From df80f7807218418afa91e28a00dd82c0fbf37c59 Mon Sep 17 00:00:00 2001
From: Annika <nikzneko@gmail.com>
Date: Tue, 12 Jul 2022 16:12:03 -0600
Subject: [PATCH] no longer manipulating prop. still can't get formatting to
 twork

---
 budgit.client/src/AppState.js                 |   3 +-
 .../src/components/AddTransaction.vue         | 113 ++++++++++++++++++
 budgit.client/src/components/Category.vue     |  28 +++++
 budgit.client/src/components/Transaction.vue  |  54 +++++++--
 budgit.client/src/pages/OverviewPage.vue      |  46 ++++++-
 budgit.client/src/pages/TransactionsPage.vue  |   7 +-
 budgit.client/src/router.js                   |   3 +-
 .../src/services/CategoriesService.js         |  14 +++
 .../src/services/TransactionsService.js       |   6 +-
 budgit.client/src/utils/Dollars.js            |   8 ++
 budgit/server/models/Category.js              |   2 +-
 budgit/server/services/TransactionsService.js |   3 +-
 12 files changed, 265 insertions(+), 22 deletions(-)
 create mode 100644 budgit.client/src/components/AddTransaction.vue
 create mode 100644 budgit.client/src/components/Category.vue
 create mode 100644 budgit.client/src/services/CategoriesService.js
 create mode 100644 budgit.client/src/utils/Dollars.js

diff --git a/budgit.client/src/AppState.js b/budgit.client/src/AppState.js
index 0f1dd3d..48c126e 100644
--- a/budgit.client/src/AppState.js
+++ b/budgit.client/src/AppState.js
@@ -4,5 +4,6 @@ import { reactive } from 'vue'
 export const AppState = reactive({
   user: {},
   account: {},
-  transactions: []
+  transactions: [],
+  categories: []
 })
