Merge remote-tracking branch 'origin/master'

src/app/pages/dashboard/dashboard.component.ts

@@ -1,26 +1,18 @@
-/*
- * Angular 2 decorators and services
- */
 import {Component, ViewEncapsulation} from 'angular2/core';
-/*
+
- * App Component
+import {PopularApp} from './popularApp';
- * Top Level Component
+
- */
 @Component({
   selector: 'dashboard',
   pipes: [],
-  providers: [],
+  directives: [PopularApp],
   encapsulation: ViewEncapsulation.None,
   styles: [require('./dashboard.scss')],
-  template: 'DASHBOARD'
+  template: require('./dashboard.html')
 })
 export class Dashboard {
 
   constructor() {
   }
 
-  ngOnInit() {
-    console.log('DASHBOARD');
-  }
-
 }

src/app/pages/dashboard/dashboard.html

@@ -0,0 +1,11 @@
+<!--<div class="row">-->
+    <!--<div class="col-xlg-9 col-lg-6 col-md-6 col-sm-12 col-xs-12">-->
+        <!--<div class="row">-->
+            <!--<div class="col-xlg-4 col-lg-12 col-md-12 col-sm-5 col-xs-12"-->
+                 <!--ba-panel-->
+                 <!--ba-panel-class="popular-app medium-panel">-->
+                <!--<popular-app></popular-app>-->
+            <!--</div>-->
+        <!--</div>-->
+    <!--</div>-->
+<!--</div>-->

src/app/pages/dashboard/popularApp/index.ts

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

src/app/pages/dashboard/popularApp/popularApp.component.ts

@@ -0,0 +1,24 @@
+/*
+ * Angular 2 decorators and services
+ */
+import {Component, ViewEncapsulation} from 'angular2/core';
+/*
+ * App Component
+ * Top Level Component
+ */
+@Component({
+  selector: 'popular-app',
+  encapsulation: ViewEncapsulation.None,
+  styles: [require('./popularApp.scss')],
+  template: require('./popularApp.html')
+})
+export class PopularApp {
+
+  constructor() {
+  }
+
+  ngOnInit() {
+    console.log('DASHBOARD');
+  }
+
+}

src/app/pages/dashboard/popularApp/popularApp.html

@@ -0,0 +1,25 @@
+<div class="popular-app-img">
+    <!--<img ng-src="{{::( 'app/my-app-logo.png' | appImage )}}"/>-->
+</div>
+<div class="popular-app-cost row">
+    <div class="col-xs-9">
+        Most Popular App
+    </div>
+    <div class="col-xs-3 text-right">
+        175$
+    </div>
+</div>
+<div class="popular-app-info row">
+    <div class="col-xs-4 text-left">
+        <div class="info-label">Total Visits</div>
+        <div>47,512</div>
+    </div>
+    <div class="col-xs-4 text-center">
+        <div class="info-label">New Visits</div>
+        <div>9,217</div>
+    </div>
+    <div class="col-xs-4 text-right">
+        <div class="info-label">Sales</div>
+        <div>2,928</div>
+    </div>
+</div>

src/app/pages/dashboard/popularApp/popularApp.scss

@@ -0,0 +1 @@
+@import '../dashboard';