chore: Code refactor

restorecommerce · Mar 28, 2024 · 23b6d70 · 23b6d70
1 parent 88d2862
commit 23b6d70
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 24 deletions.
diff --git a/packages/core/config/src/lib/constants/router.ts b/packages/core/config/src/lib/constants/router.ts
@@ -128,6 +128,30 @@ export const ROUTER: Readonly<IRouterConstant> = {
             },
           },
         },
+        order: {
+          path: 'orders',
+          link: '/orders',
+          title: 'Orders',
+          getLink: () => ['', 'orders'],
+        },
+        product: {
+          path: 'products',
+          link: '/products',
+          title: 'Products',
+          getLink: () => ['', 'products'],
+        },
+        invoice: {
+          path: 'invoices',
+          link: '/invoices',
+          title: 'Invoices',
+          getLink: () => ['', 'invoices'],
+        },
+        fulfillment: {
+          path: 'fulfillments',
+          link: '/fulfillments',
+          title: 'Fulfillments',
+          getLink: () => ['', 'fulfillments'],
+        },
         layout: {
           path: 'layout',
           link: '/layout',

diff --git a/packages/core/state/.eslintrc.json b/packages/core/state/.eslintrc.json
@@ -9,15 +9,15 @@
           "error",
           {
             "type": "attribute",
-            "prefix": "lib",
+            "prefix": "app",
             "style": "camelCase"
           }
         ],
         "@angular-eslint/component-selector": [
           "error",
           {
             "type": "element",
-            "prefix": "lib",
+            "prefix": "app",
             "style": "kebab-case"
           }
         ]

diff --git a/packages/core/state/project.json b/packages/core/state/project.json
@@ -2,7 +2,7 @@
   "name": "core-state",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/core/state/src",
-  "prefix": "lib",
+  "prefix": "app",
   "tags": ["type:state", "scope:shared"],
   "projectType": "library",
   "targets": {

diff --git a/packages/core/types/src/lib/interfaces/router.ts b/packages/core/types/src/lib/interfaces/router.ts
@@ -56,6 +56,10 @@ export interface IRouterConstant {
             preferences: IRouterItem;
           };
         };
