diff --git a/React/src/app/globals.css b/React/src/app/globals.css index ab36b3f..595e4ca 100644 --- a/React/src/app/globals.css +++ b/React/src/app/globals.css @@ -8,7 +8,7 @@ :root { --background: #ffffff; - --foreground: #171717; + --foreground: #4f4e53; } @theme inline { @@ -18,9 +18,9 @@ --font-mono: var(--font-geist-mono); } -@media (prefers-color-scheme: dark) { +@media (prefers-color-scheme: light) { :root { - --background: #0a0a0a; + --background: #5d4949; --foreground: #ededed; } } diff --git a/React/src/app/page.tsx b/React/src/app/page.tsx index 21e0862..f5d7ff9 100644 --- a/React/src/app/page.tsx +++ b/React/src/app/page.tsx @@ -1,6 +1,7 @@ "use client"; import { useState, useEffect } from "react"; import { useRouter } from "next/navigation"; +import './styles.css'; export default function Home() { const [contacts, setContacts] = useState([]); @@ -14,7 +15,9 @@ export default function Home() { fetch("/auth/session") .then((response) => response.json()) .then((data) => { + console.log("Session data received:", data); setSession(data.session); + setLoading(false); }) .catch((error) => { @@ -57,104 +60,64 @@ export default function Home() { if (loading) { return
Loading...
; } + // If no session, show sign-up and login buttons if (!session) { return ( -
+
+ +

+ Welcome to Fauxcall +

+ + +

+ We empower you to feel safe, whenever and wherever. +

+ +

+ Make an account to begin. +

+ + +
+
+

+ + Already have an account? +

- -

- Fauxcall -

-

- Set emergency contacts -

-

- If you stop speaking or say the codeword, these contacts will be - notified -

- {/* form for setting codeword */} -
e.preventDefault()} - > - setCodeword(e.target.value)} - placeholder="Codeword" - className="border border-gray-300 rounded-md p-2" - /> - -
- {/* form for adding contacts */} -
e.preventDefault()} - > - setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="border border-gray-300 rounded-md p-2" - /> - setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="border border-gray-300 rounded-md p-2" - /> - setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="border border-gray-300 rounded-md p-2" - /> - - -
+ +
); } return ( +
-

Welcome, {session.user.name}!

+ -

- Fauxcall -

-

- Set emergency contacts -

+

welcome to Fauxcall, {session.user.nickname}!

+

- If you stop speaking or say the codeword, these contacts will be - notified + To begin, set a codeword and emergency contacts. If you stop speaking or say the codeword, these contacts will be + notified.

{/* form for setting codeword */}
- setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="border border-gray-300 rounded-md p-2" - /> - setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="border border-gray-300 rounded-md p-2" - /> - setContacts(e.target.value.split(","))} - placeholder="Write down an emergency contact" - className="text-input border border-gray-300 rounded-md p-2" - /> + + +