Updated for using bower

This commit is contained in:
Wu Cheng-Han 2015-11-29 01:00:41 -06:00
parent 827cb259db
commit baed9eb33d
6 changed files with 42 additions and 41 deletions

1
app.js
View file

@ -134,6 +134,7 @@ passport.deserializeUser(function (id, done) {
//routes //routes
//static files //static files
app.use('/', express.static(__dirname + '/public')); app.use('/', express.static(__dirname + '/public'));
app.use('/vendor/', express.static(__dirname + '/bower_components'));
//template files //template files
app.set('views', __dirname + '/public'); app.set('views', __dirname + '/public');
//set render engine //set render engine

View file

@ -19,7 +19,7 @@
], ],
"dependencies": { "dependencies": {
"bootstrap": "~3.3.6", "bootstrap": "~3.3.6",
"jquery": "~2.1.4", "jquery": "~1.11.3",
"font-awesome": "~4.5.0", "font-awesome": "~4.5.0",
"reveal.js": "~3.2.0", "reveal.js": "~3.2.0",
"gsap": "greensock#~1.18.0", "gsap": "greensock#~1.18.0",

View file

@ -20,7 +20,7 @@
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<% } else { %> <% } else { %>
<link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/vendor/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/bootstrap-social.css"> <link rel="stylesheet" href="/css/bootstrap-social.css">
<% } %> <% } %>
@ -210,23 +210,23 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="//code.jquery.com/jquery-1.11.2.min.js" defer></script> <script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/TweenMax.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/jquery.gsap.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/jquery.gsap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/moment-with-locales.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment-with-locales.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/3.0.0/handlebars.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/1.8.6/url.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="/vendor/jquery-1.11.2.min.js" defer></script> <script src="/vendor/jquery/dist/jquery.min.js" defer></script>
<script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script> <script src="/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
<script src="/vendor/greensock-js/TweenMax.min.js" defer></script> <script src="/vendor/gsap/src/minified/TweenMax.min.js" defer></script>
<script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script> <script src="/vendor/gsap/src/minified/jquery.gsap.min.js" defer></script>
<script src="/vendor/select2/select2.min.js" defer></script> <script src="/vendor/select2/select2.min.js" defer></script>
<script src="/vendor/moment-with-locales.js" defer></script> <script src="/vendor/moment/min/moment-with-locales.min.js" defer></script>
<script src="/vendor/handlebars-v3.0.0.js" defer></script> <script src="/vendor/handlebars/handlebars.min.js" defer></script>
<script src="/vendor/url.min.js" defer></script> <script src="/vendor/js-url/url.min.js" defer></script>
<% } %> <% } %>
<script src="/vendor/js.cookie.js" defer></script> <script src="/vendor/js.cookie.js" defer></script>
<script src="/vendor/list.min.js" defer></script> <script src="/vendor/list.min.js" defer></script>

View file

@ -1,17 +1,17 @@
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script>
<script src="//code.jquery.com/jquery-1.11.2.min.js" defer></script> <script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/TweenMax.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/jquery.gsap.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/jquery.gsap.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="/vendor/spin.min.js" defer></script> <script src="/vendor/spin.js/spin.min.js" defer></script>
<script src="/vendor/jquery-1.11.2.min.js" defer></script> <script src="/vendor/jquery/dist/jquery.min.js" defer></script>
<script src="/vendor/jquery.mousewheel.min.js" defer></script> <script src="/vendor/jquery-mousewheel/jquery.mousewheel.min.js" defer></script>
<script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script> <script src="/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
<script src="/vendor/greensock-js/TweenMax.min.js" defer></script> <script src="/vendor/gsap/src/minified/TweenMax.min.js" defer></script>
<script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script> <script src="/vendor/gsap/src/minified/jquery.gsap.min.js" defer></script>
<% } %> <% } %>
<script src="/vendor/jquery-ui/jquery-ui.min.js" defer></script> <script src="/vendor/jquery-ui/jquery-ui.min.js" defer></script>
<!--codemirror--> <!--codemirror-->
@ -29,8 +29,8 @@
<script src="/vendor/string.min.js" defer></script> <script src="/vendor/string.min.js" defer></script>
<script src="/vendor/highlight-js/highlight.min.js" defer></script> <script src="/vendor/highlight-js/highlight.min.js" defer></script>
<script src="/vendor/js.cookie.js" defer></script> <script src="/vendor/js.cookie.js" defer></script>
<script src="/vendor/moment-with-locales.js" defer></script> <script src="/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="/vendor/handlebars-v3.0.0.js" defer></script> <script src="/vendor/handlebars/handlebars.min.js" defer></script>
<script src="/vendor/emojify/js/emojify.js" defer></script> <script src="/vendor/emojify/js/emojify.js" defer></script>
<script src="/vendor/to-markdown.js" defer></script> <script src="/vendor/to-markdown.js" defer></script>
<script src="/vendor/raphael-min.js" defer></script> <script src="/vendor/raphael-min.js" defer></script>
@ -39,7 +39,7 @@
<script src="/vendor/flowchart/flowchart-1.4.0.min.js" defer></script> <script src="/vendor/flowchart/flowchart-1.4.0.min.js" defer></script>
<script src="/vendor/FileSaver.min.js" defer></script> <script src="/vendor/FileSaver.min.js" defer></script>
<script src="/vendor/store.min.js" defer></script> <script src="/vendor/store.min.js" defer></script>
<script src="/vendor/url.min.js" defer></script> <script src="/vendor/js-url/url.min.js" defer></script>
<script src="/vendor/jquery-textcomplete/jquery.textcomplete.js" defer></script> <script src="/vendor/jquery-textcomplete/jquery.textcomplete.js" defer></script>
<script src="/vendor/idle.js" defer></script> <script src="/vendor/idle.js" defer></script>
<script src="/vendor/visibility-1.2.1.min.js" defer></script> <script src="/vendor/visibility-1.2.1.min.js" defer></script>

