From 405c1e6bb72f7e24213c2e54a7659d6afb9d1842 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Mon, 13 May 2019 12:42:03 +0200
Subject: [PATCH] changes to team view

---
 frontend/src/pages/Profile.vue | 158 +++++++++++++++------------------
 1 file changed, 71 insertions(+), 87 deletions(-)

diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index c711f26..7de88cd 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -66,87 +66,78 @@
               </q-list>
             </q-btn-dropdown>
           </div>
-          <div v-show="boolMyTeam">
-            <p class="text-h5"> Teammitglieder </p>
-            <q-table
-              :data="teamData"
-              :columns="teamColumns"
-              row-key="name"
-              table-class="my-custom"
-              hide-bottom
-              :pagination.sync="pagination"
-            />
-            <br/>
-            <p class="text-h5"> Einladungen </p>
-            <q-input lazy-rules outlined filled stack-label v-model="inviteMail"
-                     type="text" label="Email des Nutzers"
-                     :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
-            <div align="center">
-              <q-btn label="Einladung versenden"
-                     @click="sendTeamInvite()"
-                     :disabled="!teamInviteChecked"
-                     color="primary"
-                     type="submit"/>
-            </div>
-            <br/>
-            <p class="text-h5"> Teamstatus </p>
-            <p>{{currentTeamStatus}}</p>
-            <q-input lazy-rules outlined filled stack-label v-model="teamStatus"
-                     type="text" label="Neuer Teamstatus"
-                     :rules="[val=>val.length<=160||'Status zu lang!']"/>
-            <div align="center">
-              <q-btn label="Teamstatus aktualisieren"
-                     :disabled="!teamStatusChecked"
-                     @click="setTeamStatus()"
-                     color="primary"
-                     type="submit"/>
-            </div>
-            <br/>
-            <q-input lazy-rules outlined filled stack-label v-model="leaveTeamCheck"
-                     type="text" label="BESTÄTIGEN eingeben um das Team zu verlassen"
-                     :rules="[val=>val==='BESTÄTIGEN'||'Schreibweise beachten']"/>
-            <div align="center">
-              <q-btn label="Team verlassen"
-                     :disabled="!leaveConfirmed"
-                     @click="leaveTeam()"
-                     color="negative"
-                     type="submit"/>
-            </div>
+          <p class="text-h5"> Teamstatus </p>
+          <p>{{currentTeamStatus}}</p>
+          <q-input lazy-rules outlined filled stack-label v-model="teamStatus"
+                   type="text" label="Neuer Teamstatus"
+                   :rules="[val=>val.length<=160||'Status zu lang!']"/>
+          <div align="center">
+            <q-btn label="Teamstatus aktualisieren"
+                   :disabled="!teamStatusChecked"
+                   @click="setTeamStatus()"
+                   color="primary"
+                   type="submit"/>
           </div>
-          <div v-show="boolInvites">
-            <q-list>
-              <q-card class="q-mb-md" v-for="teamInvite in teamInvites" :key="teamInvite.id">
-                <q-expansion-item
-                  class=""
-                  expand-icon-toggle
-                  expand-separator
-                  icon="group"
-                  :label="teamInvite.team.name"
-                  :caption="teamInvite.team.teamStatus"
-                >
-                  <q-item class="q-pr-sm reverse q-gutter-x-sm">
-                    <q-btn @click="joinTeam(teamInvite)" unelevated color="positive" stack icon="arrow_forward"
-                           label="Anfrage annehmen" size="sm"/>
-                    <q-btn @click="deleteTeamInvite(teamInvite)" unelevated color="negative" stack icon="delete"
-                           label="Anfrage ablehnen" size="sm"/>
-                  </q-item>
-                </q-expansion-item>
-              </q-card>
-            </q-list>
+          <br/>
+          <p class="text-h5"> Teammitglieder </p>
+          <q-table
+            :data="teamData"
+            :columns="teamColumns"
+            row-key="name"
+            table-class="my-custom"
+            hide-bottom
+            :pagination.sync="pagination"
+          />
+          <br/>
+          <p class="text-h5"> Einladungen </p>
+          <q-input lazy-rules outlined filled stack-label v-model="inviteMail"
+                   type="text" label="Email des Nutzers"
+                   :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
+          <div align="center">
+            <q-btn label="Einladung versenden"
+                   @click="sendTeamInvite()"
+                   :disabled="!teamInviteChecked"
+                   color="primary"
+                   type="submit"/>
           </div>
-          <div v-show="boolCreateTeam">
-            <q-input lazy-rules outlined filled stack-label v-model="newTeamName" type="text"
-                     label="Teamname eingeben"
-                     :rules="[val=>val.length>=2||'Name muss mindestens 5 Zeichen lang sein!']"/>
-            <q-btn
-              :disabled="!newTeamNameValidationSuccesful"
-              label="Team anlegen"
-              color="primary"
-              class="full-width"
-              @click="createTeam()"
-              unelevated
-            />
+          <br/>
+          <div align="center">
+            <q-btn label="Team verlassen"
+                   :disabled="!leaveConfirmed"
+                   @click="leaveTeam()"
+                   color="negative"
+                   type="submit"/>
           </div>
+          <q-list>
+            <q-card class="q-mb-md" v-for="teamInvite in teamInvites" :key="teamInvite.id">
+              <q-expansion-item
+                class=""
+                expand-icon-toggle
+                expand-separator
+                icon="group"
+                :label="teamInvite.team.name"
+                :caption="teamInvite.team.teamStatus"
+              >
+                <q-item class="q-pr-sm reverse q-gutter-x-sm">
+                  <q-btn @click="joinTeam(teamInvite)" unelevated color="positive" stack icon="arrow_forward"
+                         label="Annehmen" size="sm"/>
+                  <q-btn @click="deleteTeamInvite(teamInvite)" unelevated color="negative" stack icon="delete"
+                         label="Ablehnen" size="sm"/>
+                </q-item>
+              </q-expansion-item>
+            </q-card>
+          </q-list>
+          <q-input lazy-rules outlined filled stack-label v-model="newTeamName" type="text"
+                   label="Teamname eingeben"
+                   :rules="[val=>val.length>=2||'Name muss mindestens 5 Zeichen lang sein!']"/>
+          <q-btn
+            :disabled="!newTeamNameValidationSuccesful"
+            label="Team anlegen"
+            color="primary"
+            class="full-width"
+            @click="createTeam()"
+            unelevated
+          />
         </q-tab-panel>
 
       </q-tab-panels>
@@ -238,16 +229,9 @@
             field: row => row.name,
             format: val => `${val}`,
           },
-          {
-            name: 'email',
-            label: 'Email',
-            required: true,
-            align: 'left',
-            field: 'email',
-          },
           {
             name: 'ranking',
-            label: 'Rangliste (Solo)',
+            label: 'Rang',
             required: true,
             align: 'left',
             field: 'ranking',
@@ -289,7 +273,7 @@
         return false;
       },
       leaveConfirmed() {
-        if (this.leaveTeamCheck === 'BESTÄTIGEN'){
+        if (this.leaveTeamCheck === 'BESTÄTIGEN') {
           return true;
         }
         return false;