From f211bb625ed21d8daad9bb15f14bb3f994917b00 Mon Sep 17 00:00:00 2001 From: Xing Date: Fri, 1 Jul 2016 09:33:27 -0700 Subject: [PATCH 1/8] Make source map files generated correctly. https://github.com/webpack/extract-text-webpack-plugin/issues/119 --- config/webpack.dev.js | 2 +- config/webpack.prod.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/webpack.dev.js b/config/webpack.dev.js index e5a8b1c5..1c553394 100644 --- a/config/webpack.dev.js +++ b/config/webpack.dev.js @@ -80,7 +80,7 @@ module.exports = webpackMerge(commonConfig, { * * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename */ - sourceMapFilename: '[name].map', + sourceMapFilename: '[file].map', /** The filename of non-entry chunks as relative path * inside the output.path directory. diff --git a/config/webpack.prod.js b/config/webpack.prod.js index 3c5d8c3d..0050734f 100644 --- a/config/webpack.prod.js +++ b/config/webpack.prod.js @@ -72,7 +72,7 @@ module.exports = webpackMerge(commonConfig, { * * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename */ - sourceMapFilename: '[name].[chunkhash].bundle.map', + sourceMapFilename: '[file].map', /** * The filename of non-entry chunks as relative path From 070cec726ea6d810e583d612a33c26f1ca60e36d Mon Sep 17 00:00:00 2001 From: tibing Date: Mon, 4 Jul 2016 17:07:51 +0300 Subject: [PATCH 2/8] feat(app\components): create tree view component --- package.json | 1 + src/app/app.menu.ts | 12 ++++++ .../pages/components/components.component.ts | 25 +++++++++++++ src/app/pages/components/components.scss | 1 + .../components/components/treeView/index.ts | 1 + .../components/treeView/treeView.component.ts | 37 +++++++++++++++++++ .../components/treeView/treeView.html | 5 +++ src/app/pages/components/index.ts | 1 + src/app/pages/pages.component.ts | 6 +++ src/app/theme/sass/_treeView.scss | 27 ++++++++++++++ src/app/theme/theme.scss | 1 + 11 files changed, 117 insertions(+) create mode 100644 src/app/pages/components/components.component.ts create mode 100644 src/app/pages/components/components.scss create mode 100644 src/app/pages/components/components/treeView/index.ts create mode 100644 src/app/pages/components/components/treeView/treeView.component.ts create mode 100644 src/app/pages/components/components/treeView/treeView.html create mode 100644 src/app/pages/components/index.ts create mode 100644 src/app/theme/sass/_treeView.scss diff --git a/package.json b/package.json index 1f653a6a..5def99c5 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "leaflet-map": "^0.2.1", "lodash": "^4.12.0", "ng2-bootstrap": "^1.0.16", + "ng2-branchy": "0.0.2-2", "ng2-ckeditor": "^1.0.3", "normalize.css": "^4.1.1", "rxjs": "5.0.0-beta.6", diff --git a/src/app/app.menu.ts b/src/app/app.menu.ts index 97d4a385..66061d77 100644 --- a/src/app/app.menu.ts +++ b/src/app/app.menu.ts @@ -33,6 +33,18 @@ export const menuItems = [ }, ] }, + { + title: 'Components', + component: 'Components', + icon: 'ion-gear-a', + order: 250, + subMenu: [ + { + title: 'Tree View', + component: 'TreeView' + } + ] + }, { title: 'UI Features', component: 'Ui', diff --git a/src/app/pages/components/components.component.ts b/src/app/pages/components/components.component.ts new file mode 100644 index 00000000..ef02cdac --- /dev/null +++ b/src/app/pages/components/components.component.ts @@ -0,0 +1,25 @@ +import {Component} from '@angular/core'; +import {RouteConfig} from '@angular/router-deprecated'; +import {TreeView} from "./components/treeView"; + +@Component({ + selector: 'components', + pipes: [], + providers: [], + styles: [], + template: `` +}) +@RouteConfig([ + { + name: 'TreeView', + component: TreeView, + path: '/tree-view', + useAsDefault: true + } +]) +export class Components { + + constructor() { + } + +} diff --git a/src/app/pages/components/components.scss b/src/app/pages/components/components.scss new file mode 100644 index 00000000..1999f610 --- /dev/null +++ b/src/app/pages/components/components.scss @@ -0,0 +1 @@ +@import '../../theme/sass/treeView'; diff --git a/src/app/pages/components/components/treeView/index.ts b/src/app/pages/components/components/treeView/index.ts new file mode 100644 index 00000000..15f949fe --- /dev/null +++ b/src/app/pages/components/components/treeView/index.ts @@ -0,0 +1 @@ +export * from './treeView.component'; diff --git a/src/app/pages/components/components/treeView/treeView.component.ts b/src/app/pages/components/components/treeView/treeView.component.ts new file mode 100644 index 00000000..1f7fbb96 --- /dev/null +++ b/src/app/pages/components/components/treeView/treeView.component.ts @@ -0,0 +1,37 @@ +import {Component} from '@angular/core'; +import {BranchyComponent, TreeModel} from 'ng2-branchy'; +import {BaCard} from "../../../../theme/components/baCard/baCard.component"; + +@Component({ + selector: 'tree-view', + directives: [BranchyComponent, BaCard], + template: require('./treeView.html'), +}) + +export class TreeView { + + constructor() { + } + private tree: TreeModel = { + value: 'Programming languages by programming paradigm', + children: [ + { + value: 'Object-oriented programming', + children: [ + {value: 'Java'}, + {value: 'C++'}, + {value: 'C#'}, + ] + }, + { + value: 'Prototype-based programming', + children: [ + {value: 'JavaScript'}, + {value: 'CoffeeScript'}, + {value: 'Lua'}, + ] + } + ] + }; + +} diff --git a/src/app/pages/components/components/treeView/treeView.html b/src/app/pages/components/components/treeView/treeView.html new file mode 100644 index 00000000..df018c41 --- /dev/null +++ b/src/app/pages/components/components/treeView/treeView.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/src/app/pages/components/index.ts b/src/app/pages/components/index.ts new file mode 100644 index 00000000..86211eac --- /dev/null +++ b/src/app/pages/components/index.ts @@ -0,0 +1 @@ +export * from './components.component'; diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index 33f9c4a1..cfb2bb60 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -10,6 +10,7 @@ import {Charts} from './charts'; import {Forms} from './forms'; import {Tables} from './tables'; import {Editors} from "./editors"; +import {Components} from "./components/components.component"; @Component({ selector: 'pages', @@ -52,6 +53,11 @@ import {Editors} from "./editors"; path: '/dashboard', useAsDefault: true, }, + { + name: 'Components', + component: Components, + path: '/components/...' + }, { name: 'Ui', component: Ui, diff --git a/src/app/theme/sass/_treeView.scss b/src/app/theme/sass/_treeView.scss new file mode 100644 index 00000000..fd03a679 --- /dev/null +++ b/src/app/theme/sass/_treeView.scss @@ -0,0 +1,27 @@ +#tree-view .tree { + & .node-value { + color: white; + } + & .folding { + &.node-expanded::before { + color: white; + } + &.node-collapsed::before { + color: white; + } + &.node-leaf::before { + color: white; + } + } + & .over-drop-target { + border: 4px solid ghostwhite; + } + & .node-value{ + & .node-selected::after { + background-color: white; + } + &:after { + background-color: white; + } + } +} diff --git a/src/app/theme/theme.scss b/src/app/theme/theme.scss index 4f38c1d0..f1f411b2 100644 --- a/src/app/theme/theme.scss +++ b/src/app/theme/theme.scss @@ -8,3 +8,4 @@ @import "sass/socicon"; @import "sass/table"; @import "sass/form"; +@import "sass/treeView"; From b280a8b0122f612e8ed2c15f54b289c086de57ce Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Fri, 8 Jul 2016 10:39:25 +0300 Subject: [PATCH 3/8] refactor(treeview): get rid of strange ts compilation error --- src/app/theme/components/baCard/baCard.component.ts | 3 +-- src/app/theme/components/baCard/index.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/theme/components/baCard/baCard.component.ts b/src/app/theme/components/baCard/baCard.component.ts index 8c700c08..f49807b0 100644 --- a/src/app/theme/components/baCard/baCard.component.ts +++ b/src/app/theme/components/baCard/baCard.component.ts @@ -1,5 +1,4 @@ -import {Component, ViewEncapsulation, Input} from '@angular/core'; - +import {Component, ViewEncapsulation, ViewChild, Input} from '@angular/core'; import {BaCardBlur} from './baCardBlur.directive'; @Component({ diff --git a/src/app/theme/components/baCard/index.ts b/src/app/theme/components/baCard/index.ts index b04caf13..8a8fa6c2 100644 --- a/src/app/theme/components/baCard/index.ts +++ b/src/app/theme/components/baCard/index.ts @@ -1,2 +1 @@ -export * from './baCard.component.ts'; -export * from './baCardBlur.directive'; +export * from './baCard.component'; From ffae8cd2487e0e849a571cda3b4846fd6c989cfc Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Fri, 8 Jul 2016 13:10:36 +0300 Subject: [PATCH 4/8] feat(forms): update forms to latest version --- package.json | 4 ++-- .../components/ckeditor/ckeditor.component.ts | 13 +++++++------ src/app/pages/login/login.component.ts | 6 +++--- src/app/pages/login/login.html | 6 +++--- src/app/pages/register/register.component.ts | 8 ++++---- src/app/pages/register/register.html | 10 +++++----- src/app/theme/validators/email.validator.ts | 8 ++++---- .../theme/validators/equalPasswords.validator.ts | 10 +++++----- src/platform/browser/directives.ts | 5 ++++- src/platform/browser/providers.ts | 15 ++++++++++----- 10 files changed, 47 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index d3995422..1faf1c07 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "leaflet": "^0.7.7", "leaflet-map": "^0.2.1", "lodash": "^4.12.0", - "ng2-bootstrap": "^1.0.16", - "ng2-ckeditor": "^1.0.3", + "ng2-bootstrap": "^1.0.17", + "ng2-ckeditor": "^1.0.4", "ng2-uploader": "^0.5.2", "normalize.css": "^4.1.1", "rxjs": "5.0.0-beta.6", diff --git a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts index 7c9240bd..94c7a6b2 100644 --- a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts +++ b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {CKEditor} from 'ng2-ckeditor'; -import {BaCard} from "../../../../theme/components/baCard/baCard.component"; +import {BaCard} from '../../../../theme/components/baCard'; import './ckeditor.loader.ts'; @@ -11,11 +11,12 @@ import './ckeditor.loader.ts'; }) export class Ckeditor { - private ckeditorContent; - private config; - + public ckeditorContent:string = '

