From 702c108db04cf616a8ddc39a28bac71ad8c07832 Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tudor.stanciu94@gmail.com>
Date: Sat, 31 Jul 2021 02:39:50 +0300
Subject: [PATCH] removed app from routes

---
 src/components/App.js            |  9 ++-------
 src/components/Layout/Content.js | 20 ++++++++------------
 src/components/Sidebar/menu.js   | 24 ++++++++++++------------
 src/context/UserContext.js       |  2 +-
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/components/App.js b/src/components/App.js
index 19c1d81..67f1fd7 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -26,14 +26,9 @@ export default function App() {
   return (
     <HashRouter basename={process.env.PUBLIC_URL || ""}>
       <Switch>
-        <Route exact path="/" render={() => <Redirect to="/app/dashboard" />} />
-        <Route
-          exact
-          path="/app"
-          render={() => <Redirect to="/app/dashboard" />}
-        />
-        <PrivateRoute path="/app" component={Layout} />
+        <Route exact path="/" render={() => <Redirect to="/dashboard" />} />
         <PublicRoute path="/login" component={Login} />
+        <PrivateRoute path="/" component={Layout} />
         <Route component={Error} />
       </Switch>
     </HashRouter>
diff --git a/src/components/Layout/Content.js b/src/components/Layout/Content.js
index 6b3dc42..edcc259 100644
--- a/src/components/Layout/Content.js
+++ b/src/components/Layout/Content.js
@@ -31,18 +31,14 @@ const Content = () => {
     >
       <div className={classes.fakeToolbar} />
       <Switch>
-        <Route path="/app/dashboard" component={Dashboard} />
-        <Route path="/app/typography" component={Typography} />
-        <Route path="/app/tables" component={Tables} />
-        <Route path="/app/notifications" component={Notifications} />
-        <Route
-          exact
-          path="/app/ui"
-          render={() => <Redirect to="/app/ui/icons" />}
-        />
-        <Route path="/app/ui/maps" component={Maps} />
-        <Route path="/app/ui/icons" component={Icons} />
-        <Route path="/app/ui/charts" component={Charts} />
+        <Route path="/dashboard" component={Dashboard} />
+        <Route path="/typography" component={Typography} />
+        <Route path="/tables" component={Tables} />
+        <Route path="/notifications" component={Notifications} />
+        <Route exact path="/ui" render={() => <Redirect to="/ui/icons" />} />
+        <Route path="/ui/maps" component={Maps} />
+        <Route path="/ui/icons" component={Icons} />
+        <Route path="/ui/charts" component={Charts} />
       </Switch>
       <ContentFooter />
     </div>
diff --git a/src/components/Sidebar/menu.js b/src/components/Sidebar/menu.js
index 1a747d0..243ddf6 100644
--- a/src/components/Sidebar/menu.js
+++ b/src/components/Sidebar/menu.js
@@ -18,13 +18,13 @@ let menu = [
   {
     id: 0,
     label: "Dashboard",
-    link: "/app/dashboard",
+    link: "/dashboard",
     icon: <DashboardIcon />
   },
   {
     id: 1,
     label: "Resources",
-    link: "/app/resources",
+    link: "/resources",
     icon: <ImageIcon />
   },
 
@@ -33,19 +33,19 @@ let menu = [
   {
     id: 4,
     label: "Admin",
-    link: "/app/admin",
+    link: "/admin",
     icon: <BuildIcon />
   },
   {
     id: 5,
     label: "Settings",
-    link: "/app/settings",
+    link: "/settings",
     icon: <SettingsIcon />,
     children: [
       {
         id: 50,
         label: "Notifications",
-        link: "/app/notifications",
+        link: "/notifications",
         icon: <NotificationsIcon />
       }
     ]
@@ -53,7 +53,7 @@ let menu = [
   {
     id: 6,
     label: "Health",
-    link: "/app/health",
+    link: "/health",
     icon: <NetworkCheckIcon />
   },
   { id: 7, type: "divider" },
@@ -91,19 +91,19 @@ if (enableTemplateContent) {
         {
           id: 14,
           label: "Typography",
-          link: "/app/typography",
+          link: "/typography",
           icon: <TypographyIcon />
         },
-        { id: 15, label: "Tables", link: "/app/tables", icon: <TableIcon /> },
+        { id: 15, label: "Tables", link: "/tables", icon: <TableIcon /> },
         {
           id: 16,
           label: "UI Elements",
-          link: "/app/ui",
+          link: "/ui",
           icon: <UIElementsIcon />,
           children: [
-            { label: "Icons", link: "/app/ui/icons" },
-            { label: "Charts", link: "/app/ui/charts" },
-            { label: "Maps", link: "/app/ui/maps" }
+            { label: "Icons", link: "/ui/icons" },
+            { label: "Charts", link: "/ui/charts" },
+            { label: "Maps", link: "/ui/maps" }
           ]
         },
         {
diff --git a/src/context/UserContext.js b/src/context/UserContext.js
index 47d97bf..ab0b601 100644
--- a/src/context/UserContext.js
+++ b/src/context/UserContext.js
@@ -78,7 +78,7 @@ function loginUser(dispatch, login, password, history, setIsLoading, setError) {
       }
     });
 
-    history.push("/app/dashboard");
+    history.push("/dashboard");
   } else {
     setLoginFailed(dispatch, setError, setIsLoading, "Login.EmptyCredentials");
   }