wip: integration tests

.env.docker-compose.prod

@@ -8,3 +8,4 @@ NEXT_REVALIDATION_KEY="veryprivatekey"
 PUBLIC_FRONTEND_URL="http://localhost:3000"
 PUBLIC_SERVER_URL="http://cms:3001"
 PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
+PUBLIC_LEGACY_URL="https://tietokilta.fi"

.env.example

@@ -16,9 +16,13 @@ PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT=true
 
 NEXT_REVALIDATION_KEY="veryprivatekey"
 
+# Digitransit API key for HSL traffic data for info screen www.digitransit.fi/en/developers/api-registration/
+DIGITRANSIT_SUBSCRIPTION_KEY="very secret stuff"
+
 PUBLIC_FRONTEND_URL="http://localhost:3000"
 PUBLIC_SERVER_URL="http://localhost:3001"
 PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
+PUBLIC_LEGACY_URL="https://tietokilta.fi"
 
 # variables required for Google OAuth 2.0, otherwise disabled
 #GOOGLE_OAUTH_CLIENT_ID=
@@ -30,3 +34,6 @@ PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
 # AZURE_STORAGE_CONTAINER_NAME=az-media
 # AZURE_STORAGE_ALLOW_CONTAINER_CREATE=true
 # AZURE_STORAGE_ACCOUNT_BASEURL=http://localhost:10000/devstoreaccount1
+
+# For showing the git commit sha in the footer and in requests
+GIT_COMMIT_SHA=development

.gitattributes

@@ -0,0 +1,2 @@
+# ignore database seeding data in diffs
+data/gen/** linguist-generated=true

.github/dependabot.yml

@@ -1,6 +1,11 @@
 # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: npm
     directory: "/"
     schedule:
@@ -21,6 +26,10 @@ updates:
           - "react-dom"
           - "@types/react"
           - "@types/react-dom"
+      turbo:
+        patterns:
+          - "turbo"
+          - "eslint-config-turbo"
       lint:
         patterns:
           - "eslint*"

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+## Description
+
+- ...
+
+### Before submitting the PR, please make sure you do the following
+
+- [ ] If your PR is related to a previously discussed issue, please [link to it](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue) here.
+- [ ] Prefix your PR title with feat:, fix:, chore:, or docs:.
+- [ ] This message body should clearly illustrate what problems it solves.
+- [ ] Make sure the commit history is linear, up-to-date with main branch and does not contain any erroneous changes
+
+### Formatting and linting
+
+- [ ] Format code with `pnpm format` and lint the project with `pnpm lint`

.github/workflows/build.yml

@@ -19,26 +19,42 @@ jobs:
         with:
           fetch-depth: 2
 
-      - uses: pnpm/action-setup@v2
+      - name: Setup turborepo cache
+        uses: actions/cache@v4
         with:
-          version: 8
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
 
-      - name: Use Node.js 20
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9.6.0
+
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
+
       - name: Format (to ensure that code has been formatted)
-        run: pnpm format && git diff --quiet
+        run: pnpm format && git diff --exit-code
+
       - name: Lint
         run: pnpm lint
+
       - name: Generate Payload types (to ensure that they are up to date)
-        run: pnpm codegen && git diff --quiet
+        run: pnpm codegen && git diff --exit-code
+
+      - name: Typecheck
+        run: pnpm typecheck
+
       - name: Build all
         run: pnpm build
+
   docker-build-and-push:
     if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'release' && github.event.action == 'published')
     needs: build
@@ -73,7 +89,7 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Push to GitHub Packages
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -83,7 +99,8 @@ jobs:
             PROJECT=${{matrix.project}}
             GIT_COMMIT_SHA=${{github.sha}}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=min
+
   deploy:
     # only run on published releases, enable this when we release
     #if: github.event_name == 'release' && github.event.action == 'published'
@@ -95,7 +112,7 @@ jobs:
         project: [web, cms]
     steps:
       - name: Login via Azure CLI
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{secrets.AZURE_CLIENT_ID}}
           subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}

.github/workflows/playwright.yml

@@ -0,0 +1,37 @@
+name: Playwright Tests
+on:
+  push:
+  #  branches: [main]
+  pull_request:
+  #  branches: [main]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9.6.0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Install Playwright Browsers
+        run: pnpm exec playwright install --with-deps
+
+      - name: Run Playwright tests
+        run: pnpm exec playwright test
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30

.gitignore

@@ -13,3 +13,4 @@ server/dist
 public/dist
 .vscode
 !.vscode/extensions.json
+.idea

.nvmrc

@@ -1 +1 @@
-20
+22

.prettierrc

@@ -1,3 +1,5 @@
 {
-  "plugins": ["prettier-plugin-tailwindcss", "prettier-plugin-packagejson"]
+  "plugins": ["prettier-plugin-tailwindcss", "prettier-plugin-packagejson"],
+  "tailwindAttributes": ["cva", "cn", "clsx"],
+  "tailwindFunctions": ["cva", "cn", "clsx"]
 }

Dockerfile

@@ -1,5 +1,5 @@
 # Base image with Node.js
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 # Use a specific version of the Node.js Alpine image as the base. Alpine images are minimal and lightweight.
 FROM node:${NODE_VERSION}-alpine AS base
 # Update the package list and install libc6-compat. This package is often required for binary Node.js modules.
@@ -17,13 +17,12 @@ RUN pnpm install --global turbo
 # Build argument for specifying the project
 # Introduce a build argument 'PROJECT' to specify which project in the monorepo to build.
 ARG PROJECT=web
-ARG GIT_COMMIT_SHA=development
-ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
 # Install all dependencies in the monorepo
 # Start a new stage for handling dependencies. This stage uses the previously setup image with pnpm and turbo installed.
 FROM setup AS dependencies
 WORKDIR /app
 # Copy the essential configuration files and the specific project's files into the Docker image.
+COPY patches/ ./patches/
 COPY packages/ ./packages/
 COPY turbo.json ./
 COPY package.json turbo.json packages ./
@@ -44,6 +43,9 @@ RUN rm -rf /app/out/full/*/*/node_modules
 FROM setup AS builder
 WORKDIR /app
 
