From 6179f8d4c2ab203e528e707101a799b0a7c0bd73 Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Wed, 3 Apr 2024 21:52:55 +0000
Subject: [PATCH 1/3] Initial

---
 frontend-next/src/app/app/page.js             |  1 +
 frontend-next/src/app/login/page.js           |  6 +--
 frontend-next/src/app/page.js                 | 22 +++++-----
 frontend-next/src/app/register/page.js        |  6 +--
 frontend-next/src/components/app/datatypes.js | 41 +++++++++----------
 frontend-next/src/components/app/header.js    | 13 +++---
 .../src/components/app/profile/ProfileRoom.js |  5 ++-
 7 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/frontend-next/src/app/app/page.js b/frontend-next/src/app/app/page.js
index 75d60e3..c057526 100644
--- a/frontend-next/src/app/app/page.js
+++ b/frontend-next/src/app/app/page.js
@@ -5,6 +5,7 @@ import { auth, database } from "../../../firebase-config";
 import { ref, onValue } from "firebase/database";
 import { useAuthState } from "react-firebase-hooks/auth"
 import { useGeolocated } from "react-geolocated";
+import Link from "next/link"
 
 // Header Import
 import { Header } from "../../components/app/header";
diff --git a/frontend-next/src/app/login/page.js b/frontend-next/src/app/login/page.js
index 29885e0..f6b287d 100644
--- a/frontend-next/src/app/login/page.js
+++ b/frontend-next/src/app/login/page.js
@@ -46,9 +46,9 @@ function Login() {
     <div>
       <div className="grid h-screen place-items-center">
         <div>
-          <a href="/">
+          <Link href="/">
             <img src="logos/logo_transparent_inverse.png" />
-          </a>
+          </Link>
           <span className="text-[36px]">Chat with friends!</span>
           <div>
             <h3 className="text-[24px] mt-[25px] mb-2">Login</h3>
@@ -109,7 +109,7 @@ function Login() {
                 Log In
               </button>
               <br />
-              Need an account? <a href="/register">Sign Up</a>
+              Need an account? <Link href="/register">Sign Up</Link>
               <br />
             </Form>
           </div>
diff --git a/frontend-next/src/app/page.js b/frontend-next/src/app/page.js
index dee3a1c..91ac733 100644
--- a/frontend-next/src/app/page.js
+++ b/frontend-next/src/app/page.js
@@ -1,6 +1,6 @@
 "use client";
 import { useState, useEffect } from "react";
-
+import Link from "next/link"
 import { auth, database } from "../../firebase-config";
 import { ref, get } from "firebase/database";
 import { onAuthStateChanged } from "firebase/auth";
@@ -53,24 +53,24 @@ function Home() {
           <div className="m-5">
             {!isAuthenticated && (
               <div>
-                <a href="/login">
+                <Link href="/login">
                   <button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">
                     Login
                   </button>
-                </a>
-                <a href="/register">
+                </Link>
+                <Link href="/register">
                   <button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">
-                    Sign Up
+                    Register
                   </button>
-                </a>
+                </Link>
               </div>
             )}
             {isAuthenticated && (
-              <a href="/app">
-                <button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">
-                  Continue to App
-                </button>
-              </a>
+              <Link href="/app">
+              <button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">
+                Continue to App
+              </button>
+            </Link>
             )}
             {!isLoadingLoc && roomCount == 1 && (
               <div className="text-[24px] pt-10">
diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js
index 6aba36d..f3c64ee 100644
--- a/frontend-next/src/app/register/page.js
+++ b/frontend-next/src/app/register/page.js
@@ -61,9 +61,9 @@ function Register() {
     <div>
       <div className="grid h-screen place-items-center">
         <div>
-          <a href="/">
+          <Link href="/">
             <img src="logos/logo_transparent_inverse.png" />
-          </a>
+          </Link>
           <span className="text-[36px]">Chat with friends!</span>
           <div>
             <h3 className="text-[24px] mt-[15px]">Register</h3>
@@ -110,7 +110,7 @@ function Register() {
                 Register
               </button>
               <br />
-              Have an account? <a href="/login">Log In</a>
+              Have an account? <Link href="/login">Login</Link>
             </Form>
           </div>
         </div>
diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js
index ab5469d..a6b95e6 100644
--- a/frontend-next/src/components/app/datatypes.js
+++ b/frontend-next/src/components/app/datatypes.js
@@ -1,3 +1,5 @@
+import Link from "next/link"
+
 // Colors for Messages
 const userColors = [
   "#ff80ed",
@@ -40,13 +42,11 @@ export function Chat({ chatObj }) {
     <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
       <div>
         <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-          <a
-            href={chatObj.uid && "/user/" + chatObj.uid}
-            className="hover:font-bold cursor-pointer"
-            target="_blank"
-          >
+          <Link href={chatObj.uid && "/user/" + chatObj.uid}
+          className="hover:font-bold cursor-pointer"
+          target="_blank">
             {chatObj.user}
-          </a>
+          </Link>
         </span>
         : {chatObj.body}
       </div>
@@ -73,13 +73,11 @@ export function SystemMessage({ chatObj }) {
     <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
       <div className="text-[#d1d1d1]">
         <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-          <a
-            href={chatObj.uid && "/user/" + chatObj.uid}
-            className="hover:font-bold cursor-pointer"
-            target="_blank"
-          >
+          <Link href={chatObj.uid && "/user/" + chatObj.uid}
+          className="hover:font-bold cursor-pointer"
+          target="_blank">
             {chatObj.user}
-          </a>
+          </Link>
         </span>{" "}
         has {chatObj.body} the room.
       </div>
@@ -93,25 +91,24 @@ export function SystemMessage({ chatObj }) {
 // Member for Active/Room members in sidebar
 export function Member({ memberObj }) {
   return (
-    <a href={"/user/" + memberObj.uid} target="_blank">
+    <Link href={"/user/" + memberObj.uid} target="_blank">
       <div className="cursor-pointer g-[aliceblue] rounded-lg m-3 shadow-xl p-2">
         {memberObj.username}
       </div>
-    </a>
+    </Link>
   );
 }
 
 // Chat Room Object for myRooms and Nearby in sidebar
 export function ChatRoomSidebar({ roomObj }) {
   return (
-    <div
-      onClick={() => location.href = "/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp}
-      className="border-[black] border-1 shadow-lg p-2 m-2 rounded-lg cursor-pointer"
-    >
-      <div className="col-span-2">
-        <div className="font-bold">{roomObj.name}</div>
-        <div className="italic">{roomObj.description}</div>
-      </div>
+    <div className="border-[black] border-1 shadow-lg p-2 m-2 rounded-lg cursor-pointer">
+      <Link href={"/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp} prefetch={false}>
+        <div className="col-span-2">
+          <div className="font-bold">{roomObj.name}</div>
+          <div className="italic">{roomObj.description}</div>
+        </div>
+      </Link>
     </div>
   );
 }
diff --git a/frontend-next/src/components/app/header.js b/frontend-next/src/components/app/header.js
index f6605f7..ea4e72b 100644
--- a/frontend-next/src/components/app/header.js
+++ b/frontend-next/src/components/app/header.js
@@ -2,6 +2,7 @@ import { auth, database } from "../../../firebase-config";
 import { ref, set, remove } from "firebase/database";
 import { signOut } from "firebase/auth";
 import { Popover } from "@headlessui/react";
+import Link from "next/link"
 
 
 function logout() {
@@ -83,9 +84,9 @@ export function Header({
   return (
     <div className="flex m-2 rounded-lg h-[63px] bg-white shadow-2xl p-1">
       <div className="flex shrink h-[60px]">
-        <a href="/app">
+        <Link href="/app">
           <img src="/logos/logo_transparent_inverse.png" className="h-[60px]" />
-        </a>
+        </Link>
       </div>
       <div className="grow grid grid-rows-1 grid-flow-col auto-cols-max justify-end gap-2 h-[60px] p-2">
         {mainTab == "chat" && isMyRoom == false && (
@@ -137,19 +138,19 @@ export function Header({
 
           <Popover.Panel className="absolute z-10 bg-white mt-[4px] rounded-xl ml-3 shadow-2xl">
             <div className="grid grid-cols-1">
-              <a
+              <Link
                 className="rounded-xl p-4 hover:bg-[#C0C0C0]"
                 href={"/user/" + user.uid}
               >
                 View Profile
-              </a>
-              <a
+              </Link>
+              <Link
                 className="rounded-xl p-4 hover:bg-[#C0C0C0]"
                 onClick={logout}
                 href="/"
               >
                 Sign Out
-              </a>
+              </Link>
             </div>
 
             <img src="/solutions.jpg" alt="" />
diff --git a/frontend-next/src/components/app/profile/ProfileRoom.js b/frontend-next/src/components/app/profile/ProfileRoom.js
index 80e6268..799c8cc 100644
--- a/frontend-next/src/components/app/profile/ProfileRoom.js
+++ b/frontend-next/src/components/app/profile/ProfileRoom.js
@@ -1,4 +1,5 @@
 import { Geo } from "../map/geo";
+import Link from "next/link"
 import { dateOptions } from "../datatypes";
 
 // Display of Rooms on user profile
@@ -18,14 +19,14 @@ export function ProfileRoom({ room }) {
         <div>
           Created on {new Date(room.timestamp).toLocaleString(dateOptions)}
         </div>
-        <a
+        <Link
           href={
             "/chat?room=" + room.path + "/" + room.name + "-" + room.timestamp
           }
           className="absolute z-2 top-[190px] w-[108px] p-2 cursor-pointer bg-cyan-500 text-white font-bold rounded-full flex items-center"
         >
           Open Room
-        </a>
+        </Link>
       </div>
     </div>
   );

From 8bca33a039ef50086c098e9337dd82f027b4126e Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Wed, 3 Apr 2024 22:04:19 +0000
Subject: [PATCH 2/3] Good to Release

---
 frontend-next/src/app/login/page.js           | 1 +
 frontend-next/src/app/register/page.js        | 1 +
 frontend-next/src/app/user/[stub]/page.js     | 4 ++--
 frontend-next/src/components/app/datatypes.js | 6 +++---
 frontend-next/src/components/app/header.js    | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend-next/src/app/login/page.js b/frontend-next/src/app/login/page.js
index f6b287d..0cb57ae 100644
--- a/frontend-next/src/app/login/page.js
+++ b/frontend-next/src/app/login/page.js
@@ -1,5 +1,6 @@
 "use client";
 import { useForm, Form } from "react-hook-form";
+import Link from "next/link"
 import { useRouter } from "next/navigation";
 import "../globals.css";
 
diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js
index f3c64ee..f475d56 100644
--- a/frontend-next/src/app/register/page.js
+++ b/frontend-next/src/app/register/page.js
@@ -2,6 +2,7 @@
 import { useRouter } from "next/navigation";
 import { useForm, Form } from "react-hook-form";
 import "../globals.css";
+import Link from "next/link"
 import { useState } from "react";
 
 import {
diff --git a/frontend-next/src/app/user/[stub]/page.js b/frontend-next/src/app/user/[stub]/page.js
index 17bc135..8134315 100644
--- a/frontend-next/src/app/user/[stub]/page.js
+++ b/frontend-next/src/app/user/[stub]/page.js
@@ -120,12 +120,12 @@ function UserProfile({ params }) {
                           }}
                           className="w-[120px] p-2 cursor-pointer bg-cyan-500 text-white font-bold rounded-full text-center"
                         >
-                          Edit Profile{" "}
+                          Edit Profile
                         </a>
                       )}
                       {!isOwner && (
                         <a className="w-[120px] p-2 cursor-pointer bg-cyan-500 text-white font-bold rounded-full text-center">
-                          Add Friend{" "}
+                          Add Friend
                         </a>
                       )}
                     </div>
diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js
index a6b95e6..15f97f5 100644
--- a/frontend-next/src/components/app/datatypes.js
+++ b/frontend-next/src/components/app/datatypes.js
@@ -42,7 +42,7 @@ export function Chat({ chatObj }) {
     <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
       <div>
         <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-          <Link href={chatObj.uid && "/user/" + chatObj.uid}
+          <Link href={`/user/${chatObj.uid}`}
           className="hover:font-bold cursor-pointer"
           target="_blank">
             {chatObj.user}
@@ -73,7 +73,7 @@ export function SystemMessage({ chatObj }) {
     <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
       <div className="text-[#d1d1d1]">
         <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-          <Link href={chatObj.uid && "/user/" + chatObj.uid}
+          <Link href={`/user/${chatObj.uid}`}
           className="hover:font-bold cursor-pointer"
           target="_blank">
             {chatObj.user}
@@ -103,7 +103,7 @@ export function Member({ memberObj }) {
 export function ChatRoomSidebar({ roomObj }) {
   return (
     <div className="border-[black] border-1 shadow-lg p-2 m-2 rounded-lg cursor-pointer">
-      <Link href={"/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp} prefetch={false}>
+      <Link href={`/chat?room=${roomObj.path}/${roomObj.name}-${roomObj.timestamp}`}>
         <div className="col-span-2">
           <div className="font-bold">{roomObj.name}</div>
           <div className="italic">{roomObj.description}</div>
diff --git a/frontend-next/src/components/app/header.js b/frontend-next/src/components/app/header.js
index ea4e72b..01d58d5 100644
--- a/frontend-next/src/components/app/header.js
+++ b/frontend-next/src/components/app/header.js
@@ -27,7 +27,6 @@ function closeChatRoom(roomObj, user) {
     payload
   );
   remove(ref(database, `/rooms/${path}/users/online/${user.uid}`));
-  location.href = "/app";
 }
 
 // Adds room to myRooms
@@ -112,14 +111,15 @@ export function Header({
           </a>
         )}
         {mainTab == "chat" && (
-          <a
+          <Link
             onClick={() => {
               closeChatRoom(chatRoomObj, user);
             }}
+            href="/app"
             className="p-2 cursor-pointer bg-cyan-500 text-white font-bold rounded-full mr-5 flex items-center"
           >
             Close Chat
-          </a>
+          </Link>
         )}
 
         <Popover className="relative">

From b7ec08f5efe8a090bfbd9d541cf86ccbbc30f0d1 Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Wed, 3 Apr 2024 22:08:25 +0000
Subject: [PATCH 3/3] Final Touches

---
 frontend-next/.eslintrc.json      | 2 +-
 frontend-next/src/app/app/page.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend-next/.eslintrc.json b/frontend-next/.eslintrc.json
index 6b2f9c6..471d759 100644
--- a/frontend-next/.eslintrc.json
+++ b/frontend-next/.eslintrc.json
@@ -4,6 +4,6 @@
     "no-unused-vars": ["warn", { "vars": "all", "args": "after-used", "ignoreRestSiblings": false }],
     "jsx-a11y/alt-text": "off",
     "@next/next/no-img-element": "off",
-    "no-console": "on",
+    "no-console": 1
   }
 }
diff --git a/frontend-next/src/app/app/page.js b/frontend-next/src/app/app/page.js
index c057526..75d60e3 100644
--- a/frontend-next/src/app/app/page.js
+++ b/frontend-next/src/app/app/page.js
@@ -5,7 +5,6 @@ import { auth, database } from "../../../firebase-config";
 import { ref, onValue } from "firebase/database";
 import { useAuthState } from "react-firebase-hooks/auth"
 import { useGeolocated } from "react-geolocated";
-import Link from "next/link"
 
 // Header Import
 import { Header } from "../../components/app/header";