Browse Source

routing error

Hima 5 years ago
parent
commit
e38497dc89

+ 58 - 19
package-lock.json

@@ -1556,6 +1556,7 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "delegates": "^1.0.0",
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
         "readable-stream": "^2.0.6"
@@ -2806,7 +2807,8 @@
       "version": "1.1.0",
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "constants-browserify": {
     "constants-browserify": {
       "version": "1.0.0",
       "version": "1.0.0",
@@ -3220,7 +3222,8 @@
       "version": "1.0.0",
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "depd": {
     "depd": {
       "version": "1.1.2",
       "version": "1.1.2",
@@ -4306,7 +4309,8 @@
         "ansi-regex": {
         "ansi-regex": {
           "version": "2.1.1",
           "version": "2.1.1",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "aproba": {
         "aproba": {
           "version": "1.2.0",
           "version": "1.2.0",
@@ -4327,12 +4331,14 @@
         "balanced-match": {
         "balanced-match": {
           "version": "1.0.0",
           "version": "1.0.0",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "brace-expansion": {
         "brace-expansion": {
           "version": "1.1.11",
           "version": "1.1.11",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "balanced-match": "^1.0.0",
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
             "concat-map": "0.0.1"
@@ -4347,17 +4353,20 @@
         "code-point-at": {
         "code-point-at": {
           "version": "1.1.0",
           "version": "1.1.0",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "concat-map": {
         "concat-map": {
           "version": "0.0.1",
           "version": "0.0.1",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "console-control-strings": {
         "console-control-strings": {
           "version": "1.1.0",
           "version": "1.1.0",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "core-util-is": {
         "core-util-is": {
           "version": "1.0.2",
           "version": "1.0.2",
@@ -4474,7 +4483,8 @@
         "inherits": {
         "inherits": {
           "version": "2.0.3",
           "version": "2.0.3",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "ini": {
         "ini": {
           "version": "1.3.5",
           "version": "1.3.5",
@@ -4486,6 +4496,7 @@
           "version": "1.0.0",
           "version": "1.0.0",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "number-is-nan": "^1.0.0"
             "number-is-nan": "^1.0.0"
           }
           }
@@ -4500,6 +4511,7 @@
           "version": "3.0.4",
           "version": "3.0.4",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "brace-expansion": "^1.1.7"
             "brace-expansion": "^1.1.7"
           }
           }
@@ -4507,12 +4519,14 @@
         "minimist": {
         "minimist": {
           "version": "0.0.8",
           "version": "0.0.8",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "minipass": {
         "minipass": {
           "version": "2.2.4",
           "version": "2.2.4",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "safe-buffer": "^5.1.1",
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
             "yallist": "^3.0.0"
@@ -4531,6 +4545,7 @@
           "version": "0.5.1",
           "version": "0.5.1",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "minimist": "0.0.8"
             "minimist": "0.0.8"
           }
           }
@@ -4611,7 +4626,8 @@
         "number-is-nan": {
         "number-is-nan": {
           "version": "1.0.1",
           "version": "1.0.1",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "object-assign": {
         "object-assign": {
           "version": "4.1.1",
           "version": "4.1.1",
@@ -4623,6 +4639,7 @@
           "version": "1.4.0",
           "version": "1.4.0",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "wrappy": "1"
             "wrappy": "1"
           }
           }
@@ -4708,7 +4725,8 @@
         "safe-buffer": {
         "safe-buffer": {
           "version": "5.1.1",
           "version": "5.1.1",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "safer-buffer": {
         "safer-buffer": {
           "version": "2.1.2",
           "version": "2.1.2",
@@ -4744,6 +4762,7 @@
           "version": "1.0.2",
           "version": "1.0.2",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "code-point-at": "^1.0.0",
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4763,6 +4782,7 @@
           "version": "3.0.1",
           "version": "3.0.1",
           "bundled": true,
           "bundled": true,
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "ansi-regex": "^2.0.0"
             "ansi-regex": "^2.0.0"
           }
           }
@@ -4806,12 +4826,14 @@
         "wrappy": {
         "wrappy": {
           "version": "1.0.2",
           "version": "1.0.2",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         },
         "yallist": {
         "yallist": {
           "version": "3.0.2",
           "version": "3.0.2",
           "bundled": true,
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
         }
       }
       }
     },
     },
@@ -4820,6 +4842,7 @@
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "graceful-fs": "^4.1.2",
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
         "inherits": "~2.0.0",
@@ -4832,6 +4855,7 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "aproba": "^1.0.3",
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
         "console-control-strings": "^1.0.0",
@@ -4869,7 +4893,8 @@
       "version": "4.0.1",
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "get-stream": {
     "get-stream": {
       "version": "3.0.0",
       "version": "3.0.0",
@@ -5129,7 +5154,8 @@
       "version": "2.0.1",
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "has-value": {
     "has-value": {
       "version": "1.0.0",
       "version": "1.0.0",
@@ -5895,7 +5921,8 @@
       "version": "0.2.1",
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "is-windows": {
     "is-windows": {
       "version": "1.0.2",
       "version": "1.0.2",
@@ -6582,6 +6609,7 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "graceful-fs": "^4.1.2",
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
         "parse-json": "^2.2.0",
@@ -6594,7 +6622,8 @@
           "version": "2.3.0",
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
         }
       }
       }
     },
     },
@@ -6868,7 +6897,8 @@
       "version": "1.0.1",
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "map-visit": {
     "map-visit": {
       "version": "1.0.0",
       "version": "1.0.0",
@@ -7756,6 +7786,7 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
         "console-control-strings": "~1.1.0",
@@ -8928,6 +8959,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "load-json-file": "^1.0.0",
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
         "normalize-package-data": "^2.3.2",
@@ -8939,6 +8971,7 @@
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "graceful-fs": "^4.1.2",
             "graceful-fs": "^4.1.2",
             "pify": "^2.0.0",
             "pify": "^2.0.0",
@@ -8949,7 +8982,8 @@
           "version": "2.3.0",
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
         }
       }
       }
     },
     },
@@ -8958,6 +8992,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "find-up": "^1.0.0",
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
         "read-pkg": "^1.0.0"
@@ -8968,6 +9003,7 @@
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "path-exists": "^2.0.0",
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
             "pinkie-promise": "^2.0.0"
@@ -8978,6 +9014,7 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "dev": true,
+          "optional": true,
           "requires": {
           "requires": {
             "pinkie-promise": "^2.0.0"
             "pinkie-promise": "^2.0.0"
           }
           }
@@ -10277,6 +10314,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "is-utf8": "^0.2.0"
         "is-utf8": "^0.2.0"
       }
       }
@@ -11628,6 +11666,7 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "dev": true,
+      "optional": true,
       "requires": {
       "requires": {
         "string-width": "^1.0.2 || 2"
         "string-width": "^1.0.2 || 2"
       }
       }

+ 1 - 1
src/app/External-Page/external-routing-module.ts

@@ -6,7 +6,7 @@ import { RouterModule, Routes } from '@angular/router';
 
 
 
 
 const externalPageRoutes: Routes = [
 const externalPageRoutes: Routes = [
-    {path: '' , component: ExternalPageComponent, children:[
+    {path: 'ExternalPage' , component: ExternalPageComponent, children:[
         {path: 'home', component: ExternalPageContentComponent},
         {path: 'home', component: ExternalPageContentComponent},
     ]},
     ]},
 ];
 ];

+ 1 - 1
src/app/app-routing.module.ts

@@ -9,7 +9,7 @@ import { ServicesComponent } from './servicesItems/services.component';
 
 
 
 
 const routes: Routes = [
 const routes: Routes = [
-  {path: '', redirectTo: '/login', pathMatch: 'full'},
+  {path: '', redirectTo: '/InternalPage/home', pathMatch: 'full'},
   {path: 'login', component: LoginComponent},
   {path: 'login', component: LoginComponent},
   {path: 'signup', component: RegesterComponent},
   {path: 'signup', component: RegesterComponent},
   {path: 'services/:id', component: ServicesComponent, canActivate: [AuthGuard]},
   {path: 'services/:id', component: ServicesComponent, canActivate: [AuthGuard]},

+ 1 - 1
src/app/dashboard/dashboard-routing.ts

@@ -42,7 +42,7 @@ import { ReportListComponent } from './report-list/report-list.component';
 import { EventsComponent } from './events/events.component';
 import { EventsComponent } from './events/events.component';
 
 
 const dashboardRouting: Routes = [
 const dashboardRouting: Routes = [
-    {path: '', component: ServiceItemComponent, canActivate: [AuthGuard], children: [
+    {path: 'service/:userID/:serviceID', component: ServiceItemComponent, canActivate: [AuthGuard], children: [
     {path: 'users/:userPageId', component: UsersComponent, canActivate: [AuthGuard]},
     {path: 'users/:userPageId', component: UsersComponent, canActivate: [AuthGuard]},
     {path: 'roles/:rolesPageId', component: RolesListComponent, canActivate: [AuthGuard]},
     {path: 'roles/:rolesPageId', component: RolesListComponent, canActivate: [AuthGuard]},
     {path: 'departments/:departsPageId', component: DepartmentListComponent, canActivate: [AuthGuard]},
     {path: 'departments/:departsPageId', component: DepartmentListComponent, canActivate: [AuthGuard]},