Merge branch main into chore/events-migrations

vevcom · Nov 8, 2024 · f375d3a · f375d3a
2 parents 89867ae + aab5541
commit f375d3a
Show file tree

Hide file tree

Showing 423 changed files with 8,801 additions and 3,107 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,7 +8,7 @@
     },
     "extends": [
         "next/core-web-vitals",
-        "eslint:recommended",
+        "next/typescript",
         "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:import/recommended",
@@ -19,21 +19,21 @@
     "root": true,
     "rules": {
         "indent": [
-        "error",
-        4,
-        {
-            "SwitchCase": 1,
-            "VariableDeclarator": 1
-        }
+            "error",
+            4,
+            {
+                "SwitchCase": 1,
+                "VariableDeclarator": 1
+            }
         ],
         // require function expressions to have a name
         "func-names": "warn",
         // enforce newline at the end of file, with no multiple empty lines
         "eol-last": "error",  
         // disallow padding inside computed properties, ie. obj[ "fjie"] not allowed
         "computed-property-spacing": [ 
-        "error",
-        "never"
+            "error",
+            "never"
         ],
         // suggest using arrow functions as callbacks
         "prefer-arrow-callback": "error",
@@ -110,17 +110,17 @@
         }
         ],
         "quotes": [
-        "error",
-        "single",
-        "avoid-escape"
+            "error",
+            "single",
+            "avoid-escape"
         ],
         "jsx-quotes": ["error", "prefer-double"],
         // require camel case names
         "camelcase": [
-        "error",
-        { 
-            "properties": "never" 
-        }
+            "error",
+            { 
+                "properties": "never" 
+            }
         ],
         // enforce spacing before and after comma
         "comma-spacing": [
@@ -493,18 +493,17 @@
             "warn",
             {
                 "groups": [
-                "index",
-                "sibling",
-                "parent",
-                "internal",
-                "external",
-                "builtin",
-                "object",
-                "type"
+                    "index",
+                    "sibling",
+                    "parent",
+                    "internal",
+                    "external",
+                    "builtin",
+                    "object",
+                    "type"
                 ]
             }
         ],
-        "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/consistent-type-imports": [
             "error",
             {

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     - name: set up node
       uses: actions/setup-node@v3
       with:
-        node-version: '20.x'
+        node-version: '22.x'
 
     - name: Install dependencies 
       run: npm ci

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-alpine AS base
+FROM node:22-alpine AS base
 WORKDIR /usr/src/app
 
 # Install node packages
@@ -16,7 +16,7 @@ COPY public public
 COPY next-env.d.t[s] next.config.js tsconfig.json ./
 
 ############################################################
-FROM node:20-alpine AS prod
+FROM node:22-alpine AS prod
 WORKDIR /usr/src/app
 
 COPY src src
@@ -25,7 +25,7 @@ COPY --from=base /usr/src/app/ .
 RUN npm run build
 CMD ["npm", "run", "start"]
 ############################################################
-FROM node:20-alpine AS dev
+FROM node:22-alpine AS dev
 WORKDIR /usr/src/app
 
 COPY --from=base /usr/src/app/ .

diff --git a/nginx/default.conf → containers/nginx/default.conf b/nginx/default.conf → containers/nginx/default.conf
diff --git a/nginx/nginx.conf → containers/nginx/nginx.conf b/nginx/nginx.conf → containers/nginx/nginx.conf
diff --git a/nginx/nginx.dev.conf → containers/nginx/nginx.dev.conf b/nginx/nginx.dev.conf → containers/nginx/nginx.dev.conf
diff --git a/postfix/Dockerfile → containers/postfix/Dockerfile b/postfix/Dockerfile → containers/postfix/Dockerfile
diff --git a/postfix/mailaliasquery.sql → containers/postfix/mailaliasquery.sql b/postfix/mailaliasquery.sql → containers/postfix/mailaliasquery.sql
diff --git a/postfix/main.cf.tmpl → containers/postfix/main.cf.tmpl b/postfix/main.cf.tmpl → containers/postfix/main.cf.tmpl
diff --git a/postfix/pgsql-aliases.cf.tmpl → containers/postfix/pgsql-aliases.cf.tmpl b/postfix/pgsql-aliases.cf.tmpl → containers/postfix/pgsql-aliases.cf.tmpl
diff --git a/default.env b/default.env
@@ -59,6 +59,8 @@ um/xyw/nKFJcqqMJ71Xq3SY+nA7I0ui4R4W6usx9He6kb5EKlzc9EdVq0w==
 -----END PUBLIC KEY-----
 "
 
+JWT_SECRET="hs_maa_gaa"
+
 # Postfix
 MAIL_DOMAIN=sanctus.omega.ntnu.no
 MAIL_RELAY_HOST=mailgw.ntnu.no
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -37,6 +37,7 @@ services:
             DOMAIN: ${DOMAIN}
             JWT_PRIVATE_KEY: ${JWT_PRIVATE_KEY}
             JWT_PUBLIC_KEY: ${JWT_PUBLIC_KEY}
+            JWT_SECRET: ${JWT_SECRET}
         depends_on:
             db:
                 condition: service_healthy
@@ -97,7 +98,7 @@ services:
         ports:
             - 80:80
         volumes:
-            - ${PROJECT_ROOT:-.}/nginx/nginx.dev.conf:/etc/nginx/nginx.conf
+            - ${PROJECT_ROOT:-.}/containers/nginx/nginx.dev.conf:/etc/nginx/nginx.conf
             - devstore:/usr/store
         depends_on:
             - projectnext

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
             DOMAIN: ${DOMAIN}
             JWT_PRIVATE_KEY: ${JWT_PRIVATE_KEY}
             JWT_PUBLIC_KEY: ${JWT_PUBLIC_KEY}
+            JWT_SECRET: ${JWT_SECRET}
         depends_on:
             db:
                 condition: service_healthy
@@ -94,8 +95,8 @@ services:
             - 80:80
             - 443:443
         volumes:
-            - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-            - ./nginx/default.conf:/etc/nginx/templates/default.conf.template:ro
+            - ./containers/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+            - ./containers/nginx/default.conf:/etc/nginx/templates/default.conf.template:ro
             - store:/usr/store:ro
             - ./certs/conf:/etc/letsencrypt:ro
             - ./certs/www/:/var/www/certbot:ro
@@ -117,7 +118,7 @@ services:
         restart: always
 
     postfix:
-        build: ./postfix/
+        build: ./containers/postfix/
         ports:
             - '587:587'
             - '25:25'