IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mobile-header-fix

Browse Source
This commit is contained in:
Wolfgang Huß 2024-10-30 13:25:05 +01:00 committed by GitHub
commit 24e2df1f28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 3690 additions and 1734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
.github/dependabot.yml vendored
View File

@ -22,7 +22,7 @@ updates:
babel:
applies-to: version-updates
patterns:
- "@babel/*"
- "@babel*"
cypress:
applies-to: version-updates
patterns:
@ -53,14 +53,14 @@ updates:
timezone: "Europe/Berlin"
time: "03:00"
groups:
apollo:
apollo-server:
applies-to: version-updates
patterns:
- "*apollo*"
- "*apollo-server*"
babel:
applies-to: version-updates
patterns:
- "*babel*"
- "@babel*"
metascraper:
applies-to: version-updates
patterns:
@ -99,10 +99,6 @@ updates:
applies-to: version-updates
patterns:
- "@babel*"
eslint:
applies-to: version-updates
patterns:
- "eslint*"
jest:
applies-to: version-updates
patterns:
@ -111,10 +107,6 @@ updates:
applies-to: version-updates
patterns:
- "*mapbox*"
sass:
applies-to: version-updates
patterns:
- "sass*"
storybook:
applies-to: version-updates
patterns:
@ -145,78 +137,78 @@ updates:
time: "03:00"
# frontend
- package-ecosystem: npm
open-pull-requests-limit: 99
directory: "/frontend"
rebase-strategy: "disabled"
schedule:
interval: weekly
day: "saturday"
timezone: "Europe/Berlin"
time: "03:00"
groups:
eslint:
applies-to: version-updates
patterns:
- "eslint*"
- "@eslint*"
pinia:
applies-to: version-updates
patterns:
- "pinia*"
react:
applies-to: version-updates
patterns:
- "react*"
remark:
applies-to: version-updates
patterns:
- "remark*"
storybook:
applies-to: version-updates
patterns:
- "storybook"
- "@storybook*"
stylelint:
applies-to: version-updates
patterns:
- "stylelint*"
typescript:
applies-to: version-updates
patterns:
- "ts*"
- "@types*"
- "typescript"
vite:
applies-to: version-updates
patterns:
- "vite"
- "vite-plugin*"
- "@vitejs/plugin-vue"
vitest:
applies-to: version-updates
patterns:
- "vitest"
- "@vitest*"
vue:
applies-to: version-updates
patterns:
- "*vue?(/)*"
exclude-patterns:
- "vuetify"
- "*vuepress*"
- "vue-tsc"
vuepress:
applies-to: version-updates
patterns:
- "vuepress"
- "@vuepress*"
- package-ecosystem: docker
open-pull-requests-limit: 99
directory: "/frontend"
rebase-strategy: "disabled"
schedule:
interval: weekly
day: "saturday"
timezone: "Europe/Berlin"
time: "03:00"
# - package-ecosystem: npm
# open-pull-requests-limit: 99
# directory: "/frontend"
# rebase-strategy: "disabled"
# schedule:
# interval: weekly
# day: "saturday"
# timezone: "Europe/Berlin"
# time: "03:00"
# groups:
# eslint:
# applies-to: version-updates
# patterns:
# - "eslint*"
# - "@eslint*"
# pinia:
# applies-to: version-updates
# patterns:
# - "pinia*"
# react:
# applies-to: version-updates
# patterns:
# - "react*"
# remark:
# applies-to: version-updates
# patterns:
# - "remark*"
# storybook:
# applies-to: version-updates
# patterns:
# - "storybook"
# - "@storybook*"
# stylelint:
# applies-to: version-updates
# patterns:
# - "stylelint*"
# typescript:
# applies-to: version-updates
# patterns:
# - "ts*"
# - "@types*"
# - "typescript"
# vite:
# applies-to: version-updates
# patterns:
# - "vite"
# - "vite-plugin*"
# - "@vitejs/plugin-vue"
# vitest:
# applies-to: version-updates
# patterns:
# - "vitest"
# - "@vitest*"
# vue:
# applies-to: version-updates
# patterns:
# - "*vue?(/)*"
# exclude-patterns:
# - "vuetify"
# - "*vuepress*"
# - "vue-tsc"
# vuepress:
# applies-to: version-updates
# patterns:
# - "vuepress"
# - "@vuepress*"
# - package-ecosystem: docker
# open-pull-requests-limit: 99
# directory: "/frontend"
# rebase-strategy: "disabled"
# schedule:
# interval: weekly
# day: "saturday"
# timezone: "Europe/Berlin"
# time: "03:00"

