Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/routes/dashboard/projects/[id]/+page.server.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { db } from '$lib/server/db/index.js';
import { devlog, project } from '$lib/server/db/schema.js';
import { devlog, project, user } from '$lib/server/db/schema.js';
import { error, fail } from '@sveltejs/kit';
import { eq, and, desc, sql, or } from 'drizzle-orm';
import type { Actions } from './$types';
Expand All @@ -21,7 +21,7 @@ import { S3 } from '$lib/server/s3';
import { PutObjectCommand } from '@aws-sdk/client-s3';
import { env } from '$env/dynamic/private';

export async function load({ params }) {
export async function load({ params, locals }) {
const id: number = parseInt(params.id);

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

let projectUser = null;

if (queriedProject.project.userId !== locals.user?.id) {
[projectUser] = await db
.select({
name: user.name
})
.from(user)
.where(eq(user.id, queriedProject.project.userId))
.limit(1);
}

const devlogs = await db
.select()
.from(devlog)
Expand All @@ -62,12 +74,13 @@ export async function load({ params }) {
editorUrl: queriedProject.project.editorUrl,
uploadedFileUrl: queriedProject.project.uploadedFileUrl,
modelFile: queriedProject.project.modelFile,

createdAt: queriedProject.project.createdAt,
updatedAt: queriedProject.project.updatedAt,
timeSpent: queriedProject.timeSpent,
status: queriedProject.project.status
},
projectUser,
devlogs: devlogs.map((devlog) => {
return {
id: devlog.id,
Expand Down
9 changes: 7 additions & 2 deletions src/routes/dashboard/projects/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,14 @@

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

<div class="flex flex-col xl:flex-row gap-3">
<div class="flex flex-col gap-3 xl:flex-row">
<div class="mb-6 grow">
<p class="text-sm">
{#if data.projectUser}
<a href={`/dashboard/users/${data.project.userId}`} class="truncate underline"
>{data.projectUser.name}</a
> ∙
{/if}
Created
<abbr title={`${data.project.createdAt.toUTCString()}`}>
{relativeDate(data.project.createdAt)}
Expand Down Expand Up @@ -109,7 +114,7 @@
<Spinny3DPreview
identifier="project-model"
modelUrl={data.s3PublicUrl + '/' + data.project.modelFile}
sizeCutoff={8*1024*1024}
sizeCutoff={8 * 1024 * 1024}
/>
</div>
{/if}
Expand Down
Loading