ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 09:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mobile-header-fix' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step

Browse Source 
Conflicts:
	webapp/components/HeaderMenu/HeaderMenu.vue
This commit is contained in:
Wolfgang Huß 2024-10-30 13:13:13 +01:00
commit 42e26e41b1
10 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/dependabot.yml vendored
View File

@ -61,18 +61,10 @@ updates:
applies-to: version-updates
patterns:
- "*babel*"
graphql:
applies-to: version-updates
patterns:
- "graphql*"
metascraper:
applies-to: version-updates
patterns:
- "metascraper*"
neo4j:
applies-to: version-updates
patterns:
- "neo*"
typescript:
applies-to: version-updates
patterns:
@ -106,7 +98,7 @@ updates:
babel:
applies-to: version-updates
patterns:
- "*babel*"
- "@babel*"
eslint:
applies-to: version-updates
patterns:
@ -119,10 +111,6 @@ updates:
applies-to: version-updates
patterns:
- "*mapbox*"
nuxt:
applies-to: version-updates
patterns:
- "*nuxt*"
sass:
applies-to: version-updates
patterns:

2
.github/workflows/deploy-documentation.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
run: npm install && npm run docs:build
- name: Deploy Vuepress to Github Pages
uses: crazy-max/ghaction-github-pages@08f571653184e9ff3d598bdda53ffd4ed00ed562 # v4.0.0
uses: crazy-max/ghaction-github-pages@fbf0a4fa4e00f45accd6cf3232368436ec06ed59 # v4.0.0
with:
target_branch: gh-pages
build_dir: .vuepress/dist

4
backend/package.json
View File

@ -83,7 +83,7 @@
"neo4j-graphql-js": "^2.11.5",
"neode": "^0.4.9",
"node-fetch": "^2.7.0",
"nodemailer": "^6.9.13",
"nodemailer": "^6.9.16",
"nodemailer-html-to-text": "^3.2.0",
"request": "~2.88.2",
"sanitize-html": "~2.13.1",
@ -95,7 +95,7 @@
"xregexp": "^4.3.0"
},
"devDependencies": {
"@faker-js/faker": "9.0.3",
"@faker-js/faker": "9.1.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.8.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",

16
backend/yarn.lock
View File

@ -1080,10 +1080,10 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
"@faker-js/faker@9.0.3":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.0.3.tgz#be817db896b07d1716bc65d9aad1ba587b499826"
integrity sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==
"@faker-js/faker@9.1.0":
version "9.1.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.1.0.tgz#5d7957df87e2fb0eee5dcfd311ba83b34ec8eead"
integrity sha512-GJvX9iM9PBtKScJVlXQ0tWpihK3i0pha/XAhzQa1hPK/ILLa1Wq3I63Ij7lRtqTwmdTxRCyrUhLC5Sly9SLbug==
"@gar/promisify@^1.1.3":
version "1.1.3"
@ -7367,10 +7367,10 @@ nodemailer-html-to-text@^3.2.0:
dependencies:
html-to-text "7.1.1"
nodemailer@^6.9.13:
version "6.9.13"
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.13.tgz#5b292bf1e92645f4852ca872c56a6ba6c4a3d3d6"
integrity sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==
nodemailer@^6.9.16:
version "6.9.16"
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.16.tgz#3ebdf6c6f477c571c0facb0727b33892635e0b8b"
integrity sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==
nodemon@~3.1.7:
version "3.1.7"

8
package-lock.json generated
View File

@ -15,7 +15,7 @@
"@badeball/cypress-cucumber-preprocessor": "^20.0.4",
"@cucumber/cucumber": "10.6.0",
"@cypress/browserify-preprocessor": "^3.0.2",
"@faker-js/faker": "9.0.3",
"@faker-js/faker": "9.1.0",
"auto-changelog": "^2.5.0",
"bcryptjs": "^2.4.3",
"cross-env": "^7.0.3",
@ -2731,9 +2731,9 @@
}
},
"node_modules/@faker-js/faker": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.0.3.tgz",
"integrity": "sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==",
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.1.0.tgz",
"integrity": "sha512-GJvX9iM9PBtKScJVlXQ0tWpihK3i0pha/XAhzQa1hPK/ILLa1Wq3I63Ij7lRtqTwmdTxRCyrUhLC5Sly9SLbug==",
"dev": true,
"funding": [
{

2
package.json
View File

@ -39,7 +39,7 @@
"@badeball/cypress-cucumber-preprocessor": "^20.0.4",
"@cucumber/cucumber": "10.6.0",
"@cypress/browserify-preprocessor": "^3.0.2",
"@faker-js/faker": "9.0.3",
"@faker-js/faker": "9.1.0",
"auto-changelog": "^2.5.0",
"bcryptjs": "^2.4.3",
"cross-env": "^7.0.3",

7
webapp/components/HeaderMenu/HeaderMenu.vue
View File

@ -141,7 +141,12 @@
</div>
</client-only>
<!-- hamburger menu -->
<base-button icon="bars" @click="toggleMobileMenuView" circle class="hamburger-button" />
<base-button
icon="bars"
@click="toggleMobileMenuView"
circle
class="hamburger-button"
/>
</ds-flex-item>
</ds-flex>
<!-- search, filter -->

2
webapp/package.json
View File

@ -71,7 +71,7 @@
"@babel/core": "^7.25.8",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.25.8",
"@faker-js/faker": "9.0.3",
"@faker-js/faker": "9.1.0",
"@nuxtjs/composition-api": "0.32.0",
"@storybook/addon-a11y": "^8.0.8",
"@storybook/addon-actions": "^5.3.21",

8
webapp/yarn.lock
View File

@ -2313,10 +2313,10 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
"@faker-js/faker@9.0.3":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.0.3.tgz#be817db896b07d1716bc65d9aad1ba587b499826"
integrity sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==
"@faker-js/faker@9.1.0":
version "9.1.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.1.0.tgz#5d7957df87e2fb0eee5dcfd311ba83b34ec8eead"
integrity sha512-GJvX9iM9PBtKScJVlXQ0tWpihK3i0pha/XAhzQa1hPK/ILLa1Wq3I63Ij7lRtqTwmdTxRCyrUhLC5Sly9SLbug==
"@hapi/address@2.x.x":
version "2.0.0"

8
yarn.lock
View File

@ -1509,10 +1509,10 @@
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
"@faker-js/faker@9.0.3":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.0.3.tgz#be817db896b07d1716bc65d9aad1ba587b499826"
integrity sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==
"@faker-js/faker@9.1.0":
version "9.1.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.1.0.tgz#5d7957df87e2fb0eee5dcfd311ba83b34ec8eead"
integrity sha512-GJvX9iM9PBtKScJVlXQ0tWpihK3i0pha/XAhzQa1hPK/ILLa1Wq3I63Ij7lRtqTwmdTxRCyrUhLC5Sly9SLbug==
"@hapi/address@2.x.x":
version "2.1.4"