From d011b31635c6ab2ea369e7a337d4571de2072134 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Tue, 22 Aug 2017 19:32:25 -0400
Subject: [PATCH] #100 Moved css out of webpack

---
 static/js/base.js         |  2 --
 static/js/contact.js      |  2 --
 static/js/controls.js     |  3 +--
 static/js/footer.js       |  4 +---
 static/js/form.js         |  3 ---
 static/js/header.js       |  2 --
 static/js/index.js        |  3 ---
 static/js/login.js        |  4 +---
 static/js/map.js          |  1 -
 static/js/settings.js     |  2 --
 static/js/table.js        |  3 ---
 views/admin.html          |  4 ++--
 views/contact.html        |  3 ++-
 views/forgot.html         |  6 +++---
 views/login.html          |  9 +++++++--
 views/map.html            |  6 ++++--
 views/password.html       |  7 ++++++-
 views/settings.html       |  7 ++++++-
 views/templates/base.html |  4 ++++
 webpack.config.js         | 20 +-------------------
 20 files changed, 38 insertions(+), 57 deletions(-)
 delete mode 100644 static/js/form.js
 delete mode 100644 static/js/index.js
 delete mode 100644 static/js/table.js

diff --git a/static/js/base.js b/static/js/base.js
index fa41e5d..0a966c5 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -1,8 +1,6 @@
 'use strict';
 /* global ga */
 
-import css from '../css/base.css';
-	
 // Google analytics
 (function(t,r,a,c,m,o,n){t['GoogleAnalyticsObject']=m;t[m]=t[m]||function(){
 (t[m].q=t[m].q||[]).push(arguments);},t[m].l=1*new Date();o=r.createElement(a),
diff --git a/static/js/contact.js b/static/js/contact.js
index 2871d4b..9bb9405 100644
--- a/static/js/contact.js
+++ b/static/js/contact.js
@@ -1,8 +1,6 @@
 'use strict';
 /* global $ */
 
-import css from '../css/contact.css';
-
 var validEmail, validMessage;
 
 // Validate email addresses
diff --git a/static/js/controls.js b/static/js/controls.js
index 0a7d9b6..4f486e1 100644
--- a/static/js/controls.js
+++ b/static/js/controls.js
@@ -1,7 +1,6 @@
 'use strict';
 /* global navigator $ userid token mapuser toggleMaps */
 
-import css from '../css/controls.css';
 import io from 'socket.io-client';
 
 const socket = io('//'+window.location.hostname);
@@ -135,4 +134,4 @@ $(function(){
 		}
 	});
 
-});
\ No newline at end of file
+});
diff --git a/static/js/footer.js b/static/js/footer.js
index a74bfdd..90f570f 100644
--- a/static/js/footer.js
+++ b/static/js/footer.js
@@ -1,8 +1,6 @@
 'use strict';
 /* global $ */
 
