From b57f5e253c4d6ce7e8339ac371880b19ded76483 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 14 Sep 2022 11:25:43 +0200
Subject: [PATCH] add following event and emit

---
 webapp/components/Group/GroupList.vue | 97 ++++++++++++++-------------
 webapp/components/Group/GroupMenu.vue |  9 +--
 webapp/graphql/groups.js              | 11 +++
 3 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 714dd8c43..30351ae83 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -1,59 +1,49 @@
 <template>
-  <div>
     <ds-container class="group-card">
       <ds-space>
-        <div @click="onlyOwnerGroups(true)" ref="myGruops">show only my groups</div>
-        <div @click="onlyOwnerGroups(false)" ref="allGruops" hidden>show all groups</div>
+        <div @click="onlyOwnerGroups(true)" ref="myGruops"><ds-button >show only my groups</ds-button ></div>
+        <div @click="onlyOwnerGroups(false)" ref="allGruops" hidden><ds-button >show all groups</ds-button ></div>
       </ds-space>
-      <ds-flex
-        v-for="item in items"
-        :key="item.id"
-        class="border-bottom"
-        :ref="item.myRole === null ? 'null' : item.myRole"
-      >
-        <ds-flex-item width="90%" centered>
-          {{ item.myRole }}
-          <ds-space margin="large">
-            <nuxt-link :to="`/group/${item.id}`">
-              <ds-text size="x-large">{{ item.name }}</ds-text>
-            </nuxt-link>
-
-            <ds-chip v-if="item.groupType === 'public'" color="primary">
-              {{ item.groupType }}
-            </ds-chip>
-            <ds-chip v-if="item.groupType === 'hidden'" color="warning">
-              {{ item.groupType }}
-            </ds-chip>
-            <ds-chip v-if="item.groupType === 'closed'" color="danger">
-              {{ item.groupType }}
-            </ds-chip>
-            <ds-chip v-if="item.myRole === 'owner'" color="inverse">{{ item.myRole }}</ds-chip>
-            <ds-chip v-if="item.myRole === 'usual' || item.myRole === 'pending'">
-              {{ item.myRole }}
-            </ds-chip>
-
-            <div>
+      <ds-space margin-bottom="small" v-for="item in items" :key="item.id"> 
+        <ds-card  :ref="item.myRole === null ? 'null' : item.myRole">
+          <ds-flex>
+            <ds-flex-item width="90%" centered>
+              <ds-space margin="large">
+              <nuxt-link :to="`/group/${item.id}`">
+                <ds-text size="x-large">{{ item.name }}</ds-text>
+              </nuxt-link> 
+              <ds-text size="small">
+                {{ item.groupType }}
+                <ds-chip v-if="item.myRole === 'owner'" color="inverse">{{ item.myRole }}</ds-chip>
+                <ds-chip v-if="item.myRole === 'usual' || item.myRole === 'pending'">
+                  {{ item.myRole }}
+                </ds-chip>
+              </ds-text>
               <ds-space margin-top="small">
-                {{ item.about }}
+                <ds-text bold>{{ item.about }}</ds-text> 
               </ds-space>
-            </div>
-            <ds-space margin-top="small">
-              <ds-chip v-for="category in item.categories" :key="category.name">
+              <ds-space margin-top="small">
+                {{ item.description }}
+              </ds-space>
+              <ds-space margin-top="small">
+                <ds-chip v-for="category in item.categories" :key="category.name">
                 <ds-icon :name="category.icon"></ds-icon>
-                {{ category.name }}
-              </ds-chip>
+                  {{ category.name }}
+                </ds-chip>
+              </ds-space>
             </ds-space>
-          </ds-space>
-        </ds-flex-item>
-        <ds-flex-item width="10%" centered>
-          <group-menu resource-type="group" :resource="item" :isOwner="item.myRole" />
-        </ds-flex-item>
-      </ds-flex>
-    </ds-container>
-  </div>
+          </ds-flex-item>
+          <ds-flex-item width="10%" centered>
+            <group-menu resource-type="group" :resource="item" :isOwner="item.myRole" @joinGroup="joinGroup"/>
+          </ds-flex-item>
+        </ds-flex>
+      </ds-card>
+    </ds-space>
+  </ds-container>
 </template>
 <script>
 import GroupMenu from '~/components/Group/GroupMenu'
+import { joinGroupMutation } from '~/graphql/groups.js'
 
 export default {
   name: 'GroupList',
@@ -76,9 +66,24 @@ export default {
     unfollowGroup() {
       alert('unfollow group')
     },
-    addMemeberToGroup() {
+    async joinGroup(value) {
       alert('addMemeberToGroup group')
+      console.log(value)
+      console.log(this.$store.getters['auth/user'].id)
+
+      const { id } = value
+      const variables = { groupId: id, userId: this.$store.getters['auth/user'].id }
+      try {
+         await this.$apollo.mutate({
+           mutation: joinGroupMutation,
+           variables,
+         })
+        this.$toast.success(this.$t('group.group-created'))
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
     },
+   
     onlyOwnerGroups(bool) {
       this.$refs.myGruops.hidden = bool
       this.$refs.allGruops.hidden = !bool
diff --git a/webapp/components/Group/GroupMenu.vue b/webapp/components/Group/GroupMenu.vue
index 171a876af..deed94e75 100644
--- a/webapp/components/Group/GroupMenu.vue
+++ b/webapp/components/Group/GroupMenu.vue
@@ -16,6 +16,7 @@
       <div class="group-menu-popover">
         <ds-menu :routes="routes">
           <template #menuitem="item">
+            {{item.parents}}
             <ds-menu-item
               :route="item.route"
               :parents="item.parents"
@@ -40,7 +41,7 @@ export default {
     Dropdown,
   },
   props: {
-    placement: { type: String, default: 'top-end' },
+    placement: { type: String, default: 'bottom-end' },
     resource: { type: Object, required: true },
     isOwner: { type: String, default: null },
     resourceType: {
@@ -67,7 +68,7 @@ export default {
           routes.push({
             label: 'Unfollowing',
             callback: () => {
-              this.unfollowGroup(this.resource)
+              // this.$emit('join-group', this.resource)
             },
             icon: 'minus',
           })
@@ -76,7 +77,7 @@ export default {
           routes.push({
             label: 'Unfollowing',
             callback: () => {
-              this.removePending(this.resource)
+              // this.removePending(this.resource)
             },
             icon: 'minus',
           })
@@ -85,7 +86,7 @@ export default {
           routes.push({
             label: 'Following',
             callback: () => {
-              this.addMemeberToGroup(this.resource)
+                this.$emit('joinGroup', this.resource)
             },
             icon: 'plus',
           })
diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js
index ff63f1a25..e650bd83e 100644
--- a/webapp/graphql/groups.js
+++ b/webapp/graphql/groups.js
@@ -106,6 +106,17 @@ export const joinGroupMutation = gql`
   }
 `
 
+export const leaveGroupMutation = gql`
+  mutation ($groupId: ID!, $userId: ID!) {
+    LeaveGroup(groupId: $groupId, userId: $userId) {
+      id
+      name
+      slug
+      myRoleInGroup
+    }
+  }
+`
+
 export const changeGroupMemberRoleMutation = gql`
   mutation ($groupId: ID!, $userId: ID!, $roleInGroup: GroupMemberRole!) {
     ChangeGroupMemberRole(groupId: $groupId, userId: $userId, roleInGroup: $roleInGroup) {