From 8062619ebe66dacd9458b549bd852a812979dada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Wed, 22 May 2024 21:45:51 -0300 Subject: [PATCH 1/4] feat: allow editing groups --- my-app/src/lib/svgs.ts | 3 +++ .../categories/details/[[id=integer]]/+page.server.ts | 4 ++-- my-app/src/routes/groups/+page.svelte | 6 +++++- .../src/routes/groups/budgets/[[id=integer]]/+page.svelte | 4 +--- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 my-app/src/lib/svgs.ts diff --git a/my-app/src/lib/svgs.ts b/my-app/src/lib/svgs.ts new file mode 100644 index 0000000..73d5578 --- /dev/null +++ b/my-app/src/lib/svgs.ts @@ -0,0 +1,3 @@ +// Useful SVGs +export const PENCIL_SVG = + ''; diff --git a/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts b/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts index 0ece8b4..6dd10de 100644 --- a/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts +++ b/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts @@ -1,4 +1,4 @@ -import { error } from '@sveltejs/kit'; +import { error, redirect } from '@sveltejs/kit'; import type { Actions } from './$types'; import { categoryService, groupService } from '$lib/server/api'; import type { PageServerLoad } from './$types'; @@ -35,6 +35,6 @@ export const actions: Actions = { const category: Category = { id, group_id, name, description, strategy }; await categoryService.save(category, cookies); - return { success: true }; + redirect(302, `/groups/movements/${group_id}`); } }; diff --git a/my-app/src/routes/groups/+page.svelte b/my-app/src/routes/groups/+page.svelte index 3cab6a6..808d0e6 100644 --- a/my-app/src/routes/groups/+page.svelte +++ b/my-app/src/routes/groups/+page.svelte @@ -1,5 +1,6 @@ From 9b30ac4cf5a5d82ca63d98676ee03d016c0bc8c9 Mon Sep 17 00:00:00 2001 From: Borja Garibotti Date: Wed, 22 May 2024 22:10:00 -0300 Subject: [PATCH 2/4] Add breadcrumb (nav) --- .../routes/budgets/details/[[id=integer]]/+page.svelte | 7 +++++++ .../categories/details/[[id=integer]]/+page.server.ts | 5 +++-- .../categories/details/[[id=integer]]/+page.svelte | 7 +++++++ .../routes/groups/budgets/[[id=integer]]/+page.svelte | 10 +++++++++- .../routes/groups/details/[[id=integer]]/+page.svelte | 7 +++++++ .../routes/groups/movements/[id=integer]/+page.svelte | 9 ++++++++- .../spendings/details/[[id=integer]]/+page.svelte | 7 +++++++ 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte b/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte index f55bf5d..2854855 100644 --- a/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte @@ -61,6 +61,13 @@ {title} - Nuevo Presupuesto + +

{#if edit}Editando{:else}Creando{/if} Presupuesto

diff --git a/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts b/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts index 0ece8b4..afc7d08 100644 --- a/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts +++ b/my-app/src/routes/categories/details/[[id=integer]]/+page.server.ts @@ -1,4 +1,4 @@ -import { error } from '@sveltejs/kit'; +import { error, redirect } from '@sveltejs/kit'; import type { Actions } from './$types'; import { categoryService, groupService } from '$lib/server/api'; import type { PageServerLoad } from './$types'; @@ -35,6 +35,7 @@ export const actions: Actions = { const category: Category = { id, group_id, name, description, strategy }; await categoryService.save(category, cookies); - return { success: true }; + + redirect(302, `/groups/movements/${group_id}`); } }; diff --git a/my-app/src/routes/categories/details/[[id=integer]]/+page.svelte b/my-app/src/routes/categories/details/[[id=integer]]/+page.svelte index a218125..5460276 100644 --- a/my-app/src/routes/categories/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/categories/details/[[id=integer]]/+page.svelte @@ -9,6 +9,13 @@ {title} - Nueva Categoría + +

Nueva Categoría

diff --git a/my-app/src/routes/groups/budgets/[[id=integer]]/+page.svelte b/my-app/src/routes/groups/budgets/[[id=integer]]/+page.svelte index b2717a8..ad91cec 100644 --- a/my-app/src/routes/groups/budgets/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/groups/budgets/[[id=integer]]/+page.svelte @@ -13,9 +13,17 @@ {title} - {data.group.name} + +
-

{data.group.name}

+

Presupuestos

{data.group.description}

