diff --git a/src/App.jsx b/src/App.jsx index 1c1c493..d5f6016 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,50 +1,77 @@ import './App.css'; -import EmailSending from './components/EmailTemplates/EmailSending'; 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 Register from './components/Authentication/register'; -import Dashboard from './pages/Dashboard/Dashboard'; -import PublishedSchedule from './pages/PublishedSchedule/PublishedSchedule'; +import SignUp from './components/Authentication/SignUp'; +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'; 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; const App = () => { return ( - - - - - - } /> - } /> - } /> - } /> - } /> - } /> - - } - /> - } /> - - - - + + + + + + } + /> + } /> + } /> + } /> + } /> + } /> + + } + /> + + } + /> + + } + /> + }/> + + + + ); }; 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/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 (
-

Register

+

Sign Up

setEmail(target.value)} placeholder="Email" />
@@ -57,7 +57,7 @@ const Register = () => { type="password" />
- + {/*