Merge pull request #1 from Birch-san/complicate

This is fine work, Alex
Birch-san · Mar 11, 2016 · 3a0d44c · 3a0d44c
2 parents de08c65 + 3bc11c3
commit 3a0d44c
Show file tree

Hide file tree

Showing 81 changed files with 421 additions and 254 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "es2015-native-modules"
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+dist
+cache
diff --git a/build.js b/build.js
@@ -0,0 +1,24 @@
+/* eslint no-var: 0 */
+var exec = require('child_process').exec;
+
+var cmdLine = './node_modules/.bin/webpack --progress';
+var environ = (!process.argv[2].indexOf('development')) ? 'development' : 'production';
+var command;
+
+if (process.platform === 'win32') {
+  cmdLine = 'set NODE_ENV=' + environ + '&& ' + cmdLine;
+} else {
+  cmdLine = 'NODE_ENV=' + environ + ' ' + cmdLine;
+}
+
+command = exec(cmdLine);
+
+command.stdout.on('data', function(data) {
+  process.stdout.write(data);
+});
+command.stderr.on('data', function(data) {
+  process.stderr.write(data);
+});
+command.on('error', function(err) {
+  process.stderr.write(err);
+});
diff --git a/about.html → client/about/index.html b/about.html → client/about/index.html
@@ -34,12 +34,12 @@
 		<main>
 			<nav>
 				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="games.html">Games</a></li>
-					<li><a href="art.html">Art</a></li>
-					<li><a href="experiments.html">Experiments</a></li>
-					<li><a href="blog.html">Blog</a></li>
-					<li><a href="music.html">Music</a></li>
+					<li><a href="../index.html">Home</a></li>
+					<li><a href="../games/index.html">Games</a></li>
+					<li><a href="../art/index.html">Art</a></li>
+					<li><a href="../experiments/index.html">Experiments</a></li>
+					<li><a href="../blog/index.html">Blog</a></li>
+					<li><a href="../music/index.html">Music</a></li>
 					<li><b>About</b></li>
 				</ul>
 			</nav>
@@ -70,7 +70,7 @@ <h2><small>History</small></h2>
 					</p>
 					<p>The Birchlabs.co.uk of today continues to archive our legacy of Flash games. The plain-text site redesign will enable mobile users to enjoy the website.
 					</p>
-					<p>My favourite game here is Commando 3; it implements powerful RTS mechanics despite being a "coffee break" game. Invasion 5 is the most technically interesting game here (see <a href="experiments.html#Invasion5">Experiments</a>).
+					<p>My favourite game here is Commando 3; it implements powerful RTS mechanics despite being a "coffee break" game. Invasion 5 is the most technically interesting game here (see <a href="../experiments/index.html#Invasion5">Experiments</a>).
 					<br>
 					&mdash; Alex
 					</p>
@@ -82,17 +82,6 @@ <h2><small>History</small></h2>
 				<p>Styling: <a href="https://github.com/mblode/marx">Matthew Blode's Marx CSS</a></p>
 			</footer>
 		</main>
-
-		<script>
-			// Google PageSpeed non-blocking, post-initial-paint css loader https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery#example
-			// I shortened it for fun, and also added support for an array of stylesheets
-			// (requestAnimationFrame || mozRequestAnimationFrame || webkitRequestAnimationFrame || msRequestAnimationFrame || window.addEventListener.bind(null, 'load'))(function() {
-			// 	["https://cdnjs.cloudflare.com/ajax/libs/marx/1.3.0/marx.min.css"].forEach(function(s) {
-			// 		var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = s;
-			// 		var h = document.getElementsByTagName('head')[0]; h.parentNode.insertBefore(l, h);
-			// 	});
-			// });
-		</script>
 
 	</body>
 </html>
diff --git a/client/about/index.js b/client/about/index.js
diff --git a/art.html → client/art/index.html b/art.html → client/art/index.html
@@ -34,13 +34,13 @@
 		<main>
 			<nav>
 				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="games.html">Games</a></li>
+					<li><a href="../index.html">Home</a></li>
+					<li><a href="../games/index.html">Games</a></li>
 					<li><b>Art</b></li>
-					<li><a href="experiments.html">Experiments</a></li>
-					<li><a href="blog.html">Blog</a></li>
-					<li><a href="music.html">Music</a></li>
-					<li><a href="about.html">About</a></li>
+					<li><a href="../experiments/index.html">Experiments</a></li>
+					<li><a href="../blog/index.html">Blog</a></li>
+					<li><a href="../music/index.html">Music</a></li>
+					<li><a href="../about/index.html">About</a></li>
 				</ul>
 			</nav>
 
@@ -66,16 +66,5 @@ <h3><small>Addenda</small></h3>
 			</footer>
 		</main>
 