-import css from '../css/footer.css';
-	
 // Push footer to bottom on pages with little content
 function setFooter(){
 	var windowHeight = $(window).height(),
@@ -16,4 +14,4 @@ function setFooter(){
 $(function(){ setFooter(); });
 
 // Execute on window resize
-$(window).resize(function(){ setFooter(); });
\ No newline at end of file
+$(window).resize(function(){ setFooter(); });
diff --git a/static/js/form.js b/static/js/form.js
deleted file mode 100644
index b39b4d7..0000000
--- a/static/js/form.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-import css from '../css/form.css';
diff --git a/static/js/header.js b/static/js/header.js
index cdd0267..d47f5d7 100644
--- a/static/js/header.js
+++ b/static/js/header.js
@@ -1,8 +1,6 @@
 /* global $ */
 'use strict';
 
-import css from '../css/header.css';
-
 $(document).ready(function(){
 	
 	// Open drawer with hamburger
diff --git a/static/js/index.js b/static/js/index.js
deleted file mode 100644
index 0a0c058..0000000
--- a/static/js/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-import css from '../css/index.css';
diff --git a/static/js/login.js b/static/js/login.js
index 68f37d6..2458f62 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -1,8 +1,6 @@
 'use strict';
 /* global $ */
 
-import css from '../css/login.css';
-
 $(function(){
 	
 	// On clocking 'show'
@@ -14,4 +12,4 @@ $(function(){
 		}
 	});
 	
-});
\ No newline at end of file
+});
diff --git a/static/js/map.js b/static/js/map.js
index 487d698..8a67800 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -1,7 +1,6 @@
 'use strict';
 /* global mapuser userid disp noHeader mapKey */
 
-import css from '../css/map.css';
 import io from 'socket.io-client';
 import $ from 'jquery';
 import loadGoogleMapsAPI from 'load-google-maps-api';
diff --git a/static/js/settings.js b/static/js/settings.js
index 17fab4a..4be5c27 100644
--- a/static/js/settings.js
+++ b/static/js/settings.js
@@ -1,8 +1,6 @@
 'use strict';
 /* global location $ */
 
-import css from '../css/settings.css';
-
 // Validate email addresses
 function validateEmail(email) {
 	var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
diff --git a/static/js/table.js b/static/js/table.js
deleted file mode 100644
index f65635a..0000000
--- a/static/js/table.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-import css from '../css/table.css';
diff --git a/views/admin.html b/views/admin.html
index a7bd6b9..998351a 100644
--- a/views/admin.html
+++ b/views/admin.html
@@ -1,9 +1,9 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Admin{% endblock %}
 
-{% block javascript %}
+{% block head %}
 	{{super()}}
-	<script type="application/javascript" src="/static/js/.table.bun.js"></script>
+	<link href="/static/css/.table.min.css" rel="stylesheet">
 {% endblock %}
 
 {% block main %}
diff --git a/views/contact.html b/views/contact.html
index 4354bf0..6cfd593 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -3,13 +3,14 @@
 
 {% block head %}
 {{super()}}
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
+	<link rel="stylesheet" type="text/css" href="/static/css/.contact.min.css">
 	<script type="application/javascript" src='https://www.google.com/recaptcha/api.js'></script>
 {% endblock %}
 
 {% block javascript %}
 {{super()}}
 	<script type="application/javascript" src="/static/js/.contact.bun.js"></script>
-	<script type="application/javascript" src="/static/js/.form.bun.js"></script>
 {% endblock %}
 
 {% block main %}
diff --git a/views/forgot.html b/views/forgot.html
index 3c3b0ea..c1ed9a4 100644
--- a/views/forgot.html
+++ b/views/forgot.html
@@ -1,9 +1,9 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Reset Password{% endblock %}
 
-{% block javascript %}
+{% block head %}
 {{super()}}
-	<script type="application/javascript" src="/static/js/.form.bun.js"></script>
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
 {% endblock %}
 
 {% block main %}
@@ -24,4 +24,4 @@
 	</form>
 
 </section>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/views/login.html b/views/login.html
index 9d8407d..7a3bd21 100644
--- a/views/login.html
+++ b/views/login.html
@@ -1,9 +1,14 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Login{% endblock %}
 
+{% block head %}
+{{super()}}
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
+	<link rel="stylesheet" type="text/css" href="/static/css/.login.min.css">
+{% endblock %}
+
 {% block javascript %}
-	{{super()}}
-	<script type="application/javascript" src="/static/js/.form.bun.js"></script>
+{{super()}}
 	<script type="application/javascript" src="/static/js/.login.bun.js"></script>
 {% endblock %}
 
diff --git a/views/map.html b/views/map.html
index e1e089d..b38d58d 100644
--- a/views/map.html
+++ b/views/map.html
@@ -3,8 +3,9 @@
 
 {% block head %}
 	{{super()}}
+	<link href="/static/css/.map.min.css" rel="stylesheet">
 	<style>/* These styles include values passed from to the template from the server.  Other styles are in map.css */
-		{% if noHeader!='0' %} main { top: 0 !important; } {% endif %}
+		{% if noHeader!='0' %} main { top: 0; } {% endif %}
 		
 		{% if mapuser.settings.showStreetview and disp!='0' and disp!='1' %}
 		/* show both */
@@ -73,6 +74,7 @@
 	</div>
 	
 	{% if user.id == mapuser.id and mapuser._id != 'demo' %}
+		<link rel="stylesheet" type="text/css" href="/static/css/.controls.min.css">
 		<div id='controls'>
 		{% if mapuser.settings.showStreetview and disp!='0' %}
 			<style>
@@ -110,4 +112,4 @@
 		<script type="application/javascript" src="/static/js/.controls.bun.js"></script>
 	{% endif %}
 	
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/views/password.html b/views/password.html
index 5317743..3d99329 100644
--- a/views/password.html
+++ b/views/password.html
@@ -1,9 +1,14 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Set Password{% endblock %}
 
+{% block head %}
+{{super()}}
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
+	<link rel="stylesheet" type="text/css" href="/static/css/.settings.min.css">
+{% endblock %}
+
 {% block javascript %}
 {{super()}}
-	<script type="application/javascript" src="/static/js/.form.bun.js"></script>
 	<script type="application/javascript" src="/static/js/.password.bun.js"></script>
 {% endblock %}
 
diff --git a/views/settings.html b/views/settings.html
index 934f324..6107e60 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -1,9 +1,14 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Settings{% endblock %}
 
+{% block head %}
+{{super()}}
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
+	<link rel="stylesheet" type="text/css" href="/static/css/.settings.min.css">
+{% endblock %}
+
 {% block javascript %}
 {{super()}}
-	<script type="application/javascript" src="/static/js/.form.bun.js"></script>
 	<script type="application/javascript" src="/static/js/.settings.bun.js"></script>
 {% endblock %}
 
diff --git a/views/templates/base.html b/views/templates/base.html
index 1837c7a..9ba4c85 100644
--- a/views/templates/base.html
+++ b/views/templates/base.html
@@ -46,7 +46,11 @@
 		<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Merriweather:300,700">
 		<script type="application/javascript" src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
 		
+		<link rel="stylesheet" type="text/css" href="/static/css/.base.min.css">
+	
 	{% endblock %}
+	{% if not noHeader %}<link href="/static/css/.header.min.css" rel="stylesheet">{% endif %}
+	{% if not noFooter %}<link href="/static/css/.footer.min.css" rel="stylesheet">{% endif %}
 	</head>
 	<body>
 
diff --git a/webpack.config.js b/webpack.config.js
index 4f692f8..d47ce4e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,9 +8,6 @@ module.exports = {
 		base: './static/js/base.js',
 		header: './static/js/header.js',
 		footer: './static/js/footer.js',
-		index: './static/js/index.js',
-		table: './static/js/table.js',
-		form: './static/js/form.js',
 		contact: './static/js/contact.js',
 		login: './static/js/login.js',
 		map: './static/js/map.js',
@@ -26,23 +23,8 @@ module.exports = {
 	},
 	
 	plugins: [
-		
 		// Minimize JS
 		new uglifyJsPlugin()
-		
 	],
 	
-	module: {
-		
-		rules: [
-			
-			// Load CSS into bundles
-			{
-				test: /\.css$/,
-				use: [ 'style-loader', 'css-loader' ]
-			}
-			
-		]
-	}
-	
-};
\ No newline at end of file
+};