Merge branch 'master' into 7114-implement-ocelot-color-tokens-in-frontend-with-theme

This commit is contained in:
Wolfgang Huß 2024-04-18 13:00:01 +02:00 committed by GitHub
commit 514e783495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 6179 additions and 13994 deletions

View File

@ -1,6 +1,7 @@
version: 2
updates:
- package-ecosystem: "github-actions"
open-pull-requests-limit: 99999
directory: "/"
rebase-strategy: "disabled"
schedule:
@ -10,6 +11,7 @@ updates:
time: "03:00"
- package-ecosystem: npm
open-pull-requests-limit: 99999
directory: "/"
rebase-strategy: "disabled"
schedule:
@ -18,6 +20,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: npm
open-pull-requests-limit: 99999
directory: "/backend"
rebase-strategy: "disabled"
schedule:
@ -26,6 +29,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: npm
open-pull-requests-limit: 99999
directory: "/webapp"
rebase-strategy: "disabled"
schedule:
@ -35,6 +39,7 @@ updates:
time: "03:00"
- package-ecosystem: docker
open-pull-requests-limit: 99999
directory: "/backend"
rebase-strategy: "disabled"
schedule:
@ -43,6 +48,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: docker
open-pull-requests-limit: 99999
directory: "/webapp"
rebase-strategy: "disabled"
schedule:
@ -51,6 +57,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: docker
open-pull-requests-limit: 99999
directory: "/neo4j"
rebase-strategy: "disabled"
schedule:
@ -59,6 +66,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: docker
open-pull-requests-limit: 99999
directory: "/deployment/src/docker"
rebase-strategy: "disabled"
schedule:
@ -69,6 +77,7 @@ updates:
# frontend
- package-ecosystem: "github-actions"
open-pull-requests-limit: 99999
directory: "/frontend"
rebase-strategy: "disabled"
schedule:
@ -77,6 +86,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: npm
open-pull-requests-limit: 99999
directory: "/frontend"
rebase-strategy: "disabled"
schedule:
@ -85,6 +95,7 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
- package-ecosystem: docker
open-pull-requests-limit: 99999
directory: "/frontend"
rebase-strategy: "disabled"
schedule:

View File

@ -37,7 +37,7 @@ jobs:
- name: Cache docker images
id: cache-neo4j
uses: actions/cache/save@v4.0.1
uses: actions/cache/save@v4.0.2
with:
path: /tmp/neo4j.tar
key: ${{ github.run_id }}-backend-neo4j-cache
@ -58,7 +58,7 @@ jobs:
- name: Cache docker images
id: cache-backend
uses: actions/cache/save@v4.0.1
uses: actions/cache/save@v4.0.2
with:
path: /tmp/backend.tar
key: ${{ github.run_id }}-backend-cache
@ -87,14 +87,14 @@ jobs:
uses: actions/checkout@v4
- name: Restore Neo4J cache
uses: actions/cache/restore@v4.0.1
uses: actions/cache/restore@v4.0.2
with:
path: /tmp/neo4j.tar
key: ${{ github.run_id }}-backend-neo4j-cache
fail-on-cache-miss: true
- name: Restore Backend cache
uses: actions/cache/restore@v4.0.1
uses: actions/cache/restore@v4.0.2
with:
path: /tmp/backend.tar
key: ${{ github.run_id }}-backend-cache

View File

@ -37,7 +37,7 @@ jobs:
- name: Cache docker images
id: cache
uses: actions/cache/save@v4.0.1
uses: actions/cache/save@v4.0.2
with:
path: |
/opt/cucumber-json-formatter
@ -59,7 +59,7 @@ jobs:
job: [1, 2, 3, 4, 5, 6, 7, 8]
steps:
- name: Restore cache
uses: actions/cache/restore@v4.0.1
uses: actions/cache/restore@v4.0.2
id: cache
with:
path: |

View File

@ -50,7 +50,7 @@ jobs:
docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
- name: Cache docker image
uses: actions/cache/save@v4.0.1
uses: actions/cache/save@v4.0.2
with:
path: /tmp/webapp.tar
key: ${{ github.run_id }}-webapp-cache
@ -79,7 +79,7 @@ jobs:
uses: actions/checkout@v4
- name: Restore webapp cache
uses: actions/cache/restore@v4.0.1
uses: actions/cache/restore@v4.0.2
with:
path: /tmp/webapp.tar
key: ${{ github.run_id }}-webapp-cache

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ yarn-error.log*
.eslintcache
kubeconfig.yaml
backup-cron-job.log
.vscode
node_modules/
cypress/videos

2
.nvmrc
View File

@ -1 +1 @@
v20.2.0
v20.12.1

View File

@ -1 +1 @@
v20.2.0
v20.12.1

View File

