Skip to content

Commit 3813b39

Browse files
committed
Add addressFound to ysws review page
1 parent a885694 commit 3813b39

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,28 @@ export async function load({ locals, params }) {
8989
.where(and(eq(devlog.projectId, queriedProject.project.id), eq(devlog.deleted, false)))
9090
.orderBy(asc(devlog.createdAt));
9191

92+
const [queriedUser] = await db
93+
.select({
94+
id: user.id,
95+
idvToken: user.idvToken
96+
})
97+
.from(user).where(eq(user.id, queriedProject.user.id))
98+
.limit(1);
99+
100+
let userData;
101+
try {
102+
const token = decrypt(queriedUser.idvToken!);
103+
userData = await getUserData(token);
104+
} catch {
105+
userData = null;
106+
}
107+
const addresses = userData.addresses ?? [];
108+
const address = addresses.find((address: { primary: boolean }) => address.primary);
109+
92110
return {
93111
project: queriedProject,
94112
devlogs,
113+
addressFound: address ? true : false,
95114
reviews: await getReviewHistory(id),
96115
filamentUsed: await getLatestPrintFilament(id)
97116
};

src/routes/dashboard/admin/ysws-review/[id]/+page.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Spinny3DPreview from '$lib/components/Spinny3DPreview.svelte';
99
import { Download } from '@lucide/svelte';
1010
import ReviewHistory from '../../ReviewHistory.svelte';
11-
import { calculatePayouts, minutesToClay } from '$lib/currency';
11+
import { calculatePayouts } from '$lib/currency';
1212
import DoubleDippingBanner from '$lib/components/DoubleDippingBanner.svelte';
1313
1414
let { data, form } = $props();
@@ -60,6 +60,7 @@
6060
.project.timeSpent % 60}min
6161
</p>
6262
<p>Status: {projectStatuses[data.project.project.status]}</p>
63+
<p>Address found: {data.addressFound ? 'true' : 'false'}</p>
6364
<p>Filament spent printing: {data.filamentUsed}g</p>
6465
<p>Submitted to Airtable: {data.project.project.submittedToAirtable ?? 'null (false)'}</p>
6566
<div class="mt-1">
@@ -203,7 +204,7 @@
203204

204205
<h2 class="mt-2 text-2xl font-bold">Journal logs</h2>
205206
<div class="mb-5 flex flex-col gap-5">
206-
{#each data.devlogs as devlog}
207+
{#each data.devlogs as devlog (devlog.id)}
207208
<div class="flex flex-col gap-2">
208209
<Devlog {devlog} projectId={devlog.projectId} showModifyButtons={false} />
209210
<div class="themed-box flex flex-col gap-3 p-3">

0 commit comments

Comments
 (0)