diff --git a/budgit.client/src/components/AddTransaction.vue b/budgit.client/src/components/AddTransaction.vue
new file mode 100644
index 0000000..c2ad728
--- /dev/null
+++ b/budgit.client/src/components/AddTransaction.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="component flex flex-wrap md:flex-nowrap justify-between bg-stone-800 mb-2">
+    <div class="pr-4">
+      <input type="date" v-model="transData.date" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
+    </div>
+    <div class="pr-4">
+      <!-- TODO this is bad! don't manipulate the prop -->
+      <!-- Look at cars in gregslist? -->
+      <!-- use editable object -->
+      <span class="flex">
+        $
+        <input type="number" v-model="transData.amount" :placeholder="transData.amount" class="w-24 bg-stone-800 text-slate-50 hover:bg-green-300 hover:text-stone-900">
+      </span>
+    </div>
+    <div class="pr-4">
+        <input type="text" v-model="transData.payee" :placeholder="transData.payee" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
+    </div>
+    <div class="pr-4">
+      <select v-model="transData.categoryId" class="text-slate-50 bg-stone-800 w-36 hover:bg-green-300 hover:text-stone-900">
+        <option :value="transData.categoryId" selected>{{categories.find((c) => c._id == transData.categoryId)?.name}}</option>
+        <!-- cat?.name - null coalescence - returns value iff object is valid -->
+        <!-- TODO there's an error here but it works??? -->
+        <option v-for="c in categories" :value="c._id">{{c.name}}</option>
+      </select>
+    </div>
+    <div class="pr-4">
+      <input type="text" v-model="transData.comment" :placeholder="transData.comment" class="text-slate-50 bg-stone-800 w-48 hover:bg-green-300 hover:text-stone-900">
+    </div>
+    <div>
+      <button class="text-slate-50 bg-stone-800 w-16 hover:bg-green-300 hover:text-stone-900" @click="update">
+        Save
+      </button>
+    </div>
+  </div>
+</template>
+
+
+<script>
+// import { logger } from '../utils/Logger'
+import { transactionsService } from '../services/TransactionsService'
+import { getDollars } from '../utils/Dollars'
+import { computed, reactive, onMounted, ref, watchEffect } from "vue";
+
+export default {
+  // TODO there's probably something wrong with this...
+  props: {
+    transaction: {
+      type: Object,
+      required: true
+    },
+    categories: {
+      type: Object,
+      required: true
+    }
+  },
+  setup(props){
+    // create editable object and use watchEffect
+    const transData = ref({})
+    watchEffect(() => {
+      transData.value = props.transaction
+      // whatever this doesn't work because WHYNOT
+      // transData.dollars = props.transaction.amount / 100
+    })
+    return {
+      transData,
+      async update() {
+        // console.log(props.transaction)
+        // send off request to update transaction
+        try {
+          // use the editable object instead
+          await transactionsService.update(transData.value)
+        } catch (error) {
+          console.log(error)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<!-- 
+  setup(props) {
+    const carData = ref({});
+    // NOTE the watcheffect runs when a piece of data inside it changes
+    // in this case props.edit car was accessed so if props.editCar changes it runs again
+    watchEffect(() => {
+      logger.log(props.editCar);
+      carData.value = props.editCar;
+    });
+    return {
+      carData, -->
+
+
+<!-- // TODO undo this -->
+<style lang="postcss" scoped>
+  input {
+    color-scheme: dark;
+  }
+
+  input::placeholder {
+    @apply text-slate-50;
+    opacity: 1;
+  }
+
+  input:hover::placeholder {
+    @apply text-stone-900;
+    opacity: 1;
+  }
+
+  input:hover {
+    color-scheme: light;
+  }
+</style>
\ No newline at end of file
diff --git a/budgit.client/src/components/Category.vue b/budgit.client/src/components/Category.vue
new file mode 100644
index 0000000..1ae65f8
--- /dev/null
+++ b/budgit.client/src/components/Category.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="component">
+    <p>{{category}}</p>
+
+  </div>
+</template>
+
+
+<script>
+import { computed, reactive, onMounted, ref, watchEffect } from "vue";
+
+export default {
+  props: {
+    category: {
+      type: Object,
+      required: true
+    }
+  },
+  setup(props){
+  }
+}
+
+</script>
+
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/budgit.client/src/components/Transaction.vue b/budgit.client/src/components/Transaction.vue
index 6fa46f4..c2ad728 100644
--- a/budgit.client/src/components/Transaction.vue
+++ b/budgit.client/src/components/Transaction.vue
@@ -1,28 +1,35 @@
 <template>
   <div class="component flex flex-wrap md:flex-nowrap justify-between bg-stone-800 mb-2">
     <div class="pr-4">
-      <input type="date" v-model="transaction.date" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
+      <input type="date" v-model="transData.date" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
     </div>
     <div class="pr-4">
-      <input type="number" v-model="transaction.amount" :placeholder="transaction.amount" class="w-24 bg-stone-800 text-slate-50 hover:bg-green-300 hover:text-stone-900">
+      <!-- TODO this is bad! don't manipulate the prop -->
+      <!-- Look at cars in gregslist? -->
+      <!-- use editable object -->
+      <span class="flex">
+        $
+        <input type="number" v-model="transData.amount" :placeholder="transData.amount" class="w-24 bg-stone-800 text-slate-50 hover:bg-green-300 hover:text-stone-900">
+      </span>
     </div>
     <div class="pr-4">
-      <input type="text" v-model="transaction.payee" :placeholder="transaction.payee" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
+        <input type="text" v-model="transData.payee" :placeholder="transData.payee" class="text-slate-50 bg-stone-800 w-32 hover:bg-green-300 hover:text-stone-900">
     </div>
     <div class="pr-4">
-      <select v-model="transaction.category" class="text-slate-50 bg-stone-800 w-36 hover:bg-green-300 hover:text-stone-900">
-        <option value="" selected>{{transaction.category}}</option>
-        <option v-for="c in 10" value="meow">meow</option>
+      <select v-model="transData.categoryId" class="text-slate-50 bg-stone-800 w-36 hover:bg-green-300 hover:text-stone-900">
+        <option :value="transData.categoryId" selected>{{categories.find((c) => c._id == transData.categoryId)?.name}}</option>
+        <!-- cat?.name - null coalescence - returns value iff object is valid -->
+        <!-- TODO there's an error here but it works??? -->
+        <option v-for="c in categories" :value="c._id">{{c.name}}</option>
       </select>
     </div>
     <div class="pr-4">
-      <input type="text" v-model="transaction.comment" :placeholder="transaction.comment" class="text-slate-50 bg-stone-800 w-48 hover:bg-green-300 hover:text-stone-900">
+      <input type="text" v-model="transData.comment" :placeholder="transData.comment" class="text-slate-50 bg-stone-800 w-48 hover:bg-green-300 hover:text-stone-900">
     </div>
     <div>
       <button class="text-slate-50 bg-stone-800 w-16 hover:bg-green-300 hover:text-stone-900" @click="update">
         Save
       </button>
-      {{transaction}}
     </div>
   </div>
 </template>
@@ -31,6 +38,8 @@
 <script>
 // import { logger } from '../utils/Logger'
 import { transactionsService } from '../services/TransactionsService'
+import { getDollars } from '../utils/Dollars'
+import { computed, reactive, onMounted, ref, watchEffect } from "vue";
 
 export default {
   // TODO there's probably something wrong with this...
@@ -38,15 +47,28 @@ export default {
     transaction: {
       type: Object,
       required: true
+    },
+    categories: {
+      type: Object,
+      required: true
     }
   },
   setup(props){
+    // create editable object and use watchEffect
+    const transData = ref({})
+    watchEffect(() => {
+      transData.value = props.transaction
+      // whatever this doesn't work because WHYNOT
+      // transData.dollars = props.transaction.amount / 100
+    })
     return {
+      transData,
       async update() {
-        console.log(props.transaction)
+        // console.log(props.transaction)
         // send off request to update transaction
         try {
-          await transactionsService.update(props.transaction)
+          // use the editable object instead
+          await transactionsService.update(transData.value)
         } catch (error) {
           console.log(error)
         }
@@ -56,6 +78,18 @@ export default {
 }
 </script>
 
+<!-- 
+  setup(props) {
+    const carData = ref({});
+    // NOTE the watcheffect runs when a piece of data inside it changes
+    // in this case props.edit car was accessed so if props.editCar changes it runs again
+    watchEffect(() => {
+      logger.log(props.editCar);
+      carData.value = props.editCar;
+    });
+    return {
+      carData, -->
+
 
 <!-- // TODO undo this -->
 <style lang="postcss" scoped>
diff --git a/budgit.client/src/pages/OverviewPage.vue b/budgit.client/src/pages/OverviewPage.vue
index 789b84a..94667ba 100644
--- a/budgit.client/src/pages/OverviewPage.vue
+++ b/budgit.client/src/pages/OverviewPage.vue
@@ -3,16 +3,35 @@
     <p class="hover:text-green-300 cursor-pointer">Add Category</p>
     <div class="flex md:mx-40 flex-col md:flex-row">
       <div class="md:w-4/12 md:order-last">analysis container</div>
-      <div class="md:w-8/12">category container</div>
+      <div class="md:w-8/12">category container
+        <p v-for="c in categories" :key="c._id">{{c.name}}</p>
+      </div>
     </div>
   </div>
 </template>
 
 
 <script>
+import { computed, onMounted } from 'vue'
+import { AppState } from '../AppState'
+import { categoriesService } from '../services/CategoriesService'
+import { logger } from '../utils/Logger'
+
+
 export default {
   setup(){
-    return {}
+    onMounted(async () => {
+      try {
+        // console.log(AppState.categories)
+        await categoriesService.getAll()
+        // console.log(AppState.categories)
+      } catch (error) {
+        logger.log(error)
+      }
+    })
+    return {
+      categories: computed(() => AppState.categories)
+    }
   }
 }
 </script>
@@ -20,4 +39,25 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+</style>
+
+<!--
+import { computed, onMounted } from 'vue'
+import { AppState } from '../AppState'
+import { transactionsService } from '../services/TransactionsService'
+import { logger } from '../utils/Logger'
+
+export default {
+  setup(){
+    onMounted(async () => {
+      try {
+        await transactionsService.getAll()
+      } catch (error) {
+        logger.log(error)
+      }
+    })
+    return {
+      transactions: computed(() => AppState.transactions)
+    }
+  }
+} -->
\ No newline at end of file
diff --git a/budgit.client/src/pages/TransactionsPage.vue b/budgit.client/src/pages/TransactionsPage.vue
index 702c77d..35833e3 100644
--- a/budgit.client/src/pages/TransactionsPage.vue
+++ b/budgit.client/src/pages/TransactionsPage.vue
@@ -2,7 +2,7 @@
   <div class="component">
     <div class="flex mt-6 md:mx-40 flex-col">
       <h1>Transactions Container</h1>
-      <Transaction v-for="t in transactions" :key="t._id" :transaction="t" />
+      <Transaction v-for="t in transactions" :key="t._id" :transaction="t" :categories="categories" />
     </div>
   </div>
 </template>
@@ -11,6 +11,7 @@
 <script>
 import { computed, onMounted } from 'vue'
 import { AppState } from '../AppState'
+import { categoriesService } from '../services/CategoriesService'
 import { transactionsService } from '../services/TransactionsService'
 import { logger } from '../utils/Logger'
 
@@ -18,13 +19,15 @@ export default {
   setup(){
     onMounted(async () => {
       try {
+        await categoriesService.getAll()
         await transactionsService.getAll()
       } catch (error) {
         logger.log(error)
       }
     })
     return {
-      transactions: computed(() => AppState.transactions)
+      transactions: computed(() => AppState.transactions),
+      categories: computed(() => AppState.categories)
     }
   }
 }
diff --git a/budgit.client/src/router.js b/budgit.client/src/router.js
index 0a1c0a0..593f12e 100644
--- a/budgit.client/src/router.js
+++ b/budgit.client/src/router.js
@@ -9,7 +9,8 @@ const routes = [
   {
     path: '/',
     name: 'Overview',
-    component: loadPage('OverviewPage')
+    component: loadPage('OverviewPage'),
+    beforeEnter: authGuard
   },
   {
     path: '/transactions',
diff --git a/budgit.client/src/services/CategoriesService.js b/budgit.client/src/services/CategoriesService.js
new file mode 100644
index 0000000..e6511bb
--- /dev/null
+++ b/budgit.client/src/services/CategoriesService.js
@@ -0,0 +1,14 @@
+import { AppState } from "../AppState"
+import { logger } from "../utils/Logger"
+import { api } from "./AxiosService"
+
+
+class CategoriesService {
+  async getAll() {
+    const res = await api.get('api/categories')
+    // console.log(res.data)
+    AppState.categories = res.data
+  }
+}
+
+export const categoriesService = new CategoriesService()
\ No newline at end of file
diff --git a/budgit.client/src/services/TransactionsService.js b/budgit.client/src/services/TransactionsService.js
index 739b322..b69ff43 100644
--- a/budgit.client/src/services/TransactionsService.js
+++ b/budgit.client/src/services/TransactionsService.js
@@ -1,6 +1,7 @@
 import { AppState } from "../AppState"
 import { logger } from "../utils/Logger"
 import { api } from "./AxiosService"
+import { getCents } from '../utils/Dollars'
 
 
 // TODO build the service to get some real data
@@ -20,9 +21,10 @@ class TransactionsService {
 
   // TODO test this
   async update(transaction) {
-    console.log(transaction._id)
+    // transaction.amount = getCents(transaction.dollars)
+    // console.log(transaction._id)
     const res = await api.put('api/transactions/' + transaction._id, transaction)
-    console.log('transactionUpdate: ' + res.data)
+    // console.log('transactionUpdate: ' + res.data)
     // AppState.transactions.find((t) => t._id == transactionId) = res.data
   }
 }
diff --git a/budgit.client/src/utils/Dollars.js b/budgit.client/src/utils/Dollars.js
new file mode 100644
index 0000000..d8e7314
--- /dev/null
+++ b/budgit.client/src/utils/Dollars.js
@@ -0,0 +1,8 @@
+export function getDollars(cents) {
+  // return `$${Math.floor(cents / 100)}.${cents % 100}`
+  return cents / 100
+}
+
+export function getCents(dollars) {
+  return Math.round(dollars * 100)
+}
\ No newline at end of file
diff --git a/budgit/server/models/Category.js b/budgit/server/models/Category.js
index 8c034dd..ce60dcf 100644
--- a/budgit/server/models/Category.js
+++ b/budgit/server/models/Category.js
@@ -5,7 +5,7 @@ const Schema = mongoose.Schema
 
 export const CategorySchema = new Schema(
   {
-    /** @property {ObjectId} [accountId] -ID of the account this transaction belongs to */
+    /** @property {ObjectId} [accountId] -ID of the account this category belongs to */
     accountId: {type: Schema.Types.ObjectId, required: true},
     
     /** @property {String} [name] -name of the category */
diff --git a/budgit/server/services/TransactionsService.js b/budgit/server/services/TransactionsService.js
index 4b53771..4836b65 100644
--- a/budgit/server/services/TransactionsService.js
+++ b/budgit/server/services/TransactionsService.js
@@ -11,6 +11,7 @@ async create(newTransaction) {
   return dbTransaction
 }
 
+// TODO need to populate categories
 async getAll(accountId) {
   if (!accountId) {
     throw new BadRequest("User not logged in")
@@ -19,8 +20,6 @@ async getAll(accountId) {
   return allTransactions
 }
 
-// TODO test this
-// TODO fix this
 async update(accountId, transactionId, update) {
   if (!transactionId) {
     throw new BadRequest('Bad transaction id')