Merge branch 'master' into docker-compose

dreammall-earth · Feb 25, 2024 · c6572f7 · c6572f7
2 parents f453673 + 1ee268d
commit c6572f7
Show file tree

Hide file tree

Showing 75 changed files with 16,928 additions and 21,903 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,15 @@ updates:
     day: "saturday"
     timezone: "Europe/Berlin"
     time: "03:00"
+- package-ecosystem: docker
+  directory: "/"
+  rebase-strategy: "disabled"
+  schedule:
+    interval: weekly
+    day: "saturday"
+    timezone: "Europe/Berlin"
+    time: "03:00"
+# presenter
 - package-ecosystem: npm
   directory: "/presenter"
   rebase-strategy: "disabled"
@@ -17,18 +26,27 @@ updates:
     timezone: "Europe/Berlin"
     time: "03:00"
 - package-ecosystem: docker
-  directory: "/"
+  directory: "/presenter"
+  rebase-strategy: "disabled"
+  schedule:
+    interval: weekly
+    day: "saturday"
+    timezone: "Europe/Berlin"
+    time: "03:00"
+# backend
+- package-ecosystem: npm
+  directory: "/backend"
   rebase-strategy: "disabled"
   schedule:
     interval: weekly
     day: "saturday"
     timezone: "Europe/Berlin"
     time: "03:00"
 - package-ecosystem: docker
-  directory: "/presenter"
+  directory: "/backend"
   rebase-strategy: "disabled"
   schedule:
     interval: weekly
     day: "saturday"
     timezone: "Europe/Berlin"
-    time: "03:00"
+    time: "03:00"
diff --git a/.github/workflows/backend.test.build.code.yml b/.github/workflows/backend.test.build.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.backend-test-build-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for backend file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}
@@ -30,7 +30,7 @@ jobs:
       WORKING_DIRECTORY: ./backend
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Backend | Build
         run: npm install && npm run build

diff --git a/.github/workflows/backend.test.build.docs.yml b/.github/workflows/backend.test.build.docs.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.backend-test-build-docs }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for backend file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}
@@ -30,7 +30,7 @@ jobs:
       WORKING_DIRECTORY: ./backend
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Backend | Build Docs
         run: npm install && npm run docs:build

diff --git a/.github/workflows/backend.test.lint.code.yml b/.github/workflows/backend.test.lint.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.backend-test-lint-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for backend file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}
@@ -30,7 +30,7 @@ jobs:
       WORKING_DIRECTORY: ./backend
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Backend | Lint
         run: npm install && npm run test:lint

diff --git a/.github/workflows/backend.test.unit.code.yml b/.github/workflows/backend.test.unit.code.yml
@@ -14,10 +14,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.backend-test-unit-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for backend file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}
@@ -33,7 +33,7 @@ jobs:
       WORKING_DIRECTORY: ./backend
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Backend | docker-compose database
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database

diff --git a/.github/workflows/presenter.test.build.code.yml b/.github/workflows/presenter.test.build.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.presenter-test-build-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v3.0.0
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.build.docs.yml b/.github/workflows/presenter.test.build.docs.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.presenter-test-build-docs }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v3.0.0
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.build.storybook.yml b/.github/workflows/presenter.test.build.storybook.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.presenter-test-build-storybook }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v3.0.0
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.lint.code.yml b/.github/workflows/presenter.test.lint.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.presenter-test-lint-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v3.0.0
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.unit.code.yml b/.github/workflows/presenter.test.unit.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.presenter-test-unit-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v3.0.0
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       # CHECKOUT CODE ##########################################################
       ##########################################################################
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch full History for changelog
       ##########################################################################
@@ -39,7 +39,7 @@ jobs:
       ##########################################################################
       # TODO: this will error on duplicate
       #- name: package-version-to-git-tag
-      #  uses: pkgdeps/git-tag-action@v2
+      #  uses: pkgdeps/git-tag-action@v3
       #  with:
       #    github_token: ${{ secrets.GITHUB_TOKEN }}
       #    github_repo: ${{ github.repository }}
