Skip to content

Commit 71a14a7

Browse files
omfjGardKalland
authored andcommitted
fix: update emeritus
optim fix
1 parent 3b8c803 commit 71a14a7

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

programmerbar-web/src/routes/(app)/emeritus/+page.svelte

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@
1616
const members = [
1717
'Erik Fjelltveit Nyhuus',
1818
'Lene Soltveit',
19-
'Lars Haukland',
2019
'Steffen Andre Pettersen',
2120
'Siren Bjorøy',
2221
'Ole Straumland',
2322
'Tony Lam',
2423
'Eirik Rekve Thorsheim',
25-
'Ole Magnus Fon Johnsen (første CTO)',
26-
'August Ebne Røeggen'
24+
'Ole Magnus Fon Johnsen',
25+
'August Ebne Røeggen',
26+
'Fredrik Hast Sørli',
27+
'Sturla Rognskog Mella',
28+
'Tord Vikøren Vikestad',
29+
'Henrik Sætre Breivik'
2730
];
2831
2932
const pastMembers = [
@@ -46,7 +49,8 @@
4649
'Simen Hauge Østbø',
4750
'Stian Munkejord',
4851
'Gard Heine Kalland',
49-
'Lars Bysheim'
52+
'Lars Bysheim',
53+
'Lars Haukland'
5054
];
5155
</script>
5256

programmerbar-web/src/routes/(portal)/portal/admin/bruker/[id]/+page.server.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@ export const load: PageServerLoad = async ({ params, locals }) => {
1414
}
1515

1616
const user = await locals.userService.findById(userId);
17-
if (!user) {
18-
throw error(404, 'User not found');
17+
if (!user) {
18+
throw error(404, 'User not found');
1919
}
2020

21-
const userShifts = await locals.shiftService.findCompletedShiftsByUserId(userId);
22-
const unclaimedBeers = await locals.beerService.getTotalAvailableBeers(userId);
23-
const referrals = await locals.referralService.getReferralStats(userId);
24-
const shifts = await locals.shiftService.findUpcomingShiftsByUserId(userId);
21+
const [userShifts, unclaimedBeers, referrals, shifts] = await Promise.all([
22+
await locals.shiftService.findCompletedShiftsByUserId(userId),
23+
await locals.beerService.getTotalAvailableBeers(userId),
24+
await locals.referralService.getReferralStats(userId),
25+
await locals.shiftService.findUpcomingShiftsByUserId(userId),
26+
]);
27+
2528

2629
return {
2730
user,

0 commit comments

Comments
 (0)