Merge pull request #1 from brain11f/workingbranch

Workingbranch
DDunc · Oct 19, 2015 · b2801cb · b2801cb
2 parents 3c41ea4 + cd6f361
commit b2801cb
Show file tree

Hide file tree

Showing 28 changed files with 383 additions and 446 deletions.
diff --git a/gulp/tasks/default.js b/gulp/tasks/default.js
@@ -1,4 +1,4 @@
 var gulp = require('gulp');
 
-gulp.task('default', ['sass', 'html', 'index', 'ngConfig', 'webpack', 'watch', 'serve']);
+gulp.task('default', ['sass', 'html', 'index', 'webpack', 'watch', 'serve']);
 
diff --git a/gulp/tasks/watch.js b/gulp/tasks/watch.js
@@ -7,7 +7,7 @@ gulp.task('watch', function() {
   gulp.watch(config.index.src, ['index']);
   gulp.watch(config.html.src, ['html']);
 
-  gulp.watch(['./node_modules/angular/angular.js', './node_modules/angular-route/angular-route.js']);
+  gulp.watch(['./node_modules/angular/angular.js', './node_modules/angular-route/angular-route.js', './node_modules/angular-ui-router']);
   // Watchify will watch and recompile our JS, so no need to gulp.watch it
 });
 
diff --git a/src/html/keyboard.html b/src/html/keyboard.html
@@ -0,0 +1 @@
+<div>Hello World</div>
diff --git a/src/index.html b/src/index.html
@@ -1,30 +1,35 @@
-
-<html>
+<!doctype html>
+<html lang="en" ng-app="synthy">
+	<head>
+		<meta charset="UTF-8">
+		<meta http-equiv="x-ua-compatible" content="ie=edge">
+		<meta name="viewport" content="width=device-width, user-scalable=no">
+		<link rel="stylesheet" href="css/main.css">
+		<title>Websynth</title>
+	</head>
 	<body>
-	<link rel="stylesheet" href="css/main.css">
-		<div class="synth">
-			<div class="controls">
-				<button id="sine" class="osc">Sine</button>
-				<button id="noise" class="osc">Noise</button>
-			</div>
-			<div id="90" class="key white">
-				<div id="83" class="key black"></div>
-			</div>
-			<div id="88" class="key white">
-				<div id="68" class="key black"></div>
-			</div>
-			<div id="67" class="key white"></div>
-			<div id="86" class="key white">
-				<div id="71" class="key black"></div>
-			</div>
-			<div id="66" class="key white">
-				<div id="72" class="key black"></div>
-			</div>
-			<div id="78" class="key white">
-				<div id="74" class="key black"></div>
-			</div>
-			<div id="77" class="key white"></div>
-		</div>
-		<script src="index.js"></script>
+		<!-- NAV -->
+		<header class="header-container">
+			<h1 class="logo"></h1>
+			<nav class="primary-nav-wrap">
+
+			</nav>
+		</header>
+		<!-- SOME KIND OF NG-VIEW THING -->
+		<main ng-view>
+
+		</main>
+		<!-- FOOTER  -->
+		<footer>
+			<ul>
+				<li><a href="#">TERMS OF USE</a></li>
+				<li><a href="#">PRIVACY POLICY</a></li>
+				<li><a href="#">CONTACT</a></li>
+				<li><a href="#">SUPPORT</a></li>
+			</ul>
+		</footer>
+		
+		<!-- SCRIPT TAGS -->
+		<script src="js/packed.js"></script>
 	</body>
-</html>
+</html>
diff --git a/src/index.js b/src/index.js
diff --git a/src/js/entry.js b/src/js/entry.js
@@ -0,0 +1,3 @@
+require("./synth-app.js");
+require("./synth-ctrl.js");
+require("./synth-service.js");