Add ship check for min 2h and description/url

Author: ArcaEge

src/app.css

@@ -233,7 +233,7 @@
 
 		&:disabled,
 		&.disabled {
-			@apply cursor-not-allowed opacity-80 hover:outline-0;
+			@apply cursor-not-allowed opacity-70 hover:outline-0;
 		}
 
 		&.red {

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

@@ -46,11 +46,6 @@ export async function load({ params, locals }) {
 		throw error(404);
 	}
 
-	// Make sure it has actual devlogs before shipping
-	if (queriedProject.devlogCount == 0) {
-		return error(400, { message: 'project has no devlogs' });
-	}
-
 	return {
 		project: queriedProject
 	};
@@ -67,6 +62,8 @@ export const actions = {
 		const [queriedProject] = await db
 			.select({
 				id: project.id,
+				description: project.description,
+				url: project.url,
 				timeSpent: sql<number>`COALESCE(SUM(${devlog.timeSpent}), 0)`,
 				devlogCount: sql<number>`COALESCE(COUNT(${devlog.id}), 0)`
 			})
@@ -80,16 +77,20 @@ export const actions = {
 					or(eq(project.status, 'building'), eq(project.status, 'rejected'))
 				)
 			)
-			.groupBy(project.id)
+			.groupBy(project.id, project.description, project.url)
 			.limit(1);
 
 		if (!queriedProject) {
 			return error(404, { message: 'project not found' });
 		}
 
-		// Make sure it has actual devlogs before shipping
-		if (queriedProject.devlogCount == 0) {
-			return error(400, { message: 'project has no devlogs' });
+		// Make sure it has atleast 2h
+		if (queriedProject.timeSpent < 120) {
+			return error(400, { message: 'minimum 2h needed to ship' });
+		}
+
+		if (queriedProject.description == '' || queriedProject.url == '') {
+			return error(400, { message: 'project must have a description and Printables url' });
 		}
 
 		await db

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

@@ -24,8 +24,14 @@
 	clickable={false}
 />
 <p class="mt-3">
-	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 data.project.timeSpent < 120}
+		You need at least 2h to ship
+	{:else if data.project.description == '' || data.project.url == ''}
+		Project must have a description and Printables URL to ship
+	{:else}
+		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}
 </p>
 <form
 	method="POST"
@@ -39,7 +45,13 @@
 	}}
 >
 	<a href={`/dashboard/projects/${data.project.id}`} class="button sm primary">Cancel</a>
-	<button class="button sm orange" disabled={formPending}>
+	<button
+		class="button sm orange"
+		disabled={formPending ||
+			data.project.timeSpent < 120 ||
+			data.project.url == '' ||
+			data.project.description == ''}
+	>
 		<Ship />
 		Ship
 	</button>