diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a7cb7668..08cf4ec5 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,7 +3,7 @@ import {RouteConfig, Router} from 'angular2/router'; import {Subscription} from 'rxjs/Subscription'; import {Pages} from './pages'; -import {ThemeGlobal} from "./theme/theme.global"; +import {ThemeGlobal} from "./theme"; // TODO: is it really the best place to globally require that dependency? require("!style!css!sass!./theme/sass/_ionicons.scss"); diff --git a/src/app/pages/charts/components/chartJs/chartJs.component.ts b/src/app/pages/charts/components/chartJs/chartJs.component.ts index 280e8953..86d40557 100644 --- a/src/app/pages/charts/components/chartJs/chartJs.component.ts +++ b/src/app/pages/charts/components/chartJs/chartJs.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {ChartJsService} from "./chartJs.service"; diff --git a/src/app/pages/charts/components/chartistJs/chartistJs.component.ts b/src/app/pages/charts/components/chartistJs/chartistJs.component.ts index aaa3417f..41845e1d 100644 --- a/src/app/pages/charts/components/chartistJs/chartistJs.component.ts +++ b/src/app/pages/charts/components/chartistJs/chartistJs.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {ChartistJsService} from "./chartistJs.service"; diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts index 56e7515d..2a1fd545 100644 --- a/src/app/pages/dashboard/dashboard.component.ts +++ b/src/app/pages/dashboard/dashboard.component.ts @@ -1,7 +1,7 @@ import {Component, ViewEncapsulation} from 'angular2/core'; import {PopularApp} from './popularApp'; -import {BaCard} from '../../theme'; +import {BaCard} from '../../theme/components'; @Component({ diff --git a/src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts b/src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts index 24d8c0ca..3598d181 100644 --- a/src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts +++ b/src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {layoutPaths} from "../../../../theme/theme.constants"; import {BubbleMapsService} from "./bubbleMaps.service"; diff --git a/src/app/pages/maps/components/googleMaps/googleMaps.component.ts b/src/app/pages/maps/components/googleMaps/googleMaps.component.ts index e1aaa904..833c7502 100644 --- a/src/app/pages/maps/components/googleMaps/googleMaps.component.ts +++ b/src/app/pages/maps/components/googleMaps/googleMaps.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation, ElementRef} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {DOM} from "angular2/src/platform/dom/dom_adapter"; @Component({ diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts index 4122b7fd..08a6c5a6 100644 --- a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts +++ b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation, ElementRef} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {DOM} from "angular2/src/platform/dom/dom_adapter"; @Component({ diff --git a/src/app/pages/maps/components/lineMaps/lineMaps.component.ts b/src/app/pages/maps/components/lineMaps/lineMaps.component.ts index 0039f079..35d1491a 100644 --- a/src/app/pages/maps/components/lineMaps/lineMaps.component.ts +++ b/src/app/pages/maps/components/lineMaps/lineMaps.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from 'angular2/core'; -import {BaCard} from '../../../../theme'; +import {BaCard} from '../../../../theme/components'; import {layoutColors, layoutPaths} from "../../../../theme/theme.constants"; import {LineMapsService} from "./lineMaps.service"; diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index f94a71ae..a00e46c7 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -1,7 +1,8 @@ import {Component, ViewEncapsulation} from 'angular2/core'; -import {RouteConfig, Router} from 'angular2/router'; +import {RouteConfig} from 'angular2/router'; + +import {PageTop, ContentTop, Sidebar} from '../theme/components'; -import {PageTop, ContentTop, Sidebar} from '../theme'; import {Dashboard} from './dashboard'; import {Ui} from './ui'; import {Maps} from './maps'; diff --git a/src/app/theme/baCard/index.ts b/src/app/theme/baCard/index.ts deleted file mode 100644 index 4890b0a2..00000000 --- a/src/app/theme/baCard/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './baCard.component'; \ No newline at end of file diff --git a/src/app/theme/baCard/baCard.component.ts b/src/app/theme/components/baCard/baCard.component.ts similarity index 100% rename from src/app/theme/baCard/baCard.component.ts rename to src/app/theme/components/baCard/baCard.component.ts diff --git a/src/app/theme/baCard/baCard.html b/src/app/theme/components/baCard/baCard.html similarity index 100% rename from src/app/theme/baCard/baCard.html rename to src/app/theme/components/baCard/baCard.html diff --git a/src/app/theme/baCard/baCard.scss b/src/app/theme/components/baCard/baCard.scss similarity index 100% rename from src/app/theme/baCard/baCard.scss rename to src/app/theme/components/baCard/baCard.scss diff --git a/src/app/theme/components/baCard/index.ts b/src/app/theme/components/baCard/index.ts new file mode 100644 index 00000000..955d54e1 --- /dev/null +++ b/src/app/theme/components/baCard/index.ts @@ -0,0 +1 @@ +export * from './baCard.component.ts'; diff --git a/src/app/theme/contentTop/contentTop.component.ts b/src/app/theme/components/contentTop/contentTop.component.ts similarity index 86% rename from src/app/theme/contentTop/contentTop.component.ts rename to src/app/theme/components/contentTop/contentTop.component.ts index 35aee169..03ef0d1a 100644 --- a/src/app/theme/contentTop/contentTop.component.ts +++ b/src/app/theme/components/contentTop/contentTop.component.ts @@ -1,8 +1,8 @@ -import {Component, ViewEncapsulation} from 'angular2/core'; - -import {ThemeGlobal} from "../theme.global"; +import {Component} from 'angular2/core'; import {Subscription} from "rxjs/Subscription"; +import {ThemeGlobal} from "../../../theme"; + @Component({ selector: 'content-top', styles: [require('./contentTop.scss')], diff --git a/src/app/theme/contentTop/contentTop.html b/src/app/theme/components/contentTop/contentTop.html similarity index 100% rename from src/app/theme/contentTop/contentTop.html rename to src/app/theme/components/contentTop/contentTop.html diff --git a/src/app/theme/contentTop/contentTop.scss b/src/app/theme/components/contentTop/contentTop.scss similarity index 94% rename from src/app/theme/contentTop/contentTop.scss rename to src/app/theme/components/contentTop/contentTop.scss index dfa6a48a..7fd45ffb 100644 --- a/src/app/theme/contentTop/contentTop.scss +++ b/src/app/theme/components/contentTop/contentTop.scss @@ -1,4 +1,4 @@ -@import '../sass/conf/conf'; +@import '../../sass/conf/conf'; .content-top { padding-top: 13px; diff --git a/src/app/theme/components/contentTop/index.ts b/src/app/theme/components/contentTop/index.ts new file mode 100644 index 00000000..794ee85d --- /dev/null +++ b/src/app/theme/components/contentTop/index.ts @@ -0,0 +1 @@ +export * from './contentTop.component.ts'; diff --git a/src/app/theme/components/index.ts b/src/app/theme/components/index.ts new file mode 100644 index 00000000..859510c7 --- /dev/null +++ b/src/app/theme/components/index.ts @@ -0,0 +1,5 @@ +export * from './pageTop'; +export * from './msgCenter'; +export * from './sidebar'; +export * from './contentTop'; +export * from './baCard'; diff --git a/src/app/theme/components/msgCenter/index.ts b/src/app/theme/components/msgCenter/index.ts new file mode 100644 index 00000000..d61dc6e7 --- /dev/null +++ b/src/app/theme/components/msgCenter/index.ts @@ -0,0 +1 @@ +export * from './msgCenter.component.ts'; diff --git a/src/app/theme/msgCenter/msgCenter.component.ts b/src/app/theme/components/msgCenter/msgCenter.component.ts similarity index 94% rename from src/app/theme/msgCenter/msgCenter.component.ts rename to src/app/theme/components/msgCenter/msgCenter.component.ts index 930ae449..2477cb77 100644 --- a/src/app/theme/msgCenter/msgCenter.component.ts +++ b/src/app/theme/components/msgCenter/msgCenter.component.ts @@ -1,5 +1,6 @@ -import {Component, ViewEncapsulation} from 'angular2/core'; -import {ProfilePicturePipe} from '../pipes/image/profile-picture.pipe'; +import {Component} from 'angular2/core'; + +import {ProfilePicturePipe} from '../../pipes'; @Component({ selector: 'msg-center', diff --git a/src/app/theme/msgCenter/msgCenter.html b/src/app/theme/components/msgCenter/msgCenter.html similarity index 100% rename from src/app/theme/msgCenter/msgCenter.html rename to src/app/theme/components/msgCenter/msgCenter.html diff --git a/src/app/theme/msgCenter/msgCenter.scss b/src/app/theme/components/msgCenter/msgCenter.scss similarity index 99% rename from src/app/theme/msgCenter/msgCenter.scss rename to src/app/theme/components/msgCenter/msgCenter.scss index 9a7816f0..692aaaaa 100644 --- a/src/app/theme/msgCenter/msgCenter.scss +++ b/src/app/theme/components/msgCenter/msgCenter.scss @@ -1,4 +1,4 @@ -@import '../sass/conf/conf'; +@import '../../sass/conf/conf'; /* msg center */ @-webkit-keyframes pulsate { diff --git a/src/app/theme/components/pageTop/index.ts b/src/app/theme/components/pageTop/index.ts new file mode 100644 index 00000000..f8243335 --- /dev/null +++ b/src/app/theme/components/pageTop/index.ts @@ -0,0 +1 @@ +export * from './pageTop.component.ts'; diff --git a/src/app/theme/pageTop/pageTop.component.ts b/src/app/theme/components/pageTop/pageTop.component.ts similarity index 65% rename from src/app/theme/pageTop/pageTop.component.ts rename to src/app/theme/components/pageTop/pageTop.component.ts index a95e0a4b..e2dda0ae 100644 --- a/src/app/theme/pageTop/pageTop.component.ts +++ b/src/app/theme/components/pageTop/pageTop.component.ts @@ -1,9 +1,9 @@ -import {Component, ViewEncapsulation} from 'angular2/core'; +import {Component} from 'angular2/core'; -import {MsgCenter} from '../msgCenter'; -import {ProfilePicturePipe} from '../pipes/image/profile-picture.pipe'; -import {ScrollPosition} from '../directives/scrollPosition.directive'; -import {ThemeGlobal} from "../theme.global"; +import {ThemeGlobal} from '../../../theme'; +import {ProfilePicturePipe} from '../../pipes'; +import {MsgCenter} from '../../components/msgCenter'; +import {ScrollPosition} from '../../directives'; @Component({ selector: 'page-top', @@ -18,7 +18,6 @@ export class PageTop { constructor(private _themeGlobal:ThemeGlobal) { - } toggleMenu() { diff --git a/src/app/theme/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html similarity index 100% rename from src/app/theme/pageTop/pageTop.html rename to src/app/theme/components/pageTop/pageTop.html diff --git a/src/app/theme/pageTop/pageTop.scss b/src/app/theme/components/pageTop/pageTop.scss similarity index 97% rename from src/app/theme/pageTop/pageTop.scss rename to src/app/theme/components/pageTop/pageTop.scss index 0869d695..13929369 100644 --- a/src/app/theme/pageTop/pageTop.scss +++ b/src/app/theme/components/pageTop/pageTop.scss @@ -1,5 +1,5 @@ -@import '../sass/conf/conf'; -@import '../msgCenter/msgCenter'; +@import '../../sass/conf/conf'; +@import '../../components/msgCenter/msgCenter'; .page-top { @include bg-translucent-dark(0.5); diff --git a/src/app/theme/components/sidebar/index.ts b/src/app/theme/components/sidebar/index.ts new file mode 100644 index 00000000..dc98b07f --- /dev/null +++ b/src/app/theme/components/sidebar/index.ts @@ -0,0 +1 @@ +export * from './sidebar.component.ts'; diff --git a/src/app/theme/sidebar/sidebar.component.ts b/src/app/theme/components/sidebar/sidebar.component.ts similarity index 94% rename from src/app/theme/sidebar/sidebar.component.ts rename to src/app/theme/components/sidebar/sidebar.component.ts index 18c98bce..af1ce1b6 100644 --- a/src/app/theme/sidebar/sidebar.component.ts +++ b/src/app/theme/components/sidebar/sidebar.component.ts @@ -1,9 +1,8 @@ -import {Component, ElementRef, HostListener, ViewEncapsulation, Input} from 'angular2/core'; +import {Component, ElementRef, HostListener, ViewEncapsulation} from 'angular2/core'; import {Router} from 'angular2/router'; -import {layoutSizes} from '../theme.constants'; +import {ThemeGlobal, layoutSizes} from '../../../theme'; import {SidebarService} from './sidebar.service'; -import {ThemeGlobal} from "../theme.global"; @Component({ selector: 'sidebar', diff --git a/src/app/theme/sidebar/sidebar.html b/src/app/theme/components/sidebar/sidebar.html similarity index 100% rename from src/app/theme/sidebar/sidebar.html rename to src/app/theme/components/sidebar/sidebar.html diff --git a/src/app/theme/sidebar/sidebar.scss b/src/app/theme/components/sidebar/sidebar.scss similarity index 99% rename from src/app/theme/sidebar/sidebar.scss rename to src/app/theme/components/sidebar/sidebar.scss index bdfb2c1f..64fb6178 100644 --- a/src/app/theme/sidebar/sidebar.scss +++ b/src/app/theme/components/sidebar/sidebar.scss @@ -1,4 +1,4 @@ -@import '../sass/conf/conf'; +@import '../../sass/conf/conf'; $sidebar-width: 180px; $angle-left: "\f100"; diff --git a/src/app/theme/sidebar/sidebar.service.ts b/src/app/theme/components/sidebar/sidebar.service.ts similarity index 100% rename from src/app/theme/sidebar/sidebar.service.ts rename to src/app/theme/components/sidebar/sidebar.service.ts diff --git a/src/app/theme/contentTop/index.ts b/src/app/theme/contentTop/index.ts deleted file mode 100644 index e8d5a5b3..00000000 --- a/src/app/theme/contentTop/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './contentTop.component'; diff --git a/src/app/theme/directives/index.ts b/src/app/theme/directives/index.ts index bd964aea..e11431fe 100644 --- a/src/app/theme/directives/index.ts +++ b/src/app/theme/directives/index.ts @@ -1 +1 @@ -export * from './scrollPosition.directive'; \ No newline at end of file +export * from './scrollPosition'; diff --git a/src/app/theme/directives/scrollPosition/index.ts b/src/app/theme/directives/scrollPosition/index.ts new file mode 100644 index 00000000..e532f7f7 --- /dev/null +++ b/src/app/theme/directives/scrollPosition/index.ts @@ -0,0 +1 @@ +export * from './scrollPosition.directive.ts'; diff --git a/src/app/theme/directives/scrollPosition.directive.ts b/src/app/theme/directives/scrollPosition/scrollPosition.directive.ts similarity index 84% rename from src/app/theme/directives/scrollPosition.directive.ts rename to src/app/theme/directives/scrollPosition/scrollPosition.directive.ts index 1b34e07a..e39365a3 100644 --- a/src/app/theme/directives/scrollPosition.directive.ts +++ b/src/app/theme/directives/scrollPosition/scrollPosition.directive.ts @@ -1,4 +1,4 @@ -import {Directive, Input, Output, EventEmitter, HostListener, ElementRef} from 'angular2/core'; +import {Directive, Input, Output, EventEmitter, HostListener} from 'angular2/core'; @Directive({ selector: '[scrollPosition]' diff --git a/src/app/theme/index.ts b/src/app/theme/index.ts index 859510c7..17e2c853 100644 --- a/src/app/theme/index.ts +++ b/src/app/theme/index.ts @@ -1,5 +1,2 @@ -export * from './pageTop'; -export * from './msgCenter'; -export * from './sidebar'; -export * from './contentTop'; -export * from './baCard'; +export * from './theme.constants' +export * from './theme.global' diff --git a/src/app/theme/msgCenter/index.ts b/src/app/theme/msgCenter/index.ts deleted file mode 100644 index 7d39ef93..00000000 --- a/src/app/theme/msgCenter/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './msgCenter.component'; \ No newline at end of file diff --git a/src/app/theme/pageTop/index.ts b/src/app/theme/pageTop/index.ts deleted file mode 100644 index 7d37b3af..00000000 --- a/src/app/theme/pageTop/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './pageTop.component'; \ No newline at end of file diff --git a/src/app/theme/pipes/index.ts b/src/app/theme/pipes/index.ts new file mode 100644 index 00000000..956d845d --- /dev/null +++ b/src/app/theme/pipes/index.ts @@ -0,0 +1 @@ +export * from './profilePicture'; diff --git a/src/app/theme/pipes/profilePicture/index.ts b/src/app/theme/pipes/profilePicture/index.ts new file mode 100644 index 00000000..b952ed87 --- /dev/null +++ b/src/app/theme/pipes/profilePicture/index.ts @@ -0,0 +1 @@ +export * from './profilePicture.pipe.ts'; diff --git a/src/app/theme/pipes/image/profile-picture.pipe.ts b/src/app/theme/pipes/profilePicture/profilePicture.pipe.ts similarity index 85% rename from src/app/theme/pipes/image/profile-picture.pipe.ts rename to src/app/theme/pipes/profilePicture/profilePicture.pipe.ts index 82cec888..6e580f79 100644 --- a/src/app/theme/pipes/image/profile-picture.pipe.ts +++ b/src/app/theme/pipes/profilePicture/profilePicture.pipe.ts @@ -1,5 +1,5 @@ import {Pipe, PipeTransform} from 'angular2/core'; -import {layoutPaths} from '../../theme.constants'; +import {layoutPaths} from '../../../theme'; @Pipe({name: 'profilePicture'}) export class ProfilePicturePipe implements PipeTransform { diff --git a/src/app/theme/sidebar/index.ts b/src/app/theme/sidebar/index.ts deleted file mode 100644 index 075e6239..00000000 --- a/src/app/theme/sidebar/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './sidebar.component';