diff --git a/back/src/main/resources/application.properties b/back/src/main/resources/application.properties index 92c9394..2c5bbe2 100644 --- a/back/src/main/resources/application.properties +++ b/back/src/main/resources/application.properties @@ -12,7 +12,7 @@ sec.cors.authorizedHeader=Authorization,Content-type #=============DATABASE============= spring.datasource.url=jdbc:${DB_URL} spring.datasource.username=${DB_USER} -spring.datasource.password=${DB_PASSWORD} +spring.datasource.password= spring.jpa.database-platform=org.hibernate.dialect.MariaDBDialect spring.jpa.show-sql=true diff --git a/compose.yaml b/compose.yaml index 8d5037b..759a553 100644 --- a/compose.yaml +++ b/compose.yaml @@ -50,19 +50,4 @@ services: networks: - unluckiest_network depends_on: - - api - - reverse_proxy: - container_name : reverse_proxy - build: - context: ./nginx - dockerfile: Dockerfile - ports: - - "80:80" - - "443:443" - volumes: - - ./ssl/:/etc/ssl/ - networks: - - unluckiest_network - depends_on: - - webapp + - api \ No newline at end of file diff --git a/front/.svelte-kit/ambient.d.ts b/front/.svelte-kit/ambient.d.ts index e8f54ab..431198d 100644 --- a/front/.svelte-kit/ambient.d.ts +++ b/front/.svelte-kit/ambient.d.ts @@ -42,7 +42,7 @@ declare module '$env/static/private' { export const DB_USER: string; export const DriverData: string; export const EDITOR: string; - export const EFC_25892: string; + export const EFC_3608: string; export const ffmpeg: string; export const FPS_BROWSER_APP_PROFILE_STRING: string; export const FPS_BROWSER_USER_PROFILE_STRING: string; @@ -150,7 +150,7 @@ declare module '$env/dynamic/private' { DB_USER: string; DriverData: string; EDITOR: string; - EFC_25892: string; + EFC_3608: string; ffmpeg: string; FPS_BROWSER_APP_PROFILE_STRING: string; FPS_BROWSER_USER_PROFILE_STRING: string; diff --git a/front/.svelte-kit/generated/server/internal.js b/front/.svelte-kit/generated/server/internal.js index 1e6a414..9113232 100644 --- a/front/.svelte-kit/generated/server/internal.js +++ b/front/.svelte-kit/generated/server/internal.js @@ -21,7 +21,7 @@ export const options = { app: ({ head, body, assets, nonce, env }) => "\n\n\t\n\t\tUnluckiest\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\n\t\t\n\n\t\t\n\t\t\n\n\t\t" + head + "\n\t\n\n\t\n\n\t\t
" + body + "
\n\n\t\n\n", error: ({ status, message }) => "\n\n\t\n\t\t\n\t\t" + message + "\n\n\t\t\n\t\n\t\n\t\t
\n\t\t\t" + status + "\n\t\t\t
\n\t\t\t\t

" + message + "

\n\t\t\t
\n\t\t
\n\t\n\n" }, - version_hash: "1rt869l" + version_hash: "1yvugoq" }; export async function get_hooks() { diff --git a/front/src/lib/assets/bomb.svg b/front/src/lib/assets/bomb.svg new file mode 100644 index 0000000..7aadab4 --- /dev/null +++ b/front/src/lib/assets/bomb.svg @@ -0,0 +1,8984 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/front/src/lib/assets/logo.svg b/front/src/lib/assets/logo.svg new file mode 100644 index 0000000..dece05b --- /dev/null +++ b/front/src/lib/assets/logo.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/front/static/images/background.png b/front/static/images/background.png new file mode 100644 index 0000000..f3e5668 Binary files /dev/null and b/front/static/images/background.png differ diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index da435c1..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM nginx:alpine - -COPY unluckiest_443 /etc/nginx/conf.d/default.conf - -CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/better_unluckiest_80 b/nginx/better_unluckiest_80 deleted file mode 100644 index 9324ed1..0000000 --- a/nginx/better_unluckiest_80 +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 80; - server_name unluckiest.naaturel.be www.unluckiest.naaturel.be; - - location / { - proxy_pass http://webapp:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_cache_bypass $http_upgrade; - } -} \ No newline at end of file diff --git a/nginx/unluckiest_443 b/nginx/unluckiest_443 deleted file mode 100644 index 3050a13..0000000 --- a/nginx/unluckiest_443 +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen 80 default_server; - listen 443 ssl default_server; - server_name _; - - ssl_certificate /etc/ssl/certs/fullchain.pem; - ssl_certificate_key /etc/ssl/certs/privkey.pem; - include /etc/ssl/conf/options-ssl-nginx.conf; - ssl_dhparam /etc/ssl/conf/ssl-dhparams.pem; - - return 444; -} - -server { - listen 80; - server_name unluckiest.naaturel.be www.unluckiest.naaturel.be; - - return 307 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name unluckiest.naaturel.be www.unluckiest.naaturel.be; - - ssl_certificate /etc/ssl/certs/fullchain.pem; - ssl_certificate_key /etc/ssl/certs/privkey.pem; - include /etc/ssl/conf/options-ssl-nginx.conf; - ssl_dhparam /etc/ssl/conf/ssl-dhparams.pem; - - location / { - proxy_pass http://webapp:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } - - location /api/ { - if ($request_uri ~ ^(.+)/$) { - return 307 $1; - } - - proxy_pass http://api:5000/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } -} diff --git a/nginx/unluckiest_80 b/nginx/unluckiest_80 deleted file mode 100644 index 541cb54..0000000 --- a/nginx/unluckiest_80 +++ /dev/null @@ -1,26 +0,0 @@ -server { - listen 80; - server_name unluckiest.naaturel.be www.unluckiest.naaturel.be; - - location / { - proxy_pass http://webapp:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } - - location /api/ { - if ($request_uri ~ ^(.+)/$) { - return 301 $1; - } - - proxy_pass http://api:5000/api/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } -} diff --git a/ssl/certs/readme b/ssl/certs/readme deleted file mode 100644 index a18fdc9..0000000 --- a/ssl/certs/readme +++ /dev/null @@ -1 +0,0 @@ -Your certificates in this folder \ No newline at end of file diff --git a/ssl/conf/readme b/ssl/conf/readme deleted file mode 100644 index e69de29..0000000 diff --git a/ssl/readme b/ssl/readme deleted file mode 100644 index 18595a9..0000000 --- a/ssl/readme +++ /dev/null @@ -1 +0,0 @@ -Your nginx ssl conf in this folder \ No newline at end of file