Merge pull request #66 from RobbinBaauw/dev

[Release] 0.2.1
finitum · Nov 6, 2018 · 79fb430 · 79fb430
2 parents cb665e2 + d8507be
commit 79fb430
Show file tree

Hide file tree

Showing 32 changed files with 1,223 additions and 712 deletions.
diff --git a/cshub-client/.env.production b/cshub-client/.env.production
@@ -1,2 +1,2 @@
-VUE_APP_API_URL=https://api-dev.cshub.nl
+VUE_APP_API_URL=https://api.cshub.nl
 VUE_APP_DEBUG=false
diff --git a/cshub-client/package-lock.json b/cshub-client/package-lock.json
diff --git a/cshub-client/public/assets/defaultAvatar.png b/cshub-client/public/assets/defaultAvatar.png
diff --git a/cshub-client/src/App.vue b/cshub-client/src/App.vue
@@ -124,6 +124,10 @@
         background: white;
     }
 
+    .postTile .v-list__tile {
+        height: auto !important;
+    }
+
     .v-icon {
         font-size: 17px !important;
     }

diff --git a/cshub-client/src/components/admin/UserTable.vue b/cshub-client/src/components/admin/UserTable.vue
@@ -14,7 +14,6 @@
                 <td class="text-xs-right">{{ props.item.lastname }}</td>
                 <td class="text-xs-right">{{ props.item.email }}</td>
                 <td class="text-xs-right">{{ props.item.admin }}</td>
-                <td class="text-xs-right">{{ props.item.avatar }}</td>
                 <td class="text-xs-right">{{ props.item.blocked }}</td>
                 <td class="text-xs-right">{{ props.item.verified }}</td>
             </template>
@@ -47,7 +46,6 @@
             {text: "Last name", value: "lastname"},
             {text: "Email", value: "email"},
             {text: "Admin", value: "admin"},
-            {text: "Avatar", value: "avatar"},
             {text: "Blocked", value: "blocked"},
             {text: "Verified", value: "verified"}
         ];

diff --git a/cshub-client/src/components/global/NavDrawer.vue b/cshub-client/src/components/global/NavDrawer.vue
@@ -21,6 +21,7 @@
             <router-link :to="navigationLocations.USERDASHBOARD" v-if="userLoggedInComputed"><NavDrawerItem icon="fas fa-user" text="User dashboard"></NavDrawerItem></router-link>
             <router-link :to="navigationLocations.ADMINDASHBOARD" v-if="userLoggedInComputed && userAdminComputed"><NavDrawerItem icon="fas fa-users" text="Admin dashboard"></NavDrawerItem></router-link>
             <router-link :to="navigationLocations.LOGIN" v-if="!userLoggedInComputed"><NavDrawerItem icon="fas fa-sign-in-alt" text="Login"></NavDrawerItem></router-link>
+            <a @click="logout"><NavDrawerItem v-if="userLoggedInComputed" icon="fas fa-sign-out-alt" text="Logout"></NavDrawerItem></a>
             <v-divider dark class="my-3"></v-divider>
             <v-layout
                     row
@@ -36,6 +37,7 @@
                 :items="topics"
                 item-key="hash"
                 activatable
+                class="ml-3"
                 active-class="primary--text"
                 transition>
             </v-treeview>
@@ -191,6 +193,17 @@
                     });
                 });
         }
+
+        /**
+         * Methods
+         */
+        private logout() {
+            logStringConsole("Logging user out");
+            document.cookie = "token=";
+            userState.clearUserModel();
+            uiState.setDrawerState(false);
+            this.$router.push(Routes.INDEX);
+        }
     }
 </script>