From e7b34fc1b43cfff2fd2ecf4ed26202a71a12cc2f Mon Sep 17 00:00:00 2001 From: Bhasher Date: Sun, 7 Jan 2024 19:46:19 +0100 Subject: [PATCH] Header fixed --- frontend/src/lib/api/projectsApi.ts | 14 ++-- .../src/lib/components/menu/GroupMenu.svelte | 15 ++-- .../src/lib/components/menu/SortMenu.svelte | 15 ++-- .../src/lib/components/project/Header.svelte | 73 +++++++------------ .../src/lib/components/project/Project.svelte | 25 +------ frontend/src/lib/stores/currentView.ts | 3 +- frontend/src/lib/types/Card.ts | 44 ++++++----- frontend/src/lib/types/View.ts | 37 ++++++++++ frontend/src/routes/[project]/+page.svelte | 4 +- 9 files changed, 122 insertions(+), 108 deletions(-) diff --git a/frontend/src/lib/api/projectsApi.ts b/frontend/src/lib/api/projectsApi.ts index 49de037..9747486 100644 --- a/frontend/src/lib/api/projectsApi.ts +++ b/frontend/src/lib/api/projectsApi.ts @@ -1,4 +1,4 @@ -import type Card from '$lib/types/Card'; +import Card from '$lib/types/Card'; import Project from '$lib/types/Project'; import ProjectTag from '$lib/types/ProjectTag'; import View from '$lib/types/View'; @@ -65,15 +65,15 @@ async function delete_(projectId: number): Promise { return true; } -async function getCards(projectId: number): Promise { - const response = await api.get(`/v1/projects/${projectId}/cards`); +async function getCards(project: Project): Promise { + const response = await api.get(`/v1/projects/${project.id}/cards`); if (response.status !== status.OK) { processError(response, 'Failed to fetch cards'); - return Promise.reject(); + return []; } - return parseCards(response.data); + return Card.parseAll(response.data, project); } async function getTags(project: Project): Promise { @@ -95,9 +95,7 @@ async function getViews(project: Project): Promise { return []; } - const views: View[] = View.parseAll(response.data, project); - - return views; + return View.parseAll(response.data, project); } export default { diff --git a/frontend/src/lib/components/menu/GroupMenu.svelte b/frontend/src/lib/components/menu/GroupMenu.svelte index 068ea40..5f08474 100644 --- a/frontend/src/lib/components/menu/GroupMenu.svelte +++ b/frontend/src/lib/components/menu/GroupMenu.svelte @@ -1,27 +1,28 @@ {#each choices as choice}
onChoice(choice.id)} + on:click={() => onChoice(choice)} role="button" tabindex="0" on:keypress={(e) => { if (e.key === 'Enter') { - onChoice(choice.id); + onChoice(choice); } }} > - {choice.value} - {#if currentChoice === choice.id} + {choice.title} + {#if currentChoice === choice} ✓ {/if}
diff --git a/frontend/src/lib/components/menu/SortMenu.svelte b/frontend/src/lib/components/menu/SortMenu.svelte index cc05686..eba90a8 100644 --- a/frontend/src/lib/components/menu/SortMenu.svelte +++ b/frontend/src/lib/components/menu/SortMenu.svelte @@ -1,10 +1,11 @@ @@ -12,17 +13,17 @@ {#each choices as choice}
onChoice(choice.id)} + on:click={() => onChoice(choice)} role="button" tabindex="0" on:keypress={(e) => { if (e.key === 'Enter') { - onChoice(choice.id); + onChoice(choice); } }} > - {choice.value} - {#if currentChoice === choice.id} + {choice.title} + {#if currentChoice === choice} {#if currentDirection === 1} ↑ diff --git a/frontend/src/lib/components/project/Header.svelte b/frontend/src/lib/components/project/Header.svelte index 95552cb..32720bf 100644 --- a/frontend/src/lib/components/project/Header.svelte +++ b/frontend/src/lib/components/project/Header.svelte @@ -1,49 +1,35 @@ {#if project}
- {#if view} -
- {#if cards} + {#if $currentView} +
+ {#if $cards}
{#if view.primary_tag_id} {#each $projectTags[view.primary_tag_id].options as option} diff --git a/frontend/src/lib/stores/currentView.ts b/frontend/src/lib/stores/currentView.ts index 57a6732..821201c 100644 --- a/frontend/src/lib/stores/currentView.ts +++ b/frontend/src/lib/stores/currentView.ts @@ -5,5 +5,6 @@ const { subscribe, set, update } = writable(null as View | null); export default { subscribe, - set + set, + reload: () => update((v) => v) }; diff --git a/frontend/src/lib/types/Card.ts b/frontend/src/lib/types/Card.ts index 97b2f35..bd7ac6f 100644 --- a/frontend/src/lib/types/Card.ts +++ b/frontend/src/lib/types/Card.ts @@ -1,25 +1,27 @@ import cardsApi from '$lib/api/cardsApi'; import { get, writable } from 'svelte/store'; import CardTag from './CardTag'; +import Project from './Project'; +import { toastAlert } from '$lib/utils/toasts'; -const cards = writable([] as Card[]); +export const cards = writable([] as Card[]); export default class Card { private _id: number; - private _project_id: number; + private _project: Project; private _title: string; private _content: string; private _tags: CardTag[]; private constructor( id: number, - project_id: number, + project: Project, title: string, content: string, tags: CardTag[] ) { this._id = id; - this._project_id = project_id; + this._project = project; this._title = title; this._content = content; this._tags = tags; @@ -29,8 +31,8 @@ export default class Card { return this._id; } - get project_id(): number { - return this._project_id; + get project(): Project { + return this._project; } get title(): string { @@ -45,10 +47,6 @@ export default class Card { return this._tags; } - static getAll(): Card[] { - return get(cards); - } - static fromId(id: number): Card | null { for (const card of get(cards)) { if (card.id === id) { @@ -59,12 +57,12 @@ export default class Card { return null; } - static async create(project_id: number): Promise { - const id = await cardsApi.create(project_id); + static async create(project: Project): Promise { + const id = await cardsApi.create(project.id); if (!id) return null; - const card = new Card(id, project_id, 'Untilted', '', []); + const card = new Card(id, project, 'Untilted', '', []); cards.update((cards) => [...cards, card]); @@ -81,12 +79,21 @@ export default class Card { return true; } - static parse(json: any): Card | null { + static parse(json: any): Card | null; + static parse(json: any, project: Project | null | undefined): Card | null; + + static parse(json: any, project?: Project | null | undefined): Card | null { if (json === null) { return null; } - const card = new Card(json.id, json.project_id, json.title, json.content, []); + if (!project) project = Project.fromId(json.project_id); + if (!project) { + toastAlert('Failed to parse card: project not found'); + return null; + } + + const card = new Card(json.id, project, json.title, json.content, []); card._tags = CardTag.parseAll(json.tags, card); @@ -101,7 +108,10 @@ export default class Card { return card; } - static parseAll(json: any): Card[] { + static parseAll(json: any): Card[]; + static parseAll(json: any, project: Project | null): Card[]; + + static parseAll(json: any, project?: Project | null): Card[] { if (json === null) { return []; } @@ -109,7 +119,7 @@ export default class Card { const cards: Card[] = []; for (const jsonCard of json) { - const card = this.parse(jsonCard); + const card = this.parse(jsonCard, project); if (!card) continue; cards.push(card); } diff --git a/frontend/src/lib/types/View.ts b/frontend/src/lib/types/View.ts index 6193abd..70e1d60 100644 --- a/frontend/src/lib/types/View.ts +++ b/frontend/src/lib/types/View.ts @@ -61,6 +61,43 @@ export default class View { return this._sortDirection; } + async setPrimaryTag(projectTag: ProjectTag): Promise { + const response = await viewsApi.update( + this.id, + this.project.id, + projectTag.id, + this.secondaryTag?.id || null, + this.title, + this.sortTag?.id || null, + this.sortDirection || null + ); + + if (!response) return false; + + this._pimaryTag = projectTag; + + return true; + } + + async setSortTag(projectTag: ProjectTag, direction: number): Promise { + const response = await viewsApi.update( + this.id, + this.project.id, + this.primaryTag?.id || null, + this.secondaryTag?.id || null, + this.title, + projectTag.id, + direction + ); + + if (!response) return false; + + this._sortTag = projectTag; + this._sortDirection = direction; + + return true; + } + static async create(project: Project) { const id = await viewsApi.create(project); diff --git a/frontend/src/routes/[project]/+page.svelte b/frontend/src/routes/[project]/+page.svelte index a169935..ddddb6f 100644 --- a/frontend/src/routes/[project]/+page.svelte +++ b/frontend/src/routes/[project]/+page.svelte @@ -5,6 +5,7 @@ import type Project from '$lib/types/Project'; import { SvelteToast } from '@zerodevx/svelte-toast'; import { onMount } from 'svelte'; + import ProjectComponent from '$lib/components/project/Project.svelte'; let projectId: number = +$page.params.project; @@ -19,13 +20,14 @@ await projectsApi.getTags(project); await projectsApi.getViews(project); + await projectsApi.getCards(project); }); {#if project}
- +
{/if}