View file

@ -8,12 +8,12 @@
<link rel="icon" type="image/png" href="/favicon.png"> <link rel="icon" type="image/png" href="/favicon.png">
<link rel="apple-touch-icon" href="/apple-touch-icon.png"> <link rel="apple-touch-icon" href="/apple-touch-icon.png">
<% if(useCDN) { %> <% if(useCDN) { %>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<% } else { %> <% } else { %>
<link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/vendor/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css"> <link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/bootstrap-social.css"> <link rel="stylesheet" href="/css/bootstrap-social.css">
<% } %> <% } %>
<link rel="stylesheet" href="/vendor/jquery-ui/jquery-ui.min.css"> <link rel="stylesheet" href="/vendor/jquery-ui/jquery-ui.min.css">

View file

@ -12,10 +12,10 @@
<link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
<% if(useCDN) { %> <% if(useCDN) { %>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<% } else { %> <% } else { %>
<link rel="stylesheet" href='<%- url %>/vendor/bootstrap/css/bootstrap.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/bootstrap/dist/css/bootstrap.min.css'>
<link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'>
<% } %> <% } %>
<link rel="stylesheet" href='<%- url %>/css/github-extract.css'> <link rel="stylesheet" href='<%- url %>/css/github-extract.css'>
@ -51,11 +51,11 @@
</html> </html>
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="https://code.jquery.com/jquery-1.11.2.min.js" defer></script> <script src="https://code.jquery.com/jquery-1.11.3.min.js" defer></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="<%- url %>/vendor/jquery-1.11.2.min.js" defer></script> <script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>
<script src="<%- url %>/vendor/bootstrap/js/bootstrap.min.js" defer></script> <script src="<%- url %>/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
<% } %> <% } %>
<script src="<%- url %>/vendor/lz-string.min.js" defer></script> <script src="<%- url %>/vendor/lz-string.min.js" defer></script>
<script src="<%- url %>/vendor/remarkable.min.js" defer></script> <script src="<%- url %>/vendor/remarkable.min.js" defer></script>
@ -63,7 +63,7 @@
<script src="<%- url %>/vendor/gist-embed.js" defer></script> <script src="<%- url %>/vendor/gist-embed.js" defer></script>
<script src="<%- url %>/vendor/string.min.js" defer></script> <script src="<%- url %>/vendor/string.min.js" defer></script>
<script src="<%- url %>/vendor/highlight-js/highlight.min.js" defer></script> <script src="<%- url %>/vendor/highlight-js/highlight.min.js" defer></script>
<script src="<%- url %>/vendor/moment-with-locales.js" defer></script> <script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script> <script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script>
<script src="<%- url %>/vendor/raphael-min.js" defer></script> <script src="<%- url %>/vendor/raphael-min.js" defer></script>
<script src="<%- url %>/vendor/lodash.min.js" defer></script> <script src="<%- url %>/vendor/lodash.min.js" defer></script>