@ -1,7 +1,7 @@
##################################################################################
# BASE (Is pushed to DockerHub for rebranding) ###################################
##################################################################################
FROM node:20.2.0-alpine3.17 as base
FROM node:20.12.1-alpine3.19 as base
# ENVs
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

View File

@ -23,42 +23,42 @@
"db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.ts --date-format 'yyyymmddHHmmss' create"
},
"dependencies": {
"@babel/cli": "~7.8.4",
"@babel/core": "^7.23.7",
"@babel/node": "~7.8.7",
"@babel/plugin-proposal-throw-expressions": "^7.23.3",
"@babel/preset-env": "~7.23.8",
"@babel/register": "^7.9.0",
"@babel/cli": "~7.24.1",
"@babel/core": "^7.24.4",
"@babel/node": "~7.23.9",
"@babel/plugin-proposal-throw-expressions": "^7.24.1",
"@babel/preset-env": "~7.24.4",
"@babel/register": "^7.23.7",
"@sentry/node": "^5.15.4",
"apollo-cache-inmemory": "~1.6.5",
"apollo-client": "~2.6.8",
"apollo-cache-inmemory": "~1.6.6",
"apollo-client": "~2.6.10",
"apollo-link-context": "~1.0.20",
"apollo-link-http": "~1.5.17",
"apollo-server": "~2.14.2",
"apollo-server-express": "^2.14.2",
"aws-sdk": "^2.1425.0",
"aws-sdk": "^2.1599.0",
"babel-core": "~7.0.0-0",
"babel-eslint": "~10.1.0",
"babel-jest": "~29.7.0",
"babel-plugin-transform-runtime": "^6.23.0",
"bcryptjs": "~2.4.3",
"cheerio": "~1.0.0-rc.3",
"cheerio": "~1.0.0-rc.12",
"cors": "~2.8.5",
"cross-env": "~7.0.3",
"dotenv": "~16.3.1",
"express": "^4.17.1",
"dotenv": "~16.4.5",
"express": "^4.19.2",
"graphql": "^14.6.0",
"graphql-middleware": "~4.0.2",
"graphql-middleware-sentry": "^3.2.1",
"graphql-redis-subscriptions": "^2.2.1",
"graphql-shield": "~7.2.2",
"graphql-tag": "~2.10.3",
"helmet": "~7.0.0",
"helmet": "~7.1.0",
"ioredis": "^4.16.1",
"jsonwebtoken": "~8.5.1",
"languagedetect": "^2.0.0",
"linkifyjs": "~2.1.8",
"lodash": "~4.17.14",
"lodash": "~4.17.21",
"merge-graphql-schemas": "^1.7.8",
"metascraper": "^5.33.5",
"metascraper-author": "^5.33.5",
@ -75,17 +75,17 @@
"metascraper-video": "^5.33.5",
"metascraper-youtube": "^5.33.5",
"migrate": "^2.1.0",
"mime-types": "^2.1.26",
"minimatch": "^9.0.3",
"mime-types": "^2.1.35",
"minimatch": "^9.0.4",
"mustache": "^4.2.0",
"neo4j-driver": "^4.0.2",
"neo4j-driver": "^4.4.11",
"neo4j-graphql-js": "^2.11.5",
"neode": "^0.4.9",
"node-fetch": "^2.7.0",
"nodemailer": "^6.4.4",
"nodemailer": "^6.9.13",
"nodemailer-html-to-text": "^3.2.0",
"request": "~2.88.2",
"sanitize-html": "~2.11.0",
"sanitize-html": "~2.13.0",
"slug": "~6.0.0",
"subscriptions-transport-ws": "^0.9.19",
"trunc-html": "~1.1.2",
@ -95,28 +95,28 @@
},
"devDependencies": {
"@faker-js/faker": "7.6.0",
"@types/jest": "^27.0.2",
"@types/node": "^20.2.5",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.7",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.57.1",
"@typescript-eslint/parser": "^5.62.0",
"apollo-server-testing": "~2.11.0",
"eslint": "^8.37.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-jest": "^28.2.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-security": "^2.1.1",
"jest": "^27.2.4",
"nodemon": "~2.0.2",
"eslint-plugin-security": "^3.0.0",
"jest": "^29.7.0",
"nodemon": "~3.1.0",
"prettier": "^3.2.5",
"rosie": "^2.0.1",
"ts-jest": "^27.0.5",
"rosie": "^2.1.1",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "^4.9.4"
"typescript": "^5.4.5"
},
"resolutions": {
"**/**/fs-capacitor": "^6.2.0",

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@
],
[
"remark-lint-list-item-indent",
"space"
"one"
]
]
}

View File

