From b6c65805f85fb0845bfbc6ddc35b769842c9d5c4 Mon Sep 17 00:00:00 2001 From: Sara Date: Fri, 15 Sep 2023 12:39:30 +0200 Subject: [PATCH] header, font and color changes --- www/app/(auth)/userInfo.tsx | 41 +++++++++------------------- www/app/layout.tsx | 46 +++++++++++++++++++++----------- www/app/transcripts/new/page.tsx | 8 +++--- 3 files changed, 45 insertions(+), 50 deletions(-) diff --git a/www/app/(auth)/userInfo.tsx b/www/app/(auth)/userInfo.tsx index d0a8ad02..a8b918b0 100644 --- a/www/app/(auth)/userInfo.tsx +++ b/www/app/(auth)/userInfo.tsx @@ -10,34 +10,17 @@ export default function UserInfo() { const isAuthenticated = useFiefIsAuthenticated(); const userinfo = useFiefUserinfo(); - return ( -
- {/* Logo on the left */} - - Reflector - - - {/* Text link on the right */} - {!isAuthenticated && ( - - Log in or create account - - )} - {isAuthenticated && ( - - {userinfo?.email} ( - - Log out - - ) - - )} -
+ return !isAuthenticated ? ( + + Log in or create account + + ) : ( + + {userinfo?.email} ( + + Log out + + ) + ); } diff --git a/www/app/layout.tsx b/www/app/layout.tsx index c15974a2..3f5a846c 100644 --- a/www/app/layout.tsx +++ b/www/app/layout.tsx @@ -1,12 +1,13 @@ import "./styles/globals.scss"; -import { Roboto } from "next/font/google"; +import { Poppins } from "next/font/google"; import { Metadata } from "next"; import FiefWrapper from "./(auth)/fiefWrapper"; import UserInfo from "./(auth)/userInfo"; import { ErrorProvider } from "./(errors)/errorContext"; import ErrorMessage from "./(errors)/errorMessage"; +import Image from "next/image"; -const roboto = Roboto({ subsets: ["latin"], weight: "400" }); +const poppins = Poppins({ subsets: ["latin"], weight: ["200", "400", "600"] }); export const metadata: Metadata = { title: { @@ -55,24 +56,37 @@ export const metadata: Metadata = { export default function RootLayout({ children }) { return ( - + -
-
- - -
-

- Reflector -

-

- Capture The Signal, Not The Noise -

+ {/*TODO lvh or svh ? */} +
+
+ {/* Logo on the left */} +
+ Reflector +
+

Reflector

+

+ Capture The Signal, Not The Noise +

+
- {children} -
+ {/* Text link on the right */} + + + + {children}
diff --git a/www/app/transcripts/new/page.tsx b/www/app/transcripts/new/page.tsx index f993f93e..eef7d411 100644 --- a/www/app/transcripts/new/page.tsx +++ b/www/app/transcripts/new/page.tsx @@ -65,10 +65,8 @@ const TranscriptCreate = () => { ) : ( <> -
-

- Audio Permissions -

+
+

Audio Permissions

{loading ? (

Checking permission... @@ -83,7 +81,7 @@ const TranscriptCreate = () => { : "Please grant permission to continue."}