+ARG GIT_COMMIT_SHA=development
+ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
+
 # Copy pruned lockfile and package.json files
 # This ensures that the builder stage has the exact dependencies needed for the project.
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
@@ -74,6 +76,7 @@ FROM base AS runner
 ARG PROJECT=web
 ARG GIT_COMMIT_SHA=development
 ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
+ENV NODE_ENV=production
 # Create a non-root user and group for better security.
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nodejs

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Tietokilta ry
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

apps/cms/package.json

@@ -7,41 +7,45 @@
   "scripts": {
     "build": "NODE_ENV=production pnpm copyfiles && pnpm build:payload && pnpm build:server",
     "build:payload": "payload build",
-    "build:server": "tsc",
-    "clean": "rm -rf dist",
+    "build:server": "tsc --project tsconfig.server.json",
+    "clean": "rm -rf build dist",
     "codegen": "pnpm generate:types & pnpm generate:graphQLSchema",
     "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png}\" dist/",
-    "dev": "nodemon",
+    "dev": "tsx watch src/server.ts",
     "generate:graphQLSchema": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema",
     "generate:types": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
     "lint": "eslint  \"./src/**/*.{js,ts}\"",
     "start": "NODE_ENV=production PAYLOAD_CONFIG_PATH=dist/payload.config.js node dist/server.js",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@azure/storage-blob": "^12.17.0",
-    "@payloadcms/bundler-webpack": "^1.0.6",
-    "@payloadcms/db-mongodb": "^1.4.2",
-    "@payloadcms/plugin-cloud-storage": "^1.1.2",
-    "@payloadcms/richtext-lexical": "^0.7.0",
-    "dotenv": "^16.4.4",
-    "express": "^4.18.2",
+    "@azure/storage-blob": "^12.24.0",
+    "@payloadcms/bundler-webpack": "^1.0.7",
+    "@payloadcms/db-mongodb": "^1.7.2",
+    "@payloadcms/plugin-cloud-storage": "^1.1.3",
+    "@payloadcms/richtext-lexical": "^0.11.3",
+    "dotenv": "^16.4.5",
+    "express": "^4.19.2",
     "lodash": "^4.17.21",
-    "payload": "^2.11.1",
-    "payload-plugin-oauth": "^2.1.1"
+    "nanoid": "^3.3.7",
+    "papaparse": "^5.4.1",
+    "payload": "^2.26.0",
+    "payload-plugin-oauth": "^2.2.0"
   },
   "devDependencies": {
     "@tietokilta/cms-types": "workspace:*",
     "@tietokilta/config-typescript": "workspace:*",
     "@tietokilta/eslint-config": "workspace:*",
     "@tietokilta/ui": "workspace:*",
     "@types/express": "^4.17.21",
-    "@types/lodash": "^4.14.202",
-    "@types/passport-oauth2": "^1.4.15",
+    "@types/express-fileupload": "^1.5.0",
+    "@types/lodash": "^4.17.7",
+    "@types/papaparse": "^5.3.14",
+    "@types/react": "catalog:",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.56.0",
-    "nodemon": "^3.0.3",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "eslint": "catalog:",
+    "react": "catalog:",
+    "tsx": "^4.17.0",
+    "typescript": "catalog:"
   }
 }

apps/cms/src/blocks/committees-in-year.ts

@@ -1,12 +1,12 @@
 import type { Block } from "payload/types";
 import { guildYearField } from "../fields/guild-year";
 
-export const CommitteesInYear: Block = {
+export const CommitteesInYear = {
   slug: "committees-in-year",
   fields: [
     guildYearField({
       name: "year",
       required: true,
     }),
   ],
-};
+} satisfies Block;

apps/cms/src/blocks/editor-in-chief.ts

@@ -0,0 +1,28 @@
+import type { Block } from "payload/types";
+
+export const EditorInChief = {
+  slug: "editor-in-chief",
+  fields: [
+    {
+      name: "name",
+      type: "text",
+      required: true,
+    },
+    {
+      name: "type",
+      type: "select",
+      required: true,
+      options: [
+        {
+          label: "Boring",
+          value: "boring",
+        },
+        {
+          label: "DVD",
+          value: "dvd",
+        },
+      ],
+      defaultValue: "boring",
+    },
+  ],
+} satisfies Block;

apps/cms/src/blocks/google-form.ts

@@ -0,0 +1,15 @@
+import type { Block } from "payload/types";
+
+export const GoogleForm = {
+  slug: "google-form",
+  fields: [
+    {
+      name: "link",
+      type: "text",
+      required: true,
+      admin: {
+        description: "Copy link from src attribute of embed HTML",
+      },
+    },
+  ],
+} satisfies Block;