oh no!!!
{page.error?.message}
-
+ 
Go back home
diff --git a/src/routes/dashboard/+layout.server.ts b/src/routes/dashboard/+layout.server.ts
index 266027d..59b7516 100644
--- a/src/routes/dashboard/+layout.server.ts
+++ b/src/routes/dashboard/+layout.server.ts
@@ -19,7 +19,8 @@ export function load({ locals }) {
hasT1Review: locals.user.hasT1Review,
hasT2Review: locals.user.hasT2Review,
hasAdmin: locals.user.hasAdmin,
- hasBasePrinter: locals.user.hasBasePrinter
+ hasBasePrinter: locals.user.hasBasePrinter,
+ printer: locals.user.printer
},
s3PublicUrl: env.S3_PUBLIC_URL
};
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
index 44e9c18..214ff60 100644
--- a/src/routes/dashboard/+page.svelte
+++ b/src/routes/dashboard/+page.svelte
@@ -20,7 +20,13 @@
Welcome to Construct!
-Here are some guides and resources to help you out!
+Impersonate logs
+ +Printer purchases
+No purchases found matching the filter
++ by {order.user?.name} +
+ {#if order.order.bricksPaid != null} +Bricks paid: {order.order.bricksPaid}
+ {/if} + {#if order.order.clayPaid != null} +Clay paid: {order.order.clayPaid}
+ {/if} ++ + {relativeDate(order.order.timestamp)} + +
+Invalid fields
{/if} diff --git a/src/routes/dashboard/admin/getReviewHistory.server.ts b/src/routes/dashboard/admin/getReviewHistory.server.ts index 40d4f33..f66abf6 100644 --- a/src/routes/dashboard/admin/getReviewHistory.server.ts +++ b/src/routes/dashboard/admin/getReviewHistory.server.ts @@ -46,6 +46,7 @@ export async function getReviewHistory(id: number) { feedback: t2Review.feedback, image: t2Review.image, shopScoreMultiplier: t2Review.shopScoreMultiplier, + shopScore: t2Review.shopScore, timestamp: t2Review.timestamp }) .from(t2Review) diff --git a/src/routes/dashboard/admin/print/+page.server.ts b/src/routes/dashboard/admin/print/+page.server.ts index 3906a08..45c1ff1 100644 --- a/src/routes/dashboard/admin/print/+page.server.ts +++ b/src/routes/dashboard/admin/print/+page.server.ts @@ -1,7 +1,7 @@ import { db } from '$lib/server/db/index.js'; import { project, user, devlog, legionReview } from '$lib/server/db/schema.js'; import { error } from '@sveltejs/kit'; -import { eq, and, sql, ne, inArray, desc, gt } from 'drizzle-orm'; +import { eq, and, sql, ne, inArray, desc, gt, lt, max, asc } from 'drizzle-orm'; import type { Actions } from './$types'; import { getCurrentlyPrinting } from './utils.server'; @@ -31,15 +31,13 @@ export async function load({ locals }) { .from(user) .where(and(ne(user.trust, 'red'), ne(user.hackatimeTrust, 'red'))); // hide banned users - const legionAgg = db - .$with('legionAgg') - .as( - db - .select({ userId: legionReview.userId, legionCnt: sqlHackatime trust: {data.project.user?.hackatimeTrust}
diff --git a/src/routes/dashboard/admin/review/[id]/+page.svelte b/src/routes/dashboard/admin/review/[id]/+page.svelte index 20f96ad..98a172f 100644 --- a/src/routes/dashboard/admin/review/[id]/+page.svelte +++ b/src/routes/dashboard/admin/review/[id]/+page.svelte @@ -70,7 +70,7 @@Hackatime trust: {data.project.user?.hackatimeTrust}
diff --git a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts index 7470d1f..c62bfd8 100644 --- a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts +++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts @@ -174,7 +174,7 @@ export const actions = { const data = await request.formData(); const notes = data.get('notes')?.toString(); const feedback = data.get('feedback')?.toString(); - const shopScoreMultiplier = data.get('shopScoreMultiplier'); + const shopScore = data.get('shopScore'); const imageUrl = data.get('imageUrl'); const imageUrlString = @@ -196,14 +196,14 @@ export const actions = { } if ( - !shopScoreMultiplier || - isNaN(parseFloat(shopScoreMultiplier.toString())) || - parseFloat(shopScoreMultiplier.toString()) < 0 + !shopScore || + isNaN(parseFloat(shopScore.toString())) || + parseFloat(shopScore.toString()) < 0 ) { - return error(400, { message: 'invalid market score multiplier' }); + return error(400, { message: 'invalid market score' }); } - const parsedShopScoreMultiplier = parseFloat(shopScoreMultiplier.toString()); + const parsedShopScore = parseFloat(shopScore.toString()); const status: typeof project.status._.data | undefined = 'finalized'; const statusMessage = 'finalised! :woah-dino:'; @@ -318,7 +318,7 @@ export const actions = { notes, image: imageUrlString, feedback, - shopScoreMultiplier: parsedShopScoreMultiplier + shopScore: parsedShopScore }); await db @@ -353,7 +353,7 @@ export const actions = { const payouts = calculatePayouts( queriedProject.timeSpent, await getLatestPrintFilament(id), - parsedShopScoreMultiplier, + parsedShopScore, queriedProject.user.hasBasePrinter, queriedProject.project.createdAt ); diff --git a/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte b/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte index 05ebbac..145e1c5 100644 --- a/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte +++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte @@ -9,19 +9,18 @@ import { Download } from '@lucide/svelte'; import ReviewHistory from '../../ReviewHistory.svelte'; import { calculatePayouts, minutesToClay } from '$lib/currency'; - import { BASE_SHOP_SCORE_PER_HOUR } from '$lib/defs'; let { data, form } = $props(); let formPending = $state(false); let overridePending = $state(false); - let shopScoreMultiplier = $state(BASE_SHOP_SCORE_PER_HOUR); + let shopScore = $state(0); let payouts = $derived.by(() => calculatePayouts( data.project.timeSpent, data.filamentUsed, - shopScoreMultiplier, + shopScore, data.user.hasBasePrinter, data.project.project.createdAt ) @@ -85,7 +84,7 @@Hackatime trust: {data.project.user?.hackatimeTrust}
@@ -166,13 +165,13 @@