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 ( - } /> - } - /> - + } /> + 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 = () => { >
- - - - - } - /> - - - + + + + + } /> + + +
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: }, { id: 1, label: "Resources", - link: "/app/resources", + link: "/resources", icon: }, @@ -33,19 +33,19 @@ let menu = [ { id: 4, label: "Admin", - link: "/app/admin", + link: "/admin", icon: }, { id: 5, label: "Settings", - link: "/app/settings", + link: "/settings", icon: , children: [ { id: 50, label: "Notifications", - link: "/app/notifications", + link: "/notifications", icon: } ] @@ -53,7 +53,7 @@ let menu = [ { id: 6, label: "Health", - link: "/app/health", + link: "/health", icon: }, { id: 7, type: "divider" }, @@ -91,19 +91,19 @@ if (enableTemplateContent) { { id: 14, label: "Typography", - link: "/app/typography", + link: "/typography", icon: }, - { id: 15, label: "Tables", link: "/app/tables", icon: }, + { id: 15, label: "Tables", link: "/tables", icon: }, { id: 16, label: "UI Elements", - link: "/app/ui", + link: "/ui", icon: , 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"); }