12
backend/package.json
View File

@ -36,7 +36,7 @@
"apollo-link-http": "~1.5.17",
"apollo-server": "~2.14.2",
"apollo-server-express": "^2.14.2",
"aws-sdk": "^2.1599.0",
"aws-sdk": "^2.1691.0",
"babel-core": "~7.0.0-0",
"babel-eslint": "~10.1.0",
"babel-jest": "~29.7.0",
@ -91,13 +91,13 @@
"subscriptions-transport-ws": "^0.9.19",
"trunc-html": "~1.1.2",
"uuid": "~9.0.1",
"validator": "^13.11.0",
"validator": "^13.12.0",
"xregexp": "^4.3.0"
},
"devDependencies": {
"@faker-js/faker": "9.1.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.8.1",
"@types/node": "^22.8.4",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"apollo-server-testing": "~2.11.0",
@ -108,12 +108,12 @@
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-security": "^3.0.0",
"eslint-plugin-security": "^3.0.1",
"jest": "^29.7.0",
"nodemon": "~3.1.7",
"prettier": "^3.2.5",
"prettier": "^3.3.3",
"rosie": "^2.1.1",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",

58
backend/yarn.lock
View File

@ -1994,10 +1994,10 @@
"@types/node" "*"
form-data "^3.0.0"
"@types/node@*", "@types/node@>=6", "@types/node@^22.8.1":
version "22.8.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.1.tgz#b39d4b98165e2ae792ce213f610c7c6108ccfa16"
integrity sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==
"@types/node@*", "@types/node@>=6", "@types/node@^22.8.4":
version "22.8.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.4.tgz#ab754f7ac52e1fe74174f761c5b03acaf06da0dc"
integrity sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw==
dependencies:
undici-types "~6.19.8"
@ -2834,10 +2834,10 @@ available-typed-arrays@^1.0.7:
dependencies:
possible-typed-array-names "^1.0.0"
aws-sdk@^2.1599.0:
version "2.1599.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1599.0.tgz#701850e6baabf6e796169e0894f062eee4509fba"
integrity sha512-jPb1LAN+s1TLTK+VR3TTJLr//sb3AhhT60Bm9jxB5G/fVeeRczXtBtixNpQ00gksQdkstILYLc9S6MuKMsksxA==
aws-sdk@^2.1691.0:
version "2.1691.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1691.0.tgz#9d6ccdcbae03c806fc62667b76eb3e33e5294dcc"
integrity sha512-/F2YC+DlsY3UBM2Bdnh5RLHOPNibS/+IcjUuhP8XuctyrN+MlL+fWDAiela32LTDk7hMy4rx8MTgvbJ+0blO5g==
dependencies:
buffer "4.9.2"
events "1.1.1"
@ -4385,23 +4385,23 @@ eslint-plugin-n@^16.6.2:
resolve "^1.22.2"
semver "^7.5.3"
eslint-plugin-prettier@^5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz#17cfade9e732cef32b5f5be53bd4e07afd8e67e1"
integrity sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==
eslint-plugin-prettier@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz#d1c8f972d8f60e414c25465c163d16f209411f95"
integrity sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==
dependencies:
prettier-linter-helpers "^1.0.0"
synckit "^0.8.6"
synckit "^0.9.1"
eslint-plugin-promise@^6.1.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
eslint-plugin-security@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-security/-/eslint-plugin-security-3.0.0.tgz#fcecadcf183368a23fd541514d177b09cb92993e"
integrity sha512-2Ij7PkmXIF2cKwoVkEgemwoXbOnxg5UfdhdcpNxZwJxC/10dbsdhHISrTyJ/n8DUkt3yiN6P1ywEgcMGjIwHIw==
eslint-plugin-security@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-security/-/eslint-plugin-security-3.0.1.tgz#bc52904f77c3b74c3942e12bdb0751831a3223d2"
integrity sha512-XjVGBhtDZJfyuhIxnQ/WMm385RbX3DBu7H1J7HNNhmB2tnGxMeqVSnYv79oAj992ayvIBZghsymwkYFS6cGH4Q==
dependencies:
safe-regex "^2.1.1"
@ -7870,10 +7870,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
prettier@^3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
prettier@^3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
pretty-format@^29.0.0, pretty-format@^29.7.0:
version "29.7.0"
@ -8859,10 +8859,10 @@ synchronous-promise@^2.0.10:
resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.10.tgz#e64c6fd3afd25f423963353043f4a68ebd397fd8"
integrity sha512-6PC+JRGmNjiG3kJ56ZMNWDPL8hjyghF5cMXIFOKg+NiwwEZZIvxTWd0pinWKyD227odg9ygF8xVhhz7gb8Uq7A==
synckit@^0.8.6:
version "0.8.8"
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.8.tgz#fe7fe446518e3d3d49f5e429f443cf08b6edfcd7"
integrity sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==
synckit@^0.9.1:
version "0.9.2"
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62"
integrity sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==
dependencies:
"@pkgr/core" "^0.1.0"
tslib "^2.6.2"
@ -9450,10 +9450,10 @@ v8flags@^3.1.1:
dependencies:
homedir-polyfill "^1.0.1"
validator@^13.11.0:
version "13.11.0"
resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b"
integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
validator@^13.12.0:
version "13.12.0"
resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f"
integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==
vary@^1, vary@~1.1.2:
version "1.1.2"

28
cypress/cypress.config.js
View File

@ -1,7 +1,12 @@
const dotenv = require('dotenv')
const { defineConfig } = require("cypress");
const browserify = require("@badeball/cypress-cucumber-preprocessor/browserify");
const { addCucumberPreprocessorPlugin } = require("@badeball/cypress-cucumber-preprocessor");
const { defineConfig } = require('cypress');
const browserify = require('@cypress/browserify-preprocessor');
const {
addCucumberPreprocessorPlugin,
} = require('@badeball/cypress-cucumber-preprocessor');
const {
preprendTransformerToOptions,
} = require('@badeball/cypress-cucumber-preprocessor/browserify');
// Test persistent(between commands) store
const testStore = {}
@ -9,15 +14,18 @@ const testStore = {}
async function setupNodeEvents(on, config) {
await addCucumberPreprocessorPlugin(on, config);
on("file:preprocessor", browserify.default(config));
on(
'file:preprocessor',
browserify(preprendTransformerToOptions(config, browserify.defaultOptions)),
);
on("task", {
on('task', {
pushValue({ name, value }) {
testStore[name] = value
return true
},
getValue(name) {
console.log("getValue",name,testStore)
console.log('getValue',name,testStore)
return testStore[name]
},
});
@ -30,13 +38,13 @@ const { parsed } = dotenv.config({ path: '../backend/.env' })
module.exports = defineConfig({
e2e: {
projectId: "qa7fe2",
projectId: 'qa7fe2',
defaultCommandTimeout: 60000,
pageLoadTimeout:180000,
chromeWebSecurity: false,
baseUrl: "http://localhost:3000",
specPattern: "cypress/e2e/**/*.feature",
supportFile: "cypress/support/e2e.js",
baseUrl: 'http://localhost:3000',
specPattern: '**/*.feature',
supportFile: 'cypress/support/e2e.js',
retries: 0,
video: false,
viewportHeight: 720,

3181
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@ -36,14 +36,14 @@
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/register": "^7.25.9",
"@badeball/cypress-cucumber-preprocessor": "^20.0.4",
"@cucumber/cucumber": "10.6.0",
"@badeball/cypress-cucumber-preprocessor": "^21.0.2",
"@cucumber/cucumber": "11.0.1",
"@cypress/browserify-preprocessor": "^3.0.2",
"@faker-js/faker": "9.1.0",
"auto-changelog": "^2.5.0",
"bcryptjs": "^2.4.3",
"cross-env": "^7.0.3",
"cypress": "^13.8.1",
"cypress": "^13.15.1",
"cypress-network-idle": "^1.14.2",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
@ -52,7 +52,7 @@
"import": "^0.0.6",
"jsonwebtoken": "^9.0.2",
"mock-socket": "^9.0.3",
"multiple-cucumber-html-reporter": "^3.6.2",
"multiple-cucumber-html-reporter": "^3.8.0",
"neo4j-driver": "^4.3.4",
"neode": "^0.4.8",
"rosie": "^2.1.0",

1971
yarn.lock
View File

File diff suppressed because it is too large Load Diff