RTL

src/App.tsx

@@ -1,36 +1,38 @@
 import './assets/css/App.css';
 import { Routes, Route, Navigate } from 'react-router-dom';
+import {} from 'react-router-dom';
 import AuthLayout from './layouts/auth';
 import AdminLayout from './layouts/admin';
 import RTLLayout from './layouts/rtl';
-import React from 'react';
-import theme from 'theme/theme';
-import { ChakraProvider } from '@chakra-ui/react';
+import {
+  ChakraProvider,
+  // extendTheme
+} from '@chakra-ui/react';
 import initialTheme from './theme/theme'; //  { themeGreen }
 import { useState } from 'react';
+// Chakra imports
 
 export default function Main() {
+  // eslint-disable-next-line
   const [currentTheme, setCurrentTheme] = useState(initialTheme);
   return (
-    <ChakraProvider theme={theme}>
-      <React.StrictMode>
-        <Routes>
-          <Route path="auth/*" element={<AuthLayout />} />
-          <Route
-            path="admin/*"
-            element={
-              <AdminLayout theme={currentTheme} setTheme={setCurrentTheme} />
-            }
-          />
-          <Route
-            path="rtl/*"
-            element={
-              <RTLLayout theme={currentTheme} setTheme={setCurrentTheme} />
-            }
-          />
-          <Route path="/" element={<Navigate to="/admin" replace />} />
-        </Routes>
-      </React.StrictMode>
+    <ChakraProvider theme={currentTheme}>
+      <Routes>
+        <Route path="auth/*" element={<AuthLayout />} />
+        <Route
+          path="admin/*"
+          element={
+            <AdminLayout theme={currentTheme} setTheme={setCurrentTheme} />
+          }
+        />
+        <Route
+          path="rtl/*"
+          element={
+            <RTLLayout theme={currentTheme} setTheme={setCurrentTheme} />
+          }
+        />
+        <Route path="/" element={<Navigate to="/admin" replace />} />
+      </Routes>
     </ChakraProvider>
   );
 }

src/index.tsx

@@ -1,7 +1,6 @@
-import React from 'react';
+import './assets/css/App.css';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
-import './assets/css/App.css';
 
 import App from './App';
 

src/layouts/admin/index.tsx

@@ -56,11 +56,7 @@ export default function Dashboard(props: { [x: string]: any }) {
     return routes.map((route: RoutesType, key: any) => {
       if (route.layout === '/admin') {
         return (
-          <Route
-            path={route.layout + route.path}
-            element={route.component}
-            key={key}
-          />
+          <Route path={`${route.path}`} element={route.component} key={key} />
         );
       } else {
         return null;

src/layouts/auth/index.tsx

@@ -19,11 +19,7 @@ export default function Auth() {
     return routes.map((route: RoutesType, key: any) => {
       if (route.layout === '/auth') {
         return (
-          <Route
-            path={route.layout + route.path}
-            element={route.component}
-            key={key}
-          />
+          <Route path={`${route.path}`} element={route.component} key={key} />
         );
       } else {
         return null;

src/layouts/rtl/index.tsx

@@ -57,11 +57,7 @@ export default function Dashboard(props: { [x: string]: any }) {
     return routes.map((route: RoutesType, key: any) => {
       if (route.layout === '/rtl') {
         return (
-          <Route
-            path={route.layout + route.path}
-            element={route.component}
-            key={key}
-          />
+          <Route path={`${route.path}`} element={route.component} key={key} />
         );
       } else {
         return null;