Clean up

src/app/routes.js

@@ -3,7 +3,6 @@ const bodyParser = require('body-parser');
 const urlBodyParser = bodyParser.urlencoded({ extended: true, limit: '1mb' });
 const jsonBodyParser = bodyParser.json();
 const defaultBodyParser = bodyParser();
-const faker = require('faker');
 const products = require("./data/products").products;
 
 module.exports = function( express, app ){
@@ -49,23 +48,6 @@ module.exports = function( express, app ){
 		}
 	} );
 
-	// const upload = multer( {
-	// 	dest: './tmp-uploads',
-	// 	limits: { fileSize: 20000000 },
-	// 	fileFilter: function( req, file, cb ){
-
-	// 		let ok = false;
-
-	// 		if( file.mimetype !== 'image/png' ){
-	// 			ok = true;
-	// 		} else {
-	// 			req.failedfiles = req.failedfiles || [];
-	// 			req.failedfiles.push(file);
-	// 		}
-	// 		cb( null, ok );
-	// 	}
-	// } ).array('documents', 10);
-
 	const upload = multer( {
 		dest: './tmp-uploads',
 		limits: { fileSize: 2000000 },

src/app/views/components/autocomplete.html

@@ -2,8 +2,6 @@
 
 {% block title %}Autocomplete - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Autocomplete')}}
 

src/app/views/components/buttons.html

@@ -2,8 +2,6 @@
 
 {% block title %}Buttons - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Buttons')}}
 

src/app/views/components/character-countdown.html

@@ -2,8 +2,6 @@
 
 {% block title %}Character countdown - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Character countdown')}}
 

src/app/views/components/checkbox-group.html

@@ -2,8 +2,6 @@
 
 {% block title %}Checkbox group - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Checkboxes')}}
 

src/app/views/components/date-picker.html

@@ -2,8 +2,6 @@
 
 {% block title %}Date picker - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Date picker')}}
 

src/app/views/components/file-picker.html

@@ -2,8 +2,6 @@
 
 {% block title %}File picker - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('File picker')}}
 

src/app/views/components/index.html

@@ -3,8 +3,6 @@
 
 {% block title %}Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	<h1>Components</h1>
 

src/app/views/components/memorable-date.html

@@ -2,8 +2,6 @@
 
 {% block title %}Memorable date - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Memorable date')}}
 

src/app/views/components/menu.html

@@ -2,8 +2,6 @@
 
 {% block title %}Menu - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Menu')}}
 

src/app/views/components/password-reveal.html

@@ -2,8 +2,6 @@
 
 {% block title %}Password reveal - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Password reveal')}}
 

src/app/views/components/radio-buttons.html

@@ -2,8 +2,6 @@
 
 {% block title %}Radio buttons - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Radio buttons')}}
 

src/app/views/components/select-box.html

@@ -2,9 +2,6 @@
 
 {% block title %}Select box - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{headings.h1('Select box')}}
 

src/app/views/components/stepper.html

@@ -2,8 +2,6 @@
 
 {% block title %}Stepper - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-
 {% block mainContent %}
 	{{headings.h1('Stepper')}}
 

src/app/views/components/text-field.html

@@ -2,9 +2,6 @@
 
 {% block title %}Text field - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{headings.h1('Text field')}}
 

src/app/views/components/textarea.html

@@ -2,9 +2,6 @@
 
 {% block title %}Textarea - Components{% endblock %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{headings.h1('Textarea')}}
 

src/app/views/examples/add-another-form.html

@@ -1,10 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "addanother" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
-
 {% block pageScript %}
 	<script>
 		new AddAnotherForm($('.addAnother'));

src/app/views/examples/autocomplete.html

@@ -1,9 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "autocomplete" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block pageScript %}
 	<script>
 		var ac = new Autocomplete($('#destination'));

src/app/views/examples/character-countdown.html

@@ -1,9 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "characters-remaining" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block pageScript %}
 	<script>
 		var ci = new CharacterCountdown(document.getElementById('notes'));

src/app/views/examples/checkbox-group.html

