Project

General

Profile

« Previous | Next » 

Revision 51793

added redirection to landing when route was not found

View differences:

modules/uoa-repository-dashboard-gui/trunk/app/pages/adminPg/adminPg.routing.ts
7 7

  
8 8
const adminRoutes: Routes = [
9 9
  {
10
    path: 'admin',
10
    path: '',
11 11
    component: AdminPgComponent,
12
    canActivate: [AuthGuardService],
13 12
    children: [
14 13
      {
15 14
        path: '',
......
26 25
      }
27 26
    ]
28 27
  }
29
]
28
];
30 29

  
31 30
@NgModule ({
32 31
  imports: [RouterModule.forChild(adminRoutes)],
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources.routing.ts
16 16

  
17 17
const sourcesRoutes: Routes = [
18 18
  {
19
    path: 'sources',
19
    path: '',
20 20
    component: SourcesComponent,
21
    canActivate: [AuthGuardService],
22 21
    children: [
23 22
      {
24
        path: '',
25
        redirectTo: '/register',
26
        pathMatch: 'full'
27
      },
28
      {
29 23
        path: 'register',
30 24
        children: [
31 25
          {
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics.routing.ts
11 11
import {MetricsUsagestatsComponent} from "./metrics-usagestats.component";
12 12

  
13 13
const metricsRoutes: Routes = [
14
  {
15
    path: 'getImpact',
16
    canActivate: [AuthGuardService],
17
    children: [
18
      {
19
        path: '',
20
        component: MetricsComponent,
21
      },
22
      {
23
        path: 'enable/:id',
24
        component: MetricsEnableComponent
25
      },
26
      {
27
        path: 'show_metrics/:id',
28
        component: MetricsShowComponent
29
      },
30
      {
31
        path: 'instructions/:id',
32
        component: MetricsInstructionsComponent
33
      },
34
      {
35
        path: 'usagestats/:id',
36
        component: MetricsUsagestatsComponent
37
      }
38
    ]
39
  }
14
    {
15
      path: '',
16
      component: MetricsComponent,
17
    },
18
    {
19
      path: 'enable/:id',
20
      component: MetricsEnableComponent
21
    },
22
    {
23
      path: 'show_metrics/:id',
24
      component: MetricsShowComponent
25
    },
26
    {
27
      path: 'instructions/:id',
28
      component: MetricsInstructionsComponent
29
    },
30
    {
31
      path: 'usagestats/:id',
32
      component: MetricsUsagestatsComponent
33
    }
40 34
];
41 35

  
42 36

  
modules/uoa-repository-dashboard-gui/trunk/app/pages/compatibility/compatibility.routing.ts
12 12

  
13 13
const compatibilityRoutes: Routes = [
14 14
  {
15
    path: 'compatibility',
15
    path: '',
16 16
    component: CompatibilityComponent,
17
    canActivate: [AuthGuardService],
18 17
    children: [
19 18
      {
20
        path: '',
21
        redirectTo: '/validate',
22
        pathMatch: 'full'
23
      },
24
      {
25 19
        path: 'validate',
26 20
        component: CompatibilityValidateComponent
27 21
      },
modules/uoa-repository-dashboard-gui/trunk/app/pages/content/content.routing.ts
10 10

  
11 11
const contentRoutes: Routes = [
12 12
  {
13
    path: 'content',
13
    path: '',
14 14
    component: ContentComponent,
15
    canActivate: [AuthGuardService],
16 15
    children: [
17 16
      {
18
        path: '',
19
        redirectTo: '/events',
20
        pathMatch: 'full'
21
      },
22
      {
23 17
        path: 'events',
24 18
        component: ContentEventsComponent,
25 19
      },
modules/uoa-repository-dashboard-gui/trunk/app/shared/reusablecomponents/reusable-components.module.ts
30 30

  
31 31
@NgModule({
32 32
  imports: [
33
    BrowserModule,
33
    //BrowserModule,
34 34
    CommonModule,
35 35
    RouterModule,
36 36
    TabsModule.forRoot(),
modules/uoa-repository-dashboard-gui/trunk/app/app.routing.ts
4 4
import {LandingComponent} from "./pages/landing/landing.component";
5 5
import {DashboardComponent} from "./pages/dashboard/dashboard.component";
6 6
import {AuthGuardService} from "./services/auth-guard.service";
7
import {MetricsModule} from "./pages/metrics/metrics.module";
7 8

  
8 9
const appRoutes: Routes = [
9 10
  {
......
19 20
    path: 'dashboard',
20 21
    component: DashboardComponent,
21 22
    canActivate: [AuthGuardService]
23
  },
24
  {
25
    path: 'sources',
26
    loadChildren: './pages/sources/sources.module#SourcesModule',
27
    canActivate: [AuthGuardService]
28
  },
29
  {
30
    path: 'compatibility',
31
    loadChildren: './pages/compatibility/compatibility.module#CompatibilityModule',
32
    canActivate: [AuthGuardService]
33
  },
34
  {
35
    path: 'content',
36
    loadChildren: './pages/content/content.module#ContentModule',
37
    canActivate: [AuthGuardService]
38
  },
39
  {
40
    path: 'getImpact',
41
    loadChildren: './pages/metrics/metrics.module#MetricsModule',
42
    canActivate: [AuthGuardService]
43
  },
44
  {
45
    path: 'admin',
46
    loadChildren: './pages/adminPg/adminPg.module#AdminPgModule',
47
    canActivate: [AuthGuardService]
48
  },
49
  {
50
    path: '**',
51
    redirectTo: '/landing'
22 52
  }
23 53
];
24 54

  

Also available in: Unified diff