From 51bd636ba68af481969c1074a2e6ba01259fd0aa Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Sat, 17 Feb 2018 17:21:38 +0300 Subject: [PATCH 01/20] Moved core into @fuse + New fuse sidebar component + Moved the navbar to the sidebar --- package-lock.json | 488 +++++++++--------- package.json | 34 +- .../animations/index.ts} | 0 .../confirm-dialog.component.html | 0 .../confirm-dialog.component.scss | 0 .../confirm-dialog.component.ts | 0 .../components/copier/copier.service.ts | 0 .../countdown/countdown.component.html | 0 .../countdown/countdown.component.scss | 0 .../countdown/countdown.component.ts | 0 .../demo-content/demo-content.component.html | 0 .../demo-content/demo-content.component.scss | 0 .../demo-content/demo-content.component.ts | 0 .../demo-sidenav/demo-sidenav.component.html | 0 .../demo-sidenav/demo-sidenav.component.scss | 0 .../demo-sidenav/demo-sidenav.component.ts | 0 .../components/demo/demo.module.ts | 0 .../highlight/highlight.component.scss | 0 .../highlight/highlight.component.ts | 0 .../components/highlight/prism-languages.ts | 0 .../material-color-picker.component.html | 0 .../material-color-picker.component.scss | 0 .../material-color-picker.component.ts | 2 +- .../nav-horizontal-collapse.component.html | 0 .../nav-horizontal-collapse.component.scss | 0 .../nav-horizontal-collapse.component.ts | 10 +- .../nav-horizontal-item.component.html | 0 .../nav-horizontal-item.component.scss | 0 .../nav-item/nav-horizontal-item.component.ts | 0 .../navigation/navigation.component.html | 0 .../navigation/navigation.component.scss | 2 +- .../navigation/navigation.component.ts | 0 .../components/navigation/navigation.model.ts | 0 .../navigation/navigation.module.ts | 0 .../navigation/navigation.service.ts | 0 .../nav-vertical-collapse.component.html | 0 .../nav-vertical-collapse.component.scss | 3 +- .../nav-vertical-collapse.component.ts | 2 +- .../nav-vertical-group.component.html | 0 .../nav-vertical-group.component.scss | 2 +- .../nav-group/nav-vertical-group.component.ts | 0 .../nav-item/nav-vertical-item.component.html | 0 .../nav-item/nav-vertical-item.component.scss | 2 +- .../nav-item/nav-vertical-item.component.ts | 0 .../search-bar/search-bar.component.html | 0 .../search-bar/search-bar.component.scss | 2 +- .../search-bar/search-bar.component.ts | 6 +- .../search-bar/search-bar.module.ts | 0 .../shortcuts/shortcuts.component.html | 0 .../shortcuts/shortcuts.component.scss | 2 +- .../shortcuts/shortcuts.component.ts | 6 +- .../components/shortcuts/shortcuts.module.ts | 0 .../components/sidebar/sidebar.component.html | 1 + .../components/sidebar/sidebar.component.scss | 59 +++ .../components/sidebar/sidebar.component.ts | 368 +++++++++++++ .../components/sidebar/sidebar.module.ts | 19 + .../components/sidebar/sidebar.service.ts | 74 +++ .../theme-options.component.html | 18 +- .../theme-options.component.scss | 2 +- .../theme-options/theme-options.component.ts | 18 +- .../widget/widget-toggle.directive.ts | 0 .../components/widget/widget.component.html | 0 .../components/widget/widget.component.scss | 0 .../components/widget/widget.component.ts | 0 .../components/widget/widget.module.ts | 0 .../fuse-if-on-dom.directive.ts | 0 .../fuse-mat-sidenav-helper.directive.ts | 0 .../fuse-mat-sidenav-helper.service.ts | 0 .../fuse-perfect-scrollbar.directive.ts | 8 +- src/@fuse/fuse.module.ts | 37 ++ src/{app/core => @fuse}/fuseUtils.ts | 0 src/{app/core => @fuse}/matColors.ts | 0 .../core => @fuse}/modules/material.module.ts | 0 .../core => @fuse}/modules/shared.module.ts | 2 - .../pipes/camelCaseToDash.pipe.ts | 0 src/{app/core => @fuse}/pipes/filter.pipe.ts | 0 src/{app/core => @fuse}/pipes/getById.pipe.ts | 0 .../pipes/htmlToPlaintext.pipe.ts | 0 src/{app/core => @fuse}/pipes/keys.pipe.ts | 0 src/{app/core => @fuse}/pipes/pipes.module.ts | 0 src/{app/core => @fuse}/scss/core.scss | 0 src/{app/core => @fuse}/scss/fuse.scss | 0 .../scss/mixins/_breakpoints.scss | 0 .../scss/partials/_angular-material-fix.scss | 0 .../core => @fuse}/scss/partials/_cards.scss | 0 .../core => @fuse}/scss/partials/_colors.scss | 0 .../core => @fuse}/scss/partials/_forms.scss | 0 .../core => @fuse}/scss/partials/_global.scss | 0 .../scss/partials/_helpers.scss | 0 .../core => @fuse}/scss/partials/_icons.scss | 0 .../scss/partials/_material.scss | 0 .../scss/partials/_navigation.scss | 0 .../scss/partials/_normalize.scss | 0 .../scss/partials/_page-layouts.scss | 0 .../core => @fuse}/scss/partials/_print.scss | 0 .../core => @fuse}/scss/partials/_reset.scss | 0 .../scss/partials/_scrollbars.scss | 0 .../scss/partials/_toolbar.scss | 0 .../scss/partials/_typography.scss | 0 .../partials/plugins/_ng-pick-datetime.scss | 0 .../partials/plugins/_ngx-color-picker.scss | 2 +- .../scss/partials/plugins/_ngx-datatable.scss | 0 .../partials/plugins/_perfect-scrollbar.scss | 0 .../scss/partials/plugins/_plugins.scss | 0 .../scss/partials/plugins/_prism.scss | 0 .../core => @fuse}/scss/variables/_theme.scss | 0 src/@fuse/services/config.service.ts | 113 ++++ .../services/match-media.service.ts | 7 +- .../services/splash-screen.service.ts | 0 .../services/translation-loader.service.ts | 0 src/app/app.component.ts | 7 +- src/app/app.module.ts | 22 +- src/app/config.ts | 17 + src/app/core/services/config.service.ts | 77 --- .../content/apps/academy/academy.module.ts | 3 +- .../content/apps/academy/course.service.ts | 5 +- .../apps/academy/course/course.component.scss | 2 +- .../apps/academy/course/course.component.ts | 8 +- .../content/apps/academy/courses.service.ts | 5 +- .../academy/courses/courses.component.scss | 2 +- .../apps/academy/courses/courses.component.ts | 2 +- src/app/main/content/apps/apps.module.ts | 4 +- .../apps/calendar/calendar.component.scss | 2 +- .../apps/calendar/calendar.component.ts | 18 +- .../content/apps/calendar/calendar.module.ts | 6 +- .../content/apps/calendar/calendar.service.ts | 3 +- .../event-form/event-form.component.scss | 2 +- .../event-form/event-form.component.ts | 16 +- .../main/content/apps/calendar/event.model.ts | 29 +- .../chat/chat-start/chat-start.component.scss | 2 +- .../chat/chat-start/chat-start.component.ts | 13 +- .../chat/chat-view/chat-view.component.ts | 6 +- .../content/apps/chat/chat.component.scss | 2 +- .../main/content/apps/chat/chat.component.ts | 4 +- src/app/main/content/apps/chat/chat.module.ts | 4 +- .../main/content/apps/chat/chat.service.ts | 8 +- .../sidenavs/left/chats/chats.component.scss | 2 +- .../sidenavs/left/chats/chats.component.ts | 8 +- .../apps/chat/sidenavs/left/left.component.ts | 4 +- .../sidenavs/left/user/user.component.scss | 2 +- .../chat/sidenavs/left/user/user.component.ts | 3 +- .../right/contact/contact.component.scss | 2 +- .../right/contact/contact.component.ts | 1 + .../chat/sidenavs/right/right.component.ts | 4 +- .../contact-form/contact-form.component.scss | 2 +- .../contact-form/contact-form.component.ts | 14 +- .../contact-list/contact-list.component.scss | 2 +- .../contact-list/contact-list.component.ts | 14 +- .../content/apps/contacts/contact.model.ts | 2 +- .../apps/contacts/contacts.component.ts | 10 +- .../content/apps/contacts/contacts.module.ts | 4 +- .../content/apps/contacts/contacts.service.ts | 8 +- .../selected-bar/selected-bar.component.scss | 2 +- .../selected-bar/selected-bar.component.ts | 14 +- .../sidenavs/main/main.component.scss | 2 +- .../contacts/sidenavs/main/main.component.ts | 4 +- .../analytics/analytics.component.scss | 2 +- .../analytics/analytics.component.ts | 2 +- .../dashboards/analytics/analytics.module.ts | 7 +- .../dashboards/analytics/analytics.service.ts | 5 +- .../dashboards/project/project.component.ts | 16 +- .../apps/dashboards/project/project.module.ts | 8 +- .../dashboards/project/project.service.ts | 5 +- .../dashboard/dashboard.component.ts | 18 +- .../e-commerce/dashboard/dashboard.service.ts | 5 +- .../apps/e-commerce/e-commerce.module.ts | 10 +- .../e-commerce/order/order.component.scss | 2 +- .../apps/e-commerce/order/order.component.ts | 18 +- .../apps/e-commerce/order/order.model.ts | 2 +- .../apps/e-commerce/order/order.service.ts | 5 +- .../e-commerce/orders/orders.component.ts | 10 +- .../apps/e-commerce/orders/orders.service.ts | 5 +- .../e-commerce/product/product.component.ts | 23 +- .../apps/e-commerce/product/product.model.ts | 3 +- .../e-commerce/product/product.service.ts | 5 +- .../products/products.component.scss | 2 +- .../e-commerce/products/products.component.ts | 15 +- .../file-list/file-list.component.scss | 2 +- .../file-list/file-list.component.ts | 7 +- .../file-manager/file-manager.component.scss | 2 +- .../file-manager/file-manager.component.ts | 6 +- .../apps/file-manager/file-manager.module.ts | 4 +- .../apps/file-manager/file-manager.service.ts | 6 +- .../sidenavs/details/details.component.ts | 4 +- .../sidenavs/main/main.component.ts | 10 +- .../dialogs/compose/compose.component.ts | 12 +- .../mail-details/mail-details.component.scss | 2 +- .../mail-details/mail-details.component.ts | 18 +- .../mail-list-item.component.scss | 2 +- .../mail-list-item.component.ts | 13 +- .../mail-list/mail-list.component.ts | 15 +- .../apps/mail-ngrx/mail.component.scss | 2 +- .../content/apps/mail-ngrx/mail.component.ts | 28 +- .../content/apps/mail-ngrx/mail.module.ts | 6 +- .../sidenavs/main/main-sidenav.component.ts | 16 +- .../mail-ngrx/store/effects/mails.effects.ts | 2 +- .../mail-ngrx/store/guards/resolve.guard.ts | 2 +- .../store/selectors/mails.selectors.ts | 3 +- .../dialogs/compose/compose.component.scss | 2 +- .../mail/dialogs/compose/compose.component.ts | 10 +- .../mail-details/mail-details.component.scss | 2 +- .../mail-details/mail-details.component.ts | 8 +- .../mail-list-item.component.scss | 2 +- .../mail-list-item.component.ts | 3 +- .../mail/mail-list/mail-list.component.ts | 10 +- .../content/apps/mail/mail.component.scss | 2 +- .../main/content/apps/mail/mail.component.ts | 10 +- src/app/main/content/apps/mail/mail.module.ts | 6 +- .../main/content/apps/mail/mail.service.ts | 11 +- .../sidenavs/main/main-sidenav.component.ts | 26 +- .../content/apps/scrumboard/board.model.ts | 3 +- .../board/add-list/add-list.component.ts | 11 +- .../scrumboard/board/board.component.scss | 2 +- .../apps/scrumboard/board/board.component.ts | 20 +- .../board/dialogs/card/card.component.scss | 2 +- .../board/dialogs/card/card.component.ts | 8 +- .../label-selector.component.ts | 17 +- .../edit-board-name.component.ts | 9 +- .../board/list/add-card/add-card.component.ts | 10 +- .../board/list/card/card.component.scss | 2 +- .../board/list/card/card.component.ts | 2 - .../edit-list-name.component.ts | 9 +- .../scrumboard/board/list/list.component.scss | 2 +- .../scrumboard/board/list/list.component.ts | 21 +- .../board-color-selector.component.ts | 16 +- .../sidenavs/settings/settings.component.ts | 14 +- .../content/apps/scrumboard/card.model.ts | 2 +- .../content/apps/scrumboard/list.model.ts | 2 +- .../apps/scrumboard/scrumboard.component.scss | 2 +- .../apps/scrumboard/scrumboard.component.ts | 18 +- .../apps/scrumboard/scrumboard.module.ts | 6 +- .../apps/scrumboard/scrumboard.service.ts | 6 +- .../sidenavs/main/main-sidenav.component.ts | 8 +- .../todo-details/todo-details.component.scss | 2 +- .../todo-details/todo-details.component.ts | 43 +- .../todo-list-item.component.scss | 2 +- .../todo-list-item.component.ts | 5 +- .../todo/todo-list/todo-list.component.ts | 12 +- .../content/apps/todo/todo.component.scss | 2 +- .../main/content/apps/todo/todo.component.ts | 22 +- src/app/main/content/apps/todo/todo.module.ts | 6 +- .../main/content/apps/todo/todo.service.ts | 36 +- .../components-third-party.module.ts | 4 +- .../google-maps/google-maps.module.ts | 6 +- .../angular-material.component.ts | 1 + .../angular-material.module.ts | 8 +- .../angular-material/example-components.ts | 212 ++++---- .../example-viewer/example-viewer.scss | 2 +- .../example-viewer/example-viewer.ts | 41 +- .../components/cards/cards.component.scss | 2 +- .../components/cards/cards.component.ts | 3 +- .../content/components/components.module.ts | 10 +- .../navigation/navigation.component.ts | 3 +- src/app/main/content/content.component.ts | 14 +- .../forgot-password-2.component.scss | 2 +- .../forgot-password-2.component.ts | 7 +- .../forgot-password-2.module.ts | 5 +- .../forgot-password.component.scss | 2 +- .../forgot-password.component.ts | 7 +- .../forgot-password/forgot-password.module.ts | 5 +- .../authentication/lock/lock.component.scss | 2 +- .../authentication/lock/lock.component.ts | 7 +- .../pages/authentication/lock/lock.module.ts | 5 +- .../login-2/login-2.component.scss | 2 +- .../login-2/login-2.component.ts | 7 +- .../authentication/login-2/login-2.module.ts | 5 +- .../authentication/login/login.component.scss | 2 +- .../authentication/login/login.component.ts | 7 +- .../authentication/login/login.module.ts | 5 +- .../mail-confirm/mail-confirm.component.scss | 2 +- .../mail-confirm/mail-confirm.component.ts | 7 +- .../mail-confirm/mail-confirm.module.ts | 5 +- .../register-2/register-2.component.scss | 2 +- .../register-2/register-2.component.ts | 7 +- .../register-2/register-2.module.ts | 5 +- .../register/register.component.scss | 2 +- .../register/register.component.ts | 7 +- .../register/register.module.ts | 5 +- .../reset-password-2.component.scss | 2 +- .../reset-password-2.component.ts | 7 +- .../reset-password-2.module.ts | 5 +- .../reset-password.component.scss | 2 +- .../reset-password.component.ts | 7 +- .../reset-password/reset-password.module.ts | 5 +- .../coming-soon/coming-soon.component.scss | 2 +- .../coming-soon/coming-soon.component.ts | 6 +- .../pages/coming-soon/coming-soon.module.ts | 5 +- .../pages/errors/404/error-404.component.scss | 2 +- .../pages/errors/404/error-404.component.ts | 12 +- .../pages/errors/404/error-404.module.ts | 5 +- .../pages/errors/500/error-500.component.scss | 2 +- .../pages/errors/500/error-500.component.ts | 12 +- .../pages/errors/500/error-500.module.ts | 5 +- .../main/content/pages/faq/faq.component.scss | 2 +- .../main/content/pages/faq/faq.component.ts | 16 +- src/app/main/content/pages/faq/faq.module.ts | 6 +- src/app/main/content/pages/faq/faq.service.ts | 5 +- .../invoices/compact/compact.component.scss | 2 +- .../invoices/compact/compact.component.ts | 1 + .../pages/invoices/compact/compact.module.ts | 7 +- .../content/pages/invoices/invoice.service.ts | 6 +- .../invoices/modern/modern.component.scss | 2 +- .../pages/invoices/modern/modern.component.ts | 1 + .../pages/invoices/modern/modern.module.ts | 7 +- .../dialogs/article/article.component.scss | 2 +- .../knowledge-base.component.scss | 2 +- .../knowledge-base.component.ts | 5 +- .../knowledge-base/knowledge-base.module.ts | 4 +- .../knowledge-base/knowledge-base.service.ts | 5 +- .../maintenance/maintenance.component.scss | 2 +- .../maintenance/maintenance.component.ts | 15 +- .../pages/maintenance/maintenence.module.ts | 5 +- .../content/pages/pricing/pricing.module.ts | 5 +- .../pricing/style-1/style-1.component.scss | 2 +- .../pricing/style-2/style-2.component.scss | 2 +- .../pricing/style-3/style-3.component.scss | 2 +- .../pages/profile/profile.component.scss | 2 +- .../pages/profile/profile.component.ts | 12 +- .../content/pages/profile/profile.module.ts | 5 +- .../content/pages/profile/profile.service.ts | 5 +- .../profile/tabs/about/about.component.scss | 2 +- .../profile/tabs/about/about.component.ts | 13 +- .../photos-videos.component.scss | 2 +- .../photos-videos/photos-videos.component.ts | 12 +- .../tabs/timeline/timeline.component.scss | 2 +- .../tabs/timeline/timeline.component.ts | 13 +- .../pages/search/search.component.scss | 2 +- .../content/pages/search/search.component.ts | 11 +- .../content/pages/search/search.module.ts | 5 +- .../content/pages/search/search.service.ts | 5 +- .../tabs/classic/classic.component.scss | 2 +- .../search/tabs/classic/classic.component.ts | 10 +- .../search/tabs/table/table.component.scss | 2 +- .../search/tabs/table/table.component.ts | 3 +- .../services/config/config.component.html | 10 +- .../main/content/services/services.module.ts | 4 +- .../content/ui/colors/colors.component.ts | 10 +- .../main/content/ui/colors/colors.module.ts | 6 +- src/app/main/content/ui/forms/forms.module.ts | 3 +- .../helper-classes/helper-classes.module.ts | 3 +- src/app/main/content/ui/icons/icons.module.ts | 4 +- .../ui/page-layouts/page-layouts.module.ts | 6 +- .../ui/typography/typography.component.ts | 8 +- .../ui/typography/typography.module.ts | 3 +- src/app/main/footer/footer.component.ts | 9 +- src/app/main/main.component.html | 33 +- src/app/main/main.component.scss | 2 +- src/app/main/main.component.ts | 23 +- src/app/main/main.module.ts | 21 +- .../navbar-horizontal.component.html | 1 - .../navbar-horizontal.component.scss | 1 - .../horizontal/navbar-horizontal.component.ts | 25 - src/app/main/navbar/navbar.component.html | 40 ++ src/app/main/navbar/navbar.component.scss | 93 ++++ src/app/main/navbar/navbar.component.ts | 30 ++ .../navbar-vertical-toggle.directive.ts | 29 -- .../vertical/navbar-vertical.component.html | 20 - .../vertical/navbar-vertical.component.scss | 159 ------ .../vertical/navbar-vertical.component.ts | 279 ---------- .../vertical/navbar-vertical.service.ts | 21 - .../main/quick-panel/quick-panel.component.ts | 1 - src/app/main/toolbar/toolbar.component.html | 3 +- src/app/main/toolbar/toolbar.component.scss | 2 +- src/app/main/toolbar/toolbar.component.ts | 14 +- src/app/navigation/navigation.model.ts | 3 +- src/styles.scss | 2 +- tsconfig.json | 52 +- 367 files changed, 2123 insertions(+), 1914 deletions(-) rename src/{app/core/animations.ts => @fuse/animations/index.ts} (100%) rename src/{app/core => @fuse}/components/confirm-dialog/confirm-dialog.component.html (100%) rename src/{app/core => @fuse}/components/confirm-dialog/confirm-dialog.component.scss (100%) rename src/{app/core => @fuse}/components/confirm-dialog/confirm-dialog.component.ts (100%) rename src/{app/core => @fuse}/components/copier/copier.service.ts (100%) rename src/{app/core => @fuse}/components/countdown/countdown.component.html (100%) rename src/{app/core => @fuse}/components/countdown/countdown.component.scss (100%) rename src/{app/core => @fuse}/components/countdown/countdown.component.ts (100%) rename src/{app/core => @fuse}/components/demo/demo-content/demo-content.component.html (100%) rename src/{app/core => @fuse}/components/demo/demo-content/demo-content.component.scss (100%) rename src/{app/core => @fuse}/components/demo/demo-content/demo-content.component.ts (100%) rename src/{app/core => @fuse}/components/demo/demo-sidenav/demo-sidenav.component.html (100%) rename src/{app/core => @fuse}/components/demo/demo-sidenav/demo-sidenav.component.scss (100%) rename src/{app/core => @fuse}/components/demo/demo-sidenav/demo-sidenav.component.ts (100%) rename src/{app/core => @fuse}/components/demo/demo.module.ts (100%) rename src/{app/core => @fuse}/components/highlight/highlight.component.scss (100%) rename src/{app/core => @fuse}/components/highlight/highlight.component.ts (100%) rename src/{app/core => @fuse}/components/highlight/prism-languages.ts (100%) rename src/{app/core => @fuse}/components/material-color-picker/material-color-picker.component.html (100%) rename src/{app/core => @fuse}/components/material-color-picker/material-color-picker.component.scss (100%) rename src/{app/core => @fuse}/components/material-color-picker/material-color-picker.component.ts (98%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html (100%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss (100%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts (83%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html (100%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss (100%) rename src/{app/core => @fuse}/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts (100%) rename src/{app/core => @fuse}/components/navigation/navigation.component.html (100%) rename src/{app/core => @fuse}/components/navigation/navigation.component.scss (60%) rename src/{app/core => @fuse}/components/navigation/navigation.component.ts (100%) rename src/{app/core => @fuse}/components/navigation/navigation.model.ts (100%) rename src/{app/core => @fuse}/components/navigation/navigation.module.ts (100%) rename src/{app/core => @fuse}/components/navigation/navigation.service.ts (100%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html (100%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss (95%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts (98%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-group/nav-vertical-group.component.html (100%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-group/nav-vertical-group.component.scss (92%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-group/nav-vertical-group.component.ts (100%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-item/nav-vertical-item.component.html (100%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-item/nav-vertical-item.component.scss (85%) rename src/{app/core => @fuse}/components/navigation/vertical/nav-item/nav-vertical-item.component.ts (100%) rename src/{app/core => @fuse}/components/search-bar/search-bar.component.html (100%) rename src/{app/core => @fuse}/components/search-bar/search-bar.component.scss (98%) rename src/{app/core => @fuse}/components/search-bar/search-bar.component.ts (90%) rename src/{app/core => @fuse}/components/search-bar/search-bar.module.ts (100%) rename src/{app/core => @fuse}/components/shortcuts/shortcuts.component.html (100%) rename src/{app/core => @fuse}/components/shortcuts/shortcuts.component.scss (93%) rename src/{app/core => @fuse}/components/shortcuts/shortcuts.component.ts (97%) rename src/{app/core => @fuse}/components/shortcuts/shortcuts.module.ts (100%) create mode 100644 src/@fuse/components/sidebar/sidebar.component.html create mode 100644 src/@fuse/components/sidebar/sidebar.component.scss create mode 100644 src/@fuse/components/sidebar/sidebar.component.ts create mode 100644 src/@fuse/components/sidebar/sidebar.module.ts create mode 100644 src/@fuse/components/sidebar/sidebar.service.ts rename src/{app/core => @fuse}/components/theme-options/theme-options.component.html (83%) rename src/{app/core => @fuse}/components/theme-options/theme-options.component.scss (98%) rename src/{app/core => @fuse}/components/theme-options/theme-options.component.ts (88%) rename src/{app/core => @fuse}/components/widget/widget-toggle.directive.ts (100%) rename src/{app/core => @fuse}/components/widget/widget.component.html (100%) rename src/{app/core => @fuse}/components/widget/widget.component.scss (100%) rename src/{app/core => @fuse}/components/widget/widget.component.ts (100%) rename src/{app/core => @fuse}/components/widget/widget.module.ts (100%) rename src/{app/core => @fuse}/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts (100%) rename src/{app/core => @fuse}/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts (100%) rename src/{app/core => @fuse}/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts (100%) rename src/{app/core => @fuse}/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts (96%) create mode 100644 src/@fuse/fuse.module.ts rename src/{app/core => @fuse}/fuseUtils.ts (100%) rename src/{app/core => @fuse}/matColors.ts (100%) rename src/{app/core => @fuse}/modules/material.module.ts (100%) rename src/{app/core => @fuse}/modules/shared.module.ts (95%) rename src/{app/core => @fuse}/pipes/camelCaseToDash.pipe.ts (100%) rename src/{app/core => @fuse}/pipes/filter.pipe.ts (100%) rename src/{app/core => @fuse}/pipes/getById.pipe.ts (100%) rename src/{app/core => @fuse}/pipes/htmlToPlaintext.pipe.ts (100%) rename src/{app/core => @fuse}/pipes/keys.pipe.ts (100%) rename src/{app/core => @fuse}/pipes/pipes.module.ts (100%) rename src/{app/core => @fuse}/scss/core.scss (100%) rename src/{app/core => @fuse}/scss/fuse.scss (100%) rename src/{app/core => @fuse}/scss/mixins/_breakpoints.scss (100%) rename src/{app/core => @fuse}/scss/partials/_angular-material-fix.scss (100%) rename src/{app/core => @fuse}/scss/partials/_cards.scss (100%) rename src/{app/core => @fuse}/scss/partials/_colors.scss (100%) rename src/{app/core => @fuse}/scss/partials/_forms.scss (100%) rename src/{app/core => @fuse}/scss/partials/_global.scss (100%) rename src/{app/core => @fuse}/scss/partials/_helpers.scss (100%) rename src/{app/core => @fuse}/scss/partials/_icons.scss (100%) rename src/{app/core => @fuse}/scss/partials/_material.scss (100%) rename src/{app/core => @fuse}/scss/partials/_navigation.scss (100%) rename src/{app/core => @fuse}/scss/partials/_normalize.scss (100%) rename src/{app/core => @fuse}/scss/partials/_page-layouts.scss (100%) rename src/{app/core => @fuse}/scss/partials/_print.scss (100%) rename src/{app/core => @fuse}/scss/partials/_reset.scss (100%) rename src/{app/core => @fuse}/scss/partials/_scrollbars.scss (100%) rename src/{app/core => @fuse}/scss/partials/_toolbar.scss (100%) rename src/{app/core => @fuse}/scss/partials/_typography.scss (100%) rename src/{app/core => @fuse}/scss/partials/plugins/_ng-pick-datetime.scss (100%) rename src/{app/core => @fuse}/scss/partials/plugins/_ngx-color-picker.scss (95%) rename src/{app/core => @fuse}/scss/partials/plugins/_ngx-datatable.scss (100%) rename src/{app/core => @fuse}/scss/partials/plugins/_perfect-scrollbar.scss (100%) rename src/{app/core => @fuse}/scss/partials/plugins/_plugins.scss (100%) rename src/{app/core => @fuse}/scss/partials/plugins/_prism.scss (100%) rename src/{app/core => @fuse}/scss/variables/_theme.scss (100%) create mode 100644 src/@fuse/services/config.service.ts rename src/{app/core => @fuse}/services/match-media.service.ts (66%) rename src/{app/core => @fuse}/services/splash-screen.service.ts (100%) rename src/{app/core => @fuse}/services/translation-loader.service.ts (100%) create mode 100644 src/app/config.ts delete mode 100644 src/app/core/services/config.service.ts delete mode 100644 src/app/main/navbar/horizontal/navbar-horizontal.component.html delete mode 100644 src/app/main/navbar/horizontal/navbar-horizontal.component.scss delete mode 100644 src/app/main/navbar/horizontal/navbar-horizontal.component.ts create mode 100644 src/app/main/navbar/navbar.component.html create mode 100644 src/app/main/navbar/navbar.component.scss create mode 100644 src/app/main/navbar/navbar.component.ts delete mode 100644 src/app/main/navbar/vertical/navbar-vertical-toggle.directive.ts delete mode 100644 src/app/main/navbar/vertical/navbar-vertical.component.html delete mode 100644 src/app/main/navbar/vertical/navbar-vertical.component.scss delete mode 100644 src/app/main/navbar/vertical/navbar-vertical.component.ts delete mode 100644 src/app/main/navbar/vertical/navbar-vertical.service.ts diff --git a/package-lock.json b/package-lock.json index dc5c6681..efc8b820 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.3.6", + "version": "1.3.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -9,33 +9,67 @@ "resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.2.tgz", "integrity": "sha512-3bdfvkWDmJszpj/F6Fzgv7sks0cs/cUEQPfs37tcJFz3jc62SsXy4TGb/WJT8FpH2nSGE6DonP8lXuFxB0lblQ==" }, + "@angular-devkit/build-optimizer": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.42.tgz", + "integrity": "sha512-BAYCVZ10ro6mgZQDZiNiVbX8ppygw4q7z/stpwG8WjMswgMRIcxsxYoC1VFuWcUPAf4UyfTIav6e8UZWA5+xnQ==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "source-map": "0.5.7", + "typescript": "2.6.2", + "webpack-sources": "1.1.0" + } + }, + "@angular-devkit/core": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.29.tgz", + "integrity": "sha512-jtUBA0pIrkdXcVqDmDrGlniqwM7NFOKdo7vWFDmCVLBbC9rZHeYW5Xv/+4HyBhGLJ4wxsAkUjsHKWGJINPPpiw==", + "dev": true, + "requires": { + "ajv": "5.5.2", + "chokidar": "1.7.0", + "rxjs": "5.5.6", + "source-map": "0.5.7" + } + }, + "@angular-devkit/schematics": { + "version": "0.0.52", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.52.tgz", + "integrity": "sha512-NtG8VB5aWtg0cw1Y7EJinJMuAnXsNdkQkkVe/i7CO6TPLyFQSFQCN1YojCr43l8jTWTRebRslrBawPCMOxsOgw==", + "dev": true, + "requires": { + "@ngtools/json-schema": "1.1.0", + "rxjs": "5.5.6" + } + }, "@angular/animations": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.3.tgz", - "integrity": "sha512-K9rOsRGwt7Zmp/rNdvBmgBKqvEdgCyZF0kvwxrmZfq1Zj0GAkfTAKPL007493O6XFd+icfu/+kmYeqXBGB4gKA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.4.tgz", + "integrity": "sha512-kLOUORV/2GdYsNSwmUsB3eEL+nAoBZYKgibYLkVy6oecrIbdFMWiNzLcFjX/avcMnb1UNMk24Hd7Of4C2UawPA==", "requires": { "tslib": "1.9.0" } }, "@angular/cdk": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.1.1.tgz", - "integrity": "sha512-V8kQmwf1PhtxiiE0cS1x9SW7/VFrJ7LcL9RqxUOMmJMl8kVR43dQBEeuVOOYJlGo9LAR5ctfemlJHwd9+PoHew==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.0.tgz", + "integrity": "sha1-Q2j2dJ6RXNzHXTJa4z/bP4WogQg=", "requires": { "tslib": "1.9.0" } }, "@angular/cli": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.7.tgz", - "integrity": "sha512-TprSjnQrEdrTsCAB5K/lCLuXZUH/y+l/BAR0aZLpubpZP8Ldgmq7q56trxL5wNSs3o6A8Vh43ZKNYOuKtnzlXQ==", + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.8.tgz", + "integrity": "sha512-/cqk7CoChwyEPav+NRzv6esZwXXxg2RszRCtPMKlIPNw9y/nleZFXka2igfJrxsjcMI5WN6z9gYvJRI7qF7RJA==", "dev": true, "requires": { "@angular-devkit/build-optimizer": "0.0.42", "@angular-devkit/core": "0.0.29", "@angular-devkit/schematics": "0.0.52", "@ngtools/json-schema": "1.1.0", - "@ngtools/webpack": "1.9.7", + "@ngtools/webpack": "1.9.8", "@schematics/angular": "0.1.17", "autoprefixer": "7.2.5", "chalk": "2.2.2", @@ -68,7 +102,7 @@ "opn": "5.1.0", "portfinder": "1.0.13", "postcss-import": "11.0.0", - "postcss-loader": "2.0.10", + "postcss-loader": "2.1.0", "postcss-url": "7.3.0", "raw-loader": "0.5.1", "resolve": "1.5.0", @@ -80,7 +114,7 @@ "style-loader": "0.13.2", "stylus": "0.54.5", "stylus-loader": "3.0.1", - "uglifyjs-webpack-plugin": "1.1.6", + "uglifyjs-webpack-plugin": "1.1.8", "url-loader": "0.6.2", "webpack": "3.10.0", "webpack-dev-middleware": "1.12.2", @@ -88,95 +122,28 @@ "webpack-merge": "4.1.1", "webpack-sources": "1.1.0", "webpack-subresource-integrity": "1.0.3" - }, - "dependencies": { - "@angular-devkit/build-optimizer": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.42.tgz", - "integrity": "sha512-BAYCVZ10ro6mgZQDZiNiVbX8ppygw4q7z/stpwG8WjMswgMRIcxsxYoC1VFuWcUPAf4UyfTIav6e8UZWA5+xnQ==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.6.2", - "webpack-sources": "1.1.0" - } - }, - "@angular-devkit/core": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.29.tgz", - "integrity": "sha512-jtUBA0pIrkdXcVqDmDrGlniqwM7NFOKdo7vWFDmCVLBbC9rZHeYW5Xv/+4HyBhGLJ4wxsAkUjsHKWGJINPPpiw==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "chokidar": "1.7.0", - "rxjs": "5.5.6", - "source-map": "0.5.7" - } - }, - "@angular-devkit/schematics": { - "version": "0.0.52", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.52.tgz", - "integrity": "sha512-NtG8VB5aWtg0cw1Y7EJinJMuAnXsNdkQkkVe/i7CO6TPLyFQSFQCN1YojCr43l8jTWTRebRslrBawPCMOxsOgw==", - "dev": true, - "requires": { - "@ngtools/json-schema": "1.1.0", - "rxjs": "5.5.6" - } - }, - "@ngtools/webpack": { - "version": "1.9.7", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.7.tgz", - "integrity": "sha512-D5QuaT9wENeM2j9g2qvW9Ls1tGqRz26Lp+jxwb2ZGFep7Ik1fFOX3ROLfgkxNlxZGVmbxJjsfrYUCyGlzj8gWg==", - "dev": true, - "requires": { - "chalk": "2.2.2", - "enhanced-resolve": "3.4.1", - "loader-utils": "1.1.0", - "magic-string": "0.22.4", - "semver": "5.5.0", - "source-map": "0.5.7", - "tree-kill": "1.2.0", - "webpack-sources": "1.1.0" - } - }, - "@schematics/angular": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.17.tgz", - "integrity": "sha512-PHE5gk/ogPY/aN94dbbtauHMCq+/7w4Kdcl7tGmSS8mPKEI0wa6XJi//Wq/tHi55lb2fP58oEZU6n6w/wQascw==", - "dev": true, - "requires": { - "typescript": "2.6.2" - } - }, - "typescript": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", - "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", - "dev": true - } } }, "@angular/common": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.3.tgz", - "integrity": "sha512-RwQ/IjmpDdMecTz/wwQlKpHgF4Crr8kyqV9FJ+c+cHR8Riqlu2DOXSU7LIfDdGoo6Mpixdxd1rtHYfs7l9YBSA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.4.tgz", + "integrity": "sha512-PNtg7lzCBUgYo5Rj+/j11EVKhLfrUkkh81ecBwexk6VcDJebmvBO1HdGppV5UPzEH/StL1mTwLc95dOI0hHSJA==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.3.tgz", - "integrity": "sha512-OynSzUdEHwajQMoV2JuYq5IdiR2dlTCTAHhTLzrym85wOihvTvovEQwVhYYHyKERu85JIoaF1sXA42KIjMGfkw==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.4.tgz", + "integrity": "sha512-KFaGcm/5OKJRxXIxrS53IYPtqta9u2xLLedrWspxIvI59ImfzeZGnLGPhfrI0pbK7wY0rJ5YdGYQnzq33dh01A==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler-cli": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.3.tgz", - "integrity": "sha512-uoCxeyQSd8R/cwEbd0FIUXjnbPq0HXEsyu3WSu9Ek2jt52HL+x/gZQdFCRtjW/mvQNOqxrgrTtEkhJ398+VkXg==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.4.tgz", + "integrity": "sha512-nODdd7EuGzk1ME5UzpVa/lN1oKNypRt2oZoNYOkgNO2TQWD1jqOcozruit1eOEFHQhXO2JvPTzlt1dd6viHSCQ==", "dev": true, "requires": { "chokidar": "1.7.0", @@ -194,9 +161,9 @@ } }, "@angular/core": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.3.tgz", - "integrity": "sha512-tL9O8KA6KGjnlxqjuTytpC2OeKbxe/yHev0kmwo5CK0lDZU4UFetcItAzUXU1dyRuILTcBkbnFt9+nr1SZs/cQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.4.tgz", + "integrity": "sha512-GPnxUf7g8Mz0AUttKKcqaw0m2xZujwwzojkg3xUIvHrNFFF5/HH5549PfnE1jD7qkmnDFx5j3IPuNkwYHW6XvA==", "requires": { "tslib": "1.9.0" } @@ -210,63 +177,63 @@ } }, "@angular/forms": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.3.tgz", - "integrity": "sha512-PsMGbj/Slvsxxyl61QSSSFDCGHN1XK6kNxVQTVmAlVhP1LlaYqBOIgQy4K9CYWUeHqU/YCdhVaFb5quzZLtPYA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.4.tgz", + "integrity": "sha512-0k6rs2k85wcBq0WPAjxNbtBu1wq/1fUSFaBLbpnrwwHeCLJI5aAjG2/f3jv/17a/ek7/WZ3lxXtHzNMMdaD/Iw==", "requires": { "tslib": "1.9.0" } }, "@angular/http": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.3.tgz", - "integrity": "sha512-3kAj7YYws8J2zRu46fEXk6lYrgSK9s5YA6O4REZkLox/suK0wb6TsDIIhoMzScGctSzZESVyuWsvYMrDYCflPA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.4.tgz", + "integrity": "sha512-WjZTNqHw9cT/mIRenIGKKlJRdm9ZdDl7IqnX+OnAdO/c6hmoQwy9fkSLRLmcXw4FBM+ASfjWu4ybodaZ8Tv6xQ==", "requires": { "tslib": "1.9.0" } }, "@angular/language-service": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.3.tgz", - "integrity": "sha512-yBi8i2rUdq6WgYn2J+82QxqhKsl2ldH7/8Lk4ZQDbKgTBx5LmYLpNGg3TJGnZEUGtKhu8Rd1E3SBmc4qqrGXsQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.4.tgz", + "integrity": "sha512-slze+UcBzm+p/pAIGxah3errOlWsUVJ5I4RNgErmR3rlylt5YNWNM/LClbDVGk8zoW+NBg0fwIxUbqK6qnk5Cw==", "dev": true }, "@angular/material": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.1.1.tgz", - "integrity": "sha512-RC3xkbX35daNq4w+XBmm+Vgi16TJvLbSkw5xkdxCqLSysFx9ymwDOjUbLeHt2nJtvYWvnSjuVukdSAeaBknTFg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.0.tgz", + "integrity": "sha1-hZnjFJ1ISH4+kulB+p3FUXbjoM8=", "requires": { "tslib": "1.9.0" } }, "@angular/material-moment-adapter": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.1.1.tgz", - "integrity": "sha512-1wpISrZOHmcC2o0tmOHX2Lt726WFUZxQs0iYe3x2yHVuxoV2W8gy0unfPkSyaZQ9v68o9xQ3DQEhSByPhr0tZg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.0.tgz", + "integrity": "sha1-gIDjS0bDWGzTnkZkJmfIAE+kuHs=", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.3.tgz", - "integrity": "sha512-60LgA4KK3BufBR7vwwcn3zTYuLlfDG3jFip7bvdgsDpURrUB0j6/pL5cbGElww4jnnxZ72uJzJRzSiGEofjc3g==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.4.tgz", + "integrity": "sha512-chv6h2aHQ/QoVA4Y6rpPpSju7vyLg/iMh516GxpGYVk6bHEdrH9pHJPulPcrt/LTd7lMAAHE3YmvYWVU6aDsaQ==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.3.tgz", - "integrity": "sha512-PheS+KJQJiyvQg1lr+eX0/1b/rjLnDjgI1qvzwikrvGYymb2JdZ+rjllHBs1iotzQ+tG+hRnlktvgdFN134x/g==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.4.tgz", + "integrity": "sha512-B3pv6FUTWA1daDYhx6b77FCFCzHQPuCyrsJQwMSSu6Xt+CYn2gc3dS0ph3B6cV6mnt1qIbEpML+Vp5Bi9x0Mkw==", "requires": { "tslib": "1.9.0" } }, "@angular/router": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.3.tgz", - "integrity": "sha512-XVEpwNZta76FYas1gZSSGvkQoiGgQjvXfab6CwOh958d4c0C+9pJsykqsv6X/n8TSTShQt7wjs/vp/copXeuoA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.4.tgz", + "integrity": "sha512-sg3iCThhbfv/6zARdKbHNLc7Xe1Rt1deit55b3K+WlrHX7GhsuJPLcitrNaADIcgDKbNT9XrwBaNirAEip9hxA==", "requires": { "tslib": "1.9.0" } @@ -303,11 +270,36 @@ "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", "dev": true }, + "@ngtools/webpack": { + "version": "1.9.8", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.8.tgz", + "integrity": "sha512-V4cFDBpWMU11KWod4qW3rJ00dBeBKYxwzD2r2kwDQl5NogVTeBacz2gq6udUfwJ/yMxJTTFdpV7NKsydTb0BoA==", + "dev": true, + "requires": { + "chalk": "2.2.2", + "enhanced-resolve": "3.4.1", + "loader-utils": "1.1.0", + "magic-string": "0.22.4", + "semver": "5.5.0", + "source-map": "0.5.7", + "tree-kill": "1.2.0", + "webpack-sources": "1.1.0" + } + }, "@ngx-translate/core": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-9.1.1.tgz", "integrity": "sha1-rhA5KINrip4Gn9Li52+iGYzH5ig=" }, + "@schematics/angular": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.17.tgz", + "integrity": "sha512-PHE5gk/ogPY/aN94dbbtauHMCq+/7w4Kdcl7tGmSS8mPKEI0wa6XJi//Wq/tHi55lb2fP58oEZU6n6w/wQascw==", + "dev": true, + "requires": { + "typescript": "2.6.2" + } + }, "@swimlane/ngx-charts": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.0.1.tgz", @@ -355,9 +347,9 @@ } }, "@types/node": { - "version": "6.0.96", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.96.tgz", - "integrity": "sha512-fsOOY6tMQ3jCB2wD51XFDmmpgm4wVKkJECdcVRqapbJEa7awJDcr+SaH8toz+4r4KW8YQ3M7ybXMoSDo1QGewA==", + "version": "6.0.98", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.98.tgz", + "integrity": "sha512-Pzldp01+6TyKlTBlp+i4RzFCuwjOpHxcfEnB74IedyEUqil2uLVg7jelYKS3Ik9/M4WzIK5N9RdtZg6UByyPEg==", "dev": true }, "@types/prismjs": { @@ -885,10 +877,10 @@ "dev": true, "requires": { "browserslist": "2.11.3", - "caniuse-lite": "1.0.30000792", + "caniuse-lite": "1.0.30000804", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "6.0.16", + "postcss": "6.0.17", "postcss-value-parser": "3.3.0" } }, @@ -1066,7 +1058,7 @@ "component-emitter": "1.2.1", "define-property": "1.0.0", "isobject": "3.0.1", - "mixin-deep": "1.3.0", + "mixin-deep": "1.3.1", "pascalcase": "0.1.1" }, "dependencies": { @@ -1269,7 +1261,7 @@ "deep-equal": "1.0.1", "dns-equal": "1.0.0", "dns-txt": "2.0.2", - "multicast-dns": "6.2.2", + "multicast-dns": "6.2.3", "multicast-dns-service-types": "1.1.0" } }, @@ -1531,8 +1523,8 @@ "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000792", - "electron-to-chromium": "1.3.31" + "caniuse-lite": "1.0.30000804", + "electron-to-chromium": "1.3.33" } }, "buffer": { @@ -1609,12 +1601,12 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "lru-cache": "4.1.1", - "mississippi": "1.3.0", + "mississippi": "1.3.1", "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", "rimraf": "2.6.2", - "ssri": "5.1.0", + "ssri": "5.2.1", "unique-filename": "1.1.0", "y18n": "3.2.1" } @@ -1689,7 +1681,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000794", + "caniuse-db": "1.0.30000804", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -1700,22 +1692,22 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000794", - "electron-to-chromium": "1.3.31" + "caniuse-db": "1.0.30000804", + "electron-to-chromium": "1.3.33" } } } }, "caniuse-db": { - "version": "1.0.30000794", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000794.tgz", - "integrity": "sha1-u+cRBPonfOSzYjh9VJBei4jlLzU=", + "version": "1.0.30000804", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000804.tgz", + "integrity": "sha1-hP60IBj8ZM9q/2Nx5DEV8pLAAXk=", "dev": true }, "caniuse-lite": { - "version": "1.0.30000792", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz", - "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=", + "version": "1.0.30000804", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000804.tgz", + "integrity": "sha512-HDZPSHLi18Bac8YU+bDJPtJLf19DwoNTM7Qp1alhltYW9FxNUlwCgk1xk92H0hB+xiKW4Jb9LXQv6M+riQyxFg==", "dev": true }, "caseless": { @@ -2606,7 +2598,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -2725,7 +2717,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000794", + "caniuse-db": "1.0.30000804", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -2738,8 +2730,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000794", - "electron-to-chromium": "1.3.31" + "caniuse-db": "1.0.30000804", + "electron-to-chromium": "1.3.33" } }, "chalk": { @@ -2776,7 +2768,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -3556,9 +3548,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.31", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz", - "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==", + "version": "1.3.33", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz", + "integrity": "sha1-vwBwPWKnxlI4E2V4w1LWxcBCpUU=", "dev": true }, "elliptic": { @@ -5866,7 +5858,7 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.8" + "uglify-js": "3.3.9" }, "dependencies": { "commander": { @@ -5991,9 +5983,9 @@ } }, "http-parser-js": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz", - "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=", + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz", + "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=", "dev": true }, "http-proxy": { @@ -6107,7 +6099,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { - "postcss": "6.0.16" + "postcss": "6.0.17" } }, "ieee754": { @@ -6851,9 +6843,9 @@ "dev": true }, "js-base64": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.2.tgz", - "integrity": "sha512-lLkz3IRPTNeATsKQGeltbzRK/5+bWsXBHfpZrxJAi4N30RtCtNA+rJznp4uR2+4OgkBsoeeFwONVLr4gzIVErQ==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", + "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==", "dev": true }, "js-tokens": { @@ -7296,9 +7288,9 @@ "dev": true }, "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", + "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", "dev": true, "optional": true }, @@ -7674,7 +7666,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, "memory-fs": { @@ -7778,9 +7770,9 @@ } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, "minimalistic-assert": { @@ -7811,9 +7803,9 @@ "dev": true }, "mississippi": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz", - "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz", + "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==", "dev": true, "requires": { "concat-stream": "1.6.0", @@ -7829,9 +7821,9 @@ } }, "mixin-deep": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz", - "integrity": "sha512-dgaCvoh6i1nosAUBKb0l0pfJ78K8+S9fluyIR2YvAeUD/QuMahnFnF3xYty5eYXMjhGSsB0DsW6A0uAZyetoAg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "dev": true, "requires": { "for-in": "1.0.2", @@ -7960,13 +7952,13 @@ "dev": true }, "multicast-dns": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz", - "integrity": "sha512-xTO41ApiRHMVDBYhNL9bEhx7kRf1hq3OqPOnOy8bpTi0JZSxVPDre7ZRpTHLDlxmhf6d/FL+10E8VX1QRd+0DA==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", + "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { "dns-packet": "1.3.1", - "thunky": "0.1.0" + "thunky": "1.0.2" } }, "multicast-dns-service-types": { @@ -8079,9 +8071,9 @@ } }, "node-forge": { - "version": "0.6.33", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", - "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz", + "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=", "dev": true }, "node-gyp": { @@ -8149,7 +8141,7 @@ "stream-browserify": "2.0.1", "stream-http": "2.8.0", "string_decoder": "1.0.3", - "timers-browserify": "2.0.4", + "timers-browserify": "2.0.6", "tty-browserify": "0.0.0", "url": "0.11.0", "util": "0.10.3", @@ -8178,7 +8170,7 @@ "in-publish": "2.0.0", "lodash.assign": "4.2.0", "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.0", + "lodash.mergewith": "4.6.1", "meow": "3.7.0", "mkdirp": "0.5.1", "nan": "2.8.0", @@ -9088,9 +9080,9 @@ "dev": true }, "postcss": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", - "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "dev": true, "requires": { "chalk": "2.3.0", @@ -9188,7 +9180,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9255,7 +9247,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9321,7 +9313,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9386,7 +9378,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9451,7 +9443,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9516,7 +9508,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9581,7 +9573,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9647,7 +9639,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9713,7 +9705,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9735,7 +9727,7 @@ "integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=", "dev": true, "requires": { - "postcss": "6.0.16", + "postcss": "6.0.17", "postcss-value-parser": "3.3.0", "read-cache": "1.0.0", "resolve": "1.5.0" @@ -9774,15 +9766,27 @@ } }, "postcss-loader": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.10.tgz", - "integrity": "sha512-xQaDcEgJ/2JqFY18zpFkik8vyYs7oS5ZRbrjvDqkP97k2wYWfPT4+qA0m4o3pTSCsz0u26PNqs8ZO9FRUWAqrA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.0.tgz", + "integrity": "sha512-S/dKzpDwGFmP9g8eyCu9sUIV+/+3UooeTpYlsKf23qKDdrhHuA4pTSfytVu0rEJ0iDqUavXrgtOPq5KhNyNMOw==", "dev": true, "requires": { "loader-utils": "1.1.0", - "postcss": "6.0.16", + "postcss": "6.0.17", "postcss-load-config": "1.2.0", - "schema-utils": "0.3.0" + "schema-utils": "0.4.3" + }, + "dependencies": { + "schema-utils": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz", + "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==", + "dev": true, + "requires": { + "ajv": "5.5.2", + "ajv-keywords": "2.1.1" + } + } } }, "postcss-merge-idents": { @@ -9836,7 +9840,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9901,7 +9905,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -9942,8 +9946,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000794", - "electron-to-chromium": "1.3.31" + "caniuse-db": "1.0.30000804", + "electron-to-chromium": "1.3.33" } }, "chalk": { @@ -9980,7 +9984,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10053,7 +10057,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10119,7 +10123,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10187,7 +10191,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10255,7 +10259,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10277,7 +10281,7 @@ "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", "dev": true, "requires": { - "postcss": "6.0.16" + "postcss": "6.0.17" } }, "postcss-modules-local-by-default": { @@ -10287,7 +10291,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.16" + "postcss": "6.0.17" } }, "postcss-modules-scope": { @@ -10297,7 +10301,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.16" + "postcss": "6.0.17" } }, "postcss-modules-values": { @@ -10307,7 +10311,7 @@ "dev": true, "requires": { "icss-replace-symbols": "1.1.0", - "postcss": "6.0.16" + "postcss": "6.0.17" } }, "postcss-normalize-charset": { @@ -10359,7 +10363,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10427,7 +10431,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10493,7 +10497,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10559,7 +10563,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10624,7 +10628,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10691,7 +10695,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10770,7 +10774,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10837,7 +10841,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -10862,7 +10866,7 @@ "mime": "1.6.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", - "postcss": "6.0.16", + "postcss": "6.0.17", "xxhashjs": "0.2.2" } }, @@ -10923,7 +10927,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -11009,7 +11013,7 @@ "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", "dev": true, "requires": { - "@types/node": "6.0.96", + "@types/node": "6.0.98", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.43", "blocking-proxy": "0.0.5", @@ -11870,7 +11874,7 @@ "dev": true, "optional": true, "requires": { - "js-base64": "2.4.2", + "js-base64": "2.4.3", "source-map": "0.4.4" }, "dependencies": { @@ -11922,12 +11926,12 @@ } }, "selfsigned": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.1.tgz", - "integrity": "sha1-v4y3uDJWxFUeMTR8YxF3jbme7FI=", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.2.tgz", + "integrity": "sha1-tESVgNmZKbZbEKSDiTAaZZIIh1g=", "dev": true, "requires": { - "node-forge": "0.6.33" + "node-forge": "0.7.1" } }, "semver": { @@ -12577,9 +12581,9 @@ } }, "ssri": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.1.0.tgz", - "integrity": "sha512-TevC8fgxQKTfQ1nWtM9GNzr3q5rrHNntG9CDMH1k3QhSZI6Kb+NbjLRs8oPFZa2Hgo7zoekL+UTvoEk7tsbjQg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.1.tgz", + "integrity": "sha512-y4PjOWlAuxt+yAcXitQYOnOzZpKaH3+f/qGV3OWxbyC2noC9FA9GNC9uILnVdV7jruA1aDKr4OKz3ZDBcVZwFQ==", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -13002,9 +13006,9 @@ "optional": true }, "thunky": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz", + "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=", "dev": true }, "ticky": { @@ -13019,9 +13023,9 @@ "dev": true }, "timers-browserify": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz", - "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz", + "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==", "dev": true, "requires": { "setimmediate": "1.0.5" @@ -13441,9 +13445,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz", - "integrity": "sha512-X0jAGtpSZRtd4RhbVNuGHyjZNa/h2MrVkKrR3Ew5iL2MJw6d7FmBke+fhVCALWySv1ygHnjjROG1KI1FAPvddw==", + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.9.tgz", + "integrity": "sha512-J2t8B5tj9JdPTW4+sNZXmiIWHzTvcoITkaqzTiilu/biZF/9crqf/Fi7k5hqbOmVRh9/hVNxAxBYIMF7N6SqMQ==", "dev": true, "requires": { "commander": "2.13.0", @@ -13466,9 +13470,9 @@ "optional": true }, "uglifyjs-webpack-plugin": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz", - "integrity": "sha512-VUja+7rYbznEvUaeb8IxOCTUrq4BCb1ml0vffa+mfwKtrAwlqnU0ENF14DtYltV1cxd/HSuK51CCA/D/8kMQVw==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz", + "integrity": "sha512-XG8/QmR1pyPeE1kj2aigo5kos8umefB31zW+PMvAAytHSB0T/vQvN6sqt8+Sh+y0b0A7zlmxNi2dzRnj0wcqGA==", "dev": true, "requires": { "cacache": "10.0.2", @@ -13476,7 +13480,7 @@ "schema-utils": "0.4.3", "serialize-javascript": "1.4.0", "source-map": "0.6.1", - "uglify-es": "3.3.8", + "uglify-es": "3.3.9", "webpack-sources": "1.1.0", "worker-farm": "1.5.2" }, @@ -13498,9 +13502,9 @@ "dev": true }, "uglify-es": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.8.tgz", - "integrity": "sha512-j8li0jWcAN6yBuAVYFZEFyYINZAm4WEdMwkA6qXFi4TLrze3Mp0Le7QjW6LR9HQjQJ2zRa9VgnFLs3PatijWOw==", + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "dev": true, "requires": { "commander": "2.13.0", @@ -14411,7 +14415,7 @@ "loglevel": "1.6.1", "opn": "5.1.0", "portfinder": "1.0.13", - "selfsigned": "1.10.1", + "selfsigned": "1.10.2", "serve-index": "1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.1.4", @@ -14791,7 +14795,7 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.9", + "http-parser-js": "0.4.10", "websocket-extensions": "0.1.3" } }, diff --git a/package.json b/package.json index 28fc82ee..39783d79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.3.6", + "version": "1.3.7", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", @@ -19,19 +19,19 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "5.2.3", - "@angular/cdk": "5.1.1", - "@angular/common": "5.2.3", - "@angular/compiler": "5.2.3", - "@angular/core": "5.2.3", + "@angular/animations": "5.2.4", + "@angular/cdk": "5.2.0", + "@angular/common": "5.2.4", + "@angular/compiler": "5.2.4", + "@angular/core": "5.2.4", "@angular/flex-layout": "2.0.0-beta.12", - "@angular/forms": "5.2.3", - "@angular/http": "5.2.3", - "@angular/material": "5.1.1", - "@angular/material-moment-adapter": "5.1.1", - "@angular/platform-browser": "5.2.3", - "@angular/platform-browser-dynamic": "5.2.3", - "@angular/router": "5.2.3", + "@angular/forms": "5.2.4", + "@angular/http": "5.2.4", + "@angular/material": "5.2.0", + "@angular/material-moment-adapter": "5.2.0", + "@angular/platform-browser": "5.2.4", + "@angular/platform-browser-dynamic": "5.2.4", + "@angular/router": "5.2.4", "@ngrx/effects": "5.0.0", "@ngrx/router-store": "5.0.0", "@ngrx/store": "5.0.0", @@ -61,13 +61,13 @@ "zone.js": "0.8.20" }, "devDependencies": { - "@angular/cli": "1.6.7", - "@angular/compiler-cli": "5.2.3", - "@angular/language-service": "5.2.3", + "@angular/cli": "1.6.8", + "@angular/compiler-cli": "5.2.4", + "@angular/language-service": "5.2.4", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.6", "@types/jasminewd2": "2.0.3", - "@types/node": "6.0.96", + "@types/node": "6.0.98", "codelyzer": "4.1.0", "jasmine-core": "2.8.0", "jasmine-spec-reporter": "4.2.1", diff --git a/src/app/core/animations.ts b/src/@fuse/animations/index.ts similarity index 100% rename from src/app/core/animations.ts rename to src/@fuse/animations/index.ts diff --git a/src/app/core/components/confirm-dialog/confirm-dialog.component.html b/src/@fuse/components/confirm-dialog/confirm-dialog.component.html similarity index 100% rename from src/app/core/components/confirm-dialog/confirm-dialog.component.html rename to src/@fuse/components/confirm-dialog/confirm-dialog.component.html diff --git a/src/app/core/components/confirm-dialog/confirm-dialog.component.scss b/src/@fuse/components/confirm-dialog/confirm-dialog.component.scss similarity index 100% rename from src/app/core/components/confirm-dialog/confirm-dialog.component.scss rename to src/@fuse/components/confirm-dialog/confirm-dialog.component.scss diff --git a/src/app/core/components/confirm-dialog/confirm-dialog.component.ts b/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts similarity index 100% rename from src/app/core/components/confirm-dialog/confirm-dialog.component.ts rename to src/@fuse/components/confirm-dialog/confirm-dialog.component.ts diff --git a/src/app/core/components/copier/copier.service.ts b/src/@fuse/components/copier/copier.service.ts similarity index 100% rename from src/app/core/components/copier/copier.service.ts rename to src/@fuse/components/copier/copier.service.ts diff --git a/src/app/core/components/countdown/countdown.component.html b/src/@fuse/components/countdown/countdown.component.html similarity index 100% rename from src/app/core/components/countdown/countdown.component.html rename to src/@fuse/components/countdown/countdown.component.html diff --git a/src/app/core/components/countdown/countdown.component.scss b/src/@fuse/components/countdown/countdown.component.scss similarity index 100% rename from src/app/core/components/countdown/countdown.component.scss rename to src/@fuse/components/countdown/countdown.component.scss diff --git a/src/app/core/components/countdown/countdown.component.ts b/src/@fuse/components/countdown/countdown.component.ts similarity index 100% rename from src/app/core/components/countdown/countdown.component.ts rename to src/@fuse/components/countdown/countdown.component.ts diff --git a/src/app/core/components/demo/demo-content/demo-content.component.html b/src/@fuse/components/demo/demo-content/demo-content.component.html similarity index 100% rename from src/app/core/components/demo/demo-content/demo-content.component.html rename to src/@fuse/components/demo/demo-content/demo-content.component.html diff --git a/src/app/core/components/demo/demo-content/demo-content.component.scss b/src/@fuse/components/demo/demo-content/demo-content.component.scss similarity index 100% rename from src/app/core/components/demo/demo-content/demo-content.component.scss rename to src/@fuse/components/demo/demo-content/demo-content.component.scss diff --git a/src/app/core/components/demo/demo-content/demo-content.component.ts b/src/@fuse/components/demo/demo-content/demo-content.component.ts similarity index 100% rename from src/app/core/components/demo/demo-content/demo-content.component.ts rename to src/@fuse/components/demo/demo-content/demo-content.component.ts diff --git a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.html b/src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.html similarity index 100% rename from src/app/core/components/demo/demo-sidenav/demo-sidenav.component.html rename to src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.html diff --git a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.scss b/src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.scss similarity index 100% rename from src/app/core/components/demo/demo-sidenav/demo-sidenav.component.scss rename to src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.scss diff --git a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.ts b/src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.ts similarity index 100% rename from src/app/core/components/demo/demo-sidenav/demo-sidenav.component.ts rename to src/@fuse/components/demo/demo-sidenav/demo-sidenav.component.ts diff --git a/src/app/core/components/demo/demo.module.ts b/src/@fuse/components/demo/demo.module.ts similarity index 100% rename from src/app/core/components/demo/demo.module.ts rename to src/@fuse/components/demo/demo.module.ts diff --git a/src/app/core/components/highlight/highlight.component.scss b/src/@fuse/components/highlight/highlight.component.scss similarity index 100% rename from src/app/core/components/highlight/highlight.component.scss rename to src/@fuse/components/highlight/highlight.component.scss diff --git a/src/app/core/components/highlight/highlight.component.ts b/src/@fuse/components/highlight/highlight.component.ts similarity index 100% rename from src/app/core/components/highlight/highlight.component.ts rename to src/@fuse/components/highlight/highlight.component.ts diff --git a/src/app/core/components/highlight/prism-languages.ts b/src/@fuse/components/highlight/prism-languages.ts similarity index 100% rename from src/app/core/components/highlight/prism-languages.ts rename to src/@fuse/components/highlight/prism-languages.ts diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.html b/src/@fuse/components/material-color-picker/material-color-picker.component.html similarity index 100% rename from src/app/core/components/material-color-picker/material-color-picker.component.html rename to src/@fuse/components/material-color-picker/material-color-picker.component.html diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.scss b/src/@fuse/components/material-color-picker/material-color-picker.component.scss similarity index 100% rename from src/app/core/components/material-color-picker/material-color-picker.component.scss rename to src/@fuse/components/material-color-picker/material-color-picker.component.scss diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.ts b/src/@fuse/components/material-color-picker/material-color-picker.component.ts similarity index 98% rename from src/app/core/components/material-color-picker/material-color-picker.component.ts rename to src/@fuse/components/material-color-picker/material-color-picker.component.ts index 317c829d..cb83c1dd 100644 --- a/src/app/core/components/material-color-picker/material-color-picker.component.ts +++ b/src/@fuse/components/material-color-picker/material-color-picker.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { MatColors } from '../../matColors'; -import { fuseAnimations } from '../../animations'; +import { fuseAnimations } from '../../animations/index'; @Component({ selector : 'fuse-material-color-picker', diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html b/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html similarity index 100% rename from src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html rename to src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss b/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss similarity index 100% rename from src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss rename to src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts b/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts similarity index 83% rename from src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts rename to src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts index 4fb2853a..c691a1bb 100644 --- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts +++ b/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts @@ -1,5 +1,5 @@ import { Component, HostBinding, HostListener, Input, OnDestroy } from '@angular/core'; -import { fuseAnimations } from '../../../../animations'; +import { fuseAnimations } from '../../../../animations/index'; import { FuseConfigService } from '../../../../services/config.service'; import { Subscription } from 'rxjs/Subscription'; @@ -11,7 +11,7 @@ import { Subscription } from 'rxjs/Subscription'; }) export class FuseNavHorizontalCollapseComponent implements OnDestroy { - onSettingsChanged: Subscription; + onConfigChanged: Subscription; fuseSettings: any; isOpen = false; @@ -34,8 +34,8 @@ export class FuseNavHorizontalCollapseComponent implements OnDestroy private fuseConfig: FuseConfigService ) { - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (newSettings) => { this.fuseSettings = newSettings; @@ -45,6 +45,6 @@ export class FuseNavHorizontalCollapseComponent implements OnDestroy ngOnDestroy() { - this.onSettingsChanged.unsubscribe(); + this.onConfigChanged.unsubscribe(); } } diff --git a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html b/src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html similarity index 100% rename from src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html rename to src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html diff --git a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss b/src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss similarity index 100% rename from src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss rename to src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss diff --git a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts b/src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts similarity index 100% rename from src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts rename to src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts diff --git a/src/app/core/components/navigation/navigation.component.html b/src/@fuse/components/navigation/navigation.component.html similarity index 100% rename from src/app/core/components/navigation/navigation.component.html rename to src/@fuse/components/navigation/navigation.component.html diff --git a/src/app/core/components/navigation/navigation.component.scss b/src/@fuse/components/navigation/navigation.component.scss similarity index 60% rename from src/app/core/components/navigation/navigation.component.scss rename to src/@fuse/components/navigation/navigation.component.scss index 8087fe06..7cee8cc8 100644 --- a/src/app/core/components/navigation/navigation.component.scss +++ b/src/@fuse/components/navigation/navigation.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; #main-navigation { margin: 0; diff --git a/src/app/core/components/navigation/navigation.component.ts b/src/@fuse/components/navigation/navigation.component.ts similarity index 100% rename from src/app/core/components/navigation/navigation.component.ts rename to src/@fuse/components/navigation/navigation.component.ts diff --git a/src/app/core/components/navigation/navigation.model.ts b/src/@fuse/components/navigation/navigation.model.ts similarity index 100% rename from src/app/core/components/navigation/navigation.model.ts rename to src/@fuse/components/navigation/navigation.model.ts diff --git a/src/app/core/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts similarity index 100% rename from src/app/core/components/navigation/navigation.module.ts rename to src/@fuse/components/navigation/navigation.module.ts diff --git a/src/app/core/components/navigation/navigation.service.ts b/src/@fuse/components/navigation/navigation.service.ts similarity index 100% rename from src/app/core/components/navigation/navigation.service.ts rename to src/@fuse/components/navigation/navigation.service.ts diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html similarity index 100% rename from src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html rename to src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss similarity index 95% rename from src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss rename to src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss index 860565ee..6fa59f1f 100644 --- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss +++ b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss @@ -1,6 +1,6 @@ :host { - .folded:not(.folded-open) & { + .folded:not(.unfolded) & { .nav-link { @@ -19,6 +19,7 @@ } .nav-link { + .collapse-arrow { transition: transform .3s ease-in-out, opacity .25s ease-in-out .1s; transform: rotate(0); diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts similarity index 98% rename from src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts rename to src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts index 31712d66..3a640232 100644 --- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts @@ -1,7 +1,7 @@ import { Component, HostBinding, Input, OnInit } from '@angular/core'; import { FuseNavigationService } from '../../navigation.service'; import { NavigationEnd, Router } from '@angular/router'; -import { fuseAnimations } from '../../../../animations'; +import { fuseAnimations } from '../../../../animations/index'; @Component({ selector : 'fuse-nav-vertical-collapse', diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html similarity index 100% rename from src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html rename to src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.scss similarity index 92% rename from src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss rename to src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.scss index 7021a70f..fdbd817a 100644 --- a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss +++ b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.scss @@ -1,6 +1,6 @@ :host { - .folded:not(.folded-open) & { + .folded:not(.unfolded) & { > .group-title { align-items: center; diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts similarity index 100% rename from src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts rename to src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts diff --git a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html similarity index 100% rename from src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html rename to src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html diff --git a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.scss b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.scss similarity index 85% rename from src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.scss rename to src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.scss index 1efc651a..6ab28ae1 100644 --- a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.scss +++ b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.scss @@ -1,6 +1,6 @@ :host { - .folded:not(.folded-open) & { + .folded:not(.unfolded) & { .nav-link { diff --git a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.ts b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts similarity index 100% rename from src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.ts rename to src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts diff --git a/src/app/core/components/search-bar/search-bar.component.html b/src/@fuse/components/search-bar/search-bar.component.html similarity index 100% rename from src/app/core/components/search-bar/search-bar.component.html rename to src/@fuse/components/search-bar/search-bar.component.html diff --git a/src/app/core/components/search-bar/search-bar.component.scss b/src/@fuse/components/search-bar/search-bar.component.scss similarity index 98% rename from src/app/core/components/search-bar/search-bar.component.scss rename to src/@fuse/components/search-bar/search-bar.component.scss index 7a737fcc..5ec26450 100644 --- a/src/app/core/components/search-bar/search-bar.component.scss +++ b/src/@fuse/components/search-bar/search-bar.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/core/components/search-bar/search-bar.component.ts b/src/@fuse/components/search-bar/search-bar.component.ts similarity index 90% rename from src/app/core/components/search-bar/search-bar.component.ts rename to src/@fuse/components/search-bar/search-bar.component.ts index ea295798..f83951b0 100644 --- a/src/app/core/components/search-bar/search-bar.component.ts +++ b/src/@fuse/components/search-bar/search-bar.component.ts @@ -12,15 +12,15 @@ export class FuseSearchBarComponent implements OnInit collapsed: boolean; toolbarColor: string; @Output() onInput: EventEmitter = new EventEmitter(); - onSettingsChanged: Subscription; + onConfigChanged: Subscription; constructor( private fuseConfig: FuseConfigService ) { this.collapsed = true; - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (newSettings) => { this.toolbarColor = newSettings.colorClasses.toolbar; diff --git a/src/app/core/components/search-bar/search-bar.module.ts b/src/@fuse/components/search-bar/search-bar.module.ts similarity index 100% rename from src/app/core/components/search-bar/search-bar.module.ts rename to src/@fuse/components/search-bar/search-bar.module.ts diff --git a/src/app/core/components/shortcuts/shortcuts.component.html b/src/@fuse/components/shortcuts/shortcuts.component.html similarity index 100% rename from src/app/core/components/shortcuts/shortcuts.component.html rename to src/@fuse/components/shortcuts/shortcuts.component.html diff --git a/src/app/core/components/shortcuts/shortcuts.component.scss b/src/@fuse/components/shortcuts/shortcuts.component.scss similarity index 93% rename from src/app/core/components/shortcuts/shortcuts.component.scss rename to src/@fuse/components/shortcuts/shortcuts.component.scss index 0ee3a166..41b8c57d 100644 --- a/src/app/core/components/shortcuts/shortcuts.component.scss +++ b/src/@fuse/components/shortcuts/shortcuts.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { diff --git a/src/app/core/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts similarity index 97% rename from src/app/core/components/shortcuts/shortcuts.component.ts rename to src/@fuse/components/shortcuts/shortcuts.component.ts index a1479f1d..85bb1e71 100644 --- a/src/app/core/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -20,7 +20,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy mobileShortcutsPanelActive = false; toolbarColor: string; matchMediaSubscription: Subscription; - onSettingsChanged: Subscription; + onConfigChanged: Subscription; @ViewChild('searchInput') searchInputField; @ViewChild('shortcuts') shortcutsEl: ElementRef; @@ -36,8 +36,8 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy { this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation(); - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (newSettings) => { this.toolbarColor = newSettings.colorClasses.toolbar; diff --git a/src/app/core/components/shortcuts/shortcuts.module.ts b/src/@fuse/components/shortcuts/shortcuts.module.ts similarity index 100% rename from src/app/core/components/shortcuts/shortcuts.module.ts rename to src/@fuse/components/shortcuts/shortcuts.module.ts diff --git a/src/@fuse/components/sidebar/sidebar.component.html b/src/@fuse/components/sidebar/sidebar.component.html new file mode 100644 index 00000000..95a0b70b --- /dev/null +++ b/src/@fuse/components/sidebar/sidebar.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/@fuse/components/sidebar/sidebar.component.scss b/src/@fuse/components/sidebar/sidebar.component.scss new file mode 100644 index 00000000..b3853867 --- /dev/null +++ b/src/@fuse/components/sidebar/sidebar.component.scss @@ -0,0 +1,59 @@ +fuse-sidebar { + display: flex; + flex-direction: column; + flex: 1 0 auto; + position: absolute; + top: 0; + bottom: 0; + overflow: hidden; + width: 280px; + min-width: 280px; + max-width: 280px; + z-index: 1000; + transition-property: transform, width, min-width, max-width; + transition-duration: 150ms; + transition-timing-function: ease-in-out; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.35); + + &.left-aligned { + left: 0; + transform: translateX(-100%); + } + + &.right-aligned { + right: 0; + transform: translateX(100%); + } + + &.open { + transform: translateX(0); + } + + &.locked-open { + position: relative !important; + transform: translateX(0) !important; + } + + &.folded { + position: absolute !important; + top: 0; + bottom: 0; + + &:not(.unfolded) { + width: 64px; + min-width: 64px; + max-width: 64px; + } + } +} + +.fuse-sidebar-overlay { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 3; + background-color: rgba(0, 0, 0, 0.6); + opacity: 0; +} \ No newline at end of file diff --git a/src/@fuse/components/sidebar/sidebar.component.ts b/src/@fuse/components/sidebar/sidebar.component.ts new file mode 100644 index 00000000..582c023c --- /dev/null +++ b/src/@fuse/components/sidebar/sidebar.component.ts @@ -0,0 +1,368 @@ +import { Component, ElementRef, HostBinding, HostListener, Inject, Input, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core'; +import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations'; +import { ObservableMedia } from '@angular/flex-layout'; +import { Subscription } from 'rxjs/Subscription'; + +import { FuseSidebarService } from './sidebar.service'; +import { FuseMatchMedia } from '@fuse/services/match-media.service'; +import { DOCUMENT } from '@angular/common'; + +@Component({ + selector : 'fuse-sidebar', + templateUrl : './sidebar.component.html', + styleUrls : ['./sidebar.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class FuseSidebarComponent implements OnInit, OnDestroy +{ + // Name + @Input() + name: string; + + // Align + @Input() + align: string; + + // Open + @HostBinding('class.open') + opened: boolean; + + // Locked Open + @Input() + lockedOpen: string; + + // isLockedOpen + @HostBinding('class.locked-open') + isLockedOpen: boolean; + + // Folded + @HostBinding('class.folded') + @Input() + folded: boolean; + + // Folded unfolded + @HostBinding('class.unfolded') + unfolded: boolean; + + // Private + private _wasActive: boolean; + private _backdrop: HTMLElement | null = null; + private _player: AnimationPlayer; + private _matchMediaWatcher: Subscription; + + /** + * Constructor + * + * @param renderer + * @param elementRef + * @param animationBuilder + * @param sidebarService + * @param matchMedia + * @param media + * @param document + */ + constructor( + private renderer: Renderer2, + private elementRef: ElementRef, + private animationBuilder: AnimationBuilder, + private sidebarService: FuseSidebarService, + private matchMedia: FuseMatchMedia, + private media: ObservableMedia, + @Inject(DOCUMENT) private document: any + ) + { + // Set the defaults + this.opened = false; + this.folded = false; + this.align = 'left'; + } + + /** + * On init + */ + ngOnInit(): void + { + // Register the sidebar + this.sidebarService.register(this.name, this); + + // Setup alignment + this._setupAlignment(); + + // Setup lockedOpen + this._setupLockedOpen(); + } + + /** + * On destroy + */ + ngOnDestroy(): void + { + // Unregister the sidebar + this.sidebarService.unregister(this.name); + + // Unregister the media watcher + this._matchMediaWatcher.unsubscribe(); + } + + /** + * Setup the alignment + * + * @private + */ + private _setupAlignment(): void + { + if ( this.align === 'left' ) + { + this.renderer.addClass(this.elementRef.nativeElement, 'left-aligned'); + } + else + { + this.renderer.addClass(this.elementRef.nativeElement, 'right-aligned'); + } + } + + /** + * Setup the lockedOpen handler + * + * @private + */ + private _setupLockedOpen(): void + { + // Return if the lockedOpen wasn't set + if ( !this.lockedOpen ) + { + return; + } + + // Set the wasActive for the first time + this._wasActive = false; + + // Act on every media change + this._matchMediaWatcher = + + this.matchMedia.onMediaChange.subscribe(() => { + + // Get the active status + const isActive = this.media.isActive(this.lockedOpen); + + // If the both status are the same, don't act + if ( this._wasActive === isActive ) + { + return; + } + + // Store the new active status + this._wasActive = isActive; + + // Activate the lockedOpen + if ( isActive ) + { + // Set the lockedOpen status + this.isLockedOpen = true; + } + // De-Activate the lockedOpen + else + { + // Set the lockedOpen status + this.isLockedOpen = false; + + // Unfold the sidebar in case if it was folded + this.unfold(); + } + }); + } + + /** + * Open the sidebar + */ + open(): void + { + if ( this.opened || this.isLockedOpen ) + { + return; + } + + // Show the backdrop + this.showBackdrop(); + + // Set the opened status + this.opened = true; + + // Add a css class to the body + this.renderer.addClass(this.document.body, 'fuse-sidebar-opened'); + } + + /** + * Close the sidebar + */ + close(): void + { + if ( !this.opened ) + { + return; + } + + // Hide the backdrop + this.hideBackdrop(); + + // Set the opened status + this.opened = false; + + // Remove the css class from the body + this.renderer.removeClass(this.document.body, 'fuse-sidebar-opened'); + } + + /** + * Toggle open/close the sidebar + */ + toggleOpen(): void + { + if ( this.opened ) + { + this.close(); + } + else + { + this.open(); + } + } + + /** + * Mouseenter + */ + @HostListener('mouseenter') + onMouseEnter(): void + { + // Only work if the sidebar is folded + if ( !this.folded ) + { + return; + } + + // Unfold the sidebar temporarily + this.unfolded = true; + + // Add a css class to the body + this.renderer.addClass(this.document.body, 'fuse-sidebar-folded-unfolded'); + } + + /** + * Mouseleave + */ + @HostListener('mouseleave') + onMouseLeave(): void + { + // Only work if the sidebar is folded + if ( !this.folded ) + { + return; + } + + // Fold the sidebar back + this.unfolded = false; + + // Remove the css class from the body + this.renderer.removeClass(this.document.body, 'fuse-sidebar-folded-unfolded'); + } + + /** + * Fold the sidebar permanently + */ + fold(): void + { + this.folded = true; + + // Add a css class to the body + this.renderer.addClass(this.document.body, 'fuse-sidebar-folded'); + } + + /** + * Unfold the sidebar permanently + */ + unfold(): void + { + this.folded = false; + + // Remove the css class from the body + this.renderer.removeClass(this.document.body, 'fuse-sidebar-folded'); + } + + /** + * Toggle the sidebar fold/unfold permanently + */ + toggleFold(): void + { + if ( this.folded ) + { + this.unfold(); + } + else + { + this.fold(); + } + } + + /** + * Show the backdrop + */ + showBackdrop(): void + { + // Create the backdrop element + this._backdrop = this.renderer.createElement('div'); + + // Add a class to the backdrop element + this._backdrop.classList.add('fuse-sidebar-overlay'); + + // Append the backdrop to the parent of the sidebar + this.renderer.appendChild(this.elementRef.nativeElement.parentElement, this._backdrop); + + // Create the enter animation and attach it to the player + this._player = + this.animationBuilder + .build([ + animate('300ms ease', style({opacity: 1})) + ]).create(this._backdrop); + + // Play the animation + this._player.play(); + + // Add an event listener to the overlay + this._backdrop.addEventListener('click', () => { + this.close(); + } + ); + } + + /** + * Hide the backdrop + */ + hideBackdrop(): void + { + if ( !this._backdrop ) + { + return; + } + + // Create the leave animation and attach it to the player + this._player = + this.animationBuilder + .build([ + animate('300ms ease', style({opacity: 0})) + ]).create(this._backdrop); + + // Play the animation + this._player.play(); + + // Once the animation is done... + this._player.onDone(() => { + + // If the backdrop still exists... + if ( this._backdrop ) + { + // Remove the backdrop + this._backdrop.parentNode.removeChild(this._backdrop); + this._backdrop = null; + } + }); + } +} diff --git a/src/@fuse/components/sidebar/sidebar.module.ts b/src/@fuse/components/sidebar/sidebar.module.ts new file mode 100644 index 00000000..f26739f3 --- /dev/null +++ b/src/@fuse/components/sidebar/sidebar.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; + +import { FuseSidebarComponent } from './sidebar.component'; +import { FuseSidebarService } from './sidebar.service'; + +@NgModule({ + declarations: [ + FuseSidebarComponent + ], + exports : [ + FuseSidebarComponent + ], + providers : [ + FuseSidebarService + ] +}) +export class FuseSidebarModule +{ +} diff --git a/src/@fuse/components/sidebar/sidebar.service.ts b/src/@fuse/components/sidebar/sidebar.service.ts new file mode 100644 index 00000000..a1da4cbb --- /dev/null +++ b/src/@fuse/components/sidebar/sidebar.service.ts @@ -0,0 +1,74 @@ +import { Injectable } from '@angular/core'; + +import { FuseSidebarComponent } from './sidebar.component'; + +@Injectable() +export class FuseSidebarService +{ + // Private + private _registry: { [key: string]: FuseSidebarComponent } = {}; + + /** + * Constructor + */ + constructor() + { + + } + + /** + * Add the sidebar to the registry + * + * @param key + * @param sidebar + */ + register(key, sidebar): void + { + // Check if the key already being used + if ( this._registry[key] ) + { + console.error(`The sidebar with the key '${key}' already exists. Either unregister it first or use a unique key.`); + + return; + } + + // Add to the registry + this._registry[key] = sidebar; + } + + /** + * Remove the sidebar from the registry + * + * @param key + */ + unregister(key): void + { + // Check if the sidebar exists + if ( !this._registry[key] ) + { + console.error(`The sidebar with the key '${key}' doesn't exist in the registry.`); + } + + // Unregister the sidebar + delete this._registry[key]; + } + + /** + * Return the sidebar with the given key + * + * @param key + */ + getSidebar(key): any + { + // Check if the sidebar exists + if ( !this._registry[key] ) + { + console.error(`The sidebar with the key '${key}' doesn't exist in the registry.`); + + return; + } + + // Return the sidebar + return this._registry[key]; + } +} diff --git a/src/app/core/components/theme-options/theme-options.component.html b/src/@fuse/components/theme-options/theme-options.component.html similarity index 83% rename from src/app/core/components/theme-options/theme-options.component.html rename to src/@fuse/components/theme-options/theme-options.component.html index 16e4de6e..cb36549e 100644 --- a/src/app/core/components/theme-options/theme-options.component.html +++ b/src/@fuse/components/theme-options/theme-options.component.html @@ -13,7 +13,7 @@

Navigation:

- Top Left @@ -22,13 +22,13 @@

Navigation Fold (for vertical navigation):

- Folded

Toolbar:

- Below Above @@ -36,7 +36,7 @@

Footer:

- Below Above @@ -44,7 +44,7 @@

Layout Mode:

- Boxed Fullwidth @@ -57,19 +57,19 @@

Toolbar Color

-

Navigation Bar Color

-

Footer Color

-
@@ -79,7 +79,7 @@

Router Animation:

- + None diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/@fuse/components/theme-options/theme-options.component.scss similarity index 98% rename from src/app/core/components/theme-options/theme-options.component.scss rename to src/@fuse/components/theme-options/theme-options.component.scss index bc116a3c..2e2c7c75 100644 --- a/src/app/core/components/theme-options/theme-options.component.scss +++ b/src/@fuse/components/theme-options/theme-options.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; @keyframes rotating { from { diff --git a/src/app/core/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts similarity index 88% rename from src/app/core/components/theme-options/theme-options.component.ts rename to src/@fuse/components/theme-options/theme-options.component.ts index b84260ef..373b5ce5 100644 --- a/src/app/core/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewC import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations'; import { Subscription } from 'rxjs/Subscription'; import { FuseConfigService } from '../../services/config.service'; -import { fuseAnimations } from '../../animations'; +import { fuseAnimations } from '../../animations/index'; import { FuseNavigationService } from '../navigation/navigation.service'; @Component({ @@ -18,9 +18,9 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy @ViewChild('overlay') overlay: ElementRef; public player: AnimationPlayer; - fuseSettings: any; + config: any; - onSettingsChanged: Subscription; + onConfigChanged: Subscription; @HostBinding('class.bar-closed') barClosed: boolean; @@ -33,11 +33,11 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy { this.barClosed = true; - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( - (newSettings) => { - this.fuseSettings = newSettings; + (newConfig) => { + this.config = newConfig; } ); @@ -72,7 +72,7 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy onSettingsChange() { - this.fuseConfig.setSettings(this.fuseSettings); + this.fuseConfig.setConfig(this.config); } closeBar() @@ -107,6 +107,6 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy ngOnDestroy() { - this.onSettingsChanged.unsubscribe(); + this.onConfigChanged.unsubscribe(); } } diff --git a/src/app/core/components/widget/widget-toggle.directive.ts b/src/@fuse/components/widget/widget-toggle.directive.ts similarity index 100% rename from src/app/core/components/widget/widget-toggle.directive.ts rename to src/@fuse/components/widget/widget-toggle.directive.ts diff --git a/src/app/core/components/widget/widget.component.html b/src/@fuse/components/widget/widget.component.html similarity index 100% rename from src/app/core/components/widget/widget.component.html rename to src/@fuse/components/widget/widget.component.html diff --git a/src/app/core/components/widget/widget.component.scss b/src/@fuse/components/widget/widget.component.scss similarity index 100% rename from src/app/core/components/widget/widget.component.scss rename to src/@fuse/components/widget/widget.component.scss diff --git a/src/app/core/components/widget/widget.component.ts b/src/@fuse/components/widget/widget.component.ts similarity index 100% rename from src/app/core/components/widget/widget.component.ts rename to src/@fuse/components/widget/widget.component.ts diff --git a/src/app/core/components/widget/widget.module.ts b/src/@fuse/components/widget/widget.module.ts similarity index 100% rename from src/app/core/components/widget/widget.module.ts rename to src/@fuse/components/widget/widget.module.ts diff --git a/src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts b/src/@fuse/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts similarity index 100% rename from src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts rename to src/@fuse/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts diff --git a/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts b/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts similarity index 100% rename from src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts rename to src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts diff --git a/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts b/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts similarity index 100% rename from src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts rename to src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts diff --git a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts similarity index 96% rename from src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts rename to src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts index 9156f2c3..49fd75d2 100644 --- a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts +++ b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts @@ -9,7 +9,7 @@ import PerfectScrollbar from 'perfect-scrollbar'; }) export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy { - onSettingsChanged: Subscription; + onConfigChanged: Subscription; isDisableCustomScrollbars = false; isMobile = false; isInitialized = true; @@ -21,8 +21,8 @@ export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy private platform: Platform ) { - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (settings) => { this.isDisableCustomScrollbars = !settings.customScrollbars; @@ -56,7 +56,7 @@ export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy return; } - this.onSettingsChanged.unsubscribe(); + this.onConfigChanged.unsubscribe(); // Destroy the perfect-scrollbar this.ps.destroy(); diff --git a/src/@fuse/fuse.module.ts b/src/@fuse/fuse.module.ts new file mode 100644 index 00000000..7ed75db1 --- /dev/null +++ b/src/@fuse/fuse.module.ts @@ -0,0 +1,37 @@ +import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; + +import { FUSE_CONFIG, FuseConfigService } from '@fuse/services/config.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { FuseSplashScreenService } from '@fuse/services/splash-screen.service'; + +@NgModule({ + declarations: [], + providers : [ + FuseConfigService, + FuseNavigationService, + FuseSplashScreenService + ] +}) +export class FuseModule +{ + constructor(@Optional() @SkipSelf() parentModule: FuseModule) + { + if ( parentModule ) + { + throw new Error('FuseModule is already loaded. Import it in the AppModule only!'); + } + } + + static forRoot(config): ModuleWithProviders + { + return { + ngModule : FuseModule, + providers: [ + { + provide : FUSE_CONFIG, + useValue: config + } + ] + }; + } +} diff --git a/src/app/core/fuseUtils.ts b/src/@fuse/fuseUtils.ts similarity index 100% rename from src/app/core/fuseUtils.ts rename to src/@fuse/fuseUtils.ts diff --git a/src/app/core/matColors.ts b/src/@fuse/matColors.ts similarity index 100% rename from src/app/core/matColors.ts rename to src/@fuse/matColors.ts diff --git a/src/app/core/modules/material.module.ts b/src/@fuse/modules/material.module.ts similarity index 100% rename from src/app/core/modules/material.module.ts rename to src/@fuse/modules/material.module.ts diff --git a/src/app/core/modules/shared.module.ts b/src/@fuse/modules/shared.module.ts similarity index 95% rename from src/app/core/modules/shared.module.ts rename to src/@fuse/modules/shared.module.ts index 36bbeb3d..ec121b3d 100644 --- a/src/app/core/modules/shared.module.ts +++ b/src/@fuse/modules/shared.module.ts @@ -14,7 +14,6 @@ import { FusePipesModule } from '../pipes/pipes.module'; import { FuseConfirmDialogComponent } from '../components/confirm-dialog/confirm-dialog.component'; import { FuseCountdownComponent } from '../components/countdown/countdown.component'; import { FuseMatchMedia } from '../services/match-media.service'; -import { FuseNavbarVerticalService } from '../../main/navbar/vertical/navbar-vertical.service'; import { FuseHighlightComponent } from '../components/highlight/highlight.component'; import { FusePerfectScrollbarDirective } from '../directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive'; @@ -73,7 +72,6 @@ import { ChartsModule } from 'ng2-charts'; providers : [ CookieService, FuseMatchMedia, - FuseNavbarVerticalService, FuseMatSidenavHelperService, FuseTranslationLoaderService ] diff --git a/src/app/core/pipes/camelCaseToDash.pipe.ts b/src/@fuse/pipes/camelCaseToDash.pipe.ts similarity index 100% rename from src/app/core/pipes/camelCaseToDash.pipe.ts rename to src/@fuse/pipes/camelCaseToDash.pipe.ts diff --git a/src/app/core/pipes/filter.pipe.ts b/src/@fuse/pipes/filter.pipe.ts similarity index 100% rename from src/app/core/pipes/filter.pipe.ts rename to src/@fuse/pipes/filter.pipe.ts diff --git a/src/app/core/pipes/getById.pipe.ts b/src/@fuse/pipes/getById.pipe.ts similarity index 100% rename from src/app/core/pipes/getById.pipe.ts rename to src/@fuse/pipes/getById.pipe.ts diff --git a/src/app/core/pipes/htmlToPlaintext.pipe.ts b/src/@fuse/pipes/htmlToPlaintext.pipe.ts similarity index 100% rename from src/app/core/pipes/htmlToPlaintext.pipe.ts rename to src/@fuse/pipes/htmlToPlaintext.pipe.ts diff --git a/src/app/core/pipes/keys.pipe.ts b/src/@fuse/pipes/keys.pipe.ts similarity index 100% rename from src/app/core/pipes/keys.pipe.ts rename to src/@fuse/pipes/keys.pipe.ts diff --git a/src/app/core/pipes/pipes.module.ts b/src/@fuse/pipes/pipes.module.ts similarity index 100% rename from src/app/core/pipes/pipes.module.ts rename to src/@fuse/pipes/pipes.module.ts diff --git a/src/app/core/scss/core.scss b/src/@fuse/scss/core.scss similarity index 100% rename from src/app/core/scss/core.scss rename to src/@fuse/scss/core.scss diff --git a/src/app/core/scss/fuse.scss b/src/@fuse/scss/fuse.scss similarity index 100% rename from src/app/core/scss/fuse.scss rename to src/@fuse/scss/fuse.scss diff --git a/src/app/core/scss/mixins/_breakpoints.scss b/src/@fuse/scss/mixins/_breakpoints.scss similarity index 100% rename from src/app/core/scss/mixins/_breakpoints.scss rename to src/@fuse/scss/mixins/_breakpoints.scss diff --git a/src/app/core/scss/partials/_angular-material-fix.scss b/src/@fuse/scss/partials/_angular-material-fix.scss similarity index 100% rename from src/app/core/scss/partials/_angular-material-fix.scss rename to src/@fuse/scss/partials/_angular-material-fix.scss diff --git a/src/app/core/scss/partials/_cards.scss b/src/@fuse/scss/partials/_cards.scss similarity index 100% rename from src/app/core/scss/partials/_cards.scss rename to src/@fuse/scss/partials/_cards.scss diff --git a/src/app/core/scss/partials/_colors.scss b/src/@fuse/scss/partials/_colors.scss similarity index 100% rename from src/app/core/scss/partials/_colors.scss rename to src/@fuse/scss/partials/_colors.scss diff --git a/src/app/core/scss/partials/_forms.scss b/src/@fuse/scss/partials/_forms.scss similarity index 100% rename from src/app/core/scss/partials/_forms.scss rename to src/@fuse/scss/partials/_forms.scss diff --git a/src/app/core/scss/partials/_global.scss b/src/@fuse/scss/partials/_global.scss similarity index 100% rename from src/app/core/scss/partials/_global.scss rename to src/@fuse/scss/partials/_global.scss diff --git a/src/app/core/scss/partials/_helpers.scss b/src/@fuse/scss/partials/_helpers.scss similarity index 100% rename from src/app/core/scss/partials/_helpers.scss rename to src/@fuse/scss/partials/_helpers.scss diff --git a/src/app/core/scss/partials/_icons.scss b/src/@fuse/scss/partials/_icons.scss similarity index 100% rename from src/app/core/scss/partials/_icons.scss rename to src/@fuse/scss/partials/_icons.scss diff --git a/src/app/core/scss/partials/_material.scss b/src/@fuse/scss/partials/_material.scss similarity index 100% rename from src/app/core/scss/partials/_material.scss rename to src/@fuse/scss/partials/_material.scss diff --git a/src/app/core/scss/partials/_navigation.scss b/src/@fuse/scss/partials/_navigation.scss similarity index 100% rename from src/app/core/scss/partials/_navigation.scss rename to src/@fuse/scss/partials/_navigation.scss diff --git a/src/app/core/scss/partials/_normalize.scss b/src/@fuse/scss/partials/_normalize.scss similarity index 100% rename from src/app/core/scss/partials/_normalize.scss rename to src/@fuse/scss/partials/_normalize.scss diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/@fuse/scss/partials/_page-layouts.scss similarity index 100% rename from src/app/core/scss/partials/_page-layouts.scss rename to src/@fuse/scss/partials/_page-layouts.scss diff --git a/src/app/core/scss/partials/_print.scss b/src/@fuse/scss/partials/_print.scss similarity index 100% rename from src/app/core/scss/partials/_print.scss rename to src/@fuse/scss/partials/_print.scss diff --git a/src/app/core/scss/partials/_reset.scss b/src/@fuse/scss/partials/_reset.scss similarity index 100% rename from src/app/core/scss/partials/_reset.scss rename to src/@fuse/scss/partials/_reset.scss diff --git a/src/app/core/scss/partials/_scrollbars.scss b/src/@fuse/scss/partials/_scrollbars.scss similarity index 100% rename from src/app/core/scss/partials/_scrollbars.scss rename to src/@fuse/scss/partials/_scrollbars.scss diff --git a/src/app/core/scss/partials/_toolbar.scss b/src/@fuse/scss/partials/_toolbar.scss similarity index 100% rename from src/app/core/scss/partials/_toolbar.scss rename to src/@fuse/scss/partials/_toolbar.scss diff --git a/src/app/core/scss/partials/_typography.scss b/src/@fuse/scss/partials/_typography.scss similarity index 100% rename from src/app/core/scss/partials/_typography.scss rename to src/@fuse/scss/partials/_typography.scss diff --git a/src/app/core/scss/partials/plugins/_ng-pick-datetime.scss b/src/@fuse/scss/partials/plugins/_ng-pick-datetime.scss similarity index 100% rename from src/app/core/scss/partials/plugins/_ng-pick-datetime.scss rename to src/@fuse/scss/partials/plugins/_ng-pick-datetime.scss diff --git a/src/app/core/scss/partials/plugins/_ngx-color-picker.scss b/src/@fuse/scss/partials/plugins/_ngx-color-picker.scss similarity index 95% rename from src/app/core/scss/partials/plugins/_ngx-color-picker.scss rename to src/@fuse/scss/partials/plugins/_ngx-color-picker.scss index aab3d8d7..c1a7d1b0 100644 --- a/src/app/core/scss/partials/plugins/_ngx-color-picker.scss +++ b/src/@fuse/scss/partials/plugins/_ngx-color-picker.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .color-picker { height: auto !important; diff --git a/src/app/core/scss/partials/plugins/_ngx-datatable.scss b/src/@fuse/scss/partials/plugins/_ngx-datatable.scss similarity index 100% rename from src/app/core/scss/partials/plugins/_ngx-datatable.scss rename to src/@fuse/scss/partials/plugins/_ngx-datatable.scss diff --git a/src/app/core/scss/partials/plugins/_perfect-scrollbar.scss b/src/@fuse/scss/partials/plugins/_perfect-scrollbar.scss similarity index 100% rename from src/app/core/scss/partials/plugins/_perfect-scrollbar.scss rename to src/@fuse/scss/partials/plugins/_perfect-scrollbar.scss diff --git a/src/app/core/scss/partials/plugins/_plugins.scss b/src/@fuse/scss/partials/plugins/_plugins.scss similarity index 100% rename from src/app/core/scss/partials/plugins/_plugins.scss rename to src/@fuse/scss/partials/plugins/_plugins.scss diff --git a/src/app/core/scss/partials/plugins/_prism.scss b/src/@fuse/scss/partials/plugins/_prism.scss similarity index 100% rename from src/app/core/scss/partials/plugins/_prism.scss rename to src/@fuse/scss/partials/plugins/_prism.scss diff --git a/src/app/core/scss/variables/_theme.scss b/src/@fuse/scss/variables/_theme.scss similarity index 100% rename from src/app/core/scss/variables/_theme.scss rename to src/@fuse/scss/variables/_theme.scss diff --git a/src/@fuse/services/config.service.ts b/src/@fuse/services/config.service.ts new file mode 100644 index 00000000..2c4cbde4 --- /dev/null +++ b/src/@fuse/services/config.service.ts @@ -0,0 +1,113 @@ +import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'; +import { NavigationStart, Router } from '@angular/router'; +import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { Platform } from '@angular/cdk/platform'; + +// Define the default config +const DEFAULT_CONFIG = { + layout : { + navigation : 'left', // 'right', 'left', 'top', 'none' + navigationFolded: false, // true, false + toolbar : 'below', // 'above', 'below', 'none' + footer : 'below', // 'above', 'below', 'none' + mode : 'fullwidth' // 'boxed', 'fullwidth' + }, + colorClasses : { + toolbar: 'mat-white-500-bg', + navbar : 'mat-fuse-dark-700-bg', + footer : 'mat-fuse-dark-900-bg' + }, + customScrollbars: true, + routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft, none +}; + +// Create the injection token for the custom config +export const FUSE_CONFIG = new InjectionToken('fuseCustomConfig'); + +@Injectable() +export class FuseConfigService +{ + config: any; + defaultConfig: any; + + onConfigChanged: BehaviorSubject; + + /** + * Constructor + * + * @param router + * @param platform + * @param config + */ + constructor( + private router: Router, + public platform: Platform, + @Inject(FUSE_CONFIG) @Optional() config + ) + { + // Set the default settings from the constant + this.defaultConfig = DEFAULT_CONFIG; + + // If custom config provided with forRoot, + // use them as default config... + if ( config ) + { + this.defaultConfig = config; + } + + /** + * Disable Custom Scrollbars if Browser is Mobile + */ + if ( this.platform.ANDROID || this.platform.IOS ) + { + this.defaultConfig.customScrollbars = false; + } + + // Set the config from the default config + this.config = {...this.defaultConfig}; + + // Reload the default settings for the + // layout on every navigation start + router.events.subscribe( + (event) => { + if ( event instanceof NavigationStart ) + { + this.setConfig({ + layout: this.defaultConfig.layout + } + ); + } + } + ); + + // Create the behavior subject + this.onConfigChanged = new BehaviorSubject(this.config); + } + + /** + * Set the new config from given object + * + * @param config + */ + setConfig(config): void + { + // Set the config from the given object + // Ugly, but works for now... + this.config = { + ...this.config, + ...config, + layout : { + ...this.config.layout, + ...config.layout, + }, + colorClasses: { + ...this.config.colorClasses, + ...config.colorClasses + } + }; + + // Trigger the event + this.onConfigChanged.next(this.config); + } +} + diff --git a/src/app/core/services/match-media.service.ts b/src/@fuse/services/match-media.service.ts similarity index 66% rename from src/app/core/services/match-media.service.ts rename to src/@fuse/services/match-media.service.ts index 6e843bc3..382e9935 100644 --- a/src/app/core/services/match-media.service.ts +++ b/src/@fuse/services/match-media.service.ts @@ -1,11 +1,12 @@ import { MediaChange, ObservableMedia } from '@angular/flex-layout'; -import { EventEmitter, Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() export class FuseMatchMedia { activeMediaQuery: string; - onMediaChange: EventEmitter = new EventEmitter(); + onMediaChange: BehaviorSubject = new BehaviorSubject(''); constructor(private observableMedia: ObservableMedia) { @@ -15,7 +16,7 @@ export class FuseMatchMedia if ( this.activeMediaQuery !== change.mqAlias ) { this.activeMediaQuery = change.mqAlias; - this.onMediaChange.emit(change.mqAlias); + this.onMediaChange.next(change.mqAlias); } }); } diff --git a/src/app/core/services/splash-screen.service.ts b/src/@fuse/services/splash-screen.service.ts similarity index 100% rename from src/app/core/services/splash-screen.service.ts rename to src/@fuse/services/splash-screen.service.ts diff --git a/src/app/core/services/translation-loader.service.ts b/src/@fuse/services/translation-loader.service.ts similarity index 100% rename from src/app/core/services/translation-loader.service.ts rename to src/@fuse/services/translation-loader.service.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 64ca8fd3..b8fbaaf1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { FuseSplashScreenService } from './core/services/splash-screen.service'; import { TranslateService } from '@ngx-translate/core'; -import { FuseTranslationLoaderService } from './core/services/translation-loader.service'; -import { FuseNavigationService } from './core/components/navigation/navigation.service'; +import { FuseSplashScreenService } from '@fuse/services/splash-screen.service'; +import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; + import { FuseNavigationModel } from './navigation/navigation.model'; import { locale as navigationEnglish } from './navigation/i18n/en'; import { locale as navigationTurkish } from './navigation/i18n/tr'; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1fe9cb41..13762a65 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,16 +5,16 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule, Routes } from '@angular/router'; import { InMemoryWebApiModule } from 'angular-in-memory-web-api'; import 'hammerjs'; -import { SharedModule } from './core/modules/shared.module'; +import { SharedModule } from '@fuse/modules/shared.module'; import { AppComponent } from './app.component'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.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 { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; +import { FuseModule } from '@fuse/fuse.module'; +import { config } from './config'; + const appRoutes: Routes = [ { path : 'apps', @@ -52,23 +52,23 @@ const appRoutes: Routes = [ ], imports : [ BrowserModule, - HttpClientModule, BrowserAnimationsModule, + HttpClientModule, RouterModule.forRoot(appRoutes), - SharedModule, TranslateModule.forRoot(), InMemoryWebApiModule.forRoot(FuseFakeDbService, { delay : 0, passThruUnknownUrl: true }), + + SharedModule, + + // Fuse Module + FuseModule.forRoot(config), + AppStoreModule, FuseMainModule ], - providers : [ - FuseSplashScreenService, - FuseConfigService, - FuseNavigationService - ], bootstrap : [ AppComponent ] diff --git a/src/app/config.ts b/src/app/config.ts new file mode 100644 index 00000000..622fa675 --- /dev/null +++ b/src/app/config.ts @@ -0,0 +1,17 @@ +// Default Fuse config +export const config = { + layout : { + navigation : 'left', // 'right', 'left', 'top', 'none' + navigationFolded: false, // true, false + toolbar : 'below', // 'above', 'below', 'none' + footer : 'below', // 'above', 'below', 'none' + mode : 'fullwidth' // 'boxed', 'fullwidth' + }, + colorClasses : { + toolbar: 'mat-white-500-bg', + navbar : 'mat-fuse-dark-700-bg', + footer : 'mat-fuse-dark-900-bg' + }, + customScrollbars: true, + routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft, none +}; diff --git a/src/app/core/services/config.service.ts b/src/app/core/services/config.service.ts deleted file mode 100644 index bd4093a6..00000000 --- a/src/app/core/services/config.service.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { NavigationStart, Router } from '@angular/router'; -import { Platform } from '@angular/cdk/platform'; - -@Injectable() -export class FuseConfigService -{ - settings: any; - defaultSettings: any; - onSettingsChanged: BehaviorSubject; - - /** - * @param router - * @param platform - */ - constructor( - private router: Router, - public platform: Platform - ) - { - // Set the default settings - this.defaultSettings = { - layout : { - navigation : 'left', // 'right', 'left', 'top', 'none' - navigationFolded: false, // true, false - toolbar : 'below', // 'above', 'below', 'none' - footer : 'below', // 'above', 'below', 'none' - mode : 'fullwidth' // 'boxed', 'fullwidth' - }, - colorClasses : { - toolbar: 'mat-white-500-bg', - navbar : 'mat-fuse-dark-700-bg', - footer : 'mat-fuse-dark-900-bg' - }, - customScrollbars: true, - routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft, none - }; - - /** - * Disable Custom Scrollbars if Browser is Mobile - */ - if ( this.platform.ANDROID || this.platform.IOS ) - { - this.defaultSettings.customScrollbars = false; - } - - // Set the settings from the default settings - this.settings = Object.assign({}, this.defaultSettings); - - // Reload the default settings on every navigation start - router.events.subscribe( - (event) => { - if ( event instanceof NavigationStart ) - { - this.setSettings({layout: this.defaultSettings.layout}); - } - } - ); - - // Create the behavior subject - this.onSettingsChanged = new BehaviorSubject(this.settings); - } - - /** - * Sets settings - * @param settings - */ - setSettings(settings) - { - // Set the settings from the given object - this.settings = Object.assign({}, this.settings, settings); - - // Trigger the event - this.onSettingsChanged.next(this.settings); - } -} diff --git a/src/app/main/content/apps/academy/academy.module.ts b/src/app/main/content/apps/academy/academy.module.ts index 20be6f3f..d344986b 100644 --- a/src/app/main/content/apps/academy/academy.module.ts +++ b/src/app/main/content/apps/academy/academy.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseAcademyCoursesComponent } from './courses/courses.component'; import { FuseAcademyCourseComponent } from './course/course.component'; import { AcademyCoursesService } from './courses.service'; diff --git a/src/app/main/content/apps/academy/course.service.ts b/src/app/main/content/apps/academy/course.service.ts index 43b0be44..a39d9d23 100644 --- a/src/app/main/content/apps/academy/course.service.ts +++ b/src/app/main/content/apps/academy/course.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/apps/academy/course/course.component.scss b/src/app/main/content/apps/academy/course/course.component.scss index f9db50fa..075503a4 100644 --- a/src/app/main/content/apps/academy/course/course.component.scss +++ b/src/app/main/content/apps/academy/course/course.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #academy-course { diff --git a/src/app/main/content/apps/academy/course/course.component.ts b/src/app/main/content/apps/academy/course/course.component.ts index 26477405..962ed7b1 100644 --- a/src/app/main/content/apps/academy/course/course.component.ts +++ b/src/app/main/content/apps/academy/course/course.component.ts @@ -1,8 +1,10 @@ import { AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit, QueryList, ViewChildren, ViewEncapsulation } from '@angular/core'; -import { AcademyCourseService } from '../course.service'; import { Subscription } from 'rxjs/Subscription'; -import { FusePerfectScrollbarDirective } from '../../../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; +import { fuseAnimations } from '@fuse/animations'; + +import { AcademyCourseService } from '../course.service'; @Component({ selector : 'fuse-academy-course', diff --git a/src/app/main/content/apps/academy/courses.service.ts b/src/app/main/content/apps/academy/courses.service.ts index a1958286..f803c757 100644 --- a/src/app/main/content/apps/academy/courses.service.ts +++ b/src/app/main/content/apps/academy/courses.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/apps/academy/courses/courses.component.scss b/src/app/main/content/apps/academy/courses/courses.component.scss index b437c44f..b1af425f 100644 --- a/src/app/main/content/apps/academy/courses/courses.component.scss +++ b/src/app/main/content/apps/academy/courses/courses.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #academy-courses { diff --git a/src/app/main/content/apps/academy/courses/courses.component.ts b/src/app/main/content/apps/academy/courses/courses.component.ts index bd5572cc..d86c00cd 100644 --- a/src/app/main/content/apps/academy/courses/courses.component.ts +++ b/src/app/main/content/apps/academy/courses/courses.component.ts @@ -1,5 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; + import { AcademyCoursesService } from '../courses.service'; @Component({ @@ -24,7 +25,6 @@ export class FuseAcademyCoursesComponent implements OnInit, OnDestroy private coursesService: AcademyCoursesService ) { - } ngOnInit() diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts index 64434a06..3cbd2a6e 100644 --- a/src/app/main/content/apps/apps.module.ts +++ b/src/app/main/content/apps/apps.module.ts @@ -1,8 +1,10 @@ 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'; +import { SharedModule } from '@fuse/modules/shared.module'; + const routes = [ { path : 'dashboards/project', diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss index cc8e2d83..91809629 100644 --- a/src/app/main/content/apps/calendar/calendar.component.scss +++ b/src/app/main/content/apps/calendar/calendar.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; @import "node_modules/angular-calendar/scss/angular-calendar"; .cal-month-view { diff --git a/src/app/main/content/apps/calendar/calendar.component.ts b/src/app/main/content/apps/calendar/calendar.component.ts index df07643f..e607fc49 100644 --- a/src/app/main/content/apps/calendar/calendar.component.ts +++ b/src/app/main/content/apps/calendar/calendar.component.ts @@ -1,19 +1,17 @@ -import { startOfDay, endOfDay, subDays, addDays, endOfMonth, isSameDay, isSameMonth, addHours } from 'date-fns'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { FormGroup } from '@angular/forms'; import { Subject } from 'rxjs/Subject'; import { MatDialog, MatDialogRef } from '@angular/material'; +import { startOfDay, isSameDay, isSameMonth } from 'date-fns'; + +import { CalendarEvent, CalendarEventAction, CalendarEventTimesChangedEvent, CalendarMonthViewDay } from 'angular-calendar'; + +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; +import { fuseAnimations } from '@fuse/animations'; + import { FuseCalendarEventFormDialogComponent } from './event-form/event-form.component'; -import { FormGroup } from '@angular/forms'; import { CalendarEventModel } from './event.model'; import { CalendarService } from './calendar.service'; -import { - CalendarEvent, - CalendarEventAction, - CalendarEventTimesChangedEvent, - CalendarMonthViewDay -} from 'angular-calendar'; -import { FuseConfirmDialogComponent } from '../../../../core/components/confirm-dialog/confirm-dialog.component'; -import { fuseAnimations } from '../../../../core/animations'; @Component({ selector : 'fuse-calendar', diff --git a/src/app/main/content/apps/calendar/calendar.module.ts b/src/app/main/content/apps/calendar/calendar.module.ts index 6897a25b..ab75854a 100644 --- a/src/app/main/content/apps/calendar/calendar.module.ts +++ b/src/app/main/content/apps/calendar/calendar.module.ts @@ -1,9 +1,11 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; -import { FuseCalendarComponent } from './calendar.component'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { CalendarService } from './calendar.service'; import { CalendarModule } from 'angular-calendar'; +import { FuseCalendarComponent } from './calendar.component'; import { FuseCalendarEventFormDialogComponent } from './event-form/event-form.component'; const routes: Routes = [ diff --git a/src/app/main/content/apps/calendar/calendar.service.ts b/src/app/main/content/apps/calendar/calendar.service.ts index 8ae8a130..d42f03f5 100644 --- a/src/app/main/content/apps/calendar/calendar.service.ts +++ b/src/app/main/content/apps/calendar/calendar.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; -import { HttpClient } from '@angular/common/http'; @Injectable() export class CalendarService implements Resolve diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.scss b/src/app/main/content/apps/calendar/event-form/event-form.component.scss index dd74c7b8..8449592f 100644 --- a/src/app/main/content/apps/calendar/event-form/event-form.component.scss +++ b/src/app/main/content/apps/calendar/event-form/event-form.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .event-form-dialog { diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.ts b/src/app/main/content/apps/calendar/event-form/event-form.component.ts index 7b9b6aa1..428d5443 100644 --- a/src/app/main/content/apps/calendar/event-form/event-form.component.ts +++ b/src/app/main/content/apps/calendar/event-form/event-form.component.ts @@ -1,9 +1,11 @@ -import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; -import { CalendarEvent } from 'angular-calendar'; +import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; + +import { MatColors } from '@fuse/matColors'; + +import { CalendarEvent } from 'angular-calendar'; import { CalendarEventModel } from '../event.model'; -import { MatColors } from '../../../../../core/matColors'; @Component({ selector : 'fuse-calendar-event-form-dialog', @@ -12,7 +14,7 @@ import { MatColors } from '../../../../../core/matColors'; encapsulation: ViewEncapsulation.None }) -export class FuseCalendarEventFormDialogComponent implements OnInit +export class FuseCalendarEventFormDialogComponent { event: CalendarEvent; dialogTitle: string; @@ -45,10 +47,6 @@ export class FuseCalendarEventFormDialogComponent implements OnInit this.eventForm = this.createEventForm(); } - ngOnInit() - { - } - createEventForm() { return new FormGroup({ diff --git a/src/app/main/content/apps/calendar/event.model.ts b/src/app/main/content/apps/calendar/event.model.ts index 30c9d329..6e121f2e 100644 --- a/src/app/main/content/apps/calendar/event.model.ts +++ b/src/app/main/content/apps/calendar/event.model.ts @@ -1,29 +1,5 @@ -import { - CalendarEventAction -} from 'angular-calendar'; - -import { - startOfDay, - endOfDay, - subDays, - addDays, - endOfMonth, - isSameDay, - isSameMonth, - addHours -} from 'date-fns'; -// import { CalendarEvent } from 'calendar-utils/dist/calendar-utils'; - -/* -export interface EventAction -{ - label: string; - cssClass?: string; - - onClick({event}: { - event: CalendarEvent; - }): any; -}*/ +import { CalendarEventAction } from 'angular-calendar'; +import { startOfDay, endOfDay } from 'date-fns'; export class CalendarEventModel { @@ -70,5 +46,4 @@ export class CalendarEventModel notes : data.meta && data.meta.notes || '' }; } - } diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss index 5c1f5133..c6f0ad4d 100644 --- a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss +++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { display: flex; diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts index 3cc6f8b8..2651c617 100644 --- a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts +++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { fuseAnimations } from '../../../../../core/animations'; +import { Component } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-chat-start', @@ -7,15 +8,9 @@ import { fuseAnimations } from '../../../../../core/animations'; styleUrls : ['./chat-start.component.scss'], animations : fuseAnimations }) -export class FuseChatStartComponent implements OnInit +export class FuseChatStartComponent { - constructor() { } - - ngOnInit() - { - } - } diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts index 92c7bce4..bf687945 100644 --- a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts +++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts @@ -1,7 +1,9 @@ import { AfterViewInit, Component, OnInit, ViewChild, ViewChildren } from '@angular/core'; -import { ChatService } from '../chat.service'; import { NgForm } from '@angular/forms'; -import { FusePerfectScrollbarDirective } from '../../../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; + +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; + +import { ChatService } from '../chat.service'; @Component({ selector : 'fuse-chat-view', diff --git a/src/app/main/content/apps/chat/chat.component.scss b/src/app/main/content/apps/chat/chat.component.scss index f4234a3f..5a317a06 100644 --- a/src/app/main/content/apps/chat/chat.component.scss +++ b/src/app/main/content/apps/chat/chat.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #chat { display: flex; diff --git a/src/app/main/content/apps/chat/chat.component.ts b/src/app/main/content/apps/chat/chat.component.ts index 51cb1971..31005479 100644 --- a/src/app/main/content/apps/chat/chat.component.ts +++ b/src/app/main/content/apps/chat/chat.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; + import { ChatService } from './chat.service'; -import { fuseAnimations } from '../../../../core/animations'; @Component({ selector : 'fuse-chat', diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts index 60ce7f57..71d5f75f 100644 --- a/src/app/main/content/apps/chat/chat.module.ts +++ b/src/app/main/content/apps/chat/chat.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseChatComponent } from './chat.component'; import { ChatService } from './chat.service'; import { FuseChatViewComponent } from './chat-view/chat-view.component'; diff --git a/src/app/main/content/apps/chat/chat.service.ts b/src/app/main/content/apps/chat/chat.service.ts index cc33e2b5..38a76b02 100644 --- a/src/app/main/content/apps/chat/chat.service.ts +++ b/src/app/main/content/apps/chat/chat.service.ts @@ -1,10 +1,12 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '../../../../core/fuseUtils'; + +import { FuseUtils } from '@fuse/fuseUtils'; @Injectable() export class ChatService implements Resolve diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss index 3b9bfb95..a49f5163 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss +++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { display: flex; diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts index f5520c22..191b0ed8 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts @@ -1,8 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { ChatService } from '../../../chat.service'; import { ObservableMedia } from '@angular/flex-layout'; -import { fuseAnimations } from '../../../../../../../core/animations'; -import { FuseMatSidenavHelperService } from '../../../../../../../core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service'; + +import { ChatService } from '../../../chat.service'; @Component({ selector : 'fuse-chat-chats-sidenav', diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.ts b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts index 3ca134ac..0854b6b3 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/left.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { fuseAnimations } from '../../../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; + import { ChatService } from '../../chat.service'; @Component({ diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss index 514d3c39..40d65ae3 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss +++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { display: flex; diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts index 2ef84ffb..21e2f942 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts @@ -1,9 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ChatService } from '../../../chat.service'; import { FormControl, FormGroup } from '@angular/forms'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; +import { ChatService } from '../../../chat.service'; + @Component({ selector : 'fuse-chat-user-sidenav', templateUrl: './user.component.html', diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss index 514d3c39..40d65ae3 100644 --- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss +++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { display: flex; diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts index 834f0299..be6a10a2 100644 --- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; + import { ChatService } from '../../../chat.service'; @Component({ diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.ts b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts index 3d9c33e9..7ed97497 100644 --- a/src/app/main/content/apps/chat/sidenavs/right/right.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { fuseAnimations } from '../../../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; + import { ChatService } from '../../chat.service'; @Component({ diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss b/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss index 95421361..2acde7e5 100644 --- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss +++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .contact-form-dialog { diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.ts b/src/app/main/content/apps/contacts/contact-form/contact-form.component.ts index 434f9c21..767024b5 100644 --- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.ts +++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.ts @@ -1,7 +1,9 @@ -import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; -import { CalendarEvent } from 'angular-calendar'; +import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; + +import { CalendarEvent } from 'angular-calendar'; + import { Contact } from '../contact.model'; @Component({ @@ -11,7 +13,7 @@ import { Contact } from '../contact.model'; encapsulation: ViewEncapsulation.None }) -export class FuseContactsContactFormDialogComponent implements OnInit +export class FuseContactsContactFormDialogComponent { event: CalendarEvent; dialogTitle: string; @@ -41,10 +43,6 @@ export class FuseContactsContactFormDialogComponent implements OnInit this.contactForm = this.createContactForm(); } - ngOnInit() - { - } - createContactForm() { return this.formBuilder.group({ diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss index 44569eb4..511d54ba 100644 --- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss +++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; fuse-contacts-contact-list { flex: 1; diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts index 8eca6913..d6755396 100644 --- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts +++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts @@ -1,13 +1,15 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; -import { ContactsService } from '../contacts.service'; -import { Observable } from 'rxjs/Observable'; -import { FuseContactsContactFormDialogComponent } from '../contact-form/contact-form.component'; -import { MatDialog, MatDialogRef } from '@angular/material'; -import { FuseConfirmDialogComponent } from '../../../../../core/components/confirm-dialog/confirm-dialog.component'; import { FormGroup } from '@angular/forms'; +import { MatDialog, MatDialogRef } from '@angular/material'; import { DataSource } from '@angular/cdk/collections'; -import { fuseAnimations } from '../../../../../core/animations'; import { Subscription } from 'rxjs/Subscription'; +import { Observable } from 'rxjs/Observable'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; + +import { FuseContactsContactFormDialogComponent } from '../contact-form/contact-form.component'; +import { ContactsService } from '../contacts.service'; @Component({ selector : 'fuse-contacts-contact-list', diff --git a/src/app/main/content/apps/contacts/contact.model.ts b/src/app/main/content/apps/contacts/contact.model.ts index bb2fa64e..f23229f4 100644 --- a/src/app/main/content/apps/contacts/contact.model.ts +++ b/src/app/main/content/apps/contacts/contact.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '../../../../core/fuseUtils'; +import { FuseUtils } from '@fuse/fuseUtils'; export class Contact { diff --git a/src/app/main/content/apps/contacts/contacts.component.ts b/src/app/main/content/apps/contacts/contacts.component.ts index 9cf13b58..c18f2149 100644 --- a/src/app/main/content/apps/contacts/contacts.component.ts +++ b/src/app/main/content/apps/contacts/contacts.component.ts @@ -1,12 +1,14 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { ContactsService } from './contacts.service'; -import { fuseAnimations } from '../../../../core/animations'; import { FormControl, FormGroup } from '@angular/forms'; -import { FuseContactsContactFormDialogComponent } from './contact-form/contact-form.component'; -import { MatDialog } from '@angular/material'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { Subscription } from 'rxjs/Subscription'; +import { MatDialog } from '@angular/material'; + +import { fuseAnimations } from '@fuse/animations'; + +import { FuseContactsContactFormDialogComponent } from './contact-form/contact-form.component'; +import { ContactsService } from './contacts.service'; @Component({ selector : 'fuse-contacts', diff --git a/src/app/main/content/apps/contacts/contacts.module.ts b/src/app/main/content/apps/contacts/contacts.module.ts index b069f979..8c93248d 100644 --- a/src/app/main/content/apps/contacts/contacts.module.ts +++ b/src/app/main/content/apps/contacts/contacts.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseContactsMainSidenavComponent } from './sidenavs/main/main.component'; import { FuseContactsComponent } from './contacts.component'; import { ContactsService } from './contacts.service'; diff --git a/src/app/main/content/apps/contacts/contacts.service.ts b/src/app/main/content/apps/contacts/contacts.service.ts index aa1ff0c2..80e8ddf7 100644 --- a/src/app/main/content/apps/contacts/contacts.service.ts +++ b/src/app/main/content/apps/contacts/contacts.service.ts @@ -1,12 +1,14 @@ import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { HttpClient } from '@angular/common/http'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { Contact } from './contact.model'; -import { FuseUtils } from '../../../../core/fuseUtils'; import { Subject } from 'rxjs/Subject'; +import { FuseUtils } from '@fuse/fuseUtils'; + +import { Contact } from './contact.model'; + @Injectable() export class ContactsService implements Resolve { diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss index 40c33970..c12b9dc5 100644 --- a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss +++ b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { flex: 1; diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts index a3ec2f28..d9c09a5b 100644 --- a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts +++ b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts @@ -1,14 +1,16 @@ -import { Component, OnInit } from '@angular/core'; -import { ContactsService } from '../contacts.service'; +import { Component } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material'; -import { FuseConfirmDialogComponent } from '../../../../../core/components/confirm-dialog/confirm-dialog.component'; + +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; + +import { ContactsService } from '../contacts.service'; @Component({ selector : 'fuse-selected-bar', templateUrl: './selected-bar.component.html', styleUrls : ['./selected-bar.component.scss'] }) -export class FuseContactsSelectedBarComponent implements OnInit +export class FuseContactsSelectedBarComponent { selectedContacts: string[]; hasSelectedContacts: boolean; @@ -31,10 +33,6 @@ export class FuseContactsSelectedBarComponent implements OnInit } - ngOnInit() - { - } - selectAll() { this.contactsService.selectContacts(); diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss b/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss index c239a34f..97c837bf 100644 --- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss +++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { display: flex; diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts b/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts index 0f6f8957..ee1ec293 100644 --- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts +++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts @@ -1,7 +1,8 @@ import { Component, OnDestroy } from '@angular/core'; -import { ContactsService } from '../../contacts.service'; import { Subscription } from 'rxjs/Subscription'; +import { ContactsService } from '../../contacts.service'; + @Component({ selector : 'fuse-contacts-main-sidenav', templateUrl: './main.component.html', @@ -11,6 +12,7 @@ export class FuseContactsMainSidenavComponent implements OnDestroy { user: any; filterBy: string; + onUserDataChangedSubscription: Subscription; constructor(private contactsService: ContactsService) diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.scss b/src/app/main/content/apps/dashboards/analytics/analytics.component.scss index 60e4858d..8cb97053 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.component.scss +++ b/src/app/main/content/apps/dashboards/analytics/analytics.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #dashboard-analytics { diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.ts b/src/app/main/content/apps/dashboards/analytics/analytics.component.ts index f4bb947b..c1b78979 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.component.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.component.ts @@ -1,7 +1,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { AnalyticsDashboardService } from './analytics.service'; -import { fuseAnimations } from '../../../../../core/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-analytics-dashboard', diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts index 7466e8b0..f1a36f4b 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts @@ -1,12 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '../../../../../core/modules/shared.module'; + import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; + import { FuseAnalyticsDashboardComponent } from './analytics.component'; import { AnalyticsDashboardService } from './analytics.service'; -import { FuseWidgetModule } from '../../../../../core/components/widget/widget.module'; + const routes: Routes = [ { diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.service.ts b/src/app/main/content/apps/dashboards/analytics/analytics.service.ts index ef95bd6c..cceb7cbe 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.service.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; @Injectable() export class AnalyticsDashboardService implements Resolve diff --git a/src/app/main/content/apps/dashboards/project/project.component.ts b/src/app/main/content/apps/dashboards/project/project.component.ts index 3f839db3..b6ed6bf6 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.ts +++ b/src/app/main/content/apps/dashboards/project/project.component.ts @@ -1,11 +1,12 @@ -import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import * as shape from 'd3-shape'; +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { DataSource } from '@angular/cdk/collections'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Observable } from 'rxjs/Observable'; -import { DataSource } from '@angular/cdk/collections'; +import * as shape from 'd3-shape'; + +import { fuseAnimations } from '@fuse/animations'; import { ProjectDashboardService } from './project.service'; -import { fuseAnimations } from '../../../../../core/animations'; @Component({ selector : 'fuse-project-dashboard', @@ -14,7 +15,7 @@ import { fuseAnimations } from '../../../../../core/animations'; encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) -export class FuseProjectDashboardComponent implements OnInit, OnDestroy +export class FuseProjectDashboardComponent implements OnInit { projects: any[]; selectedProject: any; @@ -147,11 +148,6 @@ export class FuseProjectDashboardComponent implements OnInit, OnDestroy this.widget11.onContactsChanged.next(this.widgets.widget11.table.rows); this.widget11.dataSource = new FilesDataSource(this.widget11); } - - ngOnDestroy() - { - } - } export class FilesDataSource extends DataSource 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 f2d40046..1909a159 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -1,11 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '../../../../../core/modules/shared.module'; + +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseProjectDashboardComponent } from './project.component'; import { ProjectDashboardService } from './project.service'; -import { FuseWidgetModule } from '../../../../../core/components/widget/widget.module'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; const routes: Routes = [ { diff --git a/src/app/main/content/apps/dashboards/project/project.service.ts b/src/app/main/content/apps/dashboards/project/project.service.ts index 3489f3b3..05010603 100644 --- a/src/app/main/content/apps/dashboards/project/project.service.ts +++ b/src/app/main/content/apps/dashboards/project/project.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; @Injectable() export class ProjectDashboardService implements Resolve diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts b/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts index 21090f89..5039c66f 100644 --- a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts +++ b/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts @@ -1,6 +1,8 @@ -import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; + import { EcommerceDashboardService } from './dashboard.service'; -import { fuseAnimations } from '../../../../../core/animations'; @Component({ selector : 'fuse-e-commerce-dashboard', @@ -9,7 +11,7 @@ import { fuseAnimations } from '../../../../../core/animations'; encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) -export class FuseEcommerceDashboardComponent implements OnInit, OnDestroy +export class FuseEcommerceDashboardComponent { projects: any[]; selectedProject: any; @@ -72,14 +74,4 @@ export class FuseEcommerceDashboardComponent implements OnInit, OnDestroy }; } - - ngOnInit() - { - } - - ngOnDestroy() - { - } - } - diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts b/src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts index 8ef2f754..3011c989 100644 --- a/src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts +++ b/src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; @Injectable() export class EcommerceDashboardService implements Resolve diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/content/apps/e-commerce/e-commerce.module.ts index 96a599a2..ac6763ef 100644 --- a/src/app/main/content/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/content/apps/e-commerce/e-commerce.module.ts @@ -1,10 +1,14 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; + import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { AgmCoreModule } from '@agm/core'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; + import { FuseEcommerceDashboardComponent } from './dashboard/dashboard.component'; import { EcommerceDashboardService } from './dashboard/dashboard.service'; -import { SharedModule } from '../../../../core/modules/shared.module'; -import { FuseWidgetModule } from '../../../../core/components/widget/widget.module'; import { FuseEcommerceProductsComponent } from './products/products.component'; import { EcommerceProductsService } from './products/products.service'; import { FuseEcommerceProductComponent } from './product/product.component'; @@ -13,7 +17,6 @@ import { FuseEcommerceOrdersComponent } from './orders/orders.component'; import { EcommerceOrdersService } from './orders/orders.service'; import { FuseEcommerceOrderComponent } from './order/order.component'; import { EcommerceOrderService } from './order/order.service'; -import { AgmCoreModule } from '@agm/core'; const routes: Routes = [ { @@ -58,7 +61,6 @@ const routes: Routes = [ data: EcommerceOrderService } } - ]; @NgModule({ diff --git a/src/app/main/content/apps/e-commerce/order/order.component.scss b/src/app/main/content/apps/e-commerce/order/order.component.scss index 158b8f92..928b0f0b 100644 --- a/src/app/main/content/apps/e-commerce/order/order.component.scss +++ b/src/app/main/content/apps/e-commerce/order/order.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #order { diff --git a/src/app/main/content/apps/e-commerce/order/order.component.ts b/src/app/main/content/apps/e-commerce/order/order.component.ts index 85e0e90b..9117ab84 100644 --- a/src/app/main/content/apps/e-commerce/order/order.component.ts +++ b/src/app/main/content/apps/e-commerce/order/order.component.ts @@ -1,6 +1,5 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { EcommerceOrderService } from './order.service'; -import { fuseAnimations } from '../../../../../core/animations'; +import { FormBuilder, FormGroup } from '@angular/forms'; import 'rxjs/add/operator/startWith'; import 'rxjs/add/observable/merge'; import 'rxjs/add/operator/map'; @@ -8,8 +7,11 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + import { Order } from './order.model'; -import { FormBuilder, FormGroup } from '@angular/forms'; +import { EcommerceOrderService } from './order.service'; import { orderStatuses } from './order-statuses'; @Component({ @@ -48,6 +50,11 @@ export class FuseEcommerceOrderComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onOrderChanged.unsubscribe(); + } + updateStatus() { const newStatusId = Number.parseInt(this.statusForm.get('newStatus').value); @@ -65,9 +72,4 @@ export class FuseEcommerceOrderComponent implements OnInit, OnDestroy this.order.status.unshift(newStatus); } - - ngOnDestroy() - { - this.onOrderChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/e-commerce/order/order.model.ts b/src/app/main/content/apps/e-commerce/order/order.model.ts index 9423a05f..0962ceba 100644 --- a/src/app/main/content/apps/e-commerce/order/order.model.ts +++ b/src/app/main/content/apps/e-commerce/order/order.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '../../../../../core/fuseUtils'; +import { FuseUtils } from '@fuse/fuseUtils'; export class Order { diff --git a/src/app/main/content/apps/e-commerce/order/order.service.ts b/src/app/main/content/apps/e-commerce/order/order.service.ts index 3b30d04d..061302dc 100644 --- a/src/app/main/content/apps/e-commerce/order/order.service.ts +++ b/src/app/main/content/apps/e-commerce/order/order.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.ts b/src/app/main/content/apps/e-commerce/orders/orders.component.ts index 87a3a3c3..9a38d88e 100644 --- a/src/app/main/content/apps/e-commerce/orders/orders.component.ts +++ b/src/app/main/content/apps/e-commerce/orders/orders.component.ts @@ -1,9 +1,7 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { EcommerceOrdersService } from './orders.service'; +import { MatPaginator, MatSort } from '@angular/material'; import { DataSource } from '@angular/cdk/collections'; import { Observable } from 'rxjs/Observable'; -import { fuseAnimations } from '../../../../../core/animations'; -import { MatPaginator, MatSort } from '@angular/material'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import 'rxjs/add/operator/startWith'; import 'rxjs/add/observable/merge'; @@ -11,7 +9,11 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; -import { FuseUtils } from '../../../../../core/fuseUtils'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseUtils } from '@fuse/fuseUtils'; + +import { EcommerceOrdersService } from './orders.service'; @Component({ selector : 'fuse-e-commerce-orders', diff --git a/src/app/main/content/apps/e-commerce/orders/orders.service.ts b/src/app/main/content/apps/e-commerce/orders/orders.service.ts index 08fe8075..96786444 100644 --- a/src/app/main/content/apps/e-commerce/orders/orders.service.ts +++ b/src/app/main/content/apps/e-commerce/orders/orders.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/apps/e-commerce/product/product.component.ts b/src/app/main/content/apps/e-commerce/product/product.component.ts index 8d6204c4..79a7619c 100644 --- a/src/app/main/content/apps/e-commerce/product/product.component.ts +++ b/src/app/main/content/apps/e-commerce/product/product.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { EcommerceProductService } from './product.service'; -import { fuseAnimations } from '../../../../../core/animations'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { MatSnackBar } from '@angular/material'; + import 'rxjs/add/operator/startWith'; import 'rxjs/add/observable/merge'; import 'rxjs/add/operator/map'; @@ -8,10 +9,12 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseUtils } from '@fuse/fuseUtils'; + import { Product } from './product.model'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { FuseUtils } from '../../../../../core/fuseUtils'; -import { MatSnackBar } from '@angular/material'; +import { EcommerceProductService } from './product.service'; import { Location } from '@angular/common'; @Component({ @@ -35,7 +38,6 @@ export class FuseEcommerceProductComponent implements OnInit, OnDestroy private location: Location ) { - } ngOnInit() @@ -58,7 +60,11 @@ export class FuseEcommerceProductComponent implements OnInit, OnDestroy this.productForm = this.createProductForm(); }); + } + ngOnDestroy() + { + this.onProductChanged.unsubscribe(); } createProductForm() @@ -124,9 +130,4 @@ export class FuseEcommerceProductComponent implements OnInit, OnDestroy this.location.go('apps/e-commerce/products/' + this.product.id + '/' + this.product.handle); }); } - - ngOnDestroy() - { - this.onProductChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/e-commerce/product/product.model.ts b/src/app/main/content/apps/e-commerce/product/product.model.ts index 1fa520dc..4a382b94 100644 --- a/src/app/main/content/apps/e-commerce/product/product.model.ts +++ b/src/app/main/content/apps/e-commerce/product/product.model.ts @@ -1,6 +1,7 @@ -import { FuseUtils } from '../../../../../core/fuseUtils'; import { MatChipInputEvent } from '@angular/material'; +import { FuseUtils } from '@fuse/fuseUtils'; + export class Product { id: string; diff --git a/src/app/main/content/apps/e-commerce/product/product.service.ts b/src/app/main/content/apps/e-commerce/product/product.service.ts index d763c784..8c19b01f 100644 --- a/src/app/main/content/apps/e-commerce/product/product.service.ts +++ b/src/app/main/content/apps/e-commerce/product/product.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/apps/e-commerce/products/products.component.scss b/src/app/main/content/apps/e-commerce/products/products.component.scss index f0b1acd1..67200e60 100644 --- a/src/app/main/content/apps/e-commerce/products/products.component.scss +++ b/src/app/main/content/apps/e-commerce/products/products.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/apps/e-commerce/products/products.component.ts b/src/app/main/content/apps/e-commerce/products/products.component.ts index b16f585a..329d93fa 100644 --- a/src/app/main/content/apps/e-commerce/products/products.component.ts +++ b/src/app/main/content/apps/e-commerce/products/products.component.ts @@ -1,17 +1,20 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { EcommerceProductsService } from './products.service'; -import { DataSource } from '@angular/cdk/collections'; -import { Observable } from 'rxjs/Observable'; -import { fuseAnimations } from '../../../../../core/animations'; import { MatPaginator, MatSort } from '@angular/material'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { DataSource } from '@angular/cdk/collections'; + import 'rxjs/add/operator/startWith'; import 'rxjs/add/observable/merge'; import 'rxjs/add/operator/map'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; -import { FuseUtils } from '../../../../../core/fuseUtils'; +import { Observable } from 'rxjs/Observable'; +import { BehaviorSubject } from 'rxjs/BehaviorSubject'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseUtils } from '@fuse/fuseUtils'; + +import { EcommerceProductsService } from './products.service'; @Component({ selector : 'fuse-e-commerce-products', diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.scss b/src/app/main/content/apps/file-manager/file-list/file-list.component.scss index 69f5f5b8..b598536b 100644 --- a/src/app/main/content/apps/file-manager/file-list/file-list.component.scss +++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { width: 100%; diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts index 15d1d560..22643031 100644 --- a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts +++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts @@ -1,8 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { FileManagerService } from '../file-manager.service'; -import { Observable } from 'rxjs/Observable'; import { DataSource } from '@angular/cdk/collections'; -import { fuseAnimations } from '../../../../../core/animations'; +import { Observable } from 'rxjs/Observable'; + +import { FileManagerService } from '../file-manager.service'; +import { fuseAnimations } from '@fuse/animations/index'; @Component({ selector : 'fuse-file-list', diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss index 7148980a..702683d2 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.scss +++ b/src/app/main/content/apps/file-manager/file-manager.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #file-manager { diff --git a/src/app/main/content/apps/file-manager/file-manager.component.ts b/src/app/main/content/apps/file-manager/file-manager.component.ts index 3374fc48..d7a76819 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.ts +++ b/src/app/main/content/apps/file-manager/file-manager.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; + import { FileManagerService } from './file-manager.service'; -import { fuseAnimations } from '../../../../core/animations'; @Component({ selector : 'fuse-file-manager', @@ -11,7 +13,6 @@ import { fuseAnimations } from '../../../../core/animations'; }) export class FuseFileManagerComponent implements OnInit { - selected: any; pathArr: string[]; @@ -26,5 +27,4 @@ export class FuseFileManagerComponent implements OnInit this.pathArr = selected.location.split('>'); }); } - } diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts index b5676630..dc208ca2 100644 --- a/src/app/main/content/apps/file-manager/file-manager.module.ts +++ b/src/app/main/content/apps/file-manager/file-manager.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseFileManagerComponent } from './file-manager.component'; import { FileManagerService } from './file-manager.service'; import { FuseFileManagerFileListComponent } from './file-list/file-list.component'; diff --git a/src/app/main/content/apps/file-manager/file-manager.service.ts b/src/app/main/content/apps/file-manager/file-manager.service.ts index b1145636..d555a06c 100644 --- a/src/app/main/content/apps/file-manager/file-manager.service.ts +++ b/src/app/main/content/apps/file-manager/file-manager.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() @@ -16,6 +17,7 @@ export class FileManagerService implements Resolve /** * The File Manager App Main Resolver + * * @param {ActivatedRouteSnapshot} route * @param {RouterStateSnapshot} state * @returns {Observable | Promise | any} diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts index ced23ac0..61385322 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts +++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations/index'; + import { FileManagerService } from '../../file-manager.service'; -import { fuseAnimations } from '../../../../../../core/animations'; @Component({ selector : 'fuse-file-manager-details-sidenav', diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts index e865b97f..eea05124 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts +++ b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts @@ -1,21 +1,15 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'fuse-file-manager-main-sidenav', templateUrl: './main.component.html', styleUrls : ['./main.component.scss'] }) -export class FuseFileManagerMainSidenavComponent implements OnInit +export class FuseFileManagerMainSidenavComponent { selected: any; constructor() { - } - - ngOnInit() - { - } - } diff --git a/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts b/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts index a5ae8286..65286173 100644 --- a/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts +++ b/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts @@ -1,6 +1,6 @@ -import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; @Component({ selector : 'fuse-mail-compose', @@ -8,7 +8,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; styleUrls : ['./compose.component.scss'], encapsulation: ViewEncapsulation.None }) -export class FuseMailNgrxComposeDialogComponent implements OnInit +export class FuseMailNgrxComposeDialogComponent { composeForm: FormGroup; @@ -20,11 +20,7 @@ export class FuseMailNgrxComposeDialogComponent implements OnInit { this.composeForm = this.createComposeForm(); } - - ngOnInit() - { - } - + createComposeForm() { return this.formBuilder.group({ diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss index eaabb60a..173accb2 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss +++ b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { display: flex; diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts index 9376298b..e53cfb4a 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts +++ b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts @@ -1,7 +1,8 @@ -import { ChangeDetectionStrategy, Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; -import { Mail } from '../mail.model'; -import { Observable } from 'rxjs/Observable'; +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs/Observable'; + +import { Mail } from '../mail.model'; import * as fromStore from '../store'; import { MailNgrxService } from '../mail.service'; @@ -11,7 +12,7 @@ import { MailNgrxService } from '../mail.service'; styleUrls : ['./mail-details.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class FuseMailNgrxDetailsComponent implements OnInit, OnDestroy, OnChanges +export class FuseMailNgrxDetailsComponent implements OnChanges { labels$: Observable; @Input('mail') mailInput: Mail; @@ -26,10 +27,6 @@ export class FuseMailNgrxDetailsComponent implements OnInit, OnDestroy, OnChange this.labels$ = this.store.select(fromStore.getLabelsArr); } - ngOnInit() - { - } - ngOnChanges() { this.updateModel(this.mailInput); @@ -43,7 +40,6 @@ export class FuseMailNgrxDetailsComponent implements OnInit, OnDestroy, OnChange this.mail.markRead(); this.updateMail(); } - } toggleStar(event) @@ -70,8 +66,4 @@ export class FuseMailNgrxDetailsComponent implements OnInit, OnDestroy, OnChange this.store.dispatch(new fromStore.UpdateMail(this.mail)); this.updateModel(this.mail); } - - ngOnDestroy() - { - } } diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss index 7d33476a..89566a09 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss +++ b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { flex-shrink: 0; diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts index d92d83c8..a6f3e792 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts +++ b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts @@ -1,8 +1,9 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnDestroy, OnInit } from '@angular/core'; -import { Mail } from '../../mail.model'; -import { MailNgrxService } from '../../mail.service'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; + +import { MailNgrxService } from '../../mail.service'; +import { Mail } from '../../mail.model'; import * as fromStore from '../../store'; @Component({ @@ -11,7 +12,7 @@ import * as fromStore from '../../store'; styleUrls : ['./mail-list-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class FuseMailNgrxListItemComponent implements OnInit, OnDestroy +export class FuseMailNgrxListItemComponent implements OnInit { @Input() mail: Mail; @HostBinding('class.selected') selected: boolean; @@ -51,8 +52,4 @@ export class FuseMailNgrxListItemComponent implements OnInit, OnDestroy { this.store.dispatch(new fromStore.ToggleInSelectedMails(this.mail.id)); } - - ngOnDestroy() - { - } } diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts index fd9b3987..0b1c0ac7 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts +++ b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts @@ -1,6 +1,7 @@ -import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Mail } from '../mail.model'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; + +import { Mail } from '../mail.model'; import { MailNgrxService } from '../mail.service'; @Component({ @@ -9,7 +10,7 @@ import { MailNgrxService } from '../mail.service'; styleUrls : ['./mail-list.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class FuseMailNgrxListComponent implements OnInit, OnDestroy +export class FuseMailNgrxListComponent { @Input() mails: Mail[]; @Input() currentMail: Mail[]; @@ -22,10 +23,6 @@ export class FuseMailNgrxListComponent implements OnInit, OnDestroy { } - ngOnInit() - { - } - /** * Read mail * @param mailId @@ -49,8 +46,4 @@ export class FuseMailNgrxListComponent implements OnInit, OnDestroy this.router.navigate(['apps/mail-ngrx/' + folderHandle + '/' + mailId]); } } - - ngOnDestroy() - { - } } diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.scss b/src/app/main/content/apps/mail-ngrx/mail.component.scss index 9a355577..cca33765 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.component.scss +++ b/src/app/main/content/apps/mail-ngrx/mail.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { width: 100%; diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.ts b/src/app/main/content/apps/mail-ngrx/mail.component.ts index 03ec38f0..6a154721 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.component.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.component.ts @@ -1,16 +1,18 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { MailNgrxService } from './mail.service'; import { FormControl } from '@angular/forms'; -import { Mail } from './mail.model'; -import { FuseTranslationLoaderService } from '../../../../core/services/translation-loader.service'; -import { locale as english } from './i18n/en'; -import { locale as turkish } from './i18n/tr'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; + +import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; +import { FuseConfigService } from '@fuse/services/config.service'; + +import { MailNgrxService } from './mail.service'; +import { Mail } from './mail.model'; import * as fromStore from './store'; -import { FuseConfigService } from '../../../../core/services/config.service'; +import { locale as english } from './i18n/en'; +import { locale as turkish } from './i18n/tr'; @Component({ selector : 'fuse-mail', @@ -51,8 +53,8 @@ export class FuseMailNgrxComponent implements OnInit, OnDestroy this.mails = []; this.selectedMailIds = []; - this.configService.setSettings({ - routerAnimation: 'none' + this.configService.setConfig({ + routerAnimation: 'none' }); } @@ -82,6 +84,11 @@ export class FuseMailNgrxComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.cd.detach(); + } + toggleSelectAll(ev) { ev.preventDefault(); @@ -133,9 +140,4 @@ export class FuseMailNgrxComponent implements OnInit, OnDestroy { this.cd.markForCheck(); } - - ngOnDestroy() - { - this.cd.detach(); - } } diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/content/apps/mail-ngrx/mail.module.ts index e3f3a2fc..541a39a3 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseMailNgrxComponent } from './mail.component'; import { FuseMailNgrxMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; import { FuseMailNgrxListItemComponent } from './mail-list/mail-list-item/mail-list-item.component'; @@ -8,8 +10,8 @@ import { FuseMailNgrxListComponent } from './mail-list/mail-list.component'; import { FuseMailNgrxDetailsComponent } from './mail-details/mail-details.component'; import { MailNgrxService } from './mail.service'; import { FuseMailNgrxComposeDialogComponent } from './dialogs/compose/compose.component'; -import { MailAppStoreModule } from './store/store.module'; import * as fromGuards from './store/guards/index'; +import { MailAppStoreModule } from './store/store.module'; const routes: Routes = [ { diff --git a/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts index b261d20a..d8cf1fb2 100644 --- a/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts @@ -1,11 +1,13 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; -import { FuseMailNgrxComposeDialogComponent } from '../../dialogs/compose/compose.component'; import { MatDialog } from '@angular/material'; import { FormGroup } from '@angular/forms'; + import { Observable } from 'rxjs/Observable'; import { Store } from '@ngrx/store'; -import * as fromStore from './../../store'; + import { MailNgrxService } from '../../mail.service'; +import * as fromStore from './../../store'; +import { FuseMailNgrxComposeDialogComponent } from '../../dialogs/compose/compose.component'; @Component({ selector : 'fuse-mail-main-sidenav', @@ -13,7 +15,7 @@ import { MailNgrxService } from '../../mail.service'; styleUrls : ['./main-sidenav.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class FuseMailNgrxMainSidenavComponent implements OnInit, OnDestroy +export class FuseMailNgrxMainSidenavComponent { labels: any[]; accounts: object; @@ -43,10 +45,6 @@ export class FuseMailNgrxMainSidenavComponent implements OnInit, OnDestroy this.labels$ = this.store.select(fromStore.getLabelsArr); } - ngOnInit() - { - } - composeDialog() { this.dialogRef = this.dialog.open(FuseMailNgrxComposeDialogComponent, { @@ -77,8 +75,4 @@ export class FuseMailNgrxMainSidenavComponent implements OnInit, OnDestroy } }); } - - ngOnDestroy() - { - } } diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts b/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts index 3faf8d32..99259a7d 100644 --- a/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts +++ b/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { of } from 'rxjs/observable/of'; import { map, mergeMap, exhaustMap, withLatestFrom } from 'rxjs/operators'; import 'rxjs/add/operator/debounceTime'; -import { getRouterState, State } from '../../../../../../store/reducers'; +import { getRouterState, State } from 'app/store/reducers'; import { getMailsState } from '../selectors'; import * as MailsActions from '../actions/mails.actions'; import * as fromRoot from '../../../../../../store'; diff --git a/src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts b/src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts index 46c35ebd..703496df 100644 --- a/src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts +++ b/src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts @@ -9,7 +9,7 @@ import { MailAppState } from '../reducers'; import * as fromStore from '../index'; import { getFiltersLoaded, getFoldersLoaded, getLabelsLoaded, getMailsLoaded } from '../selectors'; import { RouterStateSnapshot } from '@angular/router/src/router_state'; -import { getRouterState } from '../../../../../../store/reducers'; +import { getRouterState } from 'app/store/reducers'; @Injectable() export class ResolveGuard implements CanActivate diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts index 2830a57f..af598b08 100644 --- a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts +++ b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts @@ -1,6 +1,7 @@ +import { FuseUtils } from '@fuse/fuseUtils'; + import { createSelector } from '@ngrx/store'; import { getMailAppState, MailAppState, MailsState } from '../reducers'; -import { FuseUtils } from '../../../../../../core/fuseUtils'; export const getMailsState = createSelector( getMailAppState, diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss index ac8305da..2338f619 100644 --- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss +++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .mail-compose-dialog { diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts b/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts index 465298b8..b206345c 100644 --- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts +++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts @@ -1,6 +1,6 @@ -import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; @Component({ selector : 'fuse-mail-compose', @@ -8,7 +8,7 @@ import { FormControl, FormGroup } from '@angular/forms'; styleUrls : ['./compose.component.scss'], encapsulation: ViewEncapsulation.None }) -export class FuseMailComposeDialogComponent implements OnInit +export class FuseMailComposeDialogComponent { showExtraToFields = false; composeForm: FormGroup; @@ -21,10 +21,6 @@ export class FuseMailComposeDialogComponent implements OnInit this.composeForm = this.createComposeForm(); } - ngOnInit() - { - } - createComposeForm() { return new FormGroup({ diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.scss b/src/app/main/content/apps/mail/mail-details/mail-details.component.scss index eaabb60a..173accb2 100644 --- a/src/app/main/content/apps/mail/mail-details/mail-details.component.scss +++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { display: flex; diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts index ac475616..a990e496 100644 --- a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts +++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts @@ -1,8 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MailService } from '../mail.service'; -import { Mail } from '../mail.model'; import { Subscription } from 'rxjs/Subscription'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; + +import { Mail } from '../mail.model'; +import { MailService } from '../mail.service'; @Component({ selector : 'fuse-mail-details', diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss index 45676aff..7c068432 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss +++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { flex-shrink: 0; diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts index 4d6d2762..5062a48d 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts +++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts @@ -1,7 +1,8 @@ import { Component, HostBinding, Input, OnDestroy, OnInit } from '@angular/core'; +import { Subscription } from 'rxjs/Subscription'; + import { Mail } from '../../mail.model'; import { MailService } from '../../mail.service'; -import { Subscription } from 'rxjs/Subscription'; @Component({ selector : 'fuse-mail-list-item', diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts index 54eb8985..d2e7b177 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts +++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts @@ -1,10 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Mail } from '../mail.model'; -import { ActivatedRoute } from '@angular/router'; -import { MailService } from '../mail.service'; import { Location } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; + +import { Mail } from '../mail.model'; +import { MailService } from '../mail.service'; @Component({ selector : 'fuse-mail-list', diff --git a/src/app/main/content/apps/mail/mail.component.scss b/src/app/main/content/apps/mail/mail.component.scss index 9a355577..cca33765 100644 --- a/src/app/main/content/apps/mail/mail.component.scss +++ b/src/app/main/content/apps/mail/mail.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { width: 100%; diff --git a/src/app/main/content/apps/mail/mail.component.ts b/src/app/main/content/apps/mail/mail.component.ts index 9d3ead99..d9abe16f 100644 --- a/src/app/main/content/apps/mail/mail.component.ts +++ b/src/app/main/content/apps/mail/mail.component.ts @@ -1,11 +1,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MailService } from './mail.service'; -import { Subscription } from 'rxjs/Subscription'; import { FormControl } from '@angular/forms'; -import { Mail } from './mail.model'; -import { FuseTranslationLoaderService } from '../../../../core/services/translation-loader.service'; +import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; + +import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; + +import { Mail } from './mail.model'; +import { MailService } from './mail.service'; import { locale as english } from './i18n/en'; import { locale as turkish } from './i18n/tr'; diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts index 9c202bf2..822cd233 100644 --- a/src/app/main/content/apps/mail/mail.module.ts +++ b/src/app/main/content/apps/mail/mail.module.ts @@ -1,12 +1,14 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + +import { MailService } from './mail.service'; import { FuseMailComponent } from './mail.component'; import { FuseMailMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; import { FuseMailListItemComponent } from './mail-list/mail-list-item/mail-list-item.component'; import { FuseMailListComponent } from './mail-list/mail-list.component'; import { FuseMailDetailsComponent } from './mail-details/mail-details.component'; -import { MailService } from './mail.service'; import { FuseMailComposeDialogComponent } from './dialogs/compose/compose.component'; const routes: Routes = [ diff --git a/src/app/main/content/apps/mail/mail.service.ts b/src/app/main/content/apps/mail/mail.service.ts index 4a220f52..826f3df1 100644 --- a/src/app/main/content/apps/mail/mail.service.ts +++ b/src/app/main/content/apps/mail/mail.service.ts @@ -1,10 +1,13 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; -import { Mail } from './mail.model'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '../../../../core/fuseUtils'; + +import { FuseUtils } from '@fuse/fuseUtils'; + +import { Mail } from './mail.model'; @Injectable() export class MailService implements Resolve diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts index 1776b428..395c27fc 100644 --- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts @@ -1,10 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MailService } from '../../mail.service'; -import { Subscription } from 'rxjs/Subscription'; -import { FuseMailComposeDialogComponent } from '../../dialogs/compose/compose.component'; -import { MatDialog } from '@angular/material'; import { FormGroup } from '@angular/forms'; -import { fuseAnimations } from '../../../../../../core/animations'; +import { MatDialog } from '@angular/material'; +import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + +import { MailService } from '../../mail.service'; +import { FuseMailComposeDialogComponent } from '../../dialogs/compose/compose.component'; @Component({ selector : 'fuse-mail-main-sidenav', @@ -60,6 +62,13 @@ export class FuseMailMainSidenavComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onFoldersChanged.unsubscribe(); + this.onFiltersChanged.unsubscribe(); + this.onLabelsChanged.unsubscribe(); + } + composeDialog() { this.dialogRef = this.dialog.open(FuseMailComposeDialogComponent, { @@ -90,11 +99,4 @@ export class FuseMailMainSidenavComponent implements OnInit, OnDestroy } }); } - - ngOnDestroy() - { - this.onFoldersChanged.unsubscribe(); - this.onFiltersChanged.unsubscribe(); - this.onLabelsChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/board.model.ts b/src/app/main/content/apps/scrumboard/board.model.ts index c1b35513..bd62d4fe 100644 --- a/src/app/main/content/apps/scrumboard/board.model.ts +++ b/src/app/main/content/apps/scrumboard/board.model.ts @@ -1,4 +1,5 @@ -import { FuseUtils } from '../../../../core/fuseUtils'; +import { FuseUtils } from '@fuse/fuseUtils'; + import { List } from './list.model'; import { Card } from './card.model'; diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts index 0af6c819..fc0fcddb 100644 --- a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts +++ b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; @Component({ @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; templateUrl: './add-list.component.html', styleUrls : ['./add-list.component.scss'] }) -export class FuseScrumboardBoardAddListComponent implements OnInit +export class FuseScrumboardBoardAddListComponent { formActive = false; form: FormGroup; @@ -18,12 +18,7 @@ export class FuseScrumboardBoardAddListComponent implements OnInit ) { } - - ngOnInit() - { - - } - + openForm() { this.form = this.formBuilder.group({ diff --git a/src/app/main/content/apps/scrumboard/board/board.component.scss b/src/app/main/content/apps/scrumboard/board/board.component.scss index f0030971..6e77294a 100644 --- a/src/app/main/content/apps/scrumboard/board/board.component.scss +++ b/src/app/main/content/apps/scrumboard/board/board.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/apps/scrumboard/board/board.component.ts b/src/app/main/content/apps/scrumboard/board/board.component.ts index 91c9ec7a..41b9f463 100644 --- a/src/app/main/content/apps/scrumboard/board/board.component.ts +++ b/src/app/main/content/apps/scrumboard/board/board.component.ts @@ -1,10 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { ScrumboardService } from '../scrumboard.service'; -import { Subscription } from 'rxjs/Subscription'; import { Location } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; +import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + import { List } from '../list.model'; -import { fuseAnimations } from '../../../../../core/animations'; +import { ScrumboardService } from '../scrumboard.service'; @Component({ selector : 'fuse-scrumboard-board', @@ -34,6 +36,11 @@ export class FuseScrumboardBoardComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onBoardChanged.unsubscribe(); + } + onListAdd(newListName) { if ( newListName === '' ) @@ -54,9 +61,4 @@ export class FuseScrumboardBoardComponent implements OnInit, OnDestroy { this.scrumboardService.updateBoard(); } - - ngOnDestroy() - { - this.onBoardChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss index d060cd1e..7d11812e 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .scrumboard-card-dialog { diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts index 9a190ddd..a993766a 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts @@ -1,10 +1,12 @@ import { Component, Inject, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { NgForm } from '@angular/forms/src/forms'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatMenuTrigger } from '@angular/material'; import { Subscription } from 'rxjs/Subscription'; + +import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; + import { ScrumboardService } from '../../../scrumboard.service'; -import { NgForm } from '@angular/forms/src/forms'; -import { FuseUtils } from '../../../../../../../core/fuseUtils'; -import { FuseConfirmDialogComponent } from '../../../../../../../core/components/confirm-dialog/confirm-dialog.component'; @Component({ selector : 'fuse-scrumboard-board-card-dialog', diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts index 8f0f6f8a..1eb69081 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts @@ -1,8 +1,10 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; + +import { FuseUtils } from '@fuse/fuseUtils'; +import { fuseAnimations } from '@fuse/animations'; + import { ScrumboardService } from '../../../../scrumboard.service'; -import { FuseUtils } from '../../../../../../../../core/fuseUtils'; -import { fuseAnimations } from '../../../../../../../../core/animations'; @Component({ selector : 'fuse-scrumboard-label-selector', @@ -44,6 +46,11 @@ export class FuseScrumboardLabelSelectorComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onBoardChanged.unsubscribe(); + } + cardLabelsChanged() { this.onCardLabelsChange.next(); @@ -61,10 +68,4 @@ export class FuseScrumboardLabelSelectorComponent implements OnInit, OnDestroy this.newLabel.name = ''; this.labelsMenuView = 'labels'; } - - ngOnDestroy() - { - this.onBoardChanged.unsubscribe(); - } - } diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts index 8bea5dca..68f67b92 100644 --- a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts +++ b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; @Component({ @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; templateUrl: './edit-board-name.component.html', styleUrls : ['./edit-board-name.component.scss'] }) -export class FuseScrumboardEditBoardNameComponent implements OnInit +export class FuseScrumboardEditBoardNameComponent { formActive = false; form: FormGroup; @@ -20,11 +20,6 @@ export class FuseScrumboardEditBoardNameComponent implements OnInit { } - ngOnInit() - { - - } - openForm() { this.form = this.formBuilder.group({ diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts index 053b80bc..e3381072 100644 --- a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; @Component({ @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; templateUrl: './add-card.component.html', styleUrls : ['./add-card.component.scss'] }) -export class FuseScrumboardBoardAddCardComponent implements OnInit +export class FuseScrumboardBoardAddCardComponent { formActive = false; form: FormGroup; @@ -18,11 +18,7 @@ export class FuseScrumboardBoardAddCardComponent implements OnInit ) { } - - ngOnInit() - { - } - + openForm() { this.form = this.formBuilder.group({ diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss index 35941c99..10fe2b1b 100644 --- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss +++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .scrumboard-board-card { position: relative; diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/list/card/card.component.ts index 61aaf9ac..9ec11bd9 100644 --- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.ts @@ -1,6 +1,5 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ScrumboardService } from '../../../scrumboard.service'; import * as moment from 'moment'; @Component({ @@ -17,7 +16,6 @@ export class FuseScrumboardBoardCardComponent implements OnInit constructor( private route: ActivatedRoute, - private scrumboardService: ScrumboardService ) { } diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts index b2b38b9b..56591cb1 100644 --- a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts +++ b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; @Component({ @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; templateUrl: './edit-list-name.component.html', styleUrls : ['./edit-list-name.component.scss'] }) -export class FuseScrumboardBoardEditListNameComponent implements OnInit +export class FuseScrumboardBoardEditListNameComponent { formActive = false; form: FormGroup; @@ -20,11 +20,6 @@ export class FuseScrumboardBoardEditListNameComponent implements OnInit { } - ngOnInit() - { - - } - openForm() { this.form = this.formBuilder.group({ diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.scss b/src/app/main/content/apps/scrumboard/board/list/list.component.scss index 5bdb2d00..222cda5d 100644 --- a/src/app/main/content/apps/scrumboard/board/list/list.component.scss +++ b/src/app/main/content/apps/scrumboard/board/list/list.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .scrumboard-board-list { width: 344px; diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.ts b/src/app/main/content/apps/scrumboard/board/list/list.component.ts index d4134926..6d637ab5 100644 --- a/src/app/main/content/apps/scrumboard/board/list/list.component.ts +++ b/src/app/main/content/apps/scrumboard/board/list/list.component.ts @@ -1,12 +1,14 @@ import { Component, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Subscription } from 'rxjs/Subscription'; import { MatDialog, MatDialogRef } from '@angular/material'; -import { FuseScrumboardCardDialogComponent } from '../dialogs/card/card.component'; -import { FuseConfirmDialogComponent } from '../../../../../../core/components/confirm-dialog/confirm-dialog.component'; -import { ScrumboardService } from '../../scrumboard.service'; +import { Subscription } from 'rxjs/Subscription'; + +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; + import { Card } from '../../card.model'; -import { FusePerfectScrollbarDirective } from '../../../../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; +import { ScrumboardService } from '../../scrumboard.service'; +import { FuseScrumboardCardDialogComponent } from '../dialogs/card/card.component'; @Component({ selector : 'fuse-scrumboard-board-list', @@ -40,7 +42,11 @@ export class FuseScrumboardBoardListComponent implements OnInit, OnDestroy .subscribe(board => { this.board = board; }); + } + ngOnDestroy() + { + this.onBoardChanged.unsubscribe(); } onListNameChanged(newListName) @@ -98,9 +104,4 @@ export class FuseScrumboardBoardListComponent implements OnInit, OnDestroy { this.scrumboardService.updateBoard(); } - - ngOnDestroy() - { - this.onBoardChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts index c4a4195d..1079eb37 100644 --- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts @@ -1,8 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatColors } from '../../../../../../../../core/matColors'; -import { ScrumboardService } from '../../../../scrumboard.service'; import { Subscription } from 'rxjs/Subscription'; +import { MatColors } from '@fuse/matColors'; + +import { ScrumboardService } from '../../../../scrumboard.service'; + @Component({ selector : 'fuse-scrumboard-board-color-selector', templateUrl: './board-color-selector.component.html', @@ -30,14 +32,14 @@ export class FuseScrumboardBoardColorSelectorComponent implements OnInit, OnDest }); } + ngOnDestroy() + { + this.onBoardChanged.unsubscribe(); + } + setColor(color) { this.board.settings.color = color; this.scrumboardService.updateBoard(); } - - ngOnDestroy() - { - this.onBoardChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts index ddb268a8..9abc1d1e 100644 --- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts +++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts @@ -1,7 +1,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + import { ScrumboardService } from '../../../scrumboard.service'; -import { fuseAnimations } from '../../../../../../../core/animations'; @Component({ selector : 'fuse-scrumboard-board-settings', @@ -30,6 +32,11 @@ export class FuseScrumboardBoardSettingsSidenavComponent implements OnInit, OnDe }); } + ngOnDestroy() + { + this.onBoardChanged.unsubscribe(); + } + toggleCardCover() { this.board.settings.cardCoverImages = !this.board.settings.cardCoverImages; @@ -41,9 +48,4 @@ export class FuseScrumboardBoardSettingsSidenavComponent implements OnInit, OnDe this.board.settings.subscribed = !this.board.settings.subscribed; this.scrumboardService.updateBoard(); } - - ngOnDestroy() - { - this.onBoardChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/card.model.ts b/src/app/main/content/apps/scrumboard/card.model.ts index 5f8ea248..3b5532d9 100644 --- a/src/app/main/content/apps/scrumboard/card.model.ts +++ b/src/app/main/content/apps/scrumboard/card.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '../../../../core/fuseUtils'; +import { FuseUtils } from '@fuse/fuseUtils'; export class Card { diff --git a/src/app/main/content/apps/scrumboard/list.model.ts b/src/app/main/content/apps/scrumboard/list.model.ts index 4cf0fac9..a34e8668 100644 --- a/src/app/main/content/apps/scrumboard/list.model.ts +++ b/src/app/main/content/apps/scrumboard/list.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '../../../../core/fuseUtils'; +import { FuseUtils } from '@fuse/fuseUtils'; export class List { diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.scss b/src/app/main/content/apps/scrumboard/scrumboard.component.scss index 55953a9a..0f49cf75 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.component.scss +++ b/src/app/main/content/apps/scrumboard/scrumboard.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { min-height: 100%; diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.ts b/src/app/main/content/apps/scrumboard/scrumboard.component.ts index 969748a4..6c96c7d4 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.component.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.component.ts @@ -1,9 +1,11 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ScrumboardService } from './scrumboard.service'; -import { Subscription } from 'rxjs/Subscription'; import { Router } from '@angular/router'; +import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + import { Board } from './board.model'; -import { fuseAnimations } from '../../../../core/animations'; +import { ScrumboardService } from './scrumboard.service'; @Component({ selector : 'fuse-scrumboard', @@ -21,7 +23,6 @@ export class FuseScrumboardComponent implements OnInit, OnDestroy private scrumboardService: ScrumboardService ) { - } ngOnInit() @@ -31,7 +32,11 @@ export class FuseScrumboardComponent implements OnInit, OnDestroy .subscribe(boards => { this.boards = boards; }); + } + ngOnDestroy() + { + this.onBoardsChanged.unsubscribe(); } newBoard() @@ -41,9 +46,4 @@ export class FuseScrumboardComponent implements OnInit, OnDestroy this.router.navigate(['/apps/scrumboard/boards/' + newBoard.id + '/' + newBoard.uri]); }); } - - ngOnDestroy() - { - this.onBoardsChanged.unsubscribe(); - } } diff --git a/src/app/main/content/apps/scrumboard/scrumboard.module.ts b/src/app/main/content/apps/scrumboard/scrumboard.module.ts index 8601f55e..0fd0f694 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.module.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.module.ts @@ -1,8 +1,10 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; -import { FuseScrumboardComponent } from './scrumboard.component'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { BoardResolve, ScrumboardService } from './scrumboard.service'; +import { FuseScrumboardComponent } from './scrumboard.component'; import { FuseScrumboardBoardComponent } from './board/board.component'; import { FuseScrumboardBoardListComponent } from './board/list/list.component'; import { FuseScrumboardBoardCardComponent } from './board/list/card/card.component'; diff --git a/src/app/main/content/apps/scrumboard/scrumboard.service.ts b/src/app/main/content/apps/scrumboard/scrumboard.service.ts index 3fd33c60..89f88803 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.service.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() @@ -162,7 +163,6 @@ export class ScrumboardService implements Resolve @Injectable() export class BoardResolve implements Resolve { - constructor(private scrumboardService: ScrumboardService) { } diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts index a8956656..3026f1fa 100644 --- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts @@ -1,8 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { TodoService } from '../../todo.service'; -import { Subscription } from 'rxjs/Subscription'; import { Router } from '@angular/router'; -import { fuseAnimations } from '../../../../../../core/animations'; +import { Subscription } from 'rxjs/Subscription'; + +import { fuseAnimations } from '@fuse/animations'; + +import { TodoService } from '../../todo.service'; @Component({ selector : 'fuse-todo-main-sidenav', diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.scss b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss index 3e4d1001..b17fbc5d 100644 --- a/src/app/main/content/apps/todo/todo-details/todo-details.component.scss +++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { display: flex; diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts index 9369dc3f..63516683 100644 --- a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts +++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts @@ -1,13 +1,15 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { TodoService } from '../todo.service'; -import { Todo } from '../todo.model'; -import { Subscription } from 'rxjs/Subscription'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { FuseUtils } from '../../../../../core/fuseUtils'; -import { fuseAnimations } from '../../../../../core/animations'; +import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; +import { FuseUtils } from '@fuse/fuseUtils'; +import { fuseAnimations } from '@fuse/animations'; + +import { Todo } from '../todo.model'; +import { TodoService } from '../todo.service'; + @Component({ selector : 'fuse-todo-details', templateUrl: './todo-details.component.html', @@ -80,6 +82,17 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + if ( this.onFormChange ) + { + this.onFormChange.unsubscribe(); + } + + this.onCurrentTodoChanged.unsubscribe(); + this.onNewTodoClicked.unsubscribe(); + } + focusTitleField() { setTimeout(() => { @@ -106,18 +119,14 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy toggleStar(event) { event.stopPropagation(); - this.todo.toggleStar(); - this.todoService.updateTodo(this.todo); } toggleImportant(event) { event.stopPropagation(); - this.todo.toggleImportant(); - this.todoService.updateTodo(this.todo); } @@ -128,9 +137,7 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy toggleCompleted(event) { event.stopPropagation(); - this.todo.toggleCompleted(); - this.todoService.updateTodo(this.todo); } @@ -141,9 +148,7 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy toggleDeleted(event) { event.stopPropagation(); - this.todo.toggleDeleted(); - this.todoService.updateTodo(this.todo); } @@ -156,16 +161,4 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy { this.todoService.updateTodo(this.todoForm.getRawValue()); } - - ngOnDestroy() - { - if ( this.onFormChange ) - { - this.onFormChange.unsubscribe(); - } - - this.onCurrentTodoChanged.unsubscribe(); - - this.onNewTodoClicked.unsubscribe(); - } } diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss index b36465d0..de0e4349 100644 --- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss +++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; .todo-list-item { display: block; diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts index 765db6ca..a03c0a23 100644 --- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts +++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts @@ -1,8 +1,9 @@ import { Component, HostBinding, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subscription } from 'rxjs/Subscription'; + import { Todo } from '../../todo.model'; import { TodoService } from '../../todo.service'; -import { Subscription } from 'rxjs/Subscription'; -import { ActivatedRoute } from '@angular/router'; @Component({ selector : 'fuse-todo-list-item', diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list.component.ts index 268070e2..825b99cd 100644 --- a/src/app/main/content/apps/todo/todo-list/todo-list.component.ts +++ b/src/app/main/content/apps/todo/todo-list/todo-list.component.ts @@ -1,10 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Todo } from '../todo.model'; -import { ActivatedRoute } from '@angular/router'; -import { TodoService } from '../todo.service'; import { Location } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; + +import { Todo } from '../todo.model'; +import { TodoService } from '../todo.service'; @Component({ selector : 'fuse-todo-list', @@ -88,6 +90,6 @@ export class FuseTodoListComponent implements OnInit, OnDestroy onDrop(ev) { - this.todoService.updateTodos(this.todos); + } } diff --git a/src/app/main/content/apps/todo/todo.component.scss b/src/app/main/content/apps/todo/todo.component.scss index b702ba18..74148b26 100644 --- a/src/app/main/content/apps/todo/todo.component.scss +++ b/src/app/main/content/apps/todo/todo.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { width: 100%; diff --git a/src/app/main/content/apps/todo/todo.component.ts b/src/app/main/content/apps/todo/todo.component.ts index ba7bc4a2..6e69a48b 100644 --- a/src/app/main/content/apps/todo/todo.component.ts +++ b/src/app/main/content/apps/todo/todo.component.ts @@ -1,12 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; -import { TodoService } from './todo.service'; import { FormControl } from '@angular/forms'; -import { Todo } from './todo.model'; -import { fuseAnimations } from '../../../../core/animations'; +import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; +import { fuseAnimations } from '@fuse/animations'; + +import { Todo } from './todo.model'; +import { TodoService } from './todo.service'; + @Component({ selector : 'fuse-todo', templateUrl: './todo.component.html', @@ -34,7 +36,6 @@ export class FuseTodoComponent implements OnInit, OnDestroy ngOnInit() { - this.onSelectedTodosChanged = this.todoService.onSelectedTodosChanged .subscribe(selectedTodos => { @@ -78,11 +79,6 @@ export class FuseTodoComponent implements OnInit, OnDestroy }); } - deSelectCurrentTodo() - { - this.todoService.onCurrentTodoChanged.next([null, null]); - } - ngOnDestroy() { this.onSelectedTodosChanged.unsubscribe(); @@ -90,6 +86,11 @@ export class FuseTodoComponent implements OnInit, OnDestroy this.onTagsChanged.unsubscribe(); this.onCurrentTodoChanged.unsubscribe(); } + + deSelectCurrentTodo() + { + this.todoService.onCurrentTodoChanged.next([null, null]); + } toggleSelectAll() { @@ -110,5 +111,4 @@ export class FuseTodoComponent implements OnInit, OnDestroy { this.todoService.toggleTagOnSelectedTodos(tagId); } - } diff --git a/src/app/main/content/apps/todo/todo.module.ts b/src/app/main/content/apps/todo/todo.module.ts index 1681b761..0761767c 100644 --- a/src/app/main/content/apps/todo/todo.module.ts +++ b/src/app/main/content/apps/todo/todo.module.ts @@ -1,8 +1,10 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; -import { FuseTodoComponent } from './todo.component'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { TodoService } from './todo.service'; +import { FuseTodoComponent } from './todo.component'; import { FuseTodoMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; import { FuseTodoListItemComponent } from './todo-list/todo-list-item/todo-list-item.component'; import { FuseTodoListComponent } from './todo-list/todo-list.component'; diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts index 6c7d35ff..5738bf5f 100644 --- a/src/app/main/content/apps/todo/todo.service.ts +++ b/src/app/main/content/apps/todo/todo.service.ts @@ -1,12 +1,14 @@ import { Injectable } from '@angular/core'; +import { Location } from '@angular/common'; +import { HttpClient } from '@angular/common/http'; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { HttpClient } from '@angular/common/http'; -import { Todo } from './todo.model'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '../../../../core/fuseUtils'; import { Subject } from 'rxjs/Subject'; -import { Location } from '@angular/common'; + +import { FuseUtils } from '@fuse/fuseUtils'; + +import { Todo } from './todo.model'; @Injectable() export class TodoService implements Resolve @@ -337,7 +339,6 @@ export class TodoService implements Resolve { this.location.go('apps/todo/all/' + id); } - } /** @@ -353,7 +354,6 @@ export class TodoService implements Resolve toggleTagOnTodo(tagId, todo) { - const index = todo.tags.indexOf(tagId); if ( index !== -1 ) @@ -364,6 +364,7 @@ export class TodoService implements Resolve { todo.tags.push(tagId); } + this.updateTodo(todo); } @@ -387,27 +388,4 @@ export class TodoService implements Resolve }); }); } - - /** - * Update the todo - * @param todos - * @returns {Promise} - */ - updateTodos(todos) - { - - /* return new Promise((resolve, reject) => { - - this.http.post('api/todo-todos/', {...todos}) - - .subscribe(response => { - - this.getTodos().then(_todos => { - console.log(response); - resolve(_todos); - }, reject); - }); - });*/ - - } } 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 60908c4d..7cbac19e 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; import { GoogleMapsModule } from './google-maps/google-maps.module'; 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 59c0ee67..03fb94cc 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 @@ -1,9 +1,11 @@ import { NgModule } from '@angular/core'; -import { FuseGoogleMapsDocsComponent } from './google-maps.component'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; import { AgmCoreModule } from '@agm/core'; +import { SharedModule } from '@fuse/modules/shared.module'; + +import { FuseGoogleMapsDocsComponent } from './google-maps.component'; + const routes = [ { path : 'google-maps', diff --git a/src/app/main/content/components/angular-material/angular-material.component.ts b/src/app/main/content/components/angular-material/angular-material.component.ts index ebf277ba..6f511c5a 100644 --- a/src/app/main/content/components/angular-material/angular-material.component.ts +++ b/src/app/main/content/components/angular-material/angular-material.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; + import { COMPONENT_MAP } from './example-components'; @Component({ 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 ca8e48fa..35eeaccc 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 @@ -1,9 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '../../../../core/modules/shared.module'; -import { FuseWidgetModule } from '../../../../core/components/widget/widget.module'; -import { FuseExampleViewerComponent } from './example-viewer/example-viewer'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; + import { EXAMPLE_LIST } from './example-components'; +import { FuseExampleViewerComponent } from './example-viewer/example-viewer'; import { FuseAngularMaterialComponent } from './angular-material.component'; const routes: Routes = [ diff --git a/src/app/main/content/components/angular-material/example-components.ts b/src/app/main/content/components/angular-material/example-components.ts index e3787926..59fb02c0 100644 --- a/src/app/main/content/components/angular-material/example-components.ts +++ b/src/app/main/content/components/angular-material/example-components.ts @@ -1,109 +1,109 @@ -import { AutocompleteDisplayExample } from '../../../../../assets/angular-material-examples/autocomplete-display/autocomplete-display-example'; -import { AutocompleteFilterExample } from '../../../../../assets/angular-material-examples/autocomplete-filter/autocomplete-filter-example'; -import { AutocompleteOverviewExample } from '../../../../../assets/angular-material-examples/autocomplete-overview/autocomplete-overview-example'; -import { AutocompleteSimpleExample } from '../../../../../assets/angular-material-examples/autocomplete-simple/autocomplete-simple-example'; -import { ButtonOverviewExample } from '../../../../../assets/angular-material-examples/button-overview/button-overview-example'; -import { ButtonToggleExclusiveExample } from '../../../../../assets/angular-material-examples/button-toggle-exclusive/button-toggle-exclusive-example'; -import { ButtonToggleOverviewExample } from '../../../../../assets/angular-material-examples/button-toggle-overview/button-toggle-overview-example'; -import { ButtonTypesExample } from '../../../../../assets/angular-material-examples/button-types/button-types-example'; -import { CardFancyExample } from '../../../../../assets/angular-material-examples/card-fancy/card-fancy-example'; -import { CardOverviewExample } from '../../../../../assets/angular-material-examples/card-overview/card-overview-example'; -import { CdkTableBasicExample } from '../../../../../assets/angular-material-examples/cdk-table-basic/cdk-table-basic-example'; -import { CheckboxConfigurableExample } from '../../../../../assets/angular-material-examples/checkbox-configurable/checkbox-configurable-example'; -import { CheckboxOverviewExample } from '../../../../../assets/angular-material-examples/checkbox-overview/checkbox-overview-example'; -import { ChipsInputExample } from '../../../../../assets/angular-material-examples/chips-input/chips-input-example'; -import { ChipsOverviewExample } from '../../../../../assets/angular-material-examples/chips-overview/chips-overview-example'; -import { ChipsStackedExample } from '../../../../../assets/angular-material-examples/chips-stacked/chips-stacked-example'; -import { DatepickerApiExample } from '../../../../../assets/angular-material-examples/datepicker-api/datepicker-api-example'; -import { DatepickerDisabledExample } from '../../../../../assets/angular-material-examples/datepicker-disabled/datepicker-disabled-example'; -import { DatepickerEventsExample } from '../../../../../assets/angular-material-examples/datepicker-events/datepicker-events-example'; -import { DatepickerFilterExample } from '../../../../../assets/angular-material-examples/datepicker-filter/datepicker-filter-example'; -import { DatepickerFormatsExample } from '../../../../../assets/angular-material-examples/datepicker-formats/datepicker-formats-example'; -import { DatepickerLocaleExample } from '../../../../../assets/angular-material-examples/datepicker-locale/datepicker-locale-example'; -import { DatepickerMinMaxExample } from '../../../../../assets/angular-material-examples/datepicker-min-max/datepicker-min-max-example'; -import { DatepickerMomentExample } from '../../../../../assets/angular-material-examples/datepicker-moment/datepicker-moment-example'; -import { DatepickerOverviewExample } from '../../../../../assets/angular-material-examples/datepicker-overview/datepicker-overview-example'; -import { DatepickerStartViewExample } from '../../../../../assets/angular-material-examples/datepicker-start-view/datepicker-start-view-example'; -import { DatepickerTouchExample } from '../../../../../assets/angular-material-examples/datepicker-touch/datepicker-touch-example'; -import { DatepickerValueExample } from '../../../../../assets/angular-material-examples/datepicker-value/datepicker-value-example'; -import { DialogContentExampleDialog, DialogContentExample } from '../../../../../assets/angular-material-examples/dialog-content/dialog-content-example'; -import { DialogDataExampleDialog, DialogDataExample } from '../../../../../assets/angular-material-examples/dialog-data/dialog-data-example'; -import { DialogElementsExampleDialog, DialogElementsExample } from '../../../../../assets/angular-material-examples/dialog-elements/dialog-elements-example'; -import { DialogOverviewExampleDialog, DialogOverviewExample } from '../../../../../assets/angular-material-examples/dialog-overview/dialog-overview-example'; -import { ElevationOverviewExample } from '../../../../../assets/angular-material-examples/elevation-overview/elevation-overview-example'; -import { ExpansionOverviewExample } from '../../../../../assets/angular-material-examples/expansion-overview/expansion-overview-example'; -import { ExpansionStepsExample } from '../../../../../assets/angular-material-examples/expansion-steps/expansion-steps-example'; -import { MyTelInput, FormFieldCustomControlExample } from '../../../../../assets/angular-material-examples/form-field-custom-control/form-field-custom-control-example'; -import { FormFieldErrorExample } from '../../../../../assets/angular-material-examples/form-field-error/form-field-error-example'; -import { FormFieldHintExample } from '../../../../../assets/angular-material-examples/form-field-hint/form-field-hint-example'; -import { FormFieldOverviewExample } from '../../../../../assets/angular-material-examples/form-field-overview/form-field-overview-example'; -import { FormFieldPlaceholderExample } from '../../../../../assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example'; -import { FormFieldPrefixSuffixExample } from '../../../../../assets/angular-material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example'; -import { FormFieldThemingExample } from '../../../../../assets/angular-material-examples/form-field-theming/form-field-theming-example'; -import { GridListDynamicExample } from '../../../../../assets/angular-material-examples/grid-list-dynamic/grid-list-dynamic-example'; -import { GridListOverviewExample } from '../../../../../assets/angular-material-examples/grid-list-overview/grid-list-overview-example'; -import { IconOverviewExample } from '../../../../../assets/angular-material-examples/icon-overview/icon-overview-example'; -import { IconSvgExample } from '../../../../../assets/angular-material-examples/icon-svg/icon-svg-example'; -import { InputAutosizeTextareaExample } from '../../../../../assets/angular-material-examples/input-autosize-textarea/input-autosize-textarea-example'; -import { InputClearableExample } from '../../../../../assets/angular-material-examples/input-clearable/input-clearable-example'; -import { InputErrorStateMatcherExample } from '../../../../../assets/angular-material-examples/input-error-state-matcher/input-error-state-matcher-example'; -import { InputErrorsExample } from '../../../../../assets/angular-material-examples/input-errors/input-errors-example'; -import { InputFormExample } from '../../../../../assets/angular-material-examples/input-form/input-form-example'; -import { InputHintExample } from '../../../../../assets/angular-material-examples/input-hint/input-hint-example'; -import { InputOverviewExample } from '../../../../../assets/angular-material-examples/input-overview/input-overview-example'; -import { InputPrefixSuffixExample } from '../../../../../assets/angular-material-examples/input-prefix-suffix/input-prefix-suffix-example'; -import { ListOverviewExample } from '../../../../../assets/angular-material-examples/list-overview/list-overview-example'; -import { ListSectionsExample } from '../../../../../assets/angular-material-examples/list-sections/list-sections-example'; -import { ListSelectionExample } from '../../../../../assets/angular-material-examples/list-selection/list-selection-example'; -import { MenuIconsExample } from '../../../../../assets/angular-material-examples/menu-icons/menu-icons-example'; -import { MenuOverviewExample } from '../../../../../assets/angular-material-examples/menu-overview/menu-overview-example'; -import { NestedMenuExample } from '../../../../../assets/angular-material-examples/nested-menu/nested-menu-example'; -import { PaginatorConfigurableExample } from '../../../../../assets/angular-material-examples/paginator-configurable/paginator-configurable-example'; -import { PaginatorOverviewExample } from '../../../../../assets/angular-material-examples/paginator-overview/paginator-overview-example'; -import { ProgressBarBufferExample } from '../../../../../assets/angular-material-examples/progress-bar-buffer/progress-bar-buffer-example'; -import { ProgressBarConfigurableExample } from '../../../../../assets/angular-material-examples/progress-bar-configurable/progress-bar-configurable-example'; -import { ProgressBarDeterminateExample } from '../../../../../assets/angular-material-examples/progress-bar-determinate/progress-bar-determinate-example'; -import { ProgressBarIndeterminateExample } from '../../../../../assets/angular-material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example'; -import { ProgressBarQueryExample } from '../../../../../assets/angular-material-examples/progress-bar-query/progress-bar-query-example'; -import { ProgressSpinnerConfigurableExample } from '../../../../../assets/angular-material-examples/progress-spinner-configurable/progress-spinner-configurable-example'; -import { ProgressSpinnerOverviewExample } from '../../../../../assets/angular-material-examples/progress-spinner-overview/progress-spinner-overview-example'; -import { RadioNgModelExample } from '../../../../../assets/angular-material-examples/radio-ng-model/radio-ng-model-example'; -import { RadioOverviewExample } from '../../../../../assets/angular-material-examples/radio-overview/radio-overview-example'; -import { SelectCustomTriggerExample } from '../../../../../assets/angular-material-examples/select-custom-trigger/select-custom-trigger-example'; -import { SelectDisabledExample } from '../../../../../assets/angular-material-examples/select-disabled/select-disabled-example'; -import { SelectErrorStateMatcherExample } from '../../../../../assets/angular-material-examples/select-error-state-matcher/select-error-state-matcher-example'; -import { SelectFormExample } from '../../../../../assets/angular-material-examples/select-form/select-form-example'; -import { SelectHintErrorExample } from '../../../../../assets/angular-material-examples/select-hint-error/select-hint-error-example'; -import { SelectMultipleExample } from '../../../../../assets/angular-material-examples/select-multiple/select-multiple-example'; -import { SelectNoRippleExample } from '../../../../../assets/angular-material-examples/select-no-ripple/select-no-ripple-example'; -import { SelectOptgroupExample } from '../../../../../assets/angular-material-examples/select-optgroup/select-optgroup-example'; -import { SelectOverviewExample } from '../../../../../assets/angular-material-examples/select-overview/select-overview-example'; -import { SelectPanelClassExample } from '../../../../../assets/angular-material-examples/select-panel-class/select-panel-class-example'; -import { SelectResetExample } from '../../../../../assets/angular-material-examples/select-reset/select-reset-example'; -import { SelectValueBindingExample } from '../../../../../assets/angular-material-examples/select-value-binding/select-value-binding-example'; -import { SidenavFabExample } from '../../../../../assets/angular-material-examples/sidenav-fab/sidenav-fab-example'; -import { SidenavOverviewExample } from '../../../../../assets/angular-material-examples/sidenav-overview/sidenav-overview-example'; -import { SlideToggleConfigurableExample } from '../../../../../assets/angular-material-examples/slide-toggle-configurable/slide-toggle-configurable-example'; -import { SlideToggleFormsExample } from '../../../../../assets/angular-material-examples/slide-toggle-forms/slide-toggle-forms-example'; -import { SlideToggleOverviewExample } from '../../../../../assets/angular-material-examples/slide-toggle-overview/slide-toggle-overview-example'; -import { SliderConfigurableExample } from '../../../../../assets/angular-material-examples/slider-configurable/slider-configurable-example'; -import { SliderOverviewExample } from '../../../../../assets/angular-material-examples/slider-overview/slider-overview-example'; -import { PizzaPartyComponent, SnackBarComponentExample } from '../../../../../assets/angular-material-examples/snack-bar-component/snack-bar-component-example'; -import { SnackBarOverviewExample } from '../../../../../assets/angular-material-examples/snack-bar-overview/snack-bar-overview-example'; -import { SortOverviewExample } from '../../../../../assets/angular-material-examples/sort-overview/sort-overview-example'; -import { StepperOverviewExample } from '../../../../../assets/angular-material-examples/stepper-overview/stepper-overview-example'; -import { TableBasicExample } from '../../../../../assets/angular-material-examples/table-basic/table-basic-example'; -import { TableFilteringExample } from '../../../../../assets/angular-material-examples/table-filtering/table-filtering-example'; -import { TableHttpExample } from '../../../../../assets/angular-material-examples/table-http/table-http-example'; -import { TableOverviewExample } from '../../../../../assets/angular-material-examples/table-overview/table-overview-example'; -import { TablePaginationExample } from '../../../../../assets/angular-material-examples/table-pagination/table-pagination-example'; -import { TableSortingExample } from '../../../../../assets/angular-material-examples/table-sorting/table-sorting-example'; -import { TabsOverviewExample } from '../../../../../assets/angular-material-examples/tabs-overview/tabs-overview-example'; -import { TabsTemplateLabelExample } from '../../../../../assets/angular-material-examples/tabs-template-label/tabs-template-label-example'; -import { ToolbarMultirowExample } from '../../../../../assets/angular-material-examples/toolbar-multirow/toolbar-multirow-example'; -import { ToolbarOverviewExample } from '../../../../../assets/angular-material-examples/toolbar-overview/toolbar-overview-example'; -import { TooltipOverviewExample } from '../../../../../assets/angular-material-examples/tooltip-overview/tooltip-overview-example'; -import { TooltipPositionExample } from '../../../../../assets/angular-material-examples/tooltip-position/tooltip-position-example'; +import { AutocompleteDisplayExample } from 'assets/angular-material-examples/autocomplete-display/autocomplete-display-example'; +import { AutocompleteFilterExample } from 'assets/angular-material-examples/autocomplete-filter/autocomplete-filter-example'; +import { AutocompleteOverviewExample } from 'assets/angular-material-examples/autocomplete-overview/autocomplete-overview-example'; +import { AutocompleteSimpleExample } from 'assets/angular-material-examples/autocomplete-simple/autocomplete-simple-example'; +import { ButtonOverviewExample } from 'assets/angular-material-examples/button-overview/button-overview-example'; +import { ButtonToggleExclusiveExample } from 'assets/angular-material-examples/button-toggle-exclusive/button-toggle-exclusive-example'; +import { ButtonToggleOverviewExample } from 'assets/angular-material-examples/button-toggle-overview/button-toggle-overview-example'; +import { ButtonTypesExample } from 'assets/angular-material-examples/button-types/button-types-example'; +import { CardFancyExample } from 'assets/angular-material-examples/card-fancy/card-fancy-example'; +import { CardOverviewExample } from 'assets/angular-material-examples/card-overview/card-overview-example'; +import { CdkTableBasicExample } from 'assets/angular-material-examples/cdk-table-basic/cdk-table-basic-example'; +import { CheckboxConfigurableExample } from 'assets/angular-material-examples/checkbox-configurable/checkbox-configurable-example'; +import { CheckboxOverviewExample } from 'assets/angular-material-examples/checkbox-overview/checkbox-overview-example'; +import { ChipsInputExample } from 'assets/angular-material-examples/chips-input/chips-input-example'; +import { ChipsOverviewExample } from 'assets/angular-material-examples/chips-overview/chips-overview-example'; +import { ChipsStackedExample } from 'assets/angular-material-examples/chips-stacked/chips-stacked-example'; +import { DatepickerApiExample } from 'assets/angular-material-examples/datepicker-api/datepicker-api-example'; +import { DatepickerDisabledExample } from 'assets/angular-material-examples/datepicker-disabled/datepicker-disabled-example'; +import { DatepickerEventsExample } from 'assets/angular-material-examples/datepicker-events/datepicker-events-example'; +import { DatepickerFilterExample } from 'assets/angular-material-examples/datepicker-filter/datepicker-filter-example'; +import { DatepickerFormatsExample } from 'assets/angular-material-examples/datepicker-formats/datepicker-formats-example'; +import { DatepickerLocaleExample } from 'assets/angular-material-examples/datepicker-locale/datepicker-locale-example'; +import { DatepickerMinMaxExample } from 'assets/angular-material-examples/datepicker-min-max/datepicker-min-max-example'; +import { DatepickerMomentExample } from 'assets/angular-material-examples/datepicker-moment/datepicker-moment-example'; +import { DatepickerOverviewExample } from 'assets/angular-material-examples/datepicker-overview/datepicker-overview-example'; +import { DatepickerStartViewExample } from 'assets/angular-material-examples/datepicker-start-view/datepicker-start-view-example'; +import { DatepickerTouchExample } from 'assets/angular-material-examples/datepicker-touch/datepicker-touch-example'; +import { DatepickerValueExample } from 'assets/angular-material-examples/datepicker-value/datepicker-value-example'; +import { DialogContentExampleDialog, DialogContentExample } from 'assets/angular-material-examples/dialog-content/dialog-content-example'; +import { DialogDataExampleDialog, DialogDataExample } from 'assets/angular-material-examples/dialog-data/dialog-data-example'; +import { DialogElementsExampleDialog, DialogElementsExample } from 'assets/angular-material-examples/dialog-elements/dialog-elements-example'; +import { DialogOverviewExampleDialog, DialogOverviewExample } from 'assets/angular-material-examples/dialog-overview/dialog-overview-example'; +import { ElevationOverviewExample } from 'assets/angular-material-examples/elevation-overview/elevation-overview-example'; +import { ExpansionOverviewExample } from 'assets/angular-material-examples/expansion-overview/expansion-overview-example'; +import { ExpansionStepsExample } from 'assets/angular-material-examples/expansion-steps/expansion-steps-example'; +import { MyTelInput, FormFieldCustomControlExample } from 'assets/angular-material-examples/form-field-custom-control/form-field-custom-control-example'; +import { FormFieldErrorExample } from 'assets/angular-material-examples/form-field-error/form-field-error-example'; +import { FormFieldHintExample } from 'assets/angular-material-examples/form-field-hint/form-field-hint-example'; +import { FormFieldOverviewExample } from 'assets/angular-material-examples/form-field-overview/form-field-overview-example'; +import { FormFieldPlaceholderExample } from 'assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example'; +import { FormFieldPrefixSuffixExample } from 'assets/angular-material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example'; +import { FormFieldThemingExample } from 'assets/angular-material-examples/form-field-theming/form-field-theming-example'; +import { GridListDynamicExample } from 'assets/angular-material-examples/grid-list-dynamic/grid-list-dynamic-example'; +import { GridListOverviewExample } from 'assets/angular-material-examples/grid-list-overview/grid-list-overview-example'; +import { IconOverviewExample } from 'assets/angular-material-examples/icon-overview/icon-overview-example'; +import { IconSvgExample } from 'assets/angular-material-examples/icon-svg/icon-svg-example'; +import { InputAutosizeTextareaExample } from 'assets/angular-material-examples/input-autosize-textarea/input-autosize-textarea-example'; +import { InputClearableExample } from 'assets/angular-material-examples/input-clearable/input-clearable-example'; +import { InputErrorStateMatcherExample } from 'assets/angular-material-examples/input-error-state-matcher/input-error-state-matcher-example'; +import { InputErrorsExample } from 'assets/angular-material-examples/input-errors/input-errors-example'; +import { InputFormExample } from 'assets/angular-material-examples/input-form/input-form-example'; +import { InputHintExample } from 'assets/angular-material-examples/input-hint/input-hint-example'; +import { InputOverviewExample } from 'assets/angular-material-examples/input-overview/input-overview-example'; +import { InputPrefixSuffixExample } from 'assets/angular-material-examples/input-prefix-suffix/input-prefix-suffix-example'; +import { ListOverviewExample } from 'assets/angular-material-examples/list-overview/list-overview-example'; +import { ListSectionsExample } from 'assets/angular-material-examples/list-sections/list-sections-example'; +import { ListSelectionExample } from 'assets/angular-material-examples/list-selection/list-selection-example'; +import { MenuIconsExample } from 'assets/angular-material-examples/menu-icons/menu-icons-example'; +import { MenuOverviewExample } from 'assets/angular-material-examples/menu-overview/menu-overview-example'; +import { NestedMenuExample } from 'assets/angular-material-examples/nested-menu/nested-menu-example'; +import { PaginatorConfigurableExample } from 'assets/angular-material-examples/paginator-configurable/paginator-configurable-example'; +import { PaginatorOverviewExample } from 'assets/angular-material-examples/paginator-overview/paginator-overview-example'; +import { ProgressBarBufferExample } from 'assets/angular-material-examples/progress-bar-buffer/progress-bar-buffer-example'; +import { ProgressBarConfigurableExample } from 'assets/angular-material-examples/progress-bar-configurable/progress-bar-configurable-example'; +import { ProgressBarDeterminateExample } from 'assets/angular-material-examples/progress-bar-determinate/progress-bar-determinate-example'; +import { ProgressBarIndeterminateExample } from 'assets/angular-material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example'; +import { ProgressBarQueryExample } from 'assets/angular-material-examples/progress-bar-query/progress-bar-query-example'; +import { ProgressSpinnerConfigurableExample } from 'assets/angular-material-examples/progress-spinner-configurable/progress-spinner-configurable-example'; +import { ProgressSpinnerOverviewExample } from 'assets/angular-material-examples/progress-spinner-overview/progress-spinner-overview-example'; +import { RadioNgModelExample } from 'assets/angular-material-examples/radio-ng-model/radio-ng-model-example'; +import { RadioOverviewExample } from 'assets/angular-material-examples/radio-overview/radio-overview-example'; +import { SelectCustomTriggerExample } from 'assets/angular-material-examples/select-custom-trigger/select-custom-trigger-example'; +import { SelectDisabledExample } from 'assets/angular-material-examples/select-disabled/select-disabled-example'; +import { SelectErrorStateMatcherExample } from 'assets/angular-material-examples/select-error-state-matcher/select-error-state-matcher-example'; +import { SelectFormExample } from 'assets/angular-material-examples/select-form/select-form-example'; +import { SelectHintErrorExample } from 'assets/angular-material-examples/select-hint-error/select-hint-error-example'; +import { SelectMultipleExample } from 'assets/angular-material-examples/select-multiple/select-multiple-example'; +import { SelectNoRippleExample } from 'assets/angular-material-examples/select-no-ripple/select-no-ripple-example'; +import { SelectOptgroupExample } from 'assets/angular-material-examples/select-optgroup/select-optgroup-example'; +import { SelectOverviewExample } from 'assets/angular-material-examples/select-overview/select-overview-example'; +import { SelectPanelClassExample } from 'assets/angular-material-examples/select-panel-class/select-panel-class-example'; +import { SelectResetExample } from 'assets/angular-material-examples/select-reset/select-reset-example'; +import { SelectValueBindingExample } from 'assets/angular-material-examples/select-value-binding/select-value-binding-example'; +import { SidenavFabExample } from 'assets/angular-material-examples/sidenav-fab/sidenav-fab-example'; +import { SidenavOverviewExample } from 'assets/angular-material-examples/sidenav-overview/sidenav-overview-example'; +import { SlideToggleConfigurableExample } from 'assets/angular-material-examples/slide-toggle-configurable/slide-toggle-configurable-example'; +import { SlideToggleFormsExample } from 'assets/angular-material-examples/slide-toggle-forms/slide-toggle-forms-example'; +import { SlideToggleOverviewExample } from 'assets/angular-material-examples/slide-toggle-overview/slide-toggle-overview-example'; +import { SliderConfigurableExample } from 'assets/angular-material-examples/slider-configurable/slider-configurable-example'; +import { SliderOverviewExample } from 'assets/angular-material-examples/slider-overview/slider-overview-example'; +import { PizzaPartyComponent, SnackBarComponentExample } from 'assets/angular-material-examples/snack-bar-component/snack-bar-component-example'; +import { SnackBarOverviewExample } from 'assets/angular-material-examples/snack-bar-overview/snack-bar-overview-example'; +import { SortOverviewExample } from 'assets/angular-material-examples/sort-overview/sort-overview-example'; +import { StepperOverviewExample } from 'assets/angular-material-examples/stepper-overview/stepper-overview-example'; +import { TableBasicExample } from 'assets/angular-material-examples/table-basic/table-basic-example'; +import { TableFilteringExample } from 'assets/angular-material-examples/table-filtering/table-filtering-example'; +import { TableHttpExample } from 'assets/angular-material-examples/table-http/table-http-example'; +import { TableOverviewExample } from 'assets/angular-material-examples/table-overview/table-overview-example'; +import { TablePaginationExample } from 'assets/angular-material-examples/table-pagination/table-pagination-example'; +import { TableSortingExample } from 'assets/angular-material-examples/table-sorting/table-sorting-example'; +import { TabsOverviewExample } from 'assets/angular-material-examples/tabs-overview/tabs-overview-example'; +import { TabsTemplateLabelExample } from 'assets/angular-material-examples/tabs-template-label/tabs-template-label-example'; +import { ToolbarMultirowExample } from 'assets/angular-material-examples/toolbar-multirow/toolbar-multirow-example'; +import { ToolbarOverviewExample } from 'assets/angular-material-examples/toolbar-overview/toolbar-overview-example'; +import { TooltipOverviewExample } from 'assets/angular-material-examples/tooltip-overview/tooltip-overview-example'; +import { TooltipPositionExample } from 'assets/angular-material-examples/tooltip-position/tooltip-position-example'; export const COMPONENT_MAP = { 'autocomplete' : [ diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.scss b/src/app/main/content/components/angular-material/example-viewer/example-viewer.scss index a82d36b4..90324b70 100644 --- a/src/app/main/content/components/angular-material/example-viewer/example-viewer.scss +++ b/src/app/main/content/components/angular-material/example-viewer/example-viewer.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; fuse-example-viewer { display: block; diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts index 255c07dc..ace53c29 100644 --- a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts +++ b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts @@ -1,11 +1,13 @@ import { AfterViewInit, Component, ComponentFactoryResolver, ComponentRef, Input, OnDestroy, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; import { MatSnackBar } from '@angular/material'; import 'rxjs/add/operator/first'; -import { CopierService } from '../../../../../core/components/copier/copier.service'; -import { EXAMPLE_COMPONENTS } from '../example-components'; import 'prismjs/components/prism-scss'; import 'prismjs/components/prism-typescript'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { EXAMPLE_COMPONENTS } from '../example-components'; + +import { CopierService } from '@fuse/components/copier/copier.service'; +import { fuseAnimations } from '@fuse/animations'; export interface LiveExample { @@ -42,7 +44,6 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy /** String key of the currently displayed example. */ _example: string; - exampleData: LiveExample; /** Whether the source for the example is being displayed. */ @@ -56,6 +57,22 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy { } + ngAfterViewInit() + { + setTimeout(() => { + const cmpFactory = this._resolver.resolveComponentFactory(this.exampleData.component); + this.previewRef = this._previewContainer.createComponent(cmpFactory); + }, 0); + } + + ngOnDestroy() + { + if ( this.previewRef ) + { + this.previewRef.destroy(); + } + } + get example() { return this._example; @@ -91,20 +108,4 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy this.snackbar.open('Copy failed. Please try again!', '', {duration: 2500}); } } - - ngAfterViewInit() - { - setTimeout(() => { - const cmpFactory = this._resolver.resolveComponentFactory(this.exampleData.component); - this.previewRef = this._previewContainer.createComponent(cmpFactory); - }, 0); - } - - ngOnDestroy() - { - if ( this.previewRef ) - { - this.previewRef.destroy(); - } - } } diff --git a/src/app/main/content/components/cards/cards.component.scss b/src/app/main/content/components/cards/cards.component.scss index 70fa94ee..bb8fa71b 100644 --- a/src/app/main/content/components/cards/cards.component.scss +++ b/src/app/main/content/components/cards/cards.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/components/cards/cards.component.ts b/src/app/main/content/components/cards/cards.component.ts index 924998bf..4fe7bd7b 100644 --- a/src/app/main/content/components/cards/cards.component.ts +++ b/src/app/main/content/components/cards/cards.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import * as shape from 'd3-shape'; -import { fuseAnimations } from '../../../../core/animations'; + +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-cards-docs', diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index 754b2631..30f65c50 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -1,6 +1,11 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; + +import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; import { FuseCardsDocsComponent } from './cards/cards.component'; import { FuseCountdownDocsComponent } from './countdown/countdown.component'; import { FuseHighlightDocsComponent } from './highlight/highlight.component'; @@ -10,9 +15,6 @@ import { FuseNavigationDocsComponent } from './navigation/navigation.component'; import { FuseSearchBarDocsComponent } from './search-bar/search-bar.component'; import { FuseShortcutsDocsComponent } from './shortcuts/shortcuts.component'; import { FuseWidgetDocsComponent } from './widget/widget.component'; -import { FuseWidgetModule } from '../../../core/components/widget/widget.module'; -import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; const routes = [ { diff --git a/src/app/main/content/components/navigation/navigation.component.ts b/src/app/main/content/components/navigation/navigation.component.ts index 1f549a4e..98622f8b 100644 --- a/src/app/main/content/components/navigation/navigation.component.ts +++ b/src/app/main/content/components/navigation/navigation.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; -import { FuseNavigationService } from '../../../../core/components/navigation/navigation.service'; + +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; @Component({ selector : 'fuse-navigation-docs', diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts index 297eaa11..0e750d92 100644 --- a/src/app/main/content/content.component.ts +++ b/src/app/main/content/content.component.ts @@ -1,11 +1,13 @@ import { Component, HostBinding, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; -import { fuseAnimations } from '../../core/animations'; -import { FuseConfigService } from '../../core/services/config.service'; + import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/filter'; import 'rxjs/add/operator/map'; +import { fuseAnimations } from '@fuse/animations/index'; +import { FuseConfigService } from '@fuse/services/config.service'; + @Component({ selector : 'fuse-content', templateUrl: './content.component.html', @@ -14,7 +16,7 @@ import 'rxjs/add/operator/map'; }) export class FuseContentComponent implements OnInit, OnDestroy { - onSettingsChanged: Subscription; + onConfigChanged: Subscription; fuseSettings: any; @HostBinding('@routerTransitionUp') routeAnimationUp = false; @@ -53,8 +55,8 @@ export class FuseContentComponent implements OnInit, OnDestroy } }); - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (newSettings) => { this.fuseSettings = newSettings; @@ -69,6 +71,6 @@ export class FuseContentComponent implements OnInit, OnDestroy ngOnDestroy() { - this.onSettingsChanged.unsubscribe(); + this.onConfigChanged.unsubscribe(); } } diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss index dab8f959..8bc3c9e0 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts index b934433a..18752dc5 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-forgot-password-2', @@ -19,7 +20,7 @@ export class FuseForgotPassword2Component implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 8ae766c6..9c27b063 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseForgotPassword2Component } from './forgot-password-2.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class ForgotPassword2Module { - } diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss index eede1399..f626e4f8 100644 --- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss +++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts index 1ea17741..eebeacf7 100644 --- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts +++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-forgot-password', @@ -19,7 +20,7 @@ export class FuseForgotPasswordComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 53a9da79..50994607 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseForgotPasswordComponent } from './forgot-password.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class ForgotPasswordModule { - } diff --git a/src/app/main/content/pages/authentication/lock/lock.component.scss b/src/app/main/content/pages/authentication/lock/lock.component.scss index 24290501..b5e4f62b 100644 --- a/src/app/main/content/pages/authentication/lock/lock.component.scss +++ b/src/app/main/content/pages/authentication/lock/lock.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/lock/lock.component.ts b/src/app/main/content/pages/authentication/lock/lock.component.ts index 22e18a08..11bd2125 100644 --- a/src/app/main/content/pages/authentication/lock/lock.component.ts +++ b/src/app/main/content/pages/authentication/lock/lock.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-lock', @@ -19,7 +20,7 @@ export class FuseLockComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 edd87d4b..8d3e306a 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseLockComponent } from './lock.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class LockModule { - } diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.scss b/src/app/main/content/pages/authentication/login-2/login-2.component.scss index 71e05f07..7cd4e27f 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.component.scss +++ b/src/app/main/content/pages/authentication/login-2/login-2.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.ts b/src/app/main/content/pages/authentication/login-2/login-2.component.ts index c0637711..bc735783 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.component.ts +++ b/src/app/main/content/pages/authentication/login-2/login-2.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-login-2', @@ -19,7 +20,7 @@ export class FuseLogin2Component implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 f5356245..91d187dd 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseLogin2Component } from './login-2.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class Login2Module { - } diff --git a/src/app/main/content/pages/authentication/login/login.component.scss b/src/app/main/content/pages/authentication/login/login.component.scss index 72100d40..f02c7d2c 100644 --- a/src/app/main/content/pages/authentication/login/login.component.scss +++ b/src/app/main/content/pages/authentication/login/login.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/login/login.component.ts b/src/app/main/content/pages/authentication/login/login.component.ts index 0d052fb9..85e8a952 100644 --- a/src/app/main/content/pages/authentication/login/login.component.ts +++ b/src/app/main/content/pages/authentication/login/login.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-login', @@ -19,7 +20,7 @@ export class FuseLoginComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 cf5307f8..4679c403 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseLoginComponent } from './login.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class LoginModule { - } diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss index 0ee0667e..3670f0eb 100644 --- a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss +++ b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts index b0c357f2..8430d99d 100644 --- a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts +++ b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-mail-confirm', @@ -15,7 +16,7 @@ export class FuseMailConfirmComponent private fuseConfig: FuseConfigService ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 4d0b52b3..a030c648 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseMailConfirmComponent } from './mail-confirm.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class MailConfirmModule { - } diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.scss b/src/app/main/content/pages/authentication/register-2/register-2.component.scss index 06dac9ef..f7a7ae6e 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.component.scss +++ b/src/app/main/content/pages/authentication/register-2/register-2.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.ts b/src/app/main/content/pages/authentication/register-2/register-2.component.ts index 441bcae2..2c2f3350 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.component.ts +++ b/src/app/main/content/pages/authentication/register-2/register-2.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-register-2', @@ -19,7 +20,7 @@ export class FuseRegister2Component implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 16975fca..58ab0837 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from 'app/core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseRegister2Component } from './register-2.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class Register2Module { - } diff --git a/src/app/main/content/pages/authentication/register/register.component.scss b/src/app/main/content/pages/authentication/register/register.component.scss index 3ed27336..de627ee8 100644 --- a/src/app/main/content/pages/authentication/register/register.component.scss +++ b/src/app/main/content/pages/authentication/register/register.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/register/register.component.ts b/src/app/main/content/pages/authentication/register/register.component.ts index e1df0c37..fea8d9ec 100644 --- a/src/app/main/content/pages/authentication/register/register.component.ts +++ b/src/app/main/content/pages/authentication/register/register.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-register', @@ -19,7 +20,7 @@ export class FuseRegisterComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 61a7c904..ffa07aeb 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseRegisterComponent } from './register.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class RegisterModule { - } diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss index 10b978a1..cd93b69c 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts index 29cf69f6..dea9e605 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-reset-password-2', @@ -19,7 +20,7 @@ export class FuseResetPassword2Component implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 3fd19ca5..6f536d7c 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseResetPassword2Component } from './reset-password-2.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class ResetPassword2Module { - } diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss index 70f9dbfa..1465f371 100644 --- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss +++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts index f068e1a9..3c86a632 100644 --- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts +++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../../core/animations'; + +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-reset-password', @@ -19,7 +20,7 @@ export class FuseResetPasswordComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 4737858c..eea63226 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseResetPasswordComponent } from './reset-password.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class ResetPasswordModule { - } diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.scss b/src/app/main/content/pages/coming-soon/coming-soon.component.scss index 88186e1b..75a10c32 100644 --- a/src/app/main/content/pages/coming-soon/coming-soon.component.scss +++ b/src/app/main/content/pages/coming-soon/coming-soon.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.ts b/src/app/main/content/pages/coming-soon/coming-soon.component.ts index 76b287f5..53b252c1 100644 --- a/src/app/main/content/pages/coming-soon/coming-soon.component.ts +++ b/src/app/main/content/pages/coming-soon/coming-soon.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseConfigService } from '../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../core/animations'; +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-coming-soon', @@ -20,7 +20,7 @@ export class FuseComingSoonComponent implements OnInit private formBuilder: FormBuilder ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', 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 ddf8fa79..8d4c1617 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseComingSoonComponent } from './coming-soon.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class ComingSoonModule { - } diff --git a/src/app/main/content/pages/errors/404/error-404.component.scss b/src/app/main/content/pages/errors/404/error-404.component.scss index a19e4f25..9b63891d 100644 --- a/src/app/main/content/pages/errors/404/error-404.component.scss +++ b/src/app/main/content/pages/errors/404/error-404.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/errors/404/error-404.component.ts b/src/app/main/content/pages/errors/404/error-404.component.ts index 0797035c..135c99da 100644 --- a/src/app/main/content/pages/errors/404/error-404.component.ts +++ b/src/app/main/content/pages/errors/404/error-404.component.ts @@ -1,19 +1,19 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; -import { FuseConfigService } from '../../../../../core/services/config.service'; +import { FuseConfigService } from '@fuse/services/config.service'; @Component({ selector : 'fuse-error-404', templateUrl: './error-404.component.html', styleUrls : ['./error-404.component.scss'] }) -export class FuseError404Component implements OnInit +export class FuseError404Component { constructor( private fuseConfig: FuseConfigService ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', @@ -21,8 +21,4 @@ export class FuseError404Component implements OnInit } }); } - - ngOnInit() - { - } } 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 791f4a38..df632b11 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseError404Component } from './error-404.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class Error404Module { - } diff --git a/src/app/main/content/pages/errors/500/error-500.component.scss b/src/app/main/content/pages/errors/500/error-500.component.scss index d2f3f160..6b7667e8 100644 --- a/src/app/main/content/pages/errors/500/error-500.component.scss +++ b/src/app/main/content/pages/errors/500/error-500.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/errors/500/error-500.component.ts b/src/app/main/content/pages/errors/500/error-500.component.ts index 597043ba..b4014e47 100644 --- a/src/app/main/content/pages/errors/500/error-500.component.ts +++ b/src/app/main/content/pages/errors/500/error-500.component.ts @@ -1,19 +1,19 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; -import { FuseConfigService } from '../../../../../core/services/config.service'; +import { FuseConfigService } from '@fuse/services/config.service'; @Component({ selector : 'fuse-error-500', templateUrl: './error-500.component.html', styleUrls : ['./error-500.component.scss'] }) -export class FuseError500Component implements OnInit +export class FuseError500Component { constructor( private fuseConfig: FuseConfigService ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', @@ -21,8 +21,4 @@ export class FuseError500Component implements OnInit } }); } - - ngOnInit() - { - } } 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 7b2c0b50..e1077394 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseError500Component } from './error-500.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class Error500Module { - } diff --git a/src/app/main/content/pages/faq/faq.component.scss b/src/app/main/content/pages/faq/faq.component.scss index 48bc8c5c..fec5a676 100644 --- a/src/app/main/content/pages/faq/faq.component.scss +++ b/src/app/main/content/pages/faq/faq.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/faq/faq.component.ts b/src/app/main/content/pages/faq/faq.component.ts index 54670fb2..0e288a4e 100644 --- a/src/app/main/content/pages/faq/faq.component.ts +++ b/src/app/main/content/pages/faq/faq.component.ts @@ -1,11 +1,13 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { FormControl } from '@angular/forms'; import { Subscription } from 'rxjs/Subscription'; -import { FaqService } from './faq.service'; -import { FuseUtils } from '../../../../core/fuseUtils'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; +import { FuseUtils } from '@fuse/fuseUtils'; + +import { FaqService } from './faq.service'; + @Component({ selector : 'fuse-faq', templateUrl: './faq.component.html', @@ -41,6 +43,11 @@ export class FuseFaqComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onFaqsChanged.unsubscribe(); + } + setStep(index: number) { this.step = index; @@ -55,9 +62,4 @@ export class FuseFaqComponent implements OnInit, OnDestroy { this.step--; } - - ngOnDestroy() - { - this.onFaqsChanged.unsubscribe(); - } } diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index b4f36cc0..fe5dec69 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -1,8 +1,10 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; -import { FuseFaqComponent } from './faq.component'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FaqService } from './faq.service'; +import { FuseFaqComponent } from './faq.component'; const routes = [ { diff --git a/src/app/main/content/pages/faq/faq.service.ts b/src/app/main/content/pages/faq/faq.service.ts index 3accb335..57e22856 100644 --- a/src/app/main/content/pages/faq/faq.service.ts +++ b/src/app/main/content/pages/faq/faq.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/pages/invoices/compact/compact.component.scss b/src/app/main/content/pages/invoices/compact/compact.component.scss index 39ee0b4a..46726dd7 100644 --- a/src/app/main/content/pages/invoices/compact/compact.component.scss +++ b/src/app/main/content/pages/invoices/compact/compact.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/invoices/compact/compact.component.ts b/src/app/main/content/pages/invoices/compact/compact.component.ts index 95885916..3dd9ec24 100644 --- a/src/app/main/content/pages/invoices/compact/compact.component.ts +++ b/src/app/main/content/pages/invoices/compact/compact.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { InvoiceService } from '../invoice.service'; @Component({ 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 d2dd171c..0332cd32 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; -import { FuseInvoiceCompactComponent } from './compact.component'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { InvoiceService } from '../invoice.service'; +import { FuseInvoiceCompactComponent } from './compact.component'; const routes = [ { @@ -27,8 +28,6 @@ const routes = [ InvoiceService ] }) - export class InvoiceCompactModule { - } diff --git a/src/app/main/content/pages/invoices/invoice.service.ts b/src/app/main/content/pages/invoices/invoice.service.ts index 21ddb478..0a55fcf5 100644 --- a/src/app/main/content/pages/invoices/invoice.service.ts +++ b/src/app/main/content/pages/invoices/invoice.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() export class InvoiceService implements Resolve { invoice: any; - invoiceOnChanged: BehaviorSubject = new BehaviorSubject({}); constructor(private http: HttpClient) diff --git a/src/app/main/content/pages/invoices/modern/modern.component.scss b/src/app/main/content/pages/invoices/modern/modern.component.scss index 473ebf19..cad1ef80 100644 --- a/src/app/main/content/pages/invoices/modern/modern.component.scss +++ b/src/app/main/content/pages/invoices/modern/modern.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/invoices/modern/modern.component.ts b/src/app/main/content/pages/invoices/modern/modern.component.ts index bf529566..850561dd 100644 --- a/src/app/main/content/pages/invoices/modern/modern.component.ts +++ b/src/app/main/content/pages/invoices/modern/modern.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { InvoiceService } from '../invoice.service'; @Component({ 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 02b361c4..c968173f 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; -import { FuseInvoiceModernComponent } from './modern.component'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { InvoiceService } from '../invoice.service'; +import { FuseInvoiceModernComponent } from './modern.component'; const routes = [ { @@ -27,8 +28,6 @@ const routes = [ InvoiceService ] }) - export class InvoiceModernModule { - } diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss index a322ca81..560a36fc 100644 --- a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss +++ b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; .knowledgebase-article-dialog { diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.scss b/src/app/main/content/pages/knowledge-base/knowledge-base.component.scss index 4696bdba..e7e4156f 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.component.scss +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #knowledgebase { diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.ts b/src/app/main/content/pages/knowledge-base/knowledge-base.component.ts index 62c9b822..9828bd6c 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.component.ts +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation} from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; -import { KnowledgeBaseService } from './knowledge-base.service'; import { MatDialog } from '@angular/material'; +import { Subscription } from 'rxjs/Subscription'; + +import { KnowledgeBaseService } from './knowledge-base.service'; import { FuseKnowledgeBaseArticleComponent } from './dialogs/article/article.component'; @Component({ 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 b26bd919..367709a2 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { KnowledgeBaseService } from './knowledge-base.service'; import { FuseKnowledgeBaseComponent } from './knowledge-base.component'; import { FuseKnowledgeBaseArticleComponent } from './dialogs/article/article.component'; diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.service.ts b/src/app/main/content/pages/knowledge-base/knowledge-base.service.ts index 845356a6..73292010 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.service.ts +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/pages/maintenance/maintenance.component.scss b/src/app/main/content/pages/maintenance/maintenance.component.scss index aaf6bd6b..8c737059 100644 --- a/src/app/main/content/pages/maintenance/maintenance.component.scss +++ b/src/app/main/content/pages/maintenance/maintenance.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/maintenance/maintenance.component.ts b/src/app/main/content/pages/maintenance/maintenance.component.ts index ae86b9bf..8ba28d25 100644 --- a/src/app/main/content/pages/maintenance/maintenance.component.ts +++ b/src/app/main/content/pages/maintenance/maintenance.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; -import { FuseConfigService } from '../../../../core/services/config.service'; -import { fuseAnimations } from '../../../../core/animations'; +import { FuseConfigService } from '@fuse/services/config.service'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-maintenance', @@ -9,13 +9,13 @@ import { fuseAnimations } from '../../../../core/animations'; styleUrls : ['./maintenance.component.scss'], animations : fuseAnimations }) -export class FuseMaintenanceComponent implements OnInit +export class FuseMaintenanceComponent { constructor( private fuseConfig: FuseConfigService ) { - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout: { navigation: 'none', toolbar : 'none', @@ -23,9 +23,4 @@ export class FuseMaintenanceComponent implements OnInit } }); } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index 08195d77..732b7e1f 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseMaintenanceComponent } from './maintenance.component'; const routes = [ @@ -20,8 +21,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class MaintenanceModule { - } diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index 115bba06..b002e135 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../../../core/modules/shared.module'; + +import { SharedModule } from '@fuse/modules/shared.module'; import { FusePricingStyle1Component } from './style-1/style-1.component'; import { FusePricingStyle2Component } from './style-2/style-2.component'; @@ -32,8 +33,6 @@ const routes = [ RouterModule.forChild(routes) ] }) - export class PricingModule { - } diff --git a/src/app/main/content/pages/pricing/style-1/style-1.component.scss b/src/app/main/content/pages/pricing/style-1/style-1.component.scss index 067eb772..2db4ea0c 100644 --- a/src/app/main/content/pages/pricing/style-1/style-1.component.scss +++ b/src/app/main/content/pages/pricing/style-1/style-1.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/pricing/style-2/style-2.component.scss b/src/app/main/content/pages/pricing/style-2/style-2.component.scss index 067eb772..2db4ea0c 100644 --- a/src/app/main/content/pages/pricing/style-2/style-2.component.scss +++ b/src/app/main/content/pages/pricing/style-2/style-2.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/pricing/style-3/style-3.component.scss b/src/app/main/content/pages/pricing/style-3/style-3.component.scss index 067eb772..2db4ea0c 100644 --- a/src/app/main/content/pages/pricing/style-3/style-3.component.scss +++ b/src/app/main/content/pages/pricing/style-3/style-3.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/profile/profile.component.scss b/src/app/main/content/pages/profile/profile.component.scss index cf8e299c..8044a3cc 100644 --- a/src/app/main/content/pages/profile/profile.component.scss +++ b/src/app/main/content/pages/profile/profile.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; #profile { diff --git a/src/app/main/content/pages/profile/profile.component.ts b/src/app/main/content/pages/profile/profile.component.ts index 3acea298..4b01e1cc 100644 --- a/src/app/main/content/pages/profile/profile.component.ts +++ b/src/app/main/content/pages/profile/profile.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { fuseAnimations } from '../../../../core/animations'; +import { Component, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'fuse-profile', @@ -8,16 +9,11 @@ import { fuseAnimations } from '../../../../core/animations'; encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) -export class FuseProfileComponent implements OnInit +export class FuseProfileComponent { constructor() { } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index aa699d6a..2d39909c 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -1,12 +1,13 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + +import { ProfileService } from './profile.service'; import { FuseProfileComponent } from './profile.component'; import { FuseProfileTimelineComponent } from './tabs/timeline/timeline.component'; import { FuseProfileAboutComponent } from './tabs/about/about.component'; import { FuseProfilePhotosVideosComponent } from './tabs/photos-videos/photos-videos.component'; -import { ProfileService } from './profile.service'; const routes = [ { diff --git a/src/app/main/content/pages/profile/profile.service.ts b/src/app/main/content/pages/profile/profile.service.ts index d5019d8d..1c4029b5 100644 --- a/src/app/main/content/pages/profile/profile.service.ts +++ b/src/app/main/content/pages/profile/profile.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.scss b/src/app/main/content/pages/profile/tabs/about/about.component.scss index 48250a05..c7f0d64f 100644 --- a/src/app/main/content/pages/profile/tabs/about/about.component.scss +++ b/src/app/main/content/pages/profile/tabs/about/about.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.ts b/src/app/main/content/pages/profile/tabs/about/about.component.ts index 7bfd816a..60ba81b2 100644 --- a/src/app/main/content/pages/profile/tabs/about/about.component.ts +++ b/src/app/main/content/pages/profile/tabs/about/about.component.ts @@ -1,6 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; + import { ProfileService } from '../../profile.service'; -import { fuseAnimations } from '../../../../../../core/animations'; @Component({ selector : 'fuse-profile-about', @@ -8,7 +10,7 @@ import { fuseAnimations } from '../../../../../../core/animations'; styleUrls : ['./about.component.scss'], animations : fuseAnimations }) -export class FuseProfileAboutComponent implements OnInit +export class FuseProfileAboutComponent { about: any; @@ -18,9 +20,4 @@ export class FuseProfileAboutComponent implements OnInit this.about = about; }); } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss index 5691b548..e1653c12 100644 --- a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss +++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts index df1f26c2..f30f2ecf 100644 --- a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts +++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; import { ProfileService } from '../../profile.service'; -import { fuseAnimations } from '../../../../../../core/animations'; @Component({ selector : 'fuse-profile-photos-videos', @@ -9,7 +10,7 @@ import { fuseAnimations } from '../../../../../../core/animations'; styleUrls : ['./photos-videos.component.scss'], animations : fuseAnimations }) -export class FuseProfilePhotosVideosComponent implements OnInit +export class FuseProfilePhotosVideosComponent { photosVideos: any; @@ -19,9 +20,4 @@ export class FuseProfilePhotosVideosComponent implements OnInit this.photosVideos = photosVideos; }); } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss index 58e12fa6..c4aeee49 100644 --- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss +++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts index 69bffa7c..a82c2d00 100644 --- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts +++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts @@ -1,6 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; + import { ProfileService } from '../../profile.service'; -import { fuseAnimations } from '../../../../../../core/animations'; @Component({ selector : 'fuse-profile-timeline', @@ -8,7 +10,7 @@ import { fuseAnimations } from '../../../../../../core/animations'; styleUrls : ['./timeline.component.scss'], animations : fuseAnimations }) -export class FuseProfileTimelineComponent implements OnInit +export class FuseProfileTimelineComponent { timeline: any; @@ -18,9 +20,4 @@ export class FuseProfileTimelineComponent implements OnInit this.timeline = timeline; }); } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/search/search.component.scss b/src/app/main/content/pages/search/search.component.scss index b4121e2e..71649a46 100644 --- a/src/app/main/content/pages/search/search.component.scss +++ b/src/app/main/content/pages/search/search.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/search/search.component.ts b/src/app/main/content/pages/search/search.component.ts index 83f35b04..394ee543 100644 --- a/src/app/main/content/pages/search/search.component.ts +++ b/src/app/main/content/pages/search/search.component.ts @@ -1,20 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'fuse-search', templateUrl: './search.component.html', styleUrls : ['./search.component.scss'] }) -export class FuseSearchComponent implements OnInit +export class FuseSearchComponent { - constructor() { - - } - - ngOnInit() - { - } } diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 325c790e..7e47b1da 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -1,11 +1,12 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + +import { SearchService } from './search.service'; import { FuseSearchClassicComponent } from './tabs/classic/classic.component'; import { FuseSearchTableComponent } from './tabs/table/table.component'; import { FuseSearchComponent } from './search.component'; -import { SearchService } from './search.service'; const routes = [ { diff --git a/src/app/main/content/pages/search/search.service.ts b/src/app/main/content/pages/search/search.service.ts index 5e58f53a..5ca0277a 100644 --- a/src/app/main/content/pages/search/search.service.ts +++ b/src/app/main/content/pages/search/search.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() diff --git a/src/app/main/content/pages/search/tabs/classic/classic.component.scss b/src/app/main/content/pages/search/tabs/classic/classic.component.scss index 4a8acf7c..6280eda4 100644 --- a/src/app/main/content/pages/search/tabs/classic/classic.component.scss +++ b/src/app/main/content/pages/search/tabs/classic/classic.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/search/tabs/classic/classic.component.ts b/src/app/main/content/pages/search/tabs/classic/classic.component.ts index 2f5903b1..e197597c 100644 --- a/src/app/main/content/pages/search/tabs/classic/classic.component.ts +++ b/src/app/main/content/pages/search/tabs/classic/classic.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + import { SearchService } from '../../search.service'; @Component({ @@ -6,7 +7,7 @@ import { SearchService } from '../../search.service'; templateUrl: './classic.component.html', styleUrls : ['./classic.component.scss'] }) -export class FuseSearchClassicComponent implements OnInit +export class FuseSearchClassicComponent { classic: any; @@ -16,9 +17,4 @@ export class FuseSearchClassicComponent implements OnInit this.classic = classic; }); } - - ngOnInit() - { - - } } diff --git a/src/app/main/content/pages/search/tabs/table/table.component.scss b/src/app/main/content/pages/search/tabs/table/table.component.scss index 6c387638..ca2a0c07 100644 --- a/src/app/main/content/pages/search/tabs/table/table.component.scss +++ b/src/app/main/content/pages/search/tabs/table/table.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; :host { diff --git a/src/app/main/content/pages/search/tabs/table/table.component.ts b/src/app/main/content/pages/search/tabs/table/table.component.ts index ea3f081a..321227ee 100644 --- a/src/app/main/content/pages/search/tabs/table/table.component.ts +++ b/src/app/main/content/pages/search/tabs/table/table.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { SearchService } from '../../search.service'; import { DataSource } from '@angular/cdk/collections'; +import { SearchService } from '../../search.service'; + @Component({ selector : 'fuse-search-table', templateUrl: './table.component.html', diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/content/services/config/config.component.html index 604eea39..f7006f05 100644 --- a/src/app/main/content/services/config/config.component.html +++ b/src/app/main/content/services/config/config.component.html @@ -30,14 +30,14 @@ export class SomeComponent { - settings: any; + config: any; constructor(private fuseConfig: FuseConfigService) { // Subscribe to settings changed event - this.fuseConfig.onSettingsChanged.subscribe( - (newSettings) => { - this.settings = newSettings; + this.fuseConfig.onConfigChanged.subscribe( + (newConfig) => { + this.config = newConfig; } ); } @@ -45,7 +45,7 @@ onInit(){ // Fully customizable surroundings for this particular component - this.fuseConfig.setSettings({ + this.fuseConfig.setConfig({ layout : { navigation : 'left', // 'right', 'left', 'top', none navigationFolded: false, // true, false diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index 75be1738..bd006620 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../core/modules/shared.module'; import { RouterModule } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseConfigServiceDocsComponent } from './config/config.component'; import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-screen.component'; diff --git a/src/app/main/content/ui/colors/colors.component.ts b/src/app/main/content/ui/colors/colors.component.ts index 73d0a2d1..5e6c3025 100644 --- a/src/app/main/content/ui/colors/colors.component.ts +++ b/src/app/main/content/ui/colors/colors.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit } from '@angular/core'; -import { MatColors } from '../../../../core/matColors'; + +import { MatColors } from '@fuse/matColors'; @Component({ selector : 'fuse-colors', templateUrl: './colors.component.html', styleUrls : ['./colors.component.scss'] }) -export class FuseColorsComponent implements OnInit +export class FuseColorsComponent { colors: {}; selectedColor: string; @@ -18,11 +19,6 @@ export class FuseColorsComponent implements OnInit this.updateSelectedColor('primary'); } - ngOnInit() - { - - } - selectColor(selected) { this.updateSelectedColor(selected.tab.textLabel); diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts index cbf2dc1e..51fb3525 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '../../../../core/modules/shared.module'; -import { FuseDemoModule } from '../../../../core/components/demo/demo.module'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseDemoModule } from '@fuse/components/demo/demo.module'; + import { FuseColorsComponent } from './colors.component'; const routes: Routes = [ diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index 8c0d4fb4..04a6a257 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseFormsComponent } from './forms.component'; const routes: Routes = [ 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 bb99ecb2..bb098647 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 @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseHelperClassesComponent } from './helper-classes.component'; import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; import { FuseHelperClassesWidthHeightComponent } from './tabs/width-height/width-height.component'; diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index fe75f5b7..061fe136 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; + +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseIconsComponent } from './icons.component'; const routes: Routes = [ 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 c87cb18f..1916eb4e 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 @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '../../../../core/modules/shared.module'; -import { FuseDemoModule } from '../../../../core/components/demo/demo.module'; + +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseDemoModule } from '@fuse/components/demo/demo.module'; + import { FuseCardedFullWidthComponent } from './carded/fullwidth/fullwidth.component'; import { FuseCardedFullWidth2Component } from './carded/fullwidth-2/fullwidth-2.component'; import { FuseCardedLeftSidenavComponent } from './carded/left-sidenav/left-sidenav.component'; diff --git a/src/app/main/content/ui/typography/typography.component.ts b/src/app/main/content/ui/typography/typography.component.ts index 3f6cd268..44e979b7 100644 --- a/src/app/main/content/ui/typography/typography.component.ts +++ b/src/app/main/content/ui/typography/typography.component.ts @@ -1,17 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'fuse-typography', templateUrl: './typography.component.html', styleUrls : ['./typography.component.scss'] }) -export class FuseTypographyComponent implements OnInit +export class FuseTypographyComponent { constructor() { } - - ngOnInit() - { - } } diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index ca1e0f93..0a025966 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../../../core/modules/shared.module'; import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '@fuse/modules/shared.module'; + import { FuseTypographyComponent } from './typography.component'; import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; import { FuseTypographyInlineTextElementsComponent } from './tabs/inline-text-elements/inline-text-elements.component'; diff --git a/src/app/main/footer/footer.component.ts b/src/app/main/footer/footer.component.ts index d741f76c..4065e363 100644 --- a/src/app/main/footer/footer.component.ts +++ b/src/app/main/footer/footer.component.ts @@ -1,19 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'fuse-footer', templateUrl: './footer.component.html', styleUrls : ['./footer.component.scss'] }) -export class FuseFooterComponent implements OnInit +export class FuseFooterComponent { constructor() { } - - ngOnInit() - { - } - } diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index dd808a57..39d8905e 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -9,20 +9,23 @@ - - + +
- - + + +
@@ -44,11 +47,13 @@
- - + + +
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss index 2c1b6977..c677d9e3 100644 --- a/src/app/main/main.component.scss +++ b/src/app/main/main.component.scss @@ -1,4 +1,4 @@ -@import "src/app/core/scss/fuse"; +@import "src/@fuse/scss/fuse"; fuse-main { display: flex; diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index a8a7ce5c..e1ff1281 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -1,8 +1,9 @@ -import { Component, ElementRef, HostBinding, Inject, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; -import { FuseConfigService } from '../core/services/config.service'; -import { Platform } from '@angular/cdk/platform'; +import { Component, ElementRef, HostBinding, Inject, OnDestroy, Renderer2, ViewEncapsulation } from '@angular/core'; import { DOCUMENT } from '@angular/common'; +import { Platform } from '@angular/cdk/platform'; +import { Subscription } from 'rxjs/Subscription'; + +import { FuseConfigService } from '@fuse/services/config.service'; @Component({ selector : 'fuse-main', @@ -10,9 +11,9 @@ import { DOCUMENT } from '@angular/common'; styleUrls : ['./main.component.scss'], encapsulation: ViewEncapsulation.None }) -export class FuseMainComponent implements OnInit, OnDestroy +export class FuseMainComponent implements OnDestroy { - onSettingsChanged: Subscription; + onConfigChanged: Subscription; fuseSettings: any; @HostBinding('attr.fuse-layout-mode') layoutMode; @@ -24,8 +25,8 @@ export class FuseMainComponent implements OnInit, OnDestroy @Inject(DOCUMENT) private document: any ) { - this.onSettingsChanged = - this.fuseConfig.onSettingsChanged + this.onConfigChanged = + this.fuseConfig.onConfigChanged .subscribe( (newSettings) => { this.fuseSettings = newSettings; @@ -39,13 +40,9 @@ export class FuseMainComponent implements OnInit, OnDestroy } } - ngOnInit() - { - } - ngOnDestroy() { - this.onSettingsChanged.unsubscribe(); + this.onConfigChanged.unsubscribe(); } addClass(className: string) diff --git a/src/app/main/main.module.ts b/src/app/main/main.module.ts index 3c73543d..14d25778 100644 --- a/src/app/main/main.module.ts +++ b/src/app/main/main.module.ts @@ -1,36 +1,35 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../core/modules/shared.module'; +import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseNavigationModule } from '@fuse/components/navigation/navigation.module'; +import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; +import { FuseShortcutsModule } from '@fuse/components/shortcuts/shortcuts.module'; +import { FuseSearchBarModule } from '@fuse/components/search-bar/search-bar.module'; import { FuseMainComponent } from './main.component'; import { FuseContentComponent } from './content/content.component'; import { FuseFooterComponent } from './footer/footer.component'; -import { FuseNavbarVerticalComponent } from './navbar/vertical/navbar-vertical.component'; +import { FuseNavbarComponent } from './navbar/navbar.component'; import { FuseToolbarComponent } from './toolbar/toolbar.component'; -import { FuseNavigationModule } from '../core/components/navigation/navigation.module'; -import { FuseNavbarVerticalToggleDirective } from './navbar/vertical/navbar-vertical-toggle.directive'; -import { FuseNavbarHorizontalComponent } from './navbar/horizontal/navbar-horizontal.component'; import { FuseQuickPanelComponent } from './quick-panel/quick-panel.component'; -import { FuseThemeOptionsComponent } from '../core/components/theme-options/theme-options.component'; -import { FuseShortcutsModule } from '../core/components/shortcuts/shortcuts.module'; -import { FuseSearchBarModule } from '../core/components/search-bar/search-bar.module'; + +import { FuseSidebarModule } from '@fuse/components/sidebar/sidebar.module'; @NgModule({ declarations: [ FuseContentComponent, FuseFooterComponent, FuseMainComponent, - FuseNavbarVerticalComponent, - FuseNavbarHorizontalComponent, + FuseNavbarComponent, FuseToolbarComponent, - FuseNavbarVerticalToggleDirective, FuseThemeOptionsComponent, FuseQuickPanelComponent ], imports : [ SharedModule, RouterModule, + FuseSidebarModule, FuseNavigationModule, FuseShortcutsModule, FuseSearchBarModule diff --git a/src/app/main/navbar/horizontal/navbar-horizontal.component.html b/src/app/main/navbar/horizontal/navbar-horizontal.component.html deleted file mode 100644 index 82075715..00000000 --- a/src/app/main/navbar/horizontal/navbar-horizontal.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/main/navbar/horizontal/navbar-horizontal.component.scss b/src/app/main/navbar/horizontal/navbar-horizontal.component.scss deleted file mode 100644 index 8b137891..00000000 --- a/src/app/main/navbar/horizontal/navbar-horizontal.component.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/main/navbar/horizontal/navbar-horizontal.component.ts b/src/app/main/navbar/horizontal/navbar-horizontal.component.ts deleted file mode 100644 index 40cac7dd..00000000 --- a/src/app/main/navbar/horizontal/navbar-horizontal.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { FuseMainComponent } from '../../main.component'; - -@Component({ - selector : 'fuse-navbar-horizontal', - templateUrl : './navbar-horizontal.component.html', - styleUrls : ['./navbar-horizontal.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class FuseNavbarHorizontalComponent implements OnInit, OnDestroy -{ - constructor(private fuseMainComponent: FuseMainComponent) - { - } - - ngOnInit() - { - this.fuseMainComponent.addClass('fuse-nav-bar-horizontal'); - } - - ngOnDestroy() - { - this.fuseMainComponent.removeClass('fuse-nav-bar-horizontal'); - } -} diff --git a/src/app/main/navbar/navbar.component.html b/src/app/main/navbar/navbar.component.html new file mode 100644 index 00000000..e1f91b94 --- /dev/null +++ b/src/app/main/navbar/navbar.component.html @@ -0,0 +1,40 @@ + + +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + +
+ +
+ + \ No newline at end of file diff --git a/src/app/main/navbar/navbar.component.scss b/src/app/main/navbar/navbar.component.scss new file mode 100644 index 00000000..0c1880d9 --- /dev/null +++ b/src/app/main/navbar/navbar.component.scss @@ -0,0 +1,93 @@ +@import "src/@fuse/scss/fuse"; + +body { + + &.fuse-sidebar-folded { + + .content-wrapper { + + &:last-child { + padding-left: 64px !important; + } + + &:first-child { + padding-right: 64px !important; + } + + &:first-child:last-child { + padding-left: 0 !important; + padding-right: 0 !important; + } + + } + } +} + +fuse-sidebar { + + &.folded:not(.unfolded) { + + .navbar-vertical { + + .navbar-header { + padding: 0 13px; + + .logo { + + .logo-text { + opacity: 0; + transition: opacity 200ms ease; + } + } + } + } + } +} + +.navbar-vertical { + + .navbar-header { + padding: 0 16px 0 24px; + display: flex; + align-items: center; + height: 64px; + min-height: 64px; + justify-content: space-between; + transition: padding 200ms ease; + background-color: rgba(255, 255, 255, .05); + @include mat-elevation(1); + + .logo { + display: flex; + align-items: center; + + .logo-icon { + width: 38px; + height: 38px; + } + + .logo-text { + margin-left: 8px; + font-size: 20px; + font-weight: 300; + letter-spacing: 0.4px; + } + } + } + + .navbar-content { + flex: 1; + } +} + +.top-navbar + #wrapper { + + & > .left-navbar { + display: none !important; + + @include media-breakpoint-down(md) { + display: flex !important; + } + } +} + diff --git a/src/app/main/navbar/navbar.component.ts b/src/app/main/navbar/navbar.component.ts new file mode 100644 index 00000000..a6afd61f --- /dev/null +++ b/src/app/main/navbar/navbar.component.ts @@ -0,0 +1,30 @@ +import { Component, Input, ViewEncapsulation } from '@angular/core'; + +import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; + +@Component({ + selector : 'fuse-navbar', + templateUrl : './navbar.component.html', + styleUrls : ['./navbar.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class FuseNavbarComponent +{ + @Input() layout; + + constructor(private sidebarService: FuseSidebarService) + { + // Default layout + this.layout = 'vertical'; + } + + toggleSidebarOpened(key) + { + this.sidebarService.getSidebar(key).toggleOpen(); + } + + toggleSidebarFolded(key) + { + this.sidebarService.getSidebar(key).toggleFold(); + } +} diff --git a/src/app/main/navbar/vertical/navbar-vertical-toggle.directive.ts b/src/app/main/navbar/vertical/navbar-vertical-toggle.directive.ts deleted file mode 100644 index 9fd92e20..00000000 --- a/src/app/main/navbar/vertical/navbar-vertical-toggle.directive.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Directive, HostListener, Input } from '@angular/core'; -import { FuseNavbarVerticalService } from './navbar-vertical.service'; -import { FuseNavbarVerticalComponent } from './navbar-vertical.component'; - -@Directive({ - selector: '[fuseNavbarVertical]' -}) -export class FuseNavbarVerticalToggleDirective -{ - @Input() fuseNavbarVertical: string; - navbar: FuseNavbarVerticalComponent; - - constructor(private navbarService: FuseNavbarVerticalService) - { - } - - @HostListener('click') - onClick() - { - this.navbar = this.navbarService.getNavBar(); - - if ( !this.navbar[this.fuseNavbarVertical] ) - { - return; - } - - this.navbar[this.fuseNavbarVertical](); - } -} diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.html b/src/app/main/navbar/vertical/navbar-vertical.component.html deleted file mode 100644 index fe98e297..00000000 --- a/src/app/main/navbar/vertical/navbar-vertical.component.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - - - - - - -
- -
- -
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.scss b/src/app/main/navbar/vertical/navbar-vertical.component.scss deleted file mode 100644 index 29e359c5..00000000 --- a/src/app/main/navbar/vertical/navbar-vertical.component.scss +++ /dev/null @@ -1,159 +0,0 @@ -@import "../../../core/scss/fuse"; - -fuse-main { - - &.fuse-nav-bar-folded:not(.fuse-nav-bar-horizontal) { - - .content-wrapper { - - &:last-child { - padding-left: 64px !important; - } - - &:first-child { - padding-right: 64px !important; - } - - &:first-child:last-child { - padding-left: 0 !important; - padding-right: 0 !important; - } - - } - } -} - -fuse-navbar-vertical { - display: flex; - flex-direction: column; - width: 256px; - min-width: 256px; - max-width: 256px; - background-color: #FFFFFF; - overflow-y: auto; - overflow-x: hidden; - z-index: 4; - box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2), 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12); - transition: all .3s cubic-bezier(.55, 0, .55, .2), width .1s linear, min-width .1s linear, max-width .1s linear; - transform: translateX(0); - - &.folded { - position: absolute; - top: 0; - bottom: 0; - - &.left-navbar { - left: 0; - } - - &.right-navbar { - right: 0; - } - - &:not(.folded-open) { - width: 64px; - min-width: 64px; - max-width: 64px; - - .navbar-header { - padding: 0 13px; - - .logo { - - .logo-text { - opacity: 0; - transition: opacity 200ms ease; - } - } - } - } - } - - &.close { - box-shadow: none; - - &.left-navbar { - transform: translateX(-100%) !important; - } - - &.right-navbar { - transform: translateX(100%) !important; - } - } - - @include media-breakpoint('lt-lg') { - position: absolute; - top: 0; - bottom: 0; - - &.left-navbar { - left: 0; - } - - &.right-navbar { - right: 0; - } - - &:not(.initialized) { - - &.left-navbar { - transform: translateX(-100%); - } - - &.right-navbar { - transform: translateX(100%); - } - } - } - - .navbar-header { - padding: 0 16px 0 24px; - display: flex; - align-items: center; - height: 64px; - min-height: 64px; - justify-content: space-between; - transition: padding 200ms ease; - background-color: rgba(255, 255, 255, .05); - @include mat-elevation(1); - - .logo { - display: flex; - align-items: center; - - .logo-icon { - width: 38px; - height: 38px; - } - - .logo-text { - margin-left: 8px; - font-size: 20px; - font-weight: 300; - letter-spacing: 0.4px; - } - } - } - - .navbar-content { - flex: 1; - } -} - -fuse-navbar-horizontal + #wrapper > fuse-navbar-vertical { - display: none; - @include media-breakpoint-down(md) { - display: flex; - } -} - -.fuse-navbar-backdrop { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - z-index: 3; - background-color: rgba(0, 0, 0, 0.6); - opacity: 0; -} \ No newline at end of file diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.ts b/src/app/main/navbar/vertical/navbar-vertical.component.ts deleted file mode 100644 index 5c8eede4..00000000 --- a/src/app/main/navbar/vertical/navbar-vertical.component.ts +++ /dev/null @@ -1,279 +0,0 @@ -import { Component, ElementRef, HostBinding, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewChild, ViewEncapsulation } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; -import { FuseMatchMedia } from '../../../core/services/match-media.service'; -import { FuseNavbarVerticalService } from './navbar-vertical.service'; -import { ObservableMedia } from '@angular/flex-layout'; -import { FuseMainComponent } from '../../main.component'; -import { NavigationEnd, Router } from '@angular/router'; -import { FuseNavigationService } from '../../../core/components/navigation/navigation.service'; -import { FusePerfectScrollbarDirective } from '../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; -import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations'; - -@Component({ - selector : 'fuse-navbar-vertical', - templateUrl : './navbar-vertical.component.html', - styleUrls : ['./navbar-vertical.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class FuseNavbarVerticalComponent implements OnInit, OnDestroy -{ - private _backdropElement: HTMLElement | null = null; - private _folded = false; - - @HostBinding('class.close') isClosed: boolean; - @HostBinding('class.folded') isFoldedActive: boolean; - @HostBinding('class.folded-open') isFoldedOpen: boolean; - @HostBinding('class.initialized') initialized: boolean; - @ViewChild(FusePerfectScrollbarDirective) fusePerfectScrollbarDirective; - - @Input() - set folded(value: boolean) - { - this._folded = value; - - if ( this._folded ) - { - this.activateFolded(); - } - else - { - this.deActivateFolded(); - } - } - - get folded(): boolean - { - return this._folded; - } - - matchMediaWatcher: Subscription; - navigationServiceWatcher: Subscription; - fusePerfectScrollbarUpdateTimeout; - - player: AnimationPlayer; - - constructor( - private fuseMainComponent: FuseMainComponent, - private fuseMatchMedia: FuseMatchMedia, - private fuseNavigationService: FuseNavigationService, - private navBarService: FuseNavbarVerticalService, - private router: Router, - private _renderer: Renderer2, - private _elementRef: ElementRef, - private animationBuilder: AnimationBuilder, - public media: ObservableMedia - ) - { - navBarService.setNavBar(this); - - this.navigationServiceWatcher = - this.fuseNavigationService.onNavCollapseToggle.subscribe(() => { - this.fusePerfectScrollbarUpdateTimeout = setTimeout(() => { - this.fusePerfectScrollbarDirective.update(); - }, 310); - }); - - this.matchMediaWatcher = - this.fuseMatchMedia.onMediaChange - .subscribe((mediaStep) => { - setTimeout(() => { - - if ( this.media.isActive('lt-lg') ) - { - this.closeBar(); - this.deActivateFolded(); - } - else - { - this.openBar(); - this._detachBackdrop(); - } - }); - }); - - router.events.subscribe( - (event) => { - if ( event instanceof NavigationEnd ) - { - if ( this.media.isActive('lt-lg') ) - { - setTimeout(() => { - this.closeBar(); - }); - } - } - } - ); - } - - ngOnInit() - { - this.isClosed = false; - this.isFoldedActive = this._folded; - this.isFoldedOpen = false; - this.initialized = false; - this.updateCssClasses(); - - setTimeout(() => { - this.initialized = true; - }); - - if ( this.media.isActive('lt-lg') ) - { - this.closeBar(); - this.deActivateFolded(); - } - else - { - if ( !this._folded ) - { - this.deActivateFolded(); - } - else - { - this.activateFolded(); - } - } - } - - ngOnDestroy() - { - clearTimeout(this.fusePerfectScrollbarUpdateTimeout); - this.matchMediaWatcher.unsubscribe(); - this.navigationServiceWatcher.unsubscribe(); - } - - openBar() - { - if ( !this.isClosed ) - { - return; - } - - this.isClosed = false; - this.updateCssClasses(); - if ( this.media.isActive('lt-lg') ) - { - this._attachBackdrop(); - } - } - - closeBar() - { - if ( this.isClosed ) - { - return; - } - - this.isClosed = true; - this.updateCssClasses(); - this._detachBackdrop(); - } - - toggleBar() - { - if ( this.isClosed ) - { - this.openBar(); - } - else - { - this.closeBar(); - } - } - - toggleFold() - { - if ( !this.isFoldedActive ) - { - this.activateFolded(); - } - else - { - this.deActivateFolded(); - } - } - - activateFolded() - { - this.isFoldedActive = true; - this.fuseMainComponent.addClass('fuse-nav-bar-folded'); - this.isFoldedOpen = false; - } - - deActivateFolded() - { - this.isFoldedActive = false; - this.fuseMainComponent.removeClass('fuse-nav-bar-folded'); - this.isFoldedOpen = false; - } - - @HostListener('mouseenter') - onMouseEnter() - { - this.isFoldedOpen = true; - } - - @HostListener('mouseleave') - onMouseLeave() - { - this.isFoldedOpen = false; - } - - updateCssClasses() - { - if ( !this.isClosed ) - { - this.fuseMainComponent.addClass('fuse-navbar-opened'); - this.fuseMainComponent.removeClass('fuse-navbar-closed'); - } - else - { - this.fuseMainComponent.addClass('fuse-navbar-closed'); - this.fuseMainComponent.removeClass('fuse-navbar-opened'); - } - } - - private _attachBackdrop() - { - this._backdropElement = this._renderer.createElement('div'); - this._backdropElement.classList.add('fuse-navbar-backdrop'); - - this._renderer.appendChild(this._elementRef.nativeElement.parentElement, this._backdropElement); - - this.player = - this.animationBuilder - .build([ - animate('400ms ease', style({opacity: 1})) - ]).create(this._backdropElement); - - this.player.play(); - - this._backdropElement.addEventListener('click', () => { - this.closeBar(); - } - ); - } - - private _detachBackdrop() - { - if ( this._backdropElement ) - { - this.player = - this.animationBuilder - .build([ - animate('400ms cubic-bezier(.25,.8,.25,1)', style({opacity: 0})) - ]).create(this._backdropElement); - - this.player.play(); - - this.player.onDone(() => { - if ( this._backdropElement ) - { - this._backdropElement.parentNode.removeChild(this._backdropElement); - this._backdropElement = null; - } - }); - } - } -} diff --git a/src/app/main/navbar/vertical/navbar-vertical.service.ts b/src/app/main/navbar/vertical/navbar-vertical.service.ts deleted file mode 100644 index 6cf17124..00000000 --- a/src/app/main/navbar/vertical/navbar-vertical.service.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable() -export class FuseNavbarVerticalService -{ - navBarRef; - - constructor() - { - } - - setNavBar(ref) - { - this.navBarRef = ref; - } - - getNavBar() - { - return this.navBarRef; - } -} diff --git a/src/app/main/quick-panel/quick-panel.component.ts b/src/app/main/quick-panel/quick-panel.component.ts index bd78cd3b..6163e058 100644 --- a/src/app/main/quick-panel/quick-panel.component.ts +++ b/src/app/main/quick-panel/quick-panel.component.ts @@ -22,7 +22,6 @@ export class FuseQuickPanelComponent implements OnInit cloud : false, retro : true }; - } ngOnInit() diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html index 770b245f..07fe27c5 100644 --- a/src/app/main/toolbar/toolbar.component.html +++ b/src/app/main/toolbar/toolbar.component.html @@ -7,7 +7,8 @@
diff --git a/src/app/main/toolbar/toolbar.component.scss b/src/app/main/toolbar/toolbar.component.scss index 6176d063..f1bd3177 100644 --- a/src/app/main/toolbar/toolbar.component.scss +++ b/src/app/main/toolbar/toolbar.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/core/scss/fuse'; +@import 'src/@fuse/scss/fuse'; :host { position: relative; diff --git a/src/app/main/toolbar/toolbar.component.ts b/src/app/main/toolbar/toolbar.component.ts index 11727cc9..2e26b03e 100644 --- a/src/app/main/toolbar/toolbar.component.ts +++ b/src/app/main/toolbar/toolbar.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; import { NavigationEnd, NavigationStart, Router } from '@angular/router'; -import { FuseConfigService } from '../../core/services/config.service'; import { TranslateService } from '@ngx-translate/core'; +import { FuseConfigService } from '@fuse/services/config.service'; +import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; + @Component({ selector : 'fuse-toolbar', templateUrl: './toolbar.component.html', @@ -16,10 +18,12 @@ export class FuseToolbarComponent selectedLanguage: any; showLoadingBar: boolean; horizontalNav: boolean; + noNav: boolean; constructor( private router: Router, private fuseConfig: FuseConfigService, + private sidebarService: FuseSidebarService, private translate: TranslateService ) { @@ -78,12 +82,18 @@ export class FuseToolbarComponent } }); - this.fuseConfig.onSettingsChanged.subscribe((settings) => { + this.fuseConfig.onConfigChanged.subscribe((settings) => { this.horizontalNav = settings.layout.navigation === 'top'; + this.noNav = settings.layout.navigation === 'none'; }); } + toggleSidebarOpened(key) + { + this.sidebarService.getSidebar(key).toggleOpen(); + } + search(value) { // Do your search here... diff --git a/src/app/navigation/navigation.model.ts b/src/app/navigation/navigation.model.ts index 0ab3b6a4..6e475b00 100644 --- a/src/app/navigation/navigation.model.ts +++ b/src/app/navigation/navigation.model.ts @@ -1,4 +1,4 @@ -import { FuseNavigationModelInterface } from '../core/components/navigation/navigation.model'; +import { FuseNavigationModelInterface } from '@fuse/components/navigation/navigation.model'; export class FuseNavigationModel implements FuseNavigationModelInterface { @@ -911,4 +911,3 @@ export class FuseNavigationModel implements FuseNavigationModelInterface ]; } } - diff --git a/src/styles.scss b/src/styles.scss index 5bc10165..d71a4d52 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,2 +1,2 @@ // Import Fuse main library -@import "app/core/scss/core"; \ No newline at end of file +@import "@fuse/scss/core"; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index d08dfe1b..293548e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,25 +1,31 @@ { - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "target": "es5", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2017", - "dom" - ] - }, - "angularCompilerOptions": { - "genDir": "release/", - "strictMetadataEmit": true, - "skipTemplateCodegen": true, - "annotationsAs": "decorators" - } + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./src", + "outDir": "./dist/out-tsc", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "target": "es5", + "paths": { + "@fuse": [ + "@fuse/" + ] + }, + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2017", + "dom" + ] + }, + "angularCompilerOptions": { + "genDir": "release/", + "strictMetadataEmit": true, + "skipTemplateCodegen": true, + "annotationsAs": "decorators" + } } From 3dfb79423a248d95fb0c138685420a120d5148f1 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 20 Feb 2018 11:05:07 +0300 Subject: [PATCH 02/20] Changed how navigation data passed into the fuse-navigation + Added hidden property to the nav items + Updated fuse-navigation component docs + Updated other components that uses fuse-navigation service + Updated various packages including Angular and Angular Material --- package-lock.json | 3291 ++++------------- package.json | 40 +- .../navigation/navigation.component.html | 4 +- .../navigation/navigation.component.scss | 12 +- .../navigation/navigation.component.ts | 24 +- .../components/navigation/navigation.model.ts | 5 - .../navigation/navigation.module.ts | 1 + .../navigation/navigation.service.ts | 164 +- .../nav-vertical-collapse.component.html | 36 +- .../nav-vertical-collapse.component.ts | 10 +- .../nav-vertical-group.component.html | 24 +- .../nav-item/nav-vertical-item.component.html | 36 +- .../shortcuts/shortcuts.component.ts | 4 +- .../theme-options/theme-options.component.ts | 5 +- src/app/app.component.ts | 4 - .../navigation/navigation.component.html | 104 +- .../navigation/navigation.component.ts | 36 +- src/app/main/navbar/navbar.component.html | 4 +- src/app/main/navbar/navbar.component.scss | 54 +- src/app/main/navbar/navbar.component.ts | 34 +- src/app/navigation/navigation.model.ts | 913 ----- src/app/navigation/navigation.ts | 903 +++++ 22 files changed, 1826 insertions(+), 3882 deletions(-) delete mode 100644 src/@fuse/components/navigation/navigation.model.ts delete mode 100644 src/app/navigation/navigation.model.ts create mode 100644 src/app/navigation/navigation.ts diff --git a/package-lock.json b/package-lock.json index efc8b820..267c2013 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "fuse2", - "version": "1.3.7", + "name": "fuse", + "version": "5.2.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,9 +10,9 @@ "integrity": "sha512-3bdfvkWDmJszpj/F6Fzgv7sks0cs/cUEQPfs37tcJFz3jc62SsXy4TGb/WJT8FpH2nSGE6DonP8lXuFxB0lblQ==" }, "@angular-devkit/build-optimizer": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.42.tgz", - "integrity": "sha512-BAYCVZ10ro6mgZQDZiNiVbX8ppygw4q7z/stpwG8WjMswgMRIcxsxYoC1VFuWcUPAf4UyfTIav6e8UZWA5+xnQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.3.1.tgz", + "integrity": "sha512-yCjN+iLyF0GXzmYfVnq/YwAlUmIcVEV4XS3zqz1hXJuNMQcrYm4Zxamr6ICfOGcayd9vdaRtRFHbQc6jutEjag==", "dev": true, "requires": { "loader-utils": "1.1.0", @@ -22,9 +22,9 @@ } }, "@angular-devkit/core": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.29.tgz", - "integrity": "sha512-jtUBA0pIrkdXcVqDmDrGlniqwM7NFOKdo7vWFDmCVLBbC9rZHeYW5Xv/+4HyBhGLJ4wxsAkUjsHKWGJINPPpiw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.3.1.tgz", + "integrity": "sha512-F/yayl1gMe3jA/AMYShP2zNMi8d6OiCZcDrYdWYeJxHvNZBFpKkwAkDTMEVtsxK+5Y4+V+yJgO/l/q4GNMi6fA==", "dev": true, "requires": { "ajv": "5.5.2", @@ -34,54 +34,54 @@ } }, "@angular-devkit/schematics": { - "version": "0.0.52", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.52.tgz", - "integrity": "sha512-NtG8VB5aWtg0cw1Y7EJinJMuAnXsNdkQkkVe/i7CO6TPLyFQSFQCN1YojCr43l8jTWTRebRslrBawPCMOxsOgw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.3.1.tgz", + "integrity": "sha512-ZiDHa2AYJ6lRqeTwo1agED2LjhzfDodz5UEiDX1ekFANT0nHyUfZYg/B+psmDO1eDtQZGPmmyp3BaPZAZbhq6A==", "dev": true, "requires": { - "@ngtools/json-schema": "1.1.0", + "@ngtools/json-schema": "1.2.0", "rxjs": "5.5.6" } }, "@angular/animations": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.4.tgz", - "integrity": "sha512-kLOUORV/2GdYsNSwmUsB3eEL+nAoBZYKgibYLkVy6oecrIbdFMWiNzLcFjX/avcMnb1UNMk24Hd7Of4C2UawPA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.5.tgz", + "integrity": "sha512-70ElCmaeDxLQc2OkgYhJjXj4zjtdjI4K1D5ZZm/uSPLlUcqC6uf6skCXlhMawQoPbsL/SXE5xw2HlMgEbhUysw==", "requires": { "tslib": "1.9.0" } }, "@angular/cdk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.0.tgz", - "integrity": "sha1-Q2j2dJ6RXNzHXTJa4z/bP4WogQg=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.1.tgz", + "integrity": "sha512-8vsHeRymM+p82JeBzanrjmxp0koTU5W8cXO05ojECRsj6gUE/C950rMfFDga7fC8Pu5KTru/hWQoOcKErb3Uzg==", "requires": { "tslib": "1.9.0" } }, "@angular/cli": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.8.tgz", - "integrity": "sha512-/cqk7CoChwyEPav+NRzv6esZwXXxg2RszRCtPMKlIPNw9y/nleZFXka2igfJrxsjcMI5WN6z9gYvJRI7qF7RJA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.0.tgz", + "integrity": "sha512-8XndpwR30zVSD0lc9E4x5dWXREq0qJwt7CAzaDm/Pd7K/apSUHrBFmfijvW2diK530d2wtiUYwGBYC2Qrlml7w==", "dev": true, "requires": { - "@angular-devkit/build-optimizer": "0.0.42", - "@angular-devkit/core": "0.0.29", - "@angular-devkit/schematics": "0.0.52", - "@ngtools/json-schema": "1.1.0", - "@ngtools/webpack": "1.9.8", - "@schematics/angular": "0.1.17", - "autoprefixer": "7.2.5", + "@angular-devkit/build-optimizer": "0.3.1", + "@angular-devkit/core": "0.3.1", + "@angular-devkit/schematics": "0.3.1", + "@ngtools/json-schema": "1.2.0", + "@ngtools/webpack": "1.10.0", + "@schematics/angular": "0.3.1", + "@schematics/package-update": "0.3.1", + "autoprefixer": "7.2.6", + "cache-loader": "1.2.0", "chalk": "2.2.2", "circular-dependency-plugin": "4.4.0", + "clean-css": "4.1.9", "common-tags": "1.7.2", - "copy-webpack-plugin": "4.3.1", + "copy-webpack-plugin": "4.4.1", "core-object": "3.1.5", - "css-loader": "0.28.9", - "cssnano": "3.10.0", "denodeify": "1.2.1", "ember-cli-string-utils": "1.1.0", - "exports-loader": "0.6.4", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.6", "fs-extra": "4.0.3", @@ -101,7 +101,8 @@ "nopt": "4.0.1", "opn": "5.1.0", "portfinder": "1.0.13", - "postcss-import": "11.0.0", + "postcss": "6.0.19", + "postcss-import": "11.1.0", "postcss-loader": "2.1.0", "postcss-url": "7.3.0", "raw-loader": "0.5.1", @@ -111,39 +112,39 @@ "semver": "5.5.0", "silent-error": "1.1.0", "source-map-support": "0.4.18", - "style-loader": "0.13.2", + "style-loader": "0.19.1", "stylus": "0.54.5", "stylus-loader": "3.0.1", - "uglifyjs-webpack-plugin": "1.1.8", + "uglifyjs-webpack-plugin": "1.2.0", "url-loader": "0.6.2", - "webpack": "3.10.0", + "webpack": "3.11.0", "webpack-dev-middleware": "1.12.2", "webpack-dev-server": "2.11.1", "webpack-merge": "4.1.1", "webpack-sources": "1.1.0", - "webpack-subresource-integrity": "1.0.3" + "webpack-subresource-integrity": "1.0.4" } }, "@angular/common": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.4.tgz", - "integrity": "sha512-PNtg7lzCBUgYo5Rj+/j11EVKhLfrUkkh81ecBwexk6VcDJebmvBO1HdGppV5UPzEH/StL1mTwLc95dOI0hHSJA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.5.tgz", + "integrity": "sha512-jagCxo+75pcTwjuO1ZheIiTlKBJ6REFKFWoUPTzaSS6fnzReFJ+VPf4Pb0bWtHL1lWvbvnzmITOJPB9wmuM3fg==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.4.tgz", - "integrity": "sha512-KFaGcm/5OKJRxXIxrS53IYPtqta9u2xLLedrWspxIvI59ImfzeZGnLGPhfrI0pbK7wY0rJ5YdGYQnzq33dh01A==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.5.tgz", + "integrity": "sha512-YU/r5omexkrrBF3bZaseWrc2Iotk6hIdUWkPIL3gPC0hKJ3wBeB3sHCBujPQXktWdMBbQRujNSMZtgra3Oh1xQ==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler-cli": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.4.tgz", - "integrity": "sha512-nODdd7EuGzk1ME5UzpVa/lN1oKNypRt2oZoNYOkgNO2TQWD1jqOcozruit1eOEFHQhXO2JvPTzlt1dd6viHSCQ==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.5.tgz", + "integrity": "sha512-jRFMxUKpodzOBKdZc6OMse+CjK6xfTJssZQrYeIyqz2daobaIsMZP2hZX8s/PCfV8Vxa7XFwCJb7Fq2uyZKfHg==", "dev": true, "requires": { "chokidar": "1.7.0", @@ -161,9 +162,9 @@ } }, "@angular/core": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.4.tgz", - "integrity": "sha512-GPnxUf7g8Mz0AUttKKcqaw0m2xZujwwzojkg3xUIvHrNFFF5/HH5549PfnE1jD7qkmnDFx5j3IPuNkwYHW6XvA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.5.tgz", + "integrity": "sha512-Uo7R3LrsvA24JkRbwXWUZWp7NSEpwdTUxT1NScyjrBK+t8ybSL5/42Jo21md5M4pjeCsIgUXlGoCm1QtT5aYnQ==", "requires": { "tslib": "1.9.0" } @@ -177,63 +178,63 @@ } }, "@angular/forms": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.4.tgz", - "integrity": "sha512-0k6rs2k85wcBq0WPAjxNbtBu1wq/1fUSFaBLbpnrwwHeCLJI5aAjG2/f3jv/17a/ek7/WZ3lxXtHzNMMdaD/Iw==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.5.tgz", + "integrity": "sha512-3feqqTuv9rIu7ZOsLCtM/ugNFz5RPujLHkE8bU1gsMM4/eMYruIFir2vbjnhMkD3K6KptEg4iO6tDW18diwXug==", "requires": { "tslib": "1.9.0" } }, "@angular/http": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.4.tgz", - "integrity": "sha512-WjZTNqHw9cT/mIRenIGKKlJRdm9ZdDl7IqnX+OnAdO/c6hmoQwy9fkSLRLmcXw4FBM+ASfjWu4ybodaZ8Tv6xQ==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.5.tgz", + "integrity": "sha512-VqTCkAnebe+M9Bqrfp1QYpBQCTbXide/NxrQfwiJY87kjKFeRBuy9/XH/2S5wIwlF5Yx3bmlaIufd9VI5r/0aQ==", "requires": { "tslib": "1.9.0" } }, "@angular/language-service": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.4.tgz", - "integrity": "sha512-slze+UcBzm+p/pAIGxah3errOlWsUVJ5I4RNgErmR3rlylt5YNWNM/LClbDVGk8zoW+NBg0fwIxUbqK6qnk5Cw==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.5.tgz", + "integrity": "sha512-UWNbECu8svXmrgbTL03Fr+Dn06aPCZZLScmCOGVT5lkdsiJPAJpWAvKVM2Y0nzH0PmvekHw7INtV5lwfJOijYQ==", "dev": true }, "@angular/material": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.0.tgz", - "integrity": "sha1-hZnjFJ1ISH4+kulB+p3FUXbjoM8=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.1.tgz", + "integrity": "sha512-94VmxclpIwXAxeudz9AfMg0m46/TEx/GsDZ7R9yOtrbptAr9xSgOumiEqET4Xjb35/mzgD/PKqlcMWyHJCkyVQ==", "requires": { "tslib": "1.9.0" } }, "@angular/material-moment-adapter": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.0.tgz", - "integrity": "sha1-gIDjS0bDWGzTnkZkJmfIAE+kuHs=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.1.tgz", + "integrity": "sha512-mdLx0RTTgfnJ/9Z5cr5sNTHY9khl6UKLLd9FKoIIr7lxo1otYjd3xUS9uwlEBzj6SWqzKsd2jecPqD2uVReBpA==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.4.tgz", - "integrity": "sha512-chv6h2aHQ/QoVA4Y6rpPpSju7vyLg/iMh516GxpGYVk6bHEdrH9pHJPulPcrt/LTd7lMAAHE3YmvYWVU6aDsaQ==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.5.tgz", + "integrity": "sha512-iPAuoG/c3pD3hnk1g0VgJu/pzNITvLQyT0W71MDMSuxLxs291kq+U2jklm40pStISd1mPbCNKmvz/7M+WbdLhg==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.4.tgz", - "integrity": "sha512-B3pv6FUTWA1daDYhx6b77FCFCzHQPuCyrsJQwMSSu6Xt+CYn2gc3dS0ph3B6cV6mnt1qIbEpML+Vp5Bi9x0Mkw==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.5.tgz", + "integrity": "sha512-IMEe2qUTC3CA3KoswmJJs+O2Lkyd5GXgl5ULupqhhm/TOL2FLk00kwv8k3Epaf2d1wXcjK3BMG7aAwc6RLH7QA==", "requires": { "tslib": "1.9.0" } }, "@angular/router": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.4.tgz", - "integrity": "sha512-sg3iCThhbfv/6zARdKbHNLc7Xe1Rt1deit55b3K+WlrHX7GhsuJPLcitrNaADIcgDKbNT9XrwBaNirAEip9hxA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.5.tgz", + "integrity": "sha512-I8U0iy59lz0dAxU4zxRQHagfUPWF+MikLNMirRL1lrA49PG+5K1tiuIQ6p+8fZFAJ5UXwNHyXqYuWqsKRiVBHQ==", "requires": { "tslib": "1.9.0" } @@ -265,15 +266,15 @@ "integrity": "sha1-3zDXn1JMK3xzB3wIRzLRt+vvq5U=" }, "@ngtools/json-schema": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", - "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.2.0.tgz", + "integrity": "sha512-pMh+HDc6mOjUO3agRfB1tInimo7hf67u+0Cska2bfXFe6oU7rSMnr5PLVtiZVgwMoBHpx/6XjBymvcnWPo2Uzg==", "dev": true }, "@ngtools/webpack": { - "version": "1.9.8", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.8.tgz", - "integrity": "sha512-V4cFDBpWMU11KWod4qW3rJ00dBeBKYxwzD2r2kwDQl5NogVTeBacz2gq6udUfwJ/yMxJTTFdpV7NKsydTb0BoA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.0.tgz", + "integrity": "sha512-QdzPjUgb1VIJ/uIMXGe5mJsufp0gxItDZj/3RD+xfqYCgabLRFPZ89qe88tTCzhburuEfHK6+Uqk5HWlVnA4oA==", "dev": true, "requires": { "chalk": "2.2.2", @@ -292,14 +293,25 @@ "integrity": "sha1-rhA5KINrip4Gn9Li52+iGYzH5ig=" }, "@schematics/angular": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.17.tgz", - "integrity": "sha512-PHE5gk/ogPY/aN94dbbtauHMCq+/7w4Kdcl7tGmSS8mPKEI0wa6XJi//Wq/tHi55lb2fP58oEZU6n6w/wQascw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.3.1.tgz", + "integrity": "sha512-oGkK9ZCCOWvYyt/pmYq3+0exLtmr4sh8Rpd072Wjpc2VS9ulloMxLhVxyYEq11rqMVetKkaI9cDuJYwlQFOaJQ==", "dev": true, "requires": { "typescript": "2.6.2" } }, + "@schematics/package-update": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@schematics/package-update/-/package-update-0.3.1.tgz", + "integrity": "sha512-XibkZwEyo00MhCC61z7NbN8BLwsmhs/yT9jYm1QjVZ6edWfB3l6Gv7jvGvt6WiK+KDG9T+pgrJ16DXFAOU+oiA==", + "dev": true, + "requires": { + "rxjs": "5.5.6", + "semver": "5.5.0", + "semver-intersect": "1.3.0" + } + }, "@swimlane/ngx-charts": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.0.1.tgz", @@ -347,9 +359,9 @@ } }, "@types/node": { - "version": "6.0.98", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.98.tgz", - "integrity": "sha512-Pzldp01+6TyKlTBlp+i4RzFCuwjOpHxcfEnB74IedyEUqil2uLVg7jelYKS3Ik9/M4WzIK5N9RdtZg6UByyPEg==", + "version": "6.0.101", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.101.tgz", + "integrity": "sha512-IQ7V3D6+kK1DArTqTBrnl3M+YgJZLw8ta8w3Q9xjR79HaJzMAoTbZ8TNzUTztrkCKPTqIstE2exdbs1FzsYLUw==", "dev": true }, "@types/prismjs": { @@ -480,9 +492,9 @@ } }, "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz", + "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=", "dev": true }, "align-text": { @@ -496,12 +508,6 @@ "repeat-string": "1.6.1" } }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -552,22 +558,16 @@ } }, "angular-calendar": { - "version": "0.23.3", - "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.3.tgz", - "integrity": "sha512-MMUb4e6XmFJVv2FPqAdLlQWDtoklVxQ0wxeaZstwaUXXpzQ3sHFMMBhHADZcYcRkGDQsgoK39+sONeJB7RPvvg==", + "version": "0.23.6", + "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.6.tgz", + "integrity": "sha512-4zC4KU7M0NF3fmKxSyW2R2B9IAQlU+3ApwAlfOltIjSUKVqD0K3UHaxrptoTXRDsak0t3JhCQBNdfqZf8W5/oQ==", "requires": { "angular-draggable-droppable": "2.0.0", "angular-resizable-element": "2.0.0", "calendar-utils": "0.1.1", "date-fns": "1.29.0", - "positioning": "1.3.1" - }, - "dependencies": { - "calendar-utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.1.tgz", - "integrity": "sha512-75JPgUK7l7OTg4ZptJMuuIoQzLndc4tcGhBCFtEONr0AMlD7zFVZthOC6Sf29K8r81A1+BJ/tDIFlElgY4XFFw==" - } + "positioning": "1.3.1", + "tslib": "1.9.0" } }, "angular-draggable-droppable": { @@ -871,16 +871,16 @@ "dev": true }, "autoprefixer": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.5.tgz", - "integrity": "sha512-XqHfo8Ht0VU+T5P+eWEVoXza456KJ4l62BPewu3vpNf3LP9s2+zYXkXBznzYby4XeECXgG3N4i+hGvOhXErZmA==", + "version": "7.2.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", + "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", "dev": true, "requires": { "browserslist": "2.11.3", - "caniuse-lite": "1.0.30000804", + "caniuse-lite": "1.0.30000809", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "6.0.17", + "postcss": "6.0.19", "postcss-value-parser": "3.3.0" } }, @@ -1062,6 +1062,15 @@ "pascalcase": "0.1.1" }, "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", @@ -1523,7 +1532,7 @@ "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000804", + "caniuse-lite": "1.0.30000809", "electron-to-chromium": "1.3.33" } }, @@ -1591,9 +1600,9 @@ "dev": true }, "cacache": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz", - "integrity": "sha512-dljb7dk1jqO5ogE+dRpoR9tpHYv5xz9vPSNunh1+0wRuNdYxmzp9WmsyokgW/DUF1FDRVA/TMsmxt027R8djbQ==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { "bluebird": "3.5.1", @@ -1601,14 +1610,14 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "lru-cache": "4.1.1", - "mississippi": "1.3.1", + "mississippi": "2.0.0", "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", "rimraf": "2.6.2", - "ssri": "5.2.1", + "ssri": "5.2.4", "unique-filename": "1.1.0", - "y18n": "3.2.1" + "y18n": "4.0.0" } }, "cache-base": { @@ -1636,12 +1645,29 @@ } } }, + "cache-loader": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.0.tgz", + "integrity": "sha512-E95knP7jxy2bF/HKuw5gCEXm06tp7/sEjewNF39ezyVBnVmNzB9bnXflEFBvrqZrswsCmgiCbiIc7xIeVXW7Gw==", + "dev": true, + "requires": { + "async": "2.6.0", + "loader-utils": "1.1.0", + "mkdirp": "0.5.1", + "schema-utils": "0.4.5" + } + }, "cached-path-relative": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz", "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=", "dev": true }, + "calendar-utils": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.1.tgz", + "integrity": "sha512-75JPgUK7l7OTg4ZptJMuuIoQzLndc4tcGhBCFtEONr0AMlD7zFVZthOC6Sf29K8r81A1+BJ/tDIFlElgY4XFFw==" + }, "callsite": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", @@ -1674,40 +1700,10 @@ "map-obj": "1.0.1" } }, - "caniuse-api": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000804", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" - }, - "dependencies": { - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000804", - "electron-to-chromium": "1.3.33" - } - } - } - }, - "caniuse-db": { - "version": "1.0.30000804", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000804.tgz", - "integrity": "sha1-hP60IBj8ZM9q/2Nx5DEV8pLAAXk=", - "dev": true - }, "caniuse-lite": { - "version": "1.0.30000804", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000804.tgz", - "integrity": "sha512-HDZPSHLi18Bac8YU+bDJPtJLf19DwoNTM7Qp1alhltYW9FxNUlwCgk1xk92H0hB+xiKW4Jb9LXQv6M+riQyxFg==", + "version": "1.0.30000809", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000809.tgz", + "integrity": "sha512-tLn4flj2upmMsko3larTkQh21Vp9pylnNPUOhw5+mubL+67U5Fpm4UG5AutzGBc+gBIPSsPFHDynsiMWp5m46g==", "dev": true }, "caseless": { @@ -1836,42 +1832,6 @@ "integrity": "sha512-UjgcRlTAhAkLeXmDe2wK7ktwy/tgAqxiSndTIPiFZuIPLZmzHzWMwUIe9h9m/OokypG7snxCDEuwJshGBdPvaw==", "dev": true }, - "clap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", - "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", - "dev": true, - "requires": { - "chalk": "1.1.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 - } - } - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -1995,9 +1955,9 @@ } }, "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", "dev": true }, "clone-deep": { @@ -2029,15 +1989,6 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, - "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", - "dev": true, - "requires": { - "q": "1.5.1" - } - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -2068,17 +2019,6 @@ "object-visit": "1.0.1" } }, - "color": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", - "dev": true, - "requires": { - "clone": "1.0.3", - "color-convert": "1.9.1", - "color-string": "0.3.0" - } - }, "color-convert": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", @@ -2093,26 +2033,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "color-string": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "colormin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", - "dev": true, - "requires": { - "color": "0.11.4", - "css-color-names": "0.0.4", - "has": "1.0.1" - } - }, "colors": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", @@ -2202,23 +2122,31 @@ "dev": true }, "compressible": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", - "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz", + "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=", "dev": true, "requires": { - "mime-db": "1.30.0" + "mime-db": "1.33.0" + }, + "dependencies": { + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "dev": true + } } }, "compression": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz", - "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz", + "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=", "dev": true, "requires": { "accepts": "1.3.4", "bytes": "3.0.0", - "compressible": "2.0.12", + "compressible": "2.0.13", "debug": "2.6.9", "on-headers": "1.0.1", "safe-buffer": "5.1.1", @@ -2358,20 +2286,18 @@ "dev": true }, "copy-webpack-plugin": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.3.1.tgz", - "integrity": "sha512-xlcFiW/U7KrpS6dFuWq3r8Wb7koJx7QVc7LDFCosqkikaVSxkaYOnwDLwilbjrszZ0LYZXThDAJKcQCSrvdShQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.4.1.tgz", + "integrity": "sha512-ojaz8MpS3zoLJT/JbYMusYM+dCEArhW24hGAUPYPydTCS+87NFh2TWr85sywG3So4Q4E68QoerqQ+Ns1g0fhDg==", "dev": true, "requires": { - "cacache": "10.0.2", + "cacache": "10.0.4", "find-cache-dir": "1.0.0", "globby": "7.1.1", "is-glob": "4.0.0", "loader-utils": "0.2.17", - "lodash": "4.17.4", "minimatch": "3.0.4", "p-limit": "1.2.0", - "pify": "3.0.0", "serialize-javascript": "1.4.0" }, "dependencies": { @@ -2530,90 +2456,6 @@ "randomfill": "1.0.3" } }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-loader": { - "version": "0.28.9", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.9.tgz", - "integrity": "sha512-r3dgelMm/mkPz5Y7m9SeiGE46i2VsEU/OYbez+1llfxtv8b2y5/b5StaeEvPK3S5tlNQI+tDW/xDIhKJoZgDtw==", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "css-selector-tokenizer": "0.7.0", - "cssnano": "3.10.0", - "icss-utils": "2.1.0", - "loader-utils": "1.1.0", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-modules-extract-imports": "1.2.0", - "postcss-modules-local-by-default": "1.2.0", - "postcss-modules-scope": "1.1.0", - "postcss-modules-values": "1.3.0", - "postcss-value-parser": "3.3.0", - "source-list-map": "2.0.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, "css-parse": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", @@ -2664,136 +2506,6 @@ "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", "dev": true }, - "cssnano": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", - "dev": true, - "requires": { - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.1", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.2", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "postcss-unique-selectors": "2.0.2", - "postcss-value-parser": "3.3.0", - "postcss-zindex": "2.2.0" - }, - "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 - }, - "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000804", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000804", - "electron-to-chromium": "1.3.33" - } - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "csso": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", - "dev": true, - "requires": { - "clap": "1.2.3", - "source-map": "0.5.7" - } - }, "cuint": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", @@ -2826,7 +2538,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.38" + "es5-ext": "0.10.39" } }, "d3": { @@ -3191,12 +2903,21 @@ } }, "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } } }, "defined": { @@ -3679,9 +3400,9 @@ "dev": true }, "errno": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz", - "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { "prr": "1.0.1" @@ -3721,9 +3442,9 @@ } }, "es5-ext": { - "version": "0.10.38", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz", - "integrity": "sha512-jCMyePo7AXbUESwbl8Qi01VSH2piY9s/a3rSU/5w/MlTIx8HPL1xn2InGN8ejt/xulcJgnTO7vqNtOAxzYd2Kg==", + "version": "0.10.39", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz", + "integrity": "sha512-AlaXZhPHl0po/uxMx1tyrlt1O86M6D5iVaDH8UgLfgek4kXTX6vzsRfJQWC2Ku+aG8pkw1XWzh9eTkwfVrsD5g==", "dev": true, "requires": { "es6-iterator": "2.0.3", @@ -3737,7 +3458,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38", + "es5-ext": "0.10.39", "es6-symbol": "3.1.1" } }, @@ -3748,7 +3469,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38", + "es5-ext": "0.10.39", "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", @@ -3762,7 +3483,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38", + "es5-ext": "0.10.39", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -3775,7 +3496,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38" + "es5-ext": "0.10.39" } }, "es6-weak-map": { @@ -3785,7 +3506,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38", + "es5-ext": "0.10.39", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } @@ -3878,7 +3599,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.38" + "es5-ext": "0.10.39" } }, "eventemitter3": { @@ -4008,16 +3729,6 @@ "fill-range": "2.2.3" } }, - "exports-loader": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.6.4.tgz", - "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7" - } - }, "express": { "version": "4.16.2", "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", @@ -4077,12 +3788,24 @@ "dev": true }, "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } } }, "extglob": { @@ -4104,6 +3827,17 @@ "loader-utils": "1.1.0", "schema-utils": "0.3.0", "webpack-sources": "1.1.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.5.2" + } + } } }, "extsprintf": { @@ -4154,6 +3888,17 @@ "requires": { "loader-utils": "1.1.0", "schema-utils": "0.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.5.2" + } + } } }, "file-uri-to-path": { @@ -4220,7 +3965,7 @@ "dev": true, "requires": { "commondir": "1.0.1", - "make-dir": "1.1.0", + "make-dir": "1.2.0", "pkg-dir": "2.0.0" } }, @@ -4233,12 +3978,6 @@ "locate-path": "2.0.0" } }, - "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", - "dev": true - }, "flush-write-stream": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", @@ -5833,12 +5572,6 @@ "wbuf": "1.7.2" } }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", - "dev": true - }, "html-entities": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", @@ -5846,25 +5579,25 @@ "dev": true }, "html-minifier": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz", - "integrity": "sha512-WX7D6PB9PFq05fZ1/CyxPUuyqXed6vh2fGOM80+zJT5wAO93D/cUjLs0CcbBFjQmlwmCgRvl97RurtArIpOnkw==", + "version": "3.5.9", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz", + "integrity": "sha512-EZqO91XJwkj8BeLx9C12sKB/AHoTANaZax39vEOP9f/X/9jgJ3r1O2+neabuHqpz5kJO71TapP9JrtCY39su1A==", "dev": true, "requires": { "camel-case": "3.0.0", "clean-css": "4.1.9", - "commander": "2.12.2", + "commander": "2.14.1", "he": "1.1.1", "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.9" + "uglify-js": "3.3.11" }, "dependencies": { "commander": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz", - "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==", "dev": true } } @@ -5876,7 +5609,7 @@ "dev": true, "requires": { "bluebird": "3.5.1", - "html-minifier": "3.5.8", + "html-minifier": "3.5.9", "loader-utils": "0.2.17", "lodash": "4.17.4", "pretty-error": "2.1.1", @@ -6087,21 +5820,6 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "icss-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", - "dev": true, - "requires": { - "postcss": "6.0.17" - } - }, "ieee754": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", @@ -6159,12 +5877,6 @@ "repeating": "2.0.1" } }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -6329,12 +6041,6 @@ "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", "dev": true }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -6513,22 +6219,19 @@ } }, "is-odd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz", - "integrity": "sha1-O4qTLrAos3dcObsJ6RdnrM22kIg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "dev": true, "requires": { - "is-number": "3.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true } } }, @@ -6556,12 +6259,6 @@ "path-is-inside": "1.0.2" } }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -6613,15 +6310,6 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, - "is-svg": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", - "dev": true, - "requires": { - "html-comment-regex": "1.1.1" - } - }, "is-symbol": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", @@ -6640,6 +6328,12 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", @@ -6708,6 +6402,17 @@ "istanbul-lib-instrument": "1.9.1", "loader-utils": "1.1.0", "schema-utils": "0.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.5.2" + } + } } }, "istanbul-lib-coverage": { @@ -6846,7 +6551,8 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==", - "dev": true + "dev": true, + "optional": true }, "js-tokens": { "version": "3.0.2", @@ -7113,7 +6819,7 @@ "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==", "dev": true, "requires": { - "errno": "0.1.6", + "errno": "0.1.7", "graceful-fs": "4.1.11", "image-size": "0.5.5", "mime": "1.6.0", @@ -7134,12 +6840,6 @@ "pify": "2.3.0" }, "dependencies": { - "clone": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", - "dev": true - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -7269,22 +6969,28 @@ "dev": true, "optional": true }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "lodash.endswith": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz", + "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=", + "dev": true + }, + "lodash.isfunction": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", + "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", "dev": true }, "lodash.mergewith": { @@ -7294,18 +7000,18 @@ "dev": true, "optional": true }, + "lodash.startswith": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz", + "integrity": "sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=", + "dev": true + }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", "dev": true }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, "log4js": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.5.2.tgz", @@ -7510,12 +7216,6 @@ "yallist": "2.1.2" } }, - "macaddress": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", - "dev": true - }, "magic-string": { "version": "0.22.4", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz", @@ -7591,9 +7291,9 @@ } }, "make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", + "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", "dev": true, "requires": { "pify": "3.0.0" @@ -7626,12 +7326,6 @@ "object-visit": "1.0.1" } }, - "math-expression-evaluator": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", - "dev": true - }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -7675,7 +7369,7 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.6", + "errno": "0.1.7", "readable-stream": "2.3.3" } }, @@ -7803,9 +7497,9 @@ "dev": true }, "mississippi": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz", - "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "dev": true, "requires": { "concat-stream": "1.6.0", @@ -7814,7 +7508,7 @@ "flush-write-stream": "1.0.2", "from2": "2.3.0", "parallel-transform": "1.1.0", - "pump": "1.0.3", + "pump": "2.0.1", "pumpify": "1.4.0", "stream-each": "1.2.2", "through2": "2.0.3" @@ -7975,18 +7669,19 @@ "optional": true }, "nanomatch": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz", - "integrity": "sha512-/5ldsnyurvEw7wNpxLFgjVvBLMta43niEYOy0CJ4ntcYSbx6bugRUTQeFb4BR/WanEL1o3aQgHuVLHQaB6tOqg==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "dev": true, "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", - "define-property": "1.0.0", - "extend-shallow": "2.0.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", "fragment-cache": "0.2.1", - "is-odd": "1.0.0", - "kind-of": "5.1.0", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", "object.pick": "1.3.0", "regex-not": "1.0.0", "snapdragon": "0.8.1", @@ -8006,9 +7701,9 @@ "dev": true }, "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -8052,9 +7747,9 @@ } }, "ngx-color-picker": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.1.tgz", - "integrity": "sha512-03rrkv718RbeuHfEpr6PHnRy8xI2ncg0i3fW6jBPfNoHZQLDXh+7bY7xcdDKc9m52OtsPkvhriEwXbuY4EeckQ==" + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.2.tgz", + "integrity": "sha512-5fuhS+jKjzdH8J5YXeZq6Zam9U51p7GFQpWmrRD4gCrd5/Y1A1jYWrXlk0IRMpHsbEumAe+jYe2wrmGHWAqckw==" }, "ngx-cookie-service": { "version": "1.0.10", @@ -8090,7 +7785,7 @@ "mkdirp": "0.5.1", "nopt": "3.0.6", "npmlog": "4.1.2", - "osenv": "0.1.4", + "osenv": "0.1.5", "request": "2.81.0", "rimraf": "2.6.2", "semver": "5.3.0", @@ -8364,7 +8059,7 @@ "dev": true, "requires": { "abbrev": "1.1.1", - "osenv": "0.1.4" + "osenv": "0.1.5" } }, "normalize-package-data": { @@ -8394,18 +8089,6 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" - } - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -8715,9 +8398,9 @@ "dev": true }, "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { "os-homedir": "1.0.2", @@ -9080,38 +8763,33 @@ "dev": true }, "postcss": { - "version": "6.0.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", - "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", + "version": "6.0.19", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz", + "integrity": "sha512-f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==", "dev": true, "requires": { - "chalk": "2.3.0", + "chalk": "2.3.1", "source-map": "0.6.1", - "supports-color": "5.1.0" + "supports-color": "5.2.0" }, "dependencies": { "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", + "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", "dev": true, "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - }, - "dependencies": { - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } + "supports-color": "5.2.0" } }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -9119,615 +8797,23 @@ "dev": true }, "supports-color": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", - "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", "dev": true, "requires": { - "has-flag": "2.0.0" - } - } - } - }, - "postcss-calc": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-message-helpers": "2.0.0", - "reduce-css-calc": "1.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", - "dev": true, - "requires": { - "colormin": "1.1.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-comments": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-empty": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-unused": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-filter-plugins": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "uniqid": "4.1.1" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" + "has-flag": "3.0.0" } } } }, "postcss-import": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz", - "integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz", + "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==", "dev": true, "requires": { - "postcss": "6.0.17", + "postcss": "6.0.19", "postcss-value-parser": "3.3.0", "read-cache": "1.0.0", "resolve": "1.5.0" @@ -9772,1089 +8858,9 @@ "dev": true, "requires": { "loader-utils": "1.1.0", - "postcss": "6.0.17", + "postcss": "6.0.19", "postcss-load-config": "1.2.0", - "schema-utils": "0.4.3" - }, - "dependencies": { - "schema-utils": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz", - "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "ajv-keywords": "2.1.1" - } - } - } - }, - "postcss-merge-idents": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-merge-rules": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-api": "1.6.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3", - "vendors": "1.0.1" - }, - "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 - }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000804", - "electron-to-chromium": "1.3.33" - } - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-message-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-params": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "uniqs": "2.0.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-modules-extract-imports": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz", - "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", - "dev": true, - "requires": { - "postcss": "6.0.17" - } - }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.17" - } - }, - "postcss-modules-scope": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.17" - } - }, - "postcss-modules-values": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", - "dev": true, - "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "6.0.17" - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-normalize-url": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", - "dev": true, - "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "1.9.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-ordered-values": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-selector-parser": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", - "dev": true, - "requires": { - "flatten": "1.0.2", - "indexes-of": "1.0.1", - "uniq": "1.0.1" - } - }, - "postcss-svgo": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", - "dev": true, - "requires": { - "is-svg": "2.1.0", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "svgo": "0.7.2" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } + "schema-utils": "0.4.5" } }, "postcss-url": { @@ -10866,7 +8872,7 @@ "mime": "1.6.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", - "postcss": "6.0.17", + "postcss": "6.0.19", "xxhashjs": "0.2.2" } }, @@ -10876,85 +8882,12 @@ "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", "dev": true }, - "postcss-zindex": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "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" - }, - "dependencies": { - "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 - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.3", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "dev": true - }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -11013,7 +8946,7 @@ "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", "dev": true, "requires": { - "@types/node": "6.0.98", + "@types/node": "6.0.101", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.43", "blocking-proxy": "0.0.5", @@ -11185,9 +9118,9 @@ } }, "pump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", - "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { "end-of-stream": "1.4.1", @@ -11203,18 +9136,6 @@ "duplexify": "3.5.3", "inherits": "2.0.3", "pump": "2.0.1" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" - } - } } }, "punycode": { @@ -11223,12 +9144,6 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, "qjobs": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", @@ -11241,16 +9156,6 @@ "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", "dev": true }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" - } - }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -11503,42 +9408,6 @@ "dev": true, "optional": true }, - "reduce-css-calc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "math-expression-evaluator": "1.2.17", - "reduce-function-call": "1.0.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "reduce-function-call": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", - "dev": true, - "requires": { - "balanced-match": "0.4.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, "reflect-metadata": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz", @@ -11573,6 +9442,17 @@ "dev": true, "requires": { "extend-shallow": "2.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "regexpu-core": { @@ -11859,12 +9739,26 @@ "dev": true }, "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", + "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "6.1.1", + "ajv-keywords": "3.1.0" + }, + "dependencies": { + "ajv": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", + "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", + "dev": true, + "requires": { + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + } } }, "scss-tokenizer": { @@ -11949,6 +9843,15 @@ "semver": "5.5.0" } }, + "semver-intersect": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.0.tgz", + "integrity": "sha512-923f1TGXGb2+OCkLvsmNPijmurMQxEMFOhC80N4NL8/Jo5rBKufHZ3sBtJJ7GNhh4RhdsB6+vj+6W68kmr43Lg==", + "dev": true, + "requires": { + "semver": "5.5.0" + } + }, "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", @@ -12042,6 +9945,17 @@ "is-extendable": "0.1.1", "is-plain-object": "2.0.4", "split-string": "3.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "setimmediate": { @@ -12209,6 +10123,15 @@ "is-descriptor": "0.1.6" } }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -12279,6 +10202,15 @@ "snapdragon-util": "3.0.1" }, "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", @@ -12421,15 +10353,6 @@ "socks": "1.1.10" } }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "1.1.0" - } - }, "source-list-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", @@ -12527,27 +10450,6 @@ "dev": true, "requires": { "extend-shallow": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "2.0.4" - } - } } }, "sprintf-js": { @@ -12581,9 +10483,9 @@ } }, "ssri": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.1.tgz", - "integrity": "sha512-y4PjOWlAuxt+yAcXitQYOnOzZpKaH3+f/qGV3OWxbyC2noC9FA9GNC9uILnVdV7jruA1aDKr4OKz3ZDBcVZwFQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz", + "integrity": "sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ==", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -12765,12 +10667,6 @@ } } }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -12837,12 +10733,24 @@ "dev": true }, "style-loader": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", - "integrity": "sha1-dFMzhM9pjHEEx5URULSXF63C87s=", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz", + "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==", "dev": true, "requires": { - "loader-utils": "1.1.0" + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.5.2" + } + } } }, "stylus": { @@ -12927,21 +10835,6 @@ "has-flag": "2.0.0" } }, - "svgo": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", - "dev": true, - "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" - } - }, "symbol-observable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", @@ -13100,6 +10993,15 @@ "is-descriptor": "0.1.6" } }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -13445,15 +11347,21 @@ "dev": true }, "uglify-js": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.9.tgz", - "integrity": "sha512-J2t8B5tj9JdPTW4+sNZXmiIWHzTvcoITkaqzTiilu/biZF/9crqf/Fi7k5hqbOmVRh9/hVNxAxBYIMF7N6SqMQ==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.11.tgz", + "integrity": "sha512-AKLsYcdV+sS5eAE4NtVXF6f2u/DCQynQm0jTGxF261+Vltu1dYNuHzjqDmk11gInj+H/zJIM2EAwXG3MzPb3VA==", "dev": true, "requires": { - "commander": "2.13.0", + "commander": "2.14.1", "source-map": "0.6.1" }, "dependencies": { + "commander": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -13470,14 +11378,14 @@ "optional": true }, "uglifyjs-webpack-plugin": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz", - "integrity": "sha512-XG8/QmR1pyPeE1kj2aigo5kos8umefB31zW+PMvAAytHSB0T/vQvN6sqt8+Sh+y0b0A7zlmxNi2dzRnj0wcqGA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz", + "integrity": "sha512-Bc2NeyTTSJAy2JuKaBpdvWyuySPSPHNcj70KFqu7FhfrfsjPo0Kta9jgAvPrQxnz86mOH1tk4n/I8wvZrXvetA==", "dev": true, "requires": { - "cacache": "10.0.2", + "cacache": "10.0.4", "find-cache-dir": "1.0.0", - "schema-utils": "0.4.3", + "schema-utils": "0.4.5", "serialize-javascript": "1.4.0", "source-map": "0.6.1", "uglify-es": "3.3.9", @@ -13485,16 +11393,6 @@ "worker-farm": "1.5.2" }, "dependencies": { - "schema-utils": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz", - "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "ajv-keywords": "2.1.1" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -13543,6 +11441,15 @@ "set-value": "0.4.3" }, "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, "set-value": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", @@ -13557,27 +11464,6 @@ } } }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqid": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", - "dev": true, - "requires": { - "macaddress": "0.2.8" - } - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, "unique-filename": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", @@ -13654,6 +11540,18 @@ } } }, + "upath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.2.tgz", + "integrity": "sha512-fCmij7T5LnwUme3dbnVSejvOHHlARjB3ikJFwgZfz386pHmf/gueuTLRFU94FZEaeCLlbQrweiUU700gG41tUw==", + "dev": true, + "requires": { + "lodash.endswith": "4.2.1", + "lodash.isfunction": "3.0.9", + "lodash.isstring": "4.0.1", + "lodash.startswith": "4.2.1" + } + }, "upper-case": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", @@ -13693,6 +11591,17 @@ "loader-utils": "1.1.0", "mime": "1.6.0", "schema-utils": "0.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.5.2" + } + } } }, "url-parse": { @@ -13898,12 +11807,6 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, - "vendors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", - "dev": true - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -14039,15 +11942,15 @@ } }, "webpack": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz", - "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.11.0.tgz", + "integrity": "sha512-3kOFejWqj5ISpJk4Qj/V7w98h9Vl52wak3CLiw/cDOfbVTq7FeoZ0SdoHHY9PYlHr50ZS42OfvzE2vB4nncKQg==", "dev": true, "requires": { "acorn": "5.3.0", "acorn-dynamic-import": "2.0.2", - "ajv": "5.5.2", - "ajv-keywords": "2.1.1", + "ajv": "6.1.1", + "ajv-keywords": "3.1.0", "async": "2.6.0", "enhanced-resolve": "3.4.1", "escope": "3.6.0", @@ -14068,6 +11971,17 @@ "yargs": "8.0.2" }, "dependencies": { + "ajv": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", + "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", + "dev": true, + "requires": { + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", @@ -14225,6 +12139,12 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, "yargs": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", @@ -14400,8 +12320,8 @@ "ansi-html": "0.0.7", "array-includes": "3.0.3", "bonjour": "3.5.0", - "chokidar": "2.0.0", - "compression": "1.7.1", + "chokidar": "2.0.2", + "compression": "1.7.2", "connect-history-api-fallback": "1.5.0", "debug": "3.1.0", "del": "3.0.0", @@ -14421,7 +12341,7 @@ "sockjs-client": "1.1.4", "spdy": "3.4.7", "strip-ansi": "3.0.1", - "supports-color": "5.1.0", + "supports-color": "5.2.0", "webpack-dev-middleware": "1.12.2", "yargs": "6.6.0" }, @@ -14432,7 +12352,7 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.5", + "micromatch": "3.1.6", "normalize-path": "2.1.1" } }, @@ -14449,9 +12369,9 @@ "dev": true }, "braces": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz", - "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", + "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", "dev": true, "requires": { "arr-flatten": "1.1.0", @@ -14460,11 +12380,32 @@ "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", + "kind-of": "6.0.2", "repeat-element": "1.1.2", "snapdragon": "0.8.1", "snapdragon-node": "2.1.1", "split-string": "3.1.0", "to-regex": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "camelcase": { @@ -14474,14 +12415,14 @@ "dev": true }, "chokidar": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.0.tgz", - "integrity": "sha512-OgXCNv2U6TnG04D3tth0gsvdbV4zdbxFG3sYUqcoQMoEFVd1j1pZR6TZ8iknC45o9IJ6PeQI/J6wT/+cHcniAw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz", + "integrity": "sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==", "dev": true, "requires": { "anymatch": "2.0.0", "async-each": "1.0.1", - "braces": "2.3.0", + "braces": "2.3.1", "fsevents": "1.1.3", "glob-parent": "3.1.0", "inherits": "2.0.3", @@ -14489,7 +12430,8 @@ "is-glob": "4.0.0", "normalize-path": "2.1.1", "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "readdirp": "2.1.0", + "upath": "1.0.2" } }, "debug": { @@ -14533,6 +12475,32 @@ "requires": { "is-descriptor": "0.1.6" } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, @@ -14550,6 +12518,26 @@ "regex-not": "1.0.0", "snapdragon": "0.8.1", "to-regex": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "fill-range": { @@ -14562,6 +12550,17 @@ "is-number": "3.0.0", "repeat-string": "1.6.1", "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "glob-parent": { @@ -14585,6 +12584,12 @@ } } }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -14625,25 +12630,6 @@ } } }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -14692,20 +12678,20 @@ "dev": true }, "micromatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz", - "integrity": "sha512-ykttrLPQrz1PUJcXjwsTUjGoPJ64StIGNE2lGVD1c9CuguJ+L7/navsE8IcDNndOoCMvYV0qc/exfVbMHkUhvA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.6.tgz", + "integrity": "sha512-6hezhKgmSIRZeSCiVB84GOmH1Ajvo8XgnaEq/uPQ/wv0g+MQlaVonSEru7VMDZXzRWFoclakpADfInbg/5FGjw==", "dev": true, "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", - "braces": "2.3.0", - "define-property": "1.0.0", - "extend-shallow": "2.0.1", + "braces": "2.3.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", "extglob": "2.0.4", "fragment-cache": "0.2.1", "kind-of": "6.0.2", - "nanomatch": "1.2.7", + "nanomatch": "1.2.9", "object.pick": "1.3.0", "regex-not": "1.0.0", "snapdragon": "0.8.1", @@ -14713,14 +12699,20 @@ } }, "supports-color": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", - "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" } }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, "yargs": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", @@ -14781,9 +12773,9 @@ } }, "webpack-subresource-integrity": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.3.tgz", - "integrity": "sha1-wGBtQAkLBwzeQovsjfNgMhbkcus=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.4.tgz", + "integrity": "sha1-j6yKfo61n8ahZ2ioXJ2U7n+dDts=", "dev": true, "requires": { "webpack-core": "0.6.9" @@ -14811,12 +12803,6 @@ "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", "dev": true }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", - "dev": true - }, "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", @@ -14859,7 +12845,7 @@ "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", "dev": true, "requires": { - "errno": "0.1.6", + "errno": "0.1.7", "xtend": "4.0.1" } }, @@ -14946,9 +12932,9 @@ } }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, "yallist": { @@ -14985,6 +12971,13 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true, "optional": true + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index 39783d79..a08a2719 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "fuse2", - "version": "1.3.7", + "name": "fuse", + "version": "5.2.5", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", @@ -19,19 +19,19 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "5.2.4", - "@angular/cdk": "5.2.0", - "@angular/common": "5.2.4", - "@angular/compiler": "5.2.4", - "@angular/core": "5.2.4", + "@angular/animations": "5.2.5", + "@angular/cdk": "5.2.1", + "@angular/common": "5.2.5", + "@angular/compiler": "5.2.5", + "@angular/core": "5.2.5", "@angular/flex-layout": "2.0.0-beta.12", - "@angular/forms": "5.2.4", - "@angular/http": "5.2.4", - "@angular/material": "5.2.0", - "@angular/material-moment-adapter": "5.2.0", - "@angular/platform-browser": "5.2.4", - "@angular/platform-browser-dynamic": "5.2.4", - "@angular/router": "5.2.4", + "@angular/forms": "5.2.5", + "@angular/http": "5.2.5", + "@angular/material": "5.2.1", + "@angular/material-moment-adapter": "5.2.1", + "@angular/platform-browser": "5.2.5", + "@angular/platform-browser-dynamic": "5.2.5", + "@angular/router": "5.2.5", "@ngrx/effects": "5.0.0", "@ngrx/router-store": "5.0.0", "@ngrx/store": "5.0.0", @@ -41,7 +41,7 @@ "@swimlane/ngx-datatable": "11.1.7", "@swimlane/ngx-dnd": "3.1.0", "@types/prismjs": "1.9.0", - "angular-calendar": "0.23.3", + "angular-calendar": "0.23.6", "angular-in-memory-web-api": "0.5.3", "chart.js": "2.7.1", "classlist.js": "1.1.20150312", @@ -52,7 +52,7 @@ "moment": "2.20.1", "ng2-charts": "1.6.0", "ngrx-store-freeze": "0.2.1", - "ngx-color-picker": "5.3.1", + "ngx-color-picker": "5.3.2", "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.3.0", "prismjs": "1.11.0", @@ -61,13 +61,13 @@ "zone.js": "0.8.20" }, "devDependencies": { - "@angular/cli": "1.6.8", - "@angular/compiler-cli": "5.2.4", - "@angular/language-service": "5.2.4", + "@angular/cli": "1.7.0", + "@angular/compiler-cli": "5.2.5", + "@angular/language-service": "5.2.5", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.6", "@types/jasminewd2": "2.0.3", - "@types/node": "6.0.98", + "@types/node": "6.0.101", "codelyzer": "4.1.0", "jasmine-core": "2.8.0", "jasmine-spec-reporter": "4.2.1", diff --git a/src/@fuse/components/navigation/navigation.component.html b/src/@fuse/components/navigation/navigation.component.html index 4149e261..10ecaf89 100644 --- a/src/@fuse/components/navigation/navigation.component.html +++ b/src/@fuse/components/navigation/navigation.component.html @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/src/@fuse/components/navigation/navigation.component.scss b/src/@fuse/components/navigation/navigation.component.scss index 7cee8cc8..3432e89a 100644 --- a/src/@fuse/components/navigation/navigation.component.scss +++ b/src/@fuse/components/navigation/navigation.component.scss @@ -1,6 +1,12 @@ @import 'src/@fuse/scss/fuse'; -#main-navigation { - margin: 0; - padding: 0; +fuse-navigation { + display: flex; + flex: 1 0 auto; + + #main-navigation { + margin: 0; + padding: 0; + width: 100%; + } } diff --git a/src/@fuse/components/navigation/navigation.component.ts b/src/@fuse/components/navigation/navigation.component.ts index edd2c064..9a2e5a5c 100644 --- a/src/@fuse/components/navigation/navigation.component.ts +++ b/src/@fuse/components/navigation/navigation.component.ts @@ -1,6 +1,4 @@ -import { Component, Input, OnDestroy, ViewEncapsulation } from '@angular/core'; -import { FuseNavigationService } from './navigation.service'; -import { Subscription } from 'rxjs/Subscription'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'fuse-navigation', @@ -8,25 +6,13 @@ import { Subscription } from 'rxjs/Subscription'; styleUrls : ['./navigation.component.scss'], encapsulation: ViewEncapsulation.None }) -export class FuseNavigationComponent implements OnDestroy +export class FuseNavigationComponent { - navigationModel: any[]; - navigationModelChangeSubscription: Subscription; + @Input() layout = 'vertical'; + @Input() navigation: any; - @Input('layout') layout = 'vertical'; - - constructor(private fuseNavigationService: FuseNavigationService) + constructor() { - this.navigationModelChangeSubscription = - this.fuseNavigationService.onNavigationModelChange - .subscribe((navigationModel) => { - this.navigationModel = navigationModel; - }); - } - ngOnDestroy() - { - this.navigationModelChangeSubscription.unsubscribe(); } - } diff --git a/src/@fuse/components/navigation/navigation.model.ts b/src/@fuse/components/navigation/navigation.model.ts deleted file mode 100644 index 30268ded..00000000 --- a/src/@fuse/components/navigation/navigation.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface FuseNavigationModelInterface -{ - model: any[]; -} - diff --git a/src/@fuse/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts index 42e680cd..c9cc9efd 100644 --- a/src/@fuse/components/navigation/navigation.module.ts +++ b/src/@fuse/components/navigation/navigation.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../modules/shared.module'; import { RouterModule } from '@angular/router'; + import { FuseNavigationComponent } from './navigation.component'; import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component'; import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component'; diff --git a/src/@fuse/components/navigation/navigation.service.ts b/src/@fuse/components/navigation/navigation.service.ts index b85069b1..d2e4a319 100644 --- a/src/@fuse/components/navigation/navigation.service.ts +++ b/src/@fuse/components/navigation/navigation.service.ts @@ -1,177 +1,27 @@ import { EventEmitter, Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseNavigationModelInterface } from './navigation.model'; +import { Subject } from 'rxjs/Subject'; @Injectable() export class FuseNavigationService { - onNavCollapseToggle = new EventEmitter(); - onNavCollapseToggled = new EventEmitter(); - onNavigationModelChange: BehaviorSubject = new BehaviorSubject({}); - navigationModel: FuseNavigationModelInterface; flatNavigation: any[] = []; + onItemCollapsed: Subject = new Subject; + onItemCollapseToggled: Subject = new Subject; + constructor() { } /** - * Get navigation model - * + * Get flattened navigation array + * @param navigation * @returns {any[]} */ - getNavigationModel() + getFlatNavigation(navigation) { - return this.navigationModel.model; - } - - /** - * Set the navigation model - * - * @param model - */ - setNavigationModel(model) - { - this.navigationModel = model; - this.onNavigationModelChange.next(this.navigationModel.model); - } - - /** - * Add new navigation item - * to the given location - */ - addNavigationItem(location, item) - { - // Parse the location - const locationArr = location.split('.'); - - if ( locationArr.length === 0 ) - { - return; - } - - // Find the navigation item - const navItem = this.findNavigationItemById(locationArr); - - // Act according to the item type - switch ( navItem.type ) - { - case 'item': - - // Create a children array - navItem.children = []; - - // Push the item - navItem.children.push(item); - - // Change the item type to collapsable - navItem.type = 'collapse'; - - break; - - case 'collapse': - - // Push the item - navItem.children.push(item); - - break; - - case 'group': - - // Push the item - navItem.children.push(item); - - break; - - default: - break; - } - } - - /** - * Get navigation item from - * given location - * - * @param location - */ - getNavigationItem(location) - { - // Parse the location - const locationArr = location.split('.'); - - if ( locationArr.length === 0 ) - { - return; - } - - // Find and return the navigation item - return this.findNavigationItemById(locationArr); - } - - /** - * Find navigation item by location - * - * @param location - * @param navigation - */ - findNavigationItemById(location, navigation?) - { - if ( !navigation ) - { - navigation = this.navigationModel.model; - } - - // Iterate through the given navigation for ( const navItem of navigation ) { - // If the nav item id equals the first location... - if ( navItem.id === location[0] ) - { - // If there is more location to look at... - if ( location.length > 1 ) - { - // Remove the first item of the location - location.splice(0, 1); - - // Go nested... - return this.findNavigationItemById(location, navItem.children); - } - - // Otherwise just return the nav item - else - { - return navItem; - } - } - } - } - - /** - * Get flattened navigation array - * @param navigationItems - * @returns {any[]} - */ - getFlatNavigation(navigationItems?) - { - // If navigation items not provided, - // that means we are running the function - // for the first time... - if ( !navigationItems ) - { - // Reset the flat navigation - this.flatNavigation = []; - - // Get the entire navigation model - navigationItems = this.navigationModel.model; - } - - for ( const navItem of navigationItems ) - { - if ( navItem.type === 'subheader' ) - { - continue; - } - if ( navItem.type === 'item' ) { this.flatNavigation.push({ diff --git a/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html index 6ff78f82..e7654be5 100644 --- a/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html +++ b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html @@ -1,17 +1,21 @@ - - {{item.icon}} - {{item.title}} - - {{item.badge.title}} - - keyboard_arrow_right - + -
- - - - - -
+ + {{item.icon}} + {{item.title}} + + {{item.badge.title}} + + keyboard_arrow_right + + +
+ + + + + +
+ + diff --git a/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts index 3a640232..65afb2c8 100644 --- a/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts @@ -40,7 +40,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit ); // Listen for collapsing of any navigation item - this.navigationService.onNavCollapseToggled + this.navigationService.onItemCollapsed .subscribe( (clickedItem) => { if ( clickedItem && clickedItem.children ) @@ -95,8 +95,8 @@ export class FuseNavVerticalCollapseComponent implements OnInit this.isOpen = !this.isOpen; // Navigation collapse toggled... - this.navigationService.onNavCollapseToggled.emit(this.item); - this.navigationService.onNavCollapseToggle.emit(); + this.navigationService.onItemCollapsed.next(this.item); + this.navigationService.onItemCollapseToggled.next(); } /** @@ -110,7 +110,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit } this.isOpen = true; - this.navigationService.onNavCollapseToggle.emit(); + this.navigationService.onItemCollapseToggled.next(); } /** @@ -124,7 +124,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit } this.isOpen = false; - this.navigationService.onNavCollapseToggle.emit(); + this.navigationService.onItemCollapseToggled.next(); } /** diff --git a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html index fe5042bb..0747455c 100644 --- a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html +++ b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html @@ -1,11 +1,15 @@ -
- {{ item.title }} -
+ -
- - - - - -
\ No newline at end of file +
+ {{ item.title }} +
+ +
+ + + + + +
+ + \ No newline at end of file diff --git a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html index f0dc5201..cd67eb10 100644 --- a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html +++ b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html @@ -1,18 +1,22 @@ - - {{item.icon}} - {{item.title}} - - {{item.badge.title}} - - + - - {{item.icon}} - {{item.title}} - - {{item.badge.title}} + + {{item.icon}} + {{item.title}} + + {{item.badge.title}} + + + + + {{item.icon}} + {{item.title}} + + {{item.badge.title}} + - + + \ No newline at end of file diff --git a/src/@fuse/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts index 85bb1e71..bf95bc74 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -6,6 +6,8 @@ import { FuseMatchMedia } from '../../services/match-media.service'; import { FuseConfigService } from '../../services/config.service'; import { CookieService } from 'ngx-cookie-service'; +import { navigation } from 'app/navigation/navigation'; + @Component({ selector : 'fuse-shortcuts', templateUrl: './shortcuts.component.html', @@ -34,7 +36,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy private cookieService: CookieService ) { - this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation(); + this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation(navigation); this.onConfigChanged = this.fuseConfig.onConfigChanged diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts index 373b5ce5..c2c9c2a2 100644 --- a/src/@fuse/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -4,6 +4,7 @@ import { Subscription } from 'rxjs/Subscription'; import { FuseConfigService } from '../../services/config.service'; import { fuseAnimations } from '../../animations/index'; import { FuseNavigationService } from '../navigation/navigation.service'; +import { navigation } from 'app/navigation/navigation'; @Component({ selector : 'fuse-theme-options', @@ -43,9 +44,9 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy // Get the nav model and add customize nav item // that opens the bar programmatically - const navModel = this.navigationService.getNavigationModel(); + const nav: any = navigation; - navModel.push({ + nav.push({ 'id' : 'custom-function', 'title' : 'Custom Function', 'type' : 'group', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b8fbaaf1..95a88441 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,6 @@ import { FuseSplashScreenService } from '@fuse/services/splash-screen.service'; import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; -import { FuseNavigationModel } from './navigation/navigation.model'; import { locale as navigationEnglish } from './navigation/i18n/en'; import { locale as navigationTurkish } from './navigation/i18n/tr'; @@ -32,9 +31,6 @@ export class AppComponent // Use a language this.translate.use('en'); - // Set the navigation model - this.fuseNavigationService.setNavigationModel(new FuseNavigationModel()); - // Set the navigation translations this.translationLoader.loadTranslations(navigationEnglish, navigationTurkish); } diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/content/components/navigation/navigation.component.html index 9238d01d..aae875dd 100644 --- a/src/app/main/content/components/navigation/navigation.component.html +++ b/src/app/main/content/components/navigation/navigation.component.html @@ -26,36 +26,53 @@

-

Model

+

[navigation]

- <fuse-navigation></fuse-navigation> uses a service and a model file to populate - the entire navigation. It supports three different navigation items; Subheader, + <fuse-navigation></fuse-navigation> uses a json file to populate + the entire navigation. It supports three different navigation items; Group, Collapsable and Item. These items can be mixed and matched to create unique and complex navigation layouts.

- Navigation model can be found in src/app/navigation folder along with its translation - files. Navigation model and its translation files are set in app.component.ts file. Check that + Navigation data can be found in src/app/navigation folder along with its translation + files. Navigation data and its translation files are set in app.component.ts file. Check that file for more detailed usage example.

+
+

[layout]

+

+ There are two different layout options for the component; vertical and + horizontal. You can set the layout using the [layout] input. +

+
+ +
+

Updating the navigation

+

+ Direct modifications on the navigation data will be reflected to the component. So you can modify the + json data, or even create it from scratch using your backend and the changes will reflected to the + component immediately. +

+
+

Grouping

@@ -118,7 +135,7 @@

Edit the main.component.html file and look for the [folded] attribute on - fuse-navbar-vertical components. + fuse-sidebar components.

Assigning true to that attribute will make the vertical navigation folded by default. @@ -130,6 +147,34 @@

Examples

+

Show / Hide certain navigation items

+ +

+ + + +

+ +
+ + + +
+

Update navigation item on-the-fly

@@ -138,7 +183,7 @@ updateMailBadge() { // Get the mail nav item - const mailNavItem = this.navigationService.getNavigationItem('applications.mail'); + const mailNavItem = this.navigation[0].children[4]; // Update the badge title mailNavItem.badge.title = 35; @@ -164,14 +209,23 @@ { // Prepare the new nav item const newNavItem = { - id : 'sub-item', + id : 'sub-item', title: 'Sub Item', type : 'item', - url : '/apps/calendar' + url : '/apps/calendar' }; - // Add the new nav item - this.navigationService.addNavigationItem('applications.calendar', newNavItem); + // Get the calendar item from the navigation + const calendarNavItem = this.navigation[0].children[1]; + + // Make the calendar navigation item collapsable + calendarNavItem.type = 'collapse'; + + // Create an empty children array + calendarNavItem.children = []; + + // Push the new children + calendarNavItem.children.push(newNavItem); } @@ -194,16 +248,16 @@ { // Prepare the new nav item const newNavItem = { - id : 'custom-item', - title : 'Custom Item', - type : 'item', + id : 'custom-item', + title : 'Custom Item', + type : 'item', function: () => { alert('Custom function!'); } }; // Get the applications nav item - const applicationsNavItem = this.navigationService.getNavigationItem('applications'); + const applicationsNavItem = this.navigation[0]; // Add the new nav item at the beginning of the applications applicationsNavItem.children.unshift(newNavItem); diff --git a/src/app/main/content/components/navigation/navigation.component.ts b/src/app/main/content/components/navigation/navigation.component.ts index 98622f8b..7a1181f9 100644 --- a/src/app/main/content/components/navigation/navigation.component.ts +++ b/src/app/main/content/components/navigation/navigation.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { navigation } from 'app/navigation/navigation'; @Component({ selector : 'fuse-navigation-docs', @@ -9,15 +9,28 @@ import { FuseNavigationService } from '@fuse/components/navigation/navigation.se }) export class FuseNavigationDocsComponent { - constructor(private navigationService: FuseNavigationService) - { + navigation: any; + hidden = false; + constructor() + { + this.navigation = navigation; + } + + showHideCalendarMenuItem() + { + // Get the calendar item from the navigation + const calendarNavItem = this.navigation[0].children[1]; + + // Toggle the visibility + this.hidden = !this.hidden; + calendarNavItem.hidden = this.hidden; } updateMailBadge() { // Get the mail nav item - const mailNavItem = this.navigationService.getNavigationItem('applications.mail'); + const mailNavItem = this.navigation[0].children[4]; // Update the badge title mailNavItem.badge.title = 35; @@ -33,8 +46,17 @@ export class FuseNavigationDocsComponent url : '/apps/calendar' }; - // Add the new nav item - this.navigationService.addNavigationItem('applications.calendar', newNavItem); + // Get the calendar item from the navigation + const calendarNavItem = this.navigation[0].children[1]; + + // Make the calendar navigation item collapsable + calendarNavItem.type = 'collapse'; + + // Create an empty children array + calendarNavItem.children = []; + + // Push the new children + calendarNavItem.children.push(newNavItem); } addNavItemWithCustomFunction() @@ -50,7 +72,7 @@ export class FuseNavigationDocsComponent }; // Get the applications nav item - const applicationsNavItem = this.navigationService.getNavigationItem('applications'); + const applicationsNavItem = this.navigation[0]; // Add the new nav item at the beginning of the applications applicationsNavItem.children.unshift(newNavItem); diff --git a/src/app/main/navbar/navbar.component.html b/src/app/main/navbar/navbar.component.html index e1f91b94..7eabc890 100644 --- a/src/app/main/navbar/navbar.component.html +++ b/src/app/main/navbar/navbar.component.html @@ -24,7 +24,7 @@

- +
@@ -34,7 +34,7 @@
- +
\ No newline at end of file diff --git a/src/app/main/navbar/navbar.component.scss b/src/app/main/navbar/navbar.component.scss index 0c1880d9..d065b045 100644 --- a/src/app/main/navbar/navbar.component.scss +++ b/src/app/main/navbar/navbar.component.scss @@ -44,39 +44,47 @@ fuse-sidebar { } } -.navbar-vertical { +fuse-navbar { + height: 100%; - .navbar-header { - padding: 0 16px 0 24px; + .navbar-vertical { display: flex; - align-items: center; - height: 64px; - min-height: 64px; - justify-content: space-between; - transition: padding 200ms ease; - background-color: rgba(255, 255, 255, .05); - @include mat-elevation(1); + flex-direction: column; + width: 100%; + height: 100%; - .logo { + .navbar-header { display: flex; align-items: center; + justify-content: space-between; + height: 64px; + min-height: 64px; + padding: 0 16px 0 24px; + transition: padding 200ms ease; + background-color: rgba(255, 255, 255, .05); + @include mat-elevation(1); - .logo-icon { - width: 38px; - height: 38px; - } + .logo { + display: flex; + align-items: center; - .logo-text { - margin-left: 8px; - font-size: 20px; - font-weight: 300; - letter-spacing: 0.4px; + .logo-icon { + width: 38px; + height: 38px; + } + + .logo-text { + margin-left: 8px; + font-size: 20px; + font-weight: 300; + letter-spacing: 0.4px; + } } } - } - .navbar-content { - flex: 1; + .navbar-content { + flex: 1; + } } } diff --git a/src/app/main/navbar/navbar.component.ts b/src/app/main/navbar/navbar.component.ts index a6afd61f..c9672f67 100644 --- a/src/app/main/navbar/navbar.component.ts +++ b/src/app/main/navbar/navbar.component.ts @@ -1,21 +1,49 @@ -import { Component, Input, ViewEncapsulation } from '@angular/core'; +import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; +import { Subscription } from 'rxjs/Subscription'; +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; +import { navigation } from 'app/navigation/navigation'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; + @Component({ selector : 'fuse-navbar', templateUrl : './navbar.component.html', styleUrls : ['./navbar.component.scss'], encapsulation: ViewEncapsulation.None }) -export class FuseNavbarComponent +export class FuseNavbarComponent implements OnDestroy { + @ViewChild(FusePerfectScrollbarDirective) fusePerfectScrollbarDirective; @Input() layout; + navigation: any; + navigationServiceWatcher: Subscription; + fusePerfectScrollbarUpdateTimeout; - constructor(private sidebarService: FuseSidebarService) + constructor( + private sidebarService: FuseSidebarService, + private navigationService: FuseNavigationService + ) { + // Navigation data + this.navigation = navigation; + // Default layout this.layout = 'vertical'; + + this.navigationServiceWatcher = + this.navigationService.onItemCollapseToggled.subscribe(() => { + this.fusePerfectScrollbarUpdateTimeout = setTimeout(() => { + this.fusePerfectScrollbarDirective.update(); + }, 310); + }); + } + + ngOnDestroy() + { + clearTimeout(this.fusePerfectScrollbarUpdateTimeout); + this.navigationServiceWatcher.unsubscribe(); } toggleSidebarOpened(key) diff --git a/src/app/navigation/navigation.model.ts b/src/app/navigation/navigation.model.ts deleted file mode 100644 index 6e475b00..00000000 --- a/src/app/navigation/navigation.model.ts +++ /dev/null @@ -1,913 +0,0 @@ -import { FuseNavigationModelInterface } from '@fuse/components/navigation/navigation.model'; - -export class FuseNavigationModel implements FuseNavigationModelInterface -{ - public model: any[]; - - constructor() - { - this.model = [ - { - 'id' : 'applications', - 'title' : 'Applications', - 'translate': 'NAV.APPLICATIONS', - 'type' : 'group', - 'icon' : 'apps', - 'children' : [ - { - 'id' : 'dashboards', - 'title' : 'Dashboards', - 'translate': 'NAV.DASHBOARDS', - 'type' : 'collapse', - 'icon' : 'dashboard', - 'children' : [ - { - 'id' : 'analytics', - 'title': 'Analytics', - 'type' : 'item', - 'url' : '/apps/dashboards/analytics' - }, - { - 'id' : 'project', - 'title': 'Project', - 'type' : 'item', - 'url' : '/apps/dashboards/project' - }, - ] - }, - { - 'id' : 'calendar', - 'title' : 'Calendar', - 'translate': 'NAV.CALENDAR', - 'type' : 'item', - 'icon' : 'today', - 'url' : '/apps/calendar' - }, - { - 'id' : 'e-commerce', - 'title' : 'E-Commerce', - 'translate': 'NAV.ECOMMERCE', - 'type' : 'collapse', - 'icon' : 'shopping_cart', - 'children' : [ - { - 'id' : 'dashboard', - 'title': 'Dashboard', - 'type' : 'item', - 'url' : '/apps/e-commerce/dashboard' - }, - { - 'id' : 'products', - 'title' : 'Products', - 'type' : 'item', - 'url' : '/apps/e-commerce/products', - 'exactMatch': true - }, - { - 'id' : 'productDetail', - 'title' : 'Product Detail', - 'type' : 'item', - 'url' : '/apps/e-commerce/products/1/printed-dress', - 'exactMatch': true - }, - { - 'id' : 'orders', - 'title' : 'Orders', - 'type' : 'item', - 'url' : '/apps/e-commerce/orders', - 'exactMatch': true - }, - { - 'id' : 'orderDetail', - 'title' : 'Order Detail', - 'type' : 'item', - 'url' : '/apps/e-commerce/orders/1', - 'exactMatch': true - } - ] - }, - { - 'id' : 'academy', - 'title' : 'Academy', - 'translate': 'NAV.ACADEMY', - 'type' : 'item', - 'icon' : 'school', - 'url' : '/apps/academy' - }, - { - 'id' : 'mail', - 'title' : 'Mail', - 'translate': 'NAV.MAIL.TITLE', - 'type' : 'item', - 'icon' : 'email', - 'url' : '/apps/mail', - 'badge' : { - 'title' : 25, - 'translate': 'NAV.MAIL.BADGE', - 'bg' : '#F44336', - 'fg' : '#FFFFFF' - } - }, - { - 'id' : 'mail-ngrx', - 'title' : 'Mail Ngrx', - 'translate': 'NAV.MAIL_NGRX.TITLE', - 'type' : 'item', - 'icon' : 'email', - 'url' : '/apps/mail-ngrx', - 'badge' : { - 'title' : 13, - 'translate': 'NAV.MAIL_NGRX.BADGE', - 'bg' : '#EC0C8E', - 'fg' : '#FFFFFF' - } - }, - { - 'id' : 'chat', - 'title' : 'Chat', - 'translate': 'NAV.CHAT', - 'type' : 'item', - 'icon' : 'chat', - 'url' : '/apps/chat', - 'badge' : { - 'title': 13, - 'bg' : '#09d261', - 'fg' : '#FFFFFF' - } - }, - { - 'id' : 'file-manager', - 'title' : 'File Manager', - 'translate': 'NAV.FILE_MANAGER', - 'type' : 'item', - 'icon' : 'folder', - 'url' : '/apps/file-manager' - }, - { - 'id' : 'contacts', - 'title' : 'Contacts', - 'translate': 'NAV.CONTACTS', - 'type' : 'item', - 'icon' : 'account_box', - 'url' : '/apps/contacts' - }, - { - 'id' : 'to-do', - 'title' : 'To-Do', - 'translate': 'NAV.TODO', - 'type' : 'item', - 'icon' : 'check_box', - 'url' : '/apps/todo', - 'badge' : { - 'title': 3, - 'bg' : '#FF6F00', - 'fg' : '#FFFFFF' - } - }, - { - 'id' : 'scrumboard', - 'title' : 'Scrumboard', - 'translate': 'NAV.SCRUMBOARD', - 'type' : 'item', - 'icon' : 'assessment', - 'url' : '/apps/scrumboard' - } - ] - }, - { - 'id' : 'pages', - 'title' : 'Pages', - 'type' : 'group', - 'icon' : 'pages', - 'children': [ - { - 'id' : 'authentication', - 'title' : 'Authentication', - 'type' : 'collapse', - 'icon' : 'lock', - 'badge' : { - 'title': 10, - 'bg' : '#525e8a', - 'fg' : '#FFFFFF' - }, - 'children': [ - { - 'id' : 'login', - 'title': 'Login', - 'type' : 'item', - 'url' : '/pages/auth/login' - }, - { - 'id' : 'login-v2', - 'title': 'Login v2', - 'type' : 'item', - 'url' : '/pages/auth/login-2' - }, - { - 'id' : 'register', - 'title': 'Register', - 'type' : 'item', - 'url' : '/pages/auth/register' - }, - { - 'id' : 'register-v2', - 'title': 'Register v2', - 'type' : 'item', - 'url' : '/pages/auth/register-2' - }, - { - 'id' : 'forgot-password', - 'title': 'Forgot Password', - 'type' : 'item', - 'url' : '/pages/auth/forgot-password' - }, - { - 'id' : 'forgot-password-v2', - 'title': 'Forgot Password v2', - 'type' : 'item', - 'url' : '/pages/auth/forgot-password-2' - }, - { - 'id' : 'reset-password', - 'title': 'Reset Password', - 'type' : 'item', - 'url' : '/pages/auth/reset-password' - }, - { - 'id' : 'reset-password-v2', - 'title': 'Reset Password v2', - 'type' : 'item', - 'url' : '/pages/auth/reset-password-2' - }, - { - 'id' : 'lock-screen', - 'title': 'Lock Screen', - 'type' : 'item', - 'url' : '/pages/auth/lock' - }, - { - 'id' : 'mail-confirmation', - 'title': 'Mail Confirmation', - 'type' : 'item', - 'url' : '/pages/auth/mail-confirm' - } - ] - }, - { - 'id' : 'coming-soon', - 'title': 'Coming Soon', - 'type' : 'item', - 'icon' : 'alarm', - 'url' : '/pages/coming-soon' - }, - { - 'id' : 'errors', - 'title' : 'Errors', - 'type' : 'collapse', - 'icon' : 'error', - 'children': [ - { - 'id' : '404', - 'title': '404', - 'type' : 'item', - 'url' : '/pages/errors/error-404' - }, - { - 'id' : '500', - 'title': '500', - 'type' : 'item', - 'url' : '/pages/errors/error-500' - } - ] - }, - { - 'id' : 'invoice', - 'title' : 'Invoice', - 'type' : 'collapse', - 'icon' : 'receipt', - 'children': [ - { - 'id' : 'modern', - 'title': 'Modern', - 'type' : 'item', - 'url' : '/pages/invoices/modern' - }, - { - 'id' : 'compact', - 'title': 'Compact', - 'type' : 'item', - 'url' : '/pages/invoices/compact' - } - ] - }, - { - 'id' : 'maintenance', - 'title': 'Maintenance', - 'type' : 'item', - 'icon' : 'build', - 'url' : '/pages/maintenance' - }, - { - 'id' : 'pricing', - 'title' : 'Pricing', - 'type' : 'collapse', - 'icon' : 'attach_money', - 'children': [ - { - 'id' : 'style-1', - 'title': 'Style 1', - 'type' : 'item', - 'url' : '/pages/pricing/style-1' - }, - { - 'id' : 'style-2', - 'title': 'Style 2', - 'type' : 'item', - 'url' : '/pages/pricing/style-2' - }, - { - 'id' : 'style-3', - 'title': 'Style 3', - 'type' : 'item', - 'url' : '/pages/pricing/style-3' - } - ] - }, - { - 'id' : 'profile', - 'title': 'Profile', - 'type' : 'item', - 'icon' : 'person', - 'url' : '/pages/profile' - }, - { - 'id' : 'search', - 'title': 'Search', - 'type' : 'item', - 'icon' : 'search', - 'url' : '/pages/search' - }, - { - 'title': 'Faq', - 'type' : 'item', - 'icon' : 'help', - 'url' : '/pages/faq' - }, - { - 'title': 'Knowledge Base', - 'type' : 'item', - 'icon' : 'import_contacts', - 'url' : '/pages/knowledge-base' - } - ] - }, - { - 'id' : 'user-interface', - 'title' : 'User Interface', - 'type' : 'group', - 'icon' : 'web', - 'children': [ - { - 'id' : 'forms', - 'title': 'Forms', - 'type' : 'item', - 'icon' : 'web_asset', - 'url' : '/ui/forms' - }, - { - 'id' : 'icons', - 'title': 'Icons', - 'type' : 'item', - 'icon' : 'photo', - 'url' : '/ui/icons' - }, - { - 'id' : 'typography', - 'title': 'Typography', - 'type' : 'item', - 'icon' : 'text_fields', - 'url' : '/ui/typography' - }, - { - 'id' : 'helper-classes', - 'title': 'Helper Classes', - 'type' : 'item', - 'icon' : 'help', - 'url' : '/ui/helper-classes' - }, - { - 'id' : 'page-layouts', - 'title' : 'Page Layouts', - 'type' : 'collapse', - 'icon' : 'view_quilt', - 'children': [ - { - 'id' : 'carded', - 'title' : 'Carded', - 'type' : 'collapse', - 'badge' : { - 'title': 10, - 'bg' : '#525e8a', - 'fg' : '#FFFFFF' - }, - 'children': [ - { - 'id' : 'full-width', - 'title': 'Full Width', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/full-width' - }, - { - 'id' : 'full-width-2', - 'title': 'Full Width 2', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/full-width-2' - }, - { - 'id' : 'left-sidenav', - 'title': 'Left Sidenav', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/left-sidenav' - }, - { - 'id' : 'left-sidenav-tabbed', - 'title': 'Left Sidenav Tabbed', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/left-sidenav-tabbed' - }, - { - 'id' : 'left-sidenav-2', - 'title': 'Left Sidenav 2', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/left-sidenav-2' - }, - { - 'id' : 'left-sidenav-2-tabbed', - 'title': 'Left Sidenav 2 Tabbed', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/left-sidenav-2-tabbed' - }, - { - 'id' : 'right-sidenav', - 'title': 'Right Sidenav', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/right-sidenav' - }, - { - 'id' : 'right-sidenav-tabbed', - 'title': 'Right Sidenav Tabbed', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/right-sidenav-tabbed' - }, - { - 'id' : 'right-sidenav-2', - 'title': 'Right Sidenav 2', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/right-sidenav-2' - }, - { - 'id' : 'right-sidenav-2-tabbed', - 'title': 'Right Sidenav 2 Tabbed', - 'type' : 'item', - 'url' : '/ui/page-layouts/carded/right-sidenav-2-tabbed' - } - ] - }, - { - 'id' : 'simple', - 'title' : 'Simple', - 'type' : 'collapse', - 'badge' : { - 'title': 8, - 'bg' : '#525e8a', - 'fg' : '#FFFFFF' - }, - 'children': [ - { - 'id' : 'full-width', - 'title': 'Full Width', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/full-width' - }, - { - 'id' : 'left-sidenav', - 'title': 'Left Sidenav', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/left-sidenav' - }, - { - 'id' : 'left-sidenav-2', - 'title': 'Left Sidenav 2', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/left-sidenav-2' - }, - { - 'id' : 'left-sidenav-3', - 'title': 'Left Sidenav 3', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/left-sidenav-3' - }, - { - 'id' : 'right-sidenav', - 'title': 'Right Sidenav', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/right-sidenav' - }, - { - 'id' : 'right-sidenav-2', - 'title': 'Right Sidenav 2', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/right-sidenav-2' - }, - { - 'id' : 'right-sidenav-3', - 'title': 'Right Sidenav 3', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/right-sidenav-3' - }, - { - 'id' : 'tabbed', - 'title': 'Tabbed', - 'type' : 'item', - 'url' : '/ui/page-layouts/simple/tabbed' - } - ] - }, - { - 'id' : 'blank', - 'title': 'Blank', - 'type' : 'item', - 'url' : '/ui/page-layouts/blank' - } - ] - }, - { - 'id' : 'colors', - 'title': 'Colors', - 'type' : 'item', - 'icon' : 'color_lens', - 'url' : '/ui/colors' - } - ] - }, - { - 'id' : 'services', - 'title' : 'Services', - 'type' : 'group', - 'icon' : 'settings', - 'children': [ - { - 'id' : 'config', - 'title': 'Config', - 'type' : 'item', - 'icon' : 'settings', - 'url' : '/services/config' - }, - { - 'id' : 'splash-screen', - 'title': 'Splash Screen', - 'type' : 'item', - 'icon' : 'settings', - 'url' : '/services/splash-screen' - } - ] - }, - { - 'id' : 'components', - 'title' : 'Components', - 'type' : 'group', - 'icon' : 'settings_input_component', - 'children': [ - { - 'id' : 'angular-material-elements', - 'title' : 'Angular Material Elements', - 'type' : 'collapse', - 'icon' : 'layers', - 'children': [ - { - 'id' : 'form-controls', - 'title' : 'Form Controls', - 'type' : 'group', - 'children': [ - { - 'id' : 'autocomplete', - 'title': 'Autocomplete', - 'type' : 'item', - 'url' : '/components/angular-material/autocomplete' - }, - { - 'id' : 'checkbox', - 'title': 'Checkbox', - 'type' : 'item', - 'url' : '/components/angular-material/checkbox' - }, - { - 'id' : 'datepicker', - 'title': 'Datepicker', - 'type' : 'item', - 'url' : '/components/angular-material/datepicker' - }, - { - 'id' : 'form-field', - 'title': 'Form field', - 'type' : 'item', - 'url' : '/components/angular-material/form-field' - }, - { - 'id' : 'input', - 'title': 'Input', - 'type' : 'item', - 'url' : '/components/angular-material/input' - }, - { - 'id' : 'radio-button', - 'title': 'Radio button', - 'type' : 'item', - 'url' : '/components/angular-material/radio-button' - }, - { - 'id' : 'select', - 'title': 'Select', - 'type' : 'item', - 'url' : '/components/angular-material/select' - }, - { - 'id' : 'slider', - 'title': 'Slider', - 'type' : 'item', - 'url' : '/components/angular-material/slider' - }, - { - 'id' : 'slide-toggle', - 'title': 'Slide toggle', - 'type' : 'item', - 'url' : '/components/angular-material/slide-toggle' - } - ] - }, - { - 'id' : 'navigation', - 'title' : 'Navigation', - 'type' : 'group', - 'children': [ - { - 'id' : 'menu', - 'title': 'Menu', - 'type' : 'item', - 'url' : '/components/angular-material/menu' - }, - { - 'id' : 'sidenav', - 'title': 'Sidenav', - 'type' : 'item', - 'url' : '/components/angular-material/sidenav' - }, - { - 'id' : 'toolbar', - 'title': 'Toolbar', - 'type' : 'item', - 'url' : '/components/angular-material/toolbar' - } - ] - }, - { - 'id' : 'layout', - 'title' : 'Layout', - 'type' : 'group', - 'children': [ - { - 'id' : 'list', - 'title': 'List', - 'type' : 'item', - 'url' : '/components/angular-material/list' - }, - { - 'id' : 'grid-list', - 'title': 'Grid list', - 'type' : 'item', - 'url' : '/components/angular-material/grid-list' - }, - { - 'id' : 'card', - 'title': 'Card', - 'type' : 'item', - 'url' : '/components/angular-material/card' - }, - { - 'id' : 'stepper', - 'title': 'Stepper', - 'type' : 'item', - 'url' : '/components/angular-material/stepper' - }, - { - 'id' : 'tabs', - 'title': 'Tabs', - 'type' : 'item', - 'url' : '/components/angular-material/tabs' - }, - { - 'id' : 'elevation', - 'title': 'Elevation', - 'type' : 'item', - 'url' : '/components/angular-material/elevation' - }, - { - 'id' : 'expansion-panel', - 'title': 'Expansion Panel', - 'type' : 'item', - 'url' : '/components/angular-material/expansion-panel' - } - ] - }, - { - 'id' : 'buttons-indicators', - 'title' : 'Buttons & Indicators', - 'type' : 'group', - 'children': [ - { - 'id' : 'button', - 'title': 'Button', - 'type' : 'item', - 'url' : '/components/angular-material/button' - }, - { - 'id' : 'button-toggle', - 'title': 'Button toggle', - 'type' : 'item', - 'url' : '/components/angular-material/button-toggle' - }, - { - 'id' : 'chips', - 'title': 'Chips', - 'type' : 'item', - 'url' : '/components/angular-material/chips' - }, - { - 'id' : 'icon', - 'title': 'Icon', - 'type' : 'item', - 'url' : '/components/angular-material/icon' - }, - { - 'id' : 'progress-spinner', - 'title': 'Progress spinner', - 'type' : 'item', - 'url' : '/components/angular-material/progress-spinner' - }, - { - 'id' : 'progress-bar', - 'title': 'Progress bar', - 'type' : 'item', - 'url' : '/components/angular-material/progress-bar' - } - ] - }, - { - 'id' : 'popups-modals', - 'title' : 'Popups & Modals', - 'type' : 'group', - 'children': [ - { - 'id' : 'dialog', - 'title': 'Dialog', - 'type' : 'item', - 'url' : '/components/angular-material/dialog' - }, - { - 'id' : 'tooltip', - 'title': 'Tooltip', - 'type' : 'item', - 'url' : '/components/angular-material/tooltip' - }, - { - 'id' : 'snackbar', - 'title': 'Snackbar', - 'type' : 'item', - 'url' : '/components/angular-material/snackbar' - } - ] - }, - { - 'id' : 'data-table', - 'title' : 'Data table', - 'type' : 'group', - 'children': [ - { - 'id' : 'table', - 'title': 'Table', - 'type' : 'item', - 'url' : '/components/angular-material/data-table' - }, - { - 'id' : 'sort-header', - 'title': 'Sort header', - 'type' : 'item', - 'url' : '/components/angular-material/sort-header' - }, - { - 'id' : 'paginator', - 'title': 'Paginator', - 'type' : 'item', - 'url' : '/components/angular-material/paginator' - } - ] - } - ] - }, - { - 'id' : 'cards', - 'title': 'Cards', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/cards' - }, - { - 'id' : 'countdown', - 'title': 'Countdown', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/countdown' - }, - { - 'id' : 'highlight', - 'title': 'Highlight', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/highlight' - }, - { - 'id' : 'material-color-picker', - 'title': 'Material Color Picker', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/material-color-picker' - }, - { - 'id' : 'multi-language', - 'title': 'Multi Language', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/multi-language' - }, - { - 'id' : 'navigation', - 'title': 'Navigation', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/navigation' - }, - { - 'id' : 'search-bar', - 'title': 'Search Bar', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/search-bar' - }, - { - 'id' : 'shortcuts', - 'title': 'Shortcuts', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/shortcuts' - }, - { - 'id' : 'widget', - 'title': 'Widget', - 'type' : 'item', - 'icon' : 'settings_input_component', - 'url' : '/components/widget' - } - ] - }, - { - 'id' : '3rd-party-components', - 'title' : '3rd Party components', - 'type' : 'group', - 'icon' : 'settings_input_component', - 'children': [ - { - 'id' : 'datatables', - 'title' : 'Datatables', - 'type' : 'collapse', - 'icon' : 'border_all', - 'children': [ - { - 'id' : 'ngxdatatable', - 'title': 'ngx-datatable', - 'type' : 'item', - 'url' : '/components-third-party/datatables/ngx-datatable' - } - ] - }, - { - 'id' : 'google-maps', - 'title': 'Google Maps', - 'type' : 'item', - 'icon' : 'place', - 'url' : '/components-third-party/google-maps' - } - ] - } - ]; - } -} diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts new file mode 100644 index 00000000..d89c49db --- /dev/null +++ b/src/app/navigation/navigation.ts @@ -0,0 +1,903 @@ +export const navigation = [ + { + 'id' : 'applications', + 'title' : 'Applications', + 'translate': 'NAV.APPLICATIONS', + 'type' : 'group', + 'icon' : 'apps', + 'children' : [ + { + 'id' : 'dashboards', + 'title' : 'Dashboards', + 'translate': 'NAV.DASHBOARDS', + 'type' : 'collapse', + 'icon' : 'dashboard', + 'children' : [ + { + 'id' : 'analytics', + 'title': 'Analytics', + 'type' : 'item', + 'url' : '/apps/dashboards/analytics' + }, + { + 'id' : 'project', + 'title': 'Project', + 'type' : 'item', + 'url' : '/apps/dashboards/project' + } + ] + }, + { + 'id' : 'calendar', + 'title' : 'Calendar', + 'translate': 'NAV.CALENDAR', + 'type' : 'item', + 'icon' : 'today', + 'url' : '/apps/calendar' + }, + { + 'id' : 'e-commerce', + 'title' : 'E-Commerce', + 'translate': 'NAV.ECOMMERCE', + 'type' : 'collapse', + 'icon' : 'shopping_cart', + 'children' : [ + { + 'id' : 'dashboard', + 'title': 'Dashboard', + 'type' : 'item', + 'url' : '/apps/e-commerce/dashboard' + }, + { + 'id' : 'products', + 'title' : 'Products', + 'type' : 'item', + 'url' : '/apps/e-commerce/products', + 'exactMatch': true + }, + { + 'id' : 'productDetail', + 'title' : 'Product Detail', + 'type' : 'item', + 'url' : '/apps/e-commerce/products/1/printed-dress', + 'exactMatch': true + }, + { + 'id' : 'orders', + 'title' : 'Orders', + 'type' : 'item', + 'url' : '/apps/e-commerce/orders', + 'exactMatch': true + }, + { + 'id' : 'orderDetail', + 'title' : 'Order Detail', + 'type' : 'item', + 'url' : '/apps/e-commerce/orders/1', + 'exactMatch': true + } + ] + }, + { + 'id' : 'academy', + 'title' : 'Academy', + 'translate': 'NAV.ACADEMY', + 'type' : 'item', + 'icon' : 'school', + 'url' : '/apps/academy' + }, + { + 'id' : 'mail', + 'title' : 'Mail', + 'translate': 'NAV.MAIL.TITLE', + 'type' : 'item', + 'icon' : 'email', + 'url' : '/apps/mail', + 'badge' : { + 'title' : 25, + 'translate': 'NAV.MAIL.BADGE', + 'bg' : '#F44336', + 'fg' : '#FFFFFF' + } + }, + { + 'id' : 'mail-ngrx', + 'title' : 'Mail Ngrx', + 'translate': 'NAV.MAIL_NGRX.TITLE', + 'type' : 'item', + 'icon' : 'email', + 'url' : '/apps/mail-ngrx', + 'badge' : { + 'title' : 13, + 'translate': 'NAV.MAIL_NGRX.BADGE', + 'bg' : '#EC0C8E', + 'fg' : '#FFFFFF' + } + }, + { + 'id' : 'chat', + 'title' : 'Chat', + 'translate': 'NAV.CHAT', + 'type' : 'item', + 'icon' : 'chat', + 'url' : '/apps/chat', + 'badge' : { + 'title': 13, + 'bg' : '#09d261', + 'fg' : '#FFFFFF' + } + }, + { + 'id' : 'file-manager', + 'title' : 'File Manager', + 'translate': 'NAV.FILE_MANAGER', + 'type' : 'item', + 'icon' : 'folder', + 'url' : '/apps/file-manager' + }, + { + 'id' : 'contacts', + 'title' : 'Contacts', + 'translate': 'NAV.CONTACTS', + 'type' : 'item', + 'icon' : 'account_box', + 'url' : '/apps/contacts' + }, + { + 'id' : 'to-do', + 'title' : 'To-Do', + 'translate': 'NAV.TODO', + 'type' : 'item', + 'icon' : 'check_box', + 'url' : '/apps/todo', + 'badge' : { + 'title': 3, + 'bg' : '#FF6F00', + 'fg' : '#FFFFFF' + } + }, + { + 'id' : 'scrumboard', + 'title' : 'Scrumboard', + 'translate': 'NAV.SCRUMBOARD', + 'type' : 'item', + 'icon' : 'assessment', + 'url' : '/apps/scrumboard' + } + ] + }, + { + 'id' : 'pages', + 'title' : 'Pages', + 'type' : 'group', + 'icon' : 'pages', + 'children': [ + { + 'id' : 'authentication', + 'title' : 'Authentication', + 'type' : 'collapse', + 'icon' : 'lock', + 'badge' : { + 'title': 10, + 'bg' : '#525e8a', + 'fg' : '#FFFFFF' + }, + 'children': [ + { + 'id' : 'login', + 'title': 'Login', + 'type' : 'item', + 'url' : '/pages/auth/login' + }, + { + 'id' : 'login-v2', + 'title': 'Login v2', + 'type' : 'item', + 'url' : '/pages/auth/login-2' + }, + { + 'id' : 'register', + 'title': 'Register', + 'type' : 'item', + 'url' : '/pages/auth/register' + }, + { + 'id' : 'register-v2', + 'title': 'Register v2', + 'type' : 'item', + 'url' : '/pages/auth/register-2' + }, + { + 'id' : 'forgot-password', + 'title': 'Forgot Password', + 'type' : 'item', + 'url' : '/pages/auth/forgot-password' + }, + { + 'id' : 'forgot-password-v2', + 'title': 'Forgot Password v2', + 'type' : 'item', + 'url' : '/pages/auth/forgot-password-2' + }, + { + 'id' : 'reset-password', + 'title': 'Reset Password', + 'type' : 'item', + 'url' : '/pages/auth/reset-password' + }, + { + 'id' : 'reset-password-v2', + 'title': 'Reset Password v2', + 'type' : 'item', + 'url' : '/pages/auth/reset-password-2' + }, + { + 'id' : 'lock-screen', + 'title': 'Lock Screen', + 'type' : 'item', + 'url' : '/pages/auth/lock' + }, + { + 'id' : 'mail-confirmation', + 'title': 'Mail Confirmation', + 'type' : 'item', + 'url' : '/pages/auth/mail-confirm' + } + ] + }, + { + 'id' : 'coming-soon', + 'title': 'Coming Soon', + 'type' : 'item', + 'icon' : 'alarm', + 'url' : '/pages/coming-soon' + }, + { + 'id' : 'errors', + 'title' : 'Errors', + 'type' : 'collapse', + 'icon' : 'error', + 'children': [ + { + 'id' : '404', + 'title': '404', + 'type' : 'item', + 'url' : '/pages/errors/error-404' + }, + { + 'id' : '500', + 'title': '500', + 'type' : 'item', + 'url' : '/pages/errors/error-500' + } + ] + }, + { + 'id' : 'invoice', + 'title' : 'Invoice', + 'type' : 'collapse', + 'icon' : 'receipt', + 'children': [ + { + 'id' : 'modern', + 'title': 'Modern', + 'type' : 'item', + 'url' : '/pages/invoices/modern' + }, + { + 'id' : 'compact', + 'title': 'Compact', + 'type' : 'item', + 'url' : '/pages/invoices/compact' + } + ] + }, + { + 'id' : 'maintenance', + 'title': 'Maintenance', + 'type' : 'item', + 'icon' : 'build', + 'url' : '/pages/maintenance' + }, + { + 'id' : 'pricing', + 'title' : 'Pricing', + 'type' : 'collapse', + 'icon' : 'attach_money', + 'children': [ + { + 'id' : 'style-1', + 'title': 'Style 1', + 'type' : 'item', + 'url' : '/pages/pricing/style-1' + }, + { + 'id' : 'style-2', + 'title': 'Style 2', + 'type' : 'item', + 'url' : '/pages/pricing/style-2' + }, + { + 'id' : 'style-3', + 'title': 'Style 3', + 'type' : 'item', + 'url' : '/pages/pricing/style-3' + } + ] + }, + { + 'id' : 'profile', + 'title': 'Profile', + 'type' : 'item', + 'icon' : 'person', + 'url' : '/pages/profile' + }, + { + 'id' : 'search', + 'title': 'Search', + 'type' : 'item', + 'icon' : 'search', + 'url' : '/pages/search' + }, + { + 'title': 'Faq', + 'type' : 'item', + 'icon' : 'help', + 'url' : '/pages/faq' + }, + { + 'title': 'Knowledge Base', + 'type' : 'item', + 'icon' : 'import_contacts', + 'url' : '/pages/knowledge-base' + } + ] + }, + { + 'id' : 'user-interface', + 'title' : 'User Interface', + 'type' : 'group', + 'icon' : 'web', + 'children': [ + { + 'id' : 'forms', + 'title': 'Forms', + 'type' : 'item', + 'icon' : 'web_asset', + 'url' : '/ui/forms' + }, + { + 'id' : 'icons', + 'title': 'Icons', + 'type' : 'item', + 'icon' : 'photo', + 'url' : '/ui/icons' + }, + { + 'id' : 'typography', + 'title': 'Typography', + 'type' : 'item', + 'icon' : 'text_fields', + 'url' : '/ui/typography' + }, + { + 'id' : 'helper-classes', + 'title': 'Helper Classes', + 'type' : 'item', + 'icon' : 'help', + 'url' : '/ui/helper-classes' + }, + { + 'id' : 'page-layouts', + 'title' : 'Page Layouts', + 'type' : 'collapse', + 'icon' : 'view_quilt', + 'children': [ + { + 'id' : 'carded', + 'title' : 'Carded', + 'type' : 'collapse', + 'badge' : { + 'title': 10, + 'bg' : '#525e8a', + 'fg' : '#FFFFFF' + }, + 'children': [ + { + 'id' : 'full-width', + 'title': 'Full Width', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/full-width' + }, + { + 'id' : 'full-width-2', + 'title': 'Full Width 2', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/full-width-2' + }, + { + 'id' : 'left-sidenav', + 'title': 'Left Sidenav', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/left-sidenav' + }, + { + 'id' : 'left-sidenav-tabbed', + 'title': 'Left Sidenav Tabbed', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/left-sidenav-tabbed' + }, + { + 'id' : 'left-sidenav-2', + 'title': 'Left Sidenav 2', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/left-sidenav-2' + }, + { + 'id' : 'left-sidenav-2-tabbed', + 'title': 'Left Sidenav 2 Tabbed', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/left-sidenav-2-tabbed' + }, + { + 'id' : 'right-sidenav', + 'title': 'Right Sidenav', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/right-sidenav' + }, + { + 'id' : 'right-sidenav-tabbed', + 'title': 'Right Sidenav Tabbed', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/right-sidenav-tabbed' + }, + { + 'id' : 'right-sidenav-2', + 'title': 'Right Sidenav 2', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/right-sidenav-2' + }, + { + 'id' : 'right-sidenav-2-tabbed', + 'title': 'Right Sidenav 2 Tabbed', + 'type' : 'item', + 'url' : '/ui/page-layouts/carded/right-sidenav-2-tabbed' + } + ] + }, + { + 'id' : 'simple', + 'title' : 'Simple', + 'type' : 'collapse', + 'badge' : { + 'title': 8, + 'bg' : '#525e8a', + 'fg' : '#FFFFFF' + }, + 'children': [ + { + 'id' : 'full-width', + 'title': 'Full Width', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/full-width' + }, + { + 'id' : 'left-sidenav', + 'title': 'Left Sidenav', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/left-sidenav' + }, + { + 'id' : 'left-sidenav-2', + 'title': 'Left Sidenav 2', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/left-sidenav-2' + }, + { + 'id' : 'left-sidenav-3', + 'title': 'Left Sidenav 3', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/left-sidenav-3' + }, + { + 'id' : 'right-sidenav', + 'title': 'Right Sidenav', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/right-sidenav' + }, + { + 'id' : 'right-sidenav-2', + 'title': 'Right Sidenav 2', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/right-sidenav-2' + }, + { + 'id' : 'right-sidenav-3', + 'title': 'Right Sidenav 3', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/right-sidenav-3' + }, + { + 'id' : 'tabbed', + 'title': 'Tabbed', + 'type' : 'item', + 'url' : '/ui/page-layouts/simple/tabbed' + } + ] + }, + { + 'id' : 'blank', + 'title': 'Blank', + 'type' : 'item', + 'url' : '/ui/page-layouts/blank' + } + ] + }, + { + 'id' : 'colors', + 'title': 'Colors', + 'type' : 'item', + 'icon' : 'color_lens', + 'url' : '/ui/colors' + } + ] + }, + { + 'id' : 'services', + 'title' : 'Services', + 'type' : 'group', + 'icon' : 'settings', + 'children': [ + { + 'id' : 'config', + 'title': 'Config', + 'type' : 'item', + 'icon' : 'settings', + 'url' : '/services/config' + }, + { + 'id' : 'splash-screen', + 'title': 'Splash Screen', + 'type' : 'item', + 'icon' : 'settings', + 'url' : '/services/splash-screen' + } + ] + }, + { + 'id' : 'components', + 'title' : 'Components', + 'type' : 'group', + 'icon' : 'settings_input_component', + 'children': [ + { + 'id' : 'angular-material-elements', + 'title' : 'Angular Material Elements', + 'type' : 'collapse', + 'icon' : 'layers', + 'children': [ + { + 'id' : 'form-controls', + 'title' : 'Form Controls', + 'type' : 'group', + 'children': [ + { + 'id' : 'autocomplete', + 'title': 'Autocomplete', + 'type' : 'item', + 'url' : '/components/angular-material/autocomplete' + }, + { + 'id' : 'checkbox', + 'title': 'Checkbox', + 'type' : 'item', + 'url' : '/components/angular-material/checkbox' + }, + { + 'id' : 'datepicker', + 'title': 'Datepicker', + 'type' : 'item', + 'url' : '/components/angular-material/datepicker' + }, + { + 'id' : 'form-field', + 'title': 'Form field', + 'type' : 'item', + 'url' : '/components/angular-material/form-field' + }, + { + 'id' : 'input', + 'title': 'Input', + 'type' : 'item', + 'url' : '/components/angular-material/input' + }, + { + 'id' : 'radio-button', + 'title': 'Radio button', + 'type' : 'item', + 'url' : '/components/angular-material/radio-button' + }, + { + 'id' : 'select', + 'title': 'Select', + 'type' : 'item', + 'url' : '/components/angular-material/select' + }, + { + 'id' : 'slider', + 'title': 'Slider', + 'type' : 'item', + 'url' : '/components/angular-material/slider' + }, + { + 'id' : 'slide-toggle', + 'title': 'Slide toggle', + 'type' : 'item', + 'url' : '/components/angular-material/slide-toggle' + } + ] + }, + { + 'id' : 'navigation', + 'title' : 'Navigation', + 'type' : 'group', + 'children': [ + { + 'id' : 'menu', + 'title': 'Menu', + 'type' : 'item', + 'url' : '/components/angular-material/menu' + }, + { + 'id' : 'sidenav', + 'title': 'Sidenav', + 'type' : 'item', + 'url' : '/components/angular-material/sidenav' + }, + { + 'id' : 'toolbar', + 'title': 'Toolbar', + 'type' : 'item', + 'url' : '/components/angular-material/toolbar' + } + ] + }, + { + 'id' : 'layout', + 'title' : 'Layout', + 'type' : 'group', + 'children': [ + { + 'id' : 'list', + 'title': 'List', + 'type' : 'item', + 'url' : '/components/angular-material/list' + }, + { + 'id' : 'grid-list', + 'title': 'Grid list', + 'type' : 'item', + 'url' : '/components/angular-material/grid-list' + }, + { + 'id' : 'card', + 'title': 'Card', + 'type' : 'item', + 'url' : '/components/angular-material/card' + }, + { + 'id' : 'stepper', + 'title': 'Stepper', + 'type' : 'item', + 'url' : '/components/angular-material/stepper' + }, + { + 'id' : 'tabs', + 'title': 'Tabs', + 'type' : 'item', + 'url' : '/components/angular-material/tabs' + }, + { + 'id' : 'elevation', + 'title': 'Elevation', + 'type' : 'item', + 'url' : '/components/angular-material/elevation' + }, + { + 'id' : 'expansion-panel', + 'title': 'Expansion Panel', + 'type' : 'item', + 'url' : '/components/angular-material/expansion-panel' + } + ] + }, + { + 'id' : 'buttons-indicators', + 'title' : 'Buttons & Indicators', + 'type' : 'group', + 'children': [ + { + 'id' : 'button', + 'title': 'Button', + 'type' : 'item', + 'url' : '/components/angular-material/button' + }, + { + 'id' : 'button-toggle', + 'title': 'Button toggle', + 'type' : 'item', + 'url' : '/components/angular-material/button-toggle' + }, + { + 'id' : 'chips', + 'title': 'Chips', + 'type' : 'item', + 'url' : '/components/angular-material/chips' + }, + { + 'id' : 'icon', + 'title': 'Icon', + 'type' : 'item', + 'url' : '/components/angular-material/icon' + }, + { + 'id' : 'progress-spinner', + 'title': 'Progress spinner', + 'type' : 'item', + 'url' : '/components/angular-material/progress-spinner' + }, + { + 'id' : 'progress-bar', + 'title': 'Progress bar', + 'type' : 'item', + 'url' : '/components/angular-material/progress-bar' + } + ] + }, + { + 'id' : 'popups-modals', + 'title' : 'Popups & Modals', + 'type' : 'group', + 'children': [ + { + 'id' : 'dialog', + 'title': 'Dialog', + 'type' : 'item', + 'url' : '/components/angular-material/dialog' + }, + { + 'id' : 'tooltip', + 'title': 'Tooltip', + 'type' : 'item', + 'url' : '/components/angular-material/tooltip' + }, + { + 'id' : 'snackbar', + 'title': 'Snackbar', + 'type' : 'item', + 'url' : '/components/angular-material/snackbar' + } + ] + }, + { + 'id' : 'data-table', + 'title' : 'Data table', + 'type' : 'group', + 'children': [ + { + 'id' : 'table', + 'title': 'Table', + 'type' : 'item', + 'url' : '/components/angular-material/data-table' + }, + { + 'id' : 'sort-header', + 'title': 'Sort header', + 'type' : 'item', + 'url' : '/components/angular-material/sort-header' + }, + { + 'id' : 'paginator', + 'title': 'Paginator', + 'type' : 'item', + 'url' : '/components/angular-material/paginator' + } + ] + } + ] + }, + { + 'id' : 'cards', + 'title': 'Cards', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/cards' + }, + { + 'id' : 'countdown', + 'title': 'Countdown', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/countdown' + }, + { + 'id' : 'highlight', + 'title': 'Highlight', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/highlight' + }, + { + 'id' : 'material-color-picker', + 'title': 'Material Color Picker', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/material-color-picker' + }, + { + 'id' : 'multi-language', + 'title': 'Multi Language', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/multi-language' + }, + { + 'id' : 'navigation', + 'title': 'Navigation', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/navigation' + }, + { + 'id' : 'search-bar', + 'title': 'Search Bar', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/search-bar' + }, + { + 'id' : 'shortcuts', + 'title': 'Shortcuts', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/shortcuts' + }, + { + 'id' : 'widget', + 'title': 'Widget', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/widget' + } + ] + }, + { + 'id' : '3rd-party-components', + 'title' : '3rd Party components', + 'type' : 'group', + 'icon' : 'settings_input_component', + 'children': [ + { + 'id' : 'datatables', + 'title' : 'Datatables', + 'type' : 'collapse', + 'icon' : 'border_all', + 'children': [ + { + 'id' : 'ngxdatatable', + 'title': 'ngx-datatable', + 'type' : 'item', + 'url' : '/components-third-party/datatables/ngx-datatable' + } + ] + }, + { + 'id' : 'google-maps', + 'title': 'Google Maps', + 'type' : 'item', + 'icon' : 'place', + 'url' : '/components-third-party/google-maps' + } + ] + } +]; From 397c304ab2164f48d36c356b7b93fd3d7b617cba Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Wed, 21 Feb 2018 09:36:41 +0300 Subject: [PATCH 03/20] Created modules for custom components and the main fuse components + Changed the Shared Module (WIP) --- .../confirm-dialog.component.ts | 8 +- .../confirm-dialog/confirm-dialog.module.ts | 20 ++++ .../countdown/countdown.component.ts | 3 +- .../components/countdown/countdown.module.ts | 15 +++ src/@fuse/components/demo/demo.module.ts | 10 +- .../components/highlight/highlight.module.ts | 15 +++ src/@fuse/components/index.ts | 11 ++ .../material-color-picker.component.ts | 40 +++---- .../material-color-picker.module.ts | 31 +++++ .../navigation/navigation.module.ts | 10 +- .../search-bar/search-bar.component.ts | 12 +- .../search-bar/search-bar.module.ts | 10 +- .../shortcuts/shortcuts.component.ts | 9 +- .../components/shortcuts/shortcuts.module.ts | 22 +++- .../components/sidebar/sidebar.component.ts | 4 +- .../components/sidebar/sidebar.module.ts | 4 - .../theme-options/theme-options.component.ts | 19 +-- .../theme-options/theme-options.module.ts | 36 ++++++ .../components/widget/widget.component.ts | 9 +- src/@fuse/components/widget/widget.module.ts | 11 +- src/@fuse/directives/directives.ts | 24 ++++ .../fuse-mat-sidenav.directive.ts} | 7 +- .../fuse-mat-sidenav.service.ts} | 0 .../fuse-perfect-scrollbar.directive.ts | 7 +- src/@fuse/fuse.module.ts | 16 ++- .../{matColors.ts => mat-colors/index.ts} | 0 src/@fuse/pipes/filter.pipe.ts | 2 +- src/@fuse/pipes/pipes.module.ts | 3 - .../copier => services}/copier.service.ts | 2 +- src/@fuse/services/match-media.service.ts | 2 +- src/@fuse/shared.module.ts | 35 ++++++ src/@fuse/{fuseUtils.ts => utils/index.ts} | 0 src/app/app.module.ts | 16 ++- .../content/apps/academy/academy.module.ts | 4 +- src/app/main/content/apps/apps.module.ts | 4 +- .../content/apps/calendar/calendar.module.ts | 4 +- .../event-form/event-form.component.ts | 2 +- src/app/main/content/apps/chat/chat.module.ts | 4 +- .../main/content/apps/chat/chat.service.ts | 2 +- .../sidenavs/left/chats/chats.component.ts | 2 +- .../content/apps/contacts/contact.model.ts | 2 +- .../content/apps/contacts/contacts.module.ts | 4 +- .../content/apps/contacts/contacts.service.ts | 2 +- .../dashboards/analytics/analytics.module.ts | 4 +- .../apps/dashboards/project/project.module.ts | 4 +- .../apps/e-commerce/e-commerce.module.ts | 4 +- .../apps/e-commerce/order/order.model.ts | 2 +- .../e-commerce/orders/orders.component.ts | 2 +- .../e-commerce/product/product.component.ts | 2 +- .../apps/e-commerce/product/product.model.ts | 2 +- .../e-commerce/products/products.component.ts | 2 +- .../apps/file-manager/file-manager.module.ts | 4 +- .../content/apps/mail-ngrx/mail.module.ts | 4 +- .../store/selectors/mails.selectors.ts | 2 +- src/app/main/content/apps/mail/mail.module.ts | 4 +- .../main/content/apps/mail/mail.service.ts | 2 +- .../content/apps/scrumboard/board.model.ts | 2 +- .../board/dialogs/card/card.component.ts | 2 +- .../label-selector.component.ts | 2 +- .../board-color-selector.component.ts | 2 +- .../content/apps/scrumboard/card.model.ts | 2 +- .../content/apps/scrumboard/list.model.ts | 2 +- .../apps/scrumboard/scrumboard.module.ts | 4 +- .../todo-details/todo-details.component.ts | 2 +- src/app/main/content/apps/todo/todo.module.ts | 4 +- .../main/content/apps/todo/todo.service.ts | 2 +- .../components-third-party.module.ts | 4 +- .../google-maps/google-maps.module.ts | 4 +- .../angular-material.module.ts | 13 +- .../example-viewer/example-viewer.ts | 5 +- .../angular-material/material.module.ts | 112 ++++++++++++++++++ .../content/components/components.module.ts | 4 +- src/app/main/content/content.module.ts | 22 ++++ .../forgot-password-2.module.ts | 4 +- .../forgot-password/forgot-password.module.ts | 4 +- .../pages/authentication/lock/lock.module.ts | 4 +- .../authentication/login-2/login-2.module.ts | 4 +- .../authentication/login/login.module.ts | 4 +- .../mail-confirm/mail-confirm.module.ts | 4 +- .../register-2/register-2.module.ts | 4 +- .../register/register.module.ts | 4 +- .../reset-password-2.module.ts | 4 +- .../reset-password/reset-password.module.ts | 4 +- .../pages/coming-soon/coming-soon.module.ts | 4 +- .../pages/errors/404/error-404.module.ts | 4 +- .../pages/errors/500/error-500.module.ts | 4 +- .../main/content/pages/faq/faq.component.ts | 2 +- src/app/main/content/pages/faq/faq.module.ts | 4 +- .../pages/invoices/compact/compact.module.ts | 4 +- .../pages/invoices/modern/modern.module.ts | 4 +- .../knowledge-base/knowledge-base.module.ts | 4 +- .../pages/maintenance/maintenence.module.ts | 4 +- .../content/pages/pricing/pricing.module.ts | 4 +- .../content/pages/profile/profile.module.ts | 4 +- .../content/pages/search/search.module.ts | 4 +- .../main/content/services/services.module.ts | 4 +- .../content/ui/colors/colors.component.ts | 2 +- .../main/content/ui/colors/colors.module.ts | 4 +- src/app/main/content/ui/forms/forms.module.ts | 4 +- .../helper-classes/helper-classes.module.ts | 4 +- src/app/main/content/ui/icons/icons.module.ts | 4 +- .../ui/page-layouts/page-layouts.module.ts | 4 +- .../ui/typography/typography.module.ts | 4 +- src/app/main/footer/footer.module.ts | 28 +++++ src/app/main/main.module.ts | 44 +++---- src/app/main/navbar/navbar.module.ts | 28 +++++ .../main/quick-panel/quick-panel.module.ts | 28 +++++ src/app/main/toolbar/toolbar.module.ts | 32 +++++ .../modules => app/shared}/shared.module.ts | 4 +- 109 files changed, 706 insertions(+), 243 deletions(-) create mode 100644 src/@fuse/components/confirm-dialog/confirm-dialog.module.ts create mode 100644 src/@fuse/components/countdown/countdown.module.ts create mode 100644 src/@fuse/components/highlight/highlight.module.ts create mode 100644 src/@fuse/components/index.ts create mode 100644 src/@fuse/components/material-color-picker/material-color-picker.module.ts create mode 100644 src/@fuse/components/theme-options/theme-options.module.ts create mode 100644 src/@fuse/directives/directives.ts rename src/@fuse/directives/{fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts => fuse-mat-sidenav/fuse-mat-sidenav.directive.ts} (90%) rename src/@fuse/directives/{fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts => fuse-mat-sidenav/fuse-mat-sidenav.service.ts} (100%) rename src/@fuse/{matColors.ts => mat-colors/index.ts} (100%) rename src/@fuse/{components/copier => services}/copier.service.ts (98%) create mode 100644 src/@fuse/shared.module.ts rename src/@fuse/{fuseUtils.ts => utils/index.ts} (100%) create mode 100644 src/app/main/content/components/angular-material/material.module.ts create mode 100644 src/app/main/content/content.module.ts create mode 100644 src/app/main/footer/footer.module.ts create mode 100644 src/app/main/navbar/navbar.module.ts create mode 100644 src/app/main/quick-panel/quick-panel.module.ts create mode 100644 src/app/main/toolbar/toolbar.module.ts rename src/{@fuse/modules => app/shared}/shared.module.ts (98%) diff --git a/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts b/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts index 24e22d35..90eac6e5 100644 --- a/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts +++ b/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material'; @Component({ @@ -6,7 +6,7 @@ import { MatDialogRef } from '@angular/material'; templateUrl: './confirm-dialog.component.html', styleUrls : ['./confirm-dialog.component.scss'] }) -export class FuseConfirmDialogComponent implements OnInit +export class FuseConfirmDialogComponent { public confirmMessage: string; @@ -14,8 +14,4 @@ export class FuseConfirmDialogComponent implements OnInit { } - ngOnInit() - { - } - } diff --git a/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts b/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts new file mode 100644 index 00000000..f6f1f9c7 --- /dev/null +++ b/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { MatButtonModule, MatDialogModule } from '@angular/material'; + +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; + +@NgModule({ + declarations: [ + FuseConfirmDialogComponent + ], + imports: [ + MatDialogModule, + MatButtonModule + ], + entryComponents: [ + FuseConfirmDialogComponent + ], +}) +export class FuseConfirmDialogModule +{ +} diff --git a/src/@fuse/components/countdown/countdown.component.ts b/src/@fuse/components/countdown/countdown.component.ts index 5ab95920..6342b804 100644 --- a/src/@fuse/components/countdown/countdown.component.ts +++ b/src/@fuse/components/countdown/countdown.component.ts @@ -1,8 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import * as moment from 'moment'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/interval'; +import * as moment from 'moment'; + @Component({ selector : 'fuse-countdown', templateUrl: './countdown.component.html', diff --git a/src/@fuse/components/countdown/countdown.module.ts b/src/@fuse/components/countdown/countdown.module.ts new file mode 100644 index 00000000..9c68f4e8 --- /dev/null +++ b/src/@fuse/components/countdown/countdown.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; + +import { FuseCountdownComponent } from '@fuse/components/countdown/countdown.component'; + +@NgModule({ + declarations: [ + FuseCountdownComponent + ], + exports: [ + FuseCountdownComponent + ], +}) +export class FuseCountdownModule +{ +} diff --git a/src/@fuse/components/demo/demo.module.ts b/src/@fuse/components/demo/demo.module.ts index 2f9a7882..ea5b615c 100644 --- a/src/@fuse/components/demo/demo.module.ts +++ b/src/@fuse/components/demo/demo.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; import { RouterModule } from '@angular/router'; + +import { MatDividerModule, MatListModule } from '@angular/material'; + import { FuseDemoContentComponent } from './demo-content/demo-content.component'; import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component'; @@ -10,8 +12,10 @@ import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component' FuseDemoSidenavComponent ], imports : [ - SharedModule, - RouterModule + RouterModule, + + MatDividerModule, + MatListModule ], exports : [ FuseDemoContentComponent, diff --git a/src/@fuse/components/highlight/highlight.module.ts b/src/@fuse/components/highlight/highlight.module.ts new file mode 100644 index 00000000..d45696df --- /dev/null +++ b/src/@fuse/components/highlight/highlight.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; + +import { FuseHighlightComponent } from '@fuse/components/highlight/highlight.component'; + +@NgModule({ + declarations: [ + FuseHighlightComponent + ], + exports: [ + FuseHighlightComponent + ], +}) +export class FuseHighlightModule +{ +} diff --git a/src/@fuse/components/index.ts b/src/@fuse/components/index.ts new file mode 100644 index 00000000..0a8fb885 --- /dev/null +++ b/src/@fuse/components/index.ts @@ -0,0 +1,11 @@ +export * from './confirm-dialog/confirm-dialog.module'; +export * from './countdown/countdown.module'; +export * from './demo/demo.module'; +export * from './highlight/highlight.module'; +export * from './material-color-picker/material-color-picker.module'; +export * from './navigation/navigation.module'; +export * from './search-bar/search-bar.module'; +export * from './shortcuts/shortcuts.module'; +export * from './sidebar/sidebar.module'; +export * from './theme-options/theme-options.module'; +export * from './widget/widget.module'; diff --git a/src/@fuse/components/material-color-picker/material-color-picker.component.ts b/src/@fuse/components/material-color-picker/material-color-picker.component.ts index cb83c1dd..763ea36c 100644 --- a/src/@fuse/components/material-color-picker/material-color-picker.component.ts +++ b/src/@fuse/components/material-color-picker/material-color-picker.component.ts @@ -1,6 +1,7 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core'; -import { MatColors } from '../../matColors'; -import { fuseAnimations } from '../../animations/index'; +import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; +import { MatColors } from '@fuse/mat-colors'; @Component({ selector : 'fuse-material-color-picker', @@ -9,7 +10,7 @@ import { fuseAnimations } from '../../animations/index'; animations : fuseAnimations, encapsulation: ViewEncapsulation.None }) -export class FuseMaterialColorPickerComponent implements OnInit, OnChanges +export class FuseMaterialColorPickerComponent implements OnChanges { colors: any; selectedColor: any; @@ -91,11 +92,21 @@ export class FuseMaterialColorPickerComponent implements OnInit, OnChanges this.hues = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900', 'A100', 'A200', 'A400', 'A700']; } - ngOnInit() + ngOnChanges(changes: any) { - + if ( changes.selectedBg && changes.selectedBg.currentValue === '' || + changes.selectedClass && changes.selectedClass.currentValue === '' || + changes.selectedPalette && changes.selectedPalette.currentValue === '' ) + { + this.removeColor(); + return; + } + if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg ) + { + this.updateSelectedColor(); + } } - + selectPalette(palette) { this.selectedPalette = palette; @@ -172,19 +183,4 @@ export class FuseMaterialColorPickerComponent implements OnInit, OnChanges this.view = 'hues'; } } - - ngOnChanges(changes: any) - { - if ( changes.selectedBg && changes.selectedBg.currentValue === '' || - changes.selectedClass && changes.selectedClass.currentValue === '' || - changes.selectedPalette && changes.selectedPalette.currentValue === '' ) - { - this.removeColor(); - return; - } - if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg ) - { - this.updateSelectedColor(); - } - } } diff --git a/src/@fuse/components/material-color-picker/material-color-picker.module.ts b/src/@fuse/components/material-color-picker/material-color-picker.module.ts new file mode 100644 index 00000000..ad105a08 --- /dev/null +++ b/src/@fuse/components/material-color-picker/material-color-picker.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule, MatIconModule, MatMenuModule } from '@angular/material'; + +import { FusePipesModule } from '@fuse/pipes/pipes.module'; + +import { FuseMaterialColorPickerComponent } from '@fuse/components/material-color-picker/material-color-picker.component'; + +@NgModule({ + declarations: [ + FuseMaterialColorPickerComponent + ], + imports: [ + CommonModule, + + FlexLayoutModule, + + MatButtonModule, + MatIconModule, + MatMenuModule, + + FusePipesModule + ], + exports: [ + FuseMaterialColorPickerComponent + ], +}) +export class FuseMaterialColorPickerModule +{ +} diff --git a/src/@fuse/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts index c9cc9efd..dd9927b7 100644 --- a/src/@fuse/components/navigation/navigation.module.ts +++ b/src/@fuse/components/navigation/navigation.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; +import { MatIconModule, MatRippleModule } from '@angular/material'; import { FuseNavigationComponent } from './navigation.component'; import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component'; @@ -11,8 +12,11 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na @NgModule({ imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + MatIconModule, + MatRippleModule, ], exports : [ FuseNavigationComponent diff --git a/src/@fuse/components/search-bar/search-bar.component.ts b/src/@fuse/components/search-bar/search-bar.component.ts index f83951b0..5fa75e44 100644 --- a/src/@fuse/components/search-bar/search-bar.component.ts +++ b/src/@fuse/components/search-bar/search-bar.component.ts @@ -1,13 +1,14 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { FuseConfigService } from '../../services/config.service'; +import { Component, EventEmitter, Output } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; +import { FuseConfigService } from '@fuse/services/config.service'; + @Component({ selector : 'fuse-search-bar', templateUrl: './search-bar.component.html', styleUrls : ['./search-bar.component.scss'] }) -export class FuseSearchBarComponent implements OnInit +export class FuseSearchBarComponent { collapsed: boolean; toolbarColor: string; @@ -28,11 +29,6 @@ export class FuseSearchBarComponent implements OnInit ); } - ngOnInit() - { - - } - collapse() { this.collapsed = true; diff --git a/src/@fuse/components/search-bar/search-bar.module.ts b/src/@fuse/components/search-bar/search-bar.module.ts index d996cc9d..bc1a0595 100644 --- a/src/@fuse/components/search-bar/search-bar.module.ts +++ b/src/@fuse/components/search-bar/search-bar.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../modules/shared.module'; +import { MatIconModule } from '@angular/material'; + import { FuseSearchBarComponent } from './search-bar.component'; @NgModule({ @@ -9,8 +11,10 @@ import { FuseSearchBarComponent } from './search-bar.component'; FuseSearchBarComponent ], imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + MatIconModule ], exports : [ FuseSearchBarComponent diff --git a/src/@fuse/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts index bf95bc74..4f99d938 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -1,11 +1,12 @@ import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { FuseNavigationService } from '../navigation/navigation.service'; import { Subscription } from 'rxjs/Subscription'; import { ObservableMedia } from '@angular/flex-layout'; -import { FuseMatchMedia } from '../../services/match-media.service'; -import { FuseConfigService } from '../../services/config.service'; import { CookieService } from 'ngx-cookie-service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { FuseConfigService } from '@fuse/services/config.service'; + import { navigation } from 'app/navigation/navigation'; @Component({ @@ -30,7 +31,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy constructor( private renderer: Renderer2, private observableMedia: ObservableMedia, - private fuseMatchMedia: FuseMatchMedia, + private fuseMatchMedia: FuseMatchMediaService, private fuseNavigationService: FuseNavigationService, private fuseConfig: FuseConfigService, private cookieService: CookieService diff --git a/src/@fuse/components/shortcuts/shortcuts.module.ts b/src/@fuse/components/shortcuts/shortcuts.module.ts index 46cd7069..cefd73de 100644 --- a/src/@fuse/components/shortcuts/shortcuts.module.ts +++ b/src/@fuse/components/shortcuts/shortcuts.module.ts @@ -1,19 +1,35 @@ import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material'; +import { CookieService } from 'ngx-cookie-service'; import { FuseShortcutsComponent } from './shortcuts.component'; -import { SharedModule } from '../../modules/shared.module'; @NgModule({ declarations: [ FuseShortcutsComponent ], imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + FlexLayoutModule, + + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatListModule, + MatTooltipModule ], exports : [ FuseShortcutsComponent + ], + providers : [ + CookieService ] }) export class FuseShortcutsModule diff --git a/src/@fuse/components/sidebar/sidebar.component.ts b/src/@fuse/components/sidebar/sidebar.component.ts index 582c023c..5b410ce7 100644 --- a/src/@fuse/components/sidebar/sidebar.component.ts +++ b/src/@fuse/components/sidebar/sidebar.component.ts @@ -4,7 +4,7 @@ import { ObservableMedia } from '@angular/flex-layout'; import { Subscription } from 'rxjs/Subscription'; import { FuseSidebarService } from './sidebar.service'; -import { FuseMatchMedia } from '@fuse/services/match-media.service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; import { DOCUMENT } from '@angular/common'; @Component({ @@ -66,7 +66,7 @@ export class FuseSidebarComponent implements OnInit, OnDestroy private elementRef: ElementRef, private animationBuilder: AnimationBuilder, private sidebarService: FuseSidebarService, - private matchMedia: FuseMatchMedia, + private matchMedia: FuseMatchMediaService, private media: ObservableMedia, @Inject(DOCUMENT) private document: any ) diff --git a/src/@fuse/components/sidebar/sidebar.module.ts b/src/@fuse/components/sidebar/sidebar.module.ts index f26739f3..0f5477f5 100644 --- a/src/@fuse/components/sidebar/sidebar.module.ts +++ b/src/@fuse/components/sidebar/sidebar.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { FuseSidebarComponent } from './sidebar.component'; -import { FuseSidebarService } from './sidebar.service'; @NgModule({ declarations: [ @@ -9,9 +8,6 @@ import { FuseSidebarService } from './sidebar.service'; ], exports : [ FuseSidebarComponent - ], - providers : [ - FuseSidebarService ] }) export class FuseSidebarModule diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts index c2c9c2a2..65688a89 100644 --- a/src/@fuse/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -1,11 +1,14 @@ import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations'; import { Subscription } from 'rxjs/Subscription'; -import { FuseConfigService } from '../../services/config.service'; -import { fuseAnimations } from '../../animations/index'; -import { FuseNavigationService } from '../navigation/navigation.service'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseConfigService } from '@fuse/services/config.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; + import { navigation } from 'app/navigation/navigation'; + @Component({ selector : 'fuse-theme-options', templateUrl: './theme-options.component.html', @@ -71,6 +74,11 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onConfigChanged.unsubscribe(); + } + onSettingsChange() { this.fuseConfig.setConfig(this.config); @@ -105,9 +113,4 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy this.player.play(); } - - ngOnDestroy() - { - this.onConfigChanged.unsubscribe(); - } } diff --git a/src/@fuse/components/theme-options/theme-options.module.ts b/src/@fuse/components/theme-options/theme-options.module.ts new file mode 100644 index 00000000..0d79a402 --- /dev/null +++ b/src/@fuse/components/theme-options/theme-options.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule, MatFormFieldModule, MatIconModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule } from '@angular/material'; + +import { FuseMaterialColorPickerModule } from '@fuse/components/material-color-picker/material-color-picker.module'; +import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; + +@NgModule({ + declarations: [ + FuseThemeOptionsComponent + ], + imports : [ + CommonModule, + FormsModule, + + FlexLayoutModule, + + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatOptionModule, + MatRadioModule, + MatSelectModule, + MatSlideToggleModule, + + FuseMaterialColorPickerModule + ], + exports : [ + FuseThemeOptionsComponent + ] +}) +export class FuseThemeOptionsModule +{ +} diff --git a/src/@fuse/components/widget/widget.component.ts b/src/@fuse/components/widget/widget.component.ts index 659dcc62..46ecdbb2 100644 --- a/src/@fuse/components/widget/widget.component.ts +++ b/src/@fuse/components/widget/widget.component.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, Component, ContentChildren, ElementRef, HostBinding, OnInit, QueryList, Renderer2, ViewEncapsulation } from '@angular/core'; +import { AfterContentInit, Component, ContentChildren, ElementRef, HostBinding, QueryList, Renderer2, ViewEncapsulation } from '@angular/core'; import { FuseWidgetToggleDirective } from './widget-toggle.directive'; @Component({ @@ -8,7 +8,7 @@ import { FuseWidgetToggleDirective } from './widget-toggle.directive'; encapsulation: ViewEncapsulation.None }) -export class FuseWidgetComponent implements OnInit, AfterContentInit +export class FuseWidgetComponent implements AfterContentInit { @HostBinding('class.flipped') flipped = false; @ContentChildren(FuseWidgetToggleDirective, {descendants: true}) toggleButtons: QueryList; @@ -17,11 +17,6 @@ export class FuseWidgetComponent implements OnInit, AfterContentInit { } - ngOnInit() - { - - } - ngAfterContentInit() { setTimeout(() => { diff --git a/src/@fuse/components/widget/widget.module.ts b/src/@fuse/components/widget/widget.module.ts index 1907c5b2..5d7fea3d 100644 --- a/src/@fuse/components/widget/widget.module.ts +++ b/src/@fuse/components/widget/widget.module.ts @@ -1,20 +1,17 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; + import { FuseWidgetComponent } from './widget.component'; import { FuseWidgetToggleDirective } from './widget-toggle.directive'; @NgModule({ - imports : [ - SharedModule + declarations: [ + FuseWidgetComponent, + FuseWidgetToggleDirective ], exports : [ FuseWidgetComponent, FuseWidgetToggleDirective ], - declarations: [ - FuseWidgetComponent, - FuseWidgetToggleDirective - ] }) export class FuseWidgetModule { diff --git a/src/@fuse/directives/directives.ts b/src/@fuse/directives/directives.ts new file mode 100644 index 00000000..91c92607 --- /dev/null +++ b/src/@fuse/directives/directives.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; + +import { FuseIfOnDomDirective } from '@fuse/directives/fuse-if-on-dom/fuse-if-on-dom.directive'; +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; +import { FuseMatSidenavHelperDirective, FuseMatSidenavTogglerDirective } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive'; + +@NgModule({ + declarations: [ + FuseIfOnDomDirective, + FuseMatSidenavHelperDirective, + FuseMatSidenavTogglerDirective, + FusePerfectScrollbarDirective + ], + imports : [], + exports : [ + FuseIfOnDomDirective, + FuseMatSidenavHelperDirective, + FuseMatSidenavTogglerDirective, + FusePerfectScrollbarDirective + ] +}) +export class FuseDirectivesModule +{ +} diff --git a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts similarity index 90% rename from src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts rename to src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts index 4388c7bc..c6a0ad4d 100644 --- a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts +++ b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts @@ -2,8 +2,9 @@ import { Directive, Input, OnInit, HostListener, OnDestroy, HostBinding } from ' import { MatSidenav } from '@angular/material'; import { ObservableMedia } from '@angular/flex-layout'; import { Subscription } from 'rxjs/Subscription'; -import { FuseMatchMedia } from '../../services/match-media.service'; -import { FuseMatSidenavHelperService } from './fuse-mat-sidenav-helper.service'; + +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; @Directive({ selector: '[fuseMatSidenavHelper]' @@ -19,7 +20,7 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy constructor( private fuseMatSidenavService: FuseMatSidenavHelperService, - private fuseMatchMedia: FuseMatchMedia, + private fuseMatchMedia: FuseMatchMediaService, private observableMedia: ObservableMedia, private matSidenav: MatSidenav ) diff --git a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service.ts similarity index 100% rename from src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts rename to src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service.ts diff --git a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts index 49fd75d2..434c6b7f 100644 --- a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts +++ b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts @@ -1,9 +1,12 @@ import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy } from '@angular/core'; -import { FuseConfigService } from '../../services/config.service'; -import { Subscription } from 'rxjs/Subscription'; import { Platform } from '@angular/cdk/platform'; +import { Subscription } from 'rxjs/Subscription'; + import PerfectScrollbar from 'perfect-scrollbar'; +import { FuseConfigService } from '@fuse/services/config.service'; + + @Directive({ selector: '[fusePerfectScrollbar]' }) diff --git a/src/@fuse/fuse.module.ts b/src/@fuse/fuse.module.ts index 7ed75db1..7571fbe0 100644 --- a/src/@fuse/fuse.module.ts +++ b/src/@fuse/fuse.module.ts @@ -1,15 +1,25 @@ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; import { FUSE_CONFIG, FuseConfigService } from '@fuse/services/config.service'; +import { FuseCopierService } from '@fuse/services/copier.service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; import { FuseSplashScreenService } from '@fuse/services/splash-screen.service'; +import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; @NgModule({ - declarations: [], - providers : [ + entryComponents: [], + providers : [ FuseConfigService, + FuseCopierService, + FuseMatchMediaService, + FuseMatSidenavHelperService, FuseNavigationService, - FuseSplashScreenService + FuseSidebarService, + FuseSplashScreenService, + FuseTranslationLoaderService ] }) export class FuseModule diff --git a/src/@fuse/matColors.ts b/src/@fuse/mat-colors/index.ts similarity index 100% rename from src/@fuse/matColors.ts rename to src/@fuse/mat-colors/index.ts diff --git a/src/@fuse/pipes/filter.pipe.ts b/src/@fuse/pipes/filter.pipe.ts index 590d9d59..dc709edf 100644 --- a/src/@fuse/pipes/filter.pipe.ts +++ b/src/@fuse/pipes/filter.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { FuseUtils } from '../fuseUtils'; +import { FuseUtils } from '@fuse/utils'; @Pipe({name: 'filter'}) export class FilterPipe implements PipeTransform diff --git a/src/@fuse/pipes/pipes.module.ts b/src/@fuse/pipes/pipes.module.ts index c4a21aeb..bc5b1349 100644 --- a/src/@fuse/pipes/pipes.module.ts +++ b/src/@fuse/pipes/pipes.module.ts @@ -13,7 +13,6 @@ import { CamelCaseToDashPipe } from './camelCaseToDash.pipe'; HtmlToPlaintextPipe, FilterPipe, CamelCaseToDashPipe - ], imports : [], exports : [ @@ -24,8 +23,6 @@ import { CamelCaseToDashPipe } from './camelCaseToDash.pipe'; CamelCaseToDashPipe ] }) - export class FusePipesModule { - } diff --git a/src/@fuse/components/copier/copier.service.ts b/src/@fuse/services/copier.service.ts similarity index 98% rename from src/@fuse/components/copier/copier.service.ts rename to src/@fuse/services/copier.service.ts index 03227fc4..99880d4e 100644 --- a/src/@fuse/components/copier/copier.service.ts +++ b/src/@fuse/services/copier.service.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; @Injectable() -export class CopierService +export class FuseCopierService { private textarea: HTMLTextAreaElement; diff --git a/src/@fuse/services/match-media.service.ts b/src/@fuse/services/match-media.service.ts index 382e9935..b37b2aa1 100644 --- a/src/@fuse/services/match-media.service.ts +++ b/src/@fuse/services/match-media.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() -export class FuseMatchMedia +export class FuseMatchMediaService { activeMediaQuery: string; onMediaChange: BehaviorSubject = new BehaviorSubject(''); diff --git a/src/@fuse/shared.module.ts b/src/@fuse/shared.module.ts new file mode 100644 index 00000000..4a65c31f --- /dev/null +++ b/src/@fuse/shared.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; + +import { FlexLayoutModule } from '@angular/flex-layout'; + +import { FusePipesModule } from './pipes/pipes.module'; + +import { FuseDirectivesModule } from '@fuse/directives/directives'; + +@NgModule({ + imports : [ + CommonModule, + FormsModule, + ReactiveFormsModule, + + FlexLayoutModule, + + FuseDirectivesModule, + FusePipesModule + ], + exports : [ + CommonModule, + FormsModule, + ReactiveFormsModule, + + FlexLayoutModule, + + FuseDirectivesModule, + FusePipesModule + ] +}) +export class FuseSharedModule +{ +} diff --git a/src/@fuse/fuseUtils.ts b/src/@fuse/utils/index.ts similarity index 100% rename from src/@fuse/fuseUtils.ts rename to src/@fuse/utils/index.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 13762a65..03b755f1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,16 +5,19 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule, Routes } from '@angular/router'; import { InMemoryWebApiModule } from 'angular-in-memory-web-api'; import 'hammerjs'; -import { SharedModule } from '@fuse/modules/shared.module'; + +import { FuseModule } from '@fuse/fuse.module'; +import { FuseSharedModule } from '@fuse/shared.module'; + +// import { SharedModule } from 'app/shared/shared.module'; +import { config } from './config'; + import { AppComponent } from './app.component'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; import { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; -import { FuseModule } from '@fuse/fuse.module'; -import { config } from './config'; - const appRoutes: Routes = [ { path : 'apps', @@ -61,10 +64,11 @@ const appRoutes: Routes = [ passThruUnknownUrl: true }), - SharedModule, + // SharedModule, - // Fuse Module + // Fuse Main and Shared modules FuseModule.forRoot(config), + FuseSharedModule, AppStoreModule, FuseMainModule diff --git a/src/app/main/content/apps/academy/academy.module.ts b/src/app/main/content/apps/academy/academy.module.ts index d344986b..f1110d21 100644 --- a/src/app/main/content/apps/academy/academy.module.ts +++ b/src/app/main/content/apps/academy/academy.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseAcademyCoursesComponent } from './courses/courses.component'; import { FuseAcademyCourseComponent } from './course/course.component'; @@ -31,7 +31,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts index 3cbd2a6e..d18ed1b5 100644 --- a/src/app/main/content/apps/apps.module.ts +++ b/src/app/main/content/apps/apps.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { FuseAngularMaterialModule } from '../components/angular-material/angular-material.module'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; const routes = [ { @@ -58,7 +58,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseAngularMaterialModule ], diff --git a/src/app/main/content/apps/calendar/calendar.module.ts b/src/app/main/content/apps/calendar/calendar.module.ts index ab75854a..244fc50a 100644 --- a/src/app/main/content/apps/calendar/calendar.module.ts +++ b/src/app/main/content/apps/calendar/calendar.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { CalendarService } from './calendar.service'; import { CalendarModule } from 'angular-calendar'; @@ -21,7 +21,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), CalendarModule.forRoot() ], diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.ts b/src/app/main/content/apps/calendar/event-form/event-form.component.ts index 428d5443..0730e7b9 100644 --- a/src/app/main/content/apps/calendar/event-form/event-form.component.ts +++ b/src/app/main/content/apps/calendar/event-form/event-form.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; import { CalendarEvent } from 'angular-calendar'; import { CalendarEventModel } from '../event.model'; diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts index 71d5f75f..cd4a714c 100644 --- a/src/app/main/content/apps/chat/chat.module.ts +++ b/src/app/main/content/apps/chat/chat.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseChatComponent } from './chat.component'; import { ChatService } from './chat.service'; @@ -26,7 +26,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/chat/chat.service.ts b/src/app/main/content/apps/chat/chat.service.ts index 38a76b02..bbed4ee5 100644 --- a/src/app/main/content/apps/chat/chat.service.ts +++ b/src/app/main/content/apps/chat/chat.service.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; @Injectable() export class ChatService implements Resolve diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts index 191b0ed8..d2261bfd 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ObservableMedia } from '@angular/flex-layout'; import { fuseAnimations } from '@fuse/animations'; -import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; import { ChatService } from '../../../chat.service'; diff --git a/src/app/main/content/apps/contacts/contact.model.ts b/src/app/main/content/apps/contacts/contact.model.ts index f23229f4..efc5e687 100644 --- a/src/app/main/content/apps/contacts/contact.model.ts +++ b/src/app/main/content/apps/contacts/contact.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Contact { diff --git a/src/app/main/content/apps/contacts/contacts.module.ts b/src/app/main/content/apps/contacts/contacts.module.ts index 8c93248d..45a02229 100644 --- a/src/app/main/content/apps/contacts/contacts.module.ts +++ b/src/app/main/content/apps/contacts/contacts.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseContactsMainSidenavComponent } from './sidenavs/main/main.component'; import { FuseContactsComponent } from './contacts.component'; @@ -22,7 +22,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations : [ diff --git a/src/app/main/content/apps/contacts/contacts.service.ts b/src/app/main/content/apps/contacts/contacts.service.ts index 80e8ddf7..4b15ab2f 100644 --- a/src/app/main/content/apps/contacts/contacts.service.ts +++ b/src/app/main/content/apps/contacts/contacts.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Subject } from 'rxjs/Subject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Contact } from './contact.model'; diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts index f1a36f4b..6a5eebf6 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts @@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseAnalyticsDashboardComponent } from './analytics.component'; @@ -23,7 +23,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule, 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 1909a159..e57c260b 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseProjectDashboardComponent } from './project.component'; @@ -21,7 +21,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/content/apps/e-commerce/e-commerce.module.ts index ac6763ef..8052f814 100644 --- a/src/app/main/content/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/content/apps/e-commerce/e-commerce.module.ts @@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseEcommerceDashboardComponent } from './dashboard/dashboard.component'; @@ -65,7 +65,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule, diff --git a/src/app/main/content/apps/e-commerce/order/order.model.ts b/src/app/main/content/apps/e-commerce/order/order.model.ts index 0962ceba..9c2fb68d 100644 --- a/src/app/main/content/apps/e-commerce/order/order.model.ts +++ b/src/app/main/content/apps/e-commerce/order/order.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Order { diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.ts b/src/app/main/content/apps/e-commerce/orders/orders.component.ts index 9a38d88e..a2e23a0b 100644 --- a/src/app/main/content/apps/e-commerce/orders/orders.component.ts +++ b/src/app/main/content/apps/e-commerce/orders/orders.component.ts @@ -11,7 +11,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { EcommerceOrdersService } from './orders.service'; diff --git a/src/app/main/content/apps/e-commerce/product/product.component.ts b/src/app/main/content/apps/e-commerce/product/product.component.ts index 79a7619c..e0049456 100644 --- a/src/app/main/content/apps/e-commerce/product/product.component.ts +++ b/src/app/main/content/apps/e-commerce/product/product.component.ts @@ -11,7 +11,7 @@ import 'rxjs/add/observable/fromEvent'; import { Subscription } from 'rxjs/Subscription'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Product } from './product.model'; import { EcommerceProductService } from './product.service'; diff --git a/src/app/main/content/apps/e-commerce/product/product.model.ts b/src/app/main/content/apps/e-commerce/product/product.model.ts index 4a382b94..a77e2596 100644 --- a/src/app/main/content/apps/e-commerce/product/product.model.ts +++ b/src/app/main/content/apps/e-commerce/product/product.model.ts @@ -1,6 +1,6 @@ import { MatChipInputEvent } from '@angular/material'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Product { diff --git a/src/app/main/content/apps/e-commerce/products/products.component.ts b/src/app/main/content/apps/e-commerce/products/products.component.ts index 329d93fa..a463f200 100644 --- a/src/app/main/content/apps/e-commerce/products/products.component.ts +++ b/src/app/main/content/apps/e-commerce/products/products.component.ts @@ -12,7 +12,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { EcommerceProductsService } from './products.service'; diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts index dc208ca2..5273f344 100644 --- a/src/app/main/content/apps/file-manager/file-manager.module.ts +++ b/src/app/main/content/apps/file-manager/file-manager.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFileManagerComponent } from './file-manager.component'; import { FileManagerService } from './file-manager.service'; @@ -22,7 +22,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/content/apps/mail-ngrx/mail.module.ts index 541a39a3..33f79a0a 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailNgrxComponent } from './mail.component'; import { FuseMailNgrxMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; @@ -60,7 +60,7 @@ const routes: Routes = [ FuseMailNgrxComposeDialogComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), MailAppStoreModule ], diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts index af598b08..27d4c19f 100644 --- a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts +++ b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { createSelector } from '@ngrx/store'; import { getMailAppState, MailAppState, MailsState } from '../reducers'; diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts index 822cd233..e8a506ee 100644 --- a/src/app/main/content/apps/mail/mail.module.ts +++ b/src/app/main/content/apps/mail/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { MailService } from './mail.service'; import { FuseMailComponent } from './mail.component'; @@ -70,7 +70,7 @@ const routes: Routes = [ FuseMailComposeDialogComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/mail/mail.service.ts b/src/app/main/content/apps/mail/mail.service.ts index 826f3df1..c0504eeb 100644 --- a/src/app/main/content/apps/mail/mail.service.ts +++ b/src/app/main/content/apps/mail/mail.service.ts @@ -5,7 +5,7 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/r import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Mail } from './mail.model'; diff --git a/src/app/main/content/apps/scrumboard/board.model.ts b/src/app/main/content/apps/scrumboard/board.model.ts index bd62d4fe..3f061428 100644 --- a/src/app/main/content/apps/scrumboard/board.model.ts +++ b/src/app/main/content/apps/scrumboard/board.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { List } from './list.model'; import { Card } from './card.model'; diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts index a993766a..95d41eaf 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts @@ -3,8 +3,8 @@ import { NgForm } from '@angular/forms/src/forms'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatMenuTrigger } from '@angular/material'; import { Subscription } from 'rxjs/Subscription'; -import { FuseUtils } from '@fuse/fuseUtils'; import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; +import { FuseUtils } from '@fuse/utils'; import { ScrumboardService } from '../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts index 1eb69081..81245553 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { FuseUtils } from '@fuse/fuseUtils'; import { fuseAnimations } from '@fuse/animations'; +import { FuseUtils } from '@fuse/utils'; import { ScrumboardService } from '../../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts index 1079eb37..9f7483ab 100644 --- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; import { ScrumboardService } from '../../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/card.model.ts b/src/app/main/content/apps/scrumboard/card.model.ts index 3b5532d9..ddd84436 100644 --- a/src/app/main/content/apps/scrumboard/card.model.ts +++ b/src/app/main/content/apps/scrumboard/card.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Card { diff --git a/src/app/main/content/apps/scrumboard/list.model.ts b/src/app/main/content/apps/scrumboard/list.model.ts index a34e8668..44d1fa59 100644 --- a/src/app/main/content/apps/scrumboard/list.model.ts +++ b/src/app/main/content/apps/scrumboard/list.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class List { diff --git a/src/app/main/content/apps/scrumboard/scrumboard.module.ts b/src/app/main/content/apps/scrumboard/scrumboard.module.ts index 0fd0f694..0157b9d3 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.module.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { BoardResolve, ScrumboardService } from './scrumboard.service'; import { FuseScrumboardComponent } from './scrumboard.component'; @@ -54,7 +54,7 @@ const routes: Routes = [ FuseScrumboardBoardColorSelectorComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts index 63516683..f64737e0 100644 --- a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts +++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { fuseAnimations } from '@fuse/animations'; import { Todo } from '../todo.model'; diff --git a/src/app/main/content/apps/todo/todo.module.ts b/src/app/main/content/apps/todo/todo.module.ts index 0761767c..368a9b1b 100644 --- a/src/app/main/content/apps/todo/todo.module.ts +++ b/src/app/main/content/apps/todo/todo.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { TodoService } from './todo.service'; import { FuseTodoComponent } from './todo.component'; @@ -68,7 +68,7 @@ const routes: Routes = [ FuseTodoDetailsComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts index 5738bf5f..0e53ca29 100644 --- a/src/app/main/content/apps/todo/todo.service.ts +++ b/src/app/main/content/apps/todo/todo.service.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Subject } from 'rxjs/Subject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Todo } from './todo.model'; 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 7cbac19e..23d856a3 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; import { GoogleMapsModule } from './google-maps/google-maps.module'; @@ -15,7 +15,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), GoogleMapsModule ], 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 03fb94cc..e711802e 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 @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseGoogleMapsDocsComponent } from './google-maps.component'; @@ -15,7 +15,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), AgmCoreModule.forRoot({ apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' 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 35eeaccc..8e28ad98 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 @@ -1,12 +1,14 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { EXAMPLE_LIST } from './example-components'; import { FuseExampleViewerComponent } from './example-viewer/example-viewer'; import { FuseAngularMaterialComponent } from './angular-material.component'; +import { MaterialModule } from 'app/main/content/components/angular-material/material.module'; +import { FuseHighlightModule } from '@fuse/components'; const routes: Routes = [ { @@ -22,12 +24,11 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, RouterModule.forChild(routes), - FuseWidgetModule - ], - exports : [ - SharedModule + MaterialModule, + FuseSharedModule, + FuseWidgetModule, + FuseHighlightModule ], entryComponents: EXAMPLE_LIST, declarations : [ diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts index ace53c29..4ce317b8 100644 --- a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts +++ b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts @@ -6,8 +6,8 @@ import 'prismjs/components/prism-typescript'; import { EXAMPLE_COMPONENTS } from '../example-components'; -import { CopierService } from '@fuse/components/copier/copier.service'; import { fuseAnimations } from '@fuse/animations'; +import { FuseCopierService } from '@fuse/services/copier.service'; export interface LiveExample { @@ -21,7 +21,6 @@ export interface LiveExample selector : 'fuse-example-viewer', templateUrl : './example-viewer.html', styleUrls : ['./example-viewer.scss'], - providers : [CopierService], encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) @@ -51,7 +50,7 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy constructor( private snackbar: MatSnackBar, - private copier: CopierService, + private copier: FuseCopierService, private _resolver: ComponentFactoryResolver ) { diff --git a/src/app/main/content/components/angular-material/material.module.ts b/src/app/main/content/components/angular-material/material.module.ts new file mode 100644 index 00000000..36d357c6 --- /dev/null +++ b/src/app/main/content/components/angular-material/material.module.ts @@ -0,0 +1,112 @@ +import { NgModule } from '@angular/core'; +import { + MatAutocompleteModule, + MatButtonModule, + MatButtonToggleModule, + MatCheckboxModule, + MatToolbarModule, + MatTooltipModule, + MatCardModule, + MatChipsModule, + MatDatepickerModule, + MatDialogModule, + MatExpansionModule, + MatFormFieldModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatNativeDateModule, + MatPaginatorModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatRadioModule, + MatRippleModule, + MatSelectModule, + MatSidenavModule, + MatSliderModule, + MatSlideToggleModule, + MatSnackBarModule, + MatSortModule, + MatTableModule, + MatTabsModule, + MatStepperModule +} from '@angular/material'; +import { CdkTableModule } from '@angular/cdk/table'; + +@NgModule({ + imports: [ + MatAutocompleteModule, + MatButtonModule, + MatButtonToggleModule, + MatCardModule, + MatCheckboxModule, + MatChipsModule, + MatDatepickerModule, + MatDialogModule, + MatExpansionModule, + MatFormFieldModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatNativeDateModule, + MatPaginatorModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatRadioModule, + MatRippleModule, + MatSelectModule, + MatSidenavModule, + MatSliderModule, + MatSlideToggleModule, + MatSnackBarModule, + MatStepperModule, + MatSortModule, + MatTableModule, + MatTabsModule, + MatToolbarModule, + MatTooltipModule, + CdkTableModule + ], + exports: [ + MatAutocompleteModule, + MatButtonModule, + MatButtonToggleModule, + MatCardModule, + MatCheckboxModule, + MatChipsModule, + MatDatepickerModule, + MatDialogModule, + MatExpansionModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatNativeDateModule, + MatPaginatorModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatRadioModule, + MatRippleModule, + MatSelectModule, + MatSidenavModule, + MatSliderModule, + MatSlideToggleModule, + MatSnackBarModule, + MatStepperModule, + MatSortModule, + MatTableModule, + MatTabsModule, + MatToolbarModule, + MatTooltipModule, + CdkTableModule + ] +}) +export class MaterialModule +{ + +} diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index 30f65c50..82bdd260 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; @@ -57,7 +57,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, FuseAngularMaterialModule, diff --git a/src/app/main/content/content.module.ts b/src/app/main/content/content.module.ts new file mode 100644 index 00000000..f471e0ca --- /dev/null +++ b/src/app/main/content/content.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseContentComponent } from 'app/main/content/content.component'; + +@NgModule({ + declarations: [ + FuseContentComponent + ], + imports : [ + RouterModule, + FuseSharedModule, + ], + exports: [ + FuseContentComponent + ] +}) +export class FuseContentModule +{ +} 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 9c27b063..f04f0d94 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPassword2Component } from './forgot-password-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseForgotPassword2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 50994607..b701cee0 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPasswordComponent } from './forgot-password.component'; @@ -17,7 +17,7 @@ const routes = [ FuseForgotPasswordComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 8d3e306a..5e796850 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLockComponent } from './lock.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLockComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 91d187dd..1e988755 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLogin2Component } from './login-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLogin2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 4679c403..2fcf6ecb 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLoginComponent } from './login.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLoginComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 a030c648..9916a0d9 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailConfirmComponent } from './mail-confirm.component'; @@ -17,7 +17,7 @@ const routes = [ FuseMailConfirmComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 58ab0837..6beb5b24 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegister2Component } from './register-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseRegister2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 ffa07aeb..e330153e 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegisterComponent } from './register.component'; @@ -17,7 +17,7 @@ const routes = [ FuseRegisterComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 6f536d7c..cce11b14 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPassword2Component } from './reset-password-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseResetPassword2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 eea63226..60ea7781 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPasswordComponent } from './reset-password.component'; @@ -17,7 +17,7 @@ const routes = [ FuseResetPasswordComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 8d4c1617..0f9b1a0f 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseComingSoonComponent } from './coming-soon.component'; @@ -17,7 +17,7 @@ const routes = [ FuseComingSoonComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 df632b11..77da500d 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError404Component } from './error-404.component'; @@ -17,7 +17,7 @@ const routes = [ FuseError404Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 e1077394..909ce8da 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError500Component } from './error-500.component'; @@ -17,7 +17,7 @@ const routes = [ FuseError500Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/faq/faq.component.ts b/src/app/main/content/pages/faq/faq.component.ts index 0e288a4e..81925d2d 100644 --- a/src/app/main/content/pages/faq/faq.component.ts +++ b/src/app/main/content/pages/faq/faq.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { FaqService } from './faq.service'; diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index fe5dec69..70268e65 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FaqService } from './faq.service'; import { FuseFaqComponent } from './faq.component'; @@ -21,7 +21,7 @@ const routes = [ FuseFaqComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 0332cd32..02c575ae 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { InvoiceService } from '../invoice.service'; import { FuseInvoiceCompactComponent } from './compact.component'; @@ -21,7 +21,7 @@ const routes = [ FuseInvoiceCompactComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 c968173f..f86c6abc 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { InvoiceService } from '../invoice.service'; import { FuseInvoiceModernComponent } from './modern.component'; @@ -21,7 +21,7 @@ const routes = [ FuseInvoiceModernComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 367709a2..0fed4168 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { KnowledgeBaseService } from './knowledge-base.service'; import { FuseKnowledgeBaseComponent } from './knowledge-base.component'; @@ -23,7 +23,7 @@ const routes = [ FuseKnowledgeBaseArticleComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index 732b7e1f..b0bf2d05 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMaintenanceComponent } from './maintenance.component'; @@ -17,7 +17,7 @@ const routes = [ FuseMaintenanceComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index b002e135..0ccd5239 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FusePricingStyle1Component } from './style-1/style-1.component'; import { FusePricingStyle2Component } from './style-2/style-2.component'; @@ -29,7 +29,7 @@ const routes = [ FusePricingStyle3Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index 2d39909c..6a90bc0e 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { ProfileService } from './profile.service'; import { FuseProfileComponent } from './profile.component'; @@ -27,7 +27,7 @@ const routes = [ FuseProfilePhotosVideosComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 7e47b1da..52c6fb29 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { SearchService } from './search.service'; import { FuseSearchClassicComponent } from './tabs/classic/classic.component'; @@ -25,7 +25,7 @@ const routes = [ FuseSearchTableComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index bd006620..7d27ed4c 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseConfigServiceDocsComponent } from './config/config.component'; import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-screen.component'; @@ -19,7 +19,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/ui/colors/colors.component.ts b/src/app/main/content/ui/colors/colors.component.ts index 5e6c3025..65a38fe9 100644 --- a/src/app/main/content/ui/colors/colors.component.ts +++ b/src/app/main/content/ui/colors/colors.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; @Component({ selector : 'fuse-colors', diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts index 51fb3525..f3023d8d 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; import { FuseColorsComponent } from './colors.component'; @@ -15,7 +15,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseDemoModule ], diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index 04a6a257..5dd4855d 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFormsComponent } from './forms.component'; @@ -14,7 +14,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ 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 bb098647..d1a1e095 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHelperClassesComponent } from './helper-classes.component'; import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; @@ -16,7 +16,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index 061fe136..afc8dcd5 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseIconsComponent } from './icons.component'; @@ -14,7 +14,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ 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 1916eb4e..28622935 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; import { FuseCardedFullWidthComponent } from './carded/fullwidth/fullwidth.component'; @@ -105,7 +105,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseDemoModule ], diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index 0a025966..790b019b 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseTypographyComponent } from './typography.component'; import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; @@ -18,7 +18,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/footer/footer.module.ts b/src/app/main/footer/footer.module.ts new file mode 100644 index 00000000..a7c26d66 --- /dev/null +++ b/src/app/main/footer/footer.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatToolbarModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseFooterComponent } from 'app/main/footer/footer.component'; + +@NgModule({ + declarations: [ + FuseFooterComponent + ], + imports : [ + RouterModule, + + MatButtonModule, + MatIconModule, + MatToolbarModule, + + FuseSharedModule + ], + exports : [ + FuseFooterComponent + ] +}) +export class FuseFooterModule +{ +} diff --git a/src/app/main/main.module.ts b/src/app/main/main.module.ts index 14d25778..f7c03c72 100644 --- a/src/app/main/main.module.ts +++ b/src/app/main/main.module.ts @@ -1,44 +1,46 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatSidenavModule } from '@angular/material'; -import { SharedModule } from '@fuse/modules/shared.module'; -import { FuseNavigationModule } from '@fuse/components/navigation/navigation.module'; -import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; -import { FuseShortcutsModule } from '@fuse/components/shortcuts/shortcuts.module'; -import { FuseSearchBarModule } from '@fuse/components/search-bar/search-bar.module'; +import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseNavigationModule, FuseSearchBarModule, FuseShortcutsModule, FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components'; + +import { FuseContentModule } from 'app/main/content/content.module'; +import { FuseFooterModule } from 'app/main/footer/footer.module'; +import { FuseNavbarModule } from 'app/main/navbar/navbar.module'; +import { FuseQuickPanelModule } from 'app/main/quick-panel/quick-panel.module'; +import { FuseToolbarModule } from 'app/main/toolbar/toolbar.module'; import { FuseMainComponent } from './main.component'; -import { FuseContentComponent } from './content/content.component'; -import { FuseFooterComponent } from './footer/footer.component'; -import { FuseNavbarComponent } from './navbar/navbar.component'; -import { FuseToolbarComponent } from './toolbar/toolbar.component'; -import { FuseQuickPanelComponent } from './quick-panel/quick-panel.component'; -import { FuseSidebarModule } from '@fuse/components/sidebar/sidebar.module'; @NgModule({ declarations: [ - FuseContentComponent, - FuseFooterComponent, FuseMainComponent, - FuseNavbarComponent, - FuseToolbarComponent, - FuseThemeOptionsComponent, - FuseQuickPanelComponent ], imports : [ - SharedModule, RouterModule, - FuseSidebarModule, + + MatSidenavModule, + + FuseSharedModule, + + FuseThemeOptionsModule, FuseNavigationModule, + FuseSearchBarModule, FuseShortcutsModule, - FuseSearchBarModule + FuseSidebarModule, + + FuseContentModule, + FuseFooterModule, + FuseNavbarModule, + FuseQuickPanelModule, + FuseToolbarModule, ], exports : [ FuseMainComponent ] }) - export class FuseMainModule { } diff --git a/src/app/main/navbar/navbar.module.ts b/src/app/main/navbar/navbar.module.ts new file mode 100644 index 00000000..886c6558 --- /dev/null +++ b/src/app/main/navbar/navbar.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseNavbarComponent } from 'app/main/navbar/navbar.component'; +import { FuseNavigationModule } from '@fuse/components'; + +@NgModule({ + declarations: [ + FuseNavbarComponent + ], + imports : [ + RouterModule, + + MatIconModule, + + FuseSharedModule, + FuseNavigationModule + ], + exports : [ + FuseNavbarComponent + ] +}) +export class FuseNavbarModule +{ +} diff --git a/src/app/main/quick-panel/quick-panel.module.ts b/src/app/main/quick-panel/quick-panel.module.ts new file mode 100644 index 00000000..716461e3 --- /dev/null +++ b/src/app/main/quick-panel/quick-panel.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatDividerModule, MatListModule, MatSlideToggleModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseQuickPanelComponent } from 'app/main/quick-panel/quick-panel.component'; + +@NgModule({ + declarations: [ + FuseQuickPanelComponent + ], + imports : [ + RouterModule, + + MatDividerModule, + MatListModule, + MatSlideToggleModule, + + FuseSharedModule, + ], + exports: [ + FuseQuickPanelComponent + ] +}) +export class FuseQuickPanelModule +{ +} diff --git a/src/app/main/toolbar/toolbar.module.ts b/src/app/main/toolbar/toolbar.module.ts new file mode 100644 index 00000000..e7edb246 --- /dev/null +++ b/src/app/main/toolbar/toolbar.module.ts @@ -0,0 +1,32 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseToolbarComponent } from 'app/main/toolbar/toolbar.component'; +import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components'; + +@NgModule({ + declarations: [ + FuseToolbarComponent + ], + imports : [ + RouterModule, + + MatIconModule, + MatMenuModule, + MatProgressBarModule, + MatToolbarModule, + + FuseSharedModule, + FuseSearchBarModule, + FuseShortcutsModule + ], + exports : [ + FuseToolbarComponent + ] +}) +export class FuseToolbarModule +{ +} diff --git a/src/@fuse/modules/shared.module.ts b/src/app/shared/shared.module.ts similarity index 98% rename from src/@fuse/modules/shared.module.ts rename to src/app/shared/shared.module.ts index ec121b3d..44fd2cd3 100644 --- a/src/@fuse/modules/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,3 +1,4 @@ +/* import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; @@ -36,7 +37,6 @@ import { ChartsModule } from 'ng2-charts'; ], imports : [ FlexLayoutModule, - MaterialModule, CommonModule, FormsModule, FusePipesModule, @@ -48,7 +48,6 @@ import { ChartsModule } from 'ng2-charts'; ], exports : [ FlexLayoutModule, - MaterialModule, CommonModule, FormsModule, FuseMatSidenavHelperDirective, @@ -81,3 +80,4 @@ export class SharedModule { } +*/ From fa53e773ae254b42feb436d257f4e39c2815e1e3 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Fri, 23 Feb 2018 19:35:28 +0300 Subject: [PATCH 04/20] Separately importing Angular Material modules (wip) --- src/@fuse/components/search-bar/search-bar.module.ts | 3 ++- src/@fuse/components/shortcuts/shortcuts.module.ts | 3 ++- src/@fuse/shared.module.ts | 3 +-- src/app/app.module.ts | 6 ++++-- src/app/{config.ts => fuse-config.ts} | 2 +- src/app/main/content/apps/apps.module.ts | 4 ++-- .../main/content/apps/dashboards/project/project.module.ts | 4 +++- src/app/main/toolbar/toolbar.module.ts | 3 ++- 8 files changed, 17 insertions(+), 11 deletions(-) rename src/app/{config.ts => fuse-config.ts} (95%) diff --git a/src/@fuse/components/search-bar/search-bar.module.ts b/src/@fuse/components/search-bar/search-bar.module.ts index bc1a0595..f0968924 100644 --- a/src/@fuse/components/search-bar/search-bar.module.ts +++ b/src/@fuse/components/search-bar/search-bar.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { MatIconModule } from '@angular/material'; +import { MatButtonModule, MatIconModule } from '@angular/material'; import { FuseSearchBarComponent } from './search-bar.component'; @@ -14,6 +14,7 @@ import { FuseSearchBarComponent } from './search-bar.component'; CommonModule, RouterModule, + MatButtonModule, MatIconModule ], exports : [ diff --git a/src/@fuse/components/shortcuts/shortcuts.module.ts b/src/@fuse/components/shortcuts/shortcuts.module.ts index cefd73de..22e5e94b 100644 --- a/src/@fuse/components/shortcuts/shortcuts.module.ts +++ b/src/@fuse/components/shortcuts/shortcuts.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material'; +import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material'; import { CookieService } from 'ngx-cookie-service'; import { FuseShortcutsComponent } from './shortcuts.component'; @@ -17,6 +17,7 @@ import { FuseShortcutsComponent } from './shortcuts.component'; FlexLayoutModule, + MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, diff --git a/src/@fuse/shared.module.ts b/src/@fuse/shared.module.ts index 4a65c31f..9d82a601 100644 --- a/src/@fuse/shared.module.ts +++ b/src/@fuse/shared.module.ts @@ -4,9 +4,8 @@ import { CommonModule } from '@angular/common'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { FusePipesModule } from './pipes/pipes.module'; - import { FuseDirectivesModule } from '@fuse/directives/directives'; +import { FusePipesModule } from '@fuse/pipes/pipes.module'; @NgModule({ imports : [ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 03b755f1..159c4403 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,13 +10,14 @@ import { FuseModule } from '@fuse/fuse.module'; import { FuseSharedModule } from '@fuse/shared.module'; // import { SharedModule } from 'app/shared/shared.module'; -import { config } from './config'; +import { fuseConfig } from './fuse-config'; import { AppComponent } from './app.component'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; import { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; +import { MaterialModule } from '@fuse/modules/material.module'; const appRoutes: Routes = [ { @@ -65,9 +66,10 @@ const appRoutes: Routes = [ }), // SharedModule, + MaterialModule, // Fuse Main and Shared modules - FuseModule.forRoot(config), + FuseModule.forRoot(fuseConfig), FuseSharedModule, AppStoreModule, diff --git a/src/app/config.ts b/src/app/fuse-config.ts similarity index 95% rename from src/app/config.ts rename to src/app/fuse-config.ts index 622fa675..2da07496 100644 --- a/src/app/config.ts +++ b/src/app/fuse-config.ts @@ -1,5 +1,5 @@ // Default Fuse config -export const config = { +export const fuseConfig = { layout : { navigation : 'left', // 'right', 'left', 'top', 'none' navigationFolded: false, // true, false diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts index d18ed1b5..7764c050 100644 --- a/src/app/main/content/apps/apps.module.ts +++ b/src/app/main/content/apps/apps.module.ts @@ -10,7 +10,7 @@ const routes = [ path : 'dashboards/project', loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule' }, - { + /*{ path : 'dashboards/analytics', loadChildren: './dashboards/analytics/analytics.module#FuseAnalyticsDashboardModule' }, @@ -53,7 +53,7 @@ const routes = [ { path : 'scrumboard', loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule' - } + }*/ ]; @NgModule({ 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 e57c260b..b806b353 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -8,6 +8,7 @@ import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseProjectDashboardComponent } from './project.component'; import { ProjectDashboardService } from './project.service'; +import { MaterialModule } from '@fuse/modules/material.module'; const routes: Routes = [ { @@ -21,8 +22,9 @@ const routes: Routes = [ @NgModule({ imports : [ - FuseSharedModule, RouterModule.forChild(routes), + FuseSharedModule, + MaterialModule, FuseWidgetModule, NgxChartsModule ], diff --git a/src/app/main/toolbar/toolbar.module.ts b/src/app/main/toolbar/toolbar.module.ts index e7edb246..4d61d960 100644 --- a/src/app/main/toolbar/toolbar.module.ts +++ b/src/app/main/toolbar/toolbar.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material'; +import { MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -14,6 +14,7 @@ import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components'; imports : [ RouterModule, + MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, From b34f7fca2063df2bf932da4a43505272bf89d9c3 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Fri, 23 Feb 2018 19:57:31 +0300 Subject: [PATCH 05/20] Replaced demo text with lorem ipsum --- .../demo-content/demo-content.component.html | 68 +++++++++---------- src/app/fuse-fake-db/chat.ts | 48 ++++++------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/app/core/components/demo/demo-content/demo-content.component.html b/src/app/core/components/demo/demo-content/demo-content.component.html index a8075ec0..cd95870f 100644 --- a/src/app/core/components/demo/demo-content/demo-content.component.html +++ b/src/app/core/components/demo/demo-content/demo-content.component.html @@ -7,16 +7,16 @@

Demo Content

- One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a - horrible vermin. He lay on his armour-like back, and if he lifted his head a little he could see his - brown belly, slightly domed and divided by arches into stiff sections. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec, + auctor venenatis nisl. Suspendisse potenti. Nullam sagittis nulla in diam finibus, sed pharetra velit + vestibulum. Suspendisse euismod in urna eu posuere.

- The bedding was hardly able to cover it and seemed ready to slide off any moment. His many legs, - pitifully thin compared with the size of the rest of him, waved about helplessly as he looked. "What's - happened to me? " he thought. It wasn't a dream. + Nunc vel lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus + et tortor id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante + sollicitudin. Donec viverra augue dolor, a venenatis tellus consectetur sit amet.

John Doe @@ -24,52 +24,52 @@

- His room, a proper human room although a little too small, lay peacefully between its four familiar - walls. A collection of textile samples lay spread out on the table - Samsa was a travelling salesman - - and above it there hung a picture that he had recently cut out of an illustrated magazine and housed in - a nice, gilded frame. + Ut ornare sit amet velit vel congue. Ut nec tristique eros. Lorem ipsum dolor sit amet, consectetur adipiscing + elit. Vivamus sed lorem quis nibh porta iaculis. Vestibulum ut eleifend ante, at semper mi. Nam imperdiet est + nisi, quis hendrerit tellus convallis et. Morbi in luctus neque. Curabitur elementum ut est et gravida. In hac + habitasse platea dictumst.

- It showed a lady fitted out with a fur hat and fur boa who sat upright, raising a heavy fur muff that - covered the whole of her lower arm towards the viewer. Gregor then turned to look out the window at the - dull weather. Drops of rain could be heard hitting the pane, which made him feel quite sad. + In et placerat eros, eu tempor turpis. Curabitur ac felis finibus, elementum lectus vitae, venenatis est. + Integer mollis nisl a eros scelerisque varius. Etiam venenatis lectus vel erat condimentum tristique vel vel mi. + Nulla id euismod mi, et mollis tellus.

- "How about if I sleep a little bit longer and forget all this nonsense", he thought, but that was - something he was unable to do because he was used to sleeping on his right, and in his present state - couldn't get into that position. However hard he threw himself onto his right, he always rolled back to - where he was. + Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Class aptent taciti + sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur vitae sagittis odio. + Suspendisse ullamcorper nunc non pellentesque laoreet. Curabitur eu tortor id quam pretium mattis. Proin ut quam + velit.

- He must have tried it a hundred times, shut his eyes so that he wouldn't have to look at the floundering - legs, and only stopped when he began to feel a mild, dull pain there that he had never felt before. "Oh, - God", he thought, "what a strenuous career it is that I've chosen! + Quisque sit amet risus enim. Aliquam sit amet interdum justo, at ultricies sapien. Suspendisse et semper urna, + in gravida eros. Quisque id nibh iaculis, euismod urna sed, egestas nisi. Donec eros metus, congue a imperdiet + feugiat, sagittis nec ipsum. Quisque dapibus mollis felis non tristique.

- Travelling day in and day out. Doing business like this takes much more effort than doing your own - business at home, and on top of that there's the curse of travelling, worries about making train - connections, bad and irregular food, contact with different people all the time so that you can never - get to know anyone or become friendly with them. + Ut auctor, metus sed dapibus tempus, urna diam auctor odio, in malesuada odio risus vitae nisi. Etiam blandit + ante urna, vitae placerat massa mollis in. Duis nec urna ac purus semper dictum ut eget justo. Aenean non + sagittis augue. Sed venenatis rhoncus enim eget ornare. Donec viverra sed felis at venenatis. Mauris aliquam + fringilla nulla, sit amet congue felis dignissim at.

- "He felt a slight itch up on his belly; pushed himself slowly up on his back towards the headboard so - that he could lift his head better; found where the itch was, and saw that it was covered with lots of - little white spots which he didn't know what to make of; and when he tried to feel the place with one of - his legs he drew it quickly back because as soon as he touched it he was overcome by a cold shudder. He - slid back into his former position. + Quisque accumsan augue tempor ante mollis, sed placerat diam porttitor. Vestibulum dignissim sem vel velit + eleifend, non pellentesque quam convallis. Pellentesque est dolor, dignissim ac tortor tristique, hendrerit + iaculis metus. Praesent pulvinar quam eu leo consectetur faucibus. Vestibulum purus diam, gravida sagittis + feugiat sit amet, tincidunt in ligula. Sed semper vestibulum magna. Lorem ipsum dolor sit amet, consectetur + adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec, auctor venenatis nisl. Suspendisse potenti.

- "Getting up early all the time", he thought, "it makes you stupid. You've got to get enough sleep. Other - travelling salesmen live a life of luxury. For instance, whenever I go back to the guest house during - the morning to copy out the contract, these gentlemen are always still sitting there eating their - breakfasts. I ought to just try that with my boss; I'd get kicked out on the spot. But who knows, maybe - that would be the best thing for me... + Nullam sagittis nulla in diam finibus, sed pharetra velit vestibulum. Suspendisse euismod in urna eu posuere. + Etiam blandit nunc arcu, et consectetur orci blandit a. Aliquam condimentum pharetra quam at ultricies. Nunc vel + lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus et tortor + id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante sollicitudin. Donec + viverra augue dolor, a venenatis tellus consectetur sit amet...

diff --git a/src/app/fuse-fake-db/chat.ts b/src/app/fuse-fake-db/chat.ts index a92634d1..bd9263dc 100644 --- a/src/app/fuse-fake-db/chat.ts +++ b/src/app/fuse-fake-db/chat.ts @@ -6,21 +6,21 @@ export class ChatFakeDb 'name' : 'Alice Freeman', 'avatar': 'assets/images/avatars/alice.jpg', 'status': 'online', - 'mood' : 'I never sign anything until I pretend to read it first..' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680606588342058356d', 'name' : 'Arnold', 'avatar': 'assets/images/avatars/Arnold.jpg', 'status': 'do-not-disturb', - 'mood' : 'Looks like Andrew Jackson\'s been tossed to the back of the bus.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a68009e20d0a9e9acf2a', 'name' : 'Barrera', 'avatar': 'assets/images/avatars/Barrera.jpg', 'status': 'do-not-disturb', - 'mood' : 'Love is going to bed early.Marriage is going to sleep early.', + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', 'unread': null }, { @@ -28,7 +28,7 @@ export class ChatFakeDb 'name' : 'Blair', 'avatar': 'assets/images/avatars/Blair.jpg', 'status': 'offline', - 'mood' : 'I would be unstoppable. If i could just get started.', + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', 'unread': 3 }, { @@ -36,112 +36,112 @@ export class ChatFakeDb 'name' : 'Boyle', 'avatar': 'assets/images/avatars/Boyle.jpg', 'status': 'offline', - 'mood' : '\'GOOD MORNING COFFEE\'....Meet your maker!!!!' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a68031fdbb1db2c1af47', 'name' : 'Christy', 'avatar': 'assets/images/avatars/Christy.jpg', 'status': 'offline', - 'mood' : 'We always hold hands. If I let go, she shops.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680bc670af746c435e2', 'name' : 'Copeland', 'avatar': 'assets/images/avatars/Copeland.jpg', 'status': 'online', - 'mood' : 'I get enough exercise just pushing my luck.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680e7eb988a58ddf303', 'name' : 'Estes', 'avatar': 'assets/images/avatars/Estes.jpg', 'status': 'away', - 'mood' : 'What comes after the man bun hairstyle? The he-hive!' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680dcb077889f758961', 'name' : 'Harper', 'avatar': 'assets/images/avatars/Harper.jpg', 'status': 'offline', - 'mood' : 'Always try to be modest and be proud of it!' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6806acf030f9341e925', 'name' : 'Helen', 'avatar': 'assets/images/avatars/Helen.jpg', 'status': 'away', - 'mood' : 'Why are there stitch marks on zombies? Who\'s giving them medical attention?' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680ae1ae9a3c960d487', 'name' : 'Henderson', 'avatar': 'assets/images/avatars/Henderson.jpg', 'status': 'offline', - 'mood' : 'I can\'t decide if people who wear pajamas in public have given up on life or are living it to the fullest.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680b8d240c011dd224b', 'name' : 'Josefina', 'avatar': 'assets/images/avatars/Josefina.jpg', 'status': 'online', - 'mood' : 'The fastest way to being happy is to make other people happy. You go first' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a68034cb3968e1f79eac', 'name' : 'Katina', 'avatar': 'assets/images/avatars/Katina.jpg', 'status': 'away', - 'mood' : 'If I was a rat,,, I wouldn\'t give anyone my ass.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6801146cce777df2a08', 'name' : 'Lily', 'avatar': 'assets/images/avatars/Lily.jpg', 'status': 'do-not-disturb', - 'mood' : 'A zip line but from the sofa to the fridge' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6808a178bfd034d6ecf', 'name' : 'Mai', 'avatar': 'assets/images/avatars/Mai.jpg', 'status': 'away', - 'mood' : 'If a girl tells you she has a nipple ring, the only correct response is \'I don\'t believe you.\'' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680653c265f5c79b5a9', 'name' : 'Nancy', 'avatar': 'assets/images/avatars/Nancy.jpg', 'status': 'do-not-disturb', - 'mood' : 'Prison counts as a gated community, right?' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680bbcec3cc32a8488a', 'name' : 'Nora', 'avatar': 'assets/images/avatars/Nora.jpg', 'status': 'do-not-disturb', - 'mood' : 'I never date left handed women. Righty tighty, lefty loosey.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6803d87f1b77e17b62b', 'name' : 'Odessa', 'avatar': 'assets/images/avatars/Odessa.jpg', 'status': 'away', - 'mood' : 'A day without sunshine is like, night.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680e87cb319bd9bd673', 'name' : 'Reyna', 'avatar': 'assets/images/avatars/Reyna.jpg', 'status': 'offline', - 'mood' : 'I can\'t wait for summer in Canada...' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6802d10e277a0f35775', 'name' : 'Shauna', 'avatar': 'assets/images/avatars/Shauna.jpg', 'status': 'online', - 'mood' : 'My take home pay doesn’t ven take me home.', + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', 'unread': null }, { @@ -149,7 +149,7 @@ export class ChatFakeDb 'name' : 'Shepard', 'avatar': 'assets/images/avatars/Shepard.jpg', 'status': 'online', - 'mood' : 'I don\'t speak Spanish, but I\'m pretty sure \'Dora\' means \'annoying\'' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a680cd7efa56a45aea5d', @@ -163,21 +163,21 @@ export class ChatFakeDb 'name' : 'Trevino', 'avatar': 'assets/images/avatars/Trevino.jpg', 'status': 'away', - 'mood' : 'Apparently, a rat and a plastic tube does not count as a DIY abortion kit.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a68018c663044be49cbf', 'name' : 'Tyson', 'avatar': 'assets/images/avatars/Tyson.jpg', 'status': 'do-not-disturb', - 'mood' : 'I\'m wondering why life keeps teaching me lessons I have no desire to learn...' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' }, { 'id' : '5725a6809413bf8a0a5272b1', 'name' : 'Velazquez', 'avatar': 'assets/images/avatars/Velazquez.jpg', 'status': 'online', - 'mood' : 'Modulation in all things.' + 'mood' : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' } ]; From 6108679f46d524d3b9dd7a0841494229bb0af1b6 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Mon, 5 Mar 2018 09:05:05 +0300 Subject: [PATCH 06/20] Fixed tabbed layouts issue on Firefox --- src/app/core/scss/partials/_page-layouts.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss index b1188038..d811517a 100644 --- a/src/app/core/scss/partials/_page-layouts.scss +++ b/src/app/core/scss/partials/_page-layouts.scss @@ -231,9 +231,11 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); > .mat-sidenav-content, > .mat-drawer-content { width: calc(100% - 240px); + min-width: 0; .center { width: calc(100% - 32px); + min-width: 0; @include media-breakpoint-down('md') { width: calc(100% - 64px); From 863fa5cc469a78c5cde7a584b66242f120b0a1a5 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Mon, 5 Mar 2018 12:16:59 +0300 Subject: [PATCH 07/20] Reverted tsconfig.json to its original --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 293548e0..422182f0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,11 +21,5 @@ "es2017", "dom" ] - }, - "angularCompilerOptions": { - "genDir": "release/", - "strictMetadataEmit": true, - "skipTemplateCodegen": true, - "annotationsAs": "decorators" } } From ab61faaba578acf1796ef922723ca39e13d74764 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Mon, 5 Mar 2018 12:17:32 +0300 Subject: [PATCH 08/20] Material module imports for the apps + Couple fixes --- .../theme-options/theme-options.component.ts | 1 - .../theme-options/theme-options.module.ts | 3 +- .../fuse-mat-sidenav.directive.ts | 2 -- .../fuse-perfect-scrollbar.directive.ts | 20 ++++++----- src/app/app.module.ts | 2 +- .../content/apps/academy/academy.module.ts | 18 +++++++--- src/app/main/content/apps/apps.module.ts | 10 +++--- .../content/apps/calendar/calendar.module.ts | 29 +++++++++++---- src/app/main/content/apps/chat/chat.module.ts | 24 ++++++++++--- .../content/apps/contacts/contacts.module.ts | 27 +++++++++++--- .../dashboards/analytics/analytics.module.ts | 32 +++++++++++------ .../apps/dashboards/project/project.module.ts | 30 +++++++++++----- .../apps/e-commerce/e-commerce.module.ts | 35 ++++++++++++++----- .../apps/file-manager/file-manager.module.ts | 19 +++++++--- .../content/apps/mail-ngrx/mail.module.ts | 26 ++++++++++++-- .../mail-list-item.component.html | 15 -------- src/app/main/content/apps/mail/mail.module.ts | 22 ++++++++++-- .../board/list/card/card.component.html | 2 +- .../apps/scrumboard/scrumboard.module.ts | 25 ++++++++++++- src/app/main/content/apps/todo/todo.module.ts | 19 +++++++++- src/app/main/navbar/navbar.component.scss | 5 ++- src/app/main/navbar/navbar.component.ts | 33 +++++++++++------ 22 files changed, 296 insertions(+), 103 deletions(-) diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts index 65688a89..5d864e1c 100644 --- a/src/@fuse/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -8,7 +8,6 @@ import { FuseNavigationService } from '@fuse/components/navigation/navigation.se import { navigation } from 'app/navigation/navigation'; - @Component({ selector : 'fuse-theme-options', templateUrl: './theme-options.component.html', diff --git a/src/@fuse/components/theme-options/theme-options.module.ts b/src/@fuse/components/theme-options/theme-options.module.ts index 0d79a402..5aa58c8d 100644 --- a/src/@fuse/components/theme-options/theme-options.module.ts +++ b/src/@fuse/components/theme-options/theme-options.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { MatDividerModule, MatFormFieldModule, MatIconModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule } from '@angular/material'; +import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule } from '@angular/material'; import { FuseMaterialColorPickerModule } from '@fuse/components/material-color-picker/material-color-picker.module'; import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; @@ -17,6 +17,7 @@ import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme- FlexLayoutModule, + MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, diff --git a/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts index c6a0ad4d..df58a483 100644 --- a/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts +++ b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts @@ -12,9 +12,7 @@ import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/f export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy { matchMediaSubscription: Subscription; - @HostBinding('class.mat-is-locked-open') isLockedOpen = true; - @Input('fuseMatSidenavHelper') id: string; @Input('mat-is-locked-open') matIsLockedOpenBreakpoint: string; diff --git a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts index 434c6b7f..3fd4be24 100644 --- a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts +++ b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy } from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy, OnInit } from '@angular/core'; import { Platform } from '@angular/cdk/platform'; import { Subscription } from 'rxjs/Subscription'; @@ -6,11 +6,10 @@ import PerfectScrollbar from 'perfect-scrollbar'; import { FuseConfigService } from '@fuse/services/config.service'; - @Directive({ selector: '[fusePerfectScrollbar]' }) -export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy +export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnDestroy { onConfigChanged: Subscription; isDisableCustomScrollbars = false; @@ -23,14 +22,17 @@ export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy private fuseConfig: FuseConfigService, private platform: Platform ) + { + } + + ngOnInit() { this.onConfigChanged = - this.fuseConfig.onConfigChanged - .subscribe( - (settings) => { - this.isDisableCustomScrollbars = !settings.customScrollbars; - } - ); + this.fuseConfig.onConfigChanged.subscribe( + (settings) => { + this.isDisableCustomScrollbars = !settings.customScrollbars; + } + ); if ( this.platform.ANDROID || this.platform.IOS ) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 159c4403..92291436 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -66,7 +66,7 @@ const appRoutes: Routes = [ }), // SharedModule, - MaterialModule, + // MaterialModule, // Fuse Main and Shared modules FuseModule.forRoot(fuseConfig), diff --git a/src/app/main/content/apps/academy/academy.module.ts b/src/app/main/content/apps/academy/academy.module.ts index f1110d21..e1935402 100644 --- a/src/app/main/content/apps/academy/academy.module.ts +++ b/src/app/main/content/apps/academy/academy.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatSelectModule, MatSidenavModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseAcademyCoursesComponent } from './courses/courses.component'; @@ -30,14 +32,22 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseAcademyCoursesComponent, FuseAcademyCourseComponent ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatSelectModule, + MatSidenavModule, + + FuseSharedModule + ], providers : [ AcademyCoursesService, AcademyCourseService diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts index 7764c050..63671052 100644 --- a/src/app/main/content/apps/apps.module.ts +++ b/src/app/main/content/apps/apps.module.ts @@ -7,13 +7,13 @@ import { FuseSharedModule } from '@fuse/shared.module'; const routes = [ { - path : 'dashboards/project', - loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule' - }, - /*{ path : 'dashboards/analytics', loadChildren: './dashboards/analytics/analytics.module#FuseAnalyticsDashboardModule' }, + { + path : 'dashboards/project', + loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule' + }, { path : 'mail', loadChildren: './mail/mail.module#FuseMailModule' @@ -53,7 +53,7 @@ const routes = [ { path : 'scrumboard', loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule' - }*/ + } ]; @NgModule({ diff --git a/src/app/main/content/apps/calendar/calendar.module.ts b/src/app/main/content/apps/calendar/calendar.module.ts index 244fc50a..769f78d5 100644 --- a/src/app/main/content/apps/calendar/calendar.module.ts +++ b/src/app/main/content/apps/calendar/calendar.module.ts @@ -1,10 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatDatepickerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatSlideToggleModule, MatToolbarModule } from '@angular/material'; + +import { CalendarModule } from 'angular-calendar'; +import { ColorPickerModule } from 'ngx-color-picker'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseConfirmDialogModule } from '@fuse/components'; import { CalendarService } from './calendar.service'; -import { CalendarModule } from 'angular-calendar'; import { FuseCalendarComponent } from './calendar.component'; import { FuseCalendarEventFormDialogComponent } from './event-form/event-form.component'; @@ -20,15 +25,27 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - CalendarModule.forRoot() - ], declarations : [ FuseCalendarComponent, FuseCalendarEventFormDialogComponent ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatDatepickerModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatSlideToggleModule, + MatToolbarModule, + + CalendarModule.forRoot(), + ColorPickerModule, + + FuseSharedModule, + FuseConfirmDialogModule + ], providers : [ CalendarService ], diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts index cd4a714c..2b80c69b 100644 --- a/src/app/main/content/apps/chat/chat.module.ts +++ b/src/app/main/content/apps/chat/chat.module.ts @@ -1,10 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatCardModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatRadioModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseChatComponent } from './chat.component'; import { ChatService } from './chat.service'; +import { FuseChatComponent } from './chat.component'; import { FuseChatViewComponent } from './chat-view/chat-view.component'; import { FuseChatStartComponent } from './chat-start/chat-start.component'; import { FuseChatChatsSidenavComponent } from './sidenavs/left/chats/chats.component'; @@ -25,10 +27,6 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseChatComponent, FuseChatViewComponent, @@ -39,6 +37,22 @@ const routes: Routes = [ FuseChatRightSidenavComponent, FuseChatContactSidenavComponent ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatCardModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatRadioModule, + MatSidenavModule, + MatToolbarModule, + + FuseSharedModule + ], providers : [ ChatService ] diff --git a/src/app/main/content/apps/contacts/contacts.module.ts b/src/app/main/content/apps/contacts/contacts.module.ts index 45a02229..fd3a1a5a 100644 --- a/src/app/main/content/apps/contacts/contacts.module.ts +++ b/src/app/main/content/apps/contacts/contacts.module.ts @@ -1,7 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatRippleModule, MatSidenavModule, MatTableModule, MatToolbarModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseConfirmDialogModule } from '@fuse/components'; import { FuseContactsMainSidenavComponent } from './sidenavs/main/main.component'; import { FuseContactsComponent } from './contacts.component'; @@ -21,10 +25,6 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations : [ FuseContactsComponent, FuseContactsContactListComponent, @@ -32,6 +32,25 @@ const routes: Routes = [ FuseContactsMainSidenavComponent, FuseContactsContactFormDialogComponent ], + imports : [ + RouterModule.forChild(routes), + CdkTableModule, + + MatButtonModule, + MatCheckboxModule, + MatDatepickerModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatRippleModule, + MatSidenavModule, + MatTableModule, + MatToolbarModule, + + FuseSharedModule, + FuseConfirmDialogModule + ], providers : [ ContactsService ], diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts index 6a5eebf6..819966d1 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts @@ -1,8 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { MatFormFieldModule, MatIconModule, MatMenuModule, MatSelectModule, MatTabsModule } from '@angular/material'; + import { AgmCoreModule } from '@agm/core'; +import { ChartsModule } from 'ng2-charts'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; @@ -22,18 +25,27 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseWidgetModule, - NgxChartsModule, - AgmCoreModule.forRoot({ - apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' - }) - ], declarations: [ FuseAnalyticsDashboardComponent ], + imports : [ + RouterModule.forChild(routes), + + MatFormFieldModule, + MatIconModule, + MatMenuModule, + MatSelectModule, + MatTabsModule, + + AgmCoreModule.forRoot({ + apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' + }), + ChartsModule, + NgxChartsModule, + + FuseSharedModule, + FuseWidgetModule + ], providers : [ AnalyticsDashboardService ] 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 b806b353..23dcf8d9 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatMenuModule, MatSelectModule, MatSidenavModule, MatTableModule, MatTabsModule } from '@angular/material'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -8,7 +11,6 @@ import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseProjectDashboardComponent } from './project.component'; import { ProjectDashboardService } from './project.service'; -import { MaterialModule } from '@fuse/modules/material.module'; const routes: Routes = [ { @@ -21,16 +23,28 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - RouterModule.forChild(routes), - FuseSharedModule, - MaterialModule, - FuseWidgetModule, - NgxChartsModule - ], declarations: [ FuseProjectDashboardComponent ], + imports : [ + RouterModule.forChild(routes), + + CdkTableModule, + MatButtonModule, + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatMenuModule, + MatSelectModule, + MatSidenavModule, + MatTableModule, + MatTabsModule, + + NgxChartsModule, + + FuseSharedModule, + FuseWidgetModule + ], providers : [ ProjectDashboardService ] diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/content/apps/e-commerce/e-commerce.module.ts index 8052f814..665fba62 100644 --- a/src/app/main/content/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/content/apps/e-commerce/e-commerce.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatChipsModule, MatFormFieldModule, MatIconModule, MatInputModule, MatPaginatorModule, MatSelectModule, MatSortModule, MatTableModule, MatTabsModule } from '@angular/material'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; @@ -64,15 +67,6 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseWidgetModule, - NgxChartsModule, - AgmCoreModule.forRoot({ - apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' - }) - ], declarations: [ FuseEcommerceDashboardComponent, FuseEcommerceProductsComponent, @@ -80,6 +74,29 @@ const routes: Routes = [ FuseEcommerceOrdersComponent, FuseEcommerceOrderComponent ], + imports : [ + RouterModule.forChild(routes), + + CdkTableModule, + MatButtonModule, + MatChipsModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatPaginatorModule, + MatSelectModule, + MatSortModule, + MatTableModule, + MatTabsModule, + + NgxChartsModule, + AgmCoreModule.forRoot({ + apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' + }), + + FuseSharedModule, + FuseWidgetModule, + ], providers : [ EcommerceDashboardService, EcommerceProductsService, diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts index 5273f344..738e82fd 100644 --- a/src/app/main/content/apps/file-manager/file-manager.module.ts +++ b/src/app/main/content/apps/file-manager/file-manager.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatIconModule, MatSidenavModule, MatSlideToggleModule, MatTableModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -21,16 +24,24 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseFileManagerComponent, FuseFileManagerFileListComponent, FuseFileManagerMainSidenavComponent, FuseFileManagerDetailsSidenavComponent ], + imports : [ + RouterModule.forChild(routes), + + CdkTableModule, + MatButtonModule, + MatIconModule, + MatSlideToggleModule, + MatSidenavModule, + MatTableModule, + + FuseSharedModule + ], providers : [ FileManagerService ] diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/content/apps/mail-ngrx/mail.module.ts index 33f79a0a..3f79d5f6 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.module.ts @@ -1,8 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; + +import { TranslateModule } from '@ngx-translate/core'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { MailAppStoreModule } from './store/store.module'; +import * as fromGuards from './store/guards/index'; + import { FuseMailNgrxComponent } from './mail.component'; import { FuseMailNgrxMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; import { FuseMailNgrxListItemComponent } from './mail-list/mail-list-item/mail-list-item.component'; @@ -10,8 +17,6 @@ import { FuseMailNgrxListComponent } from './mail-list/mail-list.component'; import { FuseMailNgrxDetailsComponent } from './mail-details/mail-details.component'; import { MailNgrxService } from './mail.service'; import { FuseMailNgrxComposeDialogComponent } from './dialogs/compose/compose.component'; -import * as fromGuards from './store/guards/index'; -import { MailAppStoreModule } from './store/store.module'; const routes: Routes = [ { @@ -60,8 +65,23 @@ const routes: Routes = [ FuseMailNgrxComposeDialogComponent ], imports : [ - FuseSharedModule, RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatDialogModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatSelectModule, + MatSidenavModule, + MatToolbarModule, + + TranslateModule, + + FuseSharedModule, + MailAppStoreModule ], providers : [ diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html index 2ed29aab..5d8e3c14 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html +++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html @@ -18,21 +18,6 @@
{{mail.time}}
- - diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts index e8a506ee..6ba68da1 100644 --- a/src/app/main/content/apps/mail/mail.module.ts +++ b/src/app/main/content/apps/mail/mail.module.ts @@ -1,6 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; + +import { TranslateModule } from '@ngx-translate/core'; + import { FuseSharedModule } from '@fuse/shared.module'; import { MailService } from './mail.service'; @@ -70,8 +74,22 @@ const routes: Routes = [ FuseMailComposeDialogComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatDialogModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatSelectModule, + MatSidenavModule, + MatToolbarModule, + + TranslateModule, + + FuseSharedModule ], providers : [ MailService diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html index a852891d..b743a474 100644 --- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html +++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html @@ -17,7 +17,7 @@
+ fxLayout="row" fxLayoutWrap> { + this.fusePerfectScrollbarUpdateTimeout = setTimeout(() => { + this.fusePerfectScrollbar.update(); + }, 310); + }); + } + @Input() layout; navigation: any; navigationServiceWatcher: Subscription; @@ -31,19 +44,19 @@ export class FuseNavbarComponent implements OnDestroy // Default layout this.layout = 'vertical'; - - this.navigationServiceWatcher = - this.navigationService.onItemCollapseToggled.subscribe(() => { - this.fusePerfectScrollbarUpdateTimeout = setTimeout(() => { - this.fusePerfectScrollbarDirective.update(); - }, 310); - }); } ngOnDestroy() { - clearTimeout(this.fusePerfectScrollbarUpdateTimeout); - this.navigationServiceWatcher.unsubscribe(); + if ( this.fusePerfectScrollbarUpdateTimeout ) + { + clearTimeout(this.fusePerfectScrollbarUpdateTimeout); + } + + if ( this.navigationServiceWatcher ) + { + this.navigationServiceWatcher.unsubscribe(); + } } toggleSidebarOpened(key) From 7b474e54f0f7fe3a2007c7ffa3099031f192c118 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Mon, 5 Mar 2018 12:43:03 +0300 Subject: [PATCH 09/20] Added missing 'MatRippleModule' import --- src/app/main/content/apps/calendar/calendar.component.html | 3 --- src/app/main/content/apps/e-commerce/e-commerce.module.ts | 3 ++- src/app/main/content/apps/file-manager/file-manager.module.ts | 3 ++- src/app/main/content/apps/mail-ngrx/mail.module.ts | 3 ++- src/app/main/content/apps/mail/mail.module.ts | 3 ++- src/app/main/content/apps/scrumboard/scrumboard.module.ts | 3 ++- src/app/main/content/apps/todo/todo.module.ts | 3 ++- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html index ae61d8de..459c902d 100644 --- a/src/app/main/content/apps/calendar/calendar.component.html +++ b/src/app/main/content/apps/calendar/calendar.component.html @@ -8,11 +8,8 @@
diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/content/apps/e-commerce/e-commerce.module.ts index 665fba62..f6a09c35 100644 --- a/src/app/main/content/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/content/apps/e-commerce/e-commerce.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { CdkTableModule } from '@angular/cdk/table'; -import { MatButtonModule, MatChipsModule, MatFormFieldModule, MatIconModule, MatInputModule, MatPaginatorModule, MatSelectModule, MatSortModule, MatTableModule, MatTabsModule } from '@angular/material'; +import { MatButtonModule, MatChipsModule, MatFormFieldModule, MatIconModule, MatInputModule, MatPaginatorModule, MatRippleModule, MatSelectModule, MatSortModule, MatTableModule, MatTabsModule } from '@angular/material'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; @@ -84,6 +84,7 @@ const routes: Routes = [ MatIconModule, MatInputModule, MatPaginatorModule, + MatRippleModule, MatSelectModule, MatSortModule, MatTableModule, diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts index 738e82fd..ed33ee01 100644 --- a/src/app/main/content/apps/file-manager/file-manager.module.ts +++ b/src/app/main/content/apps/file-manager/file-manager.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { CdkTableModule } from '@angular/cdk/table'; -import { MatButtonModule, MatIconModule, MatSidenavModule, MatSlideToggleModule, MatTableModule } from '@angular/material'; +import { MatButtonModule, MatIconModule, MatRippleModule, MatSidenavModule, MatSlideToggleModule, MatTableModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -36,6 +36,7 @@ const routes: Routes = [ CdkTableModule, MatButtonModule, MatIconModule, + MatRippleModule, MatSlideToggleModule, MatSidenavModule, MatTableModule, diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/content/apps/mail-ngrx/mail.module.ts index 3f79d5f6..63456592 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; +import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatRippleModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; import { TranslateModule } from '@ngx-translate/core'; @@ -74,6 +74,7 @@ const routes: Routes = [ MatIconModule, MatInputModule, MatMenuModule, + MatRippleModule, MatSelectModule, MatSidenavModule, MatToolbarModule, diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts index 6ba68da1..a9b177f9 100644 --- a/src/app/main/content/apps/mail/mail.module.ts +++ b/src/app/main/content/apps/mail/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; +import { MatButtonModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatRippleModule, MatSelectModule, MatSidenavModule, MatToolbarModule } from '@angular/material'; import { TranslateModule } from '@ngx-translate/core'; @@ -83,6 +83,7 @@ const routes: Routes = [ MatIconModule, MatInputModule, MatMenuModule, + MatRippleModule, MatSelectModule, MatSidenavModule, MatToolbarModule, diff --git a/src/app/main/content/apps/scrumboard/scrumboard.module.ts b/src/app/main/content/apps/scrumboard/scrumboard.module.ts index bb9700c0..05d2fa2b 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.module.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MatButtonModule, MatCheckboxModule, MatChipsModule, MatDatepickerModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatProgressBarModule, MatSidenavModule, MatToolbarModule, MatTooltipModule } from '@angular/material'; +import { MatButtonModule, MatCheckboxModule, MatChipsModule, MatDatepickerModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatProgressBarModule, MatRippleModule, MatSidenavModule, MatToolbarModule, MatTooltipModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -71,6 +71,7 @@ const routes: Routes = [ MatListModule, MatMenuModule, MatProgressBarModule, + MatRippleModule, MatSidenavModule, MatToolbarModule, MatTooltipModule, diff --git a/src/app/main/content/apps/todo/todo.module.ts b/src/app/main/content/apps/todo/todo.module.ts index a81af38a..22d91ace 100644 --- a/src/app/main/content/apps/todo/todo.module.ts +++ b/src/app/main/content/apps/todo/todo.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatSelectModule, MatSidenavModule } from '@angular/material'; +import { MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatMenuModule, MatRippleModule, MatSelectModule, MatSidenavModule } from '@angular/material'; import { NgxDnDModule } from '@swimlane/ngx-dnd'; @@ -81,6 +81,7 @@ const routes: Routes = [ MatIconModule, MatInputModule, MatMenuModule, + MatRippleModule, MatSelectModule, MatSidenavModule, From 82ca0329e905eeabf47a43926012d5ef36bd0d76 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 6 Mar 2018 10:38:30 +0300 Subject: [PATCH 10/20] Material module imports for the pages and rest of the Fuse + Couple tweaks & fixes --- .../nav-group/nav-vertical-group.component.ts | 8 +- .../nav-item/nav-vertical-item.component.ts | 8 +- .../widget/widget-toggle.directive.ts | 14 +-- src/@fuse/modules/material.module.ts | 112 ------------------ src/app/fuse-config.ts | 8 +- .../components-third-party.module.ts | 27 +++-- .../datatable/ngx-datatable.component.html | 9 +- .../datatable/ngx-datatable.component.ts | 1 - .../google-maps/google-maps.module.ts | 26 ++-- .../angular-material.module.ts | 25 ++-- .../content/components/components.module.ts | 34 ++++-- src/app/main/content/content.component.ts | 9 +- src/app/main/content/content.module.ts | 1 + .../forgot-password-2.module.ts | 9 +- .../forgot-password/forgot-password.module.ts | 9 +- .../pages/authentication/lock/lock.module.ts | 12 +- .../authentication/login-2/login-2.module.ts | 12 +- .../authentication/login/login.module.ts | 12 +- .../mail-confirm/mail-confirm.module.ts | 9 +- .../register-2/register-2.module.ts | 12 +- .../register/register.module.ts | 12 +- .../reset-password-2.module.ts | 11 +- .../reset-password/reset-password.module.ts | 11 +- .../pages/coming-soon/coming-soon.module.ts | 11 +- .../pages/errors/404/error-404.module.ts | 9 +- .../pages/errors/500/error-500.module.ts | 5 +- src/app/main/content/pages/faq/faq.module.ts | 10 +- .../pages/invoices/compact/compact.module.ts | 5 +- .../pages/invoices/modern/modern.module.ts | 5 +- .../dialogs/article/article.component.html | 5 +- .../knowledge-base/knowledge-base.module.ts | 13 +- .../pages/maintenance/maintenence.module.ts | 5 +- .../content/pages/pricing/pricing.module.ts | 10 +- .../content/pages/profile/profile.module.ts | 12 +- .../tabs/timeline/timeline.component.html | 1 + .../content/pages/search/search.module.ts | 16 ++- .../main/content/services/services.module.ts | 17 ++- .../main/content/ui/colors/colors.module.ts | 17 ++- src/app/main/content/ui/forms/forms.module.ts | 18 ++- .../helper-classes/helper-classes.module.ts | 18 ++- src/app/main/content/ui/icons/icons.module.ts | 17 ++- .../ui/page-layouts/page-layouts.module.ts | 18 ++- .../ui/typography/typography.module.ts | 16 ++- 43 files changed, 359 insertions(+), 260 deletions(-) delete mode 100644 src/@fuse/modules/material.module.ts diff --git a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts index 0d5e681f..56151d6f 100644 --- a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts @@ -1,11 +1,11 @@ -import { Component, HostBinding, Input, OnInit } from '@angular/core'; +import { Component, HostBinding, Input } from '@angular/core'; @Component({ selector : 'fuse-nav-vertical-group', templateUrl: './nav-vertical-group.component.html', styleUrls : ['./nav-vertical-group.component.scss'] }) -export class FuseNavVerticalGroupComponent implements OnInit +export class FuseNavVerticalGroupComponent { @HostBinding('class') classes = 'nav-group nav-item'; @Input() item: any; @@ -14,8 +14,4 @@ export class FuseNavVerticalGroupComponent implements OnInit { } - ngOnInit() - { - } - } diff --git a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts index 74e68198..071ed1ee 100644 --- a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts @@ -1,11 +1,11 @@ -import { Component, HostBinding, Input, OnInit } from '@angular/core'; +import { Component, HostBinding, Input } from '@angular/core'; @Component({ selector : 'fuse-nav-vertical-item', templateUrl: './nav-vertical-item.component.html', styleUrls : ['./nav-vertical-item.component.scss'] }) -export class FuseNavVerticalItemComponent implements OnInit +export class FuseNavVerticalItemComponent { @HostBinding('class') classes = 'nav-item'; @Input() item: any; @@ -13,8 +13,4 @@ export class FuseNavVerticalItemComponent implements OnInit constructor() { } - - ngOnInit() - { - } } diff --git a/src/@fuse/components/widget/widget-toggle.directive.ts b/src/@fuse/components/widget/widget-toggle.directive.ts index f777c588..0c278925 100644 --- a/src/@fuse/components/widget/widget-toggle.directive.ts +++ b/src/@fuse/components/widget/widget-toggle.directive.ts @@ -1,21 +1,11 @@ -import { AfterViewInit, Directive, ElementRef, OnInit } from '@angular/core'; +import { Directive, ElementRef } from '@angular/core'; @Directive({ selector: '[fuseWidgetToggle]' }) -export class FuseWidgetToggleDirective implements OnInit, AfterViewInit +export class FuseWidgetToggleDirective { - constructor(public el: ElementRef) { } - - ngOnInit() - { - } - - ngAfterViewInit() - { - } - } diff --git a/src/@fuse/modules/material.module.ts b/src/@fuse/modules/material.module.ts deleted file mode 100644 index 36d357c6..00000000 --- a/src/@fuse/modules/material.module.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { NgModule } from '@angular/core'; -import { - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCheckboxModule, - MatToolbarModule, - MatTooltipModule, - MatCardModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatFormFieldModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatStepperModule -} from '@angular/material'; -import { CdkTableModule } from '@angular/cdk/table'; - -@NgModule({ - imports: [ - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatFormFieldModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatStepperModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatToolbarModule, - MatTooltipModule, - CdkTableModule - ], - exports: [ - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatStepperModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatToolbarModule, - MatTooltipModule, - CdkTableModule - ] -}) -export class MaterialModule -{ - -} diff --git a/src/app/fuse-config.ts b/src/app/fuse-config.ts index 2da07496..0cdd3de8 100644 --- a/src/app/fuse-config.ts +++ b/src/app/fuse-config.ts @@ -1,4 +1,10 @@ -// Default Fuse config +/** + * Default Fuse Configuration + * + * You can edit these options to change the default options. All these options also can be changed per component + * basis. See `app/main/content/pages/authentication/login/login.component.ts` constructor method to learn more + * about changing these options per component basis. + */ export const fuseConfig = { layout : { navigation : 'left', // 'right', 'left', 'top', 'none' 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 23d856a3..afd4ef64 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 @@ -1,11 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatIconModule } from '@angular/material'; + +import { NgxDatatableModule } from '@swimlane/ngx-datatable'; + import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; import { GoogleMapsModule } from './google-maps/google-maps.module'; +import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; + const routes = [ { path : 'datatables/ngx-datatable', @@ -14,14 +19,22 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - GoogleMapsModule - ], declarations: [ FuseNgxDatatableComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatIconModule, + + NgxDatatableModule, + + FuseSharedModule, + + GoogleMapsModule + ], }) export class FuseComponentsThirdPartyModule { diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html index b02758bd..645c07ff 100644 --- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html +++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html @@ -57,14 +57,11 @@ - - + - - + - - +
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts index af5f59ca..003dbc7f 100644 --- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts +++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts @@ -14,7 +14,6 @@ export class FuseNgxDatatableComponent implements OnInit constructor(private http: HttpClient) { - } ngOnInit() 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 e711802e..92a7b60b 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 @@ -1,8 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; + +import { MatButtonModule, MatIconModule } from '@angular/material'; + import { AgmCoreModule } from '@agm/core'; import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseGoogleMapsDocsComponent } from './google-maps.component'; @@ -14,16 +18,22 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - AgmCoreModule.forRoot({ - apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' - }) - ], declarations: [ FuseGoogleMapsDocsComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + + AgmCoreModule.forRoot({ + apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' + }), + + FuseSharedModule, + FuseHighlightModule + ], }) export class GoogleMapsModule { 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 8e28ad98..da8cee00 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 @@ -1,14 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MaterialModule } from 'app/main/content/components/angular-material/material.module'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { EXAMPLE_LIST } from './example-components'; import { FuseExampleViewerComponent } from './example-viewer/example-viewer'; import { FuseAngularMaterialComponent } from './angular-material.component'; -import { MaterialModule } from 'app/main/content/components/angular-material/material.module'; -import { FuseHighlightModule } from '@fuse/components'; const routes: Routes = [ { @@ -23,19 +24,21 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - RouterModule.forChild(routes), - MaterialModule, - FuseSharedModule, - FuseWidgetModule, - FuseHighlightModule - ], - entryComponents: EXAMPLE_LIST, declarations : [ [...EXAMPLE_LIST], FuseAngularMaterialComponent, FuseExampleViewerComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MaterialModule, + + FuseSharedModule, + FuseHighlightModule, + FuseWidgetModule + ], + entryComponents: EXAMPLE_LIST, }) export class FuseAngularMaterialModule { diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index 82bdd260..d2fd419f 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; + +import { MatButtonModule, MatButtonToggleModule, MatFormFieldModule, MatIconModule, MatListModule, MatMenuModule, MatSelectModule, MatSliderModule, MatSlideToggleModule, MatTabsModule } from '@angular/material'; + import { NgxChartsModule } from '@swimlane/ngx-charts'; import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; +import { FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, FuseWidgetModule } from '@fuse/components'; import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; import { FuseCardsDocsComponent } from './cards/cards.component'; @@ -56,13 +59,6 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseWidgetModule, - FuseAngularMaterialModule, - NgxChartsModule - ], declarations: [ FuseCardsDocsComponent, FuseCountdownDocsComponent, @@ -73,6 +69,28 @@ const routes = [ FuseSearchBarDocsComponent, FuseShortcutsDocsComponent, FuseWidgetDocsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatButtonToggleModule, + MatFormFieldModule, + MatIconModule, + MatListModule, + MatMenuModule, + MatSelectModule, + MatSlideToggleModule, + MatTabsModule, + + NgxChartsModule, + + FuseSharedModule, + FuseCountdownModule, + FuseHighlightModule, + FuseMaterialColorPickerModule, + FuseWidgetModule, + FuseAngularMaterialModule ] }) export class FuseComponentsModule diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts index 0e750d92..7cfca410 100644 --- a/src/app/main/content/content.component.ts +++ b/src/app/main/content/content.component.ts @@ -1,4 +1,4 @@ -import { Component, HostBinding, OnInit, OnDestroy } from '@angular/core'; +import { Component, HostBinding, OnDestroy } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; @@ -14,7 +14,7 @@ import { FuseConfigService } from '@fuse/services/config.service'; styleUrls : ['./content.component.scss'], animations : fuseAnimations }) -export class FuseContentComponent implements OnInit, OnDestroy +export class FuseContentComponent implements OnDestroy { onConfigChanged: Subscription; fuseSettings: any; @@ -64,11 +64,6 @@ export class FuseContentComponent implements OnInit, OnDestroy ); } - ngOnInit() - { - - } - ngOnDestroy() { this.onConfigChanged.unsubscribe(); diff --git a/src/app/main/content/content.module.ts b/src/app/main/content/content.module.ts index f471e0ca..bbccf91f 100644 --- a/src/app/main/content/content.module.ts +++ b/src/app/main/content/content.module.ts @@ -11,6 +11,7 @@ import { FuseContentComponent } from 'app/main/content/content.component'; ], imports : [ RouterModule, + FuseSharedModule, ], exports: [ 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 f04f0d94..8192d5d0 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPassword2Component } from './forgot-password-2.component'; @@ -17,8 +19,13 @@ const routes = [ FuseForgotPassword2Component ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) ] }) export class ForgotPassword2Module 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 b701cee0..719e4496 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPasswordComponent } from './forgot-password.component'; @@ -17,8 +19,13 @@ const routes = [ FuseForgotPasswordComponent ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) ] }) export class ForgotPasswordModule 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 5e796850..0488d20b 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLockComponent } from './lock.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLockComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + + FuseSharedModule ] }) export class LockModule 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 1e988755..9f7f932d 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLogin2Component } from './login-2.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLogin2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class Login2Module 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 2fcf6ecb..e5ea2e03 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLoginComponent } from './login.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLoginComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class LoginModule 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 9916a0d9..1c56c4a9 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailConfirmComponent } from './mail-confirm.component'; @@ -17,8 +19,11 @@ const routes = [ FuseMailConfirmComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule ] }) export class MailConfirmModule 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 6beb5b24..68458fb5 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegister2Component } from './register-2.component'; @@ -17,8 +19,14 @@ const routes = [ FuseRegister2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class Register2Module 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 e330153e..f2c80a88 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegisterComponent } from './register.component'; @@ -17,8 +19,14 @@ const routes = [ FuseRegisterComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class RegisterModule 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 cce11b14..ef10b6f8 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPassword2Component } from './reset-password-2.component'; @@ -17,8 +19,13 @@ const routes = [ FuseResetPassword2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class ResetPassword2Module 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 60ea7781..21f8e358 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPasswordComponent } from './reset-password.component'; @@ -17,8 +19,13 @@ const routes = [ FuseResetPasswordComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class ResetPasswordModule 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 0f9b1a0f..57350e51 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 @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseCountdownModule } from '@fuse/components'; import { FuseComingSoonComponent } from './coming-soon.component'; @@ -17,8 +20,14 @@ const routes = [ FuseComingSoonComponent ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) + FuseCountdownModule ] }) export class ComingSoonModule 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 77da500d..620a628a 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError404Component } from './error-404.component'; @@ -17,8 +19,11 @@ const routes = [ FuseError404Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule ] }) export class Error404Module 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 909ce8da..6e4ada57 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 @@ -17,8 +17,9 @@ const routes = [ FuseError500Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ] }) export class Error500Module diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index 70268e65..37980eb9 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatExpansionModule, MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FaqService } from './faq.service'; @@ -21,8 +23,12 @@ const routes = [ FuseFaqComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatExpansionModule, + MatIconModule, + + FuseSharedModule ], providers : [ 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 02c575ae..fa37fa95 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -21,8 +21,9 @@ const routes = [ FuseInvoiceCompactComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ], providers : [ 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 f86c6abc..45f89281 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -21,8 +21,9 @@ const routes = [ FuseInvoiceModernComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ], providers : [ InvoiceService diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html index ea2f2006..10717189 100644 --- a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html +++ b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html @@ -11,10 +11,7 @@
-
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 0fed4168..f6659c74 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDialogModule, MatIconModule, MatListModule, MatToolbarModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { KnowledgeBaseService } from './knowledge-base.service'; @@ -23,8 +25,15 @@ const routes = [ FuseKnowledgeBaseArticleComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDialogModule, + MatIconModule, + MatListModule, + MatToolbarModule, + + FuseSharedModule ], providers : [ KnowledgeBaseService diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index b0bf2d05..c47b4b34 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -17,8 +17,9 @@ const routes = [ FuseMaintenanceComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ] }) export class MaintenanceModule diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index 0ccd5239..d0c2b8bc 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDividerModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FusePricingStyle1Component } from './style-1/style-1.component'; @@ -29,8 +31,12 @@ const routes = [ FusePricingStyle3Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDividerModule, + + FuseSharedModule ] }) export class PricingModule diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index 6a90bc0e..39bd5122 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDividerModule, MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { ProfileService } from './profile.service'; @@ -27,8 +29,14 @@ const routes = [ FuseProfilePhotosVideosComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDividerModule, + MatIconModule, + MatTabsModule, + + FuseSharedModule ], providers : [ ProfileService diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html index 2c3b3863..1074f914 100644 --- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html +++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html @@ -27,6 +27,7 @@ + diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 52c6fb29..97eff0fe 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatTableModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -25,8 +28,17 @@ const routes = [ FuseSearchTableComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + CdkTableModule, + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatTableModule, + MatTabsModule, + + FuseSharedModule ], providers : [ SearchService diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index 7d27ed4c..6c44c3b3 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseConfigServiceDocsComponent } from './config/config.component'; import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-screen.component'; @@ -18,14 +21,18 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseConfigServiceDocsComponent, FuseSplashScreenServiceDocsComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule, + FuseHighlightModule + ], }) 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 f3023d8d..2c8a6379 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; @@ -14,13 +16,18 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseDemoModule - ], declarations: [ FuseColorsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseDemoModule ] }) export class UIColorsModule diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index 5dd4855d..c9fc1d6e 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatSelectModule, MatStepperModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFormsComponent } from './forms.component'; @@ -13,12 +15,20 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseFormsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatSelectModule, + MatStepperModule, + + FuseSharedModule, ] }) export class UIFormsModule 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 d1a1e095..31ee6c1f 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 @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseHelperClassesComponent } from './helper-classes.component'; import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; @@ -15,15 +18,20 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseHelperClassesComponent, FuseHelperClassesPaddingMarginComponent, FuseHelperClassesWidthHeightComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseHighlightModule, + ], }) export class UIHelperClassesModule { diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index afc8dcd5..8e14e039 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatProgressSpinnerModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseIconsComponent } from './icons.component'; @@ -13,12 +15,19 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseIconsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatProgressSpinnerModule, + + FuseSharedModule ] }) export class UIIconsModule 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 28622935..f300822f 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 @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatSidenavModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; @@ -104,11 +106,6 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseDemoModule - ], declarations: [ FuseCardedFullWidthComponent, FuseCardedFullWidth2Component, @@ -129,6 +126,17 @@ const routes: Routes = [ FuseSimpleRightSidenav3Component, FuseTabbedComponent, FuseBlankComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + MatSidenavModule, + MatTabsModule, + + FuseSharedModule, + FuseDemoModule ] }) export class UIPageLayoutsModule diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index 790b019b..bf4e2321 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseTypographyComponent } from './typography.component'; import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; @@ -17,16 +20,21 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseTypographyComponent, FuseTypographyHeadingsComponent, FuseTypographyInlineTextElementsComponent, FuseTypographyBlockquotesListsComponent, FuseTypographyHelpersComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseHighlightModule ] }) export class UITypographyModule From 583e74d99f187a1b44de0b62e9aae5fa75d9fe98 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 6 Mar 2018 11:23:20 +0300 Subject: [PATCH 11/20] Updated Angular, Angular Material, Flex Layout and various other packages --- package-lock.json | 1324 +++++++++++++++++++++++++++------------------ package.json | 48 +- 2 files changed, 831 insertions(+), 541 deletions(-) diff --git a/package-lock.json b/package-lock.json index 267c2013..21a807f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "5.2.5", + "version": "5.2.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,9 +10,9 @@ "integrity": "sha512-3bdfvkWDmJszpj/F6Fzgv7sks0cs/cUEQPfs37tcJFz3jc62SsXy4TGb/WJT8FpH2nSGE6DonP8lXuFxB0lblQ==" }, "@angular-devkit/build-optimizer": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.3.1.tgz", - "integrity": "sha512-yCjN+iLyF0GXzmYfVnq/YwAlUmIcVEV4XS3zqz1hXJuNMQcrYm4Zxamr6ICfOGcayd9vdaRtRFHbQc6jutEjag==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.3.2.tgz", + "integrity": "sha512-U0BCZtThq5rUfY08shHXpxe8ZhSsiYB/cJjUvAWRTs/ORrs8pbngS6xwseQws8d/vHoVrtqGD9GU9h8AmFRERQ==", "dev": true, "requires": { "loader-utils": "1.1.0", @@ -22,21 +22,35 @@ } }, "@angular-devkit/core": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.3.1.tgz", - "integrity": "sha512-F/yayl1gMe3jA/AMYShP2zNMi8d6OiCZcDrYdWYeJxHvNZBFpKkwAkDTMEVtsxK+5Y4+V+yJgO/l/q4GNMi6fA==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.3.2.tgz", + "integrity": "sha512-zABk/iP7YX5SVbmK4e+IX7j2d0D37MQJQiKgWdV3JzfvVJhNJzddiirtT980pIafoq+KyvTgVwXtc+vnux0oeQ==", "dev": true, "requires": { "ajv": "5.5.2", "chokidar": "1.7.0", "rxjs": "5.5.6", "source-map": "0.5.7" + }, + "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + } } }, "@angular-devkit/schematics": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.3.1.tgz", - "integrity": "sha512-ZiDHa2AYJ6lRqeTwo1agED2LjhzfDodz5UEiDX1ekFANT0nHyUfZYg/B+psmDO1eDtQZGPmmyp3BaPZAZbhq6A==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.3.2.tgz", + "integrity": "sha512-B6zZoqvHaTJy+vVdA6EtlxnCdGMa5elCa4j9lQLC3JI8DLvMXUWkCIPVbPzJ/GSRR9nsKWpvYMYaJyfBDUqfhw==", "dev": true, "requires": { "@ngtools/json-schema": "1.2.0", @@ -44,54 +58,55 @@ } }, "@angular/animations": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.5.tgz", - "integrity": "sha512-70ElCmaeDxLQc2OkgYhJjXj4zjtdjI4K1D5ZZm/uSPLlUcqC6uf6skCXlhMawQoPbsL/SXE5xw2HlMgEbhUysw==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.7.tgz", + "integrity": "sha512-t/B0z2OYO+yy8SJKB1/evSNPvnLsl+AclhM1p21/NnETxQUqvct1KXeDM7nYDu5hmnGmuavhua8LDo6rN5zS+Q==", "requires": { "tslib": "1.9.0" } }, "@angular/cdk": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.1.tgz", - "integrity": "sha512-8vsHeRymM+p82JeBzanrjmxp0koTU5W8cXO05ojECRsj6gUE/C950rMfFDga7fC8Pu5KTru/hWQoOcKErb3Uzg==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.3.tgz", + "integrity": "sha512-o95vQCJ1FpHLQj/ZfIrOya/rK0S7VwiY5vjEivpFnH25kHF5LNT4LTj6BOFkPbClMHTIM2wdKwWnuTfK0bg9WA==", "requires": { "tslib": "1.9.0" } }, "@angular/cli": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.0.tgz", - "integrity": "sha512-8XndpwR30zVSD0lc9E4x5dWXREq0qJwt7CAzaDm/Pd7K/apSUHrBFmfijvW2diK530d2wtiUYwGBYC2Qrlml7w==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.2.tgz", + "integrity": "sha512-U0RXiG6rNe5GqZazn+FLy3p4rOhBwpf5NWAec/JKe+u/cekIsyeDXLfqGJwzLhMEV4Iv2k4i3o5imejkEc4A9g==", "dev": true, "requires": { - "@angular-devkit/build-optimizer": "0.3.1", - "@angular-devkit/core": "0.3.1", - "@angular-devkit/schematics": "0.3.1", + "@angular-devkit/build-optimizer": "0.3.2", + "@angular-devkit/core": "0.3.2", + "@angular-devkit/schematics": "0.3.2", "@ngtools/json-schema": "1.2.0", - "@ngtools/webpack": "1.10.0", - "@schematics/angular": "0.3.1", - "@schematics/package-update": "0.3.1", + "@ngtools/webpack": "1.10.1", + "@schematics/angular": "0.3.2", + "@schematics/package-update": "0.3.2", + "ajv": "6.2.1", "autoprefixer": "7.2.6", - "cache-loader": "1.2.0", + "cache-loader": "1.2.2", "chalk": "2.2.2", "circular-dependency-plugin": "4.4.0", - "clean-css": "4.1.9", + "clean-css": "4.1.10", "common-tags": "1.7.2", - "copy-webpack-plugin": "4.4.1", + "copy-webpack-plugin": "4.4.3", "core-object": "3.1.5", "denodeify": "1.2.1", "ember-cli-string-utils": "1.1.0", "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.6", + "file-loader": "1.1.11", "fs-extra": "4.0.3", "glob": "7.1.2", "html-webpack-plugin": "2.30.1", "istanbul-instrumenter-loader": "3.0.0", "karma-source-map-support": "1.2.0", "less": "2.7.3", - "less-loader": "4.0.5", - "license-webpack-plugin": "1.1.1", + "less-loader": "4.0.6", + "license-webpack-plugin": "1.2.3", "loader-utils": "1.1.0", "lodash": "4.17.4", "memory-fs": "0.4.1", @@ -103,54 +118,54 @@ "portfinder": "1.0.13", "postcss": "6.0.19", "postcss-import": "11.1.0", - "postcss-loader": "2.1.0", - "postcss-url": "7.3.0", + "postcss-loader": "2.1.1", + "postcss-url": "7.3.1", "raw-loader": "0.5.1", "resolve": "1.5.0", "rxjs": "5.5.6", - "sass-loader": "6.0.6", + "sass-loader": "6.0.7", "semver": "5.5.0", "silent-error": "1.1.0", "source-map-support": "0.4.18", "style-loader": "0.19.1", "stylus": "0.54.5", - "stylus-loader": "3.0.1", - "uglifyjs-webpack-plugin": "1.2.0", + "stylus-loader": "3.0.2", + "uglifyjs-webpack-plugin": "1.2.2", "url-loader": "0.6.2", "webpack": "3.11.0", "webpack-dev-middleware": "1.12.2", - "webpack-dev-server": "2.11.1", - "webpack-merge": "4.1.1", + "webpack-dev-server": "2.11.2", + "webpack-merge": "4.1.2", "webpack-sources": "1.1.0", "webpack-subresource-integrity": "1.0.4" } }, "@angular/common": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.5.tgz", - "integrity": "sha512-jagCxo+75pcTwjuO1ZheIiTlKBJ6REFKFWoUPTzaSS6fnzReFJ+VPf4Pb0bWtHL1lWvbvnzmITOJPB9wmuM3fg==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.7.tgz", + "integrity": "sha512-TqsDMmPX1JlEH2QIneuAVzEO4ubzxLBAdV4XbKWDQKC/UfbWIIpSrSp2cIi85NV1tKkg0WAaodCIZ02NucHIHg==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.5.tgz", - "integrity": "sha512-YU/r5omexkrrBF3bZaseWrc2Iotk6hIdUWkPIL3gPC0hKJ3wBeB3sHCBujPQXktWdMBbQRujNSMZtgra3Oh1xQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.7.tgz", + "integrity": "sha512-26RG+Dy+M/95OyNNqM+OAruarIPOmbndiaglz2dMrNYzenfbSgG/AoPlL5uCdSqZDiXgnlKnS2K6/ePWXDSKNw==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler-cli": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.5.tgz", - "integrity": "sha512-jRFMxUKpodzOBKdZc6OMse+CjK6xfTJssZQrYeIyqz2daobaIsMZP2hZX8s/PCfV8Vxa7XFwCJb7Fq2uyZKfHg==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.7.tgz", + "integrity": "sha512-91gQolzsKyOlmBNW1J7lyu+dXHe/KHbAXU459hn6rycMHuTt60XvxA5O3xy3Pqt28VgbOOSrQfq5eVjZodKjWg==", "dev": true, "requires": { "chokidar": "1.7.0", "minimist": "1.2.0", "reflect-metadata": "0.1.12", - "tsickle": "0.26.0" + "tsickle": "0.27.2" }, "dependencies": { "minimist": { @@ -162,79 +177,79 @@ } }, "@angular/core": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.5.tgz", - "integrity": "sha512-Uo7R3LrsvA24JkRbwXWUZWp7NSEpwdTUxT1NScyjrBK+t8ybSL5/42Jo21md5M4pjeCsIgUXlGoCm1QtT5aYnQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.7.tgz", + "integrity": "sha512-DQuL6n7cjBfZmWX5RCV271g6PW9N8b93g2skWnM/zjm+BL9tfHPgvmsjMNB7QEHSxW8VBaaQ6gjj422O01A87g==", "requires": { "tslib": "1.9.0" } }, "@angular/flex-layout": { - "version": "2.0.0-beta.12", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.12.tgz", - "integrity": "sha512-QTOKZxehYTh8fj64V/pNVWNbfNtebSbssyMIXiGJuHTzfyF7GYdRmtjoR2pNpllycz3rE5NYX77EB140Y6BCnw==", + "version": "5.0.0-beta.13", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-5.0.0-beta.13.tgz", + "integrity": "sha1-ga1q1GEAOUbnxSKSCCGla6cpKoU=", "requires": { "tslib": "1.9.0" } }, "@angular/forms": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.5.tgz", - "integrity": "sha512-3feqqTuv9rIu7ZOsLCtM/ugNFz5RPujLHkE8bU1gsMM4/eMYruIFir2vbjnhMkD3K6KptEg4iO6tDW18diwXug==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.7.tgz", + "integrity": "sha512-43oLKdzMjMV/hOLpSTg8aOggcx+veTnPp/JN+KzMGo2qtbim5nk3fnuscWDeDOdkh8hPRPGarKxeFNEE9ZZSTg==", "requires": { "tslib": "1.9.0" } }, "@angular/http": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.5.tgz", - "integrity": "sha512-VqTCkAnebe+M9Bqrfp1QYpBQCTbXide/NxrQfwiJY87kjKFeRBuy9/XH/2S5wIwlF5Yx3bmlaIufd9VI5r/0aQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.7.tgz", + "integrity": "sha512-048+tCbsNYc9xVvIn5/sOvO4fXVkbB5b1IRYRGiRYXpTz6+JWIm5AwOqZIOeVDgqgZHFf96QllXDcFbdNVDgSA==", "requires": { "tslib": "1.9.0" } }, "@angular/language-service": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.5.tgz", - "integrity": "sha512-UWNbECu8svXmrgbTL03Fr+Dn06aPCZZLScmCOGVT5lkdsiJPAJpWAvKVM2Y0nzH0PmvekHw7INtV5lwfJOijYQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.7.tgz", + "integrity": "sha512-Tqd9ll6QBSKa2PKzhbyRiKfKZh4MOB6um3aiedC+m3IBB8zMgrY+EJbfP/SN52LsZdShEnLjuKcBZG0eqTjgEQ==", "dev": true }, "@angular/material": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.1.tgz", - "integrity": "sha512-94VmxclpIwXAxeudz9AfMg0m46/TEx/GsDZ7R9yOtrbptAr9xSgOumiEqET4Xjb35/mzgD/PKqlcMWyHJCkyVQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.3.tgz", + "integrity": "sha512-v6IGxGWaeALgBH8+kt2Q9K32zmJQH193bWdCeWmtXk0vJlj3NTiWYy+vLoZQ8aPIAtOqCKCmhf5VrerkS6pgww==", "requires": { "tslib": "1.9.0" } }, "@angular/material-moment-adapter": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.1.tgz", - "integrity": "sha512-mdLx0RTTgfnJ/9Z5cr5sNTHY9khl6UKLLd9FKoIIr7lxo1otYjd3xUS9uwlEBzj6SWqzKsd2jecPqD2uVReBpA==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.3.tgz", + "integrity": "sha512-ZeyQ0A492OxZR1fqf4wYsXVaRtHtFNuKr6vIL8KBtuX7ZpsMEttj6gzv8bMvCvfZJ/A7EsCgzK7SW0LwYwrWjw==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.5.tgz", - "integrity": "sha512-iPAuoG/c3pD3hnk1g0VgJu/pzNITvLQyT0W71MDMSuxLxs291kq+U2jklm40pStISd1mPbCNKmvz/7M+WbdLhg==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.7.tgz", + "integrity": "sha512-SdLx4F6tOy4/s3y1KZ/Z3YA6fiIrydaO2bry2FJglDxJh24p6TZIob+zC16N2MTuFW819KY5OlacNhc8aj6Yag==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.5.tgz", - "integrity": "sha512-IMEe2qUTC3CA3KoswmJJs+O2Lkyd5GXgl5ULupqhhm/TOL2FLk00kwv8k3Epaf2d1wXcjK3BMG7aAwc6RLH7QA==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.7.tgz", + "integrity": "sha512-95Rwf1JcGF/BI48k+VG2moLTVC863jPSjmHaGkz7cA9bi/QrRFGvFghl1qIm4Ezp3dj8CH8TE3TWB+1AmAg3AQ==", "requires": { "tslib": "1.9.0" } }, "@angular/router": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.5.tgz", - "integrity": "sha512-I8U0iy59lz0dAxU4zxRQHagfUPWF+MikLNMirRL1lrA49PG+5K1tiuIQ6p+8fZFAJ5UXwNHyXqYuWqsKRiVBHQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.7.tgz", + "integrity": "sha512-ppl0X7EfEgKYXIEPtdy8cOKj5KXuwCQ5Ila+IuGnSjKIRXt/olhBLJMprVl1VJgoxXj7z2i14U7kKaqSvGtpXw==", "requires": { "tslib": "1.9.0" } @@ -272,9 +287,9 @@ "dev": true }, "@ngtools/webpack": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.0.tgz", - "integrity": "sha512-QdzPjUgb1VIJ/uIMXGe5mJsufp0gxItDZj/3RD+xfqYCgabLRFPZ89qe88tTCzhburuEfHK6+Uqk5HWlVnA4oA==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.1.tgz", + "integrity": "sha512-Pa2FUy9n2Pu7kkTho6ADfHyypTmDMY8/HT7y9G3tZdaEsS7CjFMdchN5Dx+TCATGVh+G6FLS2mjgXBiGVTmbWw==", "dev": true, "requires": { "chalk": "2.2.2", @@ -293,29 +308,29 @@ "integrity": "sha1-rhA5KINrip4Gn9Li52+iGYzH5ig=" }, "@schematics/angular": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.3.1.tgz", - "integrity": "sha512-oGkK9ZCCOWvYyt/pmYq3+0exLtmr4sh8Rpd072Wjpc2VS9ulloMxLhVxyYEq11rqMVetKkaI9cDuJYwlQFOaJQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.3.2.tgz", + "integrity": "sha512-Elrk0BA951s0ScFZU0AWrpUeJBYVR52DZ1QTIO5R0AhwEd1PW4olI8szPLGQlVW5Sd6H0FA/fyFLIvn2r9v6Rw==", "dev": true, "requires": { "typescript": "2.6.2" } }, "@schematics/package-update": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@schematics/package-update/-/package-update-0.3.1.tgz", - "integrity": "sha512-XibkZwEyo00MhCC61z7NbN8BLwsmhs/yT9jYm1QjVZ6edWfB3l6Gv7jvGvt6WiK+KDG9T+pgrJ16DXFAOU+oiA==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@schematics/package-update/-/package-update-0.3.2.tgz", + "integrity": "sha512-7aVP4994Hu8vRdTTohXkfGWEwLhrdNP3EZnWyBootm5zshWqlQojUGweZe5zwewsKcixeVOiy2YtW+aI4aGSLA==", "dev": true, "requires": { "rxjs": "5.5.6", "semver": "5.5.0", - "semver-intersect": "1.3.0" + "semver-intersect": "1.3.1" } }, "@swimlane/ngx-charts": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.0.1.tgz", - "integrity": "sha512-YZNhRpMjhLpbaJK8iwPDj79Czusw12YNGGnrlbn3iwMhH8e3xkZVfzWhRA9RpfbVKo+S7qMhFTSlOhePQ61Zbg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.1.1.tgz", + "integrity": "sha512-oxJmgxAN61RfbxgDYMVmccb3LITU6WyLYnkH4AWWQIu8z1UARcwS+2MLljQhY+gJhEQUGDwDVLhQ1OL3bkNfBA==", "requires": { "d3-array": "1.2.1", "d3-brush": "1.0.4", @@ -331,9 +346,9 @@ } }, "@swimlane/ngx-datatable": { - "version": "11.1.7", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.1.7.tgz", - "integrity": "sha512-TMDN26Q4J+Sh+OPqAx8BK5Q/3hAAmcTAUQ9wvC9nboSOAmYUaHGz8t21yGdeUtRtunIfMpjTnwLa+X2Pfoq42w==" + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.2.0.tgz", + "integrity": "sha512-QlD45YEUwOz6fu7neTtIGBAoV0owY0J9Jkpc2xViXHThWJeW7+mRhg4XRyKm8nvVDuUJZH+7huzAW1lQKN+iYg==" }, "@swimlane/ngx-dnd": { "version": "3.1.0", @@ -480,13 +495,12 @@ } }, "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.1.tgz", + "integrity": "sha1-KKarxJOiq+D7TIUHrK7bQ/pVBnE=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", + "fast-deep-equal": "1.1.0", "fast-json-stable-stringify": "2.0.0", "json-schema-traverse": "0.3.1" } @@ -877,7 +891,7 @@ "dev": true, "requires": { "browserslist": "2.11.3", - "caniuse-lite": "1.0.30000809", + "caniuse-lite": "1.0.30000813", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.19", @@ -1123,9 +1137,9 @@ } }, "bfj-node4": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.2.0.tgz", - "integrity": "sha512-shYA6rXr1mlAzJT8R96TscvicMyV9GJTMDFRii9HlgxLXT7HD3aDfsEHkQzIHYghh4jLI3+oouXDHqI+pnR3zA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.2.1.tgz", + "integrity": "sha512-w+OTPD/R0AvDVR/sy/uVUVeoCpEgUoYj9/1P2zB6mR1yx7F/ADzLX4nlvZ/91WWzGgdZnuLxWP/J89D7ZDt0DA==", "dev": true, "requires": { "bluebird": "3.5.1", @@ -1532,8 +1546,8 @@ "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000809", - "electron-to-chromium": "1.3.33" + "caniuse-lite": "1.0.30000813", + "electron-to-chromium": "1.3.36" } }, "buffer": { @@ -1646,14 +1660,14 @@ } }, "cache-loader": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.0.tgz", - "integrity": "sha512-E95knP7jxy2bF/HKuw5gCEXm06tp7/sEjewNF39ezyVBnVmNzB9bnXflEFBvrqZrswsCmgiCbiIc7xIeVXW7Gw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.2.tgz", + "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==", "dev": true, "requires": { - "async": "2.6.0", "loader-utils": "1.1.0", "mkdirp": "0.5.1", + "neo-async": "2.5.0", "schema-utils": "0.4.5" } }, @@ -1701,9 +1715,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000809", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000809.tgz", - "integrity": "sha512-tLn4flj2upmMsko3larTkQh21Vp9pylnNPUOhw5+mubL+67U5Fpm4UG5AutzGBc+gBIPSsPFHDynsiMWp5m46g==", + "version": "1.0.30000813", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000813.tgz", + "integrity": "sha512-A8ITSmH5SFdMFdC704ggjg+x2z5PzQmVlG8tavwnfvbC33Q1UYrj0+G+Xm0SNAnd4He36fwUE/KEWytOEchw+A==", "dev": true }, "caseless": { @@ -1742,19 +1756,12 @@ } }, "chart.js": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.1.tgz", - "integrity": "sha512-pX1oQAY86MiuyZ2hY593Acbl4MLHKrBBhhmZ1YqSadzQbbsBE2rnd6WISoHjIsdf0WDeC0hbePYCz2ZxkV8L+g==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.2.tgz", + "integrity": "sha512-90wl3V9xRZ8tnMvMlpcW+0Yg13BelsGS9P9t0ClaDxv/hdypHDr/YAGf+728m11P5ljwyB0ZHfPKCapZFqSqYA==", "requires": { "chartjs-color": "2.2.0", - "moment": "2.18.1" - }, - "dependencies": { - "moment": { - "version": "2.18.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", - "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" - } + "moment": "2.21.0" } }, "chartjs-color": { @@ -1924,9 +1931,9 @@ "integrity": "sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k=" }, "clean-css": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", - "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.10.tgz", + "integrity": "sha1-PfwsJWnV8DwUtB2HWtm8yuCcuJ4=", "dev": true, "requires": { "source-map": "0.5.7" @@ -1961,15 +1968,15 @@ "dev": true }, "clone-deep": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz", - "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", + "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", "dev": true, "requires": { "for-own": "1.0.0", "is-plain-object": "2.0.4", - "kind-of": "3.2.2", - "shallow-clone": "0.1.2" + "kind-of": "6.0.2", + "shallow-clone": "1.0.0" }, "dependencies": { "for-own": { @@ -1980,6 +1987,12 @@ "requires": { "for-in": "1.0.2" } + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true } } }, @@ -1996,9 +2009,9 @@ "dev": true }, "codelyzer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.1.0.tgz", - "integrity": "sha512-a3FCIAS3FNQIACvj7KA4iKvH3c6r7X6t6zXsrtV797QGYPQyCwD1fIEd9yV+ZDamijF3YaZ5fbB7QbUMOJGC/g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.2.1.tgz", + "integrity": "sha512-CKwfgpfkqi9dyzy4s6ELaxJ54QgJ6A8iTSsM4bzHbLuTpbKncvNc3DUlCvpnkHBhK47gEf4qFsWoYqLrJPhy6g==", "dev": true, "requires": { "app-root-path": "2.0.1", @@ -2160,9 +2173,9 @@ "dev": true }, "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz", + "integrity": "sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==", "dev": true, "requires": { "inherits": "2.0.3", @@ -2286,16 +2299,16 @@ "dev": true }, "copy-webpack-plugin": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.4.1.tgz", - "integrity": "sha512-ojaz8MpS3zoLJT/JbYMusYM+dCEArhW24hGAUPYPydTCS+87NFh2TWr85sywG3So4Q4E68QoerqQ+Ns1g0fhDg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.4.3.tgz", + "integrity": "sha512-v4THQ24Tks2NkyOvZuFDgZVfDD9YaA9rwYLZTrWg2GHIA8lrH5DboEyeoorh5Skki+PUbgSmnsCwhMWqYrQZrA==", "dev": true, "requires": { "cacache": "10.0.4", "find-cache-dir": "1.0.0", "globby": "7.1.1", "is-glob": "4.0.0", - "loader-utils": "0.2.17", + "loader-utils": "1.1.0", "minimatch": "3.0.4", "p-limit": "1.2.0", "serialize-javascript": "1.4.0" @@ -2315,18 +2328,6 @@ "requires": { "is-extglob": "2.1.1" } - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } } } }, @@ -3235,9 +3236,9 @@ } }, "duplexify": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", - "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", + "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", "dev": true, "requires": { "end-of-stream": "1.4.1", @@ -3269,9 +3270,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.33", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz", - "integrity": "sha1-vwBwPWKnxlI4E2V4w1LWxcBCpUU=", + "version": "1.3.36", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.36.tgz", + "integrity": "sha1-Dqv3Gp6+qQE/scw1o5DgaGJPJ+g=", "dev": true }, "elliptic": { @@ -3554,7 +3555,7 @@ "requires": { "es6-map": "0.1.5", "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", + "esrecurse": "4.2.1", "estraverse": "4.2.0" } }, @@ -3565,13 +3566,12 @@ "dev": true }, "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" + "estraverse": "4.2.0" } }, "estraverse": { @@ -3829,6 +3829,18 @@ "webpack-sources": "1.1.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -3847,9 +3859,9 @@ "dev": true }, "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, "fast-json-stable-stringify": { @@ -3881,24 +3893,13 @@ } }, "file-loader": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.6.tgz", - "integrity": "sha512-873ztuL+/hfvXbLDJ262PGO6XjERnybJu2gW1/5j8HUfxSiFJI9Hj/DhZ50ZGRUxBvuNiazb/cM2rh9pqrxP6Q==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", + "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", "dev": true, "requires": { "loader-utils": "1.1.0", - "schema-utils": "0.3.0" - }, - "dependencies": { - "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, - "requires": { - "ajv": "5.5.2" - } - } + "schema-utils": "0.4.5" } }, "file-uri-to-path": { @@ -3925,9 +3926,9 @@ } }, "filesize": { - "version": "3.5.11", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", - "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz", + "integrity": "sha512-g5OWtoZWcPI56js1DFhIEqyG9tnu/7sG3foHwgS9KGYFMfsYguI3E+PRVCmtmE96VajQIEMRU2OhN+ME589Gdw==", "dev": true }, "fill-range": { @@ -5246,6 +5247,16 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, + "gzip-size": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", + "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "pify": "3.0.0" + } + }, "hammerjs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", @@ -5579,19 +5590,19 @@ "dev": true }, "html-minifier": { - "version": "3.5.9", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz", - "integrity": "sha512-EZqO91XJwkj8BeLx9C12sKB/AHoTANaZax39vEOP9f/X/9jgJ3r1O2+neabuHqpz5kJO71TapP9JrtCY39su1A==", + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.10.tgz", + "integrity": "sha512-5c8iAyeIGAiuFhVjJ0qy1lgvyQxxuZgjeOuMnoK/wjEyy8DF3xKUnE9pO+6H7VMir976K6SGlZV8ZEmIOea/Zg==", "dev": true, "requires": { "camel-case": "3.0.0", - "clean-css": "4.1.9", + "clean-css": "4.1.10", "commander": "2.14.1", "he": "1.1.1", "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.11" + "uglify-js": "3.3.13" }, "dependencies": { "commander": { @@ -5609,7 +5620,7 @@ "dev": true, "requires": { "bluebird": "3.5.1", - "html-minifier": "3.5.9", + "html-minifier": "3.5.10", "loader-utils": "0.2.17", "lodash": "4.17.4", "pretty-error": "2.1.1", @@ -6404,6 +6415,18 @@ "schema-utils": "0.3.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -6799,10 +6822,13 @@ } }, "lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=", - "dev": true + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", + "dev": true, + "requires": { + "set-getter": "0.1.0" + } }, "lcid": { "version": "1.0.0", @@ -6830,22 +6856,14 @@ } }, "less-loader": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.0.5.tgz", - "integrity": "sha1-rhVadAbKxqzSk9eFWH/P8PR4xN0=", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.0.6.tgz", + "integrity": "sha512-WPFY3NMJGJna8kIxtgSu6AVG7K6uRPdfE2J7vpQqFWMN/RkOosV09rOVUt3wghNClWH2Pg7YumD1dHiv1Thfug==", "dev": true, "requires": { "clone": "2.1.1", "loader-utils": "1.1.0", - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } + "pify": "3.0.0" } }, "levn": { @@ -6900,9 +6918,9 @@ "dev": true }, "license-webpack-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.1.1.tgz", - "integrity": "sha512-TjKOyiC0exqd4Idy/4M8/DETR22dXBZks387DuS5LbslxHiMRXGx/Q2F/j9IUtvEoH5uFvt72vRgk/G6f8j3Dg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.2.3.tgz", + "integrity": "sha512-+sie46vNe5L48N94LEzEvreJqAdi+N3x3mXUx+iujuAmftWdJUh68RSDPgWK3DRJuu50dwiyH7MdVAx95zfKQA==", "dev": true, "requires": { "ejs": "2.5.7" @@ -6975,24 +6993,6 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.endswith": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz", - "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=", - "dev": true - }, - "lodash.isfunction": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", - "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", @@ -7000,12 +7000,6 @@ "dev": true, "optional": true }, - "lodash.startswith": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz", - "integrity": "sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=", - "dev": true - }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", @@ -7502,8 +7496,8 @@ "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "dev": true, "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "concat-stream": "1.6.1", + "duplexify": "3.5.4", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.2", "from2": "2.3.0", @@ -7621,9 +7615,9 @@ } }, "moment": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", - "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==" + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", + "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==" }, "move-concurrently": { "version": "1.0.1", @@ -7683,9 +7677,9 @@ "is-windows": "1.0.2", "kind-of": "6.0.2", "object.pick": "1.3.0", - "regex-not": "1.0.0", + "regex-not": "1.0.2", "snapdragon": "0.8.1", - "to-regex": "3.0.1" + "to-regex": "3.0.2" }, "dependencies": { "arr-diff": { @@ -7723,6 +7717,12 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, + "neo-async": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz", + "integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==", + "dev": true + }, "netmask": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", @@ -7735,7 +7735,7 @@ "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-1.6.0.tgz", "integrity": "sha512-9w0WH69x5/nuqC1og2WaY39NbaBqTGIP1+5gZaH7/KPN6UEPonNg/pYnsIVklLj1DWPWXKa8+XXIJZ1jy5nLxg==", "requires": { - "chart.js": "2.7.1" + "chart.js": "2.7.2" } }, "ngrx-store-freeze": { @@ -7747,9 +7747,9 @@ } }, "ngx-color-picker": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.2.tgz", - "integrity": "sha512-5fuhS+jKjzdH8J5YXeZq6Zam9U51p7GFQpWmrRD4gCrd5/Y1A1jYWrXlk0IRMpHsbEumAe+jYe2wrmGHWAqckw==" + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.3.tgz", + "integrity": "sha512-popxIV1JucqRmMl9P2vUcHsn/94OR5PA/d7vGpACDrIOI81T8kEdUBlPvtAMqQXShvv3nVUmg8Wu3rslfcRxzg==" }, "ngx-cookie-service": { "version": "1.0.10", @@ -8071,7 +8071,7 @@ "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", "semver": "5.5.0", - "validate-npm-package-license": "3.0.1" + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -8768,20 +8768,29 @@ "integrity": "sha512-f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==", "dev": true, "requires": { - "chalk": "2.3.1", + "chalk": "2.3.2", "source-map": "0.6.1", - "supports-color": "5.2.0" + "supports-color": "5.3.0" }, "dependencies": { - "chalk": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", - "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "ansi-styles": "3.2.0", + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", + "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.2.0" + "supports-color": "5.3.0" } }, "has-flag": { @@ -8797,9 +8806,9 @@ "dev": true }, "supports-color": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", - "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -8852,9 +8861,9 @@ } }, "postcss-loader": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.0.tgz", - "integrity": "sha512-S/dKzpDwGFmP9g8eyCu9sUIV+/+3UooeTpYlsKf23qKDdrhHuA4pTSfytVu0rEJ0iDqUavXrgtOPq5KhNyNMOw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.1.tgz", + "integrity": "sha512-f0J/DWE/hyO9/LH0WHpXkny/ZZ238sSaG3p1SRBtVZnFWUtD7GXIEgHoBg8cnAeRbmEvUxHQptY46zWfwNYj/w==", "dev": true, "requires": { "loader-utils": "1.1.0", @@ -8864,9 +8873,9 @@ } }, "postcss-url": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.0.tgz", - "integrity": "sha512-VBP6uf6iL3AZra23nkPkOEkS/5azj1xf/toRrjfkolfFEgg9Gyzg9UhJZeIsz12EGKZTNVeGbPa2XtaZm/iZvg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.1.tgz", + "integrity": "sha512-Ya5KIjGptgz0OtrVYfi2UbLxVAZ6Emc4Of+Grx4Sf1deWlRpFwLr8FrtkUxfqh+XiZIVkXbjQrddE10ESpNmdA==", "dev": true, "requires": { "mime": "1.6.0", @@ -9133,7 +9142,7 @@ "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", "dev": true, "requires": { - "duplexify": "3.5.3", + "duplexify": "3.5.4", "inherits": "2.0.3", "pump": "2.0.1" } @@ -9436,23 +9445,13 @@ } }, "regex-not": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz", - "integrity": "sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "2.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexpu-core": { @@ -9641,6 +9640,12 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -9697,6 +9702,15 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "0.1.15" + } + }, "sass-graph": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", @@ -9711,15 +9725,15 @@ } }, "sass-loader": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz", - "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz", + "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==", "dev": true, "requires": { - "async": "2.6.0", - "clone-deep": "0.3.0", + "clone-deep": "2.0.2", "loader-utils": "1.1.0", "lodash.tail": "4.1.1", + "neo-async": "2.5.0", "pify": "3.0.0" } }, @@ -9744,21 +9758,8 @@ "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "dev": true, "requires": { - "ajv": "6.1.1", + "ajv": "6.2.1", "ajv-keywords": "3.1.0" - }, - "dependencies": { - "ajv": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", - "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", - "dev": true, - "requires": { - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - } } }, "scss-tokenizer": { @@ -9844,9 +9845,9 @@ } }, "semver-intersect": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.0.tgz", - "integrity": "sha512-923f1TGXGb2+OCkLvsmNPijmurMQxEMFOhC80N4NL8/Jo5rBKufHZ3sBtJJ7GNhh4RhdsB6+vj+6W68kmr43Lg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.1.tgz", + "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=", "dev": true, "requires": { "semver": "5.5.0" @@ -9981,25 +9982,21 @@ } }, "shallow-clone": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", + "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { "is-extendable": "0.1.1", - "kind-of": "2.0.1", - "lazy-cache": "0.2.7", + "kind-of": "5.1.0", "mixin-object": "2.0.1" }, "dependencies": { "kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, @@ -10394,24 +10391,35 @@ "dev": true }, "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", "dev": true }, "spdy": { @@ -10742,6 +10750,18 @@ "schema-utils": "0.3.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -10799,9 +10819,9 @@ } }, "stylus-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.1.tgz", - "integrity": "sha1-d/SzT9Aw0lsmF7z1UT21sHMMQIk=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", + "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { "loader-utils": "1.1.0", @@ -10974,91 +10994,15 @@ } }, "to-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz", - "integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "regex-not": "1.0.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -11220,15 +11164,15 @@ } }, "tsickle": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.26.0.tgz", - "integrity": "sha512-eWJ2CUfttGK0LqF9iJ/Avnxbj4M+fCyJ50Zag3wm73Fut1hsasPRHKxKdrMWVj4BMHnQNx7TO+DdNmLmJTSuNw==", + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.27.2.tgz", + "integrity": "sha512-KW+ZgY0t2cq2Qib1sfdgMiRnk+cr3brUtzZoVWjv+Ot3jNxVorFBUH+6In6hl8Dg7BI2AAFf69NHkwvZNMSFwA==", "dev": true, "requires": { "minimist": "1.2.0", "mkdirp": "0.5.1", - "source-map": "0.5.7", - "source-map-support": "0.4.18" + "source-map": "0.6.1", + "source-map-support": "0.5.3" }, "dependencies": { "minimist": { @@ -11236,6 +11180,21 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", + "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } } } }, @@ -11347,9 +11306,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.11.tgz", - "integrity": "sha512-AKLsYcdV+sS5eAE4NtVXF6f2u/DCQynQm0jTGxF261+Vltu1dYNuHzjqDmk11gInj+H/zJIM2EAwXG3MzPb3VA==", + "version": "3.3.13", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.13.tgz", + "integrity": "sha512-7rdn/bDOG1ElSTPdh7AI5TCjLv63ZD4k8BBadN3ssIkhlaQL2c0yRxmXCyOYhZK0wZTgGgUSnYQ4CGu+Jos5cA==", "dev": true, "requires": { "commander": "2.14.1", @@ -11378,9 +11337,9 @@ "optional": true }, "uglifyjs-webpack-plugin": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz", - "integrity": "sha512-Bc2NeyTTSJAy2JuKaBpdvWyuySPSPHNcj70KFqu7FhfrfsjPo0Kta9jgAvPrQxnz86mOH1tk4n/I8wvZrXvetA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz", + "integrity": "sha512-CG/NvzXfemUAm5Y4Guh5eEaJYHtkG7kKNpXEJHp9QpxsFVB5/qKvYWoMaq4sa99ccZ0hM3MK8vQV9XPZB4357A==", "dev": true, "requires": { "cacache": "10.0.4", @@ -11390,7 +11349,7 @@ "source-map": "0.6.1", "uglify-es": "3.3.9", "webpack-sources": "1.1.0", - "worker-farm": "1.5.2" + "worker-farm": "1.5.4" }, "dependencies": { "source-map": { @@ -11541,16 +11500,10 @@ } }, "upath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.2.tgz", - "integrity": "sha512-fCmij7T5LnwUme3dbnVSejvOHHlARjB3ikJFwgZfz386pHmf/gueuTLRFU94FZEaeCLlbQrweiUU700gG41tUw==", - "dev": true, - "requires": { - "lodash.endswith": "4.2.1", - "lodash.isfunction": "3.0.9", - "lodash.isstring": "4.0.1", - "lodash.startswith": "4.2.1" - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz", + "integrity": "sha512-d4SJySNBXDaQp+DPrziv3xGS6w3d2Xt69FijJr86zMPBy23JEloMCEOUBBzuN7xCtjLCnmB9tI/z7SBCahHBOw==", + "dev": true }, "upper-case": { "version": "1.1.3", @@ -11593,6 +11546,18 @@ "schema-utils": "0.3.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -11704,15 +11669,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "dev": true - }, - "lazy-cache": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", - "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", - "dev": true, - "requires": { - "set-getter": "0.1.0" - } } } }, @@ -11792,13 +11748,13 @@ } }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "vary": { @@ -11848,14 +11804,338 @@ "dev": true }, "watchpack": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", - "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz", + "integrity": "sha512-RSlipNQB1u48cq0wH/BNfCu1tD/cJ8ydFIkNYhp9o+3d+8unClkIovpW5qpFPgmL9OE48wfAnlZydXByWP82AA==", "dev": true, "requires": { - "async": "2.6.0", - "chokidar": "1.7.0", - "graceful-fs": "4.1.11" + "chokidar": "2.0.2", + "graceful-fs": "4.1.11", + "neo-async": "2.5.0" + }, + "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "3.1.9", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", + "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "define-property": "1.0.0", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "kind-of": "6.0.2", + "repeat-element": "1.1.2", + "snapdragon": "0.8.1", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "chokidar": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz", + "integrity": "sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.1", + "fsevents": "1.1.3", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.0.4" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", + "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + } + } } }, "wbuf": { @@ -11949,7 +12229,7 @@ "requires": { "acorn": "5.3.0", "acorn-dynamic-import": "2.0.2", - "ajv": "6.1.1", + "ajv": "6.2.1", "ajv-keywords": "3.1.0", "async": "2.6.0", "enhanced-resolve": "3.4.1", @@ -11966,22 +12246,11 @@ "supports-color": "4.5.0", "tapable": "0.2.8", "uglifyjs-webpack-plugin": "0.4.6", - "watchpack": "1.4.0", + "watchpack": "1.5.0", "webpack-sources": "1.1.0", "yargs": "8.0.2" }, "dependencies": { - "ajv": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", - "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", - "dev": true, - "requires": { - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", @@ -12218,55 +12487,68 @@ } }, "webpack-bundle-analyzer": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.10.0.tgz", - "integrity": "sha512-eA/9F/ZLFlVXfCLYqefHFbelJ3JcvyeFdmpAG6Vu3iJNcisj3KWNPqu00lCqK9caeaesipVrGb9alUSi2lEvAg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.11.1.tgz", + "integrity": "sha512-VKUVkVMc6TWVXmF1OxsBXoiRjYiDRA4XT0KqtbLMDK+891VX7FCuklYwzldND8J2upUcHHnuXYNTP+4mSFi4Kg==", "dev": true, "requires": { "acorn": "5.3.0", - "bfj-node4": "5.2.0", - "chalk": "2.3.0", + "bfj-node4": "5.2.1", + "chalk": "2.3.2", "commander": "2.13.0", "ejs": "2.5.7", "express": "4.16.2", - "filesize": "3.5.11", + "filesize": "3.6.0", "gzip-size": "4.1.0", "lodash": "4.17.4", "mkdirp": "0.5.1", "opener": "1.4.3", - "ws": "4.0.0" + "ws": "4.1.0" }, "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "color-convert": "1.9.1" } }, - "gzip-size": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", - "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", + "chalk": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", + "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "duplexer": "0.1.1", - "pify": "3.0.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "dev": true, + "requires": { + "has-flag": "3.0.0" } }, "ws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz", - "integrity": "sha512-QYslsH44bH8O7/W2815u5DpnCpXWpEK44FmaHffNwgJI4JMaSZONgPBTOfrxJ29mXKbXak+LsJ2uAkDTYq2ptQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", + "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", "dev": true, "requires": { "async-limiter": "1.0.0", - "safe-buffer": "5.1.1", - "ultron": "1.1.1" + "safe-buffer": "5.1.1" } } } @@ -12312,9 +12594,9 @@ } }, "webpack-dev-server": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.1.tgz", - "integrity": "sha512-ombhu5KsO/85sVshIDTyQ5HF3xjZR3N0sf5Ao6h3vFwpNyzInEzA1GV3QPVjTMLTNckp8PjfG1PFGznzBwS5lg==", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz", + "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==", "dev": true, "requires": { "ansi-html": "0.0.7", @@ -12341,7 +12623,7 @@ "sockjs-client": "1.1.4", "spdy": "3.4.7", "strip-ansi": "3.0.1", - "supports-color": "5.2.0", + "supports-color": "5.3.0", "webpack-dev-middleware": "1.12.2", "yargs": "6.6.0" }, @@ -12352,7 +12634,7 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.6", + "micromatch": "3.1.9", "normalize-path": "2.1.1" } }, @@ -12385,7 +12667,7 @@ "snapdragon": "0.8.1", "snapdragon-node": "2.1.1", "split-string": "3.1.0", - "to-regex": "3.0.1" + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -12431,7 +12713,7 @@ "normalize-path": "2.1.1", "path-is-absolute": "1.0.1", "readdirp": "2.1.0", - "upath": "1.0.2" + "upath": "1.0.4" } }, "debug": { @@ -12453,9 +12735,9 @@ "define-property": "0.2.5", "extend-shallow": "2.0.1", "posix-character-classes": "0.1.1", - "regex-not": "1.0.0", + "regex-not": "1.0.2", "snapdragon": "0.8.1", - "to-regex": "3.0.1" + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -12515,9 +12797,9 @@ "expand-brackets": "2.1.4", "extend-shallow": "2.0.1", "fragment-cache": "0.2.1", - "regex-not": "1.0.0", + "regex-not": "1.0.2", "snapdragon": "0.8.1", - "to-regex": "3.0.1" + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -12678,9 +12960,9 @@ "dev": true }, "micromatch": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.6.tgz", - "integrity": "sha512-6hezhKgmSIRZeSCiVB84GOmH1Ajvo8XgnaEq/uPQ/wv0g+MQlaVonSEru7VMDZXzRWFoclakpADfInbg/5FGjw==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", + "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", "dev": true, "requires": { "arr-diff": "4.0.0", @@ -12693,15 +12975,15 @@ "kind-of": "6.0.2", "nanomatch": "1.2.9", "object.pick": "1.3.0", - "regex-not": "1.0.0", + "regex-not": "1.0.2", "snapdragon": "0.8.1", - "to-regex": "3.0.1" + "to-regex": "3.0.2" } }, "supports-color": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", - "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -12746,12 +13028,20 @@ } }, "webpack-merge": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz", - "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz", + "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" + }, + "dependencies": { + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", + "dev": true + } } }, "webpack-sources": { @@ -12840,9 +13130,9 @@ "dev": true }, "worker-farm": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", - "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz", + "integrity": "sha512-ITyClEvcfv0ozqJl1vmWFWhvI+OIrkbInYqkEPE50wFPXj8J9Gd3FYf8+CkZJXJJsQBYe+2DvmoK9Zhx5w8W+w==", "dev": true, "requires": { "errno": "0.1.7", diff --git a/package.json b/package.json index a08a2719..8c3ee96c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "5.2.5", + "version": "5.2.7", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", @@ -19,40 +19,40 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "5.2.5", - "@angular/cdk": "5.2.1", - "@angular/common": "5.2.5", - "@angular/compiler": "5.2.5", - "@angular/core": "5.2.5", - "@angular/flex-layout": "2.0.0-beta.12", - "@angular/forms": "5.2.5", - "@angular/http": "5.2.5", - "@angular/material": "5.2.1", - "@angular/material-moment-adapter": "5.2.1", - "@angular/platform-browser": "5.2.5", - "@angular/platform-browser-dynamic": "5.2.5", - "@angular/router": "5.2.5", + "@angular/animations": "5.2.7", + "@angular/cdk": "5.2.3", + "@angular/common": "5.2.7", + "@angular/compiler": "5.2.7", + "@angular/core": "5.2.7", + "@angular/flex-layout": "5.0.0-beta.13", + "@angular/forms": "5.2.7", + "@angular/http": "5.2.7", + "@angular/material": "5.2.3", + "@angular/material-moment-adapter": "5.2.3", + "@angular/platform-browser": "5.2.7", + "@angular/platform-browser-dynamic": "5.2.7", + "@angular/router": "5.2.7", "@ngrx/effects": "5.0.0", "@ngrx/router-store": "5.0.0", "@ngrx/store": "5.0.0", "@ngrx/store-devtools": "5.0.0", "@ngx-translate/core": "9.1.1", - "@swimlane/ngx-charts": "7.0.1", - "@swimlane/ngx-datatable": "11.1.7", + "@swimlane/ngx-charts": "7.1.1", + "@swimlane/ngx-datatable": "11.2.0", "@swimlane/ngx-dnd": "3.1.0", "@types/prismjs": "1.9.0", "angular-calendar": "0.23.6", "angular-in-memory-web-api": "0.5.3", - "chart.js": "2.7.1", + "chart.js": "2.7.2", "classlist.js": "1.1.20150312", "core-js": "2.5.3", "d3": "4.13.0", "hammerjs": "2.0.8", "intl": "1.2.5", - "moment": "2.20.1", + "moment": "2.21.0", "ng2-charts": "1.6.0", "ngrx-store-freeze": "0.2.1", - "ngx-color-picker": "5.3.2", + "ngx-color-picker": "5.3.3", "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.3.0", "prismjs": "1.11.0", @@ -61,14 +61,14 @@ "zone.js": "0.8.20" }, "devDependencies": { - "@angular/cli": "1.7.0", - "@angular/compiler-cli": "5.2.5", - "@angular/language-service": "5.2.5", + "@angular/cli": "1.7.2", + "@angular/compiler-cli": "5.2.7", + "@angular/language-service": "5.2.7", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.6", "@types/jasminewd2": "2.0.3", "@types/node": "6.0.101", - "codelyzer": "4.1.0", + "codelyzer": "4.2.1", "jasmine-core": "2.8.0", "jasmine-spec-reporter": "4.2.1", "karma": "2.0.0", @@ -80,6 +80,6 @@ "ts-node": "4.1.0", "tslint": "5.9.1", "typescript": "2.6.2", - "webpack-bundle-analyzer": "2.10.0" + "webpack-bundle-analyzer": "2.11.1" } } From ae6bc376645069a902df0963f2ee51961cdf0a43 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 6 Mar 2018 11:23:59 +0300 Subject: [PATCH 12/20] Removed "fxLayoutWrap" and added "wrap" into fxLayout attributes where it's necessary --- .../theme-options.component.html | 8 +++--- src/app/app.module.ts | 5 ---- .../academy/courses/courses.component.html | 2 +- .../analytics/analytics.component.html | 9 +++--- .../dashboards/project/project.component.html | 28 ++++++++++--------- .../dashboard/dashboard.component.html | 6 ++-- .../e-commerce/product/product.component.html | 2 +- .../mail-details/mail-details.component.html | 4 +-- .../mail-list-item.component.html | 2 +- .../mail-details/mail-details.component.html | 4 +-- .../mail-list-item.component.html | 2 +- .../scrumboard/board/board.component.html | 2 +- .../board/list/card/card.component.html | 4 +-- .../apps/scrumboard/scrumboard.component.html | 4 +-- .../todo-details/todo-details.component.html | 2 +- .../todo-list-item.component.html | 2 +- .../knowledge-base.component.html | 2 +- .../pricing/style-1/style-1.component.html | 4 +-- .../pricing/style-2/style-2.component.html | 4 +-- .../pricing/style-3/style-3.component.html | 4 +-- .../profile/tabs/about/about.component.html | 4 +-- .../photos-videos.component.html | 2 +- .../tabs/timeline/timeline.component.html | 4 +-- .../content/ui/forms/forms.component.html | 2 +- .../content/ui/icons/icons.component.html | 2 +- src/app/main/navbar/navbar.component.ts | 5 ++++ 26 files changed, 59 insertions(+), 60 deletions(-) diff --git a/src/@fuse/components/theme-options/theme-options.component.html b/src/@fuse/components/theme-options/theme-options.component.html index cb36549e..71b95e66 100644 --- a/src/@fuse/components/theme-options/theme-options.component.html +++ b/src/@fuse/components/theme-options/theme-options.component.html @@ -14,7 +14,7 @@

Navigation:

+ fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start"> Top Left Right @@ -29,7 +29,7 @@

Toolbar:

+ fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start"> Below Above None @@ -37,7 +37,7 @@

Footer:

+ fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start"> Below Above None @@ -45,7 +45,7 @@

Layout Mode:

+ fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start"> Boxed Fullwidth diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 92291436..3f215833 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,7 +9,6 @@ import 'hammerjs'; import { FuseModule } from '@fuse/fuse.module'; import { FuseSharedModule } from '@fuse/shared.module'; -// import { SharedModule } from 'app/shared/shared.module'; import { fuseConfig } from './fuse-config'; import { AppComponent } from './app.component'; @@ -17,7 +16,6 @@ import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; import { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; -import { MaterialModule } from '@fuse/modules/material.module'; const appRoutes: Routes = [ { @@ -65,9 +63,6 @@ const appRoutes: Routes = [ passThruUnknownUrl: true }), - // SharedModule, - // MaterialModule, - // Fuse Main and Shared modules FuseModule.forRoot(fuseConfig), FuseSharedModule, diff --git a/src/app/main/content/apps/academy/courses/courses.component.html b/src/app/main/content/apps/academy/courses/courses.component.html index 870d3764..0231aa27 100644 --- a/src/app/main/content/apps/academy/courses/courses.component.html +++ b/src/app/main/content/apps/academy/courses/courses.component.html @@ -46,7 +46,7 @@ -
+
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.html b/src/app/main/content/apps/dashboards/analytics/analytics.component.html index 9c8f35f2..b430bcca 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.component.html +++ b/src/app/main/content/apps/dashboards/analytics/analytics.component.html @@ -55,7 +55,7 @@
-
+
Conversion
@@ -100,7 +100,7 @@
-
+
Impressions
@@ -145,7 +145,7 @@
-
+
Visits
@@ -262,8 +262,7 @@
-
+
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index a93f76fb..6f870a85 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -44,7 +44,7 @@ -
@@ -259,8 +259,8 @@
-
+
{{widgets.widget5.title}}
@@ -274,7 +274,7 @@
-
+
-
+
-
+
+
@@ -442,7 +441,7 @@ -
@@ -496,7 +495,8 @@
-
{{widgets.widget9.weeklySpent.title}}
@@ -523,7 +523,8 @@
-
{{widgets.widget9.totalSpent.title}}
@@ -550,7 +551,8 @@
-
{{widgets.widget9.remaining.title}}
@@ -641,7 +643,7 @@ -
diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html b/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html index 4853088e..49164a6b 100644 --- a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html +++ b/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html @@ -4,7 +4,7 @@
-
+
@@ -191,7 +191,7 @@
-
+
{{widgets.widget5.title}}
@@ -259,7 +259,7 @@
-
+
{{widgets.widget6.footerLeft.count[widget6.currentRange]}} {{widgets.widget6.footerLeft.title}} diff --git a/src/app/main/content/apps/e-commerce/product/product.component.html b/src/app/main/content/apps/e-commerce/product/product.component.html index 8272e994..b9280c94 100644 --- a/src/app/main/content/apps/e-commerce/product/product.component.html +++ b/src/app/main/content/apps/e-commerce/product/product.component.html @@ -125,7 +125,7 @@
-
+
diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html index 765aca1c..e87f3c9e 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html +++ b/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html @@ -14,7 +14,7 @@
{{mail.subject}}
-
+
@@ -121,7 +121,7 @@ ({{mail.attachments.length}})
-
+
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html index 80841ec0..f9224cbc 100644 --- a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html +++ b/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html @@ -33,7 +33,7 @@ {{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
-
+
{{mail.subject}}
-
+
@@ -122,7 +122,7 @@ ({{mail.attachments.length}})
-
+
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html index 5d8e3c14..6d4d2872 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html +++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html @@ -34,7 +34,7 @@ {{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
-
+
-
+
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html index b743a474..aca1da48 100644 --- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html +++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html @@ -15,9 +15,7 @@ -
+
-
+
-
+
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html index 5bc16197..7af49a8f 100644 --- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html +++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html @@ -20,7 +20,7 @@ {{todo.notes}}
-
+
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.html b/src/app/main/content/pages/knowledge-base/knowledge-base.component.html index ade919a6..438e0a82 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.component.html +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.component.html @@ -14,7 +14,7 @@
-
+
diff --git a/src/app/main/content/pages/pricing/style-1/style-1.component.html b/src/app/main/content/pages/pricing/style-1/style-1.component.html index b63d68e0..d006775d 100644 --- a/src/app/main/content/pages/pricing/style-1/style-1.component.html +++ b/src/app/main/content/pages/pricing/style-1/style-1.component.html @@ -20,7 +20,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
Frequently Asked Questions
diff --git a/src/app/main/content/pages/pricing/style-2/style-2.component.html b/src/app/main/content/pages/pricing/style-2/style-2.component.html index b79554e8..d79f0b5e 100644 --- a/src/app/main/content/pages/pricing/style-2/style-2.component.html +++ b/src/app/main/content/pages/pricing/style-2/style-2.component.html @@ -20,7 +20,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
Frequently Asked Questions
diff --git a/src/app/main/content/pages/pricing/style-3/style-3.component.html b/src/app/main/content/pages/pricing/style-3/style-3.component.html index 25e8cfdc..a4d7759a 100644 --- a/src/app/main/content/pages/pricing/style-3/style-3.component.html +++ b/src/app/main/content/pages/pricing/style-3/style-3.component.html @@ -20,7 +20,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
Frequently Asked Questions
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.html b/src/app/main/content/pages/profile/tabs/about/about.component.html index cba86b6c..0ac9c5d2 100644 --- a/src/app/main/content/pages/profile/tabs/about/about.component.html +++ b/src/app/main/content/pages/profile/tabs/about/about.component.html @@ -1,4 +1,4 @@ -
+
@@ -111,7 +111,7 @@
-
+
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html index ea84dbef..6fa12431 100644 --- a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html +++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html @@ -6,7 +6,7 @@ {{period.info}}
-
+
{{media.title}}
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html index 1074f914..d863c706 100644 --- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html +++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html @@ -1,4 +1,4 @@ -
+
@@ -141,7 +141,7 @@
See All
-
+
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/content/ui/forms/forms.component.html index 779ded79..1cdde49d 100644 --- a/src/app/main/content/ui/forms/forms.component.html +++ b/src/app/main/content/ui/forms/forms.component.html @@ -62,7 +62,7 @@
-
+
+ +

+
+ +
+

[name]

+

+ name attribute allows you to set a unique name to the sidebar. It's required for sidebar to + work correctly, as every sidebar being registered to the sidebar service. +

+
+ +
+

[folded]

+

+ Controls the folded status of the sidebar. +

+
+ +
+

[lockedOpen]

+

+ Accepts Angular Material breakpoint aliases ('gt-md', 'lg' etc.) and locks open the sidebar if the + alias matches the current breakpoint, similar to how Angular Material 1.x sidenav works. +

+
+ +
+ +
+ diff --git a/src/app/main/content/components/sidebar/sidebar.component.scss b/src/app/main/content/components/sidebar/sidebar.component.scss new file mode 100644 index 00000000..38d84b8f --- /dev/null +++ b/src/app/main/content/components/sidebar/sidebar.component.scss @@ -0,0 +1,7 @@ +:host { + + .content{ + max-width: 1100px; + } + +} diff --git a/src/app/main/content/components/sidebar/sidebar.component.ts b/src/app/main/content/components/sidebar/sidebar.component.ts new file mode 100644 index 00000000..ed91b597 --- /dev/null +++ b/src/app/main/content/components/sidebar/sidebar.component.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; + +@Component({ + selector : 'fuse-sidebar-docs', + templateUrl: './sidebar.component.html', + styleUrls : ['./sidebar.component.scss'] +}) +export class FuseSidebarDocsComponent +{ + constructor() + { + } +} diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index d89c49db..44cb879c 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -855,6 +855,13 @@ export const navigation = [ 'icon' : 'settings_input_component', 'url' : '/components/search-bar' }, + { + 'id' : 'sidebar', + 'title': 'Sidebar', + 'type' : 'item', + 'icon' : 'settings_input_component', + 'url' : '/components/sidebar' + }, { 'id' : 'shortcuts', 'title': 'Shortcuts', From 8c4a714d395a145df89e761d2be767d6b699f359 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 8 Mar 2018 11:48:38 +0300 Subject: [PATCH 17/20] Updated Angular Material element examples --- .../angular-material/example-components.ts | 333 +++++++++++------- src/app/navigation/navigation.ts | 6 + ...plete-auto-active-first-option-example.css | 9 + ...lete-auto-active-first-option-example.html | 10 + ...mplete-auto-active-first-option-example.ts | 31 ++ .../datepicker-custom-icon-example.css} | 0 .../datepicker-custom-icon-example.html | 7 + .../datepicker-custom-icon-example.ts | 9 + .../divider-overview-example.css | 1 + .../divider-overview-example.html | 7 + .../divider-overview-example.ts | 11 + .../form-field-label-example.css} | 12 +- .../form-field-label-example.html | 34 ++ .../form-field-label-example.ts | 19 + .../form-field-placeholder-example.html | 31 -- .../form-field-placeholder-example.ts | 21 -- .../icon-svg-example/icon-svg-example.css | 1 + .../icon-svg-example.html | 0 .../icon-svg-example/icon-svg-example.ts | 19 + .../icon-svg/icon-svg-example.ts | 20 -- .../sidenav-autosize-example.css | 16 + .../sidenav-autosize-example.html | 16 + .../sidenav-autosize-example.ts | 13 + .../sidenav-fab/sidenav-fab-example.css | 26 -- .../sidenav-fab/sidenav-fab-example.html | 32 -- .../sidenav-fab/sidenav-fab-example.ts | 15 - .../snack-bar-position-example.html | 19 + .../snack-bar-position-example.ts | 29 ++ .../table-selection-example.css | 15 + .../table-selection-example.html | 49 +++ .../table-selection-example.ts | 61 ++++ .../tooltip-delay/tooltip-delay-example.css | 3 + .../tooltip-delay/tooltip-delay-example.html | 7 + .../tooltip-delay/tooltip-delay-example.ts | 11 + .../tooltip-manual/tooltip-manual-example.css | 1 + .../tooltip-manual-example.html | 5 + .../tooltip-manual/tooltip-manual-example.ts | 11 + .../tooltip-modified-defaults-example.css | 1 + .../tooltip-modified-defaults-example.html | 3 + .../tooltip-modified-defaults-example.ts | 22 ++ 40 files changed, 655 insertions(+), 281 deletions(-) create mode 100755 src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.css create mode 100755 src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.html create mode 100755 src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.ts rename src/assets/angular-material-examples/{icon-svg/icon-svg-example.css => datepicker-custom-icon/datepicker-custom-icon-example.css} (100%) mode change 100644 => 100755 create mode 100755 src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.html create mode 100755 src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.ts create mode 100755 src/assets/angular-material-examples/divider-overview/divider-overview-example.css create mode 100755 src/assets/angular-material-examples/divider-overview/divider-overview-example.html create mode 100755 src/assets/angular-material-examples/divider-overview/divider-overview-example.ts rename src/assets/angular-material-examples/{form-field-placeholder/form-field-placeholder-example.css => form-field-label/form-field-label-example.css} (54%) mode change 100644 => 100755 create mode 100755 src/assets/angular-material-examples/form-field-label/form-field-label-example.html create mode 100755 src/assets/angular-material-examples/form-field-label/form-field-label-example.ts delete mode 100644 src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.html delete mode 100644 src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.ts create mode 100755 src/assets/angular-material-examples/icon-svg-example/icon-svg-example.css rename src/assets/angular-material-examples/{icon-svg => icon-svg-example}/icon-svg-example.html (100%) mode change 100644 => 100755 create mode 100755 src/assets/angular-material-examples/icon-svg-example/icon-svg-example.ts delete mode 100644 src/assets/angular-material-examples/icon-svg/icon-svg-example.ts create mode 100755 src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.css create mode 100755 src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.html create mode 100755 src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.ts delete mode 100644 src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.css delete mode 100644 src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.html delete mode 100644 src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.ts create mode 100755 src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.html create mode 100755 src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.ts create mode 100755 src/assets/angular-material-examples/table-selection/table-selection-example.css create mode 100755 src/assets/angular-material-examples/table-selection/table-selection-example.html create mode 100755 src/assets/angular-material-examples/table-selection/table-selection-example.ts create mode 100755 src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.css create mode 100755 src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.html create mode 100755 src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.ts create mode 100755 src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.css create mode 100755 src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.html create mode 100755 src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.ts create mode 100755 src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.css create mode 100755 src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.html create mode 100755 src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.ts diff --git a/src/app/main/content/components/angular-material/example-components.ts b/src/app/main/content/components/angular-material/example-components.ts index 59fb02c0..6d53ac15 100644 --- a/src/app/main/content/components/angular-material/example-components.ts +++ b/src/app/main/content/components/angular-material/example-components.ts @@ -1,3 +1,4 @@ +import { AutocompleteAutoActiveFirstOptionExample } from 'assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example'; import { AutocompleteDisplayExample } from 'assets/angular-material-examples/autocomplete-display/autocomplete-display-example'; import { AutocompleteFilterExample } from 'assets/angular-material-examples/autocomplete-filter/autocomplete-filter-example'; import { AutocompleteOverviewExample } from 'assets/angular-material-examples/autocomplete-overview/autocomplete-overview-example'; @@ -37,13 +38,12 @@ import { MyTelInput, FormFieldCustomControlExample } from 'assets/angular-materi import { FormFieldErrorExample } from 'assets/angular-material-examples/form-field-error/form-field-error-example'; import { FormFieldHintExample } from 'assets/angular-material-examples/form-field-hint/form-field-hint-example'; import { FormFieldOverviewExample } from 'assets/angular-material-examples/form-field-overview/form-field-overview-example'; -import { FormFieldPlaceholderExample } from 'assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example'; import { FormFieldPrefixSuffixExample } from 'assets/angular-material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example'; import { FormFieldThemingExample } from 'assets/angular-material-examples/form-field-theming/form-field-theming-example'; import { GridListDynamicExample } from 'assets/angular-material-examples/grid-list-dynamic/grid-list-dynamic-example'; import { GridListOverviewExample } from 'assets/angular-material-examples/grid-list-overview/grid-list-overview-example'; import { IconOverviewExample } from 'assets/angular-material-examples/icon-overview/icon-overview-example'; -import { IconSvgExample } from 'assets/angular-material-examples/icon-svg/icon-svg-example'; +import { IconSvgExample } from 'assets/angular-material-examples/icon-svg-example/icon-svg-example'; import { InputAutosizeTextareaExample } from 'assets/angular-material-examples/input-autosize-textarea/input-autosize-textarea-example'; import { InputClearableExample } from 'assets/angular-material-examples/input-clearable/input-clearable-example'; import { InputErrorStateMatcherExample } from 'assets/angular-material-examples/input-error-state-matcher/input-error-state-matcher-example'; @@ -81,7 +81,6 @@ import { SelectOverviewExample } from 'assets/angular-material-examples/select-o import { SelectPanelClassExample } from 'assets/angular-material-examples/select-panel-class/select-panel-class-example'; import { SelectResetExample } from 'assets/angular-material-examples/select-reset/select-reset-example'; import { SelectValueBindingExample } from 'assets/angular-material-examples/select-value-binding/select-value-binding-example'; -import { SidenavFabExample } from 'assets/angular-material-examples/sidenav-fab/sidenav-fab-example'; import { SidenavOverviewExample } from 'assets/angular-material-examples/sidenav-overview/sidenav-overview-example'; import { SlideToggleConfigurableExample } from 'assets/angular-material-examples/slide-toggle-configurable/slide-toggle-configurable-example'; import { SlideToggleFormsExample } from 'assets/angular-material-examples/slide-toggle-forms/slide-toggle-forms-example'; @@ -104,9 +103,19 @@ import { ToolbarMultirowExample } from 'assets/angular-material-examples/toolbar import { ToolbarOverviewExample } from 'assets/angular-material-examples/toolbar-overview/toolbar-overview-example'; import { TooltipOverviewExample } from 'assets/angular-material-examples/tooltip-overview/tooltip-overview-example'; import { TooltipPositionExample } from 'assets/angular-material-examples/tooltip-position/tooltip-position-example'; +import { DatepickerCustomIconExample } from 'assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example'; +import { SidenavAutosizeExample } from 'assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example'; +import { SnackBarPositionExample } from 'assets/angular-material-examples/snack-bar-position/snack-bar-position-example'; +import { TableSelectionExample } from 'assets/angular-material-examples/table-selection/table-selection-example'; +import { TooltipDelayExample } from 'assets/angular-material-examples/tooltip-delay/tooltip-delay-example'; +import { TooltipManualExample } from 'assets/angular-material-examples/tooltip-manual/tooltip-manual-example'; +import { TooltipModifiedDefaultsExample } from 'assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example'; +import { DividerOverviewExample } from 'assets/angular-material-examples/divider-overview/divider-overview-example'; +import { FormFieldLabelExample } from 'assets/angular-material-examples/form-field-label/form-field-label-example'; export const COMPONENT_MAP = { 'autocomplete' : [ + 'autocomplete-auto-active-first-option', 'autocomplete-simple', 'autocomplete-filter', 'autocomplete-display', @@ -118,6 +127,7 @@ export const COMPONENT_MAP = { ], 'datepicker' : [ 'datepicker-overview', + 'datepicker-custom-icon', 'datepicker-start-view', 'datepicker-value', 'datepicker-min-max', @@ -130,9 +140,11 @@ export const COMPONENT_MAP = { 'datepicker-moment', 'datepicker-formats' ], + 'divider' : [ + 'divider-overview' + ], 'form-field' : [ - 'form-field-overview', - 'form-field-placeholder', + 'form-field-label', 'form-field-hint', 'form-field-error', 'form-field-prefix-suffix', @@ -183,7 +195,7 @@ export const COMPONENT_MAP = { ], 'sidenav' : [ 'sidenav-overview', - 'sidenav-fab' + 'sidenav-autosize' ], 'toolbar' : [ 'toolbar-overview', @@ -252,14 +264,19 @@ export const COMPONENT_MAP = { ], 'tooltip' : [ 'tooltip-overview', - 'tooltip-position' + 'tooltip-position', + 'tooltip-delay', + 'tooltip-manual', + 'tooltip-modified-defaults' ], 'snackbar' : [ - 'snack-bar-overview' + 'snack-bar-overview', + 'snack-bar-position' ], 'data-table' : [ 'table-overview', 'table-basic', + 'table-selection', 'table-filtering', 'table-http' ], @@ -273,645 +290,694 @@ export const COMPONENT_MAP = { }; export const EXAMPLE_COMPONENTS = { - 'autocomplete-display' : { + 'autocomplete-auto-active-first-option': { + title : 'Highlight the first autocomplete option', + component : AutocompleteAutoActiveFirstOptionExample, + additionalFiles: null, + selectorName : null + }, + 'autocomplete-display' : { title : 'Display value autocomplete', component : AutocompleteDisplayExample, additionalFiles: null, selectorName : null }, - 'autocomplete-filter' : { + 'autocomplete-filter' : { title : 'Filter autocomplete', component : AutocompleteFilterExample, additionalFiles: null, selectorName : null }, - 'autocomplete-overview' : { + 'autocomplete-overview' : { title : 'Autocomplete overview', component : AutocompleteOverviewExample, additionalFiles: null, selectorName : null }, - 'autocomplete-simple' : { + 'autocomplete-simple' : { title : 'Simple autocomplete', component : AutocompleteSimpleExample, additionalFiles: null, selectorName : null }, - 'button-overview' : { + 'button-overview' : { title : 'Basic buttons', component : ButtonOverviewExample, additionalFiles: null, selectorName : null }, - 'button-toggle-exclusive' : { + 'button-toggle-exclusive' : { title : 'Exclusive selection', component : ButtonToggleExclusiveExample, additionalFiles: null, selectorName : null }, - 'button-toggle-overview' : { + 'button-toggle-overview' : { title : 'Basic button-toggles', component : ButtonToggleOverviewExample, additionalFiles: null, selectorName : null }, - 'button-types' : { + 'button-types' : { title : 'Button varieties', component : ButtonTypesExample, additionalFiles: null, selectorName : null }, - 'card-fancy' : { + 'card-fancy' : { title : 'Card with multiple sections', component : CardFancyExample, additionalFiles: null, selectorName : null }, - 'card-overview' : { + 'card-overview' : { title : 'Basic cards', component : CardOverviewExample, additionalFiles: null, selectorName : null }, - 'cdk-table-basic' : { + 'cdk-table-basic' : { title : 'Basic CDK data-table', component : CdkTableBasicExample, additionalFiles: null, selectorName : null }, - 'checkbox-configurable' : { + 'checkbox-configurable' : { title : 'Configurable checkbox', component : CheckboxConfigurableExample, additionalFiles: null, selectorName : null }, - 'checkbox-overview' : { + 'checkbox-overview' : { title : 'Basic checkboxes', component : CheckboxOverviewExample, additionalFiles: null, selectorName : null }, - 'chips-input' : { + 'chips-input' : { title : 'Chips with input', component : ChipsInputExample, additionalFiles: null, selectorName : null }, - 'chips-overview' : { + 'chips-overview' : { title : 'Basic chips', component : ChipsOverviewExample, additionalFiles: null, selectorName : null }, - 'chips-stacked' : { + 'chips-stacked' : { title : 'Stacked chips', component : ChipsStackedExample, additionalFiles: null, selectorName : null }, - 'datepicker-api' : { - title : 'Datepicker open method ', + 'datepicker-api' : { + title : 'Datepicker open method', component : DatepickerApiExample, additionalFiles: null, selectorName : null }, - 'datepicker-disabled' : { - title : 'Disabled datepicker ', + 'datepicker-custom-icon' : { + title : 'Datepicker custom icon', + component : DatepickerCustomIconExample, + additionalFiles: null, + selectorName : null + }, + 'datepicker-disabled' : { + title : 'Disabled datepicker', component : DatepickerDisabledExample, additionalFiles: null, selectorName : null }, - 'datepicker-events' : { - title : 'Datepicker input and change events ', + 'datepicker-events' : { + title : 'Datepicker input and change events', component : DatepickerEventsExample, additionalFiles: null, selectorName : null }, - 'datepicker-filter' : { - title : 'Datepicker with filter validation ', + 'datepicker-filter' : { + title : 'Datepicker with filter validation', component : DatepickerFilterExample, additionalFiles: null, selectorName : null }, - 'datepicker-formats' : { - title : 'Datepicker with custom formats ', + 'datepicker-formats' : { + title : 'Datepicker with custom formats', component : DatepickerFormatsExample, additionalFiles: null, selectorName : null }, - 'datepicker-locale' : { - title : 'Datepicker with different locale ', + 'datepicker-locale' : { + title : 'Datepicker with different locale', component : DatepickerLocaleExample, additionalFiles: null, selectorName : null }, - 'datepicker-min-max' : { - title : 'Datepicker with min & max validation ', + 'datepicker-min-max' : { + title : 'Datepicker with min & max validation', component : DatepickerMinMaxExample, additionalFiles: null, selectorName : null }, - 'datepicker-moment' : { + 'datepicker-moment' : { title : 'Datepicker that uses Moment.js dates ', component : DatepickerMomentExample, additionalFiles: null, selectorName : null }, - 'datepicker-overview' : { + 'datepicker-overview' : { title : 'Basic datepicker ', component : DatepickerOverviewExample, additionalFiles: null, selectorName : null }, - 'datepicker-start-view' : { + 'datepicker-start-view' : { title : 'Datepicker start date ', component : DatepickerStartViewExample, additionalFiles: null, selectorName : null }, - 'datepicker-touch' : { + 'datepicker-touch' : { title : 'Datepicker touch UI ', component : DatepickerTouchExample, additionalFiles: null, selectorName : null }, - 'datepicker-value' : { + 'datepicker-value' : { title : 'Datepicker selected value ', component : DatepickerValueExample, additionalFiles: null, selectorName : null }, - 'dialog-content' : { + 'dialog-content' : { title : 'Dialog with header, scrollable content and actions', component : DialogContentExample, additionalFiles: ['dialog-content-example-dialog.html'], selectorName : 'DialogContentExample, DialogContentExampleDialog' }, - 'dialog-data' : { + 'dialog-data' : { title : 'Injecting data when opening a dialog', component : DialogDataExample, additionalFiles: ['dialog-data-example-dialog.html'], selectorName : 'DialogDataExample, DialogDataExampleDialog' }, - 'dialog-elements' : { + 'dialog-elements' : { title : 'Dialog elements', component : DialogElementsExample, additionalFiles: ['dialog-elements-example-dialog.html'], selectorName : 'DialogElementsExample, DialogElementsExampleDialog' }, - 'dialog-overview' : { + 'dialog-overview' : { title : 'Dialog Overview', component : DialogOverviewExample, additionalFiles: ['dialog-overview-example-dialog.html'], selectorName : 'DialogOverviewExample, DialogOverviewExampleDialog' }, - 'elevation-overview' : { + 'divider-overview' : { + title : 'Basic divider', + component : DividerOverviewExample, + additionalFiles: null, + selectorName : null + }, + 'elevation-overview' : { title : 'Elevation CSS classes', component : ElevationOverviewExample, additionalFiles: null, selectorName : null }, - 'expansion-overview' : { + 'expansion-overview' : { title : 'Basic expansion panel', component : ExpansionOverviewExample, additionalFiles: null, selectorName : null }, - 'expansion-steps' : { + 'expansion-steps' : { title : 'Expansion panel as accordion', component : ExpansionStepsExample, additionalFiles: null, selectorName : null }, - 'form-field-custom-control' : { + 'form-field-custom-control' : { title : 'Form field with custom telephone number input control. ', component : FormFieldCustomControlExample, additionalFiles: ['form-field-custom-control-example.html'], selectorName : 'FormFieldCustomControlExample, MyTelInput' }, - 'form-field-error' : { + 'form-field-error' : { title : 'Form field with error messages ', component : FormFieldErrorExample, additionalFiles: null, selectorName : null }, - 'form-field-hint' : { + 'form-field-hint' : { title : 'Form field with hints ', component : FormFieldHintExample, additionalFiles: null, selectorName : null }, - 'form-field-overview' : { + 'form-field-overview' : { title : 'Simple form field ', component : FormFieldOverviewExample, additionalFiles: null, selectorName : null }, - 'form-field-placeholder' : { - title : 'Form field with placeholder ', - component : FormFieldPlaceholderExample, + 'form-field-label' : { + title : 'Form field with label', + component : FormFieldLabelExample, additionalFiles: null, selectorName : null }, - 'form-field-prefix-suffix' : { + 'form-field-prefix-suffix' : { title : 'Form field with prefix & suffix ', component : FormFieldPrefixSuffixExample, additionalFiles: null, selectorName : null }, - 'form-field-theming' : { + 'form-field-theming' : { title : 'Form field theming ', component : FormFieldThemingExample, additionalFiles: null, selectorName : null }, - 'grid-list-dynamic' : { + 'grid-list-dynamic' : { title : 'Dynamic grid-list', component : GridListDynamicExample, additionalFiles: null, selectorName : null }, - 'grid-list-overview' : { + 'grid-list-overview' : { title : 'Basic grid-list', component : GridListOverviewExample, additionalFiles: null, selectorName : null }, - 'icon-overview' : { + 'icon-overview' : { title : 'Basic icons', component : IconOverviewExample, additionalFiles: null, selectorName : null }, - 'icon-svg' : { + 'icon-svg' : { title : 'SVG icons', component : IconSvgExample, additionalFiles: null, selectorName : null }, - 'input-autosize-textarea' : { + 'input-autosize-textarea' : { title : 'Auto-resizing textarea ', component : InputAutosizeTextareaExample, additionalFiles: null, selectorName : null }, - 'input-clearable' : { + 'input-clearable' : { title : 'Input with a clear button', component : InputClearableExample, additionalFiles: null, selectorName : null }, - 'input-error-state-matcher' : { + 'input-error-state-matcher' : { title : 'Input with a custom ErrorStateMatcher ', component : InputErrorStateMatcherExample, additionalFiles: null, selectorName : null }, - 'input-errors' : { + 'input-errors' : { title : 'Input with error messages', component : InputErrorsExample, additionalFiles: null, selectorName : null }, - 'input-form' : { + 'input-form' : { title : 'Inputs in a form', component : InputFormExample, additionalFiles: null, selectorName : null }, - 'input-hint' : { + 'input-hint' : { title : 'Input with hints', component : InputHintExample, additionalFiles: null, selectorName : null }, - 'input-overview' : { + 'input-overview' : { title : 'Basic Inputs', component : InputOverviewExample, additionalFiles: null, selectorName : null }, - 'input-prefix-suffix' : { + 'input-prefix-suffix' : { title : 'Inputs with prefixes and suffixes', component : InputPrefixSuffixExample, additionalFiles: null, selectorName : null }, - 'list-overview' : { + 'list-overview' : { title : 'Basic list', component : ListOverviewExample, additionalFiles: null, selectorName : null }, - 'list-sections' : { + 'list-sections' : { title : 'List with sections', component : ListSectionsExample, additionalFiles: null, selectorName : null }, - 'list-selection' : { + 'list-selection' : { title : 'List with selection', component : ListSelectionExample, additionalFiles: null, selectorName : null }, - 'menu-icons' : { + 'menu-icons' : { title : 'Menu with icons', component : MenuIconsExample, additionalFiles: null, selectorName : null }, - 'menu-overview' : { + 'menu-overview' : { title : 'Basic menu', component : MenuOverviewExample, additionalFiles: null, selectorName : null }, - 'nested-menu' : { + 'nested-menu' : { title : 'Nested menu', component : NestedMenuExample, additionalFiles: null, selectorName : null }, - 'paginator-configurable' : { + 'paginator-configurable' : { title : 'Configurable paginator', component : PaginatorConfigurableExample, additionalFiles: null, selectorName : null }, - 'paginator-overview' : { + 'paginator-overview' : { title : 'Paginator', component : PaginatorOverviewExample, additionalFiles: null, selectorName : null }, - 'progress-bar-buffer' : { + 'progress-bar-buffer' : { title : 'Buffer progress-bar', component : ProgressBarBufferExample, additionalFiles: null, selectorName : null }, - 'progress-bar-configurable' : { + 'progress-bar-configurable' : { title : 'Configurable progress-bar', component : ProgressBarConfigurableExample, additionalFiles: null, selectorName : null }, - 'progress-bar-determinate' : { + 'progress-bar-determinate' : { title : 'Determinate progress-bar', component : ProgressBarDeterminateExample, additionalFiles: null, selectorName : null }, - 'progress-bar-indeterminate' : { + 'progress-bar-indeterminate' : { title : 'Indeterminate progress-bar', component : ProgressBarIndeterminateExample, additionalFiles: null, selectorName : null }, - 'progress-bar-query' : { + 'progress-bar-query' : { title : 'Query progress-bar', component : ProgressBarQueryExample, additionalFiles: null, selectorName : null }, - 'progress-spinner-configurable': { + 'progress-spinner-configurable' : { title : 'Configurable progress spinner', component : ProgressSpinnerConfigurableExample, additionalFiles: null, selectorName : null }, - 'progress-spinner-overview' : { + 'progress-spinner-overview' : { title : 'Basic progress-spinner', component : ProgressSpinnerOverviewExample, additionalFiles: null, selectorName : null }, - 'radio-ng-model' : { + 'radio-ng-model' : { title : 'Radios with ngModel', component : RadioNgModelExample, additionalFiles: null, selectorName : null }, - 'radio-overview' : { + 'radio-overview' : { title : 'Basic radios', component : RadioOverviewExample, additionalFiles: null, selectorName : null }, - 'select-custom-trigger' : { + 'select-custom-trigger' : { title : 'Select with custom trigger text ', component : SelectCustomTriggerExample, additionalFiles: null, selectorName : null }, - 'select-disabled' : { + 'select-disabled' : { title : 'Disabled select ', component : SelectDisabledExample, additionalFiles: null, selectorName : null }, - 'select-error-state-matcher' : { + 'select-error-state-matcher' : { title : 'Select with a custom ErrorStateMatcher ', component : SelectErrorStateMatcherExample, additionalFiles: null, selectorName : null }, - 'select-form' : { + 'select-form' : { title : 'Select in a form', component : SelectFormExample, additionalFiles: null, selectorName : null }, - 'select-hint-error' : { + 'select-hint-error' : { title : 'Select with form field features ', component : SelectHintErrorExample, additionalFiles: null, selectorName : null }, - 'select-multiple' : { + 'select-multiple' : { title : 'Select with multiple selection ', component : SelectMultipleExample, additionalFiles: null, selectorName : null }, - 'select-no-ripple' : { + 'select-no-ripple' : { title : 'Select with no option ripple ', component : SelectNoRippleExample, additionalFiles: null, selectorName : null }, - 'select-optgroup' : { + 'select-optgroup' : { title : 'Select with option groups ', component : SelectOptgroupExample, additionalFiles: null, selectorName : null }, - 'select-overview' : { + 'select-overview' : { title : 'Basic select', component : SelectOverviewExample, additionalFiles: null, selectorName : null }, - 'select-panel-class' : { + 'select-panel-class' : { title : 'Select with custom panel styling', component : SelectPanelClassExample, additionalFiles: null, selectorName : null }, - 'select-reset' : { + 'select-reset' : { title : 'Select with reset option ', component : SelectResetExample, additionalFiles: null, selectorName : null }, - 'select-value-binding' : { + 'select-value-binding' : { title : 'Select with 2-way value binding ', component : SelectValueBindingExample, additionalFiles: null, selectorName : null }, - 'sidenav-fab' : { - title : 'Sidenav with a FAB', - component : SidenavFabExample, - additionalFiles: null, - selectorName : null - }, - 'sidenav-overview' : { + 'sidenav-overview' : { title : 'Basic sidenav', component : SidenavOverviewExample, additionalFiles: null, selectorName : null }, - 'slide-toggle-configurable' : { + 'sidenav-autosize' : { + title : 'Autosize sidenav', + component : SidenavAutosizeExample, + additionalFiles: null, + selectorName : null + }, + 'slide-toggle-configurable' : { title : 'Configurable slide-toggle', component : SlideToggleConfigurableExample, additionalFiles: null, selectorName : null }, - 'slide-toggle-forms' : { + 'slide-toggle-forms' : { title : 'Slide-toggle with forms', component : SlideToggleFormsExample, additionalFiles: null, selectorName : null }, - 'slide-toggle-overview' : { + 'slide-toggle-overview' : { title : 'Basic slide-toggles', component : SlideToggleOverviewExample, additionalFiles: null, selectorName : null }, - 'slider-configurable' : { + 'slider-configurable' : { title : 'Configurable slider', component : SliderConfigurableExample, additionalFiles: null, selectorName : null }, - 'slider-overview' : { + 'slider-overview' : { title : 'Basic slider', component : SliderOverviewExample, additionalFiles: null, selectorName : null }, - 'snack-bar-component' : { + 'snack-bar-component' : { title : 'Snack-bar with a custom component', component : SnackBarComponentExample, additionalFiles: ['snack-bar-component-example-snack.html'], selectorName : 'SnackBarComponentExample, PizzaPartyComponent' }, - 'snack-bar-overview' : { + 'snack-bar-overview' : { title : 'Basic snack-bar', component : SnackBarOverviewExample, additionalFiles: null, selectorName : null }, - 'sort-overview' : { + 'snack-bar-position' : { + title : 'Snack-bar with different positions', + component : SnackBarPositionExample, + additionalFiles: null, + selectorName : null + }, + 'sort-overview' : { title : 'Sorting overview', component : SortOverviewExample, additionalFiles: null, selectorName : null }, - 'stepper-overview' : { + 'stepper-overview' : { title : 'Stepper overview', component : StepperOverviewExample, additionalFiles: null, selectorName : null }, - 'table-basic' : { + 'table-basic' : { title : 'Basic table', component : TableBasicExample, additionalFiles: null, selectorName : null }, - 'table-filtering' : { + 'table-selection' : { + title : 'Table with selection', + component : TableSelectionExample, + additionalFiles: null, + selectorName : null + }, + 'table-filtering' : { title : 'Table with filtering', component : TableFilteringExample, additionalFiles: null, selectorName : null }, - 'table-http' : { + 'table-http' : { title : 'Table retrieving data through HTTP', component : TableHttpExample, additionalFiles: null, selectorName : null }, - 'table-overview' : { + 'table-overview' : { title : 'Data table with sorting, pagination, and filtering.', component : TableOverviewExample, additionalFiles: null, selectorName : null }, - 'table-pagination' : { + 'table-pagination' : { title : 'Table with pagination', component : TablePaginationExample, additionalFiles: null, selectorName : null }, - 'table-sorting' : { + 'table-sorting' : { title : 'Table with sorting', component : TableSortingExample, additionalFiles: null, selectorName : null }, - 'tabs-overview' : { + 'tabs-overview' : { title : 'Basic tabs', component : TabsOverviewExample, additionalFiles: null, selectorName : null }, - 'tabs-template-label' : { + 'tabs-template-label' : { title : 'Complex Example', component : TabsTemplateLabelExample, additionalFiles: null, selectorName : null }, - 'toolbar-multirow' : { + 'toolbar-multirow' : { title : 'Multi-row toolbar', component : ToolbarMultirowExample, additionalFiles: null, selectorName : null }, - 'toolbar-overview' : { + 'toolbar-overview' : { title : 'Basic toolbar', component : ToolbarOverviewExample, additionalFiles: null, selectorName : null }, - 'tooltip-overview' : { + 'tooltip-overview' : { title : 'Basic tooltip', component : TooltipOverviewExample, additionalFiles: null, selectorName : null }, - 'tooltip-position' : { + 'tooltip-position' : { title : 'Tooltip with custom position', component : TooltipPositionExample, additionalFiles: null, selectorName : null + }, + 'tooltip-delay' : { + title : 'Tooltip with a show and hide delay', + component : TooltipDelayExample, + additionalFiles: null, + selectorName : null + }, + 'tooltip-manual' : { + title : 'Tooltip that can be manually shown/hidden.', + component : TooltipManualExample, + additionalFiles: null, + selectorName : null + }, + 'tooltip-modified-defaults' : { + title : 'Tooltip with modified defaults', + component : TooltipModifiedDefaultsExample, + additionalFiles: null, + selectorName : null } }; export const EXAMPLE_LIST = [ + AutocompleteAutoActiveFirstOptionExample, AutocompleteDisplayExample, AutocompleteFilterExample, AutocompleteOverviewExample, @@ -929,6 +995,7 @@ export const EXAMPLE_LIST = [ ChipsOverviewExample, ChipsStackedExample, DatepickerApiExample, + DatepickerCustomIconExample, DatepickerDisabledExample, DatepickerEventsExample, DatepickerFilterExample, @@ -944,6 +1011,7 @@ export const EXAMPLE_LIST = [ DialogDataExampleDialog, DialogDataExample, DialogElementsExampleDialog, DialogElementsExample, DialogOverviewExampleDialog, DialogOverviewExample, + DividerOverviewExample, ElevationOverviewExample, ExpansionOverviewExample, ExpansionStepsExample, @@ -951,7 +1019,7 @@ export const EXAMPLE_LIST = [ FormFieldErrorExample, FormFieldHintExample, FormFieldOverviewExample, - FormFieldPlaceholderExample, + FormFieldLabelExample, FormFieldPrefixSuffixExample, FormFieldThemingExample, GridListDynamicExample, @@ -995,8 +1063,9 @@ export const EXAMPLE_LIST = [ SelectPanelClassExample, SelectResetExample, SelectValueBindingExample, - SidenavFabExample, + SidenavAutosizeExample, SidenavOverviewExample, + SnackBarPositionExample, SlideToggleConfigurableExample, SlideToggleFormsExample, SlideToggleOverviewExample, @@ -1007,6 +1076,7 @@ export const EXAMPLE_LIST = [ SortOverviewExample, StepperOverviewExample, TableBasicExample, + TableSelectionExample, TableFilteringExample, TableHttpExample, TableOverviewExample, @@ -1017,5 +1087,8 @@ export const EXAMPLE_LIST = [ ToolbarMultirowExample, ToolbarOverviewExample, TooltipOverviewExample, + TooltipDelayExample, + TooltipManualExample, + TooltipModifiedDefaultsExample, TooltipPositionExample ]; diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index 44cb879c..f7bfd636 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -685,6 +685,12 @@ export const navigation = [ 'type' : 'item', 'url' : '/components/angular-material/card' }, + { + 'id' : 'divider', + 'title': 'Divider', + 'type' : 'item', + 'url' : '/components/angular-material/divider' + }, { 'id' : 'stepper', 'title': 'Stepper', diff --git a/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.css b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.css new file mode 100755 index 00000000..08fa6753 --- /dev/null +++ b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.css @@ -0,0 +1,9 @@ +.example-form { + min-width: 150px; + max-width: 500px; + width: 100%; +} + +.example-full-width { + width: 100%; +} diff --git a/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.html b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.html new file mode 100755 index 00000000..45090946 --- /dev/null +++ b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.html @@ -0,0 +1,10 @@ +
+ + + + + {{ option }} + + + +
diff --git a/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.ts b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.ts new file mode 100755 index 00000000..64868772 --- /dev/null +++ b/src/assets/angular-material-examples/autocomplete-auto-active-first-option/autocomplete-auto-active-first-option-example.ts @@ -0,0 +1,31 @@ +import {Component} from '@angular/core'; +import {FormControl} from '@angular/forms'; +import {Observable} from 'rxjs/Observable'; +import {startWith} from 'rxjs/operators/startWith'; +import {map} from 'rxjs/operators/map'; + +/** + * @title Highlight the first autocomplete option + */ +@Component({ + selector: 'autocomplete-auto-active-first-option-example', + templateUrl: 'autocomplete-auto-active-first-option-example.html', + styleUrls: ['autocomplete-auto-active-first-option-example.css'] +}) +export class AutocompleteAutoActiveFirstOptionExample { + myControl: FormControl = new FormControl(); + options = ['One', 'Two', 'Three']; + filteredOptions: Observable; + + ngOnInit() { + this.filteredOptions = this.myControl.valueChanges.pipe( + startWith(''), + map(val => this.filter(val)) + ); + } + + filter(val: string): string[] { + return this.options.filter(option => option.toLowerCase().indexOf(val.toLowerCase()) === 0); + } + +} diff --git a/src/assets/angular-material-examples/icon-svg/icon-svg-example.css b/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.css old mode 100644 new mode 100755 similarity index 100% rename from src/assets/angular-material-examples/icon-svg/icon-svg-example.css rename to src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.css diff --git a/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.html b/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.html new file mode 100755 index 00000000..a1b4e5d5 --- /dev/null +++ b/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.html @@ -0,0 +1,7 @@ + + + + keyboard_arrow_down + + + diff --git a/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.ts b/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.ts new file mode 100755 index 00000000..115dab66 --- /dev/null +++ b/src/assets/angular-material-examples/datepicker-custom-icon/datepicker-custom-icon-example.ts @@ -0,0 +1,9 @@ +import {Component} from '@angular/core'; + +/** @title Datepicker with custom icon */ +@Component({ + selector: 'datepicker-custom-icon-example', + templateUrl: 'datepicker-custom-icon-example.html', + styleUrls: ['datepicker-custom-icon-example.css'], +}) +export class DatepickerCustomIconExample {} diff --git a/src/assets/angular-material-examples/divider-overview/divider-overview-example.css b/src/assets/angular-material-examples/divider-overview/divider-overview-example.css new file mode 100755 index 00000000..74323087 --- /dev/null +++ b/src/assets/angular-material-examples/divider-overview/divider-overview-example.css @@ -0,0 +1 @@ +/** No CSS for this example */ diff --git a/src/assets/angular-material-examples/divider-overview/divider-overview-example.html b/src/assets/angular-material-examples/divider-overview/divider-overview-example.html new file mode 100755 index 00000000..c0e121f0 --- /dev/null +++ b/src/assets/angular-material-examples/divider-overview/divider-overview-example.html @@ -0,0 +1,7 @@ + + Item 1 + + Item 2 + + Item 3 + diff --git a/src/assets/angular-material-examples/divider-overview/divider-overview-example.ts b/src/assets/angular-material-examples/divider-overview/divider-overview-example.ts new file mode 100755 index 00000000..536b600e --- /dev/null +++ b/src/assets/angular-material-examples/divider-overview/divider-overview-example.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +/** + * @title Basic divider + */ +@Component({ + selector: 'divider-overview-example', + templateUrl: 'divider-overview-example.html', + styleUrls: ['divider-overview-example.css'], +}) +export class DividerOverviewExample {} diff --git a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.css b/src/assets/angular-material-examples/form-field-label/form-field-label-example.css old mode 100644 new mode 100755 similarity index 54% rename from src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.css rename to src/assets/angular-material-examples/form-field-label/form-field-label-example.css index 4118084a..333087a4 --- a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.css +++ b/src/assets/angular-material-examples/form-field-label/form-field-label-example.css @@ -1,20 +1,20 @@ .example-container { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .example-container > * { - width: 100%; + width: 100%; } .example-container form { - margin-bottom: 20px; + margin-bottom: 20px; } .example-container form > * { - margin: 5px 0; + margin: 5px 0; } .example-container .mat-radio-button { - margin: 0 5px; + margin: 0 5px; } diff --git a/src/assets/angular-material-examples/form-field-label/form-field-label-example.html b/src/assets/angular-material-examples/form-field-label/form-field-label-example.html new file mode 100755 index 00000000..0f7066bb --- /dev/null +++ b/src/assets/angular-material-examples/form-field-label/form-field-label-example.html @@ -0,0 +1,34 @@ +
+
+ Hide required marker +
+ + + Auto + Always + Never + +
+
+ + + + + + + Both a label and a placeholder + + + + + + -- None -- + Option + + favorite Fancy placeholder + +
diff --git a/src/assets/angular-material-examples/form-field-label/form-field-label-example.ts b/src/assets/angular-material-examples/form-field-label/form-field-label-example.ts new file mode 100755 index 00000000..4ebb56e3 --- /dev/null +++ b/src/assets/angular-material-examples/form-field-label/form-field-label-example.ts @@ -0,0 +1,19 @@ +import {Component} from '@angular/core'; +import {FormBuilder, FormGroup} from '@angular/forms'; + +/** @title Form field with label */ +@Component({ + selector: 'form-field-label-example', + templateUrl: 'form-field-label-example.html', + styleUrls: ['form-field-label-example.css'] +}) +export class FormFieldLabelExample { + options: FormGroup; + + constructor(fb: FormBuilder) { + this.options = fb.group({ + hideRequired: false, + floatLabel: 'auto', + }); + } +} diff --git a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.html b/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.html deleted file mode 100644 index 384e461c..00000000 --- a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
- Hide required marker -
- - - Auto - Always - Never - -
-
- - - - - - - - -- None -- - Option - - - favorite - Fancy placeholder - -
diff --git a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.ts b/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.ts deleted file mode 100644 index 92fb35c5..00000000 --- a/src/assets/angular-material-examples/form-field-placeholder/form-field-placeholder-example.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; - -/** @title Form field with placeholder */ -@Component({ - selector : 'form-field-placeholder-example', - templateUrl: 'form-field-placeholder-example.html', - styleUrls : ['form-field-placeholder-example.css'] -}) -export class FormFieldPlaceholderExample -{ - options: FormGroup; - - constructor(fb: FormBuilder) - { - this.options = fb.group({ - hideRequired : false, - floatPlaceholder: 'auto' - }); - } -} diff --git a/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.css b/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.css new file mode 100755 index 00000000..74323087 --- /dev/null +++ b/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.css @@ -0,0 +1 @@ +/** No CSS for this example */ diff --git a/src/assets/angular-material-examples/icon-svg/icon-svg-example.html b/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.html old mode 100644 new mode 100755 similarity index 100% rename from src/assets/angular-material-examples/icon-svg/icon-svg-example.html rename to src/assets/angular-material-examples/icon-svg-example/icon-svg-example.html diff --git a/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.ts b/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.ts new file mode 100755 index 00000000..21c4c03a --- /dev/null +++ b/src/assets/angular-material-examples/icon-svg-example/icon-svg-example.ts @@ -0,0 +1,19 @@ +import {Component} from '@angular/core'; +import {DomSanitizer} from '@angular/platform-browser'; +import {MatIconRegistry} from '@angular/material'; + +/** + * @title SVG icons + */ +@Component({ + selector: 'icon-svg-example', + templateUrl: 'icon-svg-example.html', + styleUrls: ['icon-svg-example.css'], +}) +export class IconSvgExample { + constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) { + iconRegistry.addSvgIcon( + 'thumbs-up', + sanitizer.bypassSecurityTrustResourceUrl('assets/images/examples/thumbup-icon.svg')); + } +} diff --git a/src/assets/angular-material-examples/icon-svg/icon-svg-example.ts b/src/assets/angular-material-examples/icon-svg/icon-svg-example.ts deleted file mode 100644 index 4cea0740..00000000 --- a/src/assets/angular-material-examples/icon-svg/icon-svg-example.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component } from '@angular/core'; -import { DomSanitizer } from '@angular/platform-browser'; -import { MatIconRegistry } from '@angular/material'; - -/** - * @title SVG icons - */ -@Component({ - selector : 'icon-svg-example', - templateUrl: 'icon-svg-example.html' -}) -export class IconSvgExample -{ - constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) - { - iconRegistry.addSvgIcon( - 'thumbs-up', - sanitizer.bypassSecurityTrustResourceUrl('assets/images/examples/thumbup-icon.svg')); - } -} diff --git a/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.css b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.css new file mode 100755 index 00000000..8ab00588 --- /dev/null +++ b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.css @@ -0,0 +1,16 @@ +.example-container { + width: 500px; + height: 300px; + border: 1px solid rgba(0, 0, 0, 0.5); +} + +.example-sidenav-content { + display: flex; + height: 100%; + align-items: center; + justify-content: center; +} + +.example-sidenav { + padding: 20px; +} diff --git a/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.html b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.html new file mode 100755 index 00000000..f9326a38 --- /dev/null +++ b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.html @@ -0,0 +1,16 @@ + + +

Auto-resizing sidenav

+

Lorem, ipsum dolor sit amet consectetur.

+ + + +
+ +
+ + diff --git a/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.ts b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.ts new file mode 100755 index 00000000..f7565c09 --- /dev/null +++ b/src/assets/angular-material-examples/sidenav-autosize/sidenav-autosize-example.ts @@ -0,0 +1,13 @@ +import {Component} from '@angular/core'; + +/** + * @title Autosize sidenav + */ +@Component({ + selector: 'sidenav-autosize-example', + templateUrl: 'sidenav-autosize-example.html', + styleUrls: ['sidenav-autosize-example.css'], +}) +export class SidenavAutosizeExample { + showFiller = false; +} diff --git a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.css b/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.css deleted file mode 100644 index d98e36e9..00000000 --- a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.css +++ /dev/null @@ -1,26 +0,0 @@ -.example-sidenav-fab-container { - width: 500px; - height: 300px; - border: 1px solid rgba(0, 0, 0, 0.5); -} - -.example-sidenav-fab-container mat-sidenav { - max-width: 200px; -} - -.example-sidenav-fab-container .mat-sidenav-content, -.example-sidenav-fab-container mat-sidenav { - display: flex; - overflow: visible; -} - -.example-scrolling-content { - overflow: auto; - height: 100%; -} - -.example-fab.mat-mini-fab { - position: absolute; - right: 20px; - bottom: 10px; -} diff --git a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.html b/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.html deleted file mode 100644 index 319ba69f..00000000 --- a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.html +++ /dev/null @@ -1,32 +0,0 @@ - - - -
- Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, - fusce vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam - nunc id, neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna - aliquam magna. Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor - vel urna occaecat cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at, - ligula ipsum dui sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu - enim fringilla. Arcu erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis, - tristique vehicula nibh ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. - Taciti dui, sapien consectetuer. -
- - -
- Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, fusce - vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam nunc id, - neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna aliquam magna. - Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor vel urna occaecat - cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at, ligula ipsum dui - sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu enim fringilla. Arcu - erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis, tristique vehicula nibh - ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. Taciti dui, sapien - consectetuer. -
- diff --git a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.ts b/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.ts deleted file mode 100644 index 17945be6..00000000 --- a/src/assets/angular-material-examples/sidenav-fab/sidenav-fab-example.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, ViewEncapsulation } from '@angular/core'; - -/** - * @title Sidenav with a FAB - */ -@Component({ - selector : 'sidenav-fab-example', - templateUrl : 'sidenav-fab-example.html', - styleUrls : ['sidenav-fab-example.css'], - encapsulation : ViewEncapsulation.None, - preserveWhitespaces: false -}) -export class SidenavFabExample -{ -} diff --git a/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.html b/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.html new file mode 100755 index 00000000..ddfe4aa6 --- /dev/null +++ b/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.html @@ -0,0 +1,19 @@ + + + Start + Center + End + Left + Right + + + + + Top + Bottom + + + + diff --git a/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.ts b/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.ts new file mode 100755 index 00000000..f18d10fe --- /dev/null +++ b/src/assets/angular-material-examples/snack-bar-position/snack-bar-position-example.ts @@ -0,0 +1,29 @@ +import {Component} from '@angular/core'; +import { + MatSnackBar, + MatSnackBarHorizontalPosition, + MatSnackBarVerticalPosition, +} from '@angular/material'; + +/** + * @title Snack-bar with configurable position + */ +@Component({ + selector: 'snack-bar-position-example', + templateUrl: 'snack-bar-position-example.html', +}) +export class SnackBarPositionExample { + + horizontalPosition: MatSnackBarHorizontalPosition = 'start'; + verticalPosition: MatSnackBarVerticalPosition = 'bottom'; + + constructor(public snackBar: MatSnackBar) {} + + openSnackBar() { + this.snackBar.open('Canonball!!', 'End now', { + duration: 500, + horizontalPosition: this.horizontalPosition, + verticalPosition: this.verticalPosition, + }); + } +} diff --git a/src/assets/angular-material-examples/table-selection/table-selection-example.css b/src/assets/angular-material-examples/table-selection/table-selection-example.css new file mode 100755 index 00000000..ee01a3c8 --- /dev/null +++ b/src/assets/angular-material-examples/table-selection/table-selection-example.css @@ -0,0 +1,15 @@ +.example-container { + display: flex; + flex-direction: column; + max-height: 500px; + min-width: 300px; +} + +.mat-table { + overflow: auto; + max-height: 500px; +} + +.mat-column-select { + overflow: visible; +} diff --git a/src/assets/angular-material-examples/table-selection/table-selection-example.html b/src/assets/angular-material-examples/table-selection/table-selection-example.html new file mode 100755 index 00000000..9f920558 --- /dev/null +++ b/src/assets/angular-material-examples/table-selection/table-selection-example.html @@ -0,0 +1,49 @@ +
+ + + + + + + + + + + + + + + + + No. + {{element.position}} + + + + + Name + {{element.name}} + + + + + Weight + {{element.weight}} + + + + + Symbol + {{element.symbol}} + + + + + + +
diff --git a/src/assets/angular-material-examples/table-selection/table-selection-example.ts b/src/assets/angular-material-examples/table-selection/table-selection-example.ts new file mode 100755 index 00000000..88e72ead --- /dev/null +++ b/src/assets/angular-material-examples/table-selection/table-selection-example.ts @@ -0,0 +1,61 @@ +import {Component} from '@angular/core'; +import {MatTableDataSource} from '@angular/material'; +import {SelectionModel} from '@angular/cdk/collections'; + +/** + * @title Table with selection + */ +@Component({ + selector: 'table-selection-example', + styleUrls: ['table-selection-example.css'], + templateUrl: 'table-selection-example.html', +}) +export class TableSelectionExample { + displayedColumns = ['select', 'position', 'name', 'weight', 'symbol']; + dataSource = new MatTableDataSource(ELEMENT_DATA); + selection = new SelectionModel(true, []); + + /** Whether the number of selected elements matches the total number of rows. */ + isAllSelected() { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.data.length; + return numSelected === numRows; + } + + /** Selects all rows if they are not all selected; otherwise clear selection. */ + masterToggle() { + this.isAllSelected() ? + this.selection.clear() : + this.dataSource.data.forEach(row => this.selection.select(row)); + } +} + +export interface Element { + name: string; + position: number; + weight: number; + symbol: string; +} + +const ELEMENT_DATA: Element[] = [ + {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'}, + {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'}, + {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'}, + {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'}, + {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'}, + {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'}, + {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'}, + {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'}, + {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'}, + {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'}, + {position: 11, name: 'Sodium', weight: 22.9897, symbol: 'Na'}, + {position: 12, name: 'Magnesium', weight: 24.305, symbol: 'Mg'}, + {position: 13, name: 'Aluminum', weight: 26.9815, symbol: 'Al'}, + {position: 14, name: 'Silicon', weight: 28.0855, symbol: 'Si'}, + {position: 15, name: 'Phosphorus', weight: 30.9738, symbol: 'P'}, + {position: 16, name: 'Sulfur', weight: 32.065, symbol: 'S'}, + {position: 17, name: 'Chlorine', weight: 35.453, symbol: 'Cl'}, + {position: 18, name: 'Argon', weight: 39.948, symbol: 'Ar'}, + {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'}, + {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'}, +]; diff --git a/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.css b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.css new file mode 100755 index 00000000..56d5205c --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.css @@ -0,0 +1,3 @@ +button { + margin: 8px; +} diff --git a/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.html b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.html new file mode 100755 index 00000000..7cd4a164 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.html @@ -0,0 +1,7 @@ + + + diff --git a/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.ts b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.ts new file mode 100755 index 00000000..3e7ce9c5 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-delay/tooltip-delay-example.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +/** + * @title Tooltip with a show and hide delay + */ +@Component({ + selector: 'tooltip-delay-example', + templateUrl: 'tooltip-delay-example.html', + styleUrls: ['tooltip-delay-example.css'], +}) +export class TooltipDelayExample {} diff --git a/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.css b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.css new file mode 100755 index 00000000..74323087 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.css @@ -0,0 +1 @@ +/** No CSS for this example */ diff --git a/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.html b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.html new file mode 100755 index 00000000..3e5ca183 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.html @@ -0,0 +1,5 @@ + + + + I have a tooltip + diff --git a/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.ts b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.ts new file mode 100755 index 00000000..e39a760a --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-manual/tooltip-manual-example.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +/** + * @title Tooltip that can be manually shown/hidden. + */ +@Component({ + selector: 'tooltip-manual-example', + templateUrl: 'tooltip-manual-example.html', + styleUrls: ['tooltip-manual-example.css'], +}) +export class TooltipManualExample {} diff --git a/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.css b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.css new file mode 100755 index 00000000..74323087 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.css @@ -0,0 +1 @@ +/** No CSS for this example */ diff --git a/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.html b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.html new file mode 100755 index 00000000..8dcc0d0e --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.html @@ -0,0 +1,3 @@ + diff --git a/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.ts b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.ts new file mode 100755 index 00000000..53cd3bc2 --- /dev/null +++ b/src/assets/angular-material-examples/tooltip-modified-defaults/tooltip-modified-defaults-example.ts @@ -0,0 +1,22 @@ +import {Component} from '@angular/core'; +import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/material'; + +/** Custom options the configure the tooltip's default show/hide delays. */ +export const myCustomTooltipDefaults: MatTooltipDefaultOptions = { + showDelay: 1000, + hideDelay: 1000, + touchendHideDelay: 1000, +}; + +/** + * @title Tooltip with a show and hide delay + */ +@Component({ + selector: 'tooltip-modified-defaults-example', + templateUrl: 'tooltip-modified-defaults-example.html', + styleUrls: ['tooltip-modified-defaults-example.css'], + providers: [ + {provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: myCustomTooltipDefaults} + ], +}) +export class TooltipModifiedDefaultsExample {} From 535dbdfe57a6114eeb5e63075b3a630d5260744b Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 8 Mar 2018 11:49:13 +0300 Subject: [PATCH 18/20] Updated Angular and Angular Material and various other libs + Added Community page link to the Readme --- README.md | 2 +- package-lock.json | 262 +++++++++++++++++++++++----------------------- package.json | 44 ++++---- 3 files changed, 153 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index 07d2e78f..9f460002 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Material Design Admin Template with Angular 5+ and Angular Material 2 Share your ideas, discuss Fuse and help each other. -[Click here](https://join.slack.com/t/fuse-theme/shared_invite/enQtMzA1NDE4NzYwMjcyLWQxODE4ODM1MWU4MWJjMDhlMGEwYzM4Mzg3N2E4YzVlZThhZjNlOTQ1Y2Q5OTBlNDNkMzJhZDIwMjgxOWQ3YWU) to join our Slack workspace. +[Click here](http://fusetheme.com/community) to see our Community page. ## Development server diff --git a/package-lock.json b/package-lock.json index 21a807f3..422034a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "5.2.7", + "version": "5.2.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -58,32 +58,32 @@ } }, "@angular/animations": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.7.tgz", - "integrity": "sha512-t/B0z2OYO+yy8SJKB1/evSNPvnLsl+AclhM1p21/NnETxQUqvct1KXeDM7nYDu5hmnGmuavhua8LDo6rN5zS+Q==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.8.tgz", + "integrity": "sha512-VfHN7ICR9QBaEbA02ip7ipNjD6m9ayfsliIE/ACkTVevObEdL90T3Q/NxiX+JRZSDL09M9XopIi1/WOeOn6Evw==", "requires": { "tslib": "1.9.0" } }, "@angular/cdk": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.3.tgz", - "integrity": "sha512-o95vQCJ1FpHLQj/ZfIrOya/rK0S7VwiY5vjEivpFnH25kHF5LNT4LTj6BOFkPbClMHTIM2wdKwWnuTfK0bg9WA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.4.tgz", + "integrity": "sha1-wKQpqHENj+2xV/VG4hy0nUM19/c=", "requires": { "tslib": "1.9.0" } }, "@angular/cli": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.2.tgz", - "integrity": "sha512-U0RXiG6rNe5GqZazn+FLy3p4rOhBwpf5NWAec/JKe+u/cekIsyeDXLfqGJwzLhMEV4Iv2k4i3o5imejkEc4A9g==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.3.tgz", + "integrity": "sha512-19sh0SbjneG7/R/FvZBfHsHqfIqyj4LQuXdddJKMCDM97UoHQTjfgrpRvBf3a3lR79wdLXchWJBD9Yc6ifosEA==", "dev": true, "requires": { "@angular-devkit/build-optimizer": "0.3.2", "@angular-devkit/core": "0.3.2", "@angular-devkit/schematics": "0.3.2", "@ngtools/json-schema": "1.2.0", - "@ngtools/webpack": "1.10.1", + "@ngtools/webpack": "1.10.2", "@schematics/angular": "0.3.2", "@schematics/package-update": "0.3.2", "ajv": "6.2.1", @@ -91,7 +91,7 @@ "cache-loader": "1.2.2", "chalk": "2.2.2", "circular-dependency-plugin": "4.4.0", - "clean-css": "4.1.10", + "clean-css": "4.1.11", "common-tags": "1.7.2", "copy-webpack-plugin": "4.4.3", "core-object": "3.1.5", @@ -141,25 +141,25 @@ } }, "@angular/common": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.7.tgz", - "integrity": "sha512-TqsDMmPX1JlEH2QIneuAVzEO4ubzxLBAdV4XbKWDQKC/UfbWIIpSrSp2cIi85NV1tKkg0WAaodCIZ02NucHIHg==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.8.tgz", + "integrity": "sha512-vHODEZPDtBU5b7a2GjtQYPYmCPRq5FQsJp696pebGMJEZdvN/Du43z8V7lWEdBBLGD+oNXX6rXGD9Pr4P/Bg9w==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.7.tgz", - "integrity": "sha512-26RG+Dy+M/95OyNNqM+OAruarIPOmbndiaglz2dMrNYzenfbSgG/AoPlL5uCdSqZDiXgnlKnS2K6/ePWXDSKNw==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.8.tgz", + "integrity": "sha512-xFqY7LDt/LGo6zaYzUwDRGq6Dm2Q9Z2R86ZNdy5wYRzMP+qLnwwENbU74YailKlt02WNtp83R1fdRDDlKI8N+Q==", "requires": { "tslib": "1.9.0" } }, "@angular/compiler-cli": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.7.tgz", - "integrity": "sha512-91gQolzsKyOlmBNW1J7lyu+dXHe/KHbAXU459hn6rycMHuTt60XvxA5O3xy3Pqt28VgbOOSrQfq5eVjZodKjWg==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.8.tgz", + "integrity": "sha512-u0cUfpbU2VNmRfkSS/tlsAzF24/LdlXqv8RFFLReJhwZTv4mKl1DzSjvOf6kfALGHDqCdHsVWcx2YJ8f6CeCMg==", "dev": true, "requires": { "chokidar": "1.7.0", @@ -177,9 +177,9 @@ } }, "@angular/core": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.7.tgz", - "integrity": "sha512-DQuL6n7cjBfZmWX5RCV271g6PW9N8b93g2skWnM/zjm+BL9tfHPgvmsjMNB7QEHSxW8VBaaQ6gjj422O01A87g==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.8.tgz", + "integrity": "sha512-exvh2OY+WDm90bgzZ89Asi2nZc2zrg/OWJuKMbxNfA6nxnyjCQ7uGRjTGr+MOynG+vd54J2Evtg2eDPdbcNg5A==", "requires": { "tslib": "1.9.0" } @@ -193,63 +193,63 @@ } }, "@angular/forms": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.7.tgz", - "integrity": "sha512-43oLKdzMjMV/hOLpSTg8aOggcx+veTnPp/JN+KzMGo2qtbim5nk3fnuscWDeDOdkh8hPRPGarKxeFNEE9ZZSTg==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.8.tgz", + "integrity": "sha512-yxpFwZcek7259O1+4p1Zfd8FOEJs8lh6T8n2W7IBT8Q1pcAMBCYfMi/Xga69AbypFIy3P+V6DaJoq8ZZgpwefg==", "requires": { "tslib": "1.9.0" } }, "@angular/http": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.7.tgz", - "integrity": "sha512-048+tCbsNYc9xVvIn5/sOvO4fXVkbB5b1IRYRGiRYXpTz6+JWIm5AwOqZIOeVDgqgZHFf96QllXDcFbdNVDgSA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.8.tgz", + "integrity": "sha512-vtrO7RLN9v7adVrs/neWStmrCH6+4gm1gYqUYfl6BIYnazACMleqIeAagTbTD08oMblx2dU17NRNbD+2qL8q5A==", "requires": { "tslib": "1.9.0" } }, "@angular/language-service": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.7.tgz", - "integrity": "sha512-Tqd9ll6QBSKa2PKzhbyRiKfKZh4MOB6um3aiedC+m3IBB8zMgrY+EJbfP/SN52LsZdShEnLjuKcBZG0eqTjgEQ==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.8.tgz", + "integrity": "sha512-MEEi1jB7oJgJxHmSDkwlu4Fm1bSU5TpkE3ideqO8ollxPbMgNOYNwH/9Gm634qPD+rvQaeXywKLQ0i+LQQlYiA==", "dev": true }, "@angular/material": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.3.tgz", - "integrity": "sha512-v6IGxGWaeALgBH8+kt2Q9K32zmJQH193bWdCeWmtXk0vJlj3NTiWYy+vLoZQ8aPIAtOqCKCmhf5VrerkS6pgww==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.4.tgz", + "integrity": "sha1-noI3mDJCg9I+qDkVb6xby3NEPVU=", "requires": { "tslib": "1.9.0" } }, "@angular/material-moment-adapter": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.3.tgz", - "integrity": "sha512-ZeyQ0A492OxZR1fqf4wYsXVaRtHtFNuKr6vIL8KBtuX7ZpsMEttj6gzv8bMvCvfZJ/A7EsCgzK7SW0LwYwrWjw==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.2.4.tgz", + "integrity": "sha1-tuR4mYbLQhSJZyd3+nrwEo53Q28=", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.7.tgz", - "integrity": "sha512-SdLx4F6tOy4/s3y1KZ/Z3YA6fiIrydaO2bry2FJglDxJh24p6TZIob+zC16N2MTuFW819KY5OlacNhc8aj6Yag==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.8.tgz", + "integrity": "sha512-f0tONG8+ZQOiv5/hLY76Sl1/BY6AR8Zt4buf2klz7zba5SxKLZwcsk6OfJC2PA0WtlJGiz7cSjbPr0B5sZKv8w==", "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.7.tgz", - "integrity": "sha512-95Rwf1JcGF/BI48k+VG2moLTVC863jPSjmHaGkz7cA9bi/QrRFGvFghl1qIm4Ezp3dj8CH8TE3TWB+1AmAg3AQ==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.8.tgz", + "integrity": "sha512-FzHVZf5XMty0v+hnWOU5PsXexlebvW4+EhfGG85vWCM/M9y0bF3ZSmdqZoXfGO8/Px2JbcBx0r3+GKUgsCieMA==", "requires": { "tslib": "1.9.0" } }, "@angular/router": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.7.tgz", - "integrity": "sha512-ppl0X7EfEgKYXIEPtdy8cOKj5KXuwCQ5Ila+IuGnSjKIRXt/olhBLJMprVl1VJgoxXj7z2i14U7kKaqSvGtpXw==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.8.tgz", + "integrity": "sha512-v4k1eUpauO8z/q9kcjr+vDhLvvGw5MzctJJQRoObqLhckFGBmAoITfEFsbF1ejsd/nqa9i+ivxe+LB00evbFXw==", "requires": { "tslib": "1.9.0" } @@ -261,24 +261,24 @@ "dev": true }, "@ngrx/effects": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-5.0.0.tgz", - "integrity": "sha1-jIFeJtz92H49oDrZDxO5f134i3M=" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-5.2.0.tgz", + "integrity": "sha1-qnYractv1GRNckoc7NJlyqQrrwk=" }, "@ngrx/router-store": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-5.0.0.tgz", - "integrity": "sha1-A10oo4wOWKDzTDtLf2uKOqtNrLA=" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-5.2.0.tgz", + "integrity": "sha1-v0sXTOGaNuuoIR/B3erx41rnQ2g=" }, "@ngrx/store": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-5.0.0.tgz", - "integrity": "sha1-SDqVXqmaY+4INnXOBZbVBeVQF0c=" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-5.2.0.tgz", + "integrity": "sha1-Yn7XTJzZVGKTBIXZEqVXEXsjkD4=" }, "@ngrx/store-devtools": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-5.0.0.tgz", - "integrity": "sha1-3zDXn1JMK3xzB3wIRzLRt+vvq5U=" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-5.2.0.tgz", + "integrity": "sha1-L/+RapqjSTdYJncrNZ27ZLnl1iI=" }, "@ngtools/json-schema": { "version": "1.2.0", @@ -287,9 +287,9 @@ "dev": true }, "@ngtools/webpack": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.1.tgz", - "integrity": "sha512-Pa2FUy9n2Pu7kkTho6ADfHyypTmDMY8/HT7y9G3tZdaEsS7CjFMdchN5Dx+TCATGVh+G6FLS2mjgXBiGVTmbWw==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.10.2.tgz", + "integrity": "sha512-3u2zg2rarG3qNLSukBClGADWuq/iNn5SQtlSeAbfKzwBeyLGbF0gN1z1tVx1Bcr8YwFzR6NdRePQmJGcoqq1fg==", "dev": true, "requires": { "chalk": "2.2.2", @@ -959,9 +959,9 @@ } }, "babel-generator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { "babel-messages": "6.23.0", @@ -1027,7 +1027,7 @@ "babylon": "6.18.0", "debug": "2.6.9", "globals": "9.18.0", - "invariant": "2.2.2", + "invariant": "2.2.3", "lodash": "4.17.4" } }, @@ -1734,14 +1734,6 @@ "requires": { "align-text": "0.1.4", "lazy-cache": "1.0.4" - }, - "dependencies": { - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - } } }, "chalk": { @@ -1931,9 +1923,9 @@ "integrity": "sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k=" }, "clean-css": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.10.tgz", - "integrity": "sha1-PfwsJWnV8DwUtB2HWtm8yuCcuJ4=", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz", + "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", "dev": true, "requires": { "source-map": "0.5.7" @@ -5566,9 +5558,9 @@ } }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "dev": true }, "hpack.js": { @@ -5596,7 +5588,7 @@ "dev": true, "requires": { "camel-case": "3.0.0", - "clean-css": "4.1.10", + "clean-css": "4.1.11", "commander": "2.14.1", "he": "1.1.1", "ncname": "1.0.0", @@ -5727,9 +5719,9 @@ } }, "http-parser-js": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz", - "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=", + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz", + "integrity": "sha512-QCR5O2AjjMW8Mo4HyI1ctFcv+O99j/0g367V3YoVnrNw5hkDvAWZD0lWGcc+F4yN3V55USPCVix4efb75HxFfA==", "dev": true }, "http-proxy": { @@ -6026,9 +6018,9 @@ "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=" }, "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz", + "integrity": "sha512-7Z5PPegwDTyjbaeCnV0efcyS6vdKAU51kpEmS7QFib3P4822l8ICYyMn7qvJnc+WzLoDsuI9gPMKbJ8pCu8XtA==", "dev": true, "requires": { "loose-envify": "1.3.1" @@ -6385,19 +6377,19 @@ "dev": true }, "istanbul-api": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.1.tgz", - "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.2.tgz", + "integrity": "sha512-kH5YRdqdbs5hiH4/Rr1Q0cSAGgjh3jTtg8vu9NLebBAoK3adVO4jk81J+TYOkTr2+Q4NLeb1ACvmEt65iG/Vbw==", "dev": true, "requires": { "async": "2.6.0", "fileset": "2.0.3", - "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-coverage": "1.1.2", "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", + "istanbul-lib-instrument": "1.9.2", + "istanbul-lib-report": "1.1.3", + "istanbul-lib-source-maps": "1.2.3", + "istanbul-reports": "1.1.4", "js-yaml": "3.7.0", "mkdirp": "0.5.1", "once": "1.4.0" @@ -6410,7 +6402,7 @@ "dev": true, "requires": { "convert-source-map": "1.5.1", - "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-instrument": "1.9.2", "loader-utils": "1.1.0", "schema-utils": "0.3.0" }, @@ -6439,9 +6431,9 @@ } }, "istanbul-lib-coverage": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz", + "integrity": "sha512-tZYA0v5A7qBSsOzcebJJ/z3lk3oSzH62puG78DbBA1+zupipX2CakDyiPV3pOb8He+jBwVimuwB0dTnh38hX0w==", "dev": true }, "istanbul-lib-hook": { @@ -6454,27 +6446,27 @@ } }, "istanbul-lib-instrument": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", - "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz", + "integrity": "sha512-nz8t4HQ2206a/3AXi+NHFWEa844DMpPsgbcUteJbt1j8LX1xg56H9rOMnhvcvVvPbW60qAIyrSk44H8ZDqaSSA==", "dev": true, "requires": { - "babel-generator": "6.26.0", + "babel-generator": "6.26.1", "babel-template": "6.26.0", "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-coverage": "1.1.2", "semver": "5.5.0" } }, "istanbul-lib-report": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", - "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz", + "integrity": "sha512-D4jVbMDtT2dPmloPJS/rmeP626N5Pr3Rp+SovrPn1+zPChGHcggd/0sL29jnbm4oK9W0wHjCRsdch9oLd7cm6g==", "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-coverage": "1.1.2", "mkdirp": "0.5.1", "path-parse": "1.0.5", "supports-color": "3.2.3" @@ -6498,13 +6490,13 @@ } }, "istanbul-lib-source-maps": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", - "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz", + "integrity": "sha512-fDa0hwU/5sDXwAklXgAoCJCOsFsBplVQ6WBldz5UwaqOzmDhUK4nfuR7/G//G2lERlblUNJB8P6e8cXq3a7MlA==", "dev": true, "requires": { "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-coverage": "1.1.2", "mkdirp": "0.5.1", "rimraf": "2.6.2", "source-map": "0.5.7" @@ -6522,9 +6514,9 @@ } }, "istanbul-reports": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", - "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.4.tgz", + "integrity": "sha512-DfSTVOTkuO+kRmbO8Gk650Wqm1WRGr6lrdi2EwDK1vxpS71vdlLd613EpzOKdIFioB5f/scJTjeWBnvd1FWejg==", "dev": true, "requires": { "handlebars": "4.0.11" @@ -6754,12 +6746,12 @@ } }, "karma-coverage-istanbul-reporter": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.1.tgz", - "integrity": "sha512-5og0toMjgLvsL9+TzGH4Rk1D0nr7pMIRJBg29xP4mHMKy/1KUJ12UzoqI6mBNCRFa4nDvZS2MRrN7p+RkZNWxQ==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.2.tgz", + "integrity": "sha512-sQHexslLF+QHzaKfK8+onTYMyvSwv+p5cDayVxhpEELGa3z0QuB+l0IMsicIkkBNMOJKQaqueiRoW7iuo7lsog==", "dev": true, "requires": { - "istanbul-api": "1.2.1", + "istanbul-api": "1.2.2", "minimatch": "3.0.4" } }, @@ -6822,13 +6814,10 @@ } }, "lazy-cache": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", - "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", - "dev": true, - "requires": { - "set-getter": "0.1.0" - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true }, "lcid": { "version": "1.0.0", @@ -7747,9 +7736,9 @@ } }, "ngx-color-picker": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.3.tgz", - "integrity": "sha512-popxIV1JucqRmMl9P2vUcHsn/94OR5PA/d7vGpACDrIOI81T8kEdUBlPvtAMqQXShvv3nVUmg8Wu3rslfcRxzg==" + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-5.3.4.tgz", + "integrity": "sha512-FtbmsShr0gqijZbnP6SZQ3K4KnBP6hVXa0ncN1tguiWV9BBtYcJ4DIWazzfTZXdzTCMF+RvzDolnGYOIhGP4IQ==" }, "ngx-cookie-service": { "version": "1.0.10", @@ -8068,7 +8057,7 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "is-builtin-module": "1.0.0", "semver": "5.5.0", "validate-npm-package-license": "3.0.3" @@ -11669,6 +11658,15 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", + "dev": true, + "requires": { + "set-getter": "0.1.0" + } } } }, @@ -13077,7 +13075,7 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.10", + "http-parser-js": "0.4.11", "websocket-extensions": "0.1.3" } }, diff --git a/package.json b/package.json index 8c3ee96c..e4581dc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "5.2.7", + "version": "5.2.8", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", @@ -19,23 +19,23 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "5.2.7", - "@angular/cdk": "5.2.3", - "@angular/common": "5.2.7", - "@angular/compiler": "5.2.7", - "@angular/core": "5.2.7", + "@angular/animations": "5.2.8", + "@angular/cdk": "5.2.4", + "@angular/common": "5.2.8", + "@angular/compiler": "5.2.8", + "@angular/core": "5.2.8", "@angular/flex-layout": "5.0.0-beta.13", - "@angular/forms": "5.2.7", - "@angular/http": "5.2.7", - "@angular/material": "5.2.3", - "@angular/material-moment-adapter": "5.2.3", - "@angular/platform-browser": "5.2.7", - "@angular/platform-browser-dynamic": "5.2.7", - "@angular/router": "5.2.7", - "@ngrx/effects": "5.0.0", - "@ngrx/router-store": "5.0.0", - "@ngrx/store": "5.0.0", - "@ngrx/store-devtools": "5.0.0", + "@angular/forms": "5.2.8", + "@angular/http": "5.2.8", + "@angular/material": "5.2.4", + "@angular/material-moment-adapter": "5.2.4", + "@angular/platform-browser": "5.2.8", + "@angular/platform-browser-dynamic": "5.2.8", + "@angular/router": "5.2.8", + "@ngrx/effects": "5.2.0", + "@ngrx/router-store": "5.2.0", + "@ngrx/store": "5.2.0", + "@ngrx/store-devtools": "5.2.0", "@ngx-translate/core": "9.1.1", "@swimlane/ngx-charts": "7.1.1", "@swimlane/ngx-datatable": "11.2.0", @@ -52,7 +52,7 @@ "moment": "2.21.0", "ng2-charts": "1.6.0", "ngrx-store-freeze": "0.2.1", - "ngx-color-picker": "5.3.3", + "ngx-color-picker": "5.3.4", "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.3.0", "prismjs": "1.11.0", @@ -61,9 +61,9 @@ "zone.js": "0.8.20" }, "devDependencies": { - "@angular/cli": "1.7.2", - "@angular/compiler-cli": "5.2.7", - "@angular/language-service": "5.2.7", + "@angular/cli": "1.7.3", + "@angular/compiler-cli": "5.2.8", + "@angular/language-service": "5.2.8", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.6", "@types/jasminewd2": "2.0.3", @@ -73,7 +73,7 @@ "jasmine-spec-reporter": "4.2.1", "karma": "2.0.0", "karma-chrome-launcher": "2.2.0", - "karma-coverage-istanbul-reporter": "1.4.1", + "karma-coverage-istanbul-reporter": "1.4.2", "karma-jasmine": "1.1.1", "karma-jasmine-html-reporter": "0.2.2", "protractor": "5.1.2", From 30825e792793042067a7db9bc707a1fb53dd5265 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 8 Mar 2018 12:25:27 +0300 Subject: [PATCH 19/20] Fixed Calendar day view weird characters issue + Added TranslateModule to the NavigationModule so the translate pipe can work + Small tweaks --- src/@fuse/components/navigation/navigation.module.ts | 4 ++++ src/@fuse/services/translation-loader.service.ts | 1 + src/app/app.component.ts | 10 +++++----- .../main/content/apps/calendar/calendar.component.scss | 8 ++++++++ src/app/main/content/apps/mail/mail.component.ts | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/@fuse/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts index dd9927b7..12519314 100644 --- a/src/@fuse/components/navigation/navigation.module.ts +++ b/src/@fuse/components/navigation/navigation.module.ts @@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { MatIconModule, MatRippleModule } from '@angular/material'; +import { TranslateModule } from '@ngx-translate/core'; + import { FuseNavigationComponent } from './navigation.component'; import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component'; import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component'; @@ -17,6 +19,8 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na MatIconModule, MatRippleModule, + + TranslateModule.forChild() ], exports : [ FuseNavigationComponent diff --git a/src/@fuse/services/translation-loader.service.ts b/src/@fuse/services/translation-loader.service.ts index 27283713..83bfb448 100644 --- a/src/@fuse/services/translation-loader.service.ts +++ b/src/@fuse/services/translation-loader.service.ts @@ -12,6 +12,7 @@ export class FuseTranslationLoaderService { constructor(private translate: TranslateService) { + console.log('...FuseTranslationLoaderService constructor...'); } public loadTranslations(...args: Locale[]): void diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 95a88441..9a7d71d2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -16,10 +16,10 @@ import { locale as navigationTurkish } from './navigation/i18n/tr'; export class AppComponent { constructor( + private translate: TranslateService, private fuseNavigationService: FuseNavigationService, private fuseSplashScreen: FuseSplashScreenService, - private translate: TranslateService, - private translationLoader: FuseTranslationLoaderService + private fuseTranslationLoader: FuseTranslationLoaderService ) { // Add languages @@ -28,10 +28,10 @@ export class AppComponent // Set the default language this.translate.setDefaultLang('en'); + // Set the navigation translations + this.fuseTranslationLoader.loadTranslations(navigationEnglish, navigationTurkish); + // Use a language this.translate.use('en'); - - // Set the navigation translations - this.translationLoader.loadTranslations(navigationEnglish, navigationTurkish); } } diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss index 91809629..7ec51633 100644 --- a/src/app/main/content/apps/calendar/calendar.component.scss +++ b/src/app/main/content/apps/calendar/calendar.component.scss @@ -180,6 +180,14 @@ } } } + + .cal-hour-segment { + + &:after, + &::after { + content: '' !important; + } + } } #calendar { diff --git a/src/app/main/content/apps/mail/mail.component.ts b/src/app/main/content/apps/mail/mail.component.ts index d9abe16f..0a9fa26a 100644 --- a/src/app/main/content/apps/mail/mail.component.ts +++ b/src/app/main/content/apps/mail/mail.component.ts @@ -34,11 +34,11 @@ export class FuseMailComponent implements OnInit, OnDestroy constructor( private mailService: MailService, - private translationLoader: FuseTranslationLoaderService + private fuseTranslationLoader: FuseTranslationLoaderService ) { this.searchInput = new FormControl(''); - this.translationLoader.loadTranslations(english, turkish); + this.fuseTranslationLoader.loadTranslations(english, turkish); } ngOnInit() From ddcd7c6831f66523f3a8d559b31bdb12ae124b22 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 8 Mar 2018 12:27:12 +0300 Subject: [PATCH 20/20] Removed a comment --- src/@fuse/services/translation-loader.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/@fuse/services/translation-loader.service.ts b/src/@fuse/services/translation-loader.service.ts index 83bfb448..27283713 100644 --- a/src/@fuse/services/translation-loader.service.ts +++ b/src/@fuse/services/translation-loader.service.ts @@ -12,7 +12,6 @@ export class FuseTranslationLoaderService { constructor(private translate: TranslateService) { - console.log('...FuseTranslationLoaderService constructor...'); } public loadTranslations(...args: Locale[]): void