From af895349b7cda926beff1c6ae9deffa8813aa648 Mon Sep 17 00:00:00 2001 From: NKoelblen Date: Tue, 5 May 2026 09:36:47 +0200 Subject: [PATCH 1/2] refactor: move docker setup to parent repo --- api/.env.example => .env.example | 0 .gitignore | 14 ++--- api/Dockerfile => Dockerfile | 0 apache/httpd.conf | 35 ------------ db/init.sql | 2 - docker-compose.yml | 56 ------------------- .../migrations => migrations}/202603252047.ts | 0 .../migrations => migrations}/202603261009.ts | 0 .../migrations => migrations}/202603291907.ts | 0 .../migrations => migrations}/202604021704.ts | 0 .../migrations => migrations}/202604022038.ts | 0 .../migrations => migrations}/202604030851.ts | 0 .../migrations => migrations}/202604071158.ts | 0 .../migrations => migrations}/202604071832.ts | 0 .../migrations => migrations}/202604071943.ts | 0 .../migrations => migrations}/202604171138.ts | 0 .../migrations => migrations}/202604211200.ts | 0 .../migrations => migrations}/202604231751.ts | 0 .../migrations => migrations}/202604261623.ts | 0 .../migrations => migrations}/202604261626.ts | 0 .../migrations => migrations}/202604281530.ts | 0 .../migrations => migrations}/202604300926.ts | 0 .../migrations => migrations}/202605041327.ts | 0 .../migrations => migrations}/202605041407.ts | 0 api/package.json => package.json | 0 {api/src => src}/constants/abfConstants.ts | 0 {api/src => src}/constants/jwtConstants.ts | 0 {api/src => src}/database/db.ts | 0 {api/src => src}/database/dbHelpers.ts | 0 {api/src => src}/database/migrations.ts | 0 {api/src => src}/graphql/graphqlContext.ts | 0 {api/src => src}/graphql/graphqlSchema.ts | 0 .../graphql/resolvers/accountResolver.ts | 0 .../graphql/resolvers/authResolver.ts | 0 .../graphql/resolvers/categoryResolver.ts | 0 .../graphql/resolvers/coworkerResolver.ts | 0 .../graphql/resolvers/mediaResolver.ts | 0 .../graphql/resolvers/projectResolver.ts | 0 .../graphql/resolvers/roleResolver.ts | 0 .../graphql/resolvers/stackResolver.ts | 0 .../graphql/schemas/accountSchema.ts | 0 .../src => src}/graphql/schemas/authSchema.ts | 0 .../graphql/schemas/categorySchema.ts | 0 .../graphql/schemas/coworkerSchema.ts | 0 .../graphql/schemas/mediaSchema.ts | 0 .../graphql/schemas/projectSchema.ts | 0 .../src => src}/graphql/schemas/roleSchema.ts | 0 .../graphql/schemas/stackSchema.ts | 0 {api/src => src}/index.ts | 0 .../middlewares/corsDynamicOrigin.ts | 0 {api/src => src}/middlewares/graphql.ts | 0 {api/src => src}/middlewares/security.ts | 0 .../repositories/BaseRepository.ts | 0 .../repositories/CategoryRepository.ts | 0 .../repositories/CoworkerRepository.ts | 0 .../repositories/MediaRepository.ts | 0 .../repositories/ProjectRepository.ts | 0 .../repositories/RoleRepository.ts | 0 .../repositories/SettingsRepository.ts | 0 .../repositories/StackRepository.ts | 0 {api/src => src}/types/categoryTypes.ts | 0 {api/src => src}/types/coworkerTypes.ts | 0 {api/src => src}/types/graphql-upload.d.ts | 0 {api/src => src}/types/mediaTypes.ts | 0 {api/src => src}/types/projectTypes.ts | 0 {api/src => src}/types/roleTypes.ts | 0 {api/src => src}/types/stackTypes.ts | 0 .../utils/auth/antiBruteforce.redis.ts | 0 {api/src => src}/utils/auth/jwtUtils.ts | 0 {api/src => src}/utils/initAdmin.ts | 0 {api/src => src}/utils/passwordUtils.ts | 0 {api/src => src}/utils/stringUtils.ts | 0 {api/src => src}/utils/validationUtils.ts | 0 api/tsconfig.json => tsconfig.json | 0 ...igrations.json => tsconfig.migrations.json | 0 75 files changed, 7 insertions(+), 100 deletions(-) rename api/.env.example => .env.example (100%) rename api/Dockerfile => Dockerfile (100%) delete mode 100644 apache/httpd.conf delete mode 100644 db/init.sql delete mode 100644 docker-compose.yml rename {api/migrations => migrations}/202603252047.ts (100%) rename {api/migrations => migrations}/202603261009.ts (100%) rename {api/migrations => migrations}/202603291907.ts (100%) rename {api/migrations => migrations}/202604021704.ts (100%) rename {api/migrations => migrations}/202604022038.ts (100%) rename {api/migrations => migrations}/202604030851.ts (100%) rename {api/migrations => migrations}/202604071158.ts (100%) rename {api/migrations => migrations}/202604071832.ts (100%) rename {api/migrations => migrations}/202604071943.ts (100%) rename {api/migrations => migrations}/202604171138.ts (100%) rename {api/migrations => migrations}/202604211200.ts (100%) rename {api/migrations => migrations}/202604231751.ts (100%) rename {api/migrations => migrations}/202604261623.ts (100%) rename {api/migrations => migrations}/202604261626.ts (100%) rename {api/migrations => migrations}/202604281530.ts (100%) rename {api/migrations => migrations}/202604300926.ts (100%) rename {api/migrations => migrations}/202605041327.ts (100%) rename {api/migrations => migrations}/202605041407.ts (100%) rename api/package.json => package.json (100%) rename {api/src => src}/constants/abfConstants.ts (100%) rename {api/src => src}/constants/jwtConstants.ts (100%) rename {api/src => src}/database/db.ts (100%) rename {api/src => src}/database/dbHelpers.ts (100%) rename {api/src => src}/database/migrations.ts (100%) rename {api/src => src}/graphql/graphqlContext.ts (100%) rename {api/src => src}/graphql/graphqlSchema.ts (100%) rename {api/src => src}/graphql/resolvers/accountResolver.ts (100%) rename {api/src => src}/graphql/resolvers/authResolver.ts (100%) rename {api/src => src}/graphql/resolvers/categoryResolver.ts (100%) rename {api/src => src}/graphql/resolvers/coworkerResolver.ts (100%) rename {api/src => src}/graphql/resolvers/mediaResolver.ts (100%) rename {api/src => src}/graphql/resolvers/projectResolver.ts (100%) rename {api/src => src}/graphql/resolvers/roleResolver.ts (100%) rename {api/src => src}/graphql/resolvers/stackResolver.ts (100%) rename {api/src => src}/graphql/schemas/accountSchema.ts (100%) rename {api/src => src}/graphql/schemas/authSchema.ts (100%) rename {api/src => src}/graphql/schemas/categorySchema.ts (100%) rename {api/src => src}/graphql/schemas/coworkerSchema.ts (100%) rename {api/src => src}/graphql/schemas/mediaSchema.ts (100%) rename {api/src => src}/graphql/schemas/projectSchema.ts (100%) rename {api/src => src}/graphql/schemas/roleSchema.ts (100%) rename {api/src => src}/graphql/schemas/stackSchema.ts (100%) rename {api/src => src}/index.ts (100%) rename {api/src => src}/middlewares/corsDynamicOrigin.ts (100%) rename {api/src => src}/middlewares/graphql.ts (100%) rename {api/src => src}/middlewares/security.ts (100%) rename {api/src => src}/repositories/BaseRepository.ts (100%) rename {api/src => src}/repositories/CategoryRepository.ts (100%) rename {api/src => src}/repositories/CoworkerRepository.ts (100%) rename {api/src => src}/repositories/MediaRepository.ts (100%) rename {api/src => src}/repositories/ProjectRepository.ts (100%) rename {api/src => src}/repositories/RoleRepository.ts (100%) rename {api/src => src}/repositories/SettingsRepository.ts (100%) rename {api/src => src}/repositories/StackRepository.ts (100%) rename {api/src => src}/types/categoryTypes.ts (100%) rename {api/src => src}/types/coworkerTypes.ts (100%) rename {api/src => src}/types/graphql-upload.d.ts (100%) rename {api/src => src}/types/mediaTypes.ts (100%) rename {api/src => src}/types/projectTypes.ts (100%) rename {api/src => src}/types/roleTypes.ts (100%) rename {api/src => src}/types/stackTypes.ts (100%) rename {api/src => src}/utils/auth/antiBruteforce.redis.ts (100%) rename {api/src => src}/utils/auth/jwtUtils.ts (100%) rename {api/src => src}/utils/initAdmin.ts (100%) rename {api/src => src}/utils/passwordUtils.ts (100%) rename {api/src => src}/utils/stringUtils.ts (100%) rename {api/src => src}/utils/validationUtils.ts (100%) rename api/tsconfig.json => tsconfig.json (100%) rename api/tsconfig.migrations.json => tsconfig.migrations.json (100%) diff --git a/api/.env.example b/.env.example similarity index 100% rename from api/.env.example rename to .env.example diff --git a/.gitignore b/.gitignore index ac8d9d7..cb8318e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -/api/node_modules -/api/package-lock.json -/api/tsconfig.tsbuild.json -/api/.env -/api/umzug.json -/api/public -/api/dist \ No newline at end of file +node_modules +package-lock.json +tsconfig.tsbuild.json +.env +umzug.json +public +dist \ No newline at end of file diff --git a/api/Dockerfile b/Dockerfile similarity index 100% rename from api/Dockerfile rename to Dockerfile diff --git a/apache/httpd.conf b/apache/httpd.conf deleted file mode 100644 index de77a38..0000000 --- a/apache/httpd.conf +++ /dev/null @@ -1,35 +0,0 @@ -ServerRoot "/usr/local/apache2" -Listen 80 -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule authn_core_module modules/mod_authn_core.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule dir_module modules/mod_dir.so -LoadModule alias_module modules/mod_alias.so -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_http_module modules/mod_proxy_http.so -LoadModule rewrite_module modules/mod_rewrite.so - -User daemon -Group daemon - -ServerAdmin you@example.com -ServerName localhost - -DocumentRoot "/usr/local/apache2/htdocs" - - Options Indexes FollowSymLinks - AllowOverride None - Require all granted - - -# Reverse proxy to Node.js API -ProxyRequests Off -ProxyPreserveHost On - - Require all granted - -ProxyPass /graphql http://api:4000/graphql -ProxyPassReverse /graphql http://api:4000/graphql - -ErrorLog /proc/self/fd/2 diff --git a/db/init.sql b/db/init.sql deleted file mode 100644 index 7b2b0b7..0000000 --- a/db/init.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE DATABASE IF NOT EXISTS onokodb; -USE onokodb; \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index ebdbb88..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,56 +0,0 @@ -services: - api: - build: ./api - container_name: api - restart: always - environment: - - NODE_ENV=development - - DB_HOST=db - - DB_USER=root - - DB_PASSWORD=root - - REDIS_URL=redis://redis:6379 - volumes: - - ./api:/usr/src/app - ports: - - "4000:4000" - depends_on: - - db - - redis - command: npm run dev - redis: - image: redis:7-alpine - container_name: redis - restart: always - ports: - - "6379:6379" - db: - image: mariadb:11 - container_name: db - restart: always - environment: - - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=onokodb - ports: - - "3306:3306" - volumes: - - db_data:/var/lib/mysql - - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro - apache: - image: httpd:2.4 - container_name: apache - restart: always - depends_on: - - api - ports: - - "8080:80" - volumes: - - ./apache/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro - mailpit: - image: axllent/mailpit:latest - container_name: mailpit - restart: always - ports: - - "8025:8025" # Interface web - - "1025:1025" # SMTP -volumes: - db_data: diff --git a/api/migrations/202603252047.ts b/migrations/202603252047.ts similarity index 100% rename from api/migrations/202603252047.ts rename to migrations/202603252047.ts diff --git a/api/migrations/202603261009.ts b/migrations/202603261009.ts similarity index 100% rename from api/migrations/202603261009.ts rename to migrations/202603261009.ts diff --git a/api/migrations/202603291907.ts b/migrations/202603291907.ts similarity index 100% rename from api/migrations/202603291907.ts rename to migrations/202603291907.ts diff --git a/api/migrations/202604021704.ts b/migrations/202604021704.ts similarity index 100% rename from api/migrations/202604021704.ts rename to migrations/202604021704.ts diff --git a/api/migrations/202604022038.ts b/migrations/202604022038.ts similarity index 100% rename from api/migrations/202604022038.ts rename to migrations/202604022038.ts diff --git a/api/migrations/202604030851.ts b/migrations/202604030851.ts similarity index 100% rename from api/migrations/202604030851.ts rename to migrations/202604030851.ts diff --git a/api/migrations/202604071158.ts b/migrations/202604071158.ts similarity index 100% rename from api/migrations/202604071158.ts rename to migrations/202604071158.ts diff --git a/api/migrations/202604071832.ts b/migrations/202604071832.ts similarity index 100% rename from api/migrations/202604071832.ts rename to migrations/202604071832.ts diff --git a/api/migrations/202604071943.ts b/migrations/202604071943.ts similarity index 100% rename from api/migrations/202604071943.ts rename to migrations/202604071943.ts diff --git a/api/migrations/202604171138.ts b/migrations/202604171138.ts similarity index 100% rename from api/migrations/202604171138.ts rename to migrations/202604171138.ts diff --git a/api/migrations/202604211200.ts b/migrations/202604211200.ts similarity index 100% rename from api/migrations/202604211200.ts rename to migrations/202604211200.ts diff --git a/api/migrations/202604231751.ts b/migrations/202604231751.ts similarity index 100% rename from api/migrations/202604231751.ts rename to migrations/202604231751.ts diff --git a/api/migrations/202604261623.ts b/migrations/202604261623.ts similarity index 100% rename from api/migrations/202604261623.ts rename to migrations/202604261623.ts diff --git a/api/migrations/202604261626.ts b/migrations/202604261626.ts similarity index 100% rename from api/migrations/202604261626.ts rename to migrations/202604261626.ts diff --git a/api/migrations/202604281530.ts b/migrations/202604281530.ts similarity index 100% rename from api/migrations/202604281530.ts rename to migrations/202604281530.ts diff --git a/api/migrations/202604300926.ts b/migrations/202604300926.ts similarity index 100% rename from api/migrations/202604300926.ts rename to migrations/202604300926.ts diff --git a/api/migrations/202605041327.ts b/migrations/202605041327.ts similarity index 100% rename from api/migrations/202605041327.ts rename to migrations/202605041327.ts diff --git a/api/migrations/202605041407.ts b/migrations/202605041407.ts similarity index 100% rename from api/migrations/202605041407.ts rename to migrations/202605041407.ts diff --git a/api/package.json b/package.json similarity index 100% rename from api/package.json rename to package.json diff --git a/api/src/constants/abfConstants.ts b/src/constants/abfConstants.ts similarity index 100% rename from api/src/constants/abfConstants.ts rename to src/constants/abfConstants.ts diff --git a/api/src/constants/jwtConstants.ts b/src/constants/jwtConstants.ts similarity index 100% rename from api/src/constants/jwtConstants.ts rename to src/constants/jwtConstants.ts diff --git a/api/src/database/db.ts b/src/database/db.ts similarity index 100% rename from api/src/database/db.ts rename to src/database/db.ts diff --git a/api/src/database/dbHelpers.ts b/src/database/dbHelpers.ts similarity index 100% rename from api/src/database/dbHelpers.ts rename to src/database/dbHelpers.ts diff --git a/api/src/database/migrations.ts b/src/database/migrations.ts similarity index 100% rename from api/src/database/migrations.ts rename to src/database/migrations.ts diff --git a/api/src/graphql/graphqlContext.ts b/src/graphql/graphqlContext.ts similarity index 100% rename from api/src/graphql/graphqlContext.ts rename to src/graphql/graphqlContext.ts diff --git a/api/src/graphql/graphqlSchema.ts b/src/graphql/graphqlSchema.ts similarity index 100% rename from api/src/graphql/graphqlSchema.ts rename to src/graphql/graphqlSchema.ts diff --git a/api/src/graphql/resolvers/accountResolver.ts b/src/graphql/resolvers/accountResolver.ts similarity index 100% rename from api/src/graphql/resolvers/accountResolver.ts rename to src/graphql/resolvers/accountResolver.ts diff --git a/api/src/graphql/resolvers/authResolver.ts b/src/graphql/resolvers/authResolver.ts similarity index 100% rename from api/src/graphql/resolvers/authResolver.ts rename to src/graphql/resolvers/authResolver.ts diff --git a/api/src/graphql/resolvers/categoryResolver.ts b/src/graphql/resolvers/categoryResolver.ts similarity index 100% rename from api/src/graphql/resolvers/categoryResolver.ts rename to src/graphql/resolvers/categoryResolver.ts diff --git a/api/src/graphql/resolvers/coworkerResolver.ts b/src/graphql/resolvers/coworkerResolver.ts similarity index 100% rename from api/src/graphql/resolvers/coworkerResolver.ts rename to src/graphql/resolvers/coworkerResolver.ts diff --git a/api/src/graphql/resolvers/mediaResolver.ts b/src/graphql/resolvers/mediaResolver.ts similarity index 100% rename from api/src/graphql/resolvers/mediaResolver.ts rename to src/graphql/resolvers/mediaResolver.ts diff --git a/api/src/graphql/resolvers/projectResolver.ts b/src/graphql/resolvers/projectResolver.ts similarity index 100% rename from api/src/graphql/resolvers/projectResolver.ts rename to src/graphql/resolvers/projectResolver.ts diff --git a/api/src/graphql/resolvers/roleResolver.ts b/src/graphql/resolvers/roleResolver.ts similarity index 100% rename from api/src/graphql/resolvers/roleResolver.ts rename to src/graphql/resolvers/roleResolver.ts diff --git a/api/src/graphql/resolvers/stackResolver.ts b/src/graphql/resolvers/stackResolver.ts similarity index 100% rename from api/src/graphql/resolvers/stackResolver.ts rename to src/graphql/resolvers/stackResolver.ts diff --git a/api/src/graphql/schemas/accountSchema.ts b/src/graphql/schemas/accountSchema.ts similarity index 100% rename from api/src/graphql/schemas/accountSchema.ts rename to src/graphql/schemas/accountSchema.ts diff --git a/api/src/graphql/schemas/authSchema.ts b/src/graphql/schemas/authSchema.ts similarity index 100% rename from api/src/graphql/schemas/authSchema.ts rename to src/graphql/schemas/authSchema.ts diff --git a/api/src/graphql/schemas/categorySchema.ts b/src/graphql/schemas/categorySchema.ts similarity index 100% rename from api/src/graphql/schemas/categorySchema.ts rename to src/graphql/schemas/categorySchema.ts diff --git a/api/src/graphql/schemas/coworkerSchema.ts b/src/graphql/schemas/coworkerSchema.ts similarity index 100% rename from api/src/graphql/schemas/coworkerSchema.ts rename to src/graphql/schemas/coworkerSchema.ts diff --git a/api/src/graphql/schemas/mediaSchema.ts b/src/graphql/schemas/mediaSchema.ts similarity index 100% rename from api/src/graphql/schemas/mediaSchema.ts rename to src/graphql/schemas/mediaSchema.ts diff --git a/api/src/graphql/schemas/projectSchema.ts b/src/graphql/schemas/projectSchema.ts similarity index 100% rename from api/src/graphql/schemas/projectSchema.ts rename to src/graphql/schemas/projectSchema.ts diff --git a/api/src/graphql/schemas/roleSchema.ts b/src/graphql/schemas/roleSchema.ts similarity index 100% rename from api/src/graphql/schemas/roleSchema.ts rename to src/graphql/schemas/roleSchema.ts diff --git a/api/src/graphql/schemas/stackSchema.ts b/src/graphql/schemas/stackSchema.ts similarity index 100% rename from api/src/graphql/schemas/stackSchema.ts rename to src/graphql/schemas/stackSchema.ts diff --git a/api/src/index.ts b/src/index.ts similarity index 100% rename from api/src/index.ts rename to src/index.ts diff --git a/api/src/middlewares/corsDynamicOrigin.ts b/src/middlewares/corsDynamicOrigin.ts similarity index 100% rename from api/src/middlewares/corsDynamicOrigin.ts rename to src/middlewares/corsDynamicOrigin.ts diff --git a/api/src/middlewares/graphql.ts b/src/middlewares/graphql.ts similarity index 100% rename from api/src/middlewares/graphql.ts rename to src/middlewares/graphql.ts diff --git a/api/src/middlewares/security.ts b/src/middlewares/security.ts similarity index 100% rename from api/src/middlewares/security.ts rename to src/middlewares/security.ts diff --git a/api/src/repositories/BaseRepository.ts b/src/repositories/BaseRepository.ts similarity index 100% rename from api/src/repositories/BaseRepository.ts rename to src/repositories/BaseRepository.ts diff --git a/api/src/repositories/CategoryRepository.ts b/src/repositories/CategoryRepository.ts similarity index 100% rename from api/src/repositories/CategoryRepository.ts rename to src/repositories/CategoryRepository.ts diff --git a/api/src/repositories/CoworkerRepository.ts b/src/repositories/CoworkerRepository.ts similarity index 100% rename from api/src/repositories/CoworkerRepository.ts rename to src/repositories/CoworkerRepository.ts diff --git a/api/src/repositories/MediaRepository.ts b/src/repositories/MediaRepository.ts similarity index 100% rename from api/src/repositories/MediaRepository.ts rename to src/repositories/MediaRepository.ts diff --git a/api/src/repositories/ProjectRepository.ts b/src/repositories/ProjectRepository.ts similarity index 100% rename from api/src/repositories/ProjectRepository.ts rename to src/repositories/ProjectRepository.ts diff --git a/api/src/repositories/RoleRepository.ts b/src/repositories/RoleRepository.ts similarity index 100% rename from api/src/repositories/RoleRepository.ts rename to src/repositories/RoleRepository.ts diff --git a/api/src/repositories/SettingsRepository.ts b/src/repositories/SettingsRepository.ts similarity index 100% rename from api/src/repositories/SettingsRepository.ts rename to src/repositories/SettingsRepository.ts diff --git a/api/src/repositories/StackRepository.ts b/src/repositories/StackRepository.ts similarity index 100% rename from api/src/repositories/StackRepository.ts rename to src/repositories/StackRepository.ts diff --git a/api/src/types/categoryTypes.ts b/src/types/categoryTypes.ts similarity index 100% rename from api/src/types/categoryTypes.ts rename to src/types/categoryTypes.ts diff --git a/api/src/types/coworkerTypes.ts b/src/types/coworkerTypes.ts similarity index 100% rename from api/src/types/coworkerTypes.ts rename to src/types/coworkerTypes.ts diff --git a/api/src/types/graphql-upload.d.ts b/src/types/graphql-upload.d.ts similarity index 100% rename from api/src/types/graphql-upload.d.ts rename to src/types/graphql-upload.d.ts diff --git a/api/src/types/mediaTypes.ts b/src/types/mediaTypes.ts similarity index 100% rename from api/src/types/mediaTypes.ts rename to src/types/mediaTypes.ts diff --git a/api/src/types/projectTypes.ts b/src/types/projectTypes.ts similarity index 100% rename from api/src/types/projectTypes.ts rename to src/types/projectTypes.ts diff --git a/api/src/types/roleTypes.ts b/src/types/roleTypes.ts similarity index 100% rename from api/src/types/roleTypes.ts rename to src/types/roleTypes.ts diff --git a/api/src/types/stackTypes.ts b/src/types/stackTypes.ts similarity index 100% rename from api/src/types/stackTypes.ts rename to src/types/stackTypes.ts diff --git a/api/src/utils/auth/antiBruteforce.redis.ts b/src/utils/auth/antiBruteforce.redis.ts similarity index 100% rename from api/src/utils/auth/antiBruteforce.redis.ts rename to src/utils/auth/antiBruteforce.redis.ts diff --git a/api/src/utils/auth/jwtUtils.ts b/src/utils/auth/jwtUtils.ts similarity index 100% rename from api/src/utils/auth/jwtUtils.ts rename to src/utils/auth/jwtUtils.ts diff --git a/api/src/utils/initAdmin.ts b/src/utils/initAdmin.ts similarity index 100% rename from api/src/utils/initAdmin.ts rename to src/utils/initAdmin.ts diff --git a/api/src/utils/passwordUtils.ts b/src/utils/passwordUtils.ts similarity index 100% rename from api/src/utils/passwordUtils.ts rename to src/utils/passwordUtils.ts diff --git a/api/src/utils/stringUtils.ts b/src/utils/stringUtils.ts similarity index 100% rename from api/src/utils/stringUtils.ts rename to src/utils/stringUtils.ts diff --git a/api/src/utils/validationUtils.ts b/src/utils/validationUtils.ts similarity index 100% rename from api/src/utils/validationUtils.ts rename to src/utils/validationUtils.ts diff --git a/api/tsconfig.json b/tsconfig.json similarity index 100% rename from api/tsconfig.json rename to tsconfig.json diff --git a/api/tsconfig.migrations.json b/tsconfig.migrations.json similarity index 100% rename from api/tsconfig.migrations.json rename to tsconfig.migrations.json From ae3cd416f71bf8213ee2cdfa9cb51d67aabdc8a4 Mon Sep 17 00:00:00 2001 From: NKoelblen Date: Tue, 5 May 2026 09:43:15 +0200 Subject: [PATCH 2/2] fix: update deployment scripts to use virtual environment and correct paths --- .github/workflows/deploy-production.yml | 3 +-- .github/workflows/deploy-staging.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 513b55c..c63a0ba 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -41,9 +41,8 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} port: 22 script: | - cd ~/api.onoko.dev + source /home/kono7602/nodevenv/api.onoko.dev/24/bin/activate && cd /home/kono7602/api.onoko.dev git pull origin prod - source /home/kono7602/nodevenv/api.onoko.dev/api/24/bin/activate && cd /home/kono7602/api.onoko.dev/api npm install --include=dev npm run build # 6. Retirer l'IP de la liste blanche (nettoyage) diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 2a4ece2..3b29223 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -41,9 +41,8 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} port: 22 script: | - cd ~/api.s8sfgknu.onoko.dev + source /home/kono7602/nodevenv/api.s8sfgknu.onoko.dev/24/bin/activate && cd /home/kono7602/api.s8sfgknu.onoko.dev git pull origin main - source /home/kono7602/nodevenv/api.s8sfgknu.onoko.dev/api/24/bin/activate && cd /home/kono7602/api.s8sfgknu.onoko.dev/api npm install npm run build # 6. Retirer l'IP de la liste blanche (nettoyage)