diff --git a/package-lock.json b/package-lock.json index c4ec46de..de35b092 100644 --- a/package-lock.json +++ b/package-lock.json @@ -724,6 +724,12 @@ "dev": true, "optional": true }, + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -2649,6 +2655,12 @@ "crossvent": "1.5.4" } }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, "duplexify": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", @@ -3325,6 +3337,12 @@ "minimatch": "3.0.4" } }, + "filesize": { + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", + "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==", + "dev": true + }, "fill-range": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", @@ -4620,6 +4638,15 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, + "gzip-size": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", + "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", + "dev": true, + "requires": { + "duplexer": "0.1.1" + } + }, "hammerjs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", @@ -6949,6 +6976,12 @@ "wrappy": "1.0.2" } }, + "opener": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz", + "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", + "dev": true + }, "opn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", @@ -10604,6 +10637,69 @@ } } }, + "webpack-bundle-analyzer": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.1.tgz", + "integrity": "sha512-a+UcvlsXvCmclNgfThT8PVyuJKd029By7CxkYEbNNCfs0Lqj9gagjkdv3S3MBvCIKBaUGYs8l4UpiVI0bFoh2Q==", + "dev": true, + "requires": { + "acorn": "5.3.0", + "chalk": "1.1.3", + "commander": "2.12.1", + "ejs": "2.5.7", + "express": "4.16.2", + "filesize": "3.5.11", + "gzip-size": "3.0.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "opener": "1.4.3", + "ws": "3.3.3" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.1", + "ultron": "1.1.1" + } + } + } + }, "webpack-core": { "version": "0.6.9", "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", diff --git a/package.json b/package.json index 7fb50514..545901f7 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,13 @@ "start-hmr": "ng serve --hmr -e=hmr -sm=false", "start-hmr-sourcemaps": "ng serve --hmr -e=hmr", "build": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev", + "build-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev --stats-json", "build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod", + "build-prod-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod --stats-json", "test": "ng test", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "bundle-report": "webpack-bundle-analyzer dist/stats.json" }, "private": true, "dependencies": { @@ -29,6 +32,10 @@ "@angular/platform-browser": "5.1.2", "@angular/platform-browser-dynamic": "5.1.2", "@angular/router": "5.1.2", + "@ngrx/effects": "4.1.1", + "@ngrx/router-store": "4.1.1", + "@ngrx/store": "4.1.1", + "@ngrx/store-devtools": "4.1.1", "@ngx-translate/core": "9.0.2", "@swimlane/ngx-charts": "7.0.1", "@swimlane/ngx-datatable": "11.1.7", @@ -43,10 +50,6 @@ "highlight.js": "9.12.0", "intl": "1.2.5", "moment": "2.20.1", - "@ngrx/effects": "4.1.1", - "@ngrx/router-store": "4.1.1", - "@ngrx/store": "4.1.1", - "@ngrx/store-devtools": "4.1.1", "ngrx-store-freeze": "0.2.0", "ngx-color-picker": "5.3.0", "ngx-cookie-service": "1.0.9", @@ -75,6 +78,7 @@ "protractor": "5.1.2", "ts-node": "3.2.2", "tslint": "5.7.0", - "typescript": "2.4.2" + "typescript": "2.4.2", + "webpack-bundle-analyzer": "2.9.1" } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index eaa580ca..796b335e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,62 +7,39 @@ import { InMemoryWebApiModule } from 'angular-in-memory-web-api'; import 'hammerjs'; import { SharedModule } from './core/modules/shared.module'; import { AppComponent } from './app.component'; -import { ProjectModule } from './main/content/apps/dashboards/project/project.module'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; -import { PagesModule } from './main/content/pages/pages.module'; -import { UIModule } from './main/content/ui/ui.module'; -import { ComponentsModule } from './main/content/components/components.module'; import { FuseSplashScreenService } from './core/services/splash-screen.service'; import { FuseConfigService } from './core/services/config.service'; import { FuseNavigationService } from './core/components/navigation/navigation.service'; -import { ComponentsThirdPartyModule } from './main/content/components-third-party/components-third-party.module'; -import { ServicesModule } from './main/content/services/services.module'; -import { FuseAngularMaterialModule } from './main/content/components/angular-material/angular-material.module'; import { MarkdownModule } from 'angular2-markdown'; import { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; const appRoutes: Routes = [ { - path : 'apps/mail', - loadChildren: './main/content/apps/mail/mail.module#FuseMailModule' + path : 'apps', + loadChildren: './main/content/apps/apps.module#FuseAppsModule' }, { - path : 'apps/mail-ngrx', - loadChildren: './main/content/apps/mail-ngrx/mail.module#FuseMailNgrxModule' + path : 'pages', + loadChildren: './main/content/pages/pages.module#FusePagesModule' }, { - path : 'apps/chat', - loadChildren: './main/content/apps/chat/chat.module#FuseChatModule' + path : 'ui', + loadChildren: './main/content/ui/ui.module#FuseUIModule' }, { - path : 'apps/calendar', - loadChildren: './main/content/apps/calendar/calendar.module#FuseCalendarModule' + path : 'services', + loadChildren: './main/content/services/services.module#FuseServicesModule' }, { - path : 'apps/e-commerce', - loadChildren: './main/content/apps/e-commerce/e-commerce.module#FuseEcommerceModule' + path : 'components', + loadChildren: './main/content/components/components.module#FuseComponentsModule' }, { - path : 'apps/academy', - loadChildren: './main/content/apps/academy/academy.module#FuseAcademyModule' - }, - { - path : 'apps/todo', - loadChildren: './main/content/apps/todo/todo.module#FuseTodoModule' - }, - { - path : 'apps/file-manager', - loadChildren: './main/content/apps/file-manager/file-manager.module#FuseFileManagerModule' - }, - { - path : 'apps/contacts', - loadChildren: './main/content/apps/contacts/contacts.module#FuseContactsModule' - }, - { - path : 'apps/scrumboard', - loadChildren: './main/content/apps/scrumboard/scrumboard.module#FuseScrumboardModule' + path : 'components-third-party', + loadChildren: './main/content/components-third-party/components-third-party.module#FuseComponentsThirdPartyModule' }, { path : '**', @@ -87,14 +64,7 @@ const appRoutes: Routes = [ passThruUnknownUrl: true }), AppStoreModule, - FuseMainModule, - ProjectModule, - PagesModule, - UIModule, - ServicesModule, - ComponentsModule, - FuseAngularMaterialModule, - ComponentsThirdPartyModule + FuseMainModule ], providers : [ FuseSplashScreenService, diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts new file mode 100644 index 00000000..56d93e17 --- /dev/null +++ b/src/app/main/content/apps/apps.module.ts @@ -0,0 +1,63 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../core/modules/shared.module'; +import { RouterModule } from '@angular/router'; +import { FuseAngularMaterialModule } from '../components/angular-material/angular-material.module'; + +const routes = [ + { + path : 'dashboards/project', + loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule' + }, + { + path : 'mail', + loadChildren: './mail/mail.module#FuseMailModule' + }, + { + path : 'mail-ngrx', + loadChildren: './mail-ngrx/mail.module#FuseMailNgrxModule' + }, + { + path : 'chat', + loadChildren: './chat/chat.module#FuseChatModule' + }, + { + path : 'calendar', + loadChildren: './calendar/calendar.module#FuseCalendarModule' + }, + { + path : 'e-commerce', + loadChildren: './e-commerce/e-commerce.module#FuseEcommerceModule' + }, + { + path : 'academy', + loadChildren: './academy/academy.module#FuseAcademyModule' + }, + { + path : 'todo', + loadChildren: './todo/todo.module#FuseTodoModule' + }, + { + path : 'file-manager', + loadChildren: './file-manager/file-manager.module#FuseFileManagerModule' + }, + { + path : 'contacts', + loadChildren: './contacts/contacts.module#FuseContactsModule' + }, + { + path : 'scrumboard', + loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule' + } +]; + +@NgModule({ + imports : [ + SharedModule, + RouterModule.forChild(routes), + FuseAngularMaterialModule + ], + declarations: [] +}) +export class FuseAppsModule +{ +} diff --git a/src/app/main/content/apps/dashboards/project/project.module.ts b/src/app/main/content/apps/dashboards/project/project.module.ts index c9d229e9..95816a25 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -8,7 +8,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts'; const routes: Routes = [ { - path : 'apps/dashboards/project', + path : '**', component: FuseProjectComponent, resolve : { data: ProjectsDashboardService @@ -30,7 +30,7 @@ const routes: Routes = [ ProjectsDashboardService ] }) -export class ProjectModule +export class FuseProjectDashboardModule { } diff --git a/src/app/main/content/components-third-party/components-third-party.module.ts b/src/app/main/content/components-third-party/components-third-party.module.ts index de3ede1a..60908c4d 100644 --- a/src/app/main/content/components-third-party/components-third-party.module.ts +++ b/src/app/main/content/components-third-party/components-third-party.module.ts @@ -6,7 +6,7 @@ import { GoogleMapsModule } from './google-maps/google-maps.module'; const routes = [ { - path : 'components-third-party/datatables/ngx-datatable', + path : 'datatables/ngx-datatable', component: FuseNgxDatatableComponent } ]; @@ -21,6 +21,6 @@ const routes = [ FuseNgxDatatableComponent ] }) -export class ComponentsThirdPartyModule +export class FuseComponentsThirdPartyModule { } diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts b/src/app/main/content/components-third-party/google-maps/google-maps.module.ts index ce58c417..59c0ee67 100644 --- a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts +++ b/src/app/main/content/components-third-party/google-maps/google-maps.module.ts @@ -6,7 +6,7 @@ import { AgmCoreModule } from '@agm/core'; const routes = [ { - path : 'components-third-party/google-maps', + path : 'google-maps', component: FuseGoogleMapsDocsComponent } ]; diff --git a/src/app/main/content/components/angular-material/angular-material.module.ts b/src/app/main/content/components/angular-material/angular-material.module.ts index acffb5e6..ca8e48fa 100644 --- a/src/app/main/content/components/angular-material/angular-material.module.ts +++ b/src/app/main/content/components/angular-material/angular-material.module.ts @@ -8,7 +8,7 @@ import { FuseAngularMaterialComponent } from './angular-material.component'; const routes: Routes = [ { - path : 'components/angular-material', + path : 'angular-material', children: [ { path : ':id', diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index cd467f0b..826c049a 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -11,42 +11,43 @@ import { FuseShortcutsDocsComponent } from './shortcuts/shortcuts.component'; import { FuseSearchBarDocsComponent } from 'app/main/content/components/search-bar/search-bar.component'; import { FuseWidgetDocsComponent } from './widget/widget.component'; import { FuseWidgetModule } from '../../../core/components/widget/widget.module'; +import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; const routes = [ { - path : 'components/cards', + path : 'cards', component: FuseCardsDocsComponent }, { - path : 'components/countdown', + path : 'countdown', component: FuseCountdownDocsComponent }, { - path : 'components/highlightjs', + path : 'highlightjs', component: FuseHljsDocsComponent }, { - path : 'components/material-color-picker', + path : 'material-color-picker', component: FuseMaterialColorPickerDocsComponent }, { - path : 'components/multi-language', + path : 'multi-language', component: FuseMultiLanguageDocsComponent }, { - path : 'components/navigation', + path : 'navigation', component: FuseNavigationDocsComponent }, { - path : 'components/search-bar', + path : 'search-bar', component: FuseSearchBarDocsComponent }, { - path : 'components/shortcuts', + path : 'shortcuts', component: FuseShortcutsDocsComponent }, { - path : 'components/widget', + path : 'widget', component: FuseWidgetDocsComponent } ]; @@ -55,7 +56,8 @@ const routes = [ imports : [ SharedModule, RouterModule.forChild(routes), - FuseWidgetModule + FuseWidgetModule, + FuseAngularMaterialModule ], declarations: [ FuseCardsDocsComponent, @@ -69,6 +71,6 @@ const routes = [ FuseWidgetDocsComponent ] }) -export class ComponentsModule +export class FuseComponentsModule { } diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts index f072c7c4..8ae766c6 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts @@ -6,7 +6,7 @@ import { FuseForgotPassword2Component } from './forgot-password-2.component'; const routes = [ { - path : 'pages/auth/forgot-password-2', + path : 'auth/forgot-password-2', component: FuseForgotPassword2Component } ]; diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts b/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts index 40554f80..53a9da79 100644 --- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts +++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts @@ -6,7 +6,7 @@ import { FuseForgotPasswordComponent } from './forgot-password.component'; const routes = [ { - path : 'pages/auth/forgot-password', + path : 'auth/forgot-password', component: FuseForgotPasswordComponent } ]; diff --git a/src/app/main/content/pages/authentication/lock/lock.module.ts b/src/app/main/content/pages/authentication/lock/lock.module.ts index 6a7def37..edd87d4b 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -6,7 +6,7 @@ import { FuseLockComponent } from './lock.component'; const routes = [ { - path : 'pages/auth/lock', + path : 'auth/lock', component: FuseLockComponent } ]; diff --git a/src/app/main/content/pages/authentication/login-2/login-2.module.ts b/src/app/main/content/pages/authentication/login-2/login-2.module.ts index 6bc84d1f..f5356245 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.module.ts +++ b/src/app/main/content/pages/authentication/login-2/login-2.module.ts @@ -6,7 +6,7 @@ import { FuseLogin2Component } from './login-2.component'; const routes = [ { - path : 'pages/auth/login-2', + path : 'auth/login-2', component: FuseLogin2Component } ]; diff --git a/src/app/main/content/pages/authentication/login/login.module.ts b/src/app/main/content/pages/authentication/login/login.module.ts index 00ed3966..cf5307f8 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -6,7 +6,7 @@ import { FuseLoginComponent } from './login.component'; const routes = [ { - path : 'pages/auth/login', + path : 'auth/login', component: FuseLoginComponent } ]; diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts index 2f61bb28..4d0b52b3 100644 --- a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts +++ b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts @@ -6,7 +6,7 @@ import { FuseMailConfirmComponent } from './mail-confirm.component'; const routes = [ { - path : 'pages/auth/mail-confirm', + path : 'auth/mail-confirm', component: FuseMailConfirmComponent } ]; diff --git a/src/app/main/content/pages/authentication/register-2/register-2.module.ts b/src/app/main/content/pages/authentication/register-2/register-2.module.ts index 181fd924..16975fca 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.module.ts +++ b/src/app/main/content/pages/authentication/register-2/register-2.module.ts @@ -6,7 +6,7 @@ import { FuseRegister2Component } from './register-2.component'; const routes = [ { - path : 'pages/auth/register-2', + path : 'auth/register-2', component: FuseRegister2Component } ]; diff --git a/src/app/main/content/pages/authentication/register/register.module.ts b/src/app/main/content/pages/authentication/register/register.module.ts index ad23ce6c..61a7c904 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -6,7 +6,7 @@ import { FuseRegisterComponent } from './register.component'; const routes = [ { - path : 'pages/auth/register', + path : 'auth/register', component: FuseRegisterComponent } ]; diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts index 4d7149d0..3fd19ca5 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts @@ -6,7 +6,7 @@ import { FuseResetPassword2Component } from './reset-password-2.component'; const routes = [ { - path : 'pages/auth/reset-password-2', + path : 'auth/reset-password-2', component: FuseResetPassword2Component } ]; diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts b/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts index fa352940..4737858c 100644 --- a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts +++ b/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts @@ -6,7 +6,7 @@ import { FuseResetPasswordComponent } from './reset-password.component'; const routes = [ { - path : 'pages/auth/reset-password', + path : 'auth/reset-password', component: FuseResetPasswordComponent } ]; diff --git a/src/app/main/content/pages/coming-soon/coming-soon.module.ts b/src/app/main/content/pages/coming-soon/coming-soon.module.ts index 21490ce3..ddf8fa79 100644 --- a/src/app/main/content/pages/coming-soon/coming-soon.module.ts +++ b/src/app/main/content/pages/coming-soon/coming-soon.module.ts @@ -6,7 +6,7 @@ import { FuseComingSoonComponent } from './coming-soon.component'; const routes = [ { - path : 'pages/coming-soon', + path : 'coming-soon', component: FuseComingSoonComponent } ]; diff --git a/src/app/main/content/pages/errors/404/error-404.module.ts b/src/app/main/content/pages/errors/404/error-404.module.ts index c42409e4..791f4a38 100644 --- a/src/app/main/content/pages/errors/404/error-404.module.ts +++ b/src/app/main/content/pages/errors/404/error-404.module.ts @@ -6,7 +6,7 @@ import { FuseError404Component } from './error-404.component'; const routes = [ { - path : 'pages/errors/error-404', + path : 'errors/error-404', component: FuseError404Component } ]; diff --git a/src/app/main/content/pages/errors/500/error-500.module.ts b/src/app/main/content/pages/errors/500/error-500.module.ts index b9b70575..7b2c0b50 100644 --- a/src/app/main/content/pages/errors/500/error-500.module.ts +++ b/src/app/main/content/pages/errors/500/error-500.module.ts @@ -6,7 +6,7 @@ import { FuseError500Component } from './error-500.component'; const routes = [ { - path : 'pages/errors/error-500', + path : 'errors/error-500', component: FuseError500Component } ]; diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index 127eeeb2..b4f36cc0 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -6,7 +6,7 @@ import { FaqService } from './faq.service'; const routes = [ { - path : 'pages/faq', + path : 'faq', component: FuseFaqComponent, resolve : { faq: FaqService diff --git a/src/app/main/content/pages/invoices/compact/compact.module.ts b/src/app/main/content/pages/invoices/compact/compact.module.ts index f30e6773..d2dd171c 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -7,7 +7,7 @@ import { InvoiceService } from '../invoice.service'; const routes = [ { - path : 'pages/invoices/compact', + path : 'invoices/compact', component: FuseInvoiceCompactComponent, resolve : { search: InvoiceService diff --git a/src/app/main/content/pages/invoices/modern/modern.module.ts b/src/app/main/content/pages/invoices/modern/modern.module.ts index afe268d3..02b361c4 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -7,7 +7,7 @@ import { InvoiceService } from '../invoice.service'; const routes = [ { - path : 'pages/invoices/modern', + path : 'invoices/modern', component: FuseInvoiceModernComponent, resolve : { search: InvoiceService diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts b/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts index a29ae8b5..b26bd919 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts @@ -7,7 +7,7 @@ import { FuseKnowledgeBaseArticleComponent } from './dialogs/article/article.com const routes = [ { - path : 'pages/knowledge-base', + path : 'knowledge-base', component: FuseKnowledgeBaseComponent, resolve : { knowledgeBase: KnowledgeBaseService diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index 660a70df..08195d77 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -6,7 +6,7 @@ import { FuseMaintenanceComponent } from './maintenance.component'; const routes = [ { - path : 'pages/maintenance', + path : 'maintenance', component: FuseMaintenanceComponent } ]; diff --git a/src/app/main/content/pages/pages.module.ts b/src/app/main/content/pages/pages.module.ts index 786c9792..96a6ba58 100644 --- a/src/app/main/content/pages/pages.module.ts +++ b/src/app/main/content/pages/pages.module.ts @@ -66,6 +66,7 @@ import { KnowledgeBaseModule } from './knowledge-base/knowledge-base.module'; KnowledgeBaseModule ] }) -export class PagesModule +export class FusePagesModule { + } diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index 8be47e18..115bba06 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -8,15 +8,15 @@ import { FusePricingStyle3Component } from './style-3/style-3.component'; const routes = [ { - path : 'pages/pricing/style-1', + path : 'pricing/style-1', component: FusePricingStyle1Component }, { - path : 'pages/pricing/style-2', + path : 'pricing/style-2', component: FusePricingStyle2Component }, { - path : 'pages/pricing/style-3', + path : 'pricing/style-3', component: FusePricingStyle3Component } ]; diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index 971c39b9..aa699d6a 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -10,7 +10,7 @@ import { ProfileService } from './profile.service'; const routes = [ { - path : 'pages/profile', + path : 'profile', component: FuseProfileComponent, resolve : { profile: ProfileService diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 97baa3fa..325c790e 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -9,7 +9,7 @@ import { SearchService } from './search.service'; const routes = [ { - path : 'pages/search', + path : 'search', component: FuseSearchComponent, resolve : { search: SearchService diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index 4d52ac3a..2b55e89b 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -6,11 +6,11 @@ import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-scr const routes = [ { - path : 'services/config', + path : 'config', component: FuseConfigServiceDocsComponent }, { - path : 'services/splash-screen', + path : 'splash-screen', component: FuseSplashScreenServiceDocsComponent } ]; @@ -25,6 +25,6 @@ const routes = [ FuseSplashScreenServiceDocsComponent ] }) -export class ServicesModule +export class FuseServicesModule { } diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts index c06a419c..cbf2dc1e 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -6,7 +6,7 @@ import { FuseColorsComponent } from './colors.component'; const routes: Routes = [ { - path : 'ui/colors', + path : 'colors', component: FuseColorsComponent } ]; diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index ccbdb13f..8c0d4fb4 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -6,7 +6,7 @@ import { FuseFormsComponent } from './forms.component'; const routes: Routes = [ { - path : 'ui/forms', + path : 'forms', component: FuseFormsComponent } ]; diff --git a/src/app/main/content/ui/helper-classes/helper-classes.module.ts b/src/app/main/content/ui/helper-classes/helper-classes.module.ts index 4d163162..bb99ecb2 100644 --- a/src/app/main/content/ui/helper-classes/helper-classes.module.ts +++ b/src/app/main/content/ui/helper-classes/helper-classes.module.ts @@ -8,7 +8,7 @@ import { FuseHelperClassesWidthHeightComponent } from './tabs/width-height/width const routes: Routes = [ { - path : 'ui/helper-classes', + path : 'helper-classes', component: FuseHelperClassesComponent } ]; diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index 1c382528..fe75f5b7 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -5,7 +5,7 @@ import { FuseIconsComponent } from './icons.component'; const routes: Routes = [ { - path : 'ui/icons', + path : 'icons', component: FuseIconsComponent } ]; diff --git a/src/app/main/content/ui/page-layouts/page-layouts.module.ts b/src/app/main/content/ui/page-layouts/page-layouts.module.ts index e11436dd..c87cb18f 100644 --- a/src/app/main/content/ui/page-layouts/page-layouts.module.ts +++ b/src/app/main/content/ui/page-layouts/page-layouts.module.ts @@ -24,79 +24,79 @@ import { FuseBlankComponent } from './blank/blank.component'; const routes: Routes = [ { - path : 'ui/page-layouts/carded/full-width', + path : 'page-layouts/carded/full-width', component: FuseCardedFullWidthComponent }, { - path : 'ui/page-layouts/carded/full-width-2', + path : 'page-layouts/carded/full-width-2', component: FuseCardedFullWidth2Component }, { - path : 'ui/page-layouts/carded/left-sidenav', + path : 'page-layouts/carded/left-sidenav', component: FuseCardedLeftSidenavComponent }, { - path : 'ui/page-layouts/carded/left-sidenav-tabbed', + path : 'page-layouts/carded/left-sidenav-tabbed', component: FuseCardedLeftSidenavTabbedComponent }, { - path : 'ui/page-layouts/carded/left-sidenav-2', + path : 'page-layouts/carded/left-sidenav-2', component: FuseCardedLeftSidenav2Component }, { - path : 'ui/page-layouts/carded/left-sidenav-2-tabbed', + path : 'page-layouts/carded/left-sidenav-2-tabbed', component: FuseCardedLeftSidenav2TabbedComponent }, { - path : 'ui/page-layouts/carded/right-sidenav', + path : 'page-layouts/carded/right-sidenav', component: FuseCardedRightSidenavComponent }, { - path : 'ui/page-layouts/carded/right-sidenav-tabbed', + path : 'page-layouts/carded/right-sidenav-tabbed', component: FuseCardedRightSidenavTabbedComponent }, { - path : 'ui/page-layouts/carded/right-sidenav-2', + path : 'page-layouts/carded/right-sidenav-2', component: FuseCardedRightSidenav2Component }, { - path : 'ui/page-layouts/carded/right-sidenav-2-tabbed', + path : 'page-layouts/carded/right-sidenav-2-tabbed', component: FuseCardedRightSidenav2TabbedComponent }, { - path : 'ui/page-layouts/simple/full-width', + path : 'page-layouts/simple/full-width', component: FuseSimpleFullWidthComponent }, { - path : 'ui/page-layouts/simple/left-sidenav', + path : 'page-layouts/simple/left-sidenav', component: FuseSimpleLeftSidenavComponent }, { - path : 'ui/page-layouts/simple/left-sidenav-2', + path : 'page-layouts/simple/left-sidenav-2', component: FuseSimpleLeftSidenav2Component }, { - path : 'ui/page-layouts/simple/left-sidenav-3', + path : 'page-layouts/simple/left-sidenav-3', component: FuseSimpleLeftSidenav3Component }, { - path : 'ui/page-layouts/simple/right-sidenav', + path : 'page-layouts/simple/right-sidenav', component: FuseSimpleRightSidenavComponent }, { - path : 'ui/page-layouts/simple/right-sidenav-2', + path : 'page-layouts/simple/right-sidenav-2', component: FuseSimpleRightSidenav2Component }, { - path : 'ui/page-layouts/simple/right-sidenav-3', + path : 'page-layouts/simple/right-sidenav-3', component: FuseSimpleRightSidenav3Component }, { - path : 'ui/page-layouts/simple/tabbed', + path : 'page-layouts/simple/tabbed', component: FuseTabbedComponent }, { - path : 'ui/page-layouts/blank', + path : 'page-layouts/blank', component: FuseBlankComponent } ]; diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index d02c680c..ca1e0f93 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -10,7 +10,7 @@ import { FuseTypographyHelpersComponent } from './tabs/helpers/helpers.component const routes: Routes = [ { - path : 'ui/typography', + path : 'typography', component: FuseTypographyComponent } ]; diff --git a/src/app/main/content/ui/ui.module.ts b/src/app/main/content/ui/ui.module.ts index f5ca2582..31acd6a4 100644 --- a/src/app/main/content/ui/ui.module.ts +++ b/src/app/main/content/ui/ui.module.ts @@ -17,6 +17,6 @@ import { UIColorsModule } from './colors/colors.module'; UIColorsModule ] }) -export class UIModule +export class FuseUIModule { }