Skip to content

Commit 14d8d5f

Browse files
authored
Merge pull request #250 from aroskanalen/feature/mono-repository
Gather code repositories into the API repository
2 parents a800c77 + e0617bc commit 14d8d5f

File tree

488 files changed

+77241
-1514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+77241
-1514
lines changed

.docker/nginx.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ events {
77
worker_connections 1024;
88
}
99

10-
1110
http {
1211
proxy_temp_path /tmp/proxy_temp;
1312
client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
1817
include /etc/nginx/mime.types;
1918
default_type application/octet-stream;
2019

21-
set_real_ip_from 172.16.0.0/8;
20+
set_real_ip_from 172.16.0.0/16;
2221
real_ip_recursive on;
2322
real_ip_header X-Forwarded-For;
2423

.docker/templates/default.conf.template

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ server {
44

55
root ${NGINX_WEB_ROOT};
66

7+
client_max_body_size ${NGINX_MAX_BODY_SIZE};
8+
9+
# This also needs to be set in the single server tag and not only in http.
10+
set_real_ip_from 172.16.0.0/16;
11+
real_ip_recursive on;
12+
real_ip_header X-Forwarded-For;
13+
714
location / {
815
# try to serve file directly, fallback to index.php
916
try_files $uri /index.php$is_args$args;
@@ -30,6 +37,17 @@ server {
3037
internal;
3138
}
3239

40+
location /vite {
41+
proxy_set_header X-Forwarded-For $remote_addr;
42+
proxy_set_header Host $http_host;
43+
proxy_pass http://node:3000;
44+
proxy_http_version 1.1;
45+
46+
# Enable WebSocket support for HMR
47+
proxy_set_header Upgrade $http_upgrade;
48+
proxy_set_header Connection "upgrade";
49+
}
50+
3351
location ~ \.php$ {
3452
return 404;
3553
}

.docker/vhost.conf

Lines changed: 0 additions & 33 deletions
This file was deleted.

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ charset = utf-8
1313
trim_trailing_whitespace = true
1414
insert_final_newline = true
1515

16-
[*.{js,scss}]
16+
[*.{js,jsx,scss}]
1717
indent_size = 2
1818

1919
[docker-compose*.yml]

.env

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
COMPOSE_PROJECT_NAME=displayapiservice
2-
COMPOSE_DOMAIN=displayapiservice.local.itkdev.dk
1+
COMPOSE_PROJECT_NAME=display
2+
COMPOSE_DOMAIN=display.local.itkdev.dk
33

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

109109
TRACK_SCREEN_INFO=false
110110
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
111+
112+
###> Admin configuration ###
113+
### Will be injected in the html of the admin page.
114+
ADMIN_REJSEPLANEN_APIKEY=
115+
ADMIN_SHOW_SCREEN_STATUS=false
116+
ADMIN_TOUCH_BUTTON_REGIONS=false
117+
ADMIN_LOGIN_METHODS="[]"
118+
ADMIN_ENHANCED_PREVIEW=false
119+
###< Admin configuration ###
120+
121+
###> Client configuration ###
122+
### Will be injected in the html of the client page.
123+
CLIENT_LOGIN_CHECK_TIMEOUT=20000
124+
CLIENT_REFRESH_TOKEN_TIMEOUT=300000
125+
CLIENT_RELEASE_TIMESTAMP_INTERVAL_TIMEOUT=600000
126+
CLIENT_SCHEDULING_INTERVAL=60000
127+
CLIENT_PULL_STRATEGY_INTERVAL=90000
128+
CLIENT_COLOR_SCHEME='{"type":"library","lat":56.0,"lng":10.0}'
129+
CLIENT_DEBUG=false
130+
CLIENT_LOGGING='[]'
131+
###< Client configuration ###

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/repos
2+
3+
/public/admin
4+
/public/client
5+
/public/release.json
6+
17
###> symfony/framework-bundle ###
28
/.env.local
39
/.env.local.php
@@ -38,3 +44,15 @@ launch.json
3844
###> phpstan/phpstan ###
3945
phpstan.neon
4046
###< phpstan/phpstan ###
47+
48+
###> pentatrion/vite-bundle ###
49+
/node_modules/
50+
/public/build/
51+
###< pentatrion/vite-bundle ###
52+
53+
#> Playwright
54+
/test-results/
55+
/playwright-report/
56+
/blob-report/
57+
/playwright/.cache/
58+
#< Playwright

0 commit comments

Comments
 (0)