From 3a379e9b661da3307a7b33db76c50e94268e3a2c Mon Sep 17 00:00:00 2001
From: Leonardo Silveira <sombriks@gmail.com>
Date: Sat, 9 Sep 2023 21:30:39 -0300
Subject: [PATCH] chore(RED-13): ajustes menores

---
 service-node-koa/app/main.mjs                 |  2 --
 service-node-koa/index.mjs                    |  2 +-
 web-app-vue/src/App.vue                       |  5 +--
 .../movimentacao/nova-movimentacao.vue        | 33 +++++++++++--------
 ...imentacoes-page.vue => historico-page.vue} |  5 +--
 web-app-vue/src/routes/router.js              |  4 +--
 6 files changed, 29 insertions(+), 22 deletions(-)
 rename web-app-vue/src/pages/{movimentacoes-page.vue => historico-page.vue} (68%)

diff --git a/service-node-koa/app/main.mjs b/service-node-koa/app/main.mjs
index 9e6ed4b..d81737d 100644
--- a/service-node-koa/app/main.mjs
+++ b/service-node-koa/app/main.mjs
@@ -16,8 +16,6 @@ import {
   removeMovimentacaoRequest,
   updateMovimentacaoRequest,
   insertMovimentacaoRequest,
-  novaSaidaRequest,
-  novaEntradaRequest,
   findMovimentacaoRequest,
   listMovimentacaoRequest,
   listPlanejamentoRequest,
diff --git a/service-node-koa/index.mjs b/service-node-koa/index.mjs
index 313f734..62a6363 100644
--- a/service-node-koa/index.mjs
+++ b/service-node-koa/index.mjs
@@ -4,5 +4,5 @@ import { dbMigrate } from "./app/config/db/index.mjs";
 console.log(`starting service in [${process.env.NODE_ENV}] mode`)
 dbMigrate().then(() => app.listen(process.env.PORT || 3000))
 
-console.log("http://localhost:3000")
+console.log(`Listening on ${process.env.PORT || 3000}`)
 // open to business
diff --git a/web-app-vue/src/App.vue b/web-app-vue/src/App.vue
index 15d9429..3ee68f8 100644
--- a/web-app-vue/src/App.vue
+++ b/web-app-vue/src/App.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { useUserStore } from "@/stores/userStore";
 import { ref } from "vue";
+import { router } from "@/routes/router";
 
 const userStore = useUserStore()
 const menu = [
   { label: 'Nova movimentação', icon: 'mdi-currency-usd', path: '/nova-movimentacao' },
   { label: 'Contas', icon: 'mdi-card-account-details', path: '/contas' },
   { label: 'Categorias', icon: 'mdi-playlist-check', path: '/categorias' },
-  { label: 'Histórico', icon: 'mdi-clipboard-text-search-outline', path: '/movimentacoes' },
+  { label: 'Histórico', icon: 'mdi-clipboard-text-search-outline', path: '/historico' },
   { label: 'Planejamento', icon: 'mdi-clipboard-edit-outline', path: '/planejamento' },
   { label: 'Recorrências', icon: 'mdi-history', path: '/recorrencias' },
   { label: 'Configurações', icon: 'mdi-cog-outline', path: '/config' },
@@ -25,7 +26,7 @@ const show = ref(false)
     </v-app-bar>
     <v-navigation-drawer v-if="userStore.store.token" v-model="show">
       <v-list>
-        <v-list-item v-for="m in menu" :key="m.label">
+        <v-list-item v-for="m in menu" :key="m.label" :active="m.path == $route.path">
             <template v-slot:prepend>
               <v-icon color="red-lighten-3" :icon="m.icon"></v-icon>
             </template>
diff --git a/web-app-vue/src/components/movimentacao/nova-movimentacao.vue b/web-app-vue/src/components/movimentacao/nova-movimentacao.vue
index b83ce17..efa3b09 100644
--- a/web-app-vue/src/components/movimentacao/nova-movimentacao.vue
+++ b/web-app-vue/src/components/movimentacao/nova-movimentacao.vue
@@ -31,12 +31,16 @@
             item-title="descricao"
             item-value="id"
             label="Conta"
-            @change="verificaConta"
             chips
           >
             <template v-slot:chip="{ props, item }">
               <chip-conta v-bind="props" :conta="item.raw" :color="item.raw.cor"></chip-conta>
             </template>
+            <template v-slot:item="{props, item}">
+              <v-list-item>
+                <chip-conta class="ma-2" v-bind="props" :conta="item.raw" :color="item.raw.cor"></chip-conta>
+              </v-list-item>
+            </template>
           </v-autocomplete>
         </v-row>
         <v-row align="center">
@@ -49,7 +53,12 @@
             label="Categoria"
             chips>
             <template v-slot:chip="{ props, item }">
-              <v-chip v-bind="props" variant="outlined" rounded :color="item.raw.cor"></v-chip>
+              <v-chip v-bind="props" variant="outlined" rounded :color="item.raw.cor">{{item.raw.descricao}}</v-chip>
+            </template>
+            <template v-slot:item="{props, item}">
+              <v-list-item>
+                <v-chip class="ma-2" v-bind="props" variant="outlined" rounded :color="item.raw.cor">{{item.raw.descricao}}</v-chip>
+              </v-list-item>
             </template>
           </v-autocomplete>
         </v-row>
@@ -93,7 +102,7 @@
 </template>
 <script setup>
 import { useMovimentacaoStore } from '@/stores/movimentacaoStore'
-import { onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref, watch } from "vue";
 import { useContaStore } from '@/stores/contaStore'
 import { useCategoriaStore } from '@/stores/categoriaStore'
 import { numberRule, requiredRule } from '@/form-rules/basic-rules'
@@ -127,17 +136,15 @@ const sync = async () => {
   await movimentacaoState.sincronizarMovimentacoes()
 }
 
-const verificaConta = () => {
-  if(novaMovimentacao.conta_id) {
-    const conta = contaState.store.contas
-      .find(c => c.id == novaMovimentacao.conta_id);
-    if (conta.tipo_conta_id == 3) { // cartão de crédito
-      const date = new Date()
-      date.setDate(conta.dia_vencimento)
-      novaMovimentacao.vencimento = date
-    }
+watch(() => novaMovimentacao.conta_id, () => {
+  const conta = contaState.store.contas
+    .find(c => c.id == novaMovimentacao?.conta_id);
+  if (conta?.tipo_conta_id == 3) { // cartão de crédito
+    const date = new Date()
+    date.setDate(conta.dia_vencimento)
+    novaMovimentacao.vencimento = date
   }
-}
+})
 
 const salvarMovimentacao = async () => {
   if(!valid.value) return
diff --git a/web-app-vue/src/pages/movimentacoes-page.vue b/web-app-vue/src/pages/historico-page.vue
similarity index 68%
rename from web-app-vue/src/pages/movimentacoes-page.vue
rename to web-app-vue/src/pages/historico-page.vue
index 58423dd..7c9a75a 100644
--- a/web-app-vue/src/pages/movimentacoes-page.vue
+++ b/web-app-vue/src/pages/historico-page.vue
@@ -1,10 +1,11 @@
 <script setup>
-
 import ListaMovimentacoes from "@/components/movimentacao/lista-movimentacoes.vue";
 </script>
 
 <template>
-<lista-movimentacoes></lista-movimentacoes>
+  <h1>Histórico</h1>
+
+<!--<lista-movimentacoes></lista-movimentacoes>-->
 </template>
 <style scoped>
 
diff --git a/web-app-vue/src/routes/router.js b/web-app-vue/src/routes/router.js
index d6fec47..8ca3cf9 100644
--- a/web-app-vue/src/routes/router.js
+++ b/web-app-vue/src/routes/router.js
@@ -7,7 +7,7 @@ import ConfigPage from '@/pages/config-page.vue'
 import PlanejamentoPage from '@/pages/planejamento-page.vue'
 import RecorrenciasPage from '@/pages/recorrencias-page.vue'
 import ContasPage from '@/pages/contas-page.vue'
-import MovimentacoesPage from '@/pages/movimentacoes-page.vue'
+import HistoricoPage from '@/pages/historico-page.vue'
 
 const routes = [
   { path: '/', redirect: '/nova-movimentacao' },
@@ -15,7 +15,7 @@ const routes = [
   { component: CategoriasPage, path: '/categorias' },
   { component: ConfigPage, path: '/config' },
   { component: ContasPage, path: '/contas' },
-  { component: MovimentacoesPage, path: '/movimentacoes' },
+  { component: HistoricoPage, path: '/historico' },
   { component: NovaMovimentacaoPage, path: '/nova-movimentacao' },
   { component: PlanejamentoPage, path: '/planejamento' },
   { component: RecorrenciasPage, path: '/recorrencias' }