@@ -50,7 +50,7 @@ jobs:
       # Push build tag to GitHub ###############################################
       ##########################################################################
       - name: package-version-to-git-tag + build number
-        uses: pkgdeps/git-tag-action@v2
+        uses: pkgdeps/git-tag-action@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}

diff --git a/.github/workflows/test.code.yml b/.github/workflows/test.code.yml
@@ -11,10 +11,10 @@ jobs:
     outputs:
       changes: ${{ steps.changes.outputs.test-code }}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Check for Code file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.1
         id: changes
         with:
           token: ${{ github.token }}
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Code | Test
         run: npm install && npm test
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@ node_modules/
 build/
 !.vuepress/
 .vuepress/.temp/
-.vuepress/.cache/
+.vuepress/.cache/
+
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,45 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.2.0](https://github.com/dreammall-earth/dreammall.earth/compare/1.1.0...1.2.0)
+
+- fix(presenter): use light mode icons [`#266`](https://github.com/dreammall-earth/dreammall.earth/pull/266)
+- feat(backend): logging framework [`#256`](https://github.com/dreammall-earth/dreammall.earth/pull/256)
+- chore(backend): update boilerplate backend 22 02 [`#257`](https://github.com/dreammall-earth/dreammall.earth/pull/257)
+- feat(backend): logging apollo queries to console [`#255`](https://github.com/dreammall-earth/dreammall.earth/pull/255)
+- fix(docu): fix vuepress [`#15`](https://github.com/dreammall-earth/dreammall.earth/pull/15)
+- Bump type-graphql from 2.0.0-beta.3 to 2.0.0-beta.6 [`#14`](https://github.com/dreammall-earth/dreammall.earth/pull/14)
+- Bump vuepress from 2.0.0-rc.0 to 2.0.0-rc.8 [`#13`](https://github.com/dreammall-earth/dreammall.earth/pull/13)
+- Bump dorny/paths-filter from 2.11.1 to 3.0.1 [`#12`](https://github.com/dreammall-earth/dreammall.earth/pull/12)
+- Bump actions/checkout from 3 to 4 [`#11`](https://github.com/dreammall-earth/dreammall.earth/pull/11)
+- chore(backend): update packages & fix some bugs [`#10`](https://github.com/dreammall-earth/dreammall.earth/pull/10)
+- feat(backend): prisma logging to console [`#254`](https://github.com/dreammall-earth/dreammall.earth/pull/254)
+- chore(other): adjust for apple and its silicon architecture [`#128`](https://github.com/dreammall-earth/dreammall.earth/pull/128)
+- feat(backend): logging events [`#244`](https://github.com/dreammall-earth/dreammall.earth/pull/244)
+- chore(presenter): update boilerplate presenter 19.02 [`#252`](https://github.com/dreammall-earth/dreammall.earth/pull/252)
+- feat(other): add dependabot [`#9`](https://github.com/dreammall-earth/dreammall.earth/pull/9)
+- chore(frontend): update packages 19.02 [`#86`](https://github.com/dreammall-earth/dreammall.earth/pull/86)
+- feat(other): logrotate for nginx logs [`#239`](https://github.com/dreammall-earth/dreammall.earth/pull/239)
+- feat(presenter):  ensure proper internal and external links via local linting rule [`#149`](https://github.com/dreammall-earth/dreammall.earth/pull/149)
+- chore(other): update packages 08.02 [`#75`](https://github.com/dreammall-earth/dreammall.earth/pull/75)
+- Bump pkgdeps/git-tag-action from 2 to 3 [`#221`](https://github.com/dreammall-earth/dreammall.earth/pull/221)
+- feat(other): logging for pm2 [`#238`](https://github.com/dreammall-earth/dreammall.earth/pull/238)
+- feat(other): logging for nginx [`#236`](https://github.com/dreammall-earth/dreammall.earth/pull/236)
+- feat(other): logging on deploy [`#235`](https://github.com/dreammall-earth/dreammall.earth/pull/235)
+- feat(presenter): ust-id in impressum [`#234`](https://github.com/dreammall-earth/dreammall.earth/pull/234)
+- fix(presenter): include jochens english translation [`#227`](https://github.com/dreammall-earth/dreammall.earth/pull/227)
+- chore(presenter): update boilerplate presenter 02 02 [`#228`](https://github.com/dreammall-earth/dreammall.earth/pull/228)
+- feat(presenter): multilang support [`#226`](https://github.com/dreammall-earth/dreammall.earth/pull/226)
+- style(presenter): replace German "du" by "Sie" [`#225`](https://github.com/dreammall-earth/dreammall.earth/pull/225)
+- feat(frontend): per page title [`#69`](https://github.com/dreammall-earth/dreammall.earth/pull/69)
+- Bump dorny/paths-filter from 2.11.1 to 3.0.0 [`#62`](https://github.com/dreammall-earth/dreammall.earth/pull/62)
+- chore(frontend): update packages 28.01 [`#68`](https://github.com/dreammall-earth/dreammall.earth/pull/68)
+
 #### [1.1.0](https://github.com/dreammall-earth/dreammall.earth/compare/1.0.1...1.1.0)
 
+> 25 January 2024
+
+- chore(release): 1.1.0 [`#211`](https://github.com/dreammall-earth/dreammall.earth/pull/211)
 - refactor(presenter): rename products to produkte [`#214`](https://github.com/dreammall-earth/dreammall.earth/pull/214)
 - fix(presenter): proper social preview [`#212`](https://github.com/dreammall-earth/dreammall.earth/pull/212)
 - feat(presenter): vike per-page title [`#207`](https://github.com/dreammall-earth/dreammall.earth/pull/207)

diff --git a/backend/.eslintrc.cjs b/backend/.eslintrc.cjs
@@ -12,7 +12,7 @@ module.exports = {
     'plugin:import/recommended',
     'plugin:import/typescript',
     'plugin:promise/recommended',
-    'plugin:security/recommended',
+    'plugin:security/recommended-legacy',
   ],
   parserOptions: {
     ecmaVersion: 'latest',

diff --git a/backend/.nvmrc b/backend/.nvmrc
@@ -0,0 +1 @@
+v21.4.0
diff --git a/backend/.vuepress/config.ts b/backend/.vuepress/config.ts
@@ -1,3 +1,5 @@
+import { defaultTheme } from '@vuepress/theme-default'
+import { viteBundler } from '@vuepress/bundler-vite'
 import { defineUserConfig } from 'vuepress'
 
 export default defineUserConfig({
@@ -6,4 +8,6 @@ export default defineUserConfig({
   dest: 'build/docs',
   base: process.env.VUEPRESS_BASE ? `/${process.env.VUEPRESS_BASE}/` : '/',
   pagePatterns: ['**/*.md', '**/LICENSE', '!.vuepress', '!node_modules'],
+  bundler: viteBundler({}),
+  theme: defaultTheme({}),
 })
diff --git a/backend/jest.config.json b/backend/jest.config.json
@@ -1,9 +1,8 @@
 {
   "verbose": true,
   "preset": "ts-jest",
-  "modulePathIgnorePatterns": ["<rootDir>/build/"],
   "collectCoverage": true,
-  "collectCoverageFrom": ["src/**/*.ts", "!src/index.ts", "!src/prisma.ts", "!**/node_modules/**", "!build/**"],
+  "collectCoverageFrom": ["src/**/*.ts", "!src/index.ts", "!src/logger.ts", "!src/prisma.ts", "!**/node_modules/**", "!build/**"],
   "coverageThreshold": {
     "global": {
       "statements": 100,
@@ -12,6 +11,7 @@
       "lines": 100
     }
   },
+  "modulePathIgnorePatterns": ["<rootDir>/build/"],
   "setupFiles": ["./test/testSetup.ts"],
   "setupFilesAfterEnv": ["./test/testSetupAfterEnv.ts"]
 }