From baed9eb33d1ae6da5d04a11ae8df6bc6293f04b6 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Sun, 29 Nov 2015 01:00:41 -0600
Subject: [PATCH] Updated for using bower
---
app.js | 1 +
bower.json | 2 +-
public/index.ejs | 30 +++++++++++++++---------------
public/views/foot.ejs | 26 +++++++++++++-------------
public/views/head.ejs | 8 ++++----
public/views/pretty.ejs | 16 ++++++++--------
6 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/app.js b/app.js
index 3dda03c3c..8ebcaacf3 100644
--- a/app.js
+++ b/app.js
@@ -134,6 +134,7 @@ passport.deserializeUser(function (id, done) {
//routes
//static files
app.use('/', express.static(__dirname + '/public'));
+app.use('/vendor/', express.static(__dirname + '/bower_components'));
//template files
app.set('views', __dirname + '/public');
//set render engine
diff --git a/bower.json b/bower.json
index 6167b3526..f708f83e3 100644
--- a/bower.json
+++ b/bower.json
@@ -19,7 +19,7 @@
],
"dependencies": {
"bootstrap": "~3.3.6",
- "jquery": "~2.1.4",
+ "jquery": "~1.11.3",
"font-awesome": "~4.5.0",
"reveal.js": "~3.2.0",
"gsap": "greensock#~1.18.0",
diff --git a/public/index.ejs b/public/index.ejs
index 2a80d8829..5555056ba 100644
--- a/public/index.ejs
+++ b/public/index.ejs
@@ -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="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<% } 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="/css/bootstrap-social.css">
<% } %>
@@ -210,23 +210,23 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<% if(useCDN) { %>
- <script src="//code.jquery.com/jquery-1.11.2.min.js" defer></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/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.16.1/jquery.gsap.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.6/js/bootstrap.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.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/moment.js/2.9.0/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/js-url/1.8.6/url.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/4.0.5/handlebars.min.js" defer></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script>
<% } else { %>
- <script src="/vendor/jquery-1.11.2.min.js" defer></script>
- <script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script>
- <script src="/vendor/greensock-js/TweenMax.min.js" defer></script>
- <script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script>
+ <script src="/vendor/jquery/dist/jquery.min.js" defer></script>
+ <script src="/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
+ <script src="/vendor/gsap/src/minified/TweenMax.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/moment-with-locales.js" defer></script>
- <script src="/vendor/handlebars-v3.0.0.js" defer></script>
- <script src="/vendor/url.min.js" defer></script>
+ <script src="/vendor/moment/min/moment-with-locales.min.js" defer></script>
+ <script src="/vendor/handlebars/handlebars.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/list.min.js" defer></script>
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index bdd5f55e9..b4fef9f15 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -1,17 +1,17 @@
<% if(useCDN) { %>
<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="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/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.16.1/jquery.gsap.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.18.0/TweenMax.min.js" defer></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/jquery.gsap.min.js" defer></script>
<% } else { %>
-<script src="/vendor/spin.min.js" defer></script>
-<script src="/vendor/jquery-1.11.2.min.js" defer></script>
-<script src="/vendor/jquery.mousewheel.min.js" defer></script>
-<script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script>
-<script src="/vendor/greensock-js/TweenMax.min.js" defer></script>
-<script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script>
+<script src="/vendor/spin.js/spin.min.js" defer></script>
+<script src="/vendor/jquery/dist/jquery.min.js" defer></script>
+<script src="/vendor/jquery-mousewheel/jquery.mousewheel.min.js" defer></script>
+<script src="/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
+<script src="/vendor/gsap/src/minified/TweenMax.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>
<!--codemirror-->
@@ -29,8 +29,8 @@
<script src="/vendor/string.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/moment-with-locales.js" defer></script>
-<script src="/vendor/handlebars-v3.0.0.js" defer></script>
+<script src="/vendor/moment/min/moment-with-locales.js" defer></script>
+<script src="/vendor/handlebars/handlebars.min.js" defer></script>
<script src="/vendor/emojify/js/emojify.js" defer></script>
<script src="/vendor/to-markdown.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/FileSaver.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/idle.js" defer></script>
<script src="/vendor/visibility-1.2.1.min.js" defer></script>
diff --git a/public/views/head.ejs b/public/views/head.ejs
index d4e9c2547..6eaa82c78 100644
--- a/public/views/head.ejs
+++ b/public/views/head.ejs
@@ -8,12 +8,12 @@
<link rel="icon" type="image/png" href="/favicon.png">
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<% if(useCDN) { %>
-<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/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="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.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">
<% } else { %>
-<link rel="stylesheet" href="/vendor/bootstrap/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/bootstrap/dist/css/bootstrap.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="/vendor/jquery-ui/jquery-ui.min.css">
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index b8b5d9d48..3f50363c1 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -12,10 +12,10 @@
<link rel="icon" type="image/png" href="<%- url %>/favicon.png">
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
<% 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/font-awesome/4.3.0/css/font-awesome.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.5.0/css/font-awesome.min.css">
<% } 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 %>/css/github-extract.css'>
@@ -51,11 +51,11 @@
</html>
<% if(useCDN) { %>
-<script src="https://code.jquery.com/jquery-1.11.2.min.js" defer></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.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.6/js/bootstrap.min.js" defer></script>
<% } else { %>
-<script src="<%- url %>/vendor/jquery-1.11.2.min.js" defer></script>
-<script src="<%- url %>/vendor/bootstrap/js/bootstrap.min.js" defer></script>
+<script src="<%- url %>/vendor/jquery/dist/jquery.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/remarkable.min.js" defer></script>
@@ -63,7 +63,7 @@
<script src="<%- url %>/vendor/gist-embed.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/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/raphael-min.js" defer></script>
<script src="<%- url %>/vendor/lodash.min.js" defer></script>