diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3ea7aae --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.git/ +node_modules/ +client/ +.tmp/ +npm-debug.log diff --git a/Dockerfile b/Dockerfile index 15ca3e1..497ae44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1,8 @@ -FROM digitallyseamless/nodejs-bower-grunt-runtime +FROM fergalmoran/node + +ENV NODE_ENV production + +WORKDIR /app/dist/ +ADD dist /app/dist/ +ENV NODE_ENV production +CMD ["npm", "start"] diff --git a/client/app/app.js b/client/app/app.js index ece4228..b34b411 100755 --- a/client/app/app.js +++ b/client/app/app.js @@ -50,12 +50,13 @@ angular.module('dssWebApp', [ popupOptions: {width: 580, height: 400} }); $authProvider.twitter({ - url: '_a/?backend=twitter' + url: '_a/?backend=twitter', + redirectUri: window.location.origin + '/', }); $authProvider.google({ - clientId: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com', + clientId: '248170132962-gljba6svm1l8q73acmfc3ihkgp4orbnr.apps.googleusercontent.com', redirectUri: window.location.origin + '/', - url: '/_a/?backend=google', + url: '/_a/?backend=google' }); ngClipProvider.setPath("bower_components/zeroclipboard/dist/ZeroClipboard.swf"); diff --git a/client/app/services/auth/login.service.js b/client/app/services/auth/login.service.js index 10d1ded..3c8ecdb 100644 --- a/client/app/services/auth/login.service.js +++ b/client/app/services/auth/login.service.js @@ -76,8 +76,6 @@ angular.module('dssWebApp') } function logoutUser() { - return $q.resolve(); - /* var defer = $q.defer(); $auth.logout() .then(function(){ @@ -85,6 +83,5 @@ angular.module('dssWebApp') }); return defer.promise; - */ } }); diff --git a/client/assets/site/img/picjumbo.com_HNCK4169.jpg b/client/assets/site/img/picjumbo.com_HNCK4169.jpg deleted file mode 100644 index 2384b07..0000000 Binary files a/client/assets/site/img/picjumbo.com_HNCK4169.jpg and /dev/null differ diff --git a/client/assets/site/img/profile/original/picjumbo.com_HNCK4153.jpg b/client/assets/site/img/profile/original/picjumbo.com_HNCK4153.jpg deleted file mode 100644 index f6b46c7..0000000 Binary files a/client/assets/site/img/profile/original/picjumbo.com_HNCK4153.jpg and /dev/null differ diff --git a/client/assets/site/img/profile/picjumbo.com_HNCK4153_resize.jpg b/client/assets/site/img/profile/picjumbo.com_HNCK4153_resize.jpg deleted file mode 100644 index 02709ad..0000000 Binary files a/client/assets/site/img/profile/picjumbo.com_HNCK4153_resize.jpg and /dev/null differ diff --git a/client/assets/site/img/profile/profile-1.jpg b/client/assets/site/img/profile/profile-1.jpg deleted file mode 100644 index 405c367..0000000 Binary files a/client/assets/site/img/profile/profile-1.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK3558.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK3558.jpg deleted file mode 100644 index 1987905..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK3558.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4160.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4160.jpg deleted file mode 100644 index e1a6069..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4160.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4504.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4504.jpg deleted file mode 100644 index f7ec70d..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4504.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4737.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4737.jpg deleted file mode 100644 index 8bda284..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_HNCK4737.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_3241.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_3241.jpg deleted file mode 100644 index 15d7748..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_3241.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4340.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4340.jpg deleted file mode 100644 index dc25b28..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4340.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4566.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4566.jpg deleted file mode 100644 index 6d131df..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_IMG_4566.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/original/picjumbo.com_P1100451.jpg b/client/assets/site/img/thumbnails/original/picjumbo.com_P1100451.jpg deleted file mode 100644 index 89238ef..0000000 Binary files a/client/assets/site/img/thumbnails/original/picjumbo.com_P1100451.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/picjumbo.com_HNCK4737.jpg b/client/assets/site/img/thumbnails/picjumbo.com_HNCK4737.jpg deleted file mode 100644 index a555c23..0000000 Binary files a/client/assets/site/img/thumbnails/picjumbo.com_HNCK4737.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/picjumbo.com_IMG_3241.jpg b/client/assets/site/img/thumbnails/picjumbo.com_IMG_3241.jpg deleted file mode 100644 index b37cb78..0000000 Binary files a/client/assets/site/img/thumbnails/picjumbo.com_IMG_3241.jpg and /dev/null differ diff --git a/client/assets/site/img/thumbnails/picjumbo.com_IMG_4566.jpg b/client/assets/site/img/thumbnails/picjumbo.com_IMG_4566.jpg deleted file mode 100644 index 4c69b6e..0000000 Binary files a/client/assets/site/img/thumbnails/picjumbo.com_IMG_4566.jpg and /dev/null differ diff --git a/server/config/environment/development.js b/server/config/environment/development.js index 6fea319..84e6652 100755 --- a/server/config/environment/development.js +++ b/server/config/environment/development.js @@ -8,6 +8,6 @@ module.exports = { seedDB: true, redisHost: 'localhost', - apiUrl: 'http://ext-test.deepsouthsounds.com:8001', + apiUrl: 'https://ext-test.deepsouthsounds.com:8001', radioUrl: 'http://localhost:8000' };