Mobile version

src/App.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import { Routes, Route, BrowserRouter } from 'react-router-dom';
-import { NavBar, Footer, ProtectedRoutes } from './components';
+import { NavBar, ProtectedRoutes } from './components';
 import {
-  Landing, Login, NotFound404, Signup, Dashboard, Profile, Messanger, ToDoList, ChatView,
+  Login, NotFound404, Signup, Dashboard, Profile, Messanger, ToDoList, ChatView
 } from './pages';
 
 const App = () => {
@@ -14,19 +14,18 @@ const App = () => {
       <BrowserRouter>
         <NavBar toggleMenu={toggleMenu} />
         <Routes>
-          <Route exact path="/" element={<Landing />} />
           <Route exact path="/login" element={<Login />} />
           <Route exact path="/signup" element={<Signup />} />
           <Route path="*" element={<NotFound404 />} />
           <Route element={<ProtectedRoutes open={open} setOpen={setOpen} toggleMenu={toggleMenu} />}>
+            <Route exact path="/" element={<Dashboard />} />
             <Route exact path="/dashboard" element={<Dashboard />} />
             <Route exact path="/profile" element={<Profile />} />
             <Route exact path="/messanger" element={<Messanger />} />
             <Route exact path="/messanger/1" element={<ChatView />} />
             <Route exact path="/todo" element={<ToDoList />} />
           </Route>
         </Routes>
-        <Footer />
       </BrowserRouter>
     </div>
   );

src/components/NavBar.jsx

@@ -7,8 +7,8 @@ const NavBar = ({ toggleMenu }) => {
   const { pathname } = useLocation();
 
   const isOnApp = () => {
-    const appPaths = ['/dashboard', '/profile', '/messanger', '/messanger/1', '/todo'];
-    if (!appPaths.includes(pathname)) {
+    const appPaths = ['/login', '/signup'];
+    if (appPaths.includes(pathname)) {
       return true;
     } else {
       return false;