From 60302c08d75411d459194262ef6bbea731ffdfcb Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 9 Aug 2022 11:52:28 +0200 Subject: [PATCH 001/111] 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 002/111] 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 003/111] 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 004/111] 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 005/111] 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 006/111] 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: Mon, 12 Sep 2022 13:16:55 +0200 Subject: [PATCH 007/111] member management first step --- webapp/components/Group/GroupMember.vue | 91 ++++++++++++++++--------- webapp/pages/group/edit/_id/members.vue | 36 +++++++++- 2 files changed, 92 insertions(+), 35 deletions(-) diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue index f522ee795..f1113f5eb 100644 --- a/webapp/components/Group/GroupMember.vue +++ b/webapp/components/Group/GroupMember.vue @@ -1,56 +1,83 @@ diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 1cb7ca34c..01f5f906c 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -32,21 +32,21 @@ > - - + + - - + + Reset form 0 - ) { + this.formData.name !== '' && + this.formData.groupType !== '' && + this.formData.about !== '' && + this.formData.description !== '' && + this.formData.actionRadius !== '' && + this.formData.categoryIds.length > 0 + ) { return false } return true }, submitDisableEdit() { - if ( - this.formData.name !== this.group.name - || this.formData.groupType !== this.group.groupType - || this.formData.about !== this.group.about - || this.formData.description !== this.group.description - || this.formData.actionRadius !== this.group.actionRadius - || this.formData.categoryIds.length === 0 - || !this.sameCategories - ) { + this.formData.name !== this.group.name || + this.formData.groupType !== this.group.groupType || + this.formData.about !== this.group.about || + this.formData.description !== this.group.description || + this.formData.actionRadius !== this.group.actionRadius || + this.formData.categoryIds.length === 0 || + !this.sameCategories + ) { return false } return true }, - sameCategories(){ - let formDataCategories = this.formData.categoryIds.map((categoryIds) => categoryIds) - let groupDataCategories = this.group.categories.map((category) => category.id) + sameCategories() { + const formDataCategories = this.formData.categoryIds.map((categoryIds) => categoryIds) + const groupDataCategories = this.group.categories.map((category) => category.id) let result let each = true if (formDataCategories.length !== groupDataCategories.length) return false if (JSON.stringify(formDataCategories) !== JSON.stringify(groupDataCategories)) { - formDataCategories.forEach(element => { - result = groupDataCategories.filter(groupCategorieId => groupCategorieId === element) + formDataCategories.forEach((element) => { + result = groupDataCategories.filter((groupCategorieId) => groupCategorieId === element) if (result.length === 0) each = false }) return each } return true - } - } + }, + }, } diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index 8d0583e5a..714dd8c43 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -1,47 +1,54 @@ @@ -72,33 +79,28 @@ export default { addMemeberToGroup() { alert('addMemeberToGroup group') }, - onlyOwnerGroups(bool){ - console.log('bool', bool) - console.log('this.$refs.usual', this.$refs.usual) - console.log('this.$refs.pending', this.$refs.pending) - console.log('this.$refs.null', this.$refs.null) - - this.$refs.myGruops.hidden = bool - this.$refs.allGruops.hidden = !bool - + onlyOwnerGroups(bool) { + this.$refs.myGruops.hidden = bool + this.$refs.allGruops.hidden = !bool if (this.$refs.usual) { - this.$refs.usual.forEach(element => { - element.$el.hidden = bool}) - } + this.$refs.usual.forEach((element) => { + element.$el.hidden = bool + }) + } - - if (this.$refs.null) { - this.$refs.null.forEach(element => { - element.$el.hidden = bool}) - } + if (this.$refs.null) { + this.$refs.null.forEach((element) => { + element.$el.hidden = bool + }) + } - if (this.$refs.pending) { - this.$refs.pending.forEach(element => { - element.$el.hidden = bool}) - } - - } + if (this.$refs.pending) { + this.$refs.pending.forEach((element) => { + element.$el.hidden = bool + }) + } + }, }, } diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue index a2a561ac7..00c3a4094 100644 --- a/webapp/components/Group/GroupMember.vue +++ b/webapp/components/Group/GroupMember.vue @@ -2,33 +2,33 @@

Members

 - - - + + + { + label: 'Unfollowing', + callback: () => { this.unfollowGroup(this.resource) }, - icon: 'minus', - }) + icon: 'minus', + }) } if (this.isOwner === 'pending') { routes.push({ - label: 'Unfollowing', - callback: () => { + label: 'Unfollowing', + callback: () => { this.removePending(this.resource) }, - icon: 'minus', - }) + icon: 'minus', + }) } if (this.isOwner === null) { routes.push({ - label: 'Following', - callback: () => { + label: 'Following', + callback: () => { this.addMemeberToGroup(this.resource) }, - icon: 'plus', - }) + icon: 'plus', + }) } } diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 06d2cce66..153e83c3c 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -105,7 +105,6 @@ import InviteButton from '~/components/InviteButton/InviteButton' import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu.vue' import GroupButton from '~/components/Group/GroupButton.vue' - export default { components: { Logo, diff --git a/webapp/pages/group/create.vue b/webapp/pages/group/create.vue index a5f178e92..5eaff8f91 100644 --- a/webapp/pages/group/create.vue +++ b/webapp/pages/group/create.vue @@ -1,15 +1,16 @@ diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue index 039342e5e..aa6fc6539 100644 --- a/webapp/pages/group/edit/_id.vue +++ b/webapp/pages/group/edit/_id.vue @@ -1,20 +1,21 @@