Merge branch 'dev' into sakari/feature/clan-overview

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'v20.12.2'
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: ./frontend-next-migration
+
+#      - name: Lint
+#        run: npm run lint
+#        working-directory: pages/frontend
+
+      - name: Build
+        run: npm run build
+        working-directory: ./frontend-next-migration
+        env:
+          NEXT_PUBLIC_API_LINK: ${{ secrets.NEXT_PUBLIC_API_LINK }}
+          NEXT_PUBLIC_API_DOMAIN: ${{ secrets.NEXT_PUBLIC_API_DOMAIN }}
+          NEXT_PUBLIC_LOCAL_HOST: ${{ secrets.NEXT_PUBLIC_LOCAL_HOST }}
+
+      - name: Run tests
+        run: npm test
+        working-directory: ./frontend-next-migration
+        env:
+          NEXT_PUBLIC_API_LINK: ${{ secrets.NEXT_PUBLIC_API_LINK }}
+          NEXT_PUBLIC_API_DOMAIN: ${{ secrets.NEXT_PUBLIC_API_DOMAIN }}
+          NEXT_PUBLIC_LOCAL_HOST: ${{ secrets.NEXT_PUBLIC_LOCAL_HOST }}
+
+#      - name: Run Cypress tests
+#        run: npm run cypress:run
+#        env:
+#          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+#        working-directory: ./frontend-next-migration
+#
+#      - name: Build Storybook
+#        run: npm run build-storybook
+#        working-directory: ./frontend-next-migration

frontend-next-migration/Dockerfile

@@ -60,14 +60,16 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
 USER nextjs
 
-EXPOSE 3001
+EXPOSE 3000
 #EXPOSE 3000
 
-ENV PORT 3001
+ENV PORT 3000
 #ENV PORT 3000
 # set hostname to localhost
 ENV HOSTNAME "0.0.0.0"
 
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]
+
+#"todo delete"

frontend-next-migration/README.md

@@ -14,7 +14,7 @@ pnpm dev
 bun dev
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+Open [http://localhost:5173](http://localhost:5173) with your browser to see the result.
 
 You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
 

frontend-next-migration/__mocks__/svgMock.js

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const MockSvg = (props) => <div {...props} />;
+
+export default MockSvg;

frontend-next-migration/altzone-cli/sortImports.ts

@@ -0,0 +1 @@
+import { Project } from 'ts-morph';

frontend-next-migration/jest.config.ts

@@ -102,6 +102,7 @@ const config: Config = {
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
   moduleNameMapper: {
+    '^.+\\.(svg)$': '<rootDir>/__mocks__/svgMock.js',
     '^@/(.*)$': '<rootDir>/src/$1',
   },
 

frontend-next-migration/package.json

@@ -2,6 +2,9 @@
   "name": "frontend-next-migration",
   "version": "0.1.0",
   "private": true,
+  "bin": {
+    "altzone": "./changemewhenready.ts"
+  },
   "scripts": {
     "dev": "next dev -p 5173",
     "build": "next build",
@@ -12,7 +15,9 @@
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+
+    "cli": ""
   },
   "dependencies": {
     "@fancyapps/ui": "^5.0.25",
@@ -81,6 +86,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "storybook": "^7.6.17",
+    "ts-morph": "^23.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5"
   }

frontend-next-migration/public/robots.txt

@@ -0,0 +1,4 @@
+User-agent: *
+Disallow:
+
+Sitemap: https://altzone.fi/sitemap.xml

frontend-next-migration/src/app/[lng]/(home)/_getPage.ts

@@ -1,75 +1,60 @@
+import {MainPageProps} from "@/preparedPages/MainPage";
 import {useServerTranslation} from "@/shared/i18n";
 import {AppExternalLinks} from "@/shared/appLinks/appExternalLinks";
 import {RoutePaths} from "@/shared/appLinks/RoutePaths";
-
-export async function _getPage (lng: string){
-    const {t} = await useServerTranslation(lng, 'main');
-
-
-    const seo = {
-        title: t("head-title"),
-        description: t("head-description"),
-        keywords: t("head-keywords"),
-    }
-
-    const playWithUs = {
-        title: t("playWithUs-title"),
-        webGl: {
-            title: t('PlayOnline'),
-            link: AppExternalLinks.webgl
-        },
-        googlePLayLink: AppExternalLinks.downloadAndroid,
-        belowNavs: [{
-            title: t("playWithUs-OpenPositions-title"),
-            body: t("playWithUs-OpenPositions-body"),
-            link: AppExternalLinks.duunitori,
-            isExternal: true
-        },
-            {
-                title: t("playWithUs-BecomeATester-title"),
-                body: t("playWithUs-BecomeATester-body"),
-                link: AppExternalLinks.discord,
-                isExternal: true
-            }]
-    }
-
-
-    const projectDescription = {
-        title: t('project-description-title'),
-        description: t('project-description-text')
-    }
-
-    const getToKnowComics = {
-        title: t("getToKnowComics-title"),
-        buttonParams: { innerText: t("getToKnowComics"), href: RoutePaths.COMICS_GALLERY }
-    }
-
-    const videoAndGalleries = {
-        videoLink: AppExternalLinks.previewVideoYoutube,
-        title: t("videoAndGalleries-title")
-    }
-
-
-    const classifiedHeroesBlocks = {
-        title: t("classifiedHeroesBlocks-title"),
-        seeMoreLink: {
-            text: t("classifiedHeroesBlocks-seeMore"),
-            href: RoutePaths.HEROES
-        }
-    }
-
-    const page = {
-        playWithUs,
-        projectDescription,
-        getToKnowComics,
-        videoAndGalleries,
-        classifiedHeroesBlocks
-    }
-
-
-    return {
-        page,
-        seo
-    }
-
+import {createPage} from "@/app/_helpers";
+
+export async function _getPage(lng: string) {
+    const { t } = await useServerTranslation(lng, "main");
+
+    return createPage<MainPageProps>({
+        buildSeo: () => ({
+            title: t("head-title"),
+            description: t("head-description"),
+            keywords: t("head-keywords"),
+        }),
+        buildPage: () => ({
+            playWithUs: {
+                title: t("playWithUs-title"),
+                webGl: {
+                    title: t("PlayOnline"),
+                    link: AppExternalLinks.webgl,
+                },
+                googlePLayLink: AppExternalLinks.downloadAndroid,
+                belowNavs: [
+                    {
+                        title: t("playWithUs-OpenPositions-title"),
+                        body: t("playWithUs-OpenPositions-body"),
+                        link: AppExternalLinks.duunitori,
+                        isExternal: true,
+                    },
+                    {
+                        title: t("playWithUs-BecomeATester-title"),
+                        body: t("playWithUs-BecomeATester-body"),
+                        link: AppExternalLinks.discord,
+                        isExternal: true,
+                    },
+                ],
+            },
+            projectDescription: {
+                title: t("project-description-title"),
+                description: t("project-description-text"),
+            },
+            getToKnowComics: {
+                title: t("getToKnowComics-title"),
+                buttonParams: { innerText: t("getToKnowComics"), href: RoutePaths.COMICS_GALLERY },
+            },
+            videoAndGalleries: {
+                videoLink: AppExternalLinks.previewVideoYoutube,
+                title: t("videoAndGalleries-title"),
+            },
+            classifiedHeroesBlocks: {
+                title: t("classifiedHeroesBlocks-title"),
+                seeMoreLink: {
+                    text: t("classifiedHeroesBlocks-seeMore"),
+                    href: RoutePaths.HEROES,
+                },
+            },
+        }),
+    });
 }