Skip to content

Gather code repositories into the API repository #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ events {
worker_connections 1024;
}


http {
proxy_temp_path /tmp/proxy_temp;
client_body_temp_path /tmp/client_temp;
Expand All @@ -18,7 +17,7 @@ http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

set_real_ip_from 172.16.0.0/8;
set_real_ip_from 172.16.0.0/16;
real_ip_recursive on;
real_ip_header X-Forwarded-For;

Expand Down
18 changes: 18 additions & 0 deletions .docker/templates/default.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ server {

root ${NGINX_WEB_ROOT};

client_max_body_size ${NGINX_MAX_BODY_SIZE};

# This also needs to be set in the single server tag and not only in http.
set_real_ip_from 172.16.0.0/16;
real_ip_recursive on;
real_ip_header X-Forwarded-For;

location / {
# try to serve file directly, fallback to index.php
try_files $uri /index.php$is_args$args;
Expand All @@ -30,6 +37,17 @@ server {
internal;
}

location /vite {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://node:3000;
proxy_http_version 1.1;

# Enable WebSocket support for HMR
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}

location ~ \.php$ {
return 404;
}
Expand Down
33 changes: 0 additions & 33 deletions .docker/vhost.conf

This file was deleted.

2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,scss}]
[*.{js,jsx,scss}]
indent_size = 2

[docker-compose*.yml]
Expand Down
25 changes: 23 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
COMPOSE_PROJECT_NAME=displayapiservice
COMPOSE_DOMAIN=displayapiservice.local.itkdev.dk
COMPOSE_PROJECT_NAME=display
COMPOSE_DOMAIN=display.local.itkdev.dk

# In all environments, the following files are loaded if they exist,
# the latter taking precedence over the former:
Expand Down Expand Up @@ -108,3 +108,24 @@ EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300

TRACK_SCREEN_INFO=false
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300

###> Admin configuration ###
### Will be injected in the html of the admin page.
ADMIN_REJSEPLANEN_APIKEY=
ADMIN_SHOW_SCREEN_STATUS=false
ADMIN_TOUCH_BUTTON_REGIONS=false
ADMIN_LOGIN_METHODS="[]"
ADMIN_ENHANCED_PREVIEW=false
###< Admin configuration ###

###> Client configuration ###
### Will be injected in the html of the client page.
CLIENT_LOGIN_CHECK_TIMEOUT=20000
CLIENT_REFRESH_TOKEN_TIMEOUT=300000
CLIENT_RELEASE_TIMESTAMP_INTERVAL_TIMEOUT=600000
CLIENT_SCHEDULING_INTERVAL=60000
CLIENT_PULL_STRATEGY_INTERVAL=90000
CLIENT_COLOR_SCHEME='{"type":"library","lat":56.0,"lng":10.0}'
CLIENT_DEBUG=false
CLIENT_LOGGING='[]'
###< Client configuration ###
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/repos

/public/admin
/public/client
/public/release.json

###> symfony/framework-bundle ###
/.env.local
/.env.local.php
Expand Down Expand Up @@ -38,3 +44,15 @@ launch.json
###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

###> pentatrion/vite-bundle ###
/node_modules/
/public/build/
###< pentatrion/vite-bundle ###

#> Playwright
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
#< Playwright
Loading