Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions apps/www/src/lib/components/cards/UserDetailModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
let roleForm = $state<HTMLFormElement | null>(null);
let unclaimedBeers = $state<number | null>(null);
let unclaimedBeersState = $state<'idle' | 'loading' | 'success' | 'error'>('idle');
let showDeleteSection = $state(false);
let deleteText = $state('');

onMount(async () => {
const response = await fetch(`/portal/admin/user/${selectedUser.id}`);
Expand Down Expand Up @@ -130,5 +132,38 @@
<Button type="button" intent="outline" onclick={onClose}>Lukk</Button>
</div>
</form>
<div class="">
<button type="button" onclick={() => (showDeleteSection = !showDeleteSection)}>
<p class="font-medium text-red-600">Slett bruker</p>
</button>

{#if showDeleteSection}
<div class="bg-white p-4">
<form
method="post"
action="/portal/admin/user/{selectedUser.id}?/deleteUser"
use:enhance={() => {
return ({ result }) => {
if (result.type === 'success') {
onClose();
}
};
}}
>
<div>
<p class="mb-1 text-sm">Skriv <strong>{selectedUser.name}</strong> for å bekrefte</p>
<div class="flex space-x-3">
<div class="flex-1">
<Input type="text" name="confirmDelete" bind:value={deleteText} required />
</div>
<Button type="submit" intent="danger" disabled={deleteText !== selectedUser.name}>
Bekreft sletting
</Button>
</div>
</div>
</form>
</div>
{/if}
</div>
</div>
</div>
7 changes: 7 additions & 0 deletions apps/www/src/lib/services/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,11 @@ export class UserService {

return user;
}
async deleteUser(userId: string) {
return await this.#db
.delete(users)
.where(eq(users.id, userId))
.returning()
.then((rows) => rows[0]);
}
}
39 changes: 36 additions & 3 deletions apps/www/src/routes/portal/admin/user/[id]/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ import type { Actions } from './$types';
export const actions: Actions = {
addBeers: async ({ params, request, locals }) => {
const userId = params.id;
if (!locals.user || locals.user.role !== 'board') {
return fail(401, {
success: false,
message: 'Unauthorized'
});
}
const formData = await request.formData();
const additionalBeers = +Number(formData.get('additionalBeers'));
const success = await locals.beerService.updateBeers(userId, additionalBeers);
if (!success) {
return fail(400, {
success: false,
message: 'Failed to update beers'
});
}
return { success: true };
},

deleteUser: async ({ params, request, locals }) => {
const userId = params.id;

if (!locals.user || locals.user.role !== 'board') {
return fail(401, {
Expand All @@ -13,14 +33,27 @@ export const actions: Actions = {
}

const formData = await request.formData();
const additionalBeers = +Number(formData.get('additionalBeers'));
const confirmDelete = formData.get('confirmDelete')?.toString();

const success = await locals.beerService.updateBeers(userId, additionalBeers);
const user = await locals.userService.findById(userId);
if (confirmDelete !== user?.name) {
return fail(400, {
success: false,
message: "Names dosen't match"
});
}
const success = await locals.userService.deleteUser(userId);

const invId = await locals.invitationService.findByEmail(user.email);

if (invId) {
await locals.invitationService.delete(invId.id);
}

if (!success) {
return fail(400, {
success: false,
message: 'Failed to update beers'
message: 'Failed to delete user'
});
}

Expand Down