From 7160c6159464a3c8baec92b0f90c3571612d3116 Mon Sep 17 00:00:00 2001
From: Ethan Ho <hoea2@uci.edu>
Date: Mon, 15 Jan 2024 17:59:08 -0800
Subject: [PATCH 1/5] Completed Sprint task -- renamed all "Register" items to
 "SignUp"

Co-authored-by: cherhchen <cherhchen@users.noreply.github.com>
---
 src/App.jsx                                   | 29 +++++++++++++++++--
 .../{register.jsx => SignUp.jsx}              |  8 ++---
 src/pages/Catalog/Catalog.jsx                 |  9 ++++++
 src/pages/Playground/Playground.jsx           |  9 ++++++
 .../PublishedSchedule/PublishedSchedule.jsx   | 11 +++++++
 5 files changed, 59 insertions(+), 7 deletions(-)
 rename src/components/Authentication/{register.jsx => SignUp.jsx} (94%)
 create mode 100644 src/pages/Catalog/Catalog.jsx
 create mode 100644 src/pages/Playground/Playground.jsx
 create mode 100644 src/pages/PublishedSchedule/PublishedSchedule.jsx

diff --git a/src/App.jsx b/src/App.jsx
index 06ece1d..73d6fd8 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -5,12 +5,15 @@ import { Route, Routes, BrowserRouter as Router } from 'react-router-dom';
 import { CookiesProvider } from 'react-cookie';
 import Login from './components/Authentication/Login';
 import Logout from './components/Authentication/Logout';
-import Register from './components/Authentication/register';
+import SignUp from './components/Authentication/SignUp';
 import Dashboard from './pages/Dashboard/Dashboard';
 import ForgotPassword from './components/Authentication/ForgotPassword';
 import EmailAction from './components/Authentication/EmailAction';
 import AUTH_ROLES from './utils/auth_config';
 import ProtectedRoute from './utils/ProtectedRoute';
+import Catalog from './pages/Catalog/Catalog';
+import PublishedSchedule from './pages/PublishedSchedule/PublishedSchedule';
+import Playground from './pages/Playground/Playground';
 
 const { ADMIN_ROLE, USER_ROLE } = AUTH_ROLES.AUTH_ROLES;
 
