Skip to content
Closed
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
7 changes: 7 additions & 0 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,10 @@ export function calculateMarketPrice(
return Math.round(-m * shopScoreRemainder + maxPrice);
}
}

export function getProjectLinkType(editorFileType: string | null, editorUrl: string | null, uploadedFileUrl: string | null): string {
if (editorFileType === 'url' && editorUrl?.includes('cad.onshape.com')) return 'onshape';
if (editorFileType === 'url' && editorUrl?.includes('autodesk360.com')) return 'fusion-link';
if (editorFileType === 'upload' && uploadedFileUrl?.endsWith('.f3d')) return 'fusion-file';
return 'unknown';
}
23 changes: 17 additions & 6 deletions src/routes/dashboard/admin/review/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export async function load({ locals }) {
throw error(403, { message: 'oi get out' });
}

const projects = await getProjects(['submitted'], [], []);
const projects = await getProjects(['submitted'], [], [], []);

const allProjects = await db
.select({
Expand Down Expand Up @@ -61,14 +61,18 @@ export const actions = {
return parseInt(userId.toString());
});

const projects = await getProjects(statusFilter, projectFilter, userFilter);
const typeFilter = data.getAll('type') as string[];


const projects = await getProjects(statusFilter, projectFilter, userFilter, typeFilter);

return {
projects,
fields: {
status: statusFilter,
project: projectFilter,
user: userFilter
user: userFilter,
type: typeFilter
}
};
}
Expand All @@ -77,7 +81,8 @@ export const actions = {
async function getProjects(
statusFilter: (typeof project.status._.data)[],
projectFilter: number[],
userFilter: number[]
userFilter: number[],
typeFilter: string[]
) {
return await db
.select({
Expand All @@ -86,8 +91,11 @@ async function getProjects(
name: project.name,
description: project.description,
url: project.url,
createdAt: project.createdAt,
status: project.status
editorFileType: project.editorFileType,
editorUrl: project.editorUrl,
uploadedFileUrl: project.uploadedFileUrl,
status: project.status,
createdAt: project.createdAt
},
user: {
id: user.id,
Expand All @@ -112,6 +120,9 @@ async function getProjects(
project.name,
project.description,
project.url,
project.editorFileType,
project.editorUrl,
project.uploadedFileUrl,
project.createdAt,
project.status,
user.id,
Expand Down
32 changes: 29 additions & 3 deletions src/routes/dashboard/admin/review/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<script lang="ts">
import { enhance } from '$app/forms';
import Head from '$lib/components/Head.svelte';
import { projectStatuses } from '$lib/utils.js';
import { projectStatuses, getProjectLinkType } from '$lib/utils.js';
import { ExternalLink } from '@lucide/svelte';
import relativeDate from 'tiny-relative-date';

let { data, form } = $props();

let projectSearch = $state('');
let userSearch = $state('');
let typeFilter = $state<string[]>([]);

let projects = $derived(form?.projects ?? data.projects);

Expand All @@ -20,6 +21,12 @@
let filteredUsers = $derived(
data.users.filter((user) => user.name.toLowerCase().includes(userSearch.toLowerCase()))
);
let displayedProjects = $derived(
projects.filter(p =>
typeFilter.length === 0 ||
typeFilter.includes(getProjectLinkType(p.project.editorFileType, p.project.editorUrl, p.project.uploadedFileUrl))
)
);

let formPending = $state(false);
</script>
Expand All @@ -42,7 +49,7 @@
};
}}
>
<div class="grid grid-cols-1 gap-3 sm:grid-cols-2 md:grid-cols-3">
<div class="grid grid-cols-1 gap-3 sm:grid-cols-2 md:grid-cols-4">
<!-- Project status -->
<label class="flex flex-col gap-1">
<span class="font-medium">Status</span>
Expand Down Expand Up @@ -103,6 +110,22 @@
</select>
</div>
</label>
<!-- Type-->
<label class="flex flex-col gap-1">

<span class="font-medium">Type</span>
<select
class="h-40 grow border-3 border-primary-700 bg-primary-900 fill-primary-50 p-2 text-sm ring-primary-900 placeholder:text-primary-900 active:ring-3"
name="type"
bind:value={typeFilter}
multiple
>
<option value="onshape" class="truncate">Onshape</option>
<option value="fusion-link" class="truncate">Fusion Link</option>
<option value="fusion-file" class="truncate">Fusion File</option>
<option value="unknown" class="truncate">Unknown</option>
</select>
</label>
</div>
<button type="submit" class="button md primary mt-3 w-full" disabled={formPending}
>Apply!</button
Expand Down Expand Up @@ -147,7 +170,7 @@
</div>
{:else}
<div class="grid grid-cols-1 gap-4 lg:grid-cols-2 2xl:grid-cols-3">
{#each projects as project}
{#each displayedProjects as project}
<div
class="themed-box relative flex flex-col p-3 shadow-lg/20 transition-all hover:scale-102"
>
Expand Down Expand Up @@ -176,6 +199,9 @@
{:else}
<div class="mb-2"></div>
{/if}
<p class="text-sm">
Type: {getProjectLinkType(project.project.editorFileType, project.project.editorUrl, project.project.uploadedFileUrl)}
</p>
<p class="text-sm">
{project.devlogCount} journal{project.devlogCount !== 1 ? 's' : ''} ∙ {Math.floor(
project.timeSpent / 60
Expand Down
3 changes: 2 additions & 1 deletion src/routes/dashboard/admin/review/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Devlog from '$lib/components/Devlog.svelte';
import Head from '$lib/components/Head.svelte';
import { enhance } from '$app/forms';
import { projectStatuses } from '$lib/utils.js';
import { projectStatuses, getProjectLinkType} from '$lib/utils.js';
import ProjectLinks from '$lib/components/ProjectLinks.svelte';
import Spinny3DPreview from '$lib/components/Spinny3DPreview.svelte';
import { Download } from '@lucide/svelte';
Expand Down Expand Up @@ -49,6 +49,7 @@
uploadedFileUrl={data.project.project.uploadedFileUrl}
/>
</div>
<p class="text-sm">Type: {getProjectLinkType(data.project.project.editorFileType, data.project.project.editorUrl, data.project.project.uploadedFileUrl)}</p>
</div>

<div>
Expand Down