Merge remote-tracking branch 'upstream/main' into merge-upstream

kitsteam · Feb 7, 2025 · d15eff1 · d15eff1
2 parents 2f1047e + bf55b3b
commit d15eff1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       DELETE_AFTER_DAYS: ${DELETE_AFTER_DAYS:-30}
     ports:
       - "${APP_FRONTEND_PORT:-4200}:4200"
-      - "${APP_BACKTEND_PORT:-3000}:3000"
+      - "${APP_BACKEND_PORT:-3000}:3000"
       # karma server
       - 9876:9876
     volumes:

diff --git a/teammapper-backend/src/app.module.ts b/teammapper-backend/src/app.module.ts
@@ -12,7 +12,7 @@ import { MapModule } from './map/map.module'
     TypeOrmModule.forRoot(configService.getTypeOrmConfig()),
     MapModule,
     ServeStaticModule.forRoot({
-      rootPath: join(__dirname, '..', 'client'),
+      rootPath: join(__dirname, '..', 'client', 'browser'),
     }),
   ],
 })