Merge branch 'main' into npease-chatrooms-profile

frontend-next/src/app/page.js

@@ -4,11 +4,13 @@ import { useState, useEffect } from 'react'
 
 function Home() {
     const [statusCode, setData] = useState(null)
+    const [isLoading, setLoading] = useState(true)
     useEffect(() => {
       fetch('/api/user')
         .then((res) => res.status)
         .then((status) => {
           setData(status)
+          setLoading(false)
         })
     }, [])
     return (
@@ -20,7 +22,7 @@ function Home() {
                         Chat with friends!
                     </span>
                     <div className="m-5">
-                        {statusCode == 203 && 
+                        {(statusCode == 203 || isLoading) && 
                             <div>
                                 <a href="/login"><button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">Login</button></a>
                                 <a href="/register"><button className="bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">Sign Up</button></a>

frontend-next/src/app/register/page.js

@@ -4,6 +4,7 @@ import { useForm, Form } from "react-hook-form";
 import "../globals.css"
 import { useState } from "react";
 
+
 function Register() {
     var { register, control, setError, handleSubmit, formState: { errors } } = useForm()
     var router = useRouter();
@@ -45,7 +46,7 @@ function Register() {
                         >
                             <input type="email" {...register("email", {required: true, pattern: emailRegex})} className={errors.email && "err"} placeholder="Enter Email Address"/><br/>
                             <input type="password" {...register("password", {required: true})} className={errors.password && errors.password.type == 'required' && "err"} placeholder="Enter Password"/><br/>
-                            <input type ="password" {...register("passwordCheck", {required: false})} className ={errors.passwordCheckheck && errors.passwordCheck.type == 'required' && "err"} placeholder="Re-enter Password"/><br/>
+                            <input type ="password" {...register("passwordCheck", {required: false})} className ={errors.passwordCheck && errors.passwordCheck.type == 'required' && "err"} placeholder="Re-enter Password"/><br/>
                                 {passwordMismatch && <p className="text-red-500">Passwords do not match</p>}
                             <button type="submit" className="bg-[#dee0e0] m-5 bg-cyan-500 text-white font-bold py-2 px-4 rounded-full">
                                 Register</button><br/>
@@ -58,4 +59,4 @@ function Register() {
     )
 }
 
-export default Register;
+export default Register;