From 25fb3dfbd0a7c3a3a438b31f7e673061aa0590e8 Mon Sep 17 00:00:00 2001 From: Leonardo Silveira Date: Sun, 2 Jun 2024 16:50:18 -0300 Subject: [PATCH 1/3] RED-85 --- .../src/pages/pagamento/pagamento-page.vue | 15 +++++++++++++++ web-app-vue/src/services/router.js | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 web-app-vue/src/pages/pagamento/pagamento-page.vue diff --git a/web-app-vue/src/pages/pagamento/pagamento-page.vue b/web-app-vue/src/pages/pagamento/pagamento-page.vue new file mode 100644 index 0000000..781783f --- /dev/null +++ b/web-app-vue/src/pages/pagamento/pagamento-page.vue @@ -0,0 +1,15 @@ + + + diff --git a/web-app-vue/src/services/router.js b/web-app-vue/src/services/router.js index 7248234..bcf820e 100644 --- a/web-app-vue/src/services/router.js +++ b/web-app-vue/src/services/router.js @@ -11,6 +11,7 @@ import RecorrenciasPage from '@/pages/recorrencia/recorrencias-page.vue' import ContasPage from '@/pages/conta/contas-page.vue' import MovimentacaoPage from '@/pages/movimentacao/movimentacao-page.vue' import EditarMovimentacaoPage from '@/pages/movimentacao/editar-movimentacao-page.vue' +import PagamentoPage from '@/pages/pagamento/pagamento-page.vue' export const routes = [ { path: '/', redirect: '/dashboard' }, @@ -18,6 +19,7 @@ export const routes = [ { component: DashboardPage, path: '/dashboard', label: 'Dashboard', icon: 'mdi-chart-bar' }, { component: NovaMovimentacaoPage, path: '/nova-movimentacao', label: 'Novo lançamento', icon: 'mdi-cash-plus' }, { component: MovimentacaoPage, path: '/historico', label: 'Lançamentos', icon: 'mdi-clipboard-text-search-outline' }, + { component: PagamentoPage, path: "/pagamento", label: "Pagamentos", icon: 'mdi-cash-multiple' }, { component: ContasPage, path: '/contas', label: 'Contas', icon: 'mdi-card-account-details' }, { component: CategoriasPage, path: '/categorias', label: 'Categorias', icon: 'mdi-playlist-check' }, { component: EditarMovimentacaoPage, path: '/editar-movimentacao/:id' }, From 05e9acba7822ef15564808a499991c3f17dc2967 Mon Sep 17 00:00:00 2001 From: Leonardo Silveira Date: Sun, 2 Jun 2024 21:11:55 -0300 Subject: [PATCH 2/3] RED-85 tela de pagamento --- .../pages/dashboard/controles-dashboard.vue | 21 +++++------- .../src/pages/pagamento/pagamento-form.vue | 22 ++++++++++++ .../src/pages/pagamento/pagamento-page.vue | 34 ++++++++++++++----- .../pages/pagamento/transferencia-form.vue | 20 +++++++++++ web-app-vue/src/services/chart-config.js | 2 +- web-app-vue/src/services/router.js | 2 +- 6 files changed, 78 insertions(+), 23 deletions(-) create mode 100644 web-app-vue/src/pages/pagamento/pagamento-form.vue create mode 100644 web-app-vue/src/pages/pagamento/transferencia-form.vue diff --git a/web-app-vue/src/pages/dashboard/controles-dashboard.vue b/web-app-vue/src/pages/dashboard/controles-dashboard.vue index 89c84d0..7e49cfe 100644 --- a/web-app-vue/src/pages/dashboard/controles-dashboard.vue +++ b/web-app-vue/src/pages/dashboard/controles-dashboard.vue @@ -12,16 +12,11 @@ Receitas x Despesas - -
- -
-
@@ -32,6 +27,7 @@ Limites
+

{{limite[1].name}}

@@ -57,6 +53,7 @@ Planejamentos
+

{{planejamento[1].name}}

@@ -316,12 +313,12 @@ const limites = computed(() => { const planejamentos = computed(() => { const planejamentos = {} dashboardState.store.dashboard?.planejamentos?.forEach((planejamento) => { - if(!planejamentos[planejamento.descricao]) { + if (!planejamentos[planejamento.descricao]) { planejamentos[planejamento.descricao] = [ { shape: 'square', name: 'Limite', - color: planejamento.type === "ENTRADA" ? 'lightgreen' : 'red', + color: planejamento.type === 'ENTRADA' ? 'lightgreen' : 'red', type: 'line', series: dashboardState.store.dashboard?.planejamentos ?.filter((l) => l.descricao === planejamento.descricao) @@ -339,7 +336,7 @@ const planejamentos = computed(() => { type: 'line', series: dashboardState.store.dashboard?.planejamentos ?.filter((l) => l.descricao === planejamento.descricao) - .map((l) => planejamento.type === "ENTRADA" ? l.acc : -l.acc) + .map((l) => planejamento.type === 'ENTRADA' ? l.acc : -l.acc) } ] } diff --git a/web-app-vue/src/pages/pagamento/pagamento-form.vue b/web-app-vue/src/pages/pagamento/pagamento-form.vue new file mode 100644 index 0000000..3129893 --- /dev/null +++ b/web-app-vue/src/pages/pagamento/pagamento-form.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/web-app-vue/src/pages/pagamento/pagamento-page.vue b/web-app-vue/src/pages/pagamento/pagamento-page.vue index 781783f..b02eda3 100644 --- a/web-app-vue/src/pages/pagamento/pagamento-page.vue +++ b/web-app-vue/src/pages/pagamento/pagamento-page.vue @@ -1,15 +1,31 @@ diff --git a/web-app-vue/src/pages/pagamento/transferencia-form.vue b/web-app-vue/src/pages/pagamento/transferencia-form.vue new file mode 100644 index 0000000..2251067 --- /dev/null +++ b/web-app-vue/src/pages/pagamento/transferencia-form.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/web-app-vue/src/services/chart-config.js b/web-app-vue/src/services/chart-config.js index 64a831d..3cbd57c 100644 --- a/web-app-vue/src/services/chart-config.js +++ b/web-app-vue/src/services/chart-config.js @@ -232,7 +232,7 @@ export const lineChartConfig= { 'useCssAnimation': true, 'chart': { 'fontFamily': 'inherit', - 'backgroundColor': '#000000', + 'backgroundColor': '#212121', 'color': '#d5d5d5', 'height': 600, 'width': 1000, diff --git a/web-app-vue/src/services/router.js b/web-app-vue/src/services/router.js index bcf820e..bb949c5 100644 --- a/web-app-vue/src/services/router.js +++ b/web-app-vue/src/services/router.js @@ -19,7 +19,7 @@ export const routes = [ { component: DashboardPage, path: '/dashboard', label: 'Dashboard', icon: 'mdi-chart-bar' }, { component: NovaMovimentacaoPage, path: '/nova-movimentacao', label: 'Novo lançamento', icon: 'mdi-cash-plus' }, { component: MovimentacaoPage, path: '/historico', label: 'Lançamentos', icon: 'mdi-clipboard-text-search-outline' }, - { component: PagamentoPage, path: "/pagamento", label: "Pagamentos", icon: 'mdi-cash-multiple' }, + { component: PagamentoPage, path: "/pagamento", label: "Pagar/Transferir", icon: 'mdi-cash-multiple' }, { component: ContasPage, path: '/contas', label: 'Contas', icon: 'mdi-card-account-details' }, { component: CategoriasPage, path: '/categorias', label: 'Categorias', icon: 'mdi-playlist-check' }, { component: EditarMovimentacaoPage, path: '/editar-movimentacao/:id' }, From e0def6b8fe41a61e456c739f0c50606379881e6a Mon Sep 17 00:00:00 2001 From: Leonardo Silveira Date: Sat, 8 Jun 2024 12:55:11 -0300 Subject: [PATCH 3/3] =?UTF-8?q?RED-85=20pagamentos=20e=20transfer=C3=AAnci?= =?UTF-8?q?as?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service-node-koa/app/config/db/knexfile.cjs | 18 +-- .../src/pages/categoria/lista-categorias.vue | 18 +-- .../movimentacao/editar-movimentacao.vue | 4 +- .../src/pages/pagamento/pagamento-form.vue | 110 +++++++++++++++--- .../src/pages/pagamento/pagamento-page.vue | 36 ++++-- .../pages/pagamento/transferencia-form.vue | 97 ++++++++++++--- 6 files changed, 227 insertions(+), 56 deletions(-) diff --git a/service-node-koa/app/config/db/knexfile.cjs b/service-node-koa/app/config/db/knexfile.cjs index 61d0e6d..b7bd8e2 100644 --- a/service-node-koa/app/config/db/knexfile.cjs +++ b/service-node-koa/app/config/db/knexfile.cjs @@ -1,25 +1,27 @@ /** -* @type { import("knex").Knex.Config } -*/ + * @type { import('knex').Knex.Config } + */ const _cfg = { client: 'sqlite3', useNullAsDefault: true, connection: { - filename: `${__dirname}/../../../redline.sqlite3`, + filename: `${__dirname}/../../../redline.sqlite3` }, pool: { min: 2, - max: 10 + max: 10, + afterCreate: (conn, cb) => + conn.run('PRAGMA foreign_keys = ON', cb) }, migrations: { directory: `${__dirname}/migrations`, - loadExtensions: [".mjs"], - }, + loadExtensions: ['.mjs'] + } } /** -* @type { Object. } -*/ + * @type { Object. } + */ module.exports = { development: { ..._cfg }, test: { diff --git a/web-app-vue/src/pages/categoria/lista-categorias.vue b/web-app-vue/src/pages/categoria/lista-categorias.vue index 14137a1..1247730 100644 --- a/web-app-vue/src/pages/categoria/lista-categorias.vue +++ b/web-app-vue/src/pages/categoria/lista-categorias.vue @@ -4,23 +4,23 @@ - + diff --git a/web-app-vue/src/pages/pagamento/pagamento-page.vue b/web-app-vue/src/pages/pagamento/pagamento-page.vue index b02eda3..f8d7049 100644 --- a/web-app-vue/src/pages/pagamento/pagamento-page.vue +++ b/web-app-vue/src/pages/pagamento/pagamento-page.vue @@ -1,11 +1,19 @@ diff --git a/web-app-vue/src/pages/pagamento/transferencia-form.vue b/web-app-vue/src/pages/pagamento/transferencia-form.vue index 2251067..896663e 100644 --- a/web-app-vue/src/pages/pagamento/transferencia-form.vue +++ b/web-app-vue/src/pages/pagamento/transferencia-form.vue @@ -1,20 +1,89 @@ - - +