diff --git a/.bowerrc b/.bowerrc index cb5bc5e..e880883 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,5 @@ { - "directory": "public/js/vendor" -} \ No newline at end of file + "directory": "public/vendor", + "analytics": false, + "interactive": false +} diff --git a/.gitignore b/.gitignore index ee8b874..93ff32d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,10 +25,9 @@ build/Release # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules -public/js/vendor +public/vendor -*.sublime-workspace /output.txt /err.txt diff --git a/bower.json b/bower.json index 3654720..93f00b5 100644 --- a/bower.json +++ b/bower.json @@ -17,6 +17,8 @@ "jquery": "~2.1.4", "bootstrap": "~3.3.4", "socket.io-client": "https://github.com/Automattic/socket.io-client.git#~1.3.5", - "js-cookie": "~2.0.2" + "js-cookie": "~2.0.2", + "angular": "~1.4.8", + "angular-ui-router": "~0.2.15" } } diff --git a/views/index.jade b/views/index.jade index 1510c40..82b4a5b 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,7 +3,7 @@ extend layouts/main block dependencies - script(src='/public/js/vendor/socket.io-client/socket.io.js') + script(src='/public/vendor/socket.io-client/socket.io.js') script(src='/public/js/index.js') block leftbar diff --git a/views/layouts/main.jade b/views/layouts/main.jade index 42a8d4d..30487c0 100644 --- a/views/layouts/main.jade +++ b/views/layouts/main.jade @@ -10,14 +10,14 @@ html link(rel='shortcut icon', type='image/png', href='/public/img/icon.png') //- jQuery - script(src='/public/js/vendor/jquery/dist/jquery.min.js') + script(src='/public/vendor/jquery/dist/jquery.min.js') //- bootstrap - script(src='/public/js/vendor/bootstrap/dist/js/bootstrap.min.js') - link(rel='stylesheet', href='/public/js/vendor/bootstrap/dist/css/bootstrap.min.css') + script(src='/public/vendor/bootstrap/dist/js/bootstrap.min.js') + link(rel='stylesheet', href='/public/vendor/bootstrap/dist/css/bootstrap.min.css') //- js-cookie - script(src='/public/js/vendor/js-cookie/src/js.cookie.js') + script(src='/public/vendor/js-cookie/src/js.cookie.js')