From 44ce8eb0c05206d2d15ad2a9d2f94975e87eb08d Mon Sep 17 00:00:00 2001 From: Dovi Cowan Date: Wed, 18 Oct 2023 00:08:23 +0100 Subject: [PATCH] added taken_by_name + some links --- src/routes/Home.svelte | 3 ++- src/routes/Lists/ListMembers.svelte | 1 + src/routes/Lists/ListView.svelte | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/routes/Home.svelte b/src/routes/Home.svelte index 11399d4..8b5aae9 100644 --- a/src/routes/Home.svelte +++ b/src/routes/Home.svelte @@ -36,8 +36,9 @@ > {/if} {#each lists.documents as list} - {list['title']} + {list['title']}
{/each} + Create new list {/await} diff --git a/src/routes/Lists/ListMembers.svelte b/src/routes/Lists/ListMembers.svelte index c6a032c..819156e 100644 --- a/src/routes/Lists/ListMembers.svelte +++ b/src/routes/Lists/ListMembers.svelte @@ -35,6 +35,7 @@ {#await members} Loading... {:then members} + Back to {members.memberships[0].teamName}
{#each members.memberships as member}
{member.userName} - {member.userEmail} diff --git a/src/routes/Lists/ListView.svelte b/src/routes/Lists/ListView.svelte index a00f521..b0d281a 100644 --- a/src/routes/Lists/ListView.svelte +++ b/src/routes/Lists/ListView.svelte @@ -2,7 +2,7 @@ import { ID, Permission, Query, Role } from "appwrite"; import Header from "../../lib/Header.svelte"; import { database, loggedInUser } from "../../lib/appwrite"; - import { Link } from "svelte-navigator"; + import { Link } from "svelte-navigator"; export let id; @@ -33,11 +33,11 @@ perek: perek, taken: true, taken_by: loggedInUser["$id"], + taken_by_name: loggedInUser['name'] }, [ Permission.read(Role.team(id)), Permission.write(Role.user(loggedInUser["$id"])), - Permission.write(Role.team("admins-" + id)), ], ) .then(() => { @@ -111,7 +111,7 @@ {:then list}

List {list.title}


- Members
+ Members
{#await perakimPromise then perakimResolved} {#each Array.from(Array(150 + 1).keys()).slice(1) as i} {#if perekIndex(i) !== -1} @@ -141,8 +141,10 @@ class="dark:bg-gray-600 bg-gray-400 border p-1 mt-2 rounded" >Uncomplete + {:else if perakim[perekIndex(i)].completed == false} + Perek {i} - Taken by {perakim[perekIndex(i)].taken_by_name} {:else} - Perek {i} - Taken + Perek {i} - Completed by {perakim[perekIndex(i)].taken_by_name} {/if} {:else} Perek {i}