From c43224297f983c654d080c3411c5f7311597737e Mon Sep 17 00:00:00 2001 From: prokawsar Date: Thu, 11 Jul 2024 20:40:01 +0600 Subject: [PATCH 01/23] History wip --- package.json | 2 ++ src/lib/elements/Input.svelte | 2 ++ src/lib/stores/index.ts | 14 +++++++++++ src/routes/+layout.svelte | 10 ++++++++ src/routes/+page.svelte | 12 +++++++-- src/routes/history/+page.svelte | 44 +++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 src/lib/stores/index.ts create mode 100644 src/routes/history/+page.svelte diff --git a/package.json b/package.json index 8df64c2..9e1c6e5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,9 @@ "type": "module", "dependencies": { "@fontsource/jost": "^5.0.18", + "dayjs": "^1.11.11", "mixpanel-browser": "^2.53.0", + "svelte-persisted-store": "^0.11.0", "tippy.js": "^6.3.7" } } diff --git a/src/lib/elements/Input.svelte b/src/lib/elements/Input.svelte index 1889c8e..74ba4ee 100644 --- a/src/lib/elements/Input.svelte +++ b/src/lib/elements/Input.svelte @@ -1,9 +1,11 @@ { + return persisted<{ history: PaperHistory[] }>('paper_cost_history', { history: [] }) +} + +export const paperHistoryStore = getPaperStore() diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6824dbf..57052eb 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,4 +1,5 @@ + +
+

History