-		<script>
-			// Google PageSpeed non-blocking, post-initial-paint css loader https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery#example
-			// I shortened it for fun, and also added support for an array of stylesheets
-			// (requestAnimationFrame || mozRequestAnimationFrame || webkitRequestAnimationFrame || msRequestAnimationFrame || window.addEventListener.bind(null, 'load'))(function() {
-			// 	["https://cdnjs.cloudflare.com/ajax/libs/marx/1.3.0/marx.min.css"].forEach(function(s) {
-			// 		var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = s;
-			// 		var h = document.getElementsByTagName('head')[0]; h.parentNode.insertBefore(l, h);
-			// 	});
-			// });
-		</script>
-
 	</body>
 </html>
diff --git a/client/art/index.js b/client/art/index.js
diff --git a/blog.html → client/blog/index.html b/blog.html → client/blog/index.html
@@ -34,13 +34,13 @@
 		<main>
 			<nav>
 				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="games.html">Games</a></li>
-					<li><a href="art.html">Art</a></li>
-					<li><a href="experiments.html">Experiments</a></li>
+					<li><a href="../index.html">Home</a></li>
+					<li><a href="../games/index.html">Games</a></li>
+					<li><a href="../art/index.html">Art</a></li>
+					<li><a href="../experiments/index.html">Experiments</a></li>
 					<li><b>Blog</b></li>
-					<li><a href="music.html">Music</a></li>
-					<li><a href="about.html">About</a></li>
+					<li><a href="../music/index.html">Music</a></li>
+					<li><a href="../about/index.html">About</a></li>
 				</ul>
 			</nav>
 
@@ -61,16 +61,5 @@ <h2><small>Alex</small></h2>
 			</footer>
 		</main>
 
-		<script>
-			// Google PageSpeed non-blocking, post-initial-paint css loader https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery#example
-			// I shortened it for fun, and also added support for an array of stylesheets
-			// (requestAnimationFrame || mozRequestAnimationFrame || webkitRequestAnimationFrame || msRequestAnimationFrame || window.addEventListener.bind(null, 'load'))(function() {
-			// 	["https://cdnjs.cloudflare.com/ajax/libs/marx/1.3.0/marx.min.css"].forEach(function(s) {
-			// 		var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = s;
-			// 		var h = document.getElementsByTagName('head')[0]; h.parentNode.insertBefore(l, h);
-			// 	});
-			// });
-		</script>
-
 	</body>
 </html>
diff --git a/client/blog/index.js b/client/blog/index.js
diff --git a/Experiments/CirnoRope2.png → client/experiments/img/CirnoRope2.png b/Experiments/CirnoRope2.png → client/experiments/img/CirnoRope2.png
diff --git a/Experiments/Commando4.jpg → client/experiments/img/Commando4.jpg b/Experiments/Commando4.jpg → client/experiments/img/Commando4.jpg
diff --git a/Experiments/CommandoX.png → client/experiments/img/CommandoX.png b/Experiments/CommandoX.png → client/experiments/img/CommandoX.png
diff --git a/Experiments/Displacement.jpg → client/experiments/img/Displacement.jpg b/Experiments/Displacement.jpg → client/experiments/img/Displacement.jpg
diff --git a/Experiments/Invasion5.png → client/experiments/img/Invasion5.png b/Experiments/Invasion5.png → client/experiments/img/Invasion5.png
diff --git a/Experiments/Mode7.jpg → client/experiments/img/Mode7.jpg b/Experiments/Mode7.jpg → client/experiments/img/Mode7.jpg
diff --git a/Experiments/Naruto Game.jpg → client/experiments/img/Naruto Game.jpg b/Experiments/Naruto Game.jpg → client/experiments/img/Naruto Game.jpg
diff --git a/Experiments/Orbit.jpg → client/experiments/img/Orbit.jpg b/Experiments/Orbit.jpg → client/experiments/img/Orbit.jpg
diff --git a/Experiments/Polygon.png → client/experiments/img/Polygon.png b/Experiments/Polygon.png → client/experiments/img/Polygon.png
diff --git a/Experiments/Scythe.png → client/experiments/img/Scythe.png b/Experiments/Scythe.png → client/experiments/img/Scythe.png
diff --git a/Experiments/SurfaceNormals.png → client/experiments/img/SurfaceNormals.png b/Experiments/SurfaceNormals.png → client/experiments/img/SurfaceNormals.png
diff --git a/Experiments/Tower.png → client/experiments/img/Tower.png b/Experiments/Tower.png → client/experiments/img/Tower.png
diff --git a/Experiments/Vectors.png → client/experiments/img/Vectors.png b/Experiments/Vectors.png → client/experiments/img/Vectors.png
diff --git a/Experiments/WiiBox.png → client/experiments/img/WiiBox.png b/Experiments/WiiBox.png → client/experiments/img/WiiBox.png