From afeffe31bd7d0f8333627a972e1d32e64a325b5b Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Fri, 1 Mar 2024 18:17:42 -0500 Subject: reformat fe --- .gitignore | 2 +- db/water.sqlite3 | Bin 36864 -> 0 bytes fe/.prettierrc | 4 + fe/src/App.svelte | 42 ++------- fe/src/lib/Card.svelte | 14 +-- fe/src/lib/Counter.svelte | 10 --- fe/src/lib/DataView.svelte | 177 +++++++++++++++++++------------------- fe/src/lib/Layout.svelte | 77 +++++++++-------- fe/src/lib/LoginForm.svelte | 105 +++++++++++++--------- fe/src/lib/PreferencesForm.svelte | 32 ++++--- fe/src/lib/Table.svelte | 138 ++++++++++++++--------------- fe/src/lib/errors.ts | 6 +- fe/src/lib/utils.ts | 16 ++-- fe/src/main.ts | 2 +- fe/src/stores/auth.ts | 132 ++++++++++++++-------------- fe/src/types.ts | 18 ++-- 16 files changed, 389 insertions(+), 386 deletions(-) delete mode 100644 db/water.sqlite3 create mode 100644 fe/.prettierrc delete mode 100644 fe/src/lib/Counter.svelte diff --git a/.gitignore b/.gitignore index 4e424ad..8a5cdb1 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,4 @@ node_modules/ .env.production.local .env.local - +*.sqlite3 diff --git a/db/water.sqlite3 b/db/water.sqlite3 deleted file mode 100644 index 716c5a4..0000000 Binary files a/db/water.sqlite3 and /dev/null differ diff --git a/fe/.prettierrc b/fe/.prettierrc new file mode 100644 index 0000000..222861c --- /dev/null +++ b/fe/.prettierrc @@ -0,0 +1,4 @@ +{ + "tabWidth": 2, + "useTabs": false +} diff --git a/fe/src/App.svelte b/fe/src/App.svelte index 8811c52..25d53dc 100644 --- a/fe/src/App.svelte +++ b/fe/src/App.svelte @@ -1,40 +1,16 @@
- + {#if !$authenticated} - + {:else} - - {/if} - + + {/if} +
- - diff --git a/fe/src/lib/Card.svelte b/fe/src/lib/Card.svelte index feb5bcc..0835940 100644 --- a/fe/src/lib/Card.svelte +++ b/fe/src/lib/Card.svelte @@ -1,16 +1,16 @@
- {#if title} -

{title}

- {/if} - + {#if title} +

{title}

+ {/if} +
diff --git a/fe/src/lib/Counter.svelte b/fe/src/lib/Counter.svelte deleted file mode 100644 index 979b4df..0000000 --- a/fe/src/lib/Counter.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/fe/src/lib/DataView.svelte b/fe/src/lib/DataView.svelte index dc8acae..1458c9a 100644 --- a/fe/src/lib/DataView.svelte +++ b/fe/src/lib/DataView.svelte @@ -1,126 +1,123 @@ - +
- - - -

Add Water

-
-
- - -
-
- - -
- - -
-
- - {#await json then data} - - {:catch error} -

{error}

- {/await} - + + +

Add Water

+
+
+ + +
+
+ + +
+ + + +
+ + {#await json then data} +
+ {:catch error} +

{error}

+ {/await} + diff --git a/fe/src/lib/Layout.svelte b/fe/src/lib/Layout.svelte index f349632..94ce84d 100644 --- a/fe/src/lib/Layout.svelte +++ b/fe/src/lib/Layout.svelte @@ -1,57 +1,62 @@
- {#if $authenticated} + {#if $authenticated} - {/if} -
- -
+ + {/if} +
+ +
diff --git a/fe/src/lib/LoginForm.svelte b/fe/src/lib/LoginForm.svelte index 499a457..bf6d9ad 100644 --- a/fe/src/lib/LoginForm.svelte +++ b/fe/src/lib/LoginForm.svelte @@ -1,66 +1,85 @@ - -
-
- - -
-
- - -
- {#if error} -

{error}

- {/if} - - +
+
+ + +
+
+ + +
+ {#if error} +

{error}

+ {/if} + +
diff --git a/fe/src/lib/PreferencesForm.svelte b/fe/src/lib/PreferencesForm.svelte index 781866c..95e04c1 100644 --- a/fe/src/lib/PreferencesForm.svelte +++ b/fe/src/lib/PreferencesForm.svelte @@ -1,7 +1,8 @@ - +

User Preferences

- - + +
- - + +
@@ -42,4 +43,9 @@ dialog { background: white; color: black; } + +input[type="color"] { + width: 100%; + height: 100%; +} diff --git a/fe/src/lib/Table.svelte b/fe/src/lib/Table.svelte index 4b81800..3a66e0d 100644 --- a/fe/src/lib/Table.svelte +++ b/fe/src/lib/Table.svelte @@ -1,105 +1,105 @@ +
- {#if title} + {#if title}

{title}

- {/if} - {#if !noheader} + {/if} + {#if !noheader && data} - - {#each getDataKeys(data) as header} - - {/each} - + + {#each getDataKeys(data) as header} + + {/each} + - {/if} - - {#if data} - {#each data as row} + {/if} + + {#if data} + {#each data as row} - {#each getRow(row) as datum} - + {#each getRow(row) as datum} - {/each} + {/each} - {/each} - {:else} - - There is not data. - - {/if} - - {#if !nofooter} + {/each} + {:else} + There is not data. + {/if} + + {#if !nofooter} - + - + - + - {/if} + {/if}
{header}
{header}
{formatDatum(datum)}
Table FooterTable Footer
+ diff --git a/fe/src/lib/errors.ts b/fe/src/lib/errors.ts index 0663d63..d44bec5 100644 --- a/fe/src/lib/errors.ts +++ b/fe/src/lib/errors.ts @@ -1,7 +1,7 @@ export class UnauthorizedError extends Error { - constructor (message?: string , options?: ErrorOptions) { - super(message, options); - } + constructor(message?: string, options?: ErrorOptions) { + super(message, options); + } } diff --git a/fe/src/lib/utils.ts b/fe/src/lib/utils.ts index c5501ae..22d4e9a 100644 --- a/fe/src/lib/utils.ts +++ b/fe/src/lib/utils.ts @@ -1,9 +1,9 @@ -export function processFormInput(form) { - const formData = new FormData(form); - const data = {}; - for (let field of formData) { - const [key, value] = field; - data[key] = value; - } - return data; +export function processFormInput(form: HTMLFormElement) { + const formData = new FormData(form); + const data: Record = {}; + for (let field of formData) { + const [key, value] = field; + data[key] = value; + } + return data; } diff --git a/fe/src/main.ts b/fe/src/main.ts index 8a909a1..ff866d0 100644 --- a/fe/src/main.ts +++ b/fe/src/main.ts @@ -2,7 +2,7 @@ import './app.css' import App from './App.svelte' const app = new App({ - target: document.getElementById('app'), + target: document.getElementById('app') as HTMLElement, }) export default app diff --git a/fe/src/stores/auth.ts b/fe/src/stores/auth.ts index 10e6bd3..0efc80b 100644 --- a/fe/src/stores/auth.ts +++ b/fe/src/stores/auth.ts @@ -5,96 +5,96 @@ import { writable, derived } from 'svelte/store'; type Nullable = T | null; interface User { - uuid: string; - username: string; + uuid: string; + username: string; } interface TokenStore { - subscribe: (run: Subscriber>, invalidate: Invalidator>) => Unsubscriber, - authenticate: (newToken: string) => void, - unauthenticate: () => void + subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber, + authenticate: (newToken: string) => void, + unauthenticate: () => void } interface UserStore { - subscribe: (run: Subscriber>, invalidate: Invalidator>) => Unsubscriber, - setUser: (user: User) => void, - reset: () => void + subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber, + setUser: (user: User) => void, + reset: () => void } interface PreferenceStore { - subscribe: (run: Subscriber>, invalidate: Invalidator>) => Unsubscriber, - set: (this: void, value: Nullable) => void + subscribe: (run: Subscriber, invalidate?: Invalidator) => Unsubscriber, + set: (this: void, value: Preference) => void } function createTokenStore(): TokenStore { - const storedToken = localStorage.getItem("token"); - const { subscribe, set } = writable(storedToken); - - function authenticate(newToken: string): void { - try { - localStorage.setItem("token", newToken); - set(newToken); - } catch (e) { - console.error('error', e); - } + const storedToken = localStorage.getItem("token"); + const { subscribe, set } = writable(storedToken); + + function authenticate(newToken: string): void { + try { + localStorage.setItem("token", newToken); + set(newToken); + } catch (e) { + console.error('error', e); } - - function unauthenticate(): void { - localStorage.removeItem("token"); - set(null); - } - - return { - subscribe, - authenticate, - unauthenticate - }; + } + + function unauthenticate(): void { + localStorage.removeItem("token"); + set(null); + } + + return { + subscribe, + authenticate, + unauthenticate + }; } -function onTokenChange ($token: Nullable): boolean { - return $token ? true : false; +function onTokenChange($token: Nullable): boolean { + return $token ? true : false; } function createUserStore(): UserStore { - const user = localStorage.getItem('user'); - const userObj: Nullable = user ? JSON.parse(user) : null; - const { subscribe, set } = writable(userObj); - - const setUser = (user: User) => { - localStorage.setItem('user', JSON.stringify(user)); - set(user); - } + const user = localStorage.getItem('user'); + const userObj: Nullable = user ? JSON.parse(user) : null; + const { subscribe, set } = writable(userObj); + + const setUser = (user: User) => { + localStorage.setItem('user', JSON.stringify(user)); + set(user); + } + + const reset = () => { + localStorage.removeItem('user'); + set(null); + } + + return { + subscribe, + setUser, + reset + } +} - const reset = () => { - localStorage.removeItem('user'); - set(null); - } - return { - subscribe, - setUser, - reset +function createPreferenceStore(): PreferenceStore { + const preferences = localStorage.getItem('preferences'); + const preferenceObj: Preference = preferences ? JSON.parse(preferences) : { + color: "#FF0000", + size: { + size: 16, + unit: 'oz' } -} + }; + const { subscribe, set } = writable(preferenceObj); -function createPreferenceStore(): PreferenceStore { - const preferences = localStorage.getItem('preferences'); - const preferenceObj: Preference = preferences ? JSON.parse(preferences) : { - color: "#FF0000", - size: { - size: 16, - unit: 'oz' - } - }; - - const { subscribe, set } = writable>(preferenceObj); - - return { - subscribe, - set - } + return { + subscribe, + set + } } export const token = createTokenStore(); diff --git a/fe/src/types.ts b/fe/src/types.ts index 03d613d..526e7eb 100644 --- a/fe/src/types.ts +++ b/fe/src/types.ts @@ -1,14 +1,20 @@ export interface Size { - size: number; - unit: string; + size: number; + unit: string; } export interface Preference { - color: string; - size: Size; + color: string; + size: Size; } export interface User { - name: string; - uuid: string; + name: string; + uuid: string; } + +export interface Statistic { + user_id: string; + date: string; + quantity: number; +} \ No newline at end of file -- cgit v1.1