Merge branch 'master' of https://github.com/kennyboy55/smarthome

# Conflicts: # mean-app/dist/inline.bundle.map # mean-app/dist/main.bundle.js # mean-app/dist/main.bundle.map
2017-04-04 21:52:28 +02:00
parent 98150f157d 499b780270
commit e2b28b0c7c
17 changed files with 13140 additions and 3488 deletions
@@ -0,0 +1,13 @@
+import { NgModule }             from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { DashboardComponent }   from './dashboard.component';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
+  { path: 'dashboard',  component: DashboardComponent },
+];
+@NgModule({
+  imports: [ RouterModule.forRoot(routes) ],
+  exports: [ RouterModule ]
+})
+export class AppRoutingModule {}
@@ -1,5 +1,33 @@
-<h1>
-  {{title}}
+<div class="container">

-  <line-chart></line-chart>
-</h1>
+  <nav class="navbar navbar-default">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand">Energiemeter</a>
+      </div>
+      <div id="navbar" class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <li routerLink="/dashboard" routerLinkActive="active"><a routerLink="/dashboard" routerLinkActive="active">Dashboard</a></li>
+        </ul>
+      </div><!--/.nav-collapse -->
+    </div><!--/.container-fluid -->
+  </nav>
+
+  <div class="row">
+
+    <div class="col-md-12">
+      <div class="page-header">
+        <h1>{{title}} <small>Avans</small></h1>
+      </div>
+    </div>
+
+    <router-outlet></router-outlet>
+
+  </div>
+</div>
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
  styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'app works!';
+  title = 'Energie';
 }
@@ -4,21 +4,26 @@ import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { ChartsModule } from 'ng2-charts/ng2-charts';

+import { AppRoutingModule } from './app-routing.module';
+
 import { AppComponent } from './app.component';
 import { LineChartComponent } from './chart.component';
+import { DashboardComponent } from './dashboard.component';

 import { DataService } from './data.service';

@NgModule({
  declarations: [
    AppComponent,
-    LineChartComponent
+    LineChartComponent,
+    DashboardComponent
  ],
  imports: [
    BrowserModule,
    FormsModule,
    HttpModule,
-    ChartsModule
+    ChartsModule,
+    AppRoutingModule
  ],
  providers: [DataService],
  bootstrap: [AppComponent]
@@ -0,0 +1,3 @@
+<div>
+	<line-chart></line-chart>
+</div>
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'dashboard',
+  templateUrl: './dashboard.component.html'
+})
+
+export class DashboardComponent {
+
+}
@@ -8,6 +8,13 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="icon" type="image/x-icon" href="favicon.ico">

+  <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+
+	<script
+	  src="https://code.jquery.com/jquery-3.2.1.min.js"
+	  integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
+	  crossorigin="anonymous"></script>
+  <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.1.3/Chart.bundle.min.js"></script>
 </head>
 <body>