From f047b77624fd1b58bed9e80751b37eb002264305 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 16 Dec 2017 16:28:08 +0800
Subject: [PATCH] updates

---
 src/app/routes/routes.ts |   81 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/app/routes/routes.ts b/src/app/routes/routes.ts
index 8bfbb54..c256c6c 100644
--- a/src/app/routes/routes.ts
+++ b/src/app/routes/routes.ts
@@ -1,22 +1,22 @@
 import { LayoutComponent } from '../layout/layout.component';
 import { LayoutFullScreenComponent } from '../layout/fullscreen/fullscreen.component';
-import { LoginComponent } from './pages/login/login.component';
-import { LockComponent } from './pages/lock/lock.component';
-import { RegisterComponent } from './pages/register/register.component';
-import { ForgetComponent } from './pages/forget/forget.component';
-import { MaintenanceComponent } from './pages/maintenance/maintenance.component';
-import { Page404Component } from './pages/404/404.component';
-import { Page500Component } from './pages/500/500.component';
+// import { LoginComponent } from './pages/login/login.component';
+// import { LockComponent } from './pages/lock/lock.component';
+// import { RegisterComponent } from './pages/register/register.component';
+// import { ForgetComponent } from './pages/forget/forget.component';
+// import { MaintenanceComponent } from './pages/maintenance/maintenance.component';
+// import { Page404Component } from './pages/404/404.component';
+// import { Page500Component } from './pages/500/500.component';
 import { DashboardV1Component } from './dashboard/v1/v1.component';
 import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
 import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
 import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
-import { CallbackComponent } from './callback/callback.component';
-// pro
-import { ProUserLayoutComponent } from '../layout/pro/user/user.component';
-import { ProUserLoginComponent } from './pro/user/login/login.component';
-import { ProUserRegisterComponent } from './pro/user/register/register.component';
-import { ProUserRegisterResultComponent } from './pro/user/register-result/register-result.component';
+// import { CallbackComponent } from './callback/callback.component';
+// // pro
+// import { ProUserLayoutComponent } from '../layout/pro/user/user.component';
+// import { ProUserLoginComponent } from './pro/user/login/login.component';
+// import { ProUserRegisterComponent } from './pro/user/register/register.component';
+// import { ProUserRegisterResultComponent } from './pro/user/register-result/register-result.component';
 
 export const routes = [
     {
@@ -25,19 +25,16 @@
         children: [
             { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
             { path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
+
+
+            { path: 'users', loadChildren: './users/users.module#UsersModule' },
+            { path: 'devices', loadChildren: './devices/devices.module#DevicesModule' },
+
             { path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
             { path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },
             { path: 'dashboard/monitor', component: DashboardMonitorComponent, data: { translate: 'dashboard_monitor' } },
-            { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } },
-            { path: 'widgets', loadChildren: './widgets/widgets.module#WidgetsModule' },
-            { path: 'elements', loadChildren: './elements/elements.module#ElementsModule' },
-            { path: 'forms', loadChildren: './forms/forms.module#FormsModule' },
-            { path: 'charts', loadChildren: './charts/charts.module#ChartsModule' },
-            { path: 'tables', loadChildren: './tables/tables.module#TablesModule' },
-            { path: 'maps', loadChildren: './maps/maps.module#MapsModule' },
-            { path: 'logics', loadChildren: './logics/logics.module#LogicsModule' },
-            { path: 'extras', loadChildren: './extras/extras.module#ExtrasModule' },
-            { path: 'pro', loadChildren: './pro/pro.module#ProModule' }
+            { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } }
+
         ]
     },
     // ������������
@@ -48,24 +45,24 @@
             { path: '', loadChildren: './data-v/data-v.module#DataVModule' }
         ]
     },
-    // pro ���������������������������������������������������������������Angular������������������������������������������������������
-    {
-        path: 'pro/user',
-        component: ProUserLayoutComponent,
-        children: [
-            { path: 'login', component: ProUserLoginComponent },
-            { path: 'register', component: ProUserRegisterComponent },
-            { path: 'register-result', component: ProUserRegisterResultComponent }
-        ]
-    },
-    // ���������������Layout
-    { path: 'callback/:type', component: CallbackComponent },
-    { path: 'register', component: RegisterComponent, data: { translate: 'register' } },
-    { path: 'login', component: LoginComponent, data: { title: 'login' } },
-    { path: 'forget', component: ForgetComponent, data: { translate: 'forget' } },
-    { path: 'lock', component: LockComponent, data: { translate: 'lock' } },
-    { path: 'maintenance', component: MaintenanceComponent },
-    { path: '404', component: Page404Component },
-    { path: '500', component: Page500Component },
+    // // pro ���������������������������������������������������������������Angular������������������������������������������������������
+    // {
+    //     path: 'pro/user',
+    //     component: ProUserLayoutComponent,
+    //     children: [
+    //         { path: 'login', component: ProUserLoginComponent },
+    //         { path: 'register', component: ProUserRegisterComponent },
+    //         { path: 'register-result', component: ProUserRegisterResultComponent }
+    //     ]
+    // },
+    // // ���������������Layout
+    // { path: 'callback/:type', component: CallbackComponent },
+    // { path: 'register', component: RegisterComponent, data: { translate: 'register' } },
+    // { path: 'login', component: LoginComponent, data: { title: 'login' } },
+    // { path: 'forget', component: ForgetComponent, data: { translate: 'forget' } },
+    // { path: 'lock', component: LockComponent, data: { translate: 'lock' } },
+    // { path: 'maintenance', component: MaintenanceComponent },
+    // { path: '404', component: Page404Component },
+    // { path: '500', component: Page500Component },
     { path: '**', redirectTo: 'dashboard' }
 ];

--
Gitblit v1.8.0