From 45681abf66e91268b098934eb20ea5f5149d415c Mon Sep 17 00:00:00 2001 From: silvestrevivo Date: Tue, 16 Jun 2020 21:50:24 +0200 Subject: [PATCH 1/5] store created to share data --- src/components/UI/Sidebar.svelte | 120 +++++++++++++++++-------------- src/routes/accounts.svelte | 51 +++++++------ src/store/accounts.js | 14 ++++ 3 files changed, 109 insertions(+), 76 deletions(-) create mode 100644 src/store/accounts.js diff --git a/src/components/UI/Sidebar.svelte b/src/components/UI/Sidebar.svelte index b260a72..142d2ba 100644 --- a/src/components/UI/Sidebar.svelte +++ b/src/components/UI/Sidebar.svelte @@ -1,68 +1,78 @@ - -
+
(toggle = !toggle)} + class="fixed top-0 left-0 w-full h-full z-40 bg-black bg-opacity-75 + cursor-pointer {toggle ? 'hidden' : ''}" /> \ No newline at end of file + --> diff --git a/src/routes/accounts.svelte b/src/routes/accounts.svelte index 95a3fe9..e02fac2 100644 --- a/src/routes/accounts.svelte +++ b/src/routes/accounts.svelte @@ -1,32 +1,41 @@ \ No newline at end of file + {/if} + diff --git a/src/store/accounts.js b/src/store/accounts.js new file mode 100644 index 0000000..a031ec8 --- /dev/null +++ b/src/store/accounts.js @@ -0,0 +1,14 @@ +import { writable } from 'svelte/store'; + +function createAccounts() { + const { subscribe, set, update } = writable([]); + + return { + subscribe, + //increment: () => update(n => n + 1), + //decrement: () => update(n => n - 1), + setupAccounts: (arg) => set(arg) + }; +} + +export const accounts = createAccounts(); From b357d204238d79b3c43a091543d9b450f5370dc0 Mon Sep 17 00:00:00 2001 From: silvestrevivo Date: Wed, 17 Jun 2020 09:24:21 +0200 Subject: [PATCH 2/5] $: projects = accountData.projects; on line 26 to make projects reactive --- src/routes/account/[_id].svelte | 77 ++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/src/routes/account/[_id].svelte b/src/routes/account/[_id].svelte index 550b9e6..29270e8 100644 --- a/src/routes/account/[_id].svelte +++ b/src/routes/account/[_id].svelte @@ -1,49 +1,56 @@ - {accountData.accountName} + {accountData.accountName} -

{accountData.accountName}

    -{#if projects} - {#each projects as project} -
  • - {project.projectName} -
    • -{:else} -
  • -

    No projects found or call has not been made

    -
    • -{/each} -{/if} -
\ No newline at end of file + {#if projects} + {#each projects as project} +
  • + + {project.projectName} + +
    • + {:else} +
  • +

    No projects found or call has not been made

    +
    • + {/each} + {/if} + From 25279f511886c634118230b0b1104892220c71db Mon Sep 17 00:00:00 2001 From: 3daddict Date: Wed, 17 Jun 2020 22:15:05 -0700 Subject: [PATCH 3/5] accountStore created and used globally --- src/components/Nav.svelte | 3 ++- src/components/UI/Sidebar.svelte | 22 +++------------------- src/helpers/accountData.js | 7 ------- src/routes/accounts.svelte | 24 +++--------------------- src/routes/login.svelte | 26 ++++++++++++++++++++------ src/store/accountStore.js | 3 +++ src/store/accounts.js | 2 -- 7 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 src/helpers/accountData.js create mode 100644 src/store/accountStore.js diff --git a/src/components/Nav.svelte b/src/components/Nav.svelte index 6ace459..1d5a015 100644 --- a/src/components/Nav.svelte +++ b/src/components/Nav.svelte @@ -3,6 +3,7 @@ import { goto, stores } from "@sapper/app"; import { post } from "auth.js"; import Sidebar from './UI/Sidebar.svelte'; + import { accountStore } from "../store/accountStore"; const { page, session } = stores(); export let segment; @@ -11,8 +12,8 @@ async function logout() { await post(`auth/logout`); - // $session.user = null; session.set({ token: null, user: null }) + accountStore.set([]); goto("/"); } diff --git a/src/components/UI/Sidebar.svelte b/src/components/UI/Sidebar.svelte index 142d2ba..38c5590 100644 --- a/src/components/UI/Sidebar.svelte +++ b/src/components/UI/Sidebar.svelte @@ -5,26 +5,10 @@ import { fade, fly, slide, scale } from "svelte/transition"; import Button from "./Button.svelte"; const { session } = stores(); - import { accounts } from "../../store/accounts"; + import { accountStore } from "../../store/accountStore"; export let toggle = true; - $: console.log("nav", $accounts); - // let data = []; - - // onMount(async () => { - // ({ data } = await api.get(`accounts/`, $session.token, $session.user._id)) - // }); - - // afterUpdate(() => { - // data = data; - // }) - - // onDestroy(() => { - // data = []; - // }) - - //$: console.log('Sidebar accountData:', data);