changeset 5:8d82412dfd50

Bring waves-ui in as a global script for now (only way I've been able to get it to work) and start building a waveform component.
author Lucas Thompson <dev@lucas.im>
date Wed, 26 Oct 2016 16:54:51 +0100
parents 5c0d37379879
children ee4353d1aeeb
files angular-cli.json package.json src/app/app.component.html src/app/app.module.ts
diffstat 4 files changed, 8 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/angular-cli.json	Wed Oct 26 14:34:12 2016 +0100
+++ b/angular-cli.json	Wed Oct 26 16:54:51 2016 +0100
@@ -20,7 +20,9 @@
       "styles": [
         "styles.css"
       ],
-      "scripts": [],
+      "scripts": [
+        "../node_modules/waves-ui/waves-ui.min.js"
+      ],
       "environments": {
         "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
--- a/package.json	Wed Oct 26 14:34:12 2016 +0100
+++ b/package.json	Wed Oct 26 16:54:51 2016 +0100
@@ -26,6 +26,7 @@
     "hammerjs": "^2.0.8",
     "rxjs": "5.0.0-beta.12",
     "ts-helpers": "^1.1.1",
+    "waves-ui": "github:wavesjs/ui",
     "zone.js": "^0.6.23"
   },
   "devDependencies": {
--- a/src/app/app.component.html	Wed Oct 26 14:34:12 2016 +0100
+++ b/src/app/app.component.html	Wed Oct 26 16:54:51 2016 +0100
@@ -10,33 +10,14 @@
   </button>
 
   <md-menu x-position="before" #menu="mdMenu">
-    <button md-menu-item> Refresh</button>
     <button md-menu-item> Settings</button>
     <button md-menu-item> Help</button>
-    <button md-menu-item disabled> Sign Out</button>
   </md-menu>
 </md-toolbar>
 <md-sidenav-layout>
   <md-sidenav align="end" mode="side" opened>
   </md-sidenav>
+  <app-waveform></app-waveform>
   <md-slider min="1" max="5"></md-slider>
 
 </md-sidenav-layout>
-<!--<h1>-->
-<!--{{title}}-->
-<!--</h1>-->
-<!--<div>-->
-<!--<ul>-->
-<!--<li *ngFor="let message of mail.messages">{{message.text}}</li>-->
-<!--</ul>-->
-
-<!--<ul>-->
-<!--<app-simple-form-->
-<!--*ngFor="let message of mail.messages"-->
-<!--[message]="message.text"-->
-<!--(update)="onUpdate(message.id, $event.text)"-->
-<!--&gt;{{message}}</app-simple-form>-->
-<!--</ul>-->
-<!--<hr>-->
-<!--{{serverUri}}-->
-<!--</div>-->
--- a/src/app/app.module.ts	Wed Oct 26 14:34:12 2016 +0100
+++ b/src/app/app.module.ts	Wed Oct 26 16:54:51 2016 +0100
@@ -7,11 +7,13 @@
 import { SimpleFormComponent } from './simple-form/simple-form.component';
 import {MailService} from "./mail.service";
 import {MaterialModule} from "@angular/material";
+import { WaveformComponent } from './waveform/waveform.component';
 
 @NgModule({
   declarations: [
     AppComponent,
-    SimpleFormComponent
+    SimpleFormComponent,
+    WaveformComponent
   ],
   imports: [
     BrowserModule,