From 16bbd46e11e08aeb02640b5c974d6c4821168281 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 22 Oct 2024 21:23:20 +0200 Subject: [PATCH 1/4] change set node version in readme files --- backend/README.md | 6 +++--- webapp/README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/README.md b/backend/README.md index b67b44240..8fc05779e 100644 --- a/backend/README.md +++ b/backend/README.md @@ -20,7 +20,7 @@ Wait a little until your backend is up and running at [http://localhost:4000/](h For the local installation you need a recent version of [Node](https://nodejs.org/en/) (>= `v16.19.0`). We are using -`v19.4.0` and therefore we recommend to use the same version +`v20.12.1` and therefore we recommend to use the same version ([see](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4082) some known problems with more recent node versions). You can use the [node version manager](https://github.com/nvm-sh/nvm) `nvm` to switch @@ -29,8 +29,8 @@ between different local Node versions: ```bash # install Node $ cd backend -$ nvm install v19.4.0 -$ nvm use v19.4.0 +$ nvm install v20.12.1 +$ nvm use v20.12.1 ``` Install node dependencies with [yarn](https://yarnpkg.com/en/): diff --git a/webapp/README.md b/webapp/README.md index 0279574e9..d311ab79b 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -10,8 +10,8 @@ between different local Node versions: ```bash # install Node $ cd webapp -$ nvm install v19.4.0 -$ nvm use v19.4.0 +$ nvm install v20.12.1 +$ nvm use v20.12.1 ``` Install node dependencies with [yarn](https://yarnpkg.com/en/): From 86d255d93f086243f4b1baf81d991306141cd755 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 22 Oct 2024 22:09:45 +0200 Subject: [PATCH 2/4] degroud vue packages in dependabot --- .github/dependabot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1f39fee52..207841b35 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -134,7 +134,6 @@ updates: vue: applies-to: version-updates patterns: - - "vue*" - "@vue*" - package-ecosystem: docker From 8481e6de0dbb0a05c7b73a6d0edfa06bb89b55bb Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 22 Oct 2024 22:18:36 +0200 Subject: [PATCH 3/4] degroud sass packages in dependabot --- .github/dependabot.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1f39fee52..9e015f53a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -185,10 +185,6 @@ updates: applies-to: version-updates patterns: - "remark*" - sass: - applies-to: version-updates - patterns: - - "sass*" storybook: applies-to: version-updates patterns: From be2ae1394c242b1e98f2253828c3ea9153111117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 23 Oct 2024 14:46:41 +0200 Subject: [PATCH 4/4] Fix theme color to be brandable --- frontend/src/assets/sass/tokens.module.scss | 8 ++++++++ webapp/constants/manifest.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/src/assets/sass/tokens.module.scss b/frontend/src/assets/sass/tokens.module.scss index 3454ab690..e32b9f074 100644 --- a/frontend/src/assets/sass/tokens.module.scss +++ b/frontend/src/assets/sass/tokens.module.scss @@ -28,6 +28,14 @@ $color-yellow: rgb(245, 196, 0); $color-yellow-active: rgb(255, 206, 10); $color-yellow-inverse: rgb(255, 252, 240); +/** + * @tokens Theme + * @presenter Color + */ + +// main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case +$theme-color: $color-primary; + /** * @tokens Color Neutral * @presenter Color diff --git a/webapp/constants/manifest.js b/webapp/constants/manifest.js index 9d05bb700..8662c509d 100644 --- a/webapp/constants/manifest.js +++ b/webapp/constants/manifest.js @@ -4,6 +4,6 @@ export default { name: APPLICATION_NAME, short_name: APPLICATION_SHORT_NAME, description: APPLICATION_DESCRIPTION, - theme_color: '#17b53f', + theme_color: '$theme-color', lang: 'en', }