ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#100 Moved css out of webpack

master
Keith Irwin 2017-08-22 19:32:25 -04:00
parent 0179ccc74b
commit d011b31635
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
20 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/base.js
View File

@ -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),

2
static/js/contact.js
View File

@ -1,8 +1,6 @@
'use strict';
/* global $ */
import css from '../css/contact.css';
var validEmail, validMessage;
// Validate email addresses

3
static/js/controls.js vendored
View File

@ -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(){
}
});
});
});

4
static/js/footer.js
View File

@ -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(); });
$(window).resize(function(){ setFooter(); });

3
static/js/form.js
View File

@ -1,3 +0,0 @@
'use strict';
import css from '../css/form.css';

2
static/js/header.js
View File

@ -1,8 +1,6 @@
/* global $ */
'use strict';
import css from '../css/header.css';
$(document).ready(function(){
// Open drawer with hamburger

3
static/js/index.js
View File

@ -1,3 +0,0 @@
'use strict';
import css from '../css/index.css';

4
static/js/login.js
View File

@ -1,8 +1,6 @@
'use strict';
/* global $ */
import css from '../css/login.css';
$(function(){
// On clocking 'show'
@ -14,4 +12,4 @@ $(function(){
}
});
});
});

1
static/js/map.js
View File

@ -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';

2
static/js/settings.js
View File

@ -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,}))$/;

3
static/js/table.js
View File

@ -1,3 +0,0 @@
'use strict';
import css from '../css/table.css';

4
views/admin.html
View File

@ -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 %}

3
views/contact.html
View File

@ -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 %}

6
views/forgot.html
View File

@ -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 %}
{% endblock %}

9
views/login.html
View File

@ -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 %}

6
views/map.html
View File

@ -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 %}
{% endblock %}

7
views/password.html
View File

@ -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 %}

7
views/settings.html
View File

@ -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 %}

4
views/templates/base.html
View File

@ -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>

20
webpack.config.js
View File

@ -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' ]
}
]
}
};
};