project structure update for more accurate import

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");

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";
 

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";
 

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({

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";

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({

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({

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";

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';

src/app/theme/baCard/index.ts

@@ -1 +0,0 @@
-export * from './baCard.component';

src/app/theme/components/baCard/index.ts

@@ -0,0 +1 @@
+export * from './baCard.component.ts';

src/app/theme/components/contentTop/contentTop.component.ts

@@ -1,8 +1,8 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component} from 'angular2/core';
-
-import {ThemeGlobal} from "../theme.global";
 import {Subscription} from "rxjs/Subscription";
 
+import {ThemeGlobal} from "../../../theme";
+
 @Component({
   selector: 'content-top',
   styles: [require('./contentTop.scss')],

src/app/theme/components/contentTop/contentTop.scss

@@ -1,4 +1,4 @@
-@import '../sass/conf/conf';
+@import '../../sass/conf/conf';
 
 .content-top {
   padding-top: 13px;

src/app/theme/components/contentTop/index.ts

@@ -0,0 +1 @@
+export * from './contentTop.component.ts';

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';

src/app/theme/components/msgCenter/index.ts

@@ -0,0 +1 @@
+export * from './msgCenter.component.ts';

src/app/theme/components/msgCenter/msgCenter.component.ts

@@ -1,5 +1,6 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component} from 'angular2/core';
-import {ProfilePicturePipe} from '../pipes/image/profile-picture.pipe';
+
+import {ProfilePicturePipe} from '../../pipes';
 
 @Component({
   selector: 'msg-center',

src/app/theme/components/msgCenter/msgCenter.scss

@@ -1,4 +1,4 @@
-@import '../sass/conf/conf';
+@import '../../sass/conf/conf';
 
 /* msg center */
 @-webkit-keyframes pulsate {

src/app/theme/components/pageTop/index.ts

@@ -0,0 +1 @@
+export * from './pageTop.component.ts';

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 {ThemeGlobal} from '../../../theme';
-import {ProfilePicturePipe} from '../pipes/image/profile-picture.pipe';
+import {ProfilePicturePipe} from '../../pipes';
-import {ScrollPosition} from '../directives/scrollPosition.directive';
+import {MsgCenter} from '../../components/msgCenter';
-import {ThemeGlobal} from "../theme.global";
+import {ScrollPosition} from '../../directives';
 
 @Component({
   selector: 'page-top',
@@ -18,7 +18,6 @@ export class PageTop {
 
 
   constructor(private _themeGlobal:ThemeGlobal) {
-
   }
 
   toggleMenu() {

src/app/theme/components/pageTop/pageTop.scss

@@ -1,5 +1,5 @@
-@import '../sass/conf/conf';
+@import '../../sass/conf/conf';
-@import '../msgCenter/msgCenter';
+@import '../../components/msgCenter/msgCenter';
 
 .page-top {
   @include bg-translucent-dark(0.5);

src/app/theme/components/sidebar/index.ts

@@ -0,0 +1 @@
+export * from './sidebar.component.ts';

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',

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";

src/app/theme/contentTop/index.ts

@@ -1 +0,0 @@
-export * from './contentTop.component';

src/app/theme/directives/index.ts

@@ -1 +1 @@
-export * from './scrollPosition.directive';
+export * from './scrollPosition';

src/app/theme/directives/scrollPosition/index.ts

@@ -0,0 +1 @@
+export * from './scrollPosition.directive.ts';

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]'

src/app/theme/index.ts

@@ -1,5 +1,2 @@
-export * from './pageTop';
+export * from './theme.constants'
-export * from './msgCenter';
+export * from './theme.global'
-export * from './sidebar';
-export * from './contentTop';
-export * from './baCard';

src/app/theme/msgCenter/index.ts

@@ -1 +0,0 @@
-export * from './msgCenter.component';

src/app/theme/pageTop/index.ts

@@ -1 +0,0 @@
-export * from './pageTop.component';

src/app/theme/pipes/index.ts

@@ -0,0 +1 @@
+export * from './profilePicture';

src/app/theme/pipes/profilePicture/index.ts

@@ -0,0 +1 @@
+export * from './profilePicture.pipe.ts';

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 {

src/app/theme/sidebar/index.ts

@@ -1 +0,0 @@
-export * from './sidebar.component';