Progress

4 files changed, 46 insertions, 29 deletions

diff --git a/app/src/routes/+page.server.ts b/app/src/routes/+page.server.ts
new file mode 100644
index 0000000..0d6016b
--- /dev/null
+++ b/app/src/routes/+page.server.ts
@@ -0,0 +1,14 @@
+import type { PageServerLoad } from './$types';
+import { get_budgets } from '$lib/server/actual';
+import sb1 from "$lib/server/sb1"
+
+export const load = (async () => {
+    return {
+        actual: {
+            meta: await get_budgets()
+        },
+        sb1: {
+            accounts: (await sb1.data.get_accounts())?.accounts
+        }
+    };
+}) satisfies PageServerLoad;
\ No newline at end of file
diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte
index e89df9b..26db3e4 100644
--- a/app/src/routes/+page.svelte
+++ b/app/src/routes/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import Button from "$lib/ui/button.svelte";
-    import { onMount } from "svelte";
-    import { clear_auth_session, get_accounts, get_transactions, init_auth_session, is_ready } from "./sb1.remote";
-    import { get_actual_meta } from "./actual.remote";
+    import { clear_auth_session, get_transactions, init_auth_session } from "./sb1.remote";
+    import type { PageProps } from "./$types";
 
     let navigating = $state(false);
+    let { data }: PageProps = $props();
 
     async function authorize() {
         navigating = true;
@@ -16,23 +16,16 @@
     async function logout() {
         await clear_auth_session();
     }
-
-    onMount(async () => {
-        await get_actual_meta();
-    });
 </script>
 
 <main>
-    {#if await is_ready()}
-        {@const accounts = await get_accounts()}
-        {@const actual_meta = await get_actual_meta()}
-        {#if accounts}
-            {#each accounts?.accounts as account}
-                {@const transactions = await get_transactions(account.key)}
+    {#if data.sb1.accounts?.length}
+        <ul>
+            {#each data.sb1.accounts as account}
                 <li>{account.name}</li>
-                {#if transactions?.length}
+                {#if (await get_transactions(account.key))?.length}
                     <ul>
-                        {#each transactions as transaction}
+                        {#each await get_transactions(account.key) as transaction}
                             <li>{JSON.stringify(transaction)}</li>
                         {/each}
                     </ul>
@@ -40,12 +33,22 @@
                     <small>Ingen transaksjoner</small>
                 {/if}
             {/each}
-        {/if}
-        {#if actual_meta}
-            <pre>{JSON.stringify(actual_meta, null, 2)}</pre>
-        {/if}
+        </ul>
         <Button onclick={logout}>Logg ut</Button>
     {:else}
         <Button onclick={authorize} loading={navigating}>Autentisér hos Sparebanken 1</Button>
     {/if}
+
+    {#if data.actual.meta}
+        <pre>{JSON.stringify(data.actual.meta, null, 2)}</pre>
+    {/if}
 </main>
+
+<style>
+    main {
+        display: flex;
+        justify-content: center;
+        width: 100%;
+        height: 90vh;
+    }
+</style>
diff --git a/app/src/routes/actual.remote.ts b/app/src/routes/actual.remote.ts
index 4bd70b4..9560d4d 100644
--- a/app/src/routes/actual.remote.ts
+++ b/app/src/routes/actual.remote.ts
@@ -5,7 +5,7 @@ import { existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 
 async function init_actual() {
-    const dataDir = path.resolve(__dirname, "actualDataDir");
+    const dataDir = path.resolve(import.meta.dirname, "actualDataDir");
 
     if (!existsSync(dataDir)) mkdirSync(dataDir);
 
@@ -19,4 +19,4 @@ async function init_actual() {
 export const get_actual_meta = query(async () => {
     await init_actual()
     return await actual.getBudgets()
-})
\ No newline at end of file
+})
diff --git a/app/src/routes/sb1.remote.ts b/app/src/routes/sb1.remote.ts
index d2eb0cc..c3967c1 100644
--- a/app/src/routes/sb1.remote.ts
+++ b/app/src/routes/sb1.remote.ts
@@ -8,24 +8,24 @@ const init_auth_session = command(async () => {
     return await sb1.auth.init_auth_session()
 })
 
-const is_ready = query(async () => {
-    return await sb1.auth.is_ready()
+const is_ready = query(() => {
+    return sb1.auth.is_ready()
 })
 
-const get_accounts = query(async () => {
-    return await sb1.data.get_accounts()
+const get_accounts = query(() => {
+    return sb1.data.get_accounts()
 })
 
-const get_transactions = query(v.string(), async (accountKey: string) => {
-    return await sb1.data.get_transactions(accountKey)
+const get_transactions = query(v.string(), (accountKey: string) => {
+    return sb1.data.get_transactions(accountKey)
 })
 
 const clear_auth_session = query(async () => {
     await db.delete(syncSession)
 })
 
-const get_auth_info = query(async () => {
-    return await sb1.auth.get_auth_info()
+const get_auth_info = query(() => {
+    return sb1.auth.get_auth_info()
 })
 
 const refresh_tokem = command(async () => {