Skip to content

Commit e082b37

Browse files
committed
Add username to project page
1 parent e1e6e0d commit e082b37

2 files changed

Lines changed: 23 additions & 5 deletions

File tree

src/routes/dashboard/projects/[id]/+page.server.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { db } from '$lib/server/db/index.js';
2-
import { devlog, project } from '$lib/server/db/schema.js';
2+
import { devlog, project, user } from '$lib/server/db/schema.js';
33
import { error, fail } from '@sveltejs/kit';
44
import { eq, and, desc, sql, or } from 'drizzle-orm';
55
import type { Actions } from './$types';
@@ -21,7 +21,7 @@ import { S3 } from '$lib/server/s3';
2121
import { PutObjectCommand } from '@aws-sdk/client-s3';
2222
import { env } from '$env/dynamic/private';
2323

24-
export async function load({ params }) {
24+
export async function load({ params, locals }) {
2525
const id: number = parseInt(params.id);
2626

2727
// TODO: add this to the other endpoints
@@ -44,6 +44,18 @@ export async function load({ params }) {
4444
throw error(404);
4545
}
4646

47+
let projectUser = null;
48+
49+
if (queriedProject.project.userId !== locals.user?.id) {
50+
[projectUser] = await db
51+
.select({
52+
name: user.name
53+
})
54+
.from(user)
55+
.where(eq(user.id, queriedProject.project.userId))
56+
.limit(1);
57+
}
58+
4759
const devlogs = await db
4860
.select()
4961
.from(devlog)
@@ -62,12 +74,13 @@ export async function load({ params }) {
6274
editorUrl: queriedProject.project.editorUrl,
6375
uploadedFileUrl: queriedProject.project.uploadedFileUrl,
6476
modelFile: queriedProject.project.modelFile,
65-
77+
6678
createdAt: queriedProject.project.createdAt,
6779
updatedAt: queriedProject.project.updatedAt,
6880
timeSpent: queriedProject.timeSpent,
6981
status: queriedProject.project.status
7082
},
83+
projectUser,
7184
devlogs: devlogs.map((devlog) => {
7285
return {
7386
id: devlog.id,

src/routes/dashboard/projects/[id]/+page.svelte

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,14 @@
4343

4444
<h1 class="mt-5 mb-2 font-hero text-3xl font-medium">{data.project.name}</h1>
4545

46-
<div class="flex flex-col xl:flex-row gap-3">
46+
<div class="flex flex-col gap-3 xl:flex-row">
4747
<div class="mb-6 grow">
4848
<p class="text-sm">
49+
{#if data.projectUser}
50+
<a href={`/dashboard/users/${data.project.userId}`} class="truncate underline"
51+
>{data.projectUser.name}</a
52+
> ∙
53+
{/if}
4954
Created
5055
<abbr title={`${data.project.createdAt.toUTCString()}`}>
5156
{relativeDate(data.project.createdAt)}
@@ -109,7 +114,7 @@
109114
<Spinny3DPreview
110115
identifier="project-model"
111116
modelUrl={data.s3PublicUrl + '/' + data.project.modelFile}
112-
sizeCutoff={8*1024*1024}
117+
sizeCutoff={8 * 1024 * 1024}
113118
/>
114119
</div>
115120
{/if}

0 commit comments

Comments
 (0)