Merge pull request #450 from dump-hr/main

sync 2024
dump-hr · Dec 22, 2024 · 1163e50 · 1163e50
2 parents 8b088b4 + d9e802a
commit 1163e50
Show file tree

Hide file tree

Showing 36 changed files with 1,025 additions and 21 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - '2024'
 
   workflow_dispatch:
 
@@ -30,7 +31,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Build frontend web apps
-        run: yarn build --filter=admin... --filter=sponsor... --filter=web...
+        run: yarn build --filter=admin... --filter=sponsor... --filter=web... --filter=app...
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -49,6 +50,7 @@ jobs:
           file: ./apps/api/Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ github.sha }},
+            ghcr.io/${{ github.repository }}:${{ github.ref_name }},
             ghcr.io/${{ github.repository }}:${{ github.ref_name == 'main' && 'latest' || 'unstable' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -90,4 +92,4 @@ jobs:
       - name: Run Ansible playbook
         run: |
           eval $(ssh-agent)
-          ./infrastructure/scripts/ansible-playbook.sh production api
+          ./infrastructure/scripts/ansible-playbook.sh ${{ github.ref_name == 'main' && 'production' || github.ref_name }} api
diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - main
+      - '2024'
 
   workflow_dispatch:
 
@@ -30,7 +31,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Build frontend web apps
-        run: yarn build --filter=admin... --filter=sponsor... --filter=web...
+        run: yarn build --filter=admin... --filter=sponsor... --filter=web... --filter=app...
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -48,7 +49,6 @@ jobs:
           context: .
           file: ./apps/api/Dockerfile
           push: true
-          tags: ghcr.io/${{ github.repository }}:${{ github.sha }},
-            ghcr.io/${{ github.repository }}:${{ github.ref_name == 'main' && 'latest' || 'unstable' }}
+          tags: ghcr.io/${{ github.repository }}:${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
@@ -38,5 +38,6 @@ COPY --from=installer --chown=nestjs:nestjs /app .
 COPY --chown=nestjs:nestjs apps/admin/dist ./apps/admin/dist
 COPY --chown=nestjs:nestjs apps/sponsor/dist ./apps/sponsor/dist
 COPY --chown=nestjs:nestjs apps/web/dist ./apps/web/dist
+COPY --chown=nestjs:nestjs apps/app/dist ./apps/app/dist
 
 CMD node apps/api/dist/src/main.js
diff --git a/apps/api/db/migrations/meta/_journal.json b/apps/api/db/migrations/meta/_journal.json
@@ -78,13 +78,6 @@
       "when": 1716132892106,
       "tag": "0010_slimy_stature",
       "breakpoints": true
-    },
-    {
-      "idx": 11,
-      "version": "5",
-      "when": 1732540348770,
-      "tag": "0011_narrow_clea",
-      "breakpoints": true
     }
   ]
-}
+}
diff --git a/apps/api/src/app.module.ts b/apps/api/src/app.module.ts
@@ -35,7 +35,11 @@ import { SurveyQuestionModule } from './survey-question/survey-question.module';
       ? [
           ServeStaticModule.forRoot({
             rootPath: join(__dirname, '..', '..', '..', 'web', 'dist'),
-            exclude: ['/api/(.*)', '/sponsor/(.*)', '/admin/(.*)'],
+            exclude: ['/api/(.*)', '/app/(.*)', '/sponsor/(.*)', '/admin/(.*)'],
+          }),
+          ServeStaticModule.forRoot({
+            rootPath: join(__dirname, '..', '..', '..', 'app', 'dist'),
+            serveRoot: '/app',
           }),
           ServeStaticModule.forRoot({
             rootPath: join(__dirname, '..', '..', '..', 'sponsor', 'dist'),

diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -43,7 +43,8 @@ const setupProxies = (app: INestApplication) => {
         (pathname: string) =>
           !pathname.startsWith('/api') &&
           !pathname.startsWith('/admin') &&
-          !pathname.startsWith('/sponsor'),
+          !pathname.startsWith('/sponsor') &&
+          !pathname.startsWith('/app'),
         { target: 'http://localhost:3004' },
       ),
     );
@@ -57,6 +58,13 @@ const setupProxies = (app: INestApplication) => {
       '/sponsor',
       createProxyMiddleware({ target: 'http://localhost:3003' }),
     );
+
+    app.use(
+      '/app',
+      createProxyMiddleware({
+        target: 'http://localhost:3005',
+      }),
+    );
   }
 };
 

diff --git a/apps/app/vite.config.ts b/apps/app/vite.config.ts
@@ -5,6 +5,16 @@ import path from 'path';
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [react()],
+  base: '/app',
+  server: {
+    port: 3005,
+    proxy: {
+      '/api': {
+        target: 'http://localhost:3000',
+        changeOrigin: true,
+      },
+    },
+  },
   css: {
     preprocessorOptions: {
       scss: {

diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
@@ -10,6 +10,7 @@ import { Path } from './constants/paths';
 import { getPageTitle } from './helpers';
 import { Chatbot } from './pages/Chatbot';
 import { LandingPage } from './pages/LandingPage';
+import { TemporaryLandingPage } from './pages/TemporaryLandingPage';
 
 export const App = () => {
   return (
@@ -30,7 +31,8 @@ export const App = () => {
       </Helmet>
 
       <Switch>
-        <Route path={Path.Landing} component={LandingPage} />
+        <Route path={Path.Landing} component={TemporaryLandingPage} />
+        <Route path={Path.Test} component={LandingPage} />
         <Route path={Path.Chatbot} component={Chatbot} />
       </Switch>
 

diff --git a/apps/web/src/components/ScrollingTitle/ScrollingTitle.module.scss b/apps/web/src/components/ScrollingTitle/ScrollingTitle.module.scss
@@ -56,6 +56,7 @@
     .title,
     .sticker {
       margin-right: 40px;
+      margin-top: 0;
       z-index: 2;
     }