+
+
+
+ {#if $paperHistoryStore.history.length} + {#each $paperHistoryStore.history as { finalPrice, papers, date }, i} +
+
+

+ {days(date).format('DD-MM-YYYY')} +

+

+ {finalPrice.toFixed(2)} +

+
+ +
+ {/each} + {/if} +
+
+
From 13518c1c5526f4fbae8985a7d633b53c5e3074bc Mon Sep 17 00:00:00 2001 From: prokawsar Date: Thu, 11 Jul 2024 21:05:14 +0600 Subject: [PATCH 02/23] History ID --- src/lib/stores/index.ts | 1 + src/routes/+page.svelte | 1 + src/routes/history/+page.svelte | 26 ++++-------- src/routes/history/[id]/+page.svelte | 59 ++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 src/routes/history/[id]/+page.svelte diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index 3dedd15..2777f75 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -3,6 +3,7 @@ import { persisted } from 'svelte-persisted-store' import type { Writable } from 'svelte/store' export type PaperHistory = { + id: string finalPrice: number date?: Date papers: Paper[] diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 91d8e01..8bcf783 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -45,6 +45,7 @@ // Saving to history $paperHistoryStore.history.push({ + id: makeid(6), finalPrice, date: new Date(), papers: paperCount diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index 10e335a..f124628 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -1,5 +1,4 @@ + +
+

History Details

+

+ {dayjs(data[0].date).format('DD-MM-YYYY hh:mmA')} +

+
+ +
+
+ {#if data.length} + {#each data as history, i} +
+

height

+

width

+

thickness

+

rate

+
+ {#each history.papers as { height, width, thickness, rate }, i} +
+
+ + + + + +
+
+ {/each} + +
+ {#if history.finalPrice} + + {/if} +
+ {/each} + {:else} +

No history details

+ {/if} +
+
+
From 048a72b811115dea4f0f74d270adc2f8d84a0a53 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Thu, 11 Jul 2024 21:10:41 +0600 Subject: [PATCH 03/23] History --- src/routes/+page.svelte | 2 +- src/routes/history/+page.svelte | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 8bcf783..a9087a9 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -83,7 +83,7 @@ Paper Cost Calculator -
+

Paper Cost

diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index f124628..15530f0 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -5,7 +5,12 @@
-

History

+
+

History

+

+ {$paperHistoryStore.history.length} +

+
From a64f305333dfa936d1eeee1e6230c83344ee9e6b Mon Sep 17 00:00:00 2001 From: prokawsar Date: Thu, 11 Jul 2024 21:13:43 +0600 Subject: [PATCH 04/23] Reverse --- src/routes/history/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index 15530f0..b244c42 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -15,7 +15,7 @@
{#if $paperHistoryStore.history.length} - {#each $paperHistoryStore.history as { id, finalPrice, papers, date }, i} + {#each $paperHistoryStore.history.reverse() as { id, finalPrice, papers, date }, i}
From 45ffa99bcd4829d1476bb03d731b3514204d9c36 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Thu, 11 Jul 2024 21:15:33 +0600 Subject: [PATCH 05/23] Remove log --- src/routes/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index a9087a9..1abf278 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -14,7 +14,7 @@ thickness: '', rate: '' } - $: console.log($paperHistoryStore.history) + let paperCount: Paper[] = [{ ...paperFields, id: makeid(5) }] let perPaperResult: Map = new Map() let finalPrice: number = 0 From 03682d16ee43f1073a5968063ffea879549878a4 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Sun, 14 Jul 2024 20:58:40 +0600 Subject: [PATCH 06/23] History wip --- package.json | 1 + src/lib/db/supabaseClient.ts | 4 +++ src/lib/elements/Input.svelte | 3 ++- src/lib/stores/index.ts | 16 ++++-------- src/lib/utils/services.ts | 33 ++++++++++++++++++++++++ src/routes/+layout.svelte | 11 ++++---- src/routes/+page.svelte | 30 ++++++++++++---------- src/routes/history/+page.server.ts | 8 ++++++ src/routes/history/+page.svelte | 23 ++++++++++++----- src/routes/history/[id]/+page.svelte | 38 ++++++++++++++-------------- 10 files changed, 111 insertions(+), 56 deletions(-) create mode 100644 src/lib/db/supabaseClient.ts create mode 100644 src/routes/history/+page.server.ts diff --git a/package.json b/package.json index 9e1c6e5..d618d49 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "type": "module", "dependencies": { "@fontsource/jost": "^5.0.18", + "@supabase/supabase-js": "^2.44.3", "dayjs": "^1.11.11", "mixpanel-browser": "^2.53.0", "svelte-persisted-store": "^0.11.0", diff --git a/src/lib/db/supabaseClient.ts b/src/lib/db/supabaseClient.ts new file mode 100644 index 0000000..d0c0d9f --- /dev/null +++ b/src/lib/db/supabaseClient.ts @@ -0,0 +1,4 @@ +import { PUBLIC_SUPABASE_ANON, PUBLIC_SUPABASE_URL } from '$env/static/public' +import { createClient } from '@supabase/supabase-js' + +export const supabase = createClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON) diff --git a/src/lib/elements/Input.svelte b/src/lib/elements/Input.svelte index 05ec5b5..6cdd1d3 100644 --- a/src/lib/elements/Input.svelte +++ b/src/lib/elements/Input.svelte @@ -6,6 +6,7 @@ export let value: string export let placeholder: string = '' export let disabled: boolean = false + export let classNames: string = '' let inputRef: HTMLInputElement @@ -14,7 +15,7 @@ bind:this={inputRef} {id} {disabled} - class="input-field focus:!border-[1.5px] focus:!border-teal-500 focus:outline-none" + class="input-field focus:!border-[1.5px] focus:!border-teal-500 focus:outline-none {classNames}" type="number" {placeholder} bind:value diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index 92c0287..19666f3 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -1,16 +1,10 @@ -import type { Paper } from '$lib/utils/services' import { persisted } from 'svelte-persisted-store' import { writable, type Writable } from 'svelte/store' +import type { CostHistoryType } from '$lib/utils/services' -export type PaperHistory = { - id: string - finalPrice: number - date?: Date - papers: Paper[] -} -function getPaperStore(): Writable<{ history: PaperHistory[] }> { - return persisted<{ history: PaperHistory[] }>('paper_cost_history', { history: [] }) -} +// function getPaperStore(): Writable { +// return persisted('paper_cost_history', []) +// } -export const paperHistoryStore = getPaperStore() +export const paperHistoryStore = writable([]) export const focusedInputStore: Writable = writable(null) diff --git a/src/lib/utils/services.ts b/src/lib/utils/services.ts index 6a1eaa2..b72428b 100644 --- a/src/lib/utils/services.ts +++ b/src/lib/utils/services.ts @@ -1,3 +1,5 @@ +import { supabase } from '$lib/db/supabaseClient' + export type Paper = { id: string length: string @@ -7,5 +9,36 @@ export type Paper = { [key: string]: string } +export type CostHistoryType = { + id?: string + name: string + papers: Paper[] + final_price: number + created_at?: string +} + export const PAPER_FIXED = 1550000 export const MAX_PAPER = 10 + +export const calculateCost = (paper: Paper): number => { + const paperSize = parseFloat(paper.length) * parseFloat(paper.width) * parseFloat(paper.thickness) + const result = paperSize / PAPER_FIXED + return result * parseFloat(paper.rate) +} + +export const addHistory = async (history: CostHistoryType) => { + const { data, error } = await supabase.from('history').insert({ + name: history.name || '', + papers: history.papers || [], + final_price: history.final_price || 100 + }) + if (!error) { + return data + } + return error +} + +export const deleteHistory = async (id: string) => { + const response = await supabase.from('history').delete().eq('id', id) + return response +} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 3bfb320..834dccd 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,4 +1,5 @@ + + History + +

History

- {$paperHistoryStore.history.length} + {data.histories.length}

- {#if $paperHistoryStore.history.length} - {#each $paperHistoryStore.history.reverse() as { id, finalPrice, papers, date }, i} + {#if data.histories.length} + {#each data.histories.reverse() as { name, id, final_price, papers, created_at }, i}
-

- {days(date).format('DD-MM-YYYY hh:mmA')} +

+ {name} +

+

+ {days(created_at).format('DD-MM-YYYY hh:mmA')}

- {finalPrice.toFixed(2)} + {final_price.toFixed(2)}

diff --git a/src/routes/history/[id]/+page.svelte b/src/routes/history/[id]/+page.svelte index c10e635..200c43b 100644 --- a/src/routes/history/[id]/+page.svelte +++ b/src/routes/history/[id]/+page.svelte @@ -2,37 +2,37 @@ import { page } from '$app/stores' import Input from '$lib/elements/Input.svelte' import Result from '$lib/elements/Result.svelte' - import { paperHistoryStore, type PaperHistory } from '$lib/stores' + import { paperHistoryStore } from '$lib/stores' import dayjs from 'dayjs' + import type { CostHistoryType } from '$lib/utils/services' - const data: PaperHistory[] = $paperHistoryStore.history.filter( + const data: CostHistoryType[] = $paperHistoryStore.filter( (history) => history.id == $page.params.id ) + + History + +

History Details

-

- {dayjs(data[0].date).format('DD-MM-YYYY hh:mmA')} -

+
+

{data[0].name || ''}

+

+ {dayjs(data[0].created_at).format('DD-MM-YYYY hh:mmA')} +

+
-
+
{#if data.length} {#each data as history, i} -
-

height

-

width

-

thickness

-

rate

-
- {#each history.papers as { height, width, thickness, rate }, i} -
+ {#each history.papers as { length, width, thickness, rate }, i} +
- + @@ -46,8 +46,8 @@ {/each}
- {#if history.finalPrice} - + {#if history.final_price} + {/if}
{/each} From 8aed11bef7f34e878fef016fc319015fc2c296d0 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Sun, 14 Jul 2024 21:09:18 +0600 Subject: [PATCH 07/23] Delete history --- src/lib/elements/Input.svelte | 2 +- src/routes/history/+page.svelte | 16 +++++++++++++++- src/routes/history/[id]/+page.svelte | 20 +++++++++++--------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lib/elements/Input.svelte b/src/lib/elements/Input.svelte index 6cdd1d3..d401cfb 100644 --- a/src/lib/elements/Input.svelte +++ b/src/lib/elements/Input.svelte @@ -26,6 +26,6 @@ diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index 1065579..1107e9c 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -1,10 +1,18 @@ @@ -24,7 +32,7 @@ {#if data.histories.length} {#each data.histories.reverse() as { name, id, final_price, papers, created_at }, i}

@@ -36,6 +44,12 @@

{final_price.toFixed(2)}

+
{/each} diff --git a/src/routes/history/[id]/+page.svelte b/src/routes/history/[id]/+page.svelte index 200c43b..17acb58 100644 --- a/src/routes/history/[id]/+page.svelte +++ b/src/routes/history/[id]/+page.svelte @@ -4,7 +4,7 @@ import Result from '$lib/elements/Result.svelte' import { paperHistoryStore } from '$lib/stores' import dayjs from 'dayjs' - import type { CostHistoryType } from '$lib/utils/services' + import { calculateCost, type CostHistoryType } from '$lib/utils/services' const data: CostHistoryType[] = $paperHistoryStore.filter( (history) => history.id == $page.params.id @@ -29,18 +29,20 @@
{#if data.length} {#each data as history, i} - {#each history.papers as { length, width, thickness, rate }, i} -
-
+ {#each history.papers as { length, width, thickness, rate, id }, i} +
+
- +
+

+ = {calculateCost({ length, width, thickness, rate, id }).toFixed(2)} +

+
{/each} From d0c80fc51ba861ad6a0d4af1e7e8cc852e719c48 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Sun, 14 Jul 2024 21:19:26 +0600 Subject: [PATCH 08/23] wip --- src/lib/utils/services.ts | 8 ++++++++ src/routes/history/[id]/+page.server.ts | 8 ++++++++ src/routes/history/[id]/+page.svelte | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 src/routes/history/[id]/+page.server.ts diff --git a/src/lib/utils/services.ts b/src/lib/utils/services.ts index b72428b..bc1db20 100644 --- a/src/lib/utils/services.ts +++ b/src/lib/utils/services.ts @@ -38,6 +38,14 @@ export const addHistory = async (history: CostHistoryType) => { return error } +export const getHistory = async (id: string): Promise => { + const { data, error } = await supabase.from('history').select().eq('id', id) + if (!error) { + return data as unknown as CostHistoryType + } + return null +} + export const deleteHistory = async (id: string) => { const response = await supabase.from('history').delete().eq('id', id) return response diff --git a/src/routes/history/[id]/+page.server.ts b/src/routes/history/[id]/+page.server.ts new file mode 100644 index 0000000..86f6ed6 --- /dev/null +++ b/src/routes/history/[id]/+page.server.ts @@ -0,0 +1,8 @@ +import { getHistory } from '$lib/utils/services' + +export async function load({ params }) { + const data = await getHistory(params.id) + return { + history: data ?? [] + } +} diff --git a/src/routes/history/[id]/+page.svelte b/src/routes/history/[id]/+page.svelte index 17acb58..8be1ebc 100644 --- a/src/routes/history/[id]/+page.svelte +++ b/src/routes/history/[id]/+page.svelte @@ -9,6 +9,9 @@ const data: CostHistoryType[] = $paperHistoryStore.filter( (history) => history.id == $page.params.id ) + + // export let data + // let history: CostHistoryType = data.history[0] From 6d7174248f41b2c7c01f9089fbf7b974e7aa7ee9 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Mon, 15 Jul 2024 07:20:01 +0600 Subject: [PATCH 09/23] logo update --- static/logo.jpeg | Bin 7233 -> 7540 bytes static/logo.png | Bin 3041 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/logo.png diff --git a/static/logo.jpeg b/static/logo.jpeg index 76611a2ffb7ebf356aedeeeb2121746378eaa1f0..e3e6798f4c9862af750b5c2b28a95f5636113868 100644 GIT binary patch delta 6419 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 M?EUlKDX}O22T=|mQ~&?~ delta 6102 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 Date: Mon, 15 Jul 2024 07:54:35 +0600 Subject: [PATCH 10/23] Loader --- src/lib/elements/Loader.svelte | 5 +++ src/routes/history/+page.svelte | 63 ++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 src/lib/elements/Loader.svelte diff --git a/src/lib/elements/Loader.svelte b/src/lib/elements/Loader.svelte new file mode 100644 index 0000000..449749f --- /dev/null +++ b/src/lib/elements/Loader.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index 1107e9c..3b2dd25 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -1,17 +1,21 @@ @@ -28,33 +32,42 @@
-
- {#if data.histories.length} - {#each data.histories.reverse() as { name, id, final_price, papers, created_at }, i} -
- -

- {name} -

-

- {days(created_at).format('DD-MM-YYYY hh:mmA')} -

-

- {final_price.toFixed(2)} -

- - -
- {/each} +

+ {name} +

+

+ {days(created_at).format('DD-MM-YYYY hh:mmA')} +

+

+ {final_price.toFixed(2)} +

+ + +
+ {/each} + {:else} +

No history yet

+ {/if} {:else} -

No history yet

+
+ +
{/if}
From e965a3cfe98b1896fe62922ce416a2a7a9a138c4 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Mon, 15 Jul 2024 08:05:06 +0600 Subject: [PATCH 11/23] Delete confirm --- src/routes/history/+page.svelte | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index 3b2dd25..a769468 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -8,6 +8,7 @@ export let data let isLoading = false + let deleteConfirm = false $paperHistoryStore = data.histories @@ -52,12 +53,29 @@

{final_price.toFixed(2)}

- +
+ + {#if deleteConfirm} + + + {/if} +
{/each} From 69057d90f05ef153189d59ad87f5856c5da5c063 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Mon, 15 Jul 2024 08:14:31 +0600 Subject: [PATCH 12/23] ui --- src/routes/history/+page.svelte | 12 ++++++------ src/routes/history/[id]/+page.svelte | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/routes/history/+page.svelte b/src/routes/history/+page.svelte index a769468..725987b 100644 --- a/src/routes/history/+page.svelte +++ b/src/routes/history/+page.svelte @@ -44,32 +44,32 @@ href="/history/{id}" class="flex flex-row items-center pl-1 justify-between w-full" > -

+

{name}

-

+

{days(created_at).format('DD-MM-YYYY hh:mmA')}

-

+

{final_price.toFixed(2)}

{#if deleteConfirm}
+
From a7997f4b8fb8cf4cb901fc1c411073a7d0b63025 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Mon, 15 Jul 2024 08:49:15 +0600 Subject: [PATCH 14/23] get single --- src/lib/utils/services.ts | 4 +- src/routes/(app)/history/[id]/+page.server.ts | 2 +- src/routes/(app)/history/[id]/+page.svelte | 41 ++++++++----------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/lib/utils/services.ts b/src/lib/utils/services.ts index bc1db20..b27fb3f 100644 --- a/src/lib/utils/services.ts +++ b/src/lib/utils/services.ts @@ -38,10 +38,10 @@ export const addHistory = async (history: CostHistoryType) => { return error } -export const getHistory = async (id: string): Promise => { +export const getHistory = async (id: string): Promise => { const { data, error } = await supabase.from('history').select().eq('id', id) if (!error) { - return data as unknown as CostHistoryType + return data as unknown as CostHistoryType[] } return null } diff --git a/src/routes/(app)/history/[id]/+page.server.ts b/src/routes/(app)/history/[id]/+page.server.ts index 86f6ed6..8bf4f99 100644 --- a/src/routes/(app)/history/[id]/+page.server.ts +++ b/src/routes/(app)/history/[id]/+page.server.ts @@ -3,6 +3,6 @@ import { getHistory } from '$lib/utils/services' export async function load({ params }) { const data = await getHistory(params.id) return { - history: data ?? [] + history: data ? data[0] : null } } diff --git a/src/routes/(app)/history/[id]/+page.svelte b/src/routes/(app)/history/[id]/+page.svelte index 86e1c90..6496920 100644 --- a/src/routes/(app)/history/[id]/+page.svelte +++ b/src/routes/(app)/history/[id]/+page.svelte @@ -1,17 +1,12 @@ @@ -21,18 +16,18 @@

Cost Details

-
-

{data[0].name || ''}

-

- {dayjs(data[0].created_at).format('DD-MM-YYYY hh:mmA')} -

-
+ {#if history} +
+

{history.name || ''}

+

+ {dayjs(history.created_at).format('DD-MM-YYYY hh:mmA')} +

+
-
-
- {#if data.length} - {#each data as history, i} - {#each history.papers as { length, width, thickness, rate, id }, i} +
+
+ {#if history.papers.length} + {#each history.papers as { length, width, thickness, rate, id }}
{/if}
- {/each} - {:else} -

No history details

- {/if} + {/if} +
-
+ {:else} +

No cost history details

+ {/if}
From 8173eb9e03d45b033162ffbd840c6a44075379c9 Mon Sep 17 00:00:00 2001 From: prokawsar Date: Mon, 15 Jul 2024 09:08:31 +0600 Subject: [PATCH 15/23] login ui --- src/lib/elements/Button.svelte | 13 +++++++++++ src/lib/elements/Input.svelte | 3 +-- src/routes/auth/login/+page.svelte | 35 ++++++++++++++++++++++++++---- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/lib/elements/Button.svelte b/src/lib/elements/Button.svelte index 6c8230f..d8f9d56 100644 --- a/src/lib/elements/Button.svelte +++ b/src/lib/elements/Button.svelte @@ -1,11 +1,24 @@