diff --git a/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte b/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte index 21cc7f3..16319ac 100644 --- a/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte @@ -9,6 +9,13 @@ {title} - Nuevo Grupo + +

Nuevo Grupo

diff --git a/my-app/src/routes/groups/movements/[id=integer]/+page.svelte b/my-app/src/routes/groups/movements/[id=integer]/+page.svelte index bd4cb0a..32f842d 100644 --- a/my-app/src/routes/groups/movements/[id=integer]/+page.svelte +++ b/my-app/src/routes/groups/movements/[id=integer]/+page.svelte @@ -13,9 +13,16 @@ {title} - {data.group.name} + +
-

{data.group.name}

+

Moovimietos

{data.group.description}

diff --git a/my-app/src/routes/spendings/details/[[id=integer]]/+page.svelte b/my-app/src/routes/spendings/details/[[id=integer]]/+page.svelte index e6de24b..b48ba47 100644 --- a/my-app/src/routes/spendings/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/spendings/details/[[id=integer]]/+page.svelte @@ -43,6 +43,13 @@ {title} - Nuevo Gasto + +

Nuevo Gasto

From 72a617513b51ed5d72ce15fdcad97c0cfa2e11b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Thu, 23 May 2024 00:10:29 -0300 Subject: [PATCH 3/4] Fix link --- my-app/src/routes/groups/+page.svelte | 2 +- .../groups/details/[[id=integer]]/+page.server.ts | 10 +++++----- .../groups/details/[[id=integer]]/+page.svelte | 15 +++++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/my-app/src/routes/groups/+page.svelte b/my-app/src/routes/groups/+page.svelte index 808d0e6..df9552a 100644 --- a/my-app/src/routes/groups/+page.svelte +++ b/my-app/src/routes/groups/+page.svelte @@ -28,7 +28,7 @@
{group.name} - {@html PENCIL_SVG} + {@html PENCIL_SVG}

{group.description}

