diff --git a/src/routes/dashboard/admin/admin/users/[id]/+page.server.ts b/src/routes/dashboard/admin/admin/users/[id]/+page.server.ts
index 0e277c6..554a98f 100644
--- a/src/routes/dashboard/admin/admin/users/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/admin/users/[id]/+page.server.ts
@@ -18,7 +18,7 @@ export async function load({ locals, params }) {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -49,7 +49,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -86,7 +86,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -137,7 +137,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -195,7 +195,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -221,7 +221,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -252,7 +252,7 @@ export const actions = {
// Pretty important line
if (!locals.user.hasAdmin) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
diff --git a/src/routes/dashboard/admin/print/+page.server.ts b/src/routes/dashboard/admin/print/+page.server.ts
index f246422..3b91488 100644
--- a/src/routes/dashboard/admin/print/+page.server.ts
+++ b/src/routes/dashboard/admin/print/+page.server.ts
@@ -10,7 +10,7 @@ export async function load({ locals }) {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const projects = await getProjects(['t1_approved'], [], []);
@@ -47,7 +47,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const data = await request.formData();
diff --git a/src/routes/dashboard/admin/print/[id]/+page.server.ts b/src/routes/dashboard/admin/print/[id]/+page.server.ts
index 8eb27a6..a59be0a 100644
--- a/src/routes/dashboard/admin/print/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/print/[id]/+page.server.ts
@@ -12,7 +12,7 @@ export async function load({ locals, params }) {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -96,7 +96,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const currentlyPrinting = await getCurrentlyPrinting(locals.user);
@@ -148,7 +148,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -193,7 +193,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const currentlyPrinting = await getCurrentlyPrinting(locals.user);
@@ -273,7 +273,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.isPrinter) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
diff --git a/src/routes/dashboard/admin/review/+page.server.ts b/src/routes/dashboard/admin/review/+page.server.ts
index 97dcaec..1abf3bf 100644
--- a/src/routes/dashboard/admin/review/+page.server.ts
+++ b/src/routes/dashboard/admin/review/+page.server.ts
@@ -9,7 +9,7 @@ export async function load({ locals }) {
throw error(500);
}
if (!locals.user.hasT1Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const projects = await getProjects(['submitted'], [], []);
@@ -43,7 +43,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasT1Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const data = await request.formData();
diff --git a/src/routes/dashboard/admin/review/[id]/+page.server.ts b/src/routes/dashboard/admin/review/[id]/+page.server.ts
index 78d4594..3250951 100644
--- a/src/routes/dashboard/admin/review/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/review/[id]/+page.server.ts
@@ -11,7 +11,7 @@ export async function load({ locals, params }) {
throw error(500);
}
if (!locals.user.hasT1Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -89,7 +89,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasT1Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
diff --git a/src/routes/dashboard/admin/ysws-review/+page.server.ts b/src/routes/dashboard/admin/ysws-review/+page.server.ts
index 529f686..64b2711 100644
--- a/src/routes/dashboard/admin/ysws-review/+page.server.ts
+++ b/src/routes/dashboard/admin/ysws-review/+page.server.ts
@@ -9,7 +9,7 @@ export async function load({ locals }) {
throw error(500);
}
if (!locals.user.hasT2Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const projects = await getProjects(['printed'], [], []);
@@ -43,7 +43,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasT2Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const data = await request.formData();
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 29f4e69..d27142f 100644
--- a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts
@@ -15,7 +15,7 @@ export async function load({ locals, params }) {
throw error(500);
}
if (!locals.user.hasT2Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
@@ -96,7 +96,7 @@ export const actions = {
throw error(500);
}
if (!locals.user.hasT2Review) {
- throw error(403, { message: 'get out, peasant' });
+ throw error(403, { message: 'oi get out' });
}
const id: number = parseInt(params.id);
diff --git a/src/routes/dashboard/explore/+page.server.ts b/src/routes/dashboard/explore/+page.server.ts
index 68871eb..3d2d4de 100644
--- a/src/routes/dashboard/explore/+page.server.ts
+++ b/src/routes/dashboard/explore/+page.server.ts
@@ -1,36 +1,12 @@
-import { db } from '$lib/server/db/index.js';
-import { devlog, project, user } from '$lib/server/db/schema.js';
-import { eq, desc } from 'drizzle-orm';
+import { DEVLOGS_PAGE_SIZE, fetchExploreDevlogs } from './devlogs.js';
-// TODO: pagination
export async function load() {
- const devlogs = await db
- .select({
- devlog: {
- id: devlog.id,
- description: devlog.description,
- image: devlog.image,
- model: devlog.model,
- timeSpent: devlog.timeSpent,
- createdAt: devlog.createdAt
- },
- project: {
- id: project.id,
- name: project.name
- },
- user: {
- id: user.id,
- name: user.name
- }
- })
- .from(devlog)
- .innerJoin(project, eq(devlog.projectId, project.id))
- .innerJoin(user, eq(devlog.userId, user.id))
- .where(eq(devlog.deleted, false))
- .orderBy(desc(devlog.createdAt))
- .limit(15);
+ const devlogs = await fetchExploreDevlogs(0);
+ const nextOffset = devlogs.length;
- return {
- devlogs
- };
+ return {
+ devlogs,
+ nextOffset,
+ hasMore: devlogs.length === DEVLOGS_PAGE_SIZE
+ };
}
diff --git a/src/routes/dashboard/explore/+page.svelte b/src/routes/dashboard/explore/+page.svelte
index a56b5ad..2ac2c3f 100644
--- a/src/routes/dashboard/explore/+page.svelte
+++ b/src/routes/dashboard/explore/+page.svelte
@@ -1,16 +1,84 @@
Explore
+
- {#if data.devlogs.length == 0}
+ {#if devlogs.length == 0}
No journal entries yet
{:else}
- {#each data.devlogs as devlog}
+ {#each devlogs as devlog (devlog.devlog.id)}
{/each}
+
+
+
+ {#if loadingMore}
+
Loading more...
+ {/if}
+
+ {#if loadError}
+
+ {loadError}
+
+
+ {/if}
+
+ {#if !hasMore && !loadingMore}
+
You're caught up.
+ {/if}
{/if}
\ No newline at end of file
diff --git a/src/routes/dashboard/explore/+server.ts b/src/routes/dashboard/explore/+server.ts
new file mode 100644
index 0000000..5bb2f19
--- /dev/null
+++ b/src/routes/dashboard/explore/+server.ts
@@ -0,0 +1,20 @@
+import { json } from '@sveltejs/kit';
+import { DEVLOGS_PAGE_SIZE, fetchExploreDevlogs } from './devlogs.js';
+
+export async function GET({ url }) {
+ const offsetParam = url.searchParams.get('offset');
+ const offset = offsetParam ? Number.parseInt(offsetParam, 10) : 0;
+
+ if (!Number.isFinite(offset) || offset < 0) {
+ return json({ error: 'Invalid offset' }, { status: 400 });
+ }
+
+ const devlogs = await fetchExploreDevlogs(offset);
+ const nextOffset = offset + devlogs.length;
+
+ return json({
+ devlogs,
+ nextOffset,
+ hasMore: devlogs.length === DEVLOGS_PAGE_SIZE
+ });
+}
diff --git a/src/routes/dashboard/explore/devlogs.ts b/src/routes/dashboard/explore/devlogs.ts
new file mode 100644
index 0000000..595fd32
--- /dev/null
+++ b/src/routes/dashboard/explore/devlogs.ts
@@ -0,0 +1,34 @@
+import { db } from '$lib/server/db/index.js';
+import { devlog, project, user } from '$lib/server/db/schema.js';
+import { desc, eq } from 'drizzle-orm';
+
+export const DEVLOGS_PAGE_SIZE = 15;
+
+export async function fetchExploreDevlogs(offset: number, limit = DEVLOGS_PAGE_SIZE) {
+ return db
+ .select({
+ devlog: {
+ id: devlog.id,
+ description: devlog.description,
+ image: devlog.image,
+ model: devlog.model,
+ timeSpent: devlog.timeSpent,
+ createdAt: devlog.createdAt
+ },
+ project: {
+ id: project.id,
+ name: project.name
+ },
+ user: {
+ id: user.id,
+ name: user.name
+ }
+ })
+ .from(devlog)
+ .innerJoin(project, eq(devlog.projectId, project.id))
+ .innerJoin(user, eq(devlog.userId, user.id))
+ .where(eq(devlog.deleted, false))
+ .orderBy(desc(devlog.createdAt), desc(devlog.id))
+ .offset(offset)
+ .limit(limit);
+}
diff --git a/src/routes/dashboard/market/+page.server.ts b/src/routes/dashboard/market/+page.server.ts
new file mode 100644
index 0000000..8ab074e
--- /dev/null
+++ b/src/routes/dashboard/market/+page.server.ts
@@ -0,0 +1,48 @@
+import { db } from '$lib/server/db/index.js';
+import { marketItem } from '$lib/server/db/schema.js';
+import { calculateMarketPrice } from '$lib/utils';
+import { error } from '@sveltejs/kit';
+import { eq, and } from 'drizzle-orm';
+
+export async function load({ locals }) {
+ if (!locals.user) {
+ throw error(500);
+ }
+
+ const marketItems = await db
+ .select({
+ id: marketItem.id,
+ name: marketItem.name,
+ description: marketItem.description,
+ image: marketItem.image,
+ minPrice: marketItem.minPrice,
+ maxPrice: marketItem.maxPrice,
+ minShopScore: marketItem.minShopScore,
+ maxShopScore: marketItem.maxShopScore,
+ minRequiredShopScore: marketItem.minRequiredShopScore
+ })
+ .from(marketItem)
+ .where(and(eq(marketItem.deleted, false), eq(marketItem.isPublic, true)))
+ .orderBy(marketItem.maxPrice);
+
+ const shopScore = locals.user.shopScore;
+
+ const marketItemsWithPrice = marketItems
+ .map((item) => {
+ const computedPrice = calculateMarketPrice(
+ item.minPrice,
+ item.maxPrice,
+ item.minShopScore,
+ item.maxShopScore,
+ shopScore
+ );
+
+ const discountAmount = 1 - computedPrice / item.maxPrice;
+ return { ...item, computedPrice, discountAmount };
+ })
+ .sort((a, b) => a.computedPrice - b.computedPrice);
+
+ return {
+ marketItems: marketItemsWithPrice
+ };
+}
diff --git a/src/routes/dashboard/market/+page.svelte b/src/routes/dashboard/market/+page.svelte
index 5bfdd80..2d531b8 100644
--- a/src/routes/dashboard/market/+page.svelte
+++ b/src/routes/dashboard/market/+page.svelte
@@ -1,66 +1,26 @@
-
+