From 4c5f6196f6becdac977c37cefd458730385ecc0b Mon Sep 17 00:00:00 2001 From: Lint Action Date: Thu, 13 Mar 2025 20:12:09 +0000 Subject: [PATCH] style: fix linting issues met Prettier --- compose.prod.yml | 28 ++++++++++++++-------------- compose.yml | 2 +- config/idp/student-realm.json | 10 +++++++++- config/idp/teacher-realm.json | 10 +++++++++- frontend/src/config.ts | 5 ++++- 5 files changed, 37 insertions(+), 18 deletions(-) diff --git a/compose.prod.yml b/compose.prod.yml index 9dd5b066..8825796e 100644 --- a/compose.prod.yml +++ b/compose.prod.yml @@ -50,7 +50,7 @@ services: - 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)' - 'traefik.http.services.idp.loadbalancer.server.port=7080' env_file: - - ./config/idp/.env + - ./config/idp/.env environment: KC_HOSTNAME: 'sel2-1.ugent.be' PROXY_ADDRESS_FORWARDING: 'true' @@ -65,25 +65,25 @@ services: - '443:443/tcp' command: # Add Docker provider - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" + - '--providers.docker=true' + - '--providers.docker.exposedbydefault=false' # Add web entrypoint - - "--entrypoints.web.address=:80/tcp" - - "--entrypoints.web.http.redirections.entryPoint.to=websecure" - - "--entrypoints.web.http.redirections.entryPoint.scheme=https" + - '--entrypoints.web.address=:80/tcp' + - '--entrypoints.web.http.redirections.entryPoint.to=websecure' + - '--entrypoints.web.http.redirections.entryPoint.scheme=https' # Add websecure entrypoint - - "--entrypoints.websecure.address=:443/tcp" - - "--entrypoints.websecure.http.tls=true" - - "--entrypoints.websecure.http.tls.certResolver=letsencrypt" - - "--entrypoints.websecure.http.tls.domains[0].main=sel2-1.ugent.be" + - '--entrypoints.websecure.address=:443/tcp' + - '--entrypoints.websecure.http.tls=true' + - '--entrypoints.websecure.http.tls.certResolver=letsencrypt' + - '--entrypoints.websecure.http.tls.domains[0].main=sel2-1.ugent.be' # Certificates - - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true" - - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web" - - "--certificatesresolvers.letsencrypt.acme.email=timo.demeyst@ugent.be" - - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" + - '--certificatesresolvers.letsencrypt.acme.httpchallenge=true' + - '--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web' + - '--certificatesresolvers.letsencrypt.acme.email=timo.demeyst@ugent.be' + - '--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json' restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock:ro diff --git a/compose.yml b/compose.yml index 3c4bff9a..1276c1af 100644 --- a/compose.yml +++ b/compose.yml @@ -21,7 +21,7 @@ services: ports: - '7080:7080' # - '7443:7443' - command: [ 'start-dev', '--http-port', '7080', '--https-port', '7443', '--import-realm' ] + command: ['start-dev', '--http-port', '7080', '--https-port', '7443', '--import-realm'] restart: unless-stopped volumes: - ./config/idp:/opt/keycloak/data/import diff --git a/config/idp/student-realm.json b/config/idp/student-realm.json index 0c1d45f5..32107e4e 100644 --- a/config/idp/student-realm.json +++ b/config/idp/student-realm.json @@ -620,7 +620,15 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-jwt", - "redirectUris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost:5173/*", "http://localhost:5173", "http://localhost/*", "http://localhost", "https://sel2-1.ugent.be/*", "https://sel2-1.ugent.be"], + "redirectUris": [ + "urn:ietf:wg:oauth:2.0:oob", + "http://localhost:5173/*", + "http://localhost:5173", + "http://localhost/*", + "http://localhost", + "https://sel2-1.ugent.be/*", + "https://sel2-1.ugent.be" + ], "webOrigins": ["+"], "notBefore": 0, "bearerOnly": false, diff --git a/config/idp/teacher-realm.json b/config/idp/teacher-realm.json index 6bfd0c6b..b9d29dcb 100644 --- a/config/idp/teacher-realm.json +++ b/config/idp/teacher-realm.json @@ -620,7 +620,15 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost:5173/*", "http://localhost:5173", "http://localhost/*", "http://localhost", "https://sel2-1.ugent.be/*", "https://sel2-1.ugent.be"], + "redirectUris": [ + "urn:ietf:wg:oauth:2.0:oob", + "http://localhost:5173/*", + "http://localhost:5173", + "http://localhost/*", + "http://localhost", + "https://sel2-1.ugent.be/*", + "https://sel2-1.ugent.be" + ], "webOrigins": ["+"], "notBefore": 0, "bearerOnly": false, diff --git a/frontend/src/config.ts b/frontend/src/config.ts index 3f303846..53d6f253 100644 --- a/frontend/src/config.ts +++ b/frontend/src/config.ts @@ -1,5 +1,8 @@ export const apiConfig = { - baseUrl: (window.location.hostname === "localhost" && !(window.location.port === '80' || window.location.port === '')) ? "http://localhost:3000/api" : window.location.origin + "/api", + baseUrl: + window.location.hostname === "localhost" && !(window.location.port === "80" || window.location.port === "") + ? "http://localhost:3000/api" + : window.location.origin + "/api", }; export const loginRoute = "/login";