From a1da04ec050b7daa7ed63ba5b592f96b55380a80 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 9 Sep 2022 13:06:13 +0200
Subject: [PATCH] change components add constants

---
 .../CategoriesSelect/CategoriesSelect.vue     |  3 ++-
 webapp/components/Group/GroupCard.vue         |  2 +-
 webapp/components/Group/GroupForm.vue         |  6 +++--
 webapp/constants/groups.js                    |  2 ++
 webapp/pages/group/edit/_id.vue               |  4 ++--
 webapp/pages/group/edit/_id/members.vue       | 24 +++++++++----------
 webapp/pages/{group => }/my-groups.vue        |  0
 webapp/pages/settings.vue                     |  2 +-
 8 files changed, 24 insertions(+), 19 deletions(-)
 rename webapp/pages/{group => }/my-groups.vue (100%)

diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue
index b7d71de2d..48852d009 100644
--- a/webapp/components/CategoriesSelect/CategoriesSelect.vue
+++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue
@@ -17,6 +17,7 @@
 
 <script>
 import CategoryQuery from '~/graphql/CategoryQuery'
+import { CATEGORIES_MAX } from '~/constants/categories.js'
 import xor from 'lodash/xor'
 
 export default {
@@ -32,7 +33,7 @@ export default {
   data() {
     return {
       categories: null,
-      selectedMax: 3,
+      selectedMax: CATEGORIES_MAX,
       selectedCategoryIds: this.existingCategoryIds,
     }
   },
diff --git a/webapp/components/Group/GroupCard.vue b/webapp/components/Group/GroupCard.vue
index f5a4970fa..81e593cce 100644
--- a/webapp/components/Group/GroupCard.vue
+++ b/webapp/components/Group/GroupCard.vue
@@ -3,7 +3,7 @@
     <ds-container class="group-card">
       <ds-page-title heading="Groups"></ds-page-title>
       <ds-card v-for="item in items" :key="item.id" space="xx-small">
-        <nuxt-link to="/group/g1/testgruppe">{{ item.name }}</nuxt-link>
+        <nuxt-link :to="`/group/${item.id}`">{{ item.name }}</nuxt-link>
         {{ item.categories ? item.categories.map((category) => category.name) : [] }}
         <div>{{ item }}</div>
         <ds-space>
diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index 4d4593a7b..dac2a6b72 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -68,6 +68,8 @@
 
 <script>
 import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
+import { CATEGORIES_MIN, CATEGORIES_MAX } from '~/constants/categories.js'
+import { NAME_LENGTH_MIN, NAME_LENGTH_MAX } from '~/constants/groups.js'
 
 export default {
   name: 'GroupForm',
@@ -100,7 +102,7 @@ export default {
         categoryIds: categories ? categories.map((category) => category.id) : [],
       },
       formSchema: {
-        name: { required: true, min: 3, max: 100 },
+        name: { required: true, min: NAME_LENGTH_MIN, max: NAME_LENGTH_MAX },
         groupType: { required: true },
         about: { required: true },
         description: { required: true },
@@ -109,7 +111,7 @@ export default {
           type: 'array',
           required: this.categoriesActive,
           validator: (_, value = []) => {
-            if (this.categoriesActive && (value.length === 0 || value.length > 3)) {
+            if (this.categoriesActive && (value.length < CATEGORIES_MIN || value.length > CATEGORIES_MAX)) {
               return [new Error(this.$t('common.validations.categories'))]
             }
             return []
diff --git a/webapp/constants/groups.js b/webapp/constants/groups.js
index b4a6063f1..d3eeb03cf 100644
--- a/webapp/constants/groups.js
+++ b/webapp/constants/groups.js
@@ -1,2 +1,4 @@
 // this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js`
+export const NAME_LENGTH_MIN = 3
+export const NAME_LENGTH_MAX = 50 
 export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags
diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue
index 4d8f3d7ad..4e3beedc0 100644
--- a/webapp/pages/group/edit/_id.vue
+++ b/webapp/pages/group/edit/_id.vue
@@ -12,8 +12,8 @@
       </ds-flex-item>
     </ds-flex>
     <ds-space centered>
-        <nuxt-link to="/group/my-groups">zurück</nuxt-link>
-      </ds-space>
+      <nuxt-link to="/group/my-groups">zurück</nuxt-link>
+    </ds-space>
   </div>
 </template>
 
diff --git a/webapp/pages/group/edit/_id/members.vue b/webapp/pages/group/edit/_id/members.vue
index fa22b19c9..3902137f0 100644
--- a/webapp/pages/group/edit/_id/members.vue
+++ b/webapp/pages/group/edit/_id/members.vue
@@ -1,16 +1,16 @@
 <template>
-    <div>
-      <ds-container>
-        <group-member />
-      </ds-container>
-    </div>
-  </template>
-  
-  <script>
-  import GroupMember from '~/components/Group/GroupMember'
+  <div>
+    <ds-container>
+      <group-member />
+    </ds-container>
+  </div>
+</template>
+
+<script>
+import GroupMember from '~/components/Group/GroupMember'
 export default {
-    components: {
-        GroupMember,
-    }
+  components: {
+    GroupMember,
+  },
 }
 </script>
diff --git a/webapp/pages/group/my-groups.vue b/webapp/pages/my-groups.vue
similarity index 100%
rename from webapp/pages/group/my-groups.vue
rename to webapp/pages/my-groups.vue
diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue
index 96ea66976..660449fb6 100644
--- a/webapp/pages/settings.vue
+++ b/webapp/pages/settings.vue
@@ -41,7 +41,7 @@ export default {
         },
         {
           name: this.$t('settings.myGroups'),
-          path: `/group/my-groups`,
+          path: `/my-groups`,
         },
         {
           name: this.$t('settings.muted-users.name'),