@@ -21,10 +24,10 @@ const App = () => {
         <CookiesProvider>
           <Router>
             <Routes>
-              <Route exact path="/" element={<Login />} />
+              <Route exact path="/login" element={<Login />} />
               <Route exact path="/logout" element={<Logout />} />
               <Route exact path="/forgotpassword" element={<ForgotPassword />} />
-              <Route exact path="/register" element={<Register />} />
+              <Route exact path="/signUp" element={<SignUp />} />
               <Route exact path="/emailAction" element={<EmailAction redirectPath="/" />} />
               <Route
                 exact
@@ -37,6 +40,26 @@ const App = () => {
                   />
                 }
               />
+              <Route
+                exact path="/catalog"
+                element={
+                  <ProtectedRoute
+                    Component={Catalog}
+                    redirectPath="/"
+                    roles={[ADMIN_ROLE, USER_ROLE]}
+                  />
+                }
+              />
+              <Route exact path="/publishedSchedule"
+                element={
+                  <ProtectedRoute
+                    Component={PublishedSchedule}
+                    redirectPath="/"
+                    roles={[ADMIN_ROLE, USER_ROLE]}
+                  />
+                }
+              />
+              <Route exact path="/playground" element={<Playground />}/>
             </Routes>
           </Router>
         </CookiesProvider>
diff --git a/src/components/Authentication/register.jsx b/src/components/Authentication/SignUp.jsx
similarity index 94%
rename from src/components/Authentication/register.jsx
rename to src/components/Authentication/SignUp.jsx
index a6f336e..34f109d 100644
--- a/src/components/Authentication/register.jsx
+++ b/src/components/Authentication/SignUp.jsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { registerWithEmailAndPassword } from '../../utils/auth_utils';
 
-const Register = () => {
+const SignUp = () => {
   const [email, setEmail] = useState();
   const [password, setPassword] = useState();
   const [checkPassword, setCheckPassword] = useState();
@@ -39,7 +39,7 @@ const Register = () => {
 
   return (
     <div>
-      <h2>Register</h2>
+      <h2>Sign Up</h2>
       <form onSubmit={handleSubmit}>
         <input type="text" onChange={({ target }) => setEmail(target.value)} placeholder="Email" />
         <br />
@@ -57,7 +57,7 @@ const Register = () => {
           type="password"
         />
         <br />
-        <button type="submit">Register</button>
+        <button type="submit">Sign Up</button>
         {/* <div className="login-buttons">
           <button type="button" onClick={handleGoogleSignIn}>
             <span>Sign Up With Google</span>
@@ -69,4 +69,4 @@ const Register = () => {
   );
 };
 
-export default Register;
+export default SignUp;
diff --git a/src/pages/Catalog/Catalog.jsx b/src/pages/Catalog/Catalog.jsx
new file mode 100644
index 0000000..1e85391
--- /dev/null
+++ b/src/pages/Catalog/Catalog.jsx
@@ -0,0 +1,9 @@
+const Catalog = () => {
+    return (
+      <div>
+        <h1>Catalog</h1>
+      </div>
+    );
+  };
+
+  export default Catalog;
diff --git a/src/pages/Playground/Playground.jsx b/src/pages/Playground/Playground.jsx
new file mode 100644
index 0000000..cd12780
--- /dev/null
+++ b/src/pages/Playground/Playground.jsx
@@ -0,0 +1,9 @@
+const Playground = () => {
+    return (
+      <div>
+        <h1>Playground</h1>
+      </div>
+    );
+  };
+
+export default Playground;
diff --git a/src/pages/PublishedSchedule/PublishedSchedule.jsx b/src/pages/PublishedSchedule/PublishedSchedule.jsx
new file mode 100644
index 0000000..feea92d
--- /dev/null
+++ b/src/pages/PublishedSchedule/PublishedSchedule.jsx
@@ -0,0 +1,11 @@
+
+const PublishedSchedule = () => {
+  return (
+    <div>
+      <h1>Published Schedule</h1>
+    </div>
+  )
+}
+
+
+export default PublishedSchedule;

From a71f3a2d06667c41cbee47d01ae424b8c94380bc Mon Sep 17 00:00:00 2001
From: Ethan Ho <hoea2@uci.edu>
Date: Thu, 18 Jan 2024 12:13:50 -0800
Subject: [PATCH 2/5] Restored '/' route and changed redirect paths of
 Protected routes to '/login'

---
 src/App.jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 73d6fd8..80c3328 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -24,6 +24,7 @@ const App = () => {
         <CookiesProvider>
           <Router>
             <Routes>
+              <Route exact path="/" element={<PublishedSchedule />} />
               <Route exact path="/login" element={<Login />} />
               <Route exact path="/logout" element={<Logout />} />
               <Route exact path="/forgotpassword" element={<ForgotPassword />} />
@@ -35,7 +36,7 @@ const App = () => {
                 element={
                   <ProtectedRoute
                     Component={Dashboard}
-                    redirectPath="/"
+                    redirectPath="/login"
                     roles={[ADMIN_ROLE, USER_ROLE]}
                   />
                 }
@@ -45,7 +46,7 @@ const App = () => {
                 element={
                   <ProtectedRoute
                     Component={Catalog}
-                    redirectPath="/"
+                    redirectPath="/login"
                     roles={[ADMIN_ROLE, USER_ROLE]}
                   />
                 }
@@ -54,7 +55,7 @@ const App = () => {
                 element={
                   <ProtectedRoute
                     Component={PublishedSchedule}
-                    redirectPath="/"
+                    redirectPath="/login"
                     roles={[ADMIN_ROLE, USER_ROLE]}
                   />
                 }

From 4e3ce3bacb21331722520b21242208bcb2a23107 Mon Sep 17 00:00:00 2001
From: Ethan Ho <hoea2@uci.edu>
Date: Thu, 18 Jan 2024 12:23:13 -0800
Subject: [PATCH 3/5] updated '/' to protected route

---
 src/App.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/App.jsx b/src/App.jsx
index 80c3328..1577d9a 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -24,7 +24,16 @@ const App = () => {
         <CookiesProvider>
           <Router>
             <Routes>
-              <Route exact path="/" element={<PublishedSchedule />} />
+              <Route
+                exact path="/"
+                element={
+                  <ProtectedRoute
+                    Component={PublishedSchedule}
+                    redirectPath='/login'
+                    roles={[ADMIN_ROLE, USER_ROLE]}
+                  />
+                }
+              />
               <Route exact path="/login" element={<Login />} />
               <Route exact path="/logout" element={<Logout />} />
               <Route exact path="/forgotpassword" element={<ForgotPassword />} />

From 9b0fb61012ff4a23e3d553b9e6892339dca9fa82 Mon Sep 17 00:00:00 2001
From: michellelin1 <michellelin810@gmail.com>
Date: Sun, 21 Jan 2024 16:00:10 -0800
Subject: [PATCH 4/5] changed dashboard to notifications

---
 src/App.jsx                                            | 10 ++++------
 src/components/Authentication/Login.jsx                |  2 +-
 src/components/Authentication/Logout.jsx               |  2 +-
 .../Dashboard.jsx => Notifications/Notifications.jsx}  |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename src/pages/{Dashboard/Dashboard.jsx => Notifications/Notifications.jsx} (52%)

diff --git a/src/App.jsx b/src/App.jsx
index 1577d9a..f0ffa25 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,12 +1,11 @@
 import './App.css';
-import EmailSending from './components/EmailTemplates/EmailSending';
-import { ChakraProvider, Text } from '@chakra-ui/react'
+import { ChakraProvider } from '@chakra-ui/react'
 import { Route, Routes, BrowserRouter as Router } from 'react-router-dom';
 import { CookiesProvider } from 'react-cookie';
 import Login from './components/Authentication/Login';
 import Logout from './components/Authentication/Logout';
 import SignUp from './components/Authentication/SignUp';
-import Dashboard from './pages/Dashboard/Dashboard';
+import Notifications from './pages/Notifications/Notifications';
 import ForgotPassword from './components/Authentication/ForgotPassword';
 import EmailAction from './components/Authentication/EmailAction';
 import AUTH_ROLES from './utils/auth_config';
@@ -20,7 +19,6 @@ const { ADMIN_ROLE, USER_ROLE } = AUTH_ROLES.AUTH_ROLES;
 const App = () => {
   return (
       <ChakraProvider>
-        <EmailSending />
         <CookiesProvider>
           <Router>
             <Routes>
@@ -41,10 +39,10 @@ const App = () => {
               <Route exact path="/emailAction" element={<EmailAction redirectPath="/" />} />
               <Route
                 exact
-                path="/dashboard"
+                path="/notifictions"
                 element={
                   <ProtectedRoute
-                    Component={Dashboard}
+                    Component={Notifications}
                     redirectPath="/login"
                     roles={[ADMIN_ROLE, USER_ROLE]}
                   />
diff --git a/src/components/Authentication/Login.jsx b/src/components/Authentication/Login.jsx
index dbdc913..def5540 100644
--- a/src/components/Authentication/Login.jsx
+++ b/src/components/Authentication/Login.jsx
@@ -13,7 +13,7 @@ const Login = ({ cookies }) => {
   const handleStdLogin = async e => {
     try {
       e.preventDefault();
-      await logInWithEmailAndPassword(email, password, '/dashboard', navigate, cookies);
+      await logInWithEmailAndPassword(email, password, '/publishedSchedule', navigate, cookies);
     } catch (err) {
       setErrorMessage(err.message);
     }
diff --git a/src/components/Authentication/Logout.jsx b/src/components/Authentication/Logout.jsx
index bf5cf20..1115568 100644
--- a/src/components/Authentication/Logout.jsx
+++ b/src/components/Authentication/Logout.jsx
@@ -9,7 +9,7 @@ const Logout = ({ cookies }) => {
 
   const handleLogout = async () => {
     try {
-      await logout('/', navigate, cookies);
+      await logout('/login', navigate, cookies);
     } catch (err) {
       setErrorMessage(err.message);
     }
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Notifications/Notifications.jsx
similarity index 52%
rename from src/pages/Dashboard/Dashboard.jsx
rename to src/pages/Notifications/Notifications.jsx
index 9f49fb5..f98f594 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Notifications/Notifications.jsx
@@ -1,4 +1,4 @@
-const Dashboard = () => {
+const Notifications = () => {
   return (
     <div>
       <h1>Dashboard</h1>
@@ -6,4 +6,4 @@ const Dashboard = () => {
   );
 };
 
-export default Dashboard;
+export default Notifications;

From 4b4f071480b3ee5dcc5fb51daebfcab136f97c38 Mon Sep 17 00:00:00 2001
From: michellelin1 <michellelin810@gmail.com>
Date: Sun, 21 Jan 2024 16:09:15 -0800
Subject: [PATCH 5/5] fixed spelling

---
 src/App.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.jsx b/src/App.jsx
index 25f2535..d5f6016 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -39,7 +39,7 @@ const App = () => {
               <Route exact path="/emailAction" element={<EmailAction redirectPath="/" />} />
               <Route
                 exact
-                path="/notifictions"
+                path="/notifications"
                 element={
                   <ProtectedRoute
                     Component={Notifications}