Index: app/(app)/add/page.tsx =================================================================== --- app/(app)/add/page.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/add/page.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -3,34 +3,22 @@ export default function Page() { return ( - <> -
+

-

- Add Transaction -

+ Add Transaction + -
- +
+ Add form placeholder +
+ ); } Index: app/(app)/analytics/page.tsx =================================================================== --- app/(app)/analytics/page.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/analytics/page.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -3,34 +3,22 @@ export default function Page() { return ( - <> -
+

-

- Analytics -

+ Analytics + -
- +
+ Analytics placeholder +
+ ); } Index: app/(app)/history/page.tsx =================================================================== --- app/(app)/history/page.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/history/page.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -3,34 +3,22 @@ export default function Page() { return ( - <> -
+

-

- History -

+ History + -
- +
+ History placeholder +
+ ); } Index: app/(app)/home/page.tsx =================================================================== --- app/(app)/home/page.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/home/page.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -3,35 +3,26 @@ export default function Page() { return ( - <> -
+

-

- Welcome to
- FEiN -

+ Welcome to
+ FEiN + -
- + {/* Add real home content below later */} +
+
+ Home content placeholder +
+
+ ); } Index: app/(app)/layout.tsx =================================================================== --- app/(app)/layout.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/layout.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -15,11 +15,16 @@ return ( -
-
+
+ {/* Scrollable content inside phone shell */} +
{children}
- {/* Fixed bottom navigation */} - + {/* Bottom nav FLOATS INSIDE the phone shell */} +
+
+ +
+
); Index: app/(app)/profile/actions.ts =================================================================== --- app/(app)/profile/actions.ts (revision 509bd1945ebde55993c693195b3a5c8518ddc204) +++ app/(app)/profile/actions.ts (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -0,0 +1,57 @@ +'use server'; + +import { auth } from '@/auth'; +import { redirect } from 'next/navigation'; +import postgres from 'postgres'; +import bcrypt from 'bcrypt'; + +const sql = postgres(process.env.POSTGRES_URL!, { ssl: 'require' }); + +export async function updateProfile(formData: FormData) { + const session = await auth(); + if (!session?.user?.id) redirect('/login'); + + const name = formData.get('name') as string; + const email = formData.get('email') as string; + + await sql` + UPDATE "user" + SET user_name = ${name}, + email = ${email} + WHERE user_id = ${session.user.id} + `; + + redirect('/profile'); +} + +export async function updatePassword(formData: FormData) { + const session = await auth(); + if (!session?.user?.id) redirect('/login'); + + const currentPassword = formData.get('currentPassword') as string; + const newPassword = formData.get('newPassword') as string; + + const users = await sql` + SELECT password + FROM "user" + WHERE user_id = ${session.user.id} + `; + + const user = users[0]; + if (!user) redirect('/login'); + + const match = await bcrypt.compare(currentPassword, user.password); + if (!match) { + throw new Error('Current password is incorrect'); + } + + const hashed = await bcrypt.hash(newPassword, 10); + + await sql` + UPDATE "user" + SET password = ${hashed} + WHERE user_id = ${session.user.id} + `; + + redirect('/profile'); +} Index: app/(app)/profile/page.tsx =================================================================== --- app/(app)/profile/page.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/(app)/profile/page.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -1,36 +1,110 @@ +import { auth, signOut } from '@/auth'; +import { redirect } from 'next/navigation'; import { poppins } from '@/app/ui/fonts'; +import { updateProfile, updatePassword } from './actions'; -export default function Page() { +export default async function ProfilePage() { + const session = await auth(); + + if (!session?.user) { + redirect('/login'); + } + return ( - <> -
+ {/* Title */} +

-

+ +
+ + {/* Account Info */} +
+ +
+
+ + +
+ +
+ + +
+ + +
+
+ + {/* Security */} +
+ +
+
+ + +
+ +
+ + +
+ + +
+
+ + {/* Logout */} +
{ + 'use server'; + await signOut({ redirectTo: '/login' }); + }} > - Profile -

+ + -
- +
+ ); } Index: app/layout.tsx =================================================================== --- app/layout.tsx (revision 4040276b643f272fe225cedb34141cb465e07a8c) +++ app/layout.tsx (revision 509bd1945ebde55993c693195b3a5c8518ddc204) @@ -18,9 +18,12 @@ return ( - -
+ {/* lock page scroll; the app will scroll inside the phone shell */} + + {/* Outer background wrapper */} +
{/* Phone shell */}