diff --git a/my-app/src/routes/groups/details/[[id=integer]]/+page.server.ts b/my-app/src/routes/groups/details/[[id=integer]]/+page.server.ts index eec7588..9e2f35b 100644 --- a/my-app/src/routes/groups/details/[[id=integer]]/+page.server.ts +++ b/my-app/src/routes/groups/details/[[id=integer]]/+page.server.ts @@ -3,11 +3,11 @@ import type { Actions } from './$types'; import { groupService } from '$lib/server/api'; import type { PageServerLoad } from './$types'; -export const load: PageServerLoad = async ({ params }) => { - const group: Group = { name: '', description: '', id: 0, owner_id: 0 }; - const id = params.id; - if (id) { - // TODO: load real group +export const load: PageServerLoad = async ({ params, cookies }) => { + const id = Number(params.id); + let group: Group = { name: '', description: '', id: 0, owner_id: 0 }; + if (id !== undefined) { + group = await groupService.get(id, cookies) } return { group }; }; diff --git a/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte b/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte index 21cc7f3..9f21406 100644 --- a/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/groups/details/[[id=integer]]/+page.svelte @@ -3,30 +3,37 @@ import type { PageData } from './$types'; export let data: PageData; + const edit = data.group.id !== 0; {title} - Nuevo Grupo -

Nuevo Grupo

+

+ {#if edit}Editando{:else}Creando{/if} Grupo +

- + {#if edit} + + {:else} + + {/if}
From 9015345c11c655e2a3fd4a013d64fa1d4fa41d86 Mon Sep 17 00:00:00 2001 From: Borja Garibotti Date: Thu, 23 May 2024 00:12:38 -0300 Subject: [PATCH 4/4] Update + un/archive groups --- my-app/src/lib/client/alerts.ts | 7 +++ my-app/src/lib/server/api.ts | 12 +++-- my-app/src/routes/api/groups/+server.ts | 11 +++++ .../details/[[id=integer]]/+page.server.ts | 24 ++++----- .../details/[[id=integer]]/+page.svelte | 16 ++---- .../details/[[id=integer]]/+page.server.ts | 9 ++-- .../details/[[id=integer]]/+page.svelte | 2 +- my-app/src/routes/groups/+page.server.ts | 2 +- my-app/src/routes/groups/+page.svelte | 49 ++++++++++++++++--- .../budgets/[[id=integer]]/+page.svelte | 2 +- .../details/[[id=integer]]/+page.server.ts | 11 ++--- .../details/[[id=integer]]/+page.svelte | 19 +++++-- .../movements/[id=integer]/+page.svelte | 6 +-- .../details/[[id=integer]]/+page.server.ts | 12 ++--- .../details/[[id=integer]]/+page.svelte | 16 ++---- my-app/src/types.d.ts | 1 + 16 files changed, 125 insertions(+), 74 deletions(-) create mode 100644 my-app/src/lib/client/alerts.ts create mode 100644 my-app/src/routes/api/groups/+server.ts diff --git a/my-app/src/lib/client/alerts.ts b/my-app/src/lib/client/alerts.ts new file mode 100644 index 0000000..03bc43b --- /dev/null +++ b/my-app/src/lib/client/alerts.ts @@ -0,0 +1,7 @@ +export async function confirmArchiveGroup(group: Group) { + const action = group.is_archived ? 'desarchivar' : 'archivar'; + const message = `¿Querés ${action} el grupo ${group.name}?`; + if (!confirm(message)) return; + await fetch(`/api/groups?groupId=${group.id}&archive=${!group.is_archived}`, { method: 'PUT' }); + location.reload(); +} diff --git a/my-app/src/lib/server/api.ts b/my-app/src/lib/server/api.ts index 897e3ca..2cdd469 100644 --- a/my-app/src/lib/server/api.ts +++ b/my-app/src/lib/server/api.ts @@ -57,10 +57,16 @@ export const userService = { export const groupService = { save: (data: Group, cookies: Cookies) => data.id > 0 - ? put(`group/${data.id}`, data, getAuthHeader(cookies)) + ? put('group', data, getAuthHeader(cookies)) : post('group', data, getAuthHeader(cookies)), - list: (cookies: Cookies) => get('group', getAuthHeader(cookies)), - get: (id: Id, cookies: Cookies) => get(`group/${id}`, getAuthHeader(cookies)) + list: (cookies: Cookies) => + groupService.listAll(cookies).then((data: Group[]) => data.filter((g) => !g.is_archived)), + listAll: (cookies: Cookies) => get('group', getAuthHeader(cookies)), + get: (id: Id, cookies: Cookies) => get(`group/${id}`, getAuthHeader(cookies)), + archive: (id: Id, cookies: Cookies) => + put(`group/${id}/archive`, undefined!, getAuthHeader(cookies)), + unarchive: (id: Id, cookies: Cookies) => + put(`group/${id}/unarchive`, undefined!, getAuthHeader(cookies)) }; export const spendingService = { save: (data: Spending, cookies: Cookies) => diff --git a/my-app/src/routes/api/groups/+server.ts b/my-app/src/routes/api/groups/+server.ts new file mode 100644 index 0000000..bc48824 --- /dev/null +++ b/my-app/src/routes/api/groups/+server.ts @@ -0,0 +1,11 @@ +import { groupService } from '$lib/server/api'; +import type { RequestHandler } from './$types'; + +export const PUT: RequestHandler = async ({ url, cookies, request }) => { + const groupId = Number(url.searchParams.get('groupId')); + const archive = url.searchParams.get('archive') === 'true'; + const body = archive + ? await groupService.archive(groupId, cookies) + : await groupService.unarchive(groupId, cookies); + return new Response(JSON.stringify(body)); +}; diff --git a/my-app/src/routes/budgets/details/[[id=integer]]/+page.server.ts b/my-app/src/routes/budgets/details/[[id=integer]]/+page.server.ts index 3b6fa52..fc7a8fd 100644 --- a/my-app/src/routes/budgets/details/[[id=integer]]/+page.server.ts +++ b/my-app/src/routes/budgets/details/[[id=integer]]/+page.server.ts @@ -7,18 +7,18 @@ import { fixDateString } from '$lib/formatter'; export const load: PageServerLoad = async ({ params, url, cookies }) => { const group_id = Number(url.searchParams.get('group_id')); const id = Number(params.id) || 0; - let budget: Budget = { - id, - amount: 0, - description: '', - start_date: '', - end_date: '', - category_id: 0, - group_id - }; - if (id) { - budget = await budgetService.get(id, cookies); - } + const now = new Date(); + const budget: Budget = id + ? await await budgetService.get(id, cookies) + : { + id, + amount: 0, + description: '', + start_date: now.toJSON(), + end_date: now.toJSON(), + category_id: 0, + group_id + }; const groups: Group[] = await groupService.list(cookies); return { budget, groups }; }; diff --git a/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte b/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte index 2854855..a42e6bf 100644 --- a/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte +++ b/my-app/src/routes/budgets/details/[[id=integer]]/+page.svelte @@ -73,14 +73,14 @@
- +