@@ -18,6 +21,11 @@
>Status
+
+ Cash Out
+
ArrangementBrukere
+
+ {#if auth.user?.role === 'board'}
+
+ Admin
+
+ {/if}
diff --git a/apps/www/src/lib/db/schema.ts b/apps/www/src/lib/db/schema.ts
index 9073adec..ffd046cf 100644
--- a/apps/www/src/lib/db/schema.ts
+++ b/apps/www/src/lib/db/schema.ts
@@ -5,14 +5,17 @@ import { nanoid } from 'nanoid';
/**
* Users
*/
-
export const users = sqliteTable(
'user',
{
id: text('id').notNull().primaryKey(),
name: text('name').notNull(),
email: text('email').notNull(),
- feideId: text('feide_id')
+ feideId: text('feide_id'),
+ role: text('role', { enum: ['board', 'normal'] })
+ .notNull()
+ .default('normal'),
+ additionalBeers: integer('additional_beers').default(0).notNull()
},
(t) => ({
emailIdx: uniqueIndex('email_idx').on(t.email),
@@ -31,7 +34,6 @@ export type UserInsert = InferInsertModel
;
/**
* Sessions
*/
-
export const sessions = sqliteTable('session', {
id: text('id').primaryKey(),
userId: text('user_id').notNull(),
@@ -48,7 +50,6 @@ export const sessionsRelations = relations(sessions, ({ one }) => ({
/**
* Invitations
*/
-
export const invitations = sqliteTable(
'invitation',
{
@@ -66,7 +67,6 @@ export const invitations = sqliteTable(
/**
* Events
*/
-
export const events = sqliteTable('event', {
id: text('id').notNull().primaryKey().$defaultFn(nanoid),
name: text('name').notNull(),
@@ -82,7 +82,6 @@ export type Event = InferSelectModel;
/**
* Shifts
*/
-
export const shifts = sqliteTable('shift', {
id: text('id').notNull().primaryKey().$defaultFn(nanoid),
eventId: text('event_id')
@@ -107,7 +106,6 @@ export type Shift = InferSelectModel;
/**
* Users to shifts
*/
-
export const userShifts = sqliteTable('user_shift', {
userId: text('user_id')
.notNull()
diff --git a/apps/www/src/lib/services/beer.service.ts b/apps/www/src/lib/services/beer.service.ts
new file mode 100644
index 00000000..1e61ba08
--- /dev/null
+++ b/apps/www/src/lib/services/beer.service.ts
@@ -0,0 +1,93 @@
+import type { Database } from '$lib/db/drizzle';
+import { users, userShifts } from '$lib/db/schema';
+import { eq, and } from 'drizzle-orm';
+import { ShiftService } from './shift.service';
+
+export class BeerService {
+ #db: Database;
+ #shiftService: ShiftService;
+
+ constructor(db: Database, shiftService: ShiftService) {
+ this.#db = db;
+ this.#shiftService = shiftService;
+ }
+
+ async claimBeer(userId: string): Promise {
+ try {
+ const unclaimedShifts = await this.#shiftService.findShiftsWithUnclaimedBeersByUserId(userId);
+
+ if (unclaimedShifts.length > 0) {
+ const shiftToUpdate = unclaimedShifts[0].shift;
+
+ if (shiftToUpdate) {
+ await this.#db
+ .update(userShifts)
+ .set({ isBeerClaimed: true })
+ .where(and(eq(userShifts.shiftId, shiftToUpdate.id), eq(userShifts.userId, userId)));
+ return true;
+ }
+ }
+
+ const user = await this.#db
+ .select({ additionalBeers: users.additionalBeers })
+ .from(users)
+ .where(eq(users.id, userId))
+ .limit(1);
+
+ if (user.length > 0 && user[0].additionalBeers > 0) {
+ await this.#db
+ .update(users)
+ .set({ additionalBeers: user[0].additionalBeers - 1 })
+ .where(eq(users.id, userId));
+ return true;
+ }
+
+ return false;
+ } catch (error) {
+ console.error('Error claiming beer:', error);
+ return false;
+ }
+ }
+
+ async getTotalAvailableBeers(userId: string): Promise {
+ try {
+ const unclaimedShifts = await this.#shiftService.findShiftsWithUnclaimedBeersByUserId(userId);
+ const unclaimedShiftBeers = unclaimedShifts.length;
+
+ const userResult = await this.#db
+ .select({ additionalBeers: users.additionalBeers })
+ .from(users)
+ .where(eq(users.id, userId))
+ .limit(1);
+
+ const additionalBeers = Number(userResult[0]?.additionalBeers ?? 0);
+ const totalBeers = unclaimedShiftBeers + additionalBeers;
+
+ return totalBeers;
+ } catch (error) {
+ console.error('Error getting total available beers:', error);
+ return 0;
+ }
+ }
+ // Checks the gives back the difference between newBeercount and shiftBeer, so that we can type in an amount we want and not have the shift beer added afterwards
+ async updateBeers(userId: string, newBeerCount: number): Promise {
+ if (!Number.isInteger(newBeerCount) || newBeerCount < 0) {
+ console.error('Invalid additional beer count:', newBeerCount);
+ return false;
+ }
+
+ try {
+ const unclaimedShifts = await this.#shiftService.findShiftsWithUnclaimedBeersByUserId(userId);
+ const unclaimedShiftBeers = unclaimedShifts.length;
+
+ const reqBeers = Math.max(newBeerCount - unclaimedShiftBeers, 0);
+
+ await this.#db.update(users).set({ additionalBeers: reqBeers }).where(eq(users.id, userId));
+
+ return true;
+ } catch (error) {
+ console.error('Error updating additional beers:', error);
+ return false;
+ }
+ }
+}
diff --git a/apps/www/src/lib/services/user.service.ts b/apps/www/src/lib/services/user.service.ts
index 7a5e85f1..de1ceb31 100644
--- a/apps/www/src/lib/services/user.service.ts
+++ b/apps/www/src/lib/services/user.service.ts
@@ -1,4 +1,5 @@
import type { Database } from '$lib/db/drizzle';
+import { eq } from 'drizzle-orm';
import { users, type UserInsert } from '$lib/db/schema';
export class UserService {
@@ -25,4 +26,23 @@ export class UserService {
async findAll() {
return await this.#db.query.users.findMany();
}
+
+ async updateUserRole(userId: string, role: 'board' | 'normal') {
+ return await this.#db
+ .update(users)
+ .set({ role })
+ .where(eq(users.id, userId))
+ .returning()
+ .then((rows) => rows[0]);
+ }
+
+ async findById(userId: string) {
+ const user = await this.#db
+ .select()
+ .from(users)
+ .where(eq(users.id, userId))
+ .then((results) => results[0]);
+
+ return user;
+ }
}
diff --git a/apps/www/src/routes/portal/+page.server.ts b/apps/www/src/routes/portal/+page.server.ts
index d3f6d27f..9895cc00 100644
--- a/apps/www/src/routes/portal/+page.server.ts
+++ b/apps/www/src/routes/portal/+page.server.ts
@@ -8,13 +8,15 @@ export const load: PageServerLoad = async ({ locals }) => {
const [userShifts, unclaimedBeers, upcomingShifts] = await Promise.all([
locals.shiftService.findCompletedShiftsByUserId(locals.user.id),
- locals.shiftService.findShiftsWithUnclaimedBeersByUserId(locals.user.id),
+ locals.beerService.getTotalAvailableBeers(locals.user.id),
locals.shiftService.findUpcomingShiftsByUserId(locals.user.id)
]);
+ console.log(locals.beerService.getTotalAvailableBeers(locals.user.id));
+
return {
shiftsCompleted: userShifts.length,
- unclaimedBeers: unclaimedBeers.length,
+ unclaimedBeers: unclaimedBeers,
upcomingShifts
};
};
diff --git a/apps/www/src/routes/portal/admin/+page.server.ts b/apps/www/src/routes/portal/admin/+page.server.ts
new file mode 100644
index 00000000..f13bba4b
--- /dev/null
+++ b/apps/www/src/routes/portal/admin/+page.server.ts
@@ -0,0 +1,39 @@
+import { redirect, fail, type Actions } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+
+export const load: PageServerLoad = async ({ locals }) => {
+ if (!locals.user || locals.user.role !== 'board') {
+ throw redirect(303, '/portal');
+ }
+
+ const users = await locals.userService.findAll();
+
+ return {
+ user: locals.user,
+ users
+ };
+};
+
+export const actions: Actions = {
+ default: async ({ request, locals }) => {
+ const formData = await request.formData();
+ const userId = formData.get('userId') as string;
+ const role = formData.get('role');
+
+ if (typeof role !== 'string' || (role !== 'board' && role !== 'normal')) {
+ return fail(400, { error: 'Invalid role specified' });
+ }
+
+ if (!locals.user || locals.user.role !== 'board') {
+ return fail(401, { error: 'Unauthorized' });
+ }
+
+ const success = await locals.userService.updateUserRole(userId, role);
+
+ if (success) {
+ return { success: true };
+ } else {
+ return fail(500, { error: 'Failed to update user role' });
+ }
+ }
+};
diff --git a/apps/www/src/routes/portal/admin/+page.svelte b/apps/www/src/routes/portal/admin/+page.svelte
new file mode 100644
index 00000000..1855fbf3
--- /dev/null
+++ b/apps/www/src/routes/portal/admin/+page.svelte
@@ -0,0 +1,125 @@
+
+
+
+ Admin - User Management
+
+
+{#if isModalOpen && selectedUser}
+ updateRole(event.userId, event.newRole)}
+ />
+{/if}
+
+
+ Styret
+
+ {#each boardMembers as user (user.id)}
+
+ {/each}
+
+
+
+
diff --git a/apps/www/src/routes/portal/admin/user/[id]/+server.ts b/apps/www/src/routes/portal/admin/user/[id]/+server.ts
new file mode 100644
index 00000000..af23fc18
--- /dev/null
+++ b/apps/www/src/routes/portal/admin/user/[id]/+server.ts
@@ -0,0 +1,64 @@
+import { json, error } from '@sveltejs/kit';
+
+interface BeerUpdateData {
+ additionalBeers: number;
+}
+
+export async function GET({ params, locals }: { params: { id: string }; locals: App.Locals }) {
+ const userId = params.id;
+
+ if (!locals.user || locals.user.role !== 'board') {
+ throw error(401, 'Unauthorized');
+ }
+
+ const user = await locals.userService.findById(userId);
+
+ if (!user) {
+ throw error(404, 'User not found');
+ }
+
+ const userShifts = await locals.shiftService.findCompletedShiftsByUserId(userId);
+ const unclaimedBeers = await locals.beerService.getTotalAvailableBeers(userId);
+
+ return json({
+ ...user,
+ timesVolunteered: userShifts.length,
+ unclaimedBeers: unclaimedBeers
+ });
+}
+
+export async function POST({
+ params,
+ request,
+ locals
+}: {
+ params: { id: string };
+ request: Request;
+ locals: App.Locals;
+}) {
+ const userId = params.id;
+
+ if (!locals.user || locals.user.role !== 'board') {
+ throw error(401, 'Unauthorized');
+ }
+
+ try {
+ const data = (await request.json()) as BeerUpdateData;
+ const newBeerCount = Number(data.additionalBeers);
+
+ if (!Number.isInteger(newBeerCount) || newBeerCount < 0) {
+ throw error(400, 'Invalid additional beer count');
+ }
+
+ const success = await locals.beerService.updateBeers(userId, newBeerCount);
+
+ if (success) {
+ return json({ success: true });
+ } else {
+ throw error(500, 'Failed to update additional beers');
+ }
+ } catch (err) {
+ console.error('Error updating additional beers:', err);
+ throw error(500, 'Server error');
+ }
+}
diff --git a/apps/www/src/routes/portal/arrangementer/+page.svelte b/apps/www/src/routes/portal/arrangementer/+page.svelte
index f4efb051..875dd0ce 100644
--- a/apps/www/src/routes/portal/arrangementer/+page.svelte
+++ b/apps/www/src/routes/portal/arrangementer/+page.svelte
@@ -1,8 +1,11 @@
@@ -10,10 +13,11 @@
Arrangementer
-
-
- Nytt arrangement
-
+{#if auth.user?.role == 'board'}
+
+ Nytt arrangement
+
+{/if}
{#each data.events as event}
diff --git a/apps/www/src/routes/portal/brukere/+page.svelte b/apps/www/src/routes/portal/brukere/+page.svelte
index 2347329e..e6e5e089 100644
--- a/apps/www/src/routes/portal/brukere/+page.svelte
+++ b/apps/www/src/routes/portal/brukere/+page.svelte
@@ -1,9 +1,10 @@
+
+
+ 🍺 Claim Your Beer
+
+
+ {#if message}
+ {message}
+ {/if}
+
+ {#if error}
+ {error}
+ {/if}
+
+
+
diff --git a/apps/www/src/routes/portal/claim-beer/+server.ts b/apps/www/src/routes/portal/claim-beer/+server.ts
new file mode 100644
index 00000000..d7f566b8
--- /dev/null
+++ b/apps/www/src/routes/portal/claim-beer/+server.ts
@@ -0,0 +1,21 @@
+import { json, error } from '@sveltejs/kit';
+
+export async function POST({ locals }) {
+ const userId = locals.user?.id;
+
+ if (!userId) {
+ throw error(401, 'Unauthorized: Please log in to claim your beer.');
+ }
+
+ try {
+ const success = await locals.beerService.claimBeer(userId);
+ if (success) {
+ return json({ success: true });
+ } else {
+ return json({ message: 'No more beers left to claim.' }, { status: 400 });
+ }
+ } catch (err) {
+ console.error('Error claiming beer:', err);
+ throw error(500, 'Server encountered an unexpected issue.');
+ }
+}