From 60302c08d75411d459194262ef6bbea731ffdfcb Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 9 Aug 2022 11:52:28 +0200 Subject: [PATCH 01/22] add optional header menu --- webapp/components/HeaderMenu/HeaderMenu.vue | 20 ++++++++++++ webapp/constants/headerMenu.js | 35 +++++++++++++++++++++ webapp/layouts/default.vue | 7 ++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 webapp/components/HeaderMenu/HeaderMenu.vue create mode 100644 webapp/constants/headerMenu.js diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue new file mode 100644 index 000000000..1228d1e4a --- /dev/null +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js new file mode 100644 index 000000000..da7a72e85 --- /dev/null +++ b/webapp/constants/headerMenu.js @@ -0,0 +1,35 @@ +export default { + SHOW_HEADER_MENU: true, + MENU: [{ + name: 'Themen', + path: '/#' + }, + { + name: 'Gruppen', + path: '/#', + children: [ + { + name: 'Gruppe 1', + path: '/#' + }, + { + name: 'Gruppe 2', + path: '/#' + } + ] + }, + { + name: 'Über Yunite', + path: '/#', + children: [ + { + name: 'Impressum', + path: '/#' + }, + { + name: 'Yunite Team', + path: '/#' + } + ] + }] + } \ No newline at end of file diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 0dfd752bf..503b22185 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -9,6 +9,7 @@ + import Logo from '~/components/Logo/Logo' +import HeaderMenu from '~/components/HeaderMenu/HeaderMenu.vue' +import headerMenu from '../constants/headerMenu.js' import { mapGetters } from 'vuex' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' import SearchField from '~/components/features/SearchField/SearchField.vue' @@ -94,6 +97,7 @@ import InviteButton from '~/components/InviteButton/InviteButton' export default { components: { Logo, + HeaderMenu, LocaleSwitch, SearchField, Modal, @@ -106,6 +110,7 @@ export default { mixins: [seo], data() { return { + show: headerMenu.SHOW_HEADER_MENU, mobileSearchVisible: false, toggleMobileMenu: false, inviteRegistration: this.$env.INVITE_REGISTRATION === true, // for 'false' in .env INVITE_REGISTRATION is of type undefined and not(!) boolean false, because of internal handling, From 336e9469dbdd30c839667f24e4b148a727a5fe5e Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 9 Aug 2022 11:55:00 +0200 Subject: [PATCH 02/22] add optional header menu --- webapp/components/HeaderMenu/HeaderMenu.vue | 24 ++++++++---------- webapp/constants/headerMenu.js | 28 +++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 1228d1e4a..31afe93b4 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -1,20 +1,18 @@ \ No newline at end of file + diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index da7a72e85..1dfed43d8 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,8 +1,9 @@ export default { - SHOW_HEADER_MENU: true, - MENU: [{ + SHOW_HEADER_MENU: true, + MENU: [ + { name: 'Themen', - path: '/#' + path: '/#', }, { name: 'Gruppen', @@ -10,13 +11,13 @@ export default { children: [ { name: 'Gruppe 1', - path: '/#' + path: '/#', }, { name: 'Gruppe 2', - path: '/#' - } - ] + path: '/#', + }, + ], }, { name: 'Über Yunite', @@ -24,12 +25,13 @@ export default { children: [ { name: 'Impressum', - path: '/#' + path: '/#', }, { name: 'Yunite Team', - path: '/#' - } - ] - }] - } \ No newline at end of file + path: '/#', + }, + ], + }, + ], +} From 968dcc72763a19c2b7777a077590b1fa45fd3d81 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 9 Aug 2022 13:24:31 +0200 Subject: [PATCH 03/22] add yunite logo and branding scss file --- webapp/assets/styles/imports/_branding.scss | 6 ++ webapp/assets/styles/main.scss | 1 + webapp/components/Logo/Logo.vue | 4 +- webapp/components/Logo/style.scss | 2 +- webapp/layouts/default.vue | 4 +- webapp/static/img/custom/logo-horizontal.svg | 69 ++++--------------- webapp/static/img/custom/logo-squared.svg | 71 ++++---------------- 7 files changed, 36 insertions(+), 121 deletions(-) create mode 100644 webapp/assets/styles/imports/_branding.scss diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss new file mode 100644 index 000000000..fb4c80970 --- /dev/null +++ b/webapp/assets/styles/imports/_branding.scss @@ -0,0 +1,6 @@ +.header-menu { + background-color: #748885; +} +.ds-menu-item-link { + color: antiquewhite; +} \ No newline at end of file diff --git a/webapp/assets/styles/main.scss b/webapp/assets/styles/main.scss index d6821e013..dc745585d 100644 --- a/webapp/assets/styles/main.scss +++ b/webapp/assets/styles/main.scss @@ -1,3 +1,4 @@ +@import './imports/_branding.scss'; @import './imports/_tooltip.scss'; @import './imports/_toast.scss'; diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index ed5c147e8..6e4dd3cbc 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -59,7 +59,7 @@ export default { }, data() { const logosObject = { - header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: '130px' }, + header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: '47px' }, welcome: { path: logos.LOGO_WELCOME_PATH, alt: 'Welcome', widthDefault: '200px' }, signup: { path: logos.LOGO_SIGNUP_PATH, alt: 'Sign Up', widthDefault: '200px' }, logout: { path: logos.LOGO_LOGOUT_PATH, alt: 'Logging Out', widthDefault: '200px' }, @@ -107,7 +107,7 @@ export default { } .ds-logo-svg { - width: 130px; + width: 47px; height: auto; fill: #000000; } diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss index 305e907c5..aa153c8f6 100644 --- a/webapp/components/Logo/style.scss +++ b/webapp/components/Logo/style.scss @@ -11,7 +11,7 @@ } .ds-logo-svg { - width: 130px; + width: 47px; height: auto; fill: currentColor; } \ No newline at end of file diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 503b22185..8e9f09616 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -4,7 +4,7 @@
- + @@ -17,7 +17,7 @@ - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/webapp/static/img/custom/logo-squared.svg b/webapp/static/img/custom/logo-squared.svg index 2a926f0a9..6ed4a3f62 100644 --- a/webapp/static/img/custom/logo-squared.svg +++ b/webapp/static/img/custom/logo-squared.svg @@ -1,65 +1,18 @@ - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + From 3c11d1f468dfcf8806284ec704cf53a3911733df Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 9 Aug 2022 13:27:24 +0200 Subject: [PATCH 04/22] fix lint --- webapp/layouts/default.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 8e9f09616..4c5d9d0de 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -17,7 +17,12 @@ Date: Wed, 10 Aug 2022 08:05:54 +0200 Subject: [PATCH 05/22] remove grey from sccs branding --- webapp/assets/styles/imports/_branding.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index fb4c80970..9a0d5a4e1 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -1,5 +1,5 @@ .header-menu { - background-color: #748885; + // background-color: #748885; } .ds-menu-item-link { color: antiquewhite; From afb5c719dcf42d165f640a83edd3ba2d46b75c1a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 10 Aug 2022 09:52:59 +0200 Subject: [PATCH 06/22] add color from yunite in branding --- webapp/assets/styles/imports/_branding.scss | 19 +++++++++++++++++++ webapp/assets/styles/main.scss | 3 ++- .../components/LocaleSwitch/LocaleSwitch.vue | 1 - webapp/constants/headerMenu.js | 4 ++++ webapp/layouts/default.vue | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index 9a0d5a4e1..103ae9243 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -1,3 +1,22 @@ +.main-navigation { + background-color: #748885; +} +.main-navigation .ds-menu-item-link { + color: #c8fc4f;; +} + +.main-navigation .ds-menu-item-link:hover { + color: #f2f2f1;; +} + +.main-navigation .locale-menu { + color: #c8fc4f;; +} + +.base-button { + color: #c8fc4f; +} + .header-menu { // background-color: #748885; } diff --git a/webapp/assets/styles/main.scss b/webapp/assets/styles/main.scss index dc745585d..d797bbf4e 100644 --- a/webapp/assets/styles/main.scss +++ b/webapp/assets/styles/main.scss @@ -1,4 +1,3 @@ -@import './imports/_branding.scss'; @import './imports/_tooltip.scss'; @import './imports/_toast.scss'; @@ -181,3 +180,5 @@ hr { .dropdown-arrow { font-size: $font-size-xx-small; } + +@import './imports/_branding.scss'; \ No newline at end of file diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue index 47e53028b..b302afd76 100644 --- a/webapp/components/LocaleSwitch/LocaleSwitch.vue +++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue @@ -117,7 +117,6 @@ export default { align-items: center; height: 100%; padding: $space-xx-small; - color: $text-color-soft; > .label { margin: 0 $space-xx-small; diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 1dfed43d8..06eae4109 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,6 +1,10 @@ export default { SHOW_HEADER_MENU: true, MENU: [ + { + name: 'BeitrΓ€ge', + path: '/#', + }, { name: 'Themen', path: '/#', diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 4c5d9d0de..b8a377aec 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -40,7 +40,7 @@
Date: Tue, 13 Sep 2022 09:17:04 +0200 Subject: [PATCH 07/22] feature: Tooltips for Topics --- .../CategoriesSelect/CategoriesSelect.vue | 5 +++++ .../FilterMenu/CategoriesFilter.vue | 5 +++++ webapp/locales/de.json | 21 +++++++++++++++++++ webapp/locales/en.json | 21 +++++++++++++++++++ webapp/pages/post/_id/_slug/index.vue | 5 +++++ 5 files changed, 57 insertions(+) diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue index b7d71de2d..24df0c179 100644 --- a/webapp/components/CategoriesSelect/CategoriesSelect.vue +++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue @@ -9,6 +9,11 @@ :disabled="isDisabled(category.id)" :icon="category.icon" size="small" + v-tooltip="{ + content: $t(`contribution.category.description.${category.slug}`), + placement: 'bottom-start', + delay: { show: 500 }, + }" > {{ $t(`contribution.category.name.${category.slug}`) }} diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue index 6ed37d4b3..23213929b 100644 --- a/webapp/components/FilterMenu/CategoriesFilter.vue +++ b/webapp/components/FilterMenu/CategoriesFilter.vue @@ -17,6 +17,11 @@ :filled="filteredCategoryIds.includes(category.id)" :label="$t(`contribution.category.name.${category.slug}`)" @click="toggleCategory(category.id)" + v-tooltip="{ + content: $t(`contribution.category.description.${category.slug}`), + placement: 'bottom-start', + delay: { show: 500 }, + }" /> diff --git a/webapp/locales/de.json b/webapp/locales/de.json index bc0b720c8..654376b4d 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -217,6 +217,27 @@ "infoSelectedNoOfMaxCategories": "{chosen} von {max} Themen ausgewΓ€hlt" }, "category": { + "description": { + "body-and-excercise": "Sport, Yoga, Massage, Tanzen, Entspannung", + "children": "Familie, PΓ€dagogik, Schule, PrΓ€gung", + "culture": "Kunst, Theater, Musik, Fotografie, Film", + "economy": "Handel, Konsum, Marketing, Lieferketten", + "energy": "Γ–l, Gas, Kohle, Wind, Wasserkraft, Biogas, Atomenergie", + "finance": "Geld, Finanzsystem, AlternativwΓ€hrungen", + "health": "Medizin, ErnΓ€hrung, WHO, Impfungen, Schadstoffe", + "home": "Bauen, Lebensgemeinschaften, Tiny Houses, GemΓΌsegarten", + "it-and-media": "Nachrichten, Manipulation, Datenschutz, Überwachung, Datenkraken, KI, Software, Apps", + "law": "Menschenrechte, Gesetze, Verordnungen", + "miscellaneous": "Miscellaneous", + "mobility": "Reise, Verkehr, ElektromobilitΓ€t", + "nature": "Tiere, Pflanzen, Landwirtschaft, Γ–kologie, Artenvielfalt", + "networking": "Kooperation, AktionsbΓΌndnisse, SolidaritΓ€t, Hilfe", + "peace": "Krieg, MilitΓ€r, soziale Verteidigung, Waffen, Cyberattacken", + "politics": "Demokratie, Mitbestimmung, Wahlen, Korruption, Parteien", + "psyche": "Seele, GefΓΌhle, GlΓΌck", + "science": "Bildung, Hochschule, Publikationen", + "spirituality": "Religion, Werte, Ethik" + }, "name": { "body-and-excercise": "KΓΆrper & Bewegung", "children": "Kinder", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index b3555378f..f2a6c3fc2 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -217,6 +217,27 @@ "infoSelectedNoOfMaxCategories": "{chosen} of {max} topics selected" }, "category": { + "description": { + "body-and-excercise": "Sports, yoga, massage, relaxation", + "children": "Family, education, school, imprinting", + "culture": "Art, theatre, music, photography, film", + "economy": "Trade, consumption, marketing, supply chains", + "energy": "Oil, gas, coal, wind, hydrodynamic power, biogas, atomic energy", + "finance": "Money, financial system, alternative currencies", + "health": "Medicine, nutrition, WHO, vaccination, harmful substances", + "home": "Construction, communities, tiny houses, kitchen garden", + "it-and-media": "News, manipulation, privacy, control, data leeches, AI, software, apps", + "law": "Human rights, laws, decrees", + "miscellaneous": "Miscellaneous", + "mobility": "Travel, traffic, electric mobility", + "nature": "Animals, plants, agriculture, ecologu, biodiversity", + "networking": "Cooperation, action alliances, solidarity, help", + "peace": "War, military, social defence, arms, cyber attacks", + "politics": "Democracy, participation, elections, corruption, parties", + "psyche": "Soul, feelings, happiness", + "science": "Education, university, publications", + "spirituality": "Religion, values, ethics" + }, "name": { "body-and-excercise": "Body & Excercise", "children": "Children", diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index d02a448da..30268778d 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -54,6 +54,11 @@ :key="category.id" :icon="category.icon" :name="$t(`contribution.category.name.${category.slug}`)" + v-tooltip="{ + content: $t(`contribution.category.description.${category.slug}`), + placement: 'bottom-start', + delay: { show: 500 }, + }" />
From ba9a6fd750d273b01c7ef188b343d2579a517ac8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 15 Sep 2022 09:25:46 +0200 Subject: [PATCH 08/22] Update webapp/locales/de.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 654376b4d..753b2e9d1 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -228,7 +228,7 @@ "home": "Bauen, Lebensgemeinschaften, Tiny Houses, GemΓΌsegarten", "it-and-media": "Nachrichten, Manipulation, Datenschutz, Überwachung, Datenkraken, KI, Software, Apps", "law": "Menschenrechte, Gesetze, Verordnungen", - "miscellaneous": "Miscellaneous", + "miscellaneous": "Sonstiges", "mobility": "Reise, Verkehr, ElektromobilitΓ€t", "nature": "Tiere, Pflanzen, Landwirtschaft, Γ–kologie, Artenvielfalt", "networking": "Kooperation, AktionsbΓΌndnisse, SolidaritΓ€t, Hilfe", From 64153ea9e3fe0fd6a1a1dee2c2ed4c9df7914679 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 15 Sep 2022 10:04:26 +0200 Subject: [PATCH 09/22] change delay of category tooltip to 1500 --- webapp/components/CategoriesSelect/CategoriesSelect.vue | 2 +- webapp/components/FilterMenu/CategoriesFilter.vue | 2 +- webapp/components/PostTeaser/PostTeaser.vue | 2 +- webapp/pages/post/_id/_slug/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue index 24df0c179..92779444f 100644 --- a/webapp/components/CategoriesSelect/CategoriesSelect.vue +++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue @@ -12,7 +12,7 @@ v-tooltip="{ content: $t(`contribution.category.description.${category.slug}`), placement: 'bottom-start', - delay: { show: 500 }, + delay: { show: 1500 }, }" > {{ $t(`contribution.category.name.${category.slug}`) }} diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue index 23213929b..552aa26a0 100644 --- a/webapp/components/FilterMenu/CategoriesFilter.vue +++ b/webapp/components/FilterMenu/CategoriesFilter.vue @@ -20,7 +20,7 @@ v-tooltip="{ content: $t(`contribution.category.description.${category.slug}`), placement: 'bottom-start', - delay: { show: 500 }, + delay: { show: 1500 }, }" /> diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue index a973ca31f..75eefbfb2 100644 --- a/webapp/components/PostTeaser/PostTeaser.vue +++ b/webapp/components/PostTeaser/PostTeaser.vue @@ -33,7 +33,7 @@ v-tooltip="{ content: $t(`contribution.category.name.${category.slug}`), placement: 'bottom-start', - delay: { show: 500 }, + delay: { show: 1500 }, }" :icon="category.icon" /> diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 30268778d..ff5c9a498 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -57,7 +57,7 @@ v-tooltip="{ content: $t(`contribution.category.description.${category.slug}`), placement: 'bottom-start', - delay: { show: 500 }, + delay: { show: 1500 }, }" />
From 8b62b624ac9ed75405e9ffffe2ca3bcfe7b006f7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 20 Sep 2022 10:19:02 +0200 Subject: [PATCH 10/22] refactor header menu, add svg logos --- webapp/assets/styles/imports/_branding.scss | 19 +++++++++++++----- webapp/constants/headerMenu.js | 10 ---------- webapp/static/img/custom/logo-horizontal.svg | 21 +++++++++----------- webapp/static/img/custom/logo-squared.svg | 21 +++++++++----------- 4 files changed, 32 insertions(+), 39 deletions(-) diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index 103ae9243..c0a94e900 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -1,20 +1,20 @@ .main-navigation { - background-color: #748885; + background-color: #6e8b87; } .main-navigation .ds-menu-item-link { - color: #c8fc4f;; + color: #a6ff00; } .main-navigation .ds-menu-item-link:hover { - color: #f2f2f1;; + color: #f2f2f1; } .main-navigation .locale-menu { - color: #c8fc4f;; + color: #a6ff00; } .base-button { - color: #c8fc4f; + color: #a6ff00; } .header-menu { @@ -22,4 +22,13 @@ } .ds-menu-item-link { color: antiquewhite; +} +.ds-menu-item-link.router-link-exact-active { + color: #a6ff00; + background-color: #faf9fa; + border-left: 2px solid #a6ff00; +} + +.ds-menu-item-navbar.ds-menu-item-show-submenu.ds-menu-item-level-0>.ds-menu-item-link { + color: #ffffff; } \ No newline at end of file diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 06eae4109..ee3451443 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -12,16 +12,6 @@ export default { { name: 'Gruppen', path: '/#', - children: [ - { - name: 'Gruppe 1', - path: '/#', - }, - { - name: 'Gruppe 2', - path: '/#', - }, - ], }, { name: 'Über Yunite', diff --git a/webapp/static/img/custom/logo-horizontal.svg b/webapp/static/img/custom/logo-horizontal.svg index 9ad368b9b..e85e839c0 100644 --- a/webapp/static/img/custom/logo-horizontal.svg +++ b/webapp/static/img/custom/logo-horizontal.svg @@ -1,18 +1,15 @@ - - - - - - - - - + + + + + + + + + - - - diff --git a/webapp/static/img/custom/logo-squared.svg b/webapp/static/img/custom/logo-squared.svg index 6ed4a3f62..6c12acd28 100644 --- a/webapp/static/img/custom/logo-squared.svg +++ b/webapp/static/img/custom/logo-squared.svg @@ -1,18 +1,15 @@ - - - - - - - - - + + + + + + + + + - - - From 52070b8c570970bf48df561134bf67cb4111b640 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 20 Sep 2022 16:03:06 +0200 Subject: [PATCH 11/22] change color and scss in branding --- webapp/assets/styles/imports/_branding.scss | 13 +++-- .../components/FilterMenu/CategoriesMenu.vue | 7 ++- webapp/components/HeaderMenu/HeaderMenu.vue | 29 +++++++++- .../_new/generic/BaseButton/BaseButton.vue | 2 + webapp/constants/headerMenu.js | 41 ++++++++------ webapp/layouts/default.vue | 56 ++++++++++++------- webapp/pages/settings/index.vue | 1 + 7 files changed, 100 insertions(+), 49 deletions(-) diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index c0a94e900..473091f8c 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -4,11 +4,17 @@ .main-navigation .ds-menu-item-link { color: #a6ff00; } - .main-navigation .ds-menu-item-link:hover { color: #f2f2f1; } +.main-navigation a { + color: #a6ff00; +} +.main-navigation a:hover { + color: #ffffff; +} + .main-navigation .locale-menu { color: #a6ff00; } @@ -17,14 +23,11 @@ color: #a6ff00; } -.header-menu { - // background-color: #748885; -} .ds-menu-item-link { color: antiquewhite; } .ds-menu-item-link.router-link-exact-active { - color: #a6ff00; + color: #6a8ee1; background-color: #faf9fa; border-left: 2px solid #a6ff00; } diff --git a/webapp/components/FilterMenu/CategoriesMenu.vue b/webapp/components/FilterMenu/CategoriesMenu.vue index 37bd19c84..e38125bef 100644 --- a/webapp/components/FilterMenu/CategoriesMenu.vue +++ b/webapp/components/FilterMenu/CategoriesMenu.vue @@ -1,14 +1,15 @@

{{ $t('filter-menu.filter-by') }}

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 31afe93b4..a10d18bbc 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -1,6 +1,21 @@ + diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue index d87598d76..e6248d6aa 100644 --- a/webapp/components/_new/generic/BaseButton/BaseButton.vue +++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue @@ -79,6 +79,7 @@ export default { diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index ee3451443..0455290d1 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -5,27 +5,32 @@ export default { name: 'BeitrÀge', path: '/#', }, - { - name: 'Themen', - path: '/#', - }, - { - name: 'Gruppen', - path: '/#', - }, + // { + // name: 'Themen', + // path: '/#', + // }, + // { + // name: 'Gruppen', + // path: '/#', + // }, { name: 'Über Yunite', path: '/#', - children: [ - { - name: 'Impressum', - path: '/#', - }, - { - name: 'Yunite Team', - path: '/#', - }, - ], + url: 'https://yunite.org', + // children: [ + // { + // name: 'Impressum', + // path: '/#', + // }, + // { + // name: 'Yunite Team', + // path: '/#', + // }, + // ], }, + // { + // name: 'Topic', + // path: '/#', + // }, ], } diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index be8a0834b..2a9ba47bf 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -4,12 +4,33 @@
- - - + + + - + + + + + {{ item.name }} + + + + + {{ item.name }} + + + + + + + + - - - - - import Logo from '~/components/Logo/Logo' -import HeaderMenu from '~/components/HeaderMenu/HeaderMenu.vue' import headerMenu from '../constants/headerMenu.js' import { mapGetters } from 'vuex' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' @@ -112,7 +123,6 @@ import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu.vue' export default { components: { Logo, - HeaderMenu, LocaleSwitch, SearchField, Modal, @@ -127,6 +137,7 @@ export default { data() { return { show: headerMenu.SHOW_HEADER_MENU, + menu: headerMenu.MENU, mobileSearchVisible: false, toggleMobileMenu: false, inviteRegistration: this.$env.INVITE_REGISTRATION === true, // for 'false' in .env INVITE_REGISTRATION is of type undefined and not(!) boolean false, because of internal handling, @@ -151,6 +162,14 @@ export default { diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 329f9d8a1..b41770926 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -168,6 +168,9 @@ export default { diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue index 622bf1ce9..2535ca145 100644 --- a/webapp/components/LocaleSwitch/LocaleSwitch.vue +++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue @@ -117,6 +117,7 @@ export default { align-items: center; height: 100%; padding: $space-xx-small; + color: $color-locale-menu; > .label { margin: 0 $space-xx-small; From 5f5c0faa1f28cd4df7681eba335ae5998b2d9cca Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Sep 2022 17:52:03 +0200 Subject: [PATCH 18/22] cleanup refactor rebranding --- webapp/components/Logo/Logo.vue | 6 +- webapp/components/Logo/style.scss | 6 -- webapp/constants/headerMenu.js | 29 +------- webapp/constants/links.js | 18 ++--- webapp/constants/logos.js | 1 + webapp/layouts/default.vue | 10 +-- webapp/static/img/custom/logo-horizontal.svg | 64 +++++++++++++++--- webapp/static/img/custom/logo-squared.svg | 70 +++++++++++++++++--- 8 files changed, 139 insertions(+), 65 deletions(-) diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index 6e4dd3cbc..748af46a8 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -59,7 +59,7 @@ export default { }, data() { const logosObject = { - header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: '47px' }, + header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: logos.LOGO_HEADER_WIDTH }, welcome: { path: logos.LOGO_WELCOME_PATH, alt: 'Welcome', widthDefault: '200px' }, signup: { path: logos.LOGO_SIGNUP_PATH, alt: 'Sign Up', widthDefault: '200px' }, logout: { path: logos.LOGO_LOGOUT_PATH, alt: 'Logging Out', widthDefault: '200px' }, @@ -90,6 +90,9 @@ export default { return `width: ${width};` }, }, + created() { + console.log('logoWidth', this.logoWidth) + }, } @@ -107,7 +110,6 @@ export default { } .ds-logo-svg { - width: 47px; height: auto; fill: #000000; } diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss index aa153c8f6..69897422f 100644 --- a/webapp/components/Logo/style.scss +++ b/webapp/components/Logo/style.scss @@ -8,10 +8,4 @@ .ds-logo-inverse { color: $text-color-primary-inverse; -} - -.ds-logo-svg { - width: 47px; - height: auto; - fill: currentColor; } \ No newline at end of file diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 0455290d1..7055c44e5 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,36 +1,13 @@ export default { - SHOW_HEADER_MENU: true, MENU: [ - { - name: 'BeitrÀge', - path: '/#', - }, // { - // name: 'Themen', - // path: '/#', - // }, - // { - // name: 'Gruppen', + // name: 'BeitrÀge', // path: '/#', // }, - { - name: 'Über Yunite', - path: '/#', - url: 'https://yunite.org', - // children: [ - // { - // name: 'Impressum', - // path: '/#', - // }, - // { - // name: 'Yunite Team', - // path: '/#', - // }, - // ], - }, // { - // name: 'Topic', + // name: 'Über Yunite', // path: '/#', + // url: 'https://yunite.org', // }, ], } diff --git a/webapp/constants/links.js b/webapp/constants/links.js index 09dba8629..c65c9be3c 100644 --- a/webapp/constants/links.js +++ b/webapp/constants/links.js @@ -3,7 +3,7 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ - externalLink: 'https://yunite.org', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.made', // localized string identifier, if undefined default is used @@ -17,7 +17,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.donate', // localized string identifier, if undefined default is used @@ -31,7 +31,7 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ }) const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used @@ -57,7 +57,7 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri }, }) const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ - externalLink: 'https://yunite.org/ueber-yunite/unsere-werte/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used @@ -70,7 +70,7 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ }, }) const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ - externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used @@ -83,7 +83,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ }, }) const FAQ = defaultPageParamsPages.FAQ.overwrite({ - externalLink: 'https://yunite.org/ueber-yunite/faq-hilfe/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.faq', // localized string identifier, if undefined default is used @@ -125,12 +125,12 @@ export default { FOOTER_LINK_LIST: [ ORGANIZATION, - // TERMS_AND_CONDITIONS, + TERMS_AND_CONDITIONS, CODE_OF_CONDUCT, DATA_PRIVACY, FAQ, - // DONATE, - // SUPPORT, + DONATE, + SUPPORT, IMPRINT, ], } diff --git a/webapp/constants/logos.js b/webapp/constants/logos.js index d093c7b46..2bea199da 100644 --- a/webapp/constants/logos.js +++ b/webapp/constants/logos.js @@ -2,6 +2,7 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_WIDTH: '130px', LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index b41770926..3e2a4aa69 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -4,7 +4,7 @@
- + @@ -47,8 +47,8 @@ :width="{ base: '45%', sm: '45%', - md: show ? 'auto' : '45%', - lg: show ? 'auto' : '50%', + md: isHeaderMenu ? 'auto' : '45%', + lg: isHeaderMenu ? 'auto' : '50%', }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }" style="flex-shrink: 0; flex-grow: 1" @@ -113,6 +113,7 @@ From 1af5ce9e3015c6869541a1cc34489ada16e35803 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Sep 2022 18:20:13 +0200 Subject: [PATCH 20/22] =?UTF-8?q?add=20=1B[200~.ds-footer=20a=20{scss=20to?= =?UTF-8?q?ken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/assets/_new/styles/tokens.scss | 1 + webapp/components/PageFooter/PageFooter.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index 7f6c0a7a3..caca5953f 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -368,6 +368,7 @@ $color-header-background: $color-neutral-100; */ $color-footer-background: $color-neutral-100; +$color-footer-link: $color-primary; /** * @tokens Locale Menu Color diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index 67659e137..c71fc4b5c 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -44,7 +44,7 @@ export default { box-shadow: 0px -6px 12px -4px rgba(0, 0, 0, 0.1); } .ds-footer a { - color: #6e8b87; + color: $color-footer-link; } .division-line { margin-left: 0.2rem; From 858739eaa00b62c8095c0fe5b0d630eb25bd0d47 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Sep 2022 18:42:58 +0200 Subject: [PATCH 21/22] fix review --- backend/src/schema/resolvers/users/location.spec.js | 2 +- webapp/assets/_new/styles/tokens.scss | 2 +- webapp/components/FilterMenu/CategoriesMenu.vue | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 92f08893e..c0525ca1c 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -121,7 +121,7 @@ describe('Location Service', () => { const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual( expect.arrayContaining([ - { id: 'place.14094307404564380', place_name: 'Berlin, Germany' }, + { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Germany' }, { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Maryland, United States', diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index caca5953f..6aa6410df 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -374,4 +374,4 @@ $color-footer-link: $color-primary; * @tokens Locale Menu Color */ - $color-locale-menu: $text-color-soft; \ No newline at end of file +$color-locale-menu: $text-color-soft; \ No newline at end of file diff --git a/webapp/components/FilterMenu/CategoriesMenu.vue b/webapp/components/FilterMenu/CategoriesMenu.vue index a9a36496b..0b5505503 100644 --- a/webapp/components/FilterMenu/CategoriesMenu.vue +++ b/webapp/components/FilterMenu/CategoriesMenu.vue @@ -1,13 +1,6 @@