+        order: IRouterItem;
+        product: IRouterItem;
+        invoice: IRouterItem;
+        fulfillment: IRouterItem;
         layout: IRouterItem;
         overflow: IRouterItem;
         management: {

diff --git a/packages/modules/main/src/lib/lib.routes.ts b/packages/modules/main/src/lib/lib.routes.ts
@@ -62,20 +62,38 @@ export const modulesMainRoutes: Route[] = [
       ),
   },
   {
-    path: ROUTER.pages.main.children.layout.path,
+    path: ROUTER.pages.main.children.order.path,
     component: PrivateTemplateComponent,
     canActivate: [PrivateGuard],
     canActivateChild: [PrivateGuard],
     loadChildren: () =>
-      import('@console-modules/layout').then((m) => m.ModulesLayoutModule),
+      import('@console-modules/order').then((m) => m.ModulesOrderModule),
   },
   {
-    path: ROUTER.pages.main.children.overflow.path,
+    path: ROUTER.pages.main.children.product.path,
     component: PrivateTemplateComponent,
     canActivate: [PrivateGuard],
     canActivateChild: [PrivateGuard],
     loadChildren: () =>
-      import('@console-modules/overflow').then((m) => m.ModulesOverflowModule),
+      import('@console-modules/product').then((m) => m.ModulesProductModule),
+  },
+  {
+    path: ROUTER.pages.main.children.invoice.path,
+    component: PrivateTemplateComponent,
+    canActivate: [PrivateGuard],
+    canActivateChild: [PrivateGuard],
+    loadChildren: () =>
+      import('@console-modules/invoice').then((m) => m.ModulesInvoiceModule),
+  },
+  {
+    path: ROUTER.pages.main.children.fulfillment.path,
+    component: PrivateTemplateComponent,
+    canActivate: [PrivateGuard],
+    canActivateChild: [PrivateGuard],
+    loadChildren: () =>
+      import('@console-modules/fulfillment').then(
+        (m) => m.ModulesFulfillmentModule
+      ),
   },
   {
     path: '',

diff --git a/packages/modules/ui/src/lib/components/templates/private/private-template.component.html b/packages/modules/ui/src/lib/components/templates/private/private-template.component.html
@@ -89,24 +89,36 @@
         *ngIf="currentRoute === ROUTER.pages.main.children.home.link"
       >
         <rc-drawer-navigation-item
-          icon="mdi:home"
+          icon="mdi:home-outline"
           [routerLink]="ROUTER.pages.main.children.home.link"
           [routerLinkActive]="['selected']"
           [routerLinkActiveOptions]="{ exact: true }"
         >
           Home</rc-drawer-navigation-item
         >
         <rc-drawer-navigation-item
-          icon="mdi:arrow-split-vertical"
-          [routerLink]="ROUTER.pages.main.children.layout.link"
+          icon="mdi:receipt-outline"
+          [routerLink]="ROUTER.pages.main.children.order.link"
           [routerLinkActive]="['selected']"
-          >Layout</rc-drawer-navigation-item
+          >Orders</rc-drawer-navigation-item
         >
         <rc-drawer-navigation-item
-          icon="mdi:arrow-split-vertical"
-          [routerLink]="'/overflow'"
+          icon="mdi:tag-outline"
+          [routerLink]="ROUTER.pages.main.children.product.link"
           [routerLinkActive]="['selected']"
-          >Overflow</rc-drawer-navigation-item
+          >Products</rc-drawer-navigation-item
+        >
+        <rc-drawer-navigation-item
+          icon="mdi:invoice-outline"
+          [routerLink]="ROUTER.pages.main.children.invoice.link"
+          [routerLinkActive]="['selected']"
+          >Invoices</rc-drawer-navigation-item
+        >
+        <rc-drawer-navigation-item
+          icon="mdi:truck-outline"
+          [routerLink]="ROUTER.pages.main.children.fulfillment.link"
+          [routerLinkActive]="['selected']"
+          >Fulfillment</rc-drawer-navigation-item
         >
       </ng-container>
       <!-- /Home -->
@@ -119,7 +131,7 @@
         "
       >
         <rc-drawer-navigation-item
-          icon="mdi:account-multiple"
+          icon="mdi:account-multiple-outline"
           [routerLink]="ROUTER.pages.main.children.management.children.iam.link"
           [routerLinkActive]="['selected']"
           >IAM
@@ -135,7 +147,7 @@
         </rc-drawer-navigation-item>
 
         <rc-drawer-navigation-item
-          icon="mdi:city"
+          icon="mdi:city-variant-outline"
           [routerLink]="
             ROUTER.pages.main.children.management.children.locations.link
           "
@@ -145,7 +157,7 @@
         </rc-drawer-navigation-item>
 
         <rc-drawer-navigation-item
-          icon="mdi:map-marker"
+          icon="mdi:map-marker-outline"
           [routerLink]="
             ROUTER.pages.main.children.management.children.countries.link
           "
@@ -155,7 +167,7 @@
         </rc-drawer-navigation-item>
 
         <rc-drawer-navigation-item
-          icon="mdi:card-account-mail"
+          icon="mdi:card-account-mail-outline"
           [routerLink]="
             ROUTER.pages.main.children.management.children.contactPoints.link
           "
@@ -165,7 +177,7 @@
         </rc-drawer-navigation-item>
 
         <rc-drawer-navigation-item
-          icon="mdi:certificate"
+          icon="mdi:certificate-outline"
           [routerLink]="
             ROUTER.pages.main.children.management.children.contracts.link
           "
@@ -185,15 +197,15 @@
         </rc-drawer-navigation-item>
 
         <rc-drawer-navigation-item
-          icon="mdi:lock"
+          icon="mdi:lock-outline"
           [routerLink]="
             ROUTER.pages.main.children.management.children.accessControl.link
           "
           [routerLinkActive]="['selected']"
         >
           Access Control
           <rc-drawer-navigation-item
-            icon="mdi:account-multiple"
+            icon="mdi:account-multiple-outline"
             [routerLink]="
               ROUTER.pages.main.children.management.children.accessControl
                 .children.teams.link
@@ -202,7 +214,7 @@
             >Teams</rc-drawer-navigation-item
           >
           <rc-drawer-navigation-item
-            icon="mdi:account-key"
+            icon="mdi:account-key-outline"
             [routerLink]="
               ROUTER.pages.main.children.management.children.accessControl
                 .children.roles.link
@@ -211,7 +223,7 @@
             >Roles</rc-drawer-navigation-item
           >
           <rc-drawer-navigation-item
-            icon="mdi:account-convert"
+            icon="mdi:account-convert-outline"
             [routerLink]="
               ROUTER.pages.main.children.management.children.accessControl
                 .children.rules.link
@@ -220,7 +232,7 @@
             >Rules</rc-drawer-navigation-item
           >
           <rc-drawer-navigation-item
-            icon="mdi:folder-account"
+            icon="mdi:folder-account-outline"
             [routerLink]="
               ROUTER.pages.main.children.management.children.accessControl
                 .children.polices.link