Save history with user id and shows email

src/lib/elements/About.svelte

@@ -1,11 +1,19 @@
 <script lang="ts">
 	import { version } from '$app/environment'
+	import type { User } from '@supabase/supabase-js'
+	export let user: User | null = null
 </script>
 
 <div class="flex flex-col text-center items-center">
 	<img class="h-10 w-10 rounded-full" src="/logo.jpeg" alt="logo" />
 	<p class="text-lg font-bold">Paper Cost</p>
 
+	<p class="text-sm">
+		Logged in as:
+		<span class="text-teal-500">
+			{user?.email}
+		</span>
+	</p>
 	<p class="mt-5">Developed by</p>
 	<div class="text-sm flex flex-col">
 		<p>Sheba Queue</p>

src/lib/utils/services.ts

@@ -15,6 +15,7 @@ export type CostHistoryType = {
 	name: string
 	papers: Paper[]
 	final_price: number
+	user: string
 	created_at?: string
 }
 
@@ -37,8 +38,9 @@ export const get40Percent = (cost: number) => {
 export const addHistory = async (history: CostHistoryType) => {
 	const { data, error } = await supabase.from('history').insert({
 		name: history.name || '',
-		papers: history.papers || [],
-		final_price: history.final_price || 100
+		papers: history.papers,
+		final_price: history.final_price,
+		user: history.user
 	})
 	if (!error) {
 		return data

src/routes/(app)/+layout.server.ts

@@ -1,7 +1,8 @@
 import type { LayoutServerLoad } from './$types'
 
-export const load: LayoutServerLoad = async ({ cookies }) => {
+export const load: LayoutServerLoad = async ({ locals: { user }, cookies }) => {
 	return {
+		user,
 		cookies: cookies.getAll()
 	}
 }

src/routes/(app)/+layout.svelte

@@ -13,6 +13,8 @@
 	import BrandTitle from '$lib/elements/BrandTitle.svelte'
 	import About from '$lib/elements/About.svelte'
 
+	export let data
+
 	//Import Mixpanel SDK
 	mixpanel.init(PUBLIC_MIX_TOKEN, {
 		debug: false,
@@ -38,7 +40,7 @@
 	{/if}
 	{#if showAbout}
 		<Modal bind:show={showAbout}>
-			<About />
+			<About user={data.user} />
 		</Modal>
 	{/if}
 	<div class="flex flex-col h-[92%]">

src/routes/(app)/+layout.ts

@@ -30,9 +30,9 @@ export const load: LayoutLoad = async ({ fetch, data, depends }) => {
 	// const {
 	// 	data: { session }
 	// } = await supabase.auth.getSession()
-	// const {
-	// 	data: { user }
-	// } = await supabase.auth.getUser()
+	const {
+		data: { user }
+	} = await supabase.auth.getUser()
 
-	return { supabase }
+	return { supabase, user }
 }

src/routes/(app)/+page.server.ts

@@ -1,5 +1,11 @@
 import { redirect, type Actions } from '@sveltejs/kit'
 
+export const load = ({ locals: { user } }) => {
+	return {
+		user
+	}
+}
+
 export const actions: Actions = {
 	logout: async ({ locals: { supabase } }) => {
 		const { error } = await supabase.auth.signOut()

src/routes/(app)/+page.svelte

@@ -10,6 +10,8 @@
 	import { onMount, tick } from 'svelte'
 	import { toast } from 'svelte-sonner'
 
+	export let data
+
 	let paperCount: Paper[] = [{ ...paperFields, id: makeid(5) }]
 	let perPaperResult: Map<string, number> = new Map()
 	let finalPrice: number = 0
@@ -64,7 +66,8 @@
 			const response = await addHistory({
 				name: customer_name,
 				final_price: finalPrice,
-				papers: paperCount
+				papers: paperCount,
+				user: data.user.id
 			})
 
 			if (response && response?.message.indexOf('TypeError') != -1) {

src/routes/(app)/history/+page.server.ts

@@ -1,7 +1,11 @@
-import { supabase } from '$lib/db/supabaseClient'
+export async function load({ locals: { user, supabase } }) {
+	if (!user) throw new Error('Unautherized request')
 
-export async function load() {
-	const { data } = await supabase.from('history').select().is('deleted_at', null)
+	const { data } = await supabase
+		.from('history')
+		.select()
+		.eq('user', user.id)
+		.is('deleted_at', null)
 	return {
 		histories: data ?? []
 	}

src/routes/(app)/history/trash/+page.server.ts

@@ -1,7 +1,11 @@
-import { supabase } from '$lib/db/supabaseClient'
+export async function load({ locals: { user, supabase } }) {
+	if (!user) throw new Error('Unautherized request')
 
-export async function load() {
-	const { data } = await supabase.from('history').select().not('deleted_at', 'is', null)
+	const { data } = await supabase
+		.from('history')
+		.select()
+		.eq('user', user.id)
+		.not('deleted_at', 'is', null)
 	return {
 		histories: data ?? []
 	}