diff --git a/.gitignore b/.gitignore index bfafd79..ec00bd1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ dist-ssr server-dist coverage *.local -.env +.env_* /cypress/videos/ /cypress/screenshots/ diff --git a/Dockerfiles/Dockerfile_frontend b/Dockerfiles/Dockerfile_frontend index 68e36b8..c7941bc 100644 --- a/Dockerfiles/Dockerfile_frontend +++ b/Dockerfiles/Dockerfile_frontend @@ -3,6 +3,7 @@ FROM node:lts-bullseye as builder ADD .. /home/node/app/ WORKDIR /home/node/app # Install the dependencies +COPY Dockerfiles/frontend_build.env /home/node/app/.env RUN npm install RUN npm run build @@ -14,8 +15,7 @@ ADD Dockerfiles/nginx.conf "${NGINX_DEFAULT_CONF_PATH}" COPY --from=builder /home/node/app/dist /opt/app-root/src RUN chgrp -R 0 /opt/app-root/src/ && chmod -R g+rwX /opt/app-root/src/ USER 1001 -CMD ["nginx", "-g", "daemon off;"] - +CMD sed -i "s@replaceobpapihost@$VITE_OBP_API_HOST@g" /home/app/dist/index*.js ; nginx -g "daemon off;" diff --git a/Dockerfiles/frontend_build.env b/Dockerfiles/frontend_build.env new file mode 100644 index 0000000..4dad90d --- /dev/null +++ b/Dockerfiles/frontend_build.env @@ -0,0 +1,4 @@ +VITE_OBP_API_HOST=replaceobpapihost +VITE_OBP_API_MANAGER_HOST=replaceobpapimanagerhost +VITE_OBP_API_VERSION=v5.1.0 + diff --git a/components.d.ts b/components.d.ts index f58c18f..b53b581 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,12 +9,12 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { + Collections: typeof import('./src/components/Collections.vue')['default'] Content: typeof import('./src/components/Content.vue')['default'] ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElBacktop: typeof import('element-plus/es')['ElBacktop'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCard: typeof import('element-plus/es')['ElCard'] ElCol: typeof import('element-plus/es')['ElCol'] ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] @@ -32,10 +32,9 @@ declare module '@vue/runtime-core' { ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] ElMain: typeof import('element-plus/es')['ElMain'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElRow: typeof import('element-plus/es')['ElRow'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTag: typeof import('element-plus/es')['ElTag'] GlossarySearchNav: typeof import('./src/components/GlossarySearchNav.vue')['default'] HeaderNav: typeof import('./src/components/HeaderNav.vue')['default'] Menu: typeof import('./src/components/Menu.vue')['default'] diff --git a/server/app.ts b/server/app.ts index 82f7d58..9b9c458 100644 --- a/server/app.ts +++ b/server/app.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/controllers/CallbackController.ts b/server/controllers/CallbackController.ts index f878588..992d7a3 100644 --- a/server/controllers/CallbackController.ts +++ b/server/controllers/CallbackController.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/controllers/ConnectController.ts b/server/controllers/ConnectController.ts index 1d7125e..5f144a5 100644 --- a/server/controllers/ConnectController.ts +++ b/server/controllers/ConnectController.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/controllers/RequestController.ts b/server/controllers/RequestController.ts index 37185fa..7213910 100644 --- a/server/controllers/RequestController.ts +++ b/server/controllers/RequestController.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/controllers/StatusController.ts b/server/controllers/StatusController.ts index efe1909..af0f2b3 100644 --- a/server/controllers/StatusController.ts +++ b/server/controllers/StatusController.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/controllers/UserController.ts b/server/controllers/UserController.ts index 63e7b61..ca46e9c 100644 --- a/server/controllers/UserController.ts +++ b/server/controllers/UserController.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/middlewares/OauthAccessTokenMiddleware.ts b/server/middlewares/OauthAccessTokenMiddleware.ts index a0a5b1b..de331fb 100644 --- a/server/middlewares/OauthAccessTokenMiddleware.ts +++ b/server/middlewares/OauthAccessTokenMiddleware.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/middlewares/OauthRequestTokenMiddleware.ts b/server/middlewares/OauthRequestTokenMiddleware.ts index de38e19..8ca866a 100644 --- a/server/middlewares/OauthRequestTokenMiddleware.ts +++ b/server/middlewares/OauthRequestTokenMiddleware.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/services/OBPClientService.ts b/server/services/OBPClientService.ts index 7943435..898848c 100644 --- a/server/services/OBPClientService.ts +++ b/server/services/OBPClientService.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/server/services/OauthInjectedService.ts b/server/services/OauthInjectedService.ts index fe6c454..4965d17 100644 --- a/server/services/OauthInjectedService.ts +++ b/server/services/OauthInjectedService.ts @@ -1,5 +1,4 @@ /* - * * * Open Bank Project - API Explorer II * Copyright (C) 2023-2024, TESOBE GmbH * diff --git a/src/App.vue b/src/App.vue index a866d57..be09cbd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,4 @@