renamed routes

Author: suxrobGM

src/Client/Logistics.OfficeApp/src/app/app.routes.ts

@@ -22,33 +22,33 @@ export const APP_ROUTES: Routes = [
     loadChildren: () => import('./pages/home').then((m) => m.HOME_ROUTES),
   },
   {
-    path: 'employee',
+    path: 'dashboard',
+    loadChildren: () => import('./pages/dashboard').then((m) => m.DASHBOARD_ROUTES),
+    data: {
+      breadcrumb: 'Dashboard',
+    },
+  },
+  {
+    path: 'employees',
     loadChildren: () => import('./pages/employee').then((m) => m.EMPLOYEE_ROUTES),
     data: {
       breadcrumb: 'Employees',
     },
   },
   {
-    path: 'load',
+    path: 'loads',
     loadChildren: () => import('./pages/load').then((m) => m.LOAD_ROUTES),
     data: {
       breadcrumb: 'Loads',
     },
   },
   {
-    path: 'truck',
+    path: 'trucks',
     loadChildren: () => import('./pages/truck').then((m) => m.TRUCK_ROUTES),
     data: {
       breadcrumb: 'Trucks',
     },
   },
-  {
-    path: 'dashboard',
-    loadChildren: () => import('./pages/dashboard').then((m) => m.DASHBOARD_ROUTES),
-    data: {
-      breadcrumb: 'Dashboard',
-    },
-  },
   {
     path: 'customers',
     loadChildren: () => import('./pages/customer').then((m) => m.CUSTOMER_ROUTES),

src/Client/Logistics.OfficeApp/src/app/layout/sidebar/sidebar.component.html

@@ -17,19 +17,19 @@
       </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link border-bottom" [routerLink]="['/load/list']">
+      <a class="nav-link border-bottom" [routerLink]="['/loads']">
         <i class="bi bi-database h1" pTooltip="Loads"></i>
         <span class="ms-2" *ngIf="isOpened">Loads</span>
       </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link border-bottom" [routerLink]="['/truck/list']">
+      <a class="nav-link border-bottom" [routerLink]="['/trucks']">
         <i class="bi bi-truck h1" pTooltip="Trucks"></i>
         <span class="ms-2" *ngIf="isOpened">Trucks</span>
       </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link border-bottom" [routerLink]="['/employee/list']">
+      <a class="nav-link border-bottom" [routerLink]="['/employees']">
         <i class="bi bi-people h1" pTooltip="Employees"></i>
         <span class="ms-2" *ngIf="isOpened">Employees</span>
       </a>

src/Client/Logistics.OfficeApp/src/app/pages/dashboard/components/truck-stats-table/truck-stats-table.component.html

@@ -72,7 +72,7 @@ <h4 class="ps-3 py-2">Truck statistics for
             <button pButton 
               class="p-button-raised ms-2"
               label="Edit"
-              [routerLink]="['/truck/edit', truckStats.truckId]">
+              [routerLink]="['/trucks/edit', truckStats.truckId]">
             </button>
           </td>
         </tr>

src/Client/Logistics.OfficeApp/src/app/pages/employee/add-employee/add-employee.component.html

@@ -35,7 +35,7 @@ <h1 class="text-center">Add a new employee</h1>
             type="button"
             class="p-button-raised mt-3 ms-2"
             icon="bi bi-arrow-left-square"
-            routerLink="/employee/list"
+            routerLink="/employees"
             label="Back to list">
           </button>
         </div>

src/Client/Logistics.OfficeApp/src/app/pages/employee/edit-employee/edit-employee.component.html

@@ -44,7 +44,7 @@ <h1 class="text-center">Edit Employee</h1>
           type="button"
           class="p-button-raised mt-3 ms-2"
           icon="bi bi-arrow-left-square"
-          routerLink="/employee/list"
+          routerLink="/employees"
           label="Back to list">
         </button>
       </div>

src/Client/Logistics.OfficeApp/src/app/pages/employee/employee.routes.ts

@@ -9,15 +9,10 @@ import {ListEmployeeComponent} from './list-employees/list-employees.component';
 export const EMPLOYEE_ROUTES: Routes = [
   {
     path: '',
-    redirectTo: 'list',
-    pathMatch: 'full',
-  },
-  {
-    path: 'list',
     component: ListEmployeeComponent,
     canActivate: [AuthGuard],
     data: {
-      breadcrumb: 'List',
+      breadcrumb: '',
       permission: Permissions.Employees.View,
     },
   },

src/Client/Logistics.OfficeApp/src/app/pages/employee/list-employees/list-employees.component.html

@@ -4,7 +4,7 @@ <h1>List Employees</h1>
     class="p-button-lg p-button-rounded p-button-text text-black ms-2"
     icon="bi bi-plus-square-fill"
     pTooltip="Add a new employee"
-    routerLink="/employee/add">
+    routerLink="/employees/add">
   </button>
 </div>
 <hr class="w-100">
@@ -53,12 +53,12 @@ <h1>List Employees</h1>
         <ng-template pTemplate="body" let-employee>
           <tr>
             <td>
-              <a [routerLink]="['/employee/edit', employee.id]">
+              <a [routerLink]="['/employees/edit', employee.id]">
                 {{employee.firstName}}
               </a>
             </td>
             <td>
-              <a [routerLink]="['/employee/edit', employee.id]">
+              <a [routerLink]="['/employees/edit', employee.id]">
                 {{employee.lastName}}
               </a>
             </td>

src/Client/Logistics.OfficeApp/src/app/pages/employee/list-employees/list-employees.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 import {DatePipe} from '@angular/common';
 import {RouterLink} from '@angular/router';
 import {TableLazyLoadEvent, TableModule} from 'primeng/table';

src/Client/Logistics.OfficeApp/src/app/pages/home/home.component.html

@@ -31,15 +31,15 @@ <h4 class="ps-3 py-2">Active loads</h4>
         <ng-template pTemplate="body" let-load>
           <tr>
             <td>
-              <a [routerLink]="['/load/edit', load.id]">
+              <a [routerLink]="['/loads/edit', load.id]">
                 {{load.refId}}
               </a>
             </td>
             <td [pTooltip]="load.currentLocation" [showDelay]="500" tooltipPosition="bottom">
               {{load.currentLocation}}
             </td>
             <td>
-              <a [routerLink]="['/truck/details', load.assignedTruckId]">
+              <a [routerLink]="['/trucks/details', load.assignedTruckId]">
                 {{load.assignedTruckNumber}}
               </a>
             </td>
@@ -50,12 +50,12 @@ <h4 class="ps-3 py-2">Active loads</h4>
             <td colspan="4">
               <button pButton 
                 class="p-button-raised" 
-                routerLink="/load/add">
+                routerLink="/loads/add">
                 Add
               </button>
               <button pButton 
                 class="p-button-raised ms-2" 
-                routerLink="/load/list">
+                routerLink="/loads">
                 View all loads
               </button>
             </td>

src/Client/Logistics.OfficeApp/src/app/pages/load/add-load/add-load.component.html

@@ -69,7 +69,7 @@ <h1>Add a new load</h1>
             type="button"
             class="p-button-raised mt-3 ms-0 ms-md-2"
             icon="bi bi-arrow-left-square"
-            routerLink="/load/list">
+            routerLink="/loads">
             Back to list
           </button>
         </div>

src/Client/Logistics.OfficeApp/src/app/pages/load/edit-load/edit-load.component.html

@@ -84,7 +84,7 @@ <h1>Edit a load #{{loadRefId}}</h1>
             type="button"
             class="p-button-raised mt-3 ms-0 ms-md-2"
             icon="bi bi-arrow-left-square"
-            routerLink="/load/list">
+            routerLink="/loads">
             Back to list
           </button>
         </div>

src/Client/Logistics.OfficeApp/src/app/pages/load/edit-load/edit-load.component.ts

@@ -179,7 +179,7 @@ export class EditLoadComponent implements OnInit {
     this.apiService.deleteLoad(this.id).subscribe((result) => {
       if (result.isSuccess) {
         this.toastService.showSuccess('A load has been deleted successfully');
-        this.router.navigateByUrl('/load/list');
+        this.router.navigateByUrl('/loads');
       }
 
       this.isBusy = false;

src/Client/Logistics.OfficeApp/src/app/pages/load/list-loads/list-loads.component.html

@@ -4,7 +4,7 @@ <h1>List Loads</h1>
     class="p-button-lg p-button-rounded p-button-text text-black ms-2"
     icon="bi bi-plus-square-fill"
     pTooltip="Add a new load"
-    routerLink="/load/add">
+    routerLink="/loads/add">
   </button>
 </div>
 <hr class="w-100">
@@ -78,7 +78,7 @@ <h1>List Loads</h1>
         <ng-template pTemplate="body" let-load>
           <tr>
             <td>
-              <a [routerLink]="['/load/edit', load.id]">
+              <a [routerLink]="['/loads/edit', load.id]">
                 {{load.refId}}
               </a>
             </td>

src/Client/Logistics.OfficeApp/src/app/pages/load/load.routes.ts

@@ -9,15 +9,10 @@ import {AddLoadComponent} from './add-load/add-load.component';
 export const LOAD_ROUTES: Routes = [
   {
     path: '',
-    redirectTo: 'list',
-    pathMatch: 'full',
-  },
-  {
-    path: 'list',
     component: ListLoadComponent,
     canActivate: [AuthGuard],
     data: {
-      breadcrumb: 'List',
+      breadcrumb: '',
       permission: Permissions.Loads.View,
     },
   },

src/Client/Logistics.OfficeApp/src/app/pages/truck/edit-truck/edit-truck.component.html

@@ -50,7 +50,7 @@ <h1 class="text-center">{{headerText}}</h1>
             type="button"
             class="p-button-raised mt-3 ms-0 ms-md-2"
             icon="bi bi-arrow-left-square"
-            routerLink="/truck/list">
+            routerLink="/trucks">
             Back to list
           </button>
         </div>

src/Client/Logistics.OfficeApp/src/app/pages/truck/edit-truck/edit-truck.component.ts

@@ -76,8 +76,8 @@ export class EditTruckComponent implements OnInit {
     this.fetchTruck(this.id);
   }
 
-  searchDriver(event: any) {
-    this.apiService.getDrivers(event.query).subscribe((result) => {
+  searchDriver(event: {query: string}) {
+    this.apiService.getDrivers({search: event.query}).subscribe((result) => {
       if (result.isSuccess && result.data) {
         this.suggestedDrivers = result.data;
       }

src/Client/Logistics.OfficeApp/src/app/pages/truck/list-trucks/list-trucks.component.html

@@ -4,7 +4,7 @@ <h1>List Trucks</h1>
     class="p-button-lg p-button-rounded p-button-text text-black ms-2"
     icon="bi bi-plus-square-fill"
     pTooltip="Add a new truck"
-    routerLink="/truck/add">
+    routerLink="/trucks/add">
   </button>
 </div>
 <hr class="w-100">
@@ -71,7 +71,7 @@ <h1>List Trucks</h1>
               <button pButton 
                 class="p-button-raised ms-2"
                 label="Edit"
-                [routerLink]="['/truck/edit', truck.id]">
+                [routerLink]="['/trucks/edit', truck.id]">
               </button>
             </td>
           </tr>

src/Client/Logistics.OfficeApp/src/app/pages/truck/truck-details/truck-details.component.html

@@ -51,7 +51,7 @@ <h1 class="text-center">Truck Details</h1>
         </div>
         <div class="col-12 col-md-6 mb-2 mb-md-0">
           <span class="fw-bold">Truck Number: </span><br />
-          <a [routerLink]="['/truck/edit', truck?.id]">{{truck?.truckNumber}}</a>
+          <a [routerLink]="['/trucks/edit', truck?.id]">{{truck?.truckNumber}}</a>
         </div>
       </div>
 

src/Client/Logistics.OfficeApp/src/app/pages/truck/truck.routes.ts

@@ -9,15 +9,10 @@ import {TruckDetailsComponent} from './truck-details/truck-details.component';
 export const TRUCK_ROUTES: Routes = [
   {
     path: '',
-    redirectTo: 'list',
-    pathMatch: 'full',
-  },
-  {
-    path: 'list',
     component: ListTruckComponent,
     canActivate: [AuthGuard],
     data: {
-      breadcrumb: 'List',
+      breadcrumb: '',
       permission: Permissions.Trucks.View,
     },
   },