From 09169feb9f4307654c9bb045d6dd05622631af00 Mon Sep 17 00:00:00 2001
From: Annika <nikzneko@gmail.com>
Date: Thu, 4 Aug 2022 15:28:33 -0600
Subject: [PATCH] I think I'm passing???!!!???

---
 keepr.client/src/assets/scss/_variables.scss          | 3 ++-
 keepr.client/src/components/KeepModalButtons.vue      | 4 ++--
 keepr.client/src/components/VaultKeepModalButtons.vue | 1 +
 keepr.client/src/pages/HomePage.vue                   | 4 +++-
 keepr.client/src/pages/ProfilePage.vue                | 4 +++-
 keepr.client/src/pages/VaultPage.vue                  | 4 +++-
 keepr.client/src/services/KeepsService.js             | 2 +-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/keepr.client/src/assets/scss/_variables.scss b/keepr.client/src/assets/scss/_variables.scss
index 9975792..9fad10a 100644
--- a/keepr.client/src/assets/scss/_variables.scss
+++ b/keepr.client/src/assets/scss/_variables.scss
@@ -6,7 +6,8 @@ $info: #5d0149;
 $warning: #fbcf33;
 $danger: #ea0606;
 $light: #e9ecef;
-$dark: #111927;
+// $dark: #111927;
+$dark: #44132d;
 $grey: #cbcbcb;
 
 $font-sans-serif: Open Sans;
diff --git a/keepr.client/src/components/KeepModalButtons.vue b/keepr.client/src/components/KeepModalButtons.vue
index f42da75..9221f7d 100644
--- a/keepr.client/src/components/KeepModalButtons.vue
+++ b/keepr.client/src/components/KeepModalButtons.vue
@@ -3,12 +3,12 @@
 
     <div class="d-flex align-items-end">
 
-      <div class="btn-group me-5" role="group">
+      <div v-show="account.id" class="btn-group me-5" role="group">
         <button id="addToVaultGroup" class="btn btn-outline-primary dropdown-toggle" data-bs-toggle="dropdown"
           aria-expanded="false">Add to Vault</button>
         <ul class="dropdown-menu" aria-labelledby="addToVaultGroup">
           <li v-for="v in myVaults" :key="v.id"><a @click="addToVault(v.id)" class="dropdown-item">{{v.name}}</a></li>
-        </ul>
+        </ul> 
       </div>
 
       <!-- account is empty... -->
diff --git a/keepr.client/src/components/VaultKeepModalButtons.vue b/keepr.client/src/components/VaultKeepModalButtons.vue
index ab2e006..f7ebe1d 100644
--- a/keepr.client/src/components/VaultKeepModalButtons.vue
+++ b/keepr.client/src/components/VaultKeepModalButtons.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="d-flex justify-content-between align-items-end">
+    <div></div>
     <button v-if="account.id == vault.creatorId" @click="removeFromVault(keep.id)" class="btn btn-outline-secondary">Remove from Vault</button>
 
     <i v-show="account.id == keep.creatorId" @click="deleteKeep()" class="mdi mdi-delete-outline text-secondary" title="Delete"></i>
diff --git a/keepr.client/src/pages/HomePage.vue b/keepr.client/src/pages/HomePage.vue
index 7d0624c..0e60553 100644
--- a/keepr.client/src/pages/HomePage.vue
+++ b/keepr.client/src/pages/HomePage.vue
@@ -36,7 +36,9 @@ export default {
             keeps: computed(() => AppState.keeps),
             activeKeep: computed(() => AppState.activeKeep),
             viewKeep(keep) {
-                AppState.activeKeep = keep;
+                // AppState.activeKeep = keep;
+                // make API call to trigger view counter
+                keepsService.getById(keep.id)
                 Modal.getOrCreateInstance(document.getElementById("keepModal")).show();
             }
         };
diff --git a/keepr.client/src/pages/ProfilePage.vue b/keepr.client/src/pages/ProfilePage.vue
index 6d6dafd..43ef53d 100644
--- a/keepr.client/src/pages/ProfilePage.vue
+++ b/keepr.client/src/pages/ProfilePage.vue
@@ -82,7 +82,9 @@ export default {
 
             async viewKeep(keep) {
                 keep.creator = AppState.activeProfile;
-                AppState.activeKeep = keep;
+                // AppState.activeKeep = keep
+                // make API call to trigger view counter
+                keepsService.getById(keep.id)
                 Modal.getOrCreateInstance(document.getElementById("keepModal")).show();
             },
 
diff --git a/keepr.client/src/pages/VaultPage.vue b/keepr.client/src/pages/VaultPage.vue
index b57194b..e72cce8 100644
--- a/keepr.client/src/pages/VaultPage.vue
+++ b/keepr.client/src/pages/VaultPage.vue
@@ -53,7 +53,9 @@ export default {
       account: computed(() => AppState.account),
 
       viewKeep(keep) {
-        AppState.activeKeep = keep
+        // AppState.activeKeep = keep
+        // make API call to trigger view counter
+        keepsService.getById(keep.id)
         Modal.getOrCreateInstance(document.getElementById('keepModal')).show()
       },
 
diff --git a/keepr.client/src/services/KeepsService.js b/keepr.client/src/services/KeepsService.js
index d481ced..765b554 100644
--- a/keepr.client/src/services/KeepsService.js
+++ b/keepr.client/src/services/KeepsService.js
@@ -17,7 +17,7 @@ class KeepsService {
   async getById(id) {
     try {
       const res = await api.get('api/keeps/' + id)
-      AppState.keeps = res.data
+      AppState.activeKeep = res.data
     } catch (error) {
       logger.error(error)
       Pop.error(error)