diff --git a/.dockerignore b/.dockerignore index 3ea7aae..f9871ef 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ .git/ -node_modules/ client/ .tmp/ npm-debug.log diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7989278..0000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: node_js -node_js: - - '0.10' - - '0.11' -before_script: - - npm install -g bower grunt-cli - - bower install -services: mongodb \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 64dd2d3..b1b2abb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -#FROM digitallyseamless/nodejs-bower-grunt-runtime - -FROM node +FROM fergalmoran/node ENV NODE_ENV production WORKDIR /app/dist/ ADD dist /app/dist/ + +RUN npm install + ENV NODE_ENV production CMD ["npm", "start"] diff --git a/client/app/app.js b/client/app/app.js index faab7ca..0e5b3b5 100644 --- a/client/app/app.js +++ b/client/app/app.js @@ -13,7 +13,6 @@ angular.module('dssWebApp', [ 'ui.select', 'dialogs.main', 'infinite-scroll', - 'angularFileUpload', 'angulartics', 'angular-jwt', 'angular-smilies', @@ -40,7 +39,7 @@ angular.module('dssWebApp', [ $authProvider.facebook({ name: 'facebook', url: '/_a/?backend=facebook', - clientId: '154504534677009', + clientId: '344996219591469', authorizationEndpoint: 'https://www.facebook.com/v2.5/dialog/oauth', redirectUri: window.location.origin + '/', requiredUrlParams: ['display', 'scope'], diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html index 819a62c..ab603a2 100644 --- a/client/app/components/navbar/navbar.html +++ b/client/app/components/navbar/navbar.html @@ -2,15 +2,16 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf b/client/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc6..0000000 Binary files a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff b/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e61285..0000000 Binary files a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 b/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b5..0000000 Binary files a/client/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/client/assets/fonts/font-awesome/FontAwesome.otf b/client/assets/fonts/font-awesome/FontAwesome.otf deleted file mode 100644 index d4de13e..0000000 Binary files a/client/assets/fonts/font-awesome/FontAwesome.otf and /dev/null differ diff --git a/client/assets/fonts/font-awesome/fontawesome-webfont.eot b/client/assets/fonts/font-awesome/fontawesome-webfont.eot deleted file mode 100644 index c7b00d2..0000000 Binary files a/client/assets/fonts/font-awesome/fontawesome-webfont.eot and /dev/null differ diff --git a/client/assets/fonts/font-awesome/fontawesome-webfont.svg b/client/assets/fonts/font-awesome/fontawesome-webfont.svg deleted file mode 100644 index 8b66187..0000000 --- a/client/assets/fonts/font-awesome/fontawesome-webfont.svg +++ /dev/null @@ -1,685 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/assets/fonts/font-awesome/fontawesome-webfont.ttf b/client/assets/fonts/font-awesome/fontawesome-webfont.ttf deleted file mode 100644 index f221e50..0000000 Binary files a/client/assets/fonts/font-awesome/fontawesome-webfont.ttf and /dev/null differ diff --git a/client/assets/fonts/font-awesome/fontawesome-webfont.woff b/client/assets/fonts/font-awesome/fontawesome-webfont.woff deleted file mode 100644 index 6e7483c..0000000 Binary files a/client/assets/fonts/font-awesome/fontawesome-webfont.woff and /dev/null differ diff --git a/client/assets/fonts/font-awesome/fontawesome-webfont.woff2 b/client/assets/fonts/font-awesome/fontawesome-webfont.woff2 deleted file mode 100644 index 7eb74fd..0000000 Binary files a/client/assets/fonts/font-awesome/fontawesome-webfont.woff2 and /dev/null differ diff --git a/client/index.html b/client/index.html index 46c0957..56c8ec4 100644 --- a/client/index.html +++ b/client/index.html @@ -1,5 +1,6 @@ + @@ -7,13 +8,12 @@ Deep|South|Sounds - - + - + @@ -52,6 +52,7 @@ +
@@ -61,12 +62,12 @@
-