Merge pull request #192 from chrishiguto/feature/add-default-route-an…

…d-unprotected-routes feat: add default route and unprotected routes
conceptadev · Aug 28, 2024 · a1f900a · a1f900a
2 parents 5fad2a9 + 8d3fb77
commit a1f900a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/packages/react-navigation/src/components/DefaultRoute.tsx b/packages/react-navigation/src/components/DefaultRoute.tsx
@@ -13,6 +13,7 @@ import { ModuleProps } from '@concepta/react-material-ui/dist/modules/crud';
 type DefaultRouteProps = {
   resource: string;
   name: string;
+  isUnprotected?: boolean;
   module?: ModuleProps;
   page?: ReactNode;
   items: DrawerItemProps[];
@@ -27,6 +28,7 @@ type DefaultRouteProps = {
 const DefaultRoute = ({
   resource,
   name,
+  isUnprotected = false,
   module,
   page,
   items,
@@ -64,13 +66,25 @@ const DefaultRoute = ({
   }
 
   if (renderAppBar) {
+    if (!isUnprotected) {
+      return <>{renderAppBar(menuItems, renderedChildren)}</>;
+    }
+
     return (
       <ProtectedRoute>
         {renderAppBar(menuItems, renderedChildren)}
       </ProtectedRoute>
     );
   }
 
+  if (!isUnprotected) {
+    return (
+      <AppBarContainer menuItems={menuItems}>
+        {renderedChildren}
+      </AppBarContainer>
+    );
+  }
+
   return (
     <ProtectedRoute>
       <AppBarContainer

diff --git a/packages/react-navigation/src/components/Resource.tsx b/packages/react-navigation/src/components/Resource.tsx
@@ -6,6 +6,7 @@ type ResourceProps = {
   id: string;
   name: string;
   icon: ReactNode;
+  isUnprotected?: boolean;
   module?: Partial<ModuleProps>;
   page?: ReactNode;
 };

diff --git a/packages/react-navigation/src/components/Router.tsx b/packages/react-navigation/src/components/Router.tsx
@@ -31,6 +31,7 @@ const router = (
   AdminProvider: ComponentType<PropsWithChildren<{ home: string }>>,
   routes: ReactElement[],
   items: DrawerItemProps[],
+  defaultRoute?: string,
   authModuleProps?: AuthModule,
   drawerProps?: DrawerProps,
   navbarProps?: NavbarProps,
@@ -55,10 +56,11 @@ const router = (
       <Route
         path="/*"
         element={
-          <AdminProvider home={firstRoute?.props.id}>
+          <AdminProvider home={defaultRoute ?? firstRoute?.props.id}>
             <RoutesRoot
               routes={routes}
               items={items}
+              defaultRoute={defaultRoute}
               authModuleProps={authModuleProps}
               drawerProps={drawerProps}
               navbarProps={navbarProps}
@@ -78,6 +80,7 @@ const router = (
 type RouterProps = {
   children: ReactElement[];
   AdminProvider: ComponentType<PropsWithChildren<{ home: string }>>;
+  defaultRoute?: string;
   useMemoryRouter?: boolean;
   authModuleProps?: AuthModule;
   drawerProps?: DrawerProps;
@@ -95,6 +98,7 @@ type RouterProps = {
 const Router = ({
   children,
   AdminProvider,
+  defaultRoute,
   useMemoryRouter = false,
   authModuleProps,
   drawerProps,
@@ -119,6 +123,7 @@ const Router = ({
         AdminProvider,
         children,
         items,
+        defaultRoute,
         authModuleProps,
         drawerProps,
         navbarProps,

diff --git a/packages/react-navigation/src/components/RoutesRoot.tsx b/packages/react-navigation/src/components/RoutesRoot.tsx
@@ -15,6 +15,7 @@ import { AuthModule } from './Router';
 type RoutesRootProps = {
   items: DrawerItemProps[];
   routes: ReactElement[];
+  defaultRoute?: string;
   authModuleProps?: AuthModule;
   drawerProps?: DrawerProps;
   navbarProps?: NavbarProps;
@@ -31,6 +32,7 @@ type RoutesRootProps = {
 const RoutesRoot = ({
   routes,
   items,
+  defaultRoute,
   authModuleProps,
   drawerProps,
   navbarProps,
@@ -40,7 +42,7 @@ const RoutesRoot = ({
   renderForgotPassword,
   renderResetPassword,
 }: RoutesRootProps) => {
-  const home = routes[0].props.id;
+  const home = defaultRoute ?? routes[0].props.id;
 
   return (
     <Routes>
@@ -99,6 +101,7 @@ const RoutesRoot = ({
             element={
               <DefaultRoute
                 renderAppBar={renderAppBar}
+                isUnprotected={child.props.isUnprotected}
                 resource={child.props.id}
                 name={child.props.name}
                 module={child.props.module}