Hello CKEditor

'; + public config = { + uiColor: '#F0F3F4', + height: '600' + }; + constructor() { - this.ckeditorContent = `

Hello CKEditor

`; - this.config = {uiColor: '#F0F3F4', height: '600'}; } } diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 63eea4f8..b02adda0 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common'; +import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms'; @Component({ selector: 'login', @@ -10,7 +10,7 @@ import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} }) export class Login { - public form:ControlGroup; + public form:FormGroup; public email:AbstractControl; public password:AbstractControl; public submitted:boolean = false; @@ -24,7 +24,7 @@ export class Login { this.email = this.form.controls['email']; this.password = this.form.controls['password']; } - + public onSubmit(values:Object):void { this.submitted = true; if (this.form.valid) { diff --git a/src/app/pages/login/login.html b/src/app/pages/login/login.html index 9bedac1a..ad0ee101 100644 --- a/src/app/pages/login/login.html +++ b/src/app/pages/login/login.html @@ -3,19 +3,19 @@

Sign in to ng2-admin

New to ng2-admin? Sign up! -
+
- +
- +
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts index 1d06b645..9af4e225 100644 --- a/src/app/pages/register/register.component.ts +++ b/src/app/pages/register/register.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common'; +import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms'; import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators'; @Component({ @@ -11,12 +11,12 @@ import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators'; }) export class Register { - public form:ControlGroup; + public form:FormGroup; public name:AbstractControl; public email:AbstractControl; public password:AbstractControl; public repeatPassword:AbstractControl; - public passwords:ControlGroup; + public passwords:FormGroup; public submitted:boolean = false; @@ -33,7 +33,7 @@ export class Register { this.name = this.form.controls['name']; this.email = this.form.controls['email']; - this.passwords = this.form.controls['passwords']; + this.passwords = this.form.controls['passwords']; this.password = this.passwords.controls['password']; this.repeatPassword = this.passwords.controls['repeatPassword']; } diff --git a/src/app/pages/register/register.html b/src/app/pages/register/register.html index de3d19b7..07eb03e6 100644 --- a/src/app/pages/register/register.html +++ b/src/app/pages/register/register.html @@ -3,33 +3,33 @@

Sign up to ng2-admin

Already have an ng2-admin account? Sign in! - +
- +
- +
- +
- + Passwords don't match.
diff --git a/src/app/theme/validators/email.validator.ts b/src/app/theme/validators/email.validator.ts index f31fc8fa..a23f8533 100644 --- a/src/app/theme/validators/email.validator.ts +++ b/src/app/theme/validators/email.validator.ts @@ -1,14 +1,14 @@ -import {Control} from '@angular/common'; +import {AbstractControl} from '@angular/forms'; export class EmailValidator { - public static validate(c: Control) { + public static validate(c:AbstractControl) { let EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i; - + return EMAIL_REGEXP.test(c.value) ? null : { validateEmail: { valid: false } }; } -} \ No newline at end of file +} diff --git a/src/app/theme/validators/equalPasswords.validator.ts b/src/app/theme/validators/equalPasswords.validator.ts index d843f3c6..d5cbc40e 100644 --- a/src/app/theme/validators/equalPasswords.validator.ts +++ b/src/app/theme/validators/equalPasswords.validator.ts @@ -1,11 +1,11 @@ -import {Control, ControlGroup} from '@angular/common'; +import {FormGroup} from '@angular/forms'; export class EqualPasswordsValidator { public static validate(firstField, secondField) { - - return (c: ControlGroup) => { - + + return (c:FormGroup) => { + return (c.controls && c.controls[firstField].value == c.controls[secondField].value) ? null : { passwordsEqual: { valid: false @@ -13,4 +13,4 @@ export class EqualPasswordsValidator { }; } } -} \ No newline at end of file +} diff --git a/src/platform/browser/directives.ts b/src/platform/browser/directives.ts index 7693bb4b..c5cd6c38 100644 --- a/src/platform/browser/directives.ts +++ b/src/platform/browser/directives.ts @@ -6,10 +6,13 @@ import {PLATFORM_DIRECTIVES} from '@angular/core'; // Angular 2 Router import {ROUTER_DIRECTIVES} from '@angular/router-deprecated'; +// Angular 2 forms +import { REACTIVE_FORM_DIRECTIVES } from '@angular/forms'; // application_directives: directives that are global through out the application export const APPLICATION_DIRECTIVES = [ - ...ROUTER_DIRECTIVES + ...ROUTER_DIRECTIVES, + ...REACTIVE_FORM_DIRECTIVES ]; export const DIRECTIVES = [ diff --git a/src/platform/browser/providers.ts b/src/platform/browser/providers.ts index 9027794d..fb4c6f41 100644 --- a/src/platform/browser/providers.ts +++ b/src/platform/browser/providers.ts @@ -10,15 +10,20 @@ import {HTTP_PROVIDERS} from '@angular/http'; // Angular 2 Router import {ROUTER_PROVIDERS} from '@angular/router-deprecated'; +// Angular 2 forms +import {disableDeprecatedForms, provideForms} from '@angular/forms'; + /* -* Application Providers/Directives/Pipes -* providers/directives/pipes that only live in our browser environment -*/ + * Application Providers/Directives/Pipes + * providers/directives/pipes that only live in our browser environment + */ export const APPLICATION_PROVIDERS = [ - ...FORM_PROVIDERS, + // new Angular 2 forms + disableDeprecatedForms(), + provideForms(), ...HTTP_PROVIDERS, ...ROUTER_PROVIDERS, - {provide: LocationStrategy, useClass: HashLocationStrategy } + {provide: LocationStrategy, useClass: HashLocationStrategy} ]; export const PROVIDERS = [ From 9fc37c561d3fe8280854d5fc7af1d48f1fe361c7 Mon Sep 17 00:00:00 2001 From: gavinzhou Date: Tue, 12 Jul 2016 01:40:07 +0000 Subject: [PATCH 5/8] change Dockerfile add build.sh with build docker --- Dockerfile | 37 ++++++++++--------------------------- _VERSION | 1 + build.sh | 9 +++++++++ 3 files changed, 20 insertions(+), 27 deletions(-) create mode 100644 _VERSION create mode 100755 build.sh diff --git a/Dockerfile b/Dockerfile index ba084f6d..eb90881c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,33 +1,16 @@ FROM node:latest -COPY . /var/www -WORKDIR /var/www - -#Install rimraf globally, so root can perform delete operation -RUN npm install --global rimraf -RUN npm run clean - -#install bower and dependcies with --allow-root flag -RUN npm install --global bower -RUN bower install --allow-root - -#install right version of typings -RUN npm install --global typings@0.8.1 -RUN npm run typings -- install - -#install all -RUN npm install --global webpack webpack-dev-server typescript -RUN npm install - -#build -RUN npm run prebuild:prod -RUN npm run build:prod +RUN git clone https://github.com/akveo/ng2-admin.git /var/www \ + && cd /var/www \ + && npm install --global rimraf \ + && npm run clean \ + && npm install --global bower typings webpack webpack-dev-server typescript \ + && bower install --allow-root \ + && npm run typings -- install \ + && npm install \ + && npm run prebuild:prod && npm run build:prod EXPOSE 8080 +WORKDIR /var/www ENTRYPOINT ["npm", "run", "server:prod"] - -#to build image - docker quick terminal, navigate to folder, docker build -t [your docker hub account]/ng2-admin . -#to run docker run -p 8080:8080 [your docker hub account]/ng2-admin -#or you can simply pull from my registry - docker pull dimkk/ng2-admin, docker run -p8080:8080 dimkk/ng2-admin -#now you can navigate to docker-machine (assuming you are on windows or osx) in browser - 192.168.99.100:8080 \ No newline at end of file diff --git a/_VERSION b/_VERSION new file mode 100644 index 00000000..a673804b --- /dev/null +++ b/_VERSION @@ -0,0 +1 @@ +_VERSION=0.3.0 diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..48d814e4 --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +_tag=$1 + +if [ -z "${_tag}" ]; then + source _VERSION + _tag=${_VERSION} +fi + +docker build --tag "ng2-admin:${_tag}" --no-cache=true . From 86a648374d135c7801848102381727f7a2a745de Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Tue, 12 Jul 2016 10:34:32 +0300 Subject: [PATCH 6/8] fix(forms): update ng2-bootstrap --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1faf1c07..0ed0642b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "leaflet": "^0.7.7", "leaflet-map": "^0.2.1", "lodash": "^4.12.0", - "ng2-bootstrap": "^1.0.17", + "ng2-bootstrap": "^1.0.20", "ng2-ckeditor": "^1.0.4", "ng2-uploader": "^0.5.2", "normalize.css": "^4.1.1", From 563c6d03334f5043d007e36870956e724e94cf85 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Tue, 12 Jul 2016 11:02:30 +0300 Subject: [PATCH 7/8] fix(merge): fix merge issues --- config/webpack.common.js | 3 ++- src/platform/browser/providers.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/webpack.common.js b/config/webpack.common.js index 34c2d39a..25772a7d 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -87,7 +87,8 @@ module.exports = { loader: 'source-map-loader', exclude: [ // these packages have problems with their sourcemaps - helpers.root('node_modules/rxjs') + helpers.root('node_modules/rxjs'), + helpers.root('node_modules/ng2-bootstrap'), ] } diff --git a/src/platform/browser/providers.ts b/src/platform/browser/providers.ts index bee58303..6f9dfa8f 100644 --- a/src/platform/browser/providers.ts +++ b/src/platform/browser/providers.ts @@ -23,8 +23,8 @@ export const APPLICATION_PROVIDERS = [ provideForms(), ...HTTP_PROVIDERS, ...APP_ROUTER_PROVIDERS, + {provide: LocationStrategy, useClass: HashLocationStrategy}, {provide: LocationStrategy, useClass: HashLocationStrategy} - {provide: LocationStrategy, useClass: HashLocationStrategy } ]; export const PROVIDERS = [ From a46c259318db2cf467e6ad5b0e45cd1b1d2e860d Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Tue, 12 Jul 2016 12:15:25 +0300 Subject: [PATCH 8/8] fix(merge): merge tree view component --- package.json | 2 +- .../pages/components/components.component.ts | 10 ------- src/app/pages/pages.routes.ts | 26 +++++++++++++++++++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 1d50716b..9da4336d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "lodash": "^4.12.0", "ng2-bootstrap": "^1.0.20", "ng2-ckeditor": "^1.0.4", - "ng2-branchy": "0.0.2-2", + "ng2-branchy": "^0.0.2-5", "ng2-uploader": "^0.5.2", "normalize.css": "^4.1.1", "rxjs": "5.0.0-beta.6", diff --git a/src/app/pages/components/components.component.ts b/src/app/pages/components/components.component.ts index ef02cdac..41891ad5 100644 --- a/src/app/pages/components/components.component.ts +++ b/src/app/pages/components/components.component.ts @@ -1,6 +1,4 @@ import {Component} from '@angular/core'; -import {RouteConfig} from '@angular/router-deprecated'; -import {TreeView} from "./components/treeView"; @Component({ selector: 'components', @@ -9,14 +7,6 @@ import {TreeView} from "./components/treeView"; styles: [], template: `` }) -@RouteConfig([ - { - name: 'TreeView', - component: TreeView, - path: '/tree-view', - useAsDefault: true - } -]) export class Components { constructor() { diff --git a/src/app/pages/pages.routes.ts b/src/app/pages/pages.routes.ts index 3cc32d61..36ffe8da 100644 --- a/src/app/pages/pages.routes.ts +++ b/src/app/pages/pages.routes.ts @@ -20,6 +20,8 @@ import {BubbleMaps} from './maps/components/bubbleMaps/bubbleMaps.component'; import {LineMaps} from './maps/components/lineMaps/lineMaps.component'; import {Editors} from './editors/editors.component'; import {Ckeditor} from './editors/components/ckeditor/ckeditor.component'; +import {Components} from './components/components.component'; +import {TreeView} from './components/components/treeView/treeView.component'; //noinspection TypeScriptValidateTypes export const PagesRoutes:RouterConfig = [ @@ -64,6 +66,30 @@ export const PagesRoutes:RouterConfig = [ } ] }, + { + path: 'components', + component: Components, + data: { + menu: { + title: 'Components', + icon: 'ion-gear-a', + selected: false, + expanded: false, + order: 250, + } + }, + children: [ + { + path: 'treeview', + component: TreeView, + data: { + menu: { + title: 'Tree View', + } + } + } + ] + }, { path: 'charts', component: Charts,