From af3252277c7628481bf8f1d18816815854443337 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Tue, 25 Jan 2022 08:37:38 +0000
Subject: [PATCH] Implement currentBudget and move infos to sidebar

---
 web/src/App.vue                  |  9 +++++
 web/src/pages/Budget.vue         | 57 --------------------------------
 web/src/pages/BudgetSidebar.vue  | 55 ++++++++++++++++++++++++++++++
 web/src/router/routes.js         |  7 ++--
 web/src/store/budget/index.js    |  2 +-
 web/src/store/dashboard/index.js | 27 ++++++++++++---
 6 files changed, 91 insertions(+), 66 deletions(-)
 delete mode 100644 web/src/pages/Budget.vue
 create mode 100644 web/src/pages/BudgetSidebar.vue

diff --git a/web/src/App.vue b/web/src/App.vue
index cdcca6f..d1847a9 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -2,6 +2,11 @@
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup
 export default {
+  data() {
+    return {
+      showMenu: null
+    }
+  },
   computed: {
     loggedIn() {
       return this.$store.state.Session.Token;
@@ -27,6 +32,10 @@ export default {
         <li v-if="loggedIn"><router-link to="/">Dashboard</router-link></li>
       </ul>
     </v-app-bar>
+
+    <v-navigation-drawer app v-model="showMenu">
+      <router-view name="sidebar"></router-view>
+    </v-navigation-drawer>
   
     <v-main>
       <router-view></router-view>
diff --git a/web/src/pages/Budget.vue b/web/src/pages/Budget.vue
deleted file mode 100644
index 9d22b6e..0000000
--- a/web/src/pages/Budget.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script>
-export default {
-  mounted () {
-    this.$store.dispatch("fetchBudget", this.$route.params.budgetid)
-  }
-}
-
-</script>
-
-<template>
-  <h1>Budget</h1>
-  <h1>
-    <a href="/dashboard">⌂</a>
-    {{$store.getters.CurrentBudget.Name}}
-  </h1>
-  <ul>
-    <li><a href="/budget/{{$store.getters.CurrentBudget.ID}}">Budget</a></li>
-    <li>Reports (Coming Soon)</li>
-    <li><a href="/budget/{{$store.getters.CurrentBudget.ID}}/all-accounts">All Accounts</a></li>
-    <li>
-      On-Budget Accounts
-      <ul v-for="account in $store.getters.OnBudgetAccounts" class="two-valued">
-          <li>
-            <a href="/budget/{{$store.getters.CurrentBudget.ID}}/account/{{.ID}}">{{account.Name}}</a>
-            <span>{{account.Balance.Int / 100}}</span>
-          </li>
-      </ul>
-    </li>
-    <li>
-      Off-Budget Accounts
-      <ul v-for="account in $store.getters.OffBudgetAccounts" class="two-valued">
-          <li>
-            <a href="/budget/{{$store.getters.CurrentBudget.ID}}/account/{{.ID}}">{{account.Name}}</a>
-            <span>{{account.Balance.Int / 100}}</span>
-          </li>
-      </ul>
-    </li>
-    <li>
-      Closed Accounts
-    </li>
-    <li>
-      <a href="/budget/{{$.Budget.ID}}/accounts">Edit accounts</a>
-    </li>
-    <li>
-      + Add Account
-    </li>
-    <li>
-      <a href="/budget/{{.Budget.ID}}/settings">Budget-Settings</a>
-    </li>
-    <li>
-      <a href="/admin">Admin</a>
-    </li>
-    <li>
-      <a href="/api/v1/user/logout">Logout</a>
-    </li>
-</ul>        
-</template>
\ No newline at end of file
diff --git a/web/src/pages/BudgetSidebar.vue b/web/src/pages/BudgetSidebar.vue
new file mode 100644
index 0000000..3481411
--- /dev/null
+++ b/web/src/pages/BudgetSidebar.vue
@@ -0,0 +1,55 @@
+<script>
+export default {
+  mounted () {
+    const budgetid = this.$route.params.budgetid;
+    this.$store.dispatch("setCurrentBudget", budgetid)
+  }
+}
+
+</script>
+
+<template>
+  <h1>Budget</h1>
+  <h1>
+    <router-link to="/dashboard">⌂</router-link>
+    {{$store.getters.CurrentBudget.Name}}
+  </h1>
+  <ul>
+    <li><router-link :to="'/budget/'+$store.getters.CurrentBudget.ID">Budget</router-link></li>
+    <li>Reports (Coming Soon)</li>
+    <li><router-link :to="'/budget/'+$store.getters.CurrentBudget.ID+'/all-accounts'">All Accounts</router-link></li>
+    <li>
+      On-Budget Accounts
+      <ul v-for="account in $store.getters.OnBudgetAccounts" class="two-valued">
+          <li>
+            <router-link :to="'/budget/'+$store.getters.CurrentBudget.ID+'/account/'+$store.getters.CurrentBudget.ID">{{account.Name}}</router-link>
+            <span>{{account.Balance.Int / 100}}</span>
+          </li>
+      </ul>
+    </li>
+    <li>
+      Off-Budget Accounts
+      <ul v-for="account in $store.getters.OffBudgetAccounts" class="two-valued">
+          <li>
+            <router-link :to="'/budget/'+$store.getters.CurrentBudget.ID+'/account/'+$store.getters.CurrentBudget.ID">{{account.Name}}</router-link>
+            <span>{{account.Balance.Int / 100}}</span>
+          </li>
+      </ul>
+    </li>
+    <li>
+      Closed Accounts
+    </li>
+    <li>
+      <router-link :to="'/budget/'+$store.getters.CurrentBudget.ID+'/accounts'">Edit accounts</router-link>
+    </li>
+    <li>
+      + Add Account
+    </li>
+    <li>
+      <router-link :to="'/budget/'+$store.getters.CurrentBudget.ID+'/settings'">Budget-Settings</router-link>
+    </li>
+    <li>
+      <router-link to="/admin">Admin</router-link>
+    </li>
+</ul>        
+</template>
\ No newline at end of file
diff --git a/web/src/router/routes.js b/web/src/router/routes.js
index a0c2626..8c139eb 100644
--- a/web/src/router/routes.js
+++ b/web/src/router/routes.js
@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
 import Budget from '../pages/Budget.vue';
 import Dashboard from '../pages/Dashboard.vue';
 import Login from '../pages/Login.vue';
@@ -6,13 +6,14 @@ import Register from '../pages/Register.vue';
 
 const routes = [
   { path: '/', name: 'Index', component: Dashboard },
+  { path: '/dashboard', name: 'Dashboard', component: Dashboard },
   { path: '/login', name: 'Login', component: Login },
   { path: '/register', name: 'Register', component: Register },
-  { path: '/budget/:budgetid',  name: 'Budget', component: Budget },
+  { path: '/budget/:budgetid',  name: 'Budget', components: {default: Dashboard, sidebar: Budget } },
 ]
 
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHistory(),
   routes,
 })
 
diff --git a/web/src/store/budget/index.js b/web/src/store/budget/index.js
index aaca938..71ec39c 100644
--- a/web/src/store/budget/index.js
+++ b/web/src/store/budget/index.js
@@ -9,7 +9,7 @@ const budget = {
     },
     mutations: {
         setAccounts (state, accounts) {
-                state.Accounts = accounts;
+            state.Accounts = accounts;
         }
     },
     getters: {
diff --git a/web/src/store/dashboard/index.js b/web/src/store/dashboard/index.js
index 1ef347b..4138f41 100644
--- a/web/src/store/dashboard/index.js
+++ b/web/src/store/dashboard/index.js
@@ -11,24 +11,30 @@ const dashboard = {
         },
         addBudget(state, budget) {
             state.Budgets.push(budget);
+        },
+        setCurrentBudget(state, budget) {
+            state.CurrentBudget = budget;
         }
     },
     getters: {
         Budgets(state) {
             return state.Budgets || [];
+        },
+        CurrentBudget(state) {
+            return state.CurrentBudget || {};
         }
     },
     actions: {
-        fetchDashboard ({state, commit, rootState}) {
-            fetch("/api/v1/dashboard", {
+        async fetchDashboard ({state, commit, rootState}) {
+            const response = await fetch("/api/v1/dashboard", {
                 headers: {
                     'Authorization': 'Bearer ' + rootState.Session.Token
                 }
             })
-                .then(x => x.json())
-                .then(x => commit("setBudgets", x.Budgets));
+            const data = await response.json();
+            commit("setBudgets", data.Budgets);
         },
-        newBudget ({state, commit, rootState}, budgetName) {
+        async newBudget ({state, commit, rootState}, budgetName) {
             fetch("/api/v1/budget/new", {
                 method: "POST",
                 body: JSON.stringify({name: budgetName}),
@@ -38,6 +44,17 @@ const dashboard = {
             })
                 .then(x => x.json())
                 .then(x => commit("addBudget", x));
+        },
+        async setCurrentBudget({state, commit, dispatch}, budgetid) {
+            await dispatch("fetchDashboard");
+            for (const element of state.Budgets) {
+                if(element.ID != budgetid) 
+                    continue
+                
+                commit("setCurrentBudget", element);
+                break
+            }
+            await dispatch("fetchBudget", budgetid);
         }
     }
 }