@ -35,7 +35,7 @@ This projects utilizes `storybook` and `chromatic` to develop, document & test f
The following commands are available:
| Command | Description |
|-----------------------------|--------------------------------------------------|
| --------------------------- | ------------------------------------------------ |
| `npm install` | Project setup |
| `npm run build` | Compiles and minifies for production |
| `npm run server:prod` | Runs productions server |
@ -108,7 +108,7 @@ npm install
The following endpoints are provided given the right command is executed or all three if `docker compose` is used:
| Endpoint | Description |
|------------------------------------------------|---------------|
| ---------------------------------------------- | ------------- |
| [http://localhost:3000](http://localhost:3000) | Web |
| [http://localhost:6006](http://localhost:6006) | Storybook |
| [http://localhost:8080](http://localhost:8080) | Documentation |

11430
frontend/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -65,44 +65,44 @@
"@mdi/font": "^7.4.47",
"@types/compression": "^1.7.5",
"@types/express": "^4.17.21",
"@types/node": "^20.11.20",
"@types/node": "^20.12.7",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.19",
"@vue/server-renderer": "3.4.19",
"@vuepress/theme-default": "^2.0.0-rc.17",
"@vue/compiler-sfc": "^3.4.21",
"@vue/server-renderer": "3.4.21",
"@vuepress/theme-default": "^2.0.0-rc.24",
"compression": "^1.7.4",
"cross-env": "^7.0.3",
"express": "^4.18.2",
"express": "^4.19.2",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"sass": "^1.71.1",
"sass-loader": "^14.1.1",
"sass": "^1.75.0",
"sass-loader": "^14.2.0",
"sirv": "^2.0.4",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"vike": "^0.4.163",
"vite": "^5.1.4",
"vue": "3.4.19",
"vue-i18n": "^9.9.1",
"vuetify": "^3.5.6"
"typescript": "^5.4.5",
"vike": "^0.4.168",
"vite": "^5.2.8",
"vue": "3.4.21",
"vue-i18n": "^9.12.1",
"vuetify": "^3.5.15"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.1.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
"@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/blocks": "^7.6.17",
"@storybook/test-runner": "^0.16.0",
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-interactions": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/blocks": "^8.0.8",
"@storybook/test-runner": "^0.17.0",
"@storybook/testing-library": "^0.2.2",
"@storybook/vue3": "^7.6.17",
"@storybook/vue3-vite": "^7.6.17",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"@vitest/coverage-v8": "^1.3.1",
"@vue/test-utils": "^2.4.4",
"@vuepress/bundler-vite": "^2.0.0-rc.8",
"chromatic": "^11.0.0",
"@storybook/vue3": "^8.0.8",
"@storybook/vue3-vite": "^8.0.8",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@vitest/coverage-v8": "^1.5.0",
"@vue/test-utils": "^2.4.5",
"@vuepress/bundler-vite": "^2.0.0-rc.9",
"chromatic": "^11.3.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0",
@ -111,35 +111,35 @@
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-security": "^2.1.1",
"eslint-plugin-security": "^3.0.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-vitest": "^0.3.22",
"eslint-plugin-vue": "^9.22.0",
"eslint-plugin-vuetify": "^2.1.1",
"eslint-plugin-yml": "^1.12.2",
"happy-dom": "^13.5.0",
"eslint-plugin-vitest": "^0.4.1",
"eslint-plugin-vue": "^9.25.0",
"eslint-plugin-vuetify": "^2.3.0",
"eslint-plugin-yml": "^1.14.0",
"happy-dom": "^14.7.1",
"prettier": "^3.2.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"remark-cli": "^12.0.0",
"remark-gfm": "^4.0.0",
"remark-preset-lint-consistent": "^5.1.2",
"remark-preset-lint-markdown-style-guide": "^5.1.3",
"remark-preset-lint-recommended": "^6.1.3",
"storybook": "^7.6.17",
"stylelint": "^16.2.1",
"remark-preset-lint-consistent": "^6.0.0",
"remark-preset-lint-markdown-style-guide": "^6.0.0",
"remark-preset-lint-recommended": "^7.0.0",
"storybook": "^8.0.8",
"stylelint": "^16.3.1",
"stylelint-config-css-modules": "^4.4.0",
"stylelint-config-recess-order": "^4.6.0",
"stylelint-config-recess-order": "^5.0.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.0.0",
"tsx": "^4.7.1",
"stylelint-config-standard-scss": "^13.1.0",
"tsx": "^4.7.2",
"vite-plugin-checker": "^0.6.4",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-vuetify": "^2.0.1",
"vitest": "^1.3.1",
"vite-plugin-vuetify": "^2.0.3",
"vitest": "^1.5.0",
"vue-tsc": "^1.8.27",
"vuepress": "^2.0.0-rc.8"
"vuepress": "^2.0.0-rc.9"
},
"imports": {
"#components/*": "./src/components/*",

View File

@ -197,6 +197,7 @@ exports[`PageShell > renders 1`] = `
<input
aria-describedby="switch-4-messages"
aria-disabled="false"
aria-label="$t('language.german')"
id="switch-4"
type="checkbox"
value="true"

View File

@ -197,6 +197,7 @@ exports[`TopMenu > renders 1`] = `
<input
aria-describedby="switch-4-messages"
aria-disabled="false"
aria-label="$t('language.german')"
id="switch-4"
type="checkbox"
value="true"

883
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -34,25 +34,25 @@
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/preset-env": "^7.24.0",
"@babel/preset-env": "^7.24.4",
"@babel/register": "^7.23.7",
"@badeball/cypress-cucumber-preprocessor": "^20.0.2",
"@cucumber/cucumber": "10.3.1",
"@badeball/cypress-cucumber-preprocessor": "^20.0.3",
"@cucumber/cucumber": "10.4.0",
"@cypress/browserify-preprocessor": "^3.0.2",
"@faker-js/faker": "8.4.1",
"auto-changelog": "^2.3.0",
"bcryptjs": "^2.4.3",
"cross-env": "^7.0.3",
"cypress": "^13.7.0",
"cypress": "^13.7.3",
"cypress-network-idle": "^1.14.2",
"date-fns": "^3.3.1",
"dotenv": "^16.4.4",
"dotenv": "^16.4.5",
"expect": "^29.6.4",
"graphql-request": "^2.0.0",
"import": "^0.0.6",
"jsonwebtoken": "^9.0.2",
"mock-socket": "^9.0.3",
"multiple-cucumber-html-reporter": "^3.6.1",
"multiple-cucumber-html-reporter": "^3.6.2",
"neo4j-driver": "^4.3.4",
"neode": "^0.4.8",
"rosie": "^2.1.0",

View File

@ -1 +1 @@
v20.2.0
v20.12.1

View File

@ -1,7 +1,7 @@
##################################################################################
# BASE (Is pushed to DockerHub for rebranding) ###################################
##################################################################################
FROM node:20.2.0-alpine3.17 as base
FROM node:20.12.1-alpine3.19 as base
# ENVs
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

View File

@ -1,7 +1,7 @@
##################################################################################
# BASE ###########################################################################
##################################################################################
FROM node:20.2.0-alpine3.17 as base
FROM 20.12.1-alpine3.19 as base
# ENVs
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

View File

@ -36,7 +36,7 @@
"cropperjs": "^1.6.1",
"cross-env": "~7.0.3",
"date-fns": "2.22.1",
"express": "~4.18.3",
"express": "~4.19.2",
"graphql": "~14.7.0",
"intersection-observer": "^0.12.0",
"jsonwebtoken": "~9.0.0",
@ -46,7 +46,7 @@
"nuxt": "~2.12.1",
"nuxt-dropzone": "^1.0.4",
"nuxt-env": "~0.1.0",
"sass": "^1.30.0",
"sass": "^1.75.0",
"stack-utils": "^2.0.3",
"tippy.js": "^4.3.5",
"tiptap": "~1.26.6",
@ -54,8 +54,8 @@
"trunc-html": "^1.1.2",
"v-mapbox": "^1.11.2",
"v-tooltip": "~2.1.3",
"validator": "^13.0.0",
"vue-advanced-chat": "^2.0.10",
"validator": "^13.11.0",
"vue-advanced-chat": "^2.0.11",
"vue-count-to": "~1.0.13",
"vue-infinite-loading": "^2.4.5",
"vue-izitoast": "^1.2.1",
@ -68,12 +68,12 @@
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.24.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.22.4",
"@faker-js/faker": "5.1.0",
"@nuxtjs/composition-api": "0.32.0",
"@storybook/addon-a11y": "^6.3.6",
"@storybook/addon-a11y": "^8.0.8",
"@storybook/addon-actions": "^5.3.21",
"@storybook/addon-notes": "^5.3.18",
"@storybook/vue": "~7.4.0",
@ -85,7 +85,7 @@
"async-validator": "^3.2.4",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "~10.1.0",
"babel-jest": "29.5",
"babel-jest": "29.7",
"babel-loader": "~8.1.0",
"babel-plugin-require-context-hook": "^1.0.0",
"babel-preset-vue": "~2.0.2",
@ -101,10 +101,10 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "~4.3.1",
"eslint-plugin-standard": "~5.0.0",
"eslint-plugin-vue": "~9.19.2",
"eslint-plugin-vue": "~9.25.0",
"flush-promises": "^1.0.2",
"identity-obj-proxy": "^3.0.0",
"jest": "29.5",
"jest": "29.7",
"jest-environment-jsdom": "^29.7.0",
"mutation-observer": "^1.0.3",
"prettier": "~3.2.5",

File diff suppressed because it is too large Load Diff

961
yarn.lock

File diff suppressed because it is too large Load Diff