-
Your Collections
-
+
Your Collections
{#if collections.length === 0}
You have no collections
{:else}
{#each collections as collection}
-
+
{collection.name}
@@ -25,10 +25,6 @@ let collections = data?.collections || []
Created at: {new Date(collection.createdAt).toLocaleString()}
-
{/each}
{/if}
diff --git a/src/routes/(app)/(protected)/settings/+layout.svelte b/src/routes/(app)/(protected)/settings/+layout.svelte
index 81483b4..4f4c6f4 100644
--- a/src/routes/(app)/(protected)/settings/+layout.svelte
+++ b/src/routes/(app)/(protected)/settings/+layout.svelte
@@ -34,15 +34,21 @@ let { children } = $props()
.security-nav {
display: flex;
+ @media (width <= 1000px) {
+ display: grid;
+ }
+
nav {
- width: 16rem;
- position: sticky;
- top: 0;
- left: 0;
- background-color: #fff;
- padding: 1rem;
- border-right: 1px solid #ddd;
- height: 100vh;
+ @media (width > 1000px) {
+ width: 16rem;
+ position: sticky;
+ top: 0;
+ left: 0;
+ background-color: #fff;
+ padding: 1rem;
+ border-right: 1px solid #ddd;
+ height: 100vh;
+ }
ul {
list-style-type: none;
diff --git a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts
index 91f2ec4..a551027 100644
--- a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts
+++ b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts
@@ -1,9 +1,9 @@
import { notSignedInMessage } from '$lib/flashMessages'
import env from '$lib/server/api/common/env'
+import { decodeHex, encodeBase32 } from '@oslojs/encoding'
+import { createTOTPKeyURI } from '@oslojs/otp'
import { type Actions, fail } from '@sveltejs/kit'
import kebabCase from 'just-kebab-case'
-import { encodeBase32, decodeHex } from '@oslojs/encoding'
-import { createTOTPKeyURI } from '@oslojs/otp'
import QRCode from 'qrcode'
import { redirect } from 'sveltekit-flash-message/server'
import { zod } from 'sveltekit-superforms/adapters'
@@ -63,7 +63,7 @@ export const load: PageServerLoad = async (event) => {
})
}
const decodedHexSecret = decodeHex(createdTotpCredentials.secret_data)
- const secret = encodeBase32(new TextEncoder().encode(decodedHexSecret))
+ const secret = encodeBase32(decodedHexSecret)
const intervalInSeconds = 30
const digits = 6
diff --git a/src/routes/(app)/(protected)/wishlists/+page.server.ts b/src/routes/(app)/(protected)/wishlists/+page.server.ts
index f211518..d5e1386 100644
--- a/src/routes/(app)/(protected)/wishlists/+page.server.ts
+++ b/src/routes/(app)/(protected)/wishlists/+page.server.ts
@@ -1,7 +1,6 @@
import { notSignedInMessage } from '$lib/flashMessages.js'
import { gamesTable, wishlist_items, wishlistsTable } from '$lib/server/api/databases/tables'
import { db } from '$lib/server/api/packages/drizzle'
-import { userNotAuthenticated } from '$lib/server/auth-utils'
import { modifyListGameSchema } from '$lib/validations/zod-schemas'
import { type Actions, error, fail } from '@sveltejs/kit'
import { and, eq } from 'drizzle-orm'
@@ -17,15 +16,8 @@ export async function load(event) {
throw redirect(302, '/login', notSignedInMessage, event)
}
- const userWishlists = await db.query.wishlists.findMany({
- columns: {
- cuid: true,
- name: true,
- createdAt: true,
- },
- where: eq(wishlistsTable.user_id, authedUser.id),
- })
- console.log('wishlists', userWishlists)
+ const { data } = await locals.api.wishlists.$get().then(locals.parseApiResponse)
+ const userWishlists = data?.wishlists
if (userWishlists?.length === 0) {
console.log('Wishlists not found')
diff --git a/src/routes/(app)/(protected)/wishlists/+page.svelte b/src/routes/(app)/(protected)/wishlists/+page.svelte
index ace0846..29ad9b3 100644
--- a/src/routes/(app)/(protected)/wishlists/+page.svelte
+++ b/src/routes/(app)/(protected)/wishlists/+page.svelte
@@ -1,4 +1,6 @@
@@ -8,21 +10,25 @@ const { wishlists = [] } = data
-
Your wishlistsTable
+
Your wishlists
-
-
- {#if wishlists.length === 0}
-
You have no wishlistsTable
- {:else}
- {#each wishlists as wishlist}
-
-
-
Created at: {new Date(wishlist.created_at).toLocaleString()}
-
- {/each}
- {/if}
-
+
@@ -32,10 +38,6 @@ const { wishlists = [] } = data
width: 100%;
}
- .wishlists {
- margin: 2rem 0;
- }
-
.wishlist-list {
display: grid;
grid-template-columns: repeat(3, minmax(200px, 1fr));
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index bb10caa..4f8f756 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -8,7 +8,7 @@ const welcomeName = $derived.by(() => {
welcomeName += data?.user?.firstName
}
if (data?.user?.lastName) {
- welcomeName += ' ' + data?.user?.lastName
+ welcomeName = welcomeName.length === 0 ? data?.user?.lastName : welcomeName
}
if (welcomeName.length === 0) {
@@ -23,7 +23,7 @@ const welcomeName = $derived.by(() => {
{#if user}
Welcome, {welcomeName}!
-
You wishlistsTable:
+
You wishlists:
{#each wishlists as wishlist}
{wishlist.name}
{/each}