@@ -1,9 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "checkbox-group" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{formElements.checkboxes('things', 'Things you like', [{
 		label: 'Chocolate',

src/app/views/examples/datalist.html

@@ -1,8 +1,5 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{formElements.datalist('destination', 'Destination', [{ value: "1", text: "Afghanistan" },
 { value: "2", text: "Åland Islands" },

src/app/views/examples/date-picker-always.html

@@ -1,9 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "date-picker-field" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-
 {% block pageScript %}
 	<script>
 		new DatePicker($('#tdate'));

src/app/views/examples/date-picker.html

@@ -1,7 +1,5 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/form-elements.html" as formElements %}
-
 {% block pageScript %}
 	<script>
 		if(typeof DatePicker !== 'undefined') {

src/app/views/examples/delivery-options-form.html

@@ -1,10 +1,7 @@
 {% extends 'layouts/raw.html' %}
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
 
 {% block mainContent %}
-	
+
 	<form>
 		{{formElements.radioButtons('deliveryoptions', 'Delivery options', [{ id: "1", label: "Standard (Free, 2-3 days)" },
 		{ id: "2", label: "Next day (£6)" }])}}

src/app/views/examples/download-to-upload.html

@@ -1,18 +1,14 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "upload" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
-
 {% block mainContent %}
 
 	{{headings.h1('Download to upload')}}
 
 	<p><a href="#">Download previous version</a></p>
 
 	<form novalidate enctype="multipart/form-data" method="post" action="/">
-		{{formElements.fileInput('documents', 'Upload file')}}	
+		{{formElements.fileInput('documents', 'Upload file')}}
 		{{buttons.primaryButton('Continue', 'continue')}}
 	</form>
 

src/app/views/examples/dropzone.html

@@ -1,11 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "upload" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
-{% import "macros/navigation.html" as navigation %}
-
 {% block pageScript %}
 <script>
 	if(typeof Dropzone != 'undefined') {
@@ -29,7 +24,7 @@
 	</svg>
 
 	<h1>Upload files</h1>
-	
+
 	<div class="files {% if not files.length %}hidden{% endif%}">
 		<h2>Files</h2>
 		<ul>

src/app/views/examples/email-field.html

@@ -1,9 +1,7 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 
 	{{formElements.textBox('email', 'Email address', type='email')}}
-	
+
 {% endblock mainContent %}

src/app/views/examples/file-picker.html

@@ -1,8 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "file-input" %}
 
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 	{{formElements.fileInput('file', 'Choose file')}}
 {% endblock mainContent %}

src/app/views/examples/filter-form.html

@@ -1,21 +1,18 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
-
 {% block pageScript %}
-<script>
-	new FilterCollapser($('fieldset').eq(0));
-	new FilterCollapser($('fieldset').eq(1));
-	new FilterCollapser($('fieldset').eq(2));
+	<script>
+		new FilterCollapser($('fieldset').eq(0));
+		new FilterCollapser($('fieldset').eq(1));
+		new FilterCollapser($('fieldset').eq(2));
 
-	new FilterRequester();
-	new FilterMenu();
-</script>
+		new FilterRequester();
+		new FilterMenu();
+	</script>
 {% endblock pageScript %}
 
 {% block mainContent %}
-		
+
 
 		<h1 class="filter-heading">Wallets</h1>
 		<div class="filter-marker"></div>
@@ -26,7 +23,7 @@ <h1 class="filter-heading">Wallets</h1>
 				<h2 id="filter-heading">Filter</h2>
 
 				<form role="form" method="get" action="/examples/filter-form">
-				
+
 					{{formElements.checkboxes('color', 'Color', [{
 						label: 'Red',
 						id: 'color',

src/app/views/examples/login-form.html

@@ -1,9 +1,5 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/buttons.html" as buttons %}
-
 {% block pageScript %}
 	<script>
 		var validator = new FormValidator(document.forms[0]);
@@ -42,7 +38,7 @@
 
 {% block mainContent %}
 
-	
+
 	{{headings.h1('Log in')}}
 	<ul>
 		<li>Not signed up? <a href="/examples/registration-form">Register</a></li>

src/app/views/examples/memorable-date.html

@@ -1,10 +1,6 @@
 {% extends 'layouts/raw.html' %}
 {% set cnav = "memorable-date-field" %}
 
-{% import "macros/headings.html" as headings %}
-{% import "macros/form-elements.html" as formElements %}
-{% import "macros/navigation.html" as navigation %}
-
 {% block pageHeader %}
 	{{headings.h1('Memorable date')}}
 {% endblock pageHeader %}

src/app/views/examples/password-field.html

@@ -1,9 +1,7 @@
 {% extends 'layouts/raw.html' %}
 
-{% import "macros/form-elements.html" as formElements %}
-
 {% block mainContent %}
 
 	{{formElements.textBox('password', 'Password', type='password')}}
-	
+
 {% endblock mainContent %}