From c7c11cf7f6bb78639e7ad41781ad29add4a027fd Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 3 May 2015 01:37:22 -0700 Subject: [PATCH] get closer to all bower static assets --- app.js | 3 +- bower.json | 29 ++++++++++++++++++ public/js/application.js | 5 +--- views/account/show.jade | 2 -- views/partials/css-cdns.jade | 47 ------------------------------ views/partials/universal-head.jade | 15 ++++++++-- 6 files changed, 44 insertions(+), 57 deletions(-) create mode 100644 bower.json diff --git a/app.js b/app.js index 962d7dd1dd..c64eb61526 100755 --- a/app.js +++ b/app.js @@ -95,7 +95,8 @@ app.use(express.static(__dirname + '/public', {maxAge: oneYear})); app.use(connectAssets({ paths: [ path.join(__dirname, 'public/css'), - path.join(__dirname, 'public/js') + path.join(__dirname, 'public/js'), + path.join(__dirname, '/bower_components') ], build: false, buildDir: false, diff --git a/bower.json b/bower.json new file mode 100644 index 0000000000..791cbb93bb --- /dev/null +++ b/bower.json @@ -0,0 +1,29 @@ +{ + "name": "freecodecamp", + "version": "0.0.0", + "homepage": "http://freecodecamp.com", + "authors": [ + "Quincy Larson " + ], + "license": "MIT", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "public/bower_components", + "test", + "tests" + ], + "dependencies": { + "angular-ui-bootstrap": "~0.13.0", + "angular": "~1.3.15", + "d3": "~3.5.5", + "jquery": "~2.1.4", + "cal-heatmap": "~3.5.2", + "bootstrap": "~3.3.4", + "font-awesome": "~4.3.0", + "moment": "~2.10.2", + "angular-route": "~1.3.15" + } +} diff --git a/public/js/application.js b/public/js/application.js index bf07cd484f..20c69637b6 100644 --- a/public/js/application.js +++ b/public/js/application.js @@ -13,7 +13,4 @@ * scripts down below using //= filename.js notation. */ -//= require lib/jquery-2.1.1.min -//= require lib/bootstrap.min -//= require lib/moment/moment -//= require main \ No newline at end of file + diff --git a/views/account/show.jade b/views/account/show.jade index ba545fa551..f953353cbb 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -101,8 +101,6 @@ block content .spacer .hidden-xs.hidden-sm.col-md-12 - script(src="//d3js.org/d3.v3.min.js") - script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js") #cal-heatmap.d3-centered script. $(document).ready(function() { diff --git a/views/partials/css-cdns.jade b/views/partials/css-cdns.jade index 3aade4da1e..e69de29bb2 100644 --- a/views/partials/css-cdns.jade +++ b/views/partials/css-cdns.jade @@ -1,47 +0,0 @@ -script. - var cb = function() { - var l = document.createElement('link'); - l.rel = 'stylesheet'; - l.href = '//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'; - var h = document.getElementsByTagName('head')[0]; h.parentNode.insertBefore(l, h); - }; - var raf = requestAnimationFrame || mozRequestAnimationFrame || - webkitRequestAnimationFrame || msRequestAnimationFrame; - if (raf) raf(cb); - else window.addEventListener('load', cb); - - var cb = function () { - var l = document.createElement('link'); - l.rel = 'stylesheet'; - l.href = '//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'; - var h = document.getElementsByTagName('head')[0]; - h.parentNode.insertBefore(l, h); - }; - var raf = requestAnimationFrame || mozRequestAnimationFrame || - webkitRequestAnimationFrame || msRequestAnimationFrame; - if (raf) raf(cb); - else window.addEventListener('load', cb); - - var cb = function () { - var l = document.createElement('link'); - l.rel = 'stylesheet'; - l.href = 'http://fonts.googleapis.com/css?family=Lato:400|Inconsolata'; - var h = document.getElementsByTagName('head')[0]; - h.parentNode.insertBefore(l, h); - }; - var raf = requestAnimationFrame || mozRequestAnimationFrame || - webkitRequestAnimationFrame || msRequestAnimationFrame; - if (raf) raf(cb); - else window.addEventListener('load', cb); - - var cb = function () { - var l = document.createElement('link'); - l.rel = 'stylesheet'; - l.href = '//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css'; - var h = document.getElementsByTagName('head')[0]; - h.parentNode.insertBefore(l, h); - }; - var raf = requestAnimationFrame || mozRequestAnimationFrame || - webkitRequestAnimationFrame || msRequestAnimationFrame; - if (raf) raf(cb); - else window.addEventListener('load', cb); diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade index ad37165618..45ff12725b 100644 --- a/views/partials/universal-head.jade +++ b/views/partials/universal-head.jade @@ -1,6 +1,15 @@ -script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") -script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") -script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") +script(src="/bower_components/jquery/dist/jquery.min.js") +script(src="/bower_components/d3/d3.js") +script(src="/bower_components/cal-heatmap/cal-heatmap.min.js") +//script(src="/bower_components/angular/angular.min.js") +//script(src="/bower_components/angular-route/angular-route.min.js") +script(src="/bower_components/bootstrap/dist/js/bootstrap.min.js") +script(src="/bower_components/moment/min/moment.min.js") +script(src="/js/main.js") +link(rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400|Inconsolata") +link(rel="stylesheet" type="text/css" href="bower_components/cal-heatmap/cal-heatmap.css") +link(rel='stylesheet', href='/css/main.less') + include meta title #{title} | Free Code Camp meta(charset='utf-8')