From baed9eb33d1ae6da5d04a11ae8df6bc6293f04b6 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han 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 @@ <% } else { %> - + <% } %> @@ -210,23 +210,23 @@ ================================================== --> <% if(useCDN) { %> - - - - + + + + - - - + + + <% } else { %> - - - - + + + + - - - + + + <% } %> 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) { %> - + - - - + + + <% } else { %> - - - - - - + + + + + + <% } %> @@ -29,8 +29,8 @@ - - + + @@ -39,7 +39,7 @@ - + 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 @@ <% if(useCDN) { %> - - + + <% } else { %> - - + + <% } %> 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 @@ <% if(useCDN) { %> - - + + <% } else { %> - + <% } %> @@ -51,11 +51,11 @@ <% if(useCDN) { %> - - + + <% } else { %> - - + + <% } %> @@ -63,7 +63,7 @@ - +