Admin
-
diff --git a/src/routes/dashboard/admin/admin/orders/+page.server.ts b/src/routes/dashboard/admin/admin/orders/+page.server.ts
new file mode 100644
index 0000000..64b2711
--- /dev/null
+++ b/src/routes/dashboard/admin/admin/orders/+page.server.ts
@@ -0,0 +1,120 @@
+import { db } from '$lib/server/db/index.js';
+import { project, user, devlog } from '$lib/server/db/schema.js';
+import { error } from '@sveltejs/kit';
+import { eq, and, sql, ne, inArray } from 'drizzle-orm';
+import type { Actions } from './$types';
+
+export async function load({ locals }) {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasT2Review) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const projects = await getProjects(['printed'], [], []);
+
+ const allProjects = await db
+ .select({
+ id: project.id,
+ name: project.name
+ })
+ .from(project)
+ .where(and(eq(project.deleted, false)));
+
+ const users = await db
+ .select({
+ id: user.id,
+ name: user.name
+ })
+ .from(user)
+ .where(and(ne(user.trust, 'red'), ne(user.hackatimeTrust, 'red'))); // hide banned users
+
+ return {
+ allProjects,
+ projects,
+ users
+ };
+}
+
+export const actions = {
+ default: async ({ locals, request }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasT2Review) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const data = await request.formData();
+ const statusFilter = data.getAll('status') as (typeof project.status._.data)[];
+
+ const projectFilter = data.getAll('project').map((projectId) => {
+ const parsedInt = parseInt(projectId.toString());
+ if (!parsedInt) throw error(400, { message: 'malformed project filter' });
+ return parseInt(projectId.toString());
+ });
+
+ const userFilter = data.getAll('user').map((userId) => {
+ const parsedInt = parseInt(userId.toString());
+ if (!parsedInt) throw error(400, { message: 'malformed user filter' });
+ return parseInt(userId.toString());
+ });
+
+ const projects = await getProjects(statusFilter, projectFilter, userFilter);
+
+ return {
+ projects,
+ fields: {
+ status: statusFilter,
+ project: projectFilter,
+ user: userFilter
+ }
+ };
+ }
+} satisfies Actions;
+
+async function getProjects(
+ statusFilter: (typeof project.status._.data)[],
+ projectFilter: number[],
+ userFilter: number[]
+) {
+ return await db
+ .select({
+ project: {
+ id: project.id,
+ name: project.name,
+ description: project.description,
+ url: project.url,
+ createdAt: project.createdAt,
+ status: project.status
+ },
+ user: {
+ id: user.id,
+ name: user.name
+ },
+ timeSpent: sql
`COALESCE(SUM(${devlog.timeSpent}), 0)`,
+ devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
+ })
+ .from(project)
+ .leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
+ .leftJoin(user, eq(user.id, project.userId))
+ .where(
+ and(
+ eq(project.deleted, false),
+ statusFilter.length > 0 ? inArray(project.status, statusFilter) : undefined,
+ projectFilter.length > 0 ? inArray(project.id, projectFilter) : undefined,
+ userFilter.length > 0 ? inArray(project.userId, userFilter) : undefined
+ )
+ )
+ .groupBy(
+ project.id,
+ project.name,
+ project.description,
+ project.url,
+ project.createdAt,
+ project.status,
+ user.id,
+ user.name
+ );
+}
diff --git a/src/routes/dashboard/admin/admin/orders/+page.svelte b/src/routes/dashboard/admin/admin/orders/+page.svelte
new file mode 100644
index 0000000..bf4957c
--- /dev/null
+++ b/src/routes/dashboard/admin/admin/orders/+page.svelte
@@ -0,0 +1,207 @@
+
+
+
+
+
+
Market item orders
+
+ coming soon
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts b/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts
new file mode 100644
index 0000000..342afae
--- /dev/null
+++ b/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts
@@ -0,0 +1,266 @@
+import { db } from '$lib/server/db/index.js';
+import { project, user, devlog, t2Review } from '$lib/server/db/schema.js';
+import { error, fail, redirect } from '@sveltejs/kit';
+import { eq, and, asc, sql, desc } from 'drizzle-orm';
+import type { Actions } from './$types';
+import { sendSlackDM } from '$lib/server/slack.js';
+import { airtableBase } from '$lib/server/airtable';
+import { env } from '$env/dynamic/private';
+import { decrypt } from '$lib/server/encryption';
+import { getUserData } from '$lib/server/idvUserData';
+
+export async function load({ locals, params }) {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasAdmin) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ // const [queriedProject] = await db
+ // .select({
+ // project: {
+ // id: project.id,
+ // name: project.name,
+ // description: project.description,
+
+ // url: project.url,
+ // editorFileType: project.editorFileType,
+ // editorUrl: project.editorUrl,
+ // uploadedFileUrl: project.uploadedFileUrl,
+ // modelFile: project.modelFile,
+
+ // submittedToAirtable: project.submittedToAirtable,
+
+ // createdAt: project.createdAt,
+ // updatedAt: project.updatedAt,
+ // status: project.status
+ // },
+ // user: {
+ // id: user.id,
+ // name: user.name,
+ // slackID: user.slackId,
+ // trust: user.trust,
+ // hackatimeTrust: user.hackatimeTrust
+ // },
+ // timeSpent: sql`COALESCE(SUM(${devlog.timeSpent}), 0)`,
+ // devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
+ // })
+ // .from(project)
+ // .leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
+ // .leftJoin(user, eq(user.id, project.userId))
+ // .where(and(eq(project.id, id), eq(project.deleted, false)))
+ // .groupBy(
+ // project.id,
+ // project.name,
+ // project.description,
+ // project.url,
+ // project.editorFileType,
+ // project.editorUrl,
+ // project.uploadedFileUrl,
+ // project.modelFile,
+ // project.submittedToAirtable,
+ // project.createdAt,
+ // project.status,
+ // user.id,
+ // user.name,
+ // user.slackId,
+ // user.trust,
+ // user.hackatimeTrust
+ // )
+ // .limit(1);
+
+ // if (!queriedProject) {
+ // throw error(404, { message: 'project not found' });
+ // }
+
+ // const devlogs = await db
+ // .select()
+ // .from(devlog)
+ // .where(and(eq(devlog.projectId, queriedProject.project.id), eq(devlog.deleted, false)))
+ // .orderBy(asc(devlog.createdAt));
+
+ // return {
+ // project: queriedProject,
+ // devlogs,
+ // reviews: await getReviewHistory(id)
+ // };
+}
+
+// export const actions = {
+// default: async ({ locals, request, params }) => {
+// if (!locals.user) {
+// throw error(500);
+// }
+// if (!locals.user.hasT2Review) {
+// throw error(403, { message: 'oi get out' });
+// }
+
+// const id: number = parseInt(params.id);
+
+// const [queriedProject] = await db
+// .select({
+// project: {
+// id: project.id,
+// name: project.name,
+// description: project.description,
+
+// url: project.url,
+// editorFileType: project.editorFileType,
+// editorUrl: project.editorUrl,
+// uploadedFileUrl: project.uploadedFileUrl,
+// submittedToAirtable: project.submittedToAirtable
+// },
+// user: {
+// id: user.id,
+// name: user.name,
+// slackId: user.slackId,
+// idvId: user.idvId,
+// idvToken: user.idvToken,
+// trust: user.trust,
+// hackatimeTrust: user.hackatimeTrust
+// },
+// timeSpent: sql`COALESCE(SUM(${devlog.timeSpent}), 0)`,
+// devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
+// })
+// .from(project)
+// .leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
+// .leftJoin(user, eq(user.id, project.userId))
+// .where(and(eq(project.id, id), eq(project.deleted, false)))
+// .groupBy(
+// project.id,
+// project.name,
+// project.description,
+// project.url,
+// project.editorFileType,
+// project.editorUrl,
+// project.uploadedFileUrl,
+// user.id,
+// user.name,
+// user.slackId,
+// user.idvId,
+// user.idvToken,
+// user.trust,
+// user.hackatimeTrust
+// )
+// .limit(1);
+
+// if (!queriedProject) {
+// return error(404, { message: 'project not found' });
+// }
+
+// const data = await request.formData();
+// const notes = data.get('notes')?.toString();
+// const feedback = data.get('feedback')?.toString();
+
+// if (notes === null || feedback === null) {
+// return error(400);
+// }
+
+// const status: typeof project.status._.data | undefined = 'finalized';
+// const statusMessage = 'finalised! :woah-dino:';
+
+// if (airtableBase && !queriedProject.project.submittedToAirtable) {
+// const [latestDevlog] = await db
+// .select({
+// image: devlog.image
+// })
+// .from(devlog)
+// .where(and(eq(devlog.projectId, id), eq(devlog.deleted, false)))
+// .orderBy(desc(devlog.createdAt))
+// .limit(1);
+
+// if (!queriedProject.user?.idvToken) {
+// return fail(400, {
+// message: 'IDV token revoked/expired, ask them to reauthenticate'
+// });
+// }
+
+// const token = decrypt(queriedProject.user.idvToken);
+// let userData;
+
+// try {
+// userData = await getUserData(token);
+// } catch {
+// return fail(400, {
+// message: 'IDV token revoked/expired, ask them to reauthenticate'
+// });
+// }
+// const { first_name, last_name, primary_email, birthday, addresses } = userData;
+
+// const address = addresses.find((address: { primary: boolean; }) => address.primary);
+
+// const repoUrl =
+// queriedProject.project.editorFileType === 'upload'
+// ? `${env.S3_PUBLIC_URL}/${queriedProject.project.uploadedFileUrl}`
+// : queriedProject.project.editorFileType === 'url'
+// ? queriedProject.project.editorUrl
+// : '';
+
+// const justificationAppend = `Project has ${queriedProject.devlogCount} ${queriedProject.devlogCount == 1 ? 'journal' : 'journals'} over ${Math.floor(
+// queriedProject.timeSpent / 60
+// )}h ${queriedProject.timeSpent % 60}min, each one with a 3d model file to show progress.\nAll journals can be found here: https://construct.hackclub.com/dashboard/projects/${queriedProject.project.id}`;
+
+// await airtableBase('YSWS Project Submission').create({
+// 'Repository URL': repoUrl ?? '',
+// 'Demo URL': queriedProject.project.url ?? '',
+// Description: queriedProject.project.description ?? '',
+
+// 'First Name': first_name ?? '',
+// 'Last Name': last_name ?? '',
+// 'Email': primary_email ?? '',
+// 'Birthday': birthday ?? '',
+// 'Address (Line 1)': address?.line_1 ?? '',
+// 'City': address?.city ?? '',
+// 'State / Province': address?.state ?? '',
+// 'Country': address?.country ?? '',
+// 'ZIP / Postal Code': address?.postal_code ?? '',
+
+// 'Hours estimate': queriedProject.timeSpent / 60,
+// 'Optional - Override Hours Spent': queriedProject.timeSpent / 60,
+// 'Optional - Override Hours Spent Justification': notes
+// ? notes + '\n' + justificationAppend
+// : justificationAppend,
+// Screenshot: [
+// {
+// url: env.S3_PUBLIC_URL + '/' + latestDevlog.image
+// }
+// // eslint-disable-next-line @typescript-eslint/no-explicit-any
+// ] as any,
+// 'Slack Username': queriedProject.user?.name,
+// idv_rec: queriedProject.user?.idvId,
+// 'Identity Verified': true,
+// 'Temp hold': false
+// });
+// }
+
+// await db.insert(t2Review).values({
+// projectId: id,
+// userId: locals.user.id,
+// currencyMultiplier: 1.0, // TODO: implement
+// notes,
+// feedback
+// });
+
+// await db
+// .update(project)
+// .set({
+// status,
+// submittedToAirtable: true
+// })
+// .where(eq(project.id, id));
+
+// if (queriedProject.user) {
+// const feedbackText = feedback ? `\n\nHere's what they said:\n${feedback}` : '';
+
+// await sendSlackDM(
+// queriedProject.user.slackId,
+// `Your project has been ${statusMessage}${feedbackText}`
+// );
+// }
+
+// return redirect(302, '/dashboard/admin/review');
+// }
+// } satisfies Actions;
diff --git a/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte b/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte
new file mode 100644
index 0000000..b7e4388
--- /dev/null
+++ b/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
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 d27142f..e1d8e01 100644
--- a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts
@@ -1,5 +1,5 @@
import { db } from '$lib/server/db/index.js';
-import { project, user, devlog, t2Review } from '$lib/server/db/schema.js';
+import { project, user, devlog, t2Review, legionReview } from '$lib/server/db/schema.js';
import { error, fail, redirect } from '@sveltejs/kit';
import { eq, and, asc, sql, desc } from 'drizzle-orm';
import type { Actions } from './$types';
@@ -9,6 +9,7 @@ import { env } from '$env/dynamic/private';
import { decrypt } from '$lib/server/encryption';
import { getUserData } from '$lib/server/idvUserData';
import { getReviewHistory } from '../../getReviewHistory.server';
+import { calculatePayouts } from '$lib/currency';
export async function load({ locals, params }) {
if (!locals.user) {
@@ -86,12 +87,13 @@ export async function load({ locals, params }) {
return {
project: queriedProject,
devlogs,
- reviews: await getReviewHistory(id)
+ reviews: await getReviewHistory(id),
+ filamentUsed: await getLatestPrintFilament(id)
};
}
export const actions = {
- default: async ({ locals, request, params }) => {
+ review: async ({ locals, request, params }) => {
if (!locals.user) {
throw error(500);
}
@@ -107,6 +109,7 @@ export const actions = {
id: project.id,
name: project.name,
description: project.description,
+ createdAt: project.createdAt,
url: project.url,
editorFileType: project.editorFileType,
@@ -121,7 +124,12 @@ export const actions = {
idvId: user.idvId,
idvToken: user.idvToken,
trust: user.trust,
- hackatimeTrust: user.hackatimeTrust
+ hackatimeTrust: user.hackatimeTrust,
+ hasBasePrinter: user.hasBasePrinter,
+
+ clay: user.clay,
+ brick: user.brick,
+ shopScore: user.shopScore
},
timeSpent: sql`COALESCE(SUM(${devlog.timeSpent}), 0)`,
devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
@@ -134,6 +142,7 @@ export const actions = {
project.id,
project.name,
project.description,
+ project.createdAt,
project.url,
project.editorFileType,
project.editorUrl,
@@ -144,7 +153,11 @@ export const actions = {
user.idvId,
user.idvToken,
user.trust,
- user.hackatimeTrust
+ user.hackatimeTrust,
+ user.hasBasePrinter,
+ user.clay,
+ user.brick,
+ user.shopScore
)
.limit(1);
@@ -155,11 +168,22 @@ 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');
if (notes === null || feedback === null) {
return error(400);
}
+ if (
+ !shopScoreMultiplier ||
+ isNaN(parseFloat(shopScoreMultiplier.toString())) ||
+ parseFloat(shopScoreMultiplier.toString()) < 0
+ ) {
+ return error(400, { message: 'invalid market score multiplier' });
+ }
+
+ const parsedShopScoreMultiplier = parseFloat(shopScoreMultiplier.toString());
+
const status: typeof project.status._.data | undefined = 'finalized';
const statusMessage = 'finalised! :woah-dino:';
@@ -191,7 +215,7 @@ export const actions = {
}
const { first_name, last_name, primary_email, birthday, addresses } = userData;
- const address = addresses.find((address: { primary: boolean; }) => address.primary);
+ const address = addresses.find((address: { primary: boolean }) => address.primary);
const repoUrl =
queriedProject.project.editorFileType === 'upload'
@@ -211,12 +235,12 @@ export const actions = {
'First Name': first_name ?? '',
'Last Name': last_name ?? '',
- 'Email': primary_email ?? '',
- 'Birthday': birthday ?? '',
+ Email: primary_email ?? '',
+ Birthday: birthday ?? '',
'Address (Line 1)': address?.line_1 ?? '',
- 'City': address?.city ?? '',
+ City: address?.city ?? '',
'State / Province': address?.state ?? '',
- 'Country': address?.country ?? '',
+ Country: address?.country ?? '',
'ZIP / Postal Code': address?.postal_code ?? '',
'Hours estimate': queriedProject.timeSpent / 60,
@@ -240,9 +264,9 @@ export const actions = {
await db.insert(t2Review).values({
projectId: id,
userId: locals.user.id,
- currencyMultiplier: 1.0, // TODO: implement
notes,
- feedback
+ feedback,
+ shopScoreMultiplier: parsedShopScoreMultiplier
});
await db
@@ -254,6 +278,23 @@ export const actions = {
.where(eq(project.id, id));
if (queriedProject.user) {
+ const payouts = calculatePayouts(
+ queriedProject.timeSpent,
+ await getLatestPrintFilament(id),
+ parsedShopScoreMultiplier,
+ queriedProject.user.hasBasePrinter,
+ queriedProject.project.createdAt
+ );
+
+ await db
+ .update(user)
+ .set({
+ clay: sql`${user.clay} + ${payouts.clay ?? 0}`,
+ brick: sql`${user.brick} + ${payouts.bricks ?? 0}`,
+ shopScore: sql`${user.shopScore} + ${payouts.shopScore}`
+ })
+ .where(eq(user.id, queriedProject.user.id));
+
const feedbackText = feedback ? `\n\nHere's what they said:\n${feedback}` : '';
await sendSlackDM(
@@ -263,5 +304,68 @@ export const actions = {
}
return redirect(302, '/dashboard/admin/review');
+ },
+
+ override: async ({ locals, request, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasT2Review) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const data = await request.formData();
+ const devlogId = data.get('devlogId');
+ const timeSpent = data.get('minutes');
+
+ if (!devlogId || isNaN(parseInt(devlogId.toString()))) {
+ return error(400, { message: 'invalid devlog id' });
+ }
+
+ const parsedDevlogId = parseInt(devlogId.toString());
+
+ if (!timeSpent || isNaN(parseInt(timeSpent.toString())) || parseInt(timeSpent.toString()) < 0) {
+ return error(400, { message: 'invalid time spent' });
+ }
+
+ const parsedTimeSpent = parseInt(timeSpent.toString());
+
+ const [queriedDevlog] = await db
+ .select({ id: devlog.id })
+ .from(devlog)
+ .where(
+ and(eq(devlog.deleted, false), eq(devlog.projectId, id), eq(devlog.id, parsedDevlogId))
+ )
+ .limit(1);
+
+ if (!queriedDevlog) {
+ return error(404, { message: 'devlog not found' });
+ }
+
+ await db
+ .update(devlog)
+ .set({
+ timeSpent: parsedTimeSpent
+ })
+ .where(
+ and(eq(devlog.deleted, false), eq(devlog.projectId, id), eq(devlog.id, parsedDevlogId))
+ );
+
+ return { success: true };
}
} satisfies Actions;
+
+async function getLatestPrintFilament(id: number) {
+ const [{ filament }] = (await db
+ .select({
+ filament: legionReview.filamentUsed
+ })
+ .from(legionReview)
+ .where(and(eq(legionReview.projectId, id), eq(legionReview.action, 'print')))
+ .orderBy(desc(legionReview.timestamp))
+ .limit(1)) ?? [{ filament: 0 }];
+
+ return filament ?? 0;
+}
diff --git a/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte b/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte
index 82a7cfd..4da5ab8 100644
--- a/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte
+++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.svelte
@@ -8,10 +8,24 @@
import Spinny3DPreview from '$lib/components/Spinny3DPreview.svelte';
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 payouts = $derived.by(() =>
+ calculatePayouts(
+ data.project.timeSpent,
+ data.filamentUsed,
+ shopScoreMultiplier,
+ data.user.hasBasePrinter,
+ data.project.project.createdAt
+ )
+ );
@@ -41,6 +55,7 @@
.project.timeSpent % 60}min
Status: {projectStatuses[data.project.project.status]}
+ Filament spent printing: {data.filamentUsed}g
Submitted to Airtable: {data.project.project.submittedToAirtable ?? 'null (false)'}
diff --git a/src/routes/dashboard/projects/[id]/ship/+page.svelte b/src/routes/dashboard/projects/[id]/ship/+page.svelte
index bc2e0ff..fefb4a1 100644
--- a/src/routes/dashboard/projects/[id]/ship/+page.svelte
+++ b/src/routes/dashboard/projects/[id]/ship/+page.svelte
@@ -3,6 +3,7 @@
import ChecklistItem from '$lib/components/ChecklistItem.svelte';
import Head from '$lib/components/Head.svelte';
import Project from '$lib/components/Project.svelte';
+ import { calculateCurrencyPayout, calculateMinutes } from '$lib/currency';
import { MAX_UPLOAD_SIZE } from '../config';
import type { PageProps } from './$types';
import { Ship, SquarePen } from '@lucide/svelte';
@@ -17,6 +18,15 @@
let modelFile = $state(null);
let hasEditorFile = $derived((editorUrl || editorUploadFile) && !(editorUrl && editorUploadFile));
+
+ let filamentUse = $state(50);
+ let payoutEstimate = $derived.by(() =>
+ calculateCurrencyPayout(
+ calculateMinutes(data.project.timeSpent, filamentUse),
+ data.user.hasBasePrinter,
+ data.project.createdAt
+ )
+ );
@@ -177,21 +187,21 @@
and meets the open definition or Orpheus will come after you with
a stick. I'd recommend using CC-BY-SA!
-
- {#if data.project.timeSpent >= 120 && data.project.description != '' && data.project.url != ''}
-
- Are you sure you want to ship "{data.project.name}"?
- You won't be able to edit it or journal again unless it gets
- rejected.
-
- {/if}
-
+
+ {#if data.project.timeSpent >= 120 && data.project.description != '' && data.project.url != ''}
+
+ Are you sure you want to ship "{data.project.name}"?
+ You won't be able to edit it or journal again unless it gets rejected.
+
+ {/if}