Bhasher/focus
Bhasher
/
focus
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases 6 Activity

Optimize tags

This commit is contained in:
Brieuc Dubois 2023-12-29 03:21:10 +01:00
parent c4b41d79a2
commit aaef1cb67d
4 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/db/cards.go
View File

@ -16,19 +16,26 @@ func CreateCard(c types.Card) (int, error) {
return int(id), nil
}
func GetAllCardsOf(projectID int) ([]types.Card, error) {
func GetAllCardsOf(projectID int) ([]types.FullCard, error) {
rows, err := db.Query("SELECT * FROM cards WHERE project_id = ?", projectID)
if err != nil {
return nil, err
}
defer rows.Close()
var cards []types.Card
var cards []types.FullCard
for rows.Next() {
var c types.Card
var c types.FullCard
if err := rows.Scan(&c.ID, &c.ProjectID, &c.Title, &c.Content); err != nil {
return nil, err
}
tags, err := GetAllTagsOfCard(c.ID)
if err != nil {
return nil, err
}
c.Tags = tags
cards = append(cards, c)
}
@ -39,14 +46,20 @@ func GetAllCardsOf(projectID int) ([]types.Card, error) {
return cards, nil
}
func GetCard(id int) (*types.Card, error) {
var c types.Card
func GetCard(id int) (*types.FullCard, error) {
var c types.FullCard
err := db.QueryRow("SELECT * FROM cards WHERE id = ?", id).Scan(&c.ID, &c.ProjectID, &c.Title, &c.Content)
if err != nil {
return nil, err
}
tags, err := GetAllTagsOfCard(id)
if err != nil {
return nil, err
}
c.Tags = tags
return &c, nil
}

8
backend/types/card.go
View File

@ -6,3 +6,11 @@ type Card struct {
Title string `json:"title"`
Content string `json:"content"`
}
type FullCard struct {
ID int `json:"id"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Content string `json:"content"`
Tags []FullCardTag `json:"tags"`
}

32
frontend/src/components/card.svelte
View File

@ -8,31 +8,21 @@
id: number;
title: string;
content: string;
tags: Tag[];
}
export let card: Card = {
id: 0,
title: 'No title',
content: 'Nocontent'
};
interface FullTag {
interface Tag {
tag_id: number;
tag_title: string;
value: string;
}
let tags: FullTag[];
onMount(async () => {
const response = await axios.get(`${backend}/api/cardtags/${card.id}`);
if (response.data.status === 'ok') {
tags = response.data.data;
} else {
console.error(response.data);
}
});
export let card: Card = {
id: 0,
title: 'No title',
content: 'Nocontent',
tags: []
};
</script>
<svelte:head>
@ -41,11 +31,9 @@
<div class="card" draggable={true}>
<div class="title">{card.title}</div>
{#if tags}
{#if card.tags}
<div class="tags">
<!-- <span class="tag" style="background-color: #874d45;">HIGH</span>
<span class="tag" style="background-color: #4a8645;">PERSONAL</span> -->
{#each tags as tag}
{#each card.tags as tag}
<span class="tag" style="border: 1px solid #333">{tag.value}</span>
{/each}
</div>

80
frontend/src/components/project.svelte
View File

@ -1,56 +1,62 @@
<script lang="ts">
import axios from "axios";
import { onMount } from "svelte";
import Card from "./card.svelte";
import axios from 'axios';
import { onMount } from 'svelte';
import Card from './card.svelte';
export let projectId: number = 0;
export let projectId: number = 0;
const backend = 'http://127.0.0.1:3000';
const backend = 'http://127.0.0.1:3000';
interface Project {
id: number | undefined,
title: string,
}
interface Project {
id: number | undefined;
title: string;
}
interface Tag {
tag_id: number;
tag_title: string;
value: string;
}
interface Card {
id: number,
title: string,
content: string,
}
interface Card {
id: number;
title: string;
content: string;
tags: Tag[];
}
let project: Project;
let cards: Card[];
let project: Project;
let cards: Card[];
onMount(async () => {
let response = await axios.get(`${backend}/api/project/${projectId}`);
onMount(async () => {
let response = await axios.get(`${backend}/api/project/${projectId}`);
project = response.data;
project = response.data;
response = await axios.get(`${backend}/api/cards/${projectId}`)
response = await axios.get(`${backend}/api/cards/${projectId}`);
if(response.data.status === "ok") {
cards = response.data.data;
} else {
console.error(response.data)
}
})
if (response.data.status === 'ok') {
cards = response.data.data;
} else {
console.error(response.data);
}
});
</script>
<svelte:head>
<link rel="stylesheet" type="text/css" href="/css/project.css" />
<link rel="stylesheet" type="text/css" href="/css/project.css" />
</svelte:head>
{#if project}
<div id="project">
<h2>{project.title}</h2>
<div id="project">
<h2>{project.title}</h2>
<ul>
{#if cards}
{#each cards as card}
<Card {card} />
{/each}
{/if}
</ul>
</div>
<ul>
{#if cards}
{#each cards as card}
<Card {card} />
{/each}
{/if}
</ul>
</div>
{/if}