diff --git a/client/src/lib/ui/daterangepicker/daterangepicker.svelte b/client/src/lib/ui/daterangepicker/daterangepicker.svelte index a702244..d01cad5 100644 --- a/client/src/lib/ui/daterangepicker/daterangepicker.svelte +++ b/client/src/lib/ui/daterangepicker/daterangepicker.svelte @@ -41,7 +41,11 @@
{#if value && value.start} diff --git a/client/src/lib/ui/tabs/tabs-list.svelte b/client/src/lib/ui/tabs/tabs-list.svelte index 4011101..f3c92a6 100644 --- a/client/src/lib/ui/tabs/tabs-list.svelte +++ b/client/src/lib/ui/tabs/tabs-list.svelte @@ -9,7 +9,7 @@ bind:ref data-slot="tabs-list" class={cn( - 'bg-based inline-flex h-9 w-fit items-center justify-center gap-1 rounded-lg p-[3px]', + 'bg-based inline-flex h-11 w-fit items-center justify-center gap-1 rounded-lg p-[3px]', className )} {...restProps} diff --git a/client/src/routes/(app)/+layout.svelte b/client/src/routes/(app)/+layout.svelte index b8c3266..4b81652 100644 --- a/client/src/routes/(app)/+layout.svelte +++ b/client/src/routes/(app)/+layout.svelte @@ -1,4 +1,5 @@
- - { get.submit(); @@ -65,6 +63,8 @@ get.submit(); }} /> + +
{#snippet editModal(item: Item)} @@ -260,9 +260,7 @@
- {#if get.loading() && get.output.items.length == 0} - Loading - {:else} + {#if get.output.items.length > 0} {#each get.output.items as item (item.id)}
diff --git a/client/src/routes/auth/+page.svelte b/client/src/routes/auth/+page.svelte index b0e9bb6..e8f56f3 100644 --- a/client/src/routes/auth/+page.svelte +++ b/client/src/routes/auth/+page.svelte @@ -17,6 +17,9 @@ let tabValue = $state('login'); async function redirect() { + localStorage.setItem('username', login.input.username); + login.input.password = ''; + if (page.url.searchParams.has('redir')) { const uri = decodeURIComponent(page.url.searchParams.get('redir')!); await goto(uri); @@ -27,6 +30,10 @@ } const login = coolForm(AuthClient, AuthService.method.login, { + init: { + username: localStorage.getItem('username') ?? '' + }, + reset: false, onResult: () => { redirect(); } @@ -93,7 +100,7 @@
{#if login.input.username} - + {/if}
diff --git a/client/vite.config.ts b/client/vite.config.ts index afd1aec..57458a5 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -15,6 +15,9 @@ export default defineConfig({ changeOrigin: true } }, + fs: { + allow: ['package.json'] + }, host: '0.0.0.0' } }); diff --git a/server/cmd/trevstack/main.go b/server/cmd/trevstack/main.go index 4420cc1..7d32de9 100644 --- a/server/cmd/trevstack/main.go +++ b/server/cmd/trevstack/main.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "log" - "log/slog" "net/http" "net/url" "os" @@ -30,9 +29,6 @@ import ( ) func main() { - logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{})) - slog.SetDefault(logger) - // Get env env, err := getEnv() if err != nil { @@ -91,7 +87,7 @@ func main() { signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) go func() { sig := <-sigs - slog.Warn(fmt.Sprintf("Received signal %s, exiting", sig)) + log.Printf("Received signal %s, exiting", sig) // Close HTTP server ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) @@ -120,7 +116,7 @@ type env struct { func getEnv() (*env, error) { err := godotenv.Load() if err != nil { - slog.Warn("Failed to load .env file, using environment variables") + log.Println("Failed to load .env file, using environment variables") } // Create