diff --git a/Gruntfile.js b/Gruntfile.js
index f24b72b..8c02e20 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -247,7 +247,6 @@ module.exports = function (grunt) {
src: [
'<%= yeoman.dist %>/public/{,*/}*.js',
'<%= yeoman.dist %>/public/{,*/}*.css',
- '<%= yeoman.dist %>/public/assets/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
'<%= yeoman.dist %>/public/assets/fonts/*',
'!<%= yeoman.dist %>/public/assets/images/dyn/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
]
diff --git a/bower.json b/bower.json
index e6f80df..a37d0cd 100755
--- a/bower.json
+++ b/bower.json
@@ -43,8 +43,6 @@
"angular-socket-io": "^0.7.0",
"socket.io-client": "^1.4.6",
"angular-toastr": "^1.7.0",
- "angular-inform": "^0.0.18",
- "font-awesome": "^4.6.3",
"jquery.gritter": "^1.7.4"
},
"devDependencies": {
@@ -52,7 +50,6 @@
"angular-scenario": ">=1.2.*"
},
"resolutions": {
- "angular-bootstrap": "~0.14.3",
"angular": "1.4.*"
}
}
diff --git a/client/app/app.js b/client/app/app.js
index 8f9f6ae..73da360 100755
--- a/client/app/app.js
+++ b/client/app/app.js
@@ -20,8 +20,7 @@ angular.module('dssWebApp', [
'angular-smilies',
'satellizer',
'toastr',
- 'angulartics.google.analytics',
- 'inform'
+ 'angulartics.google.analytics'
])
.config(function ($stateProvider, $sceDelegateProvider, $httpProvider, $urlRouterProvider, $locationProvider, $provide, $authProvider,
ngClipProvider, $analyticsProvider, dialogsProvider, DSProvider, DSHttpAdapterProvider,
diff --git a/client/app/main.controller.js b/client/app/main.controller.js
index eed6ee8..e5bcacf 100755
--- a/client/app/main.controller.js
+++ b/client/app/main.controller.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('dssWebApp')
- .controller('MainCtrl', function ($scope, $rootScope, $http, $state, $auth, inform,
+ .controller('MainCtrl', function ($scope, $rootScope, $http, $state, $auth,
dialogs, logger, SocketService, AudioService,
MixModel, UserModel, LoginService, Session,
SERVER_CONFIG, CHAT_EVENTS, MESSAGE_EVENTS, AUTH_EVENTS) {
diff --git a/client/assets/utils.js b/client/assets/utils.js
index 5a6aa06..7cbfbd1 100644
--- a/client/assets/utils.js
+++ b/client/assets/utils.js
@@ -1,60 +1,15 @@
'use strict';
var utils = {
getWindowWidth: function () {
- return window.innerWidth
- || document.documentElement.clientWidth
- || document.body.clientWidth;
+ return window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
},
showToast: function(title, text, image){
$.gritter.add({
title: title,
text: text,
image: image,
+ time: 60000,
sticky: false
});
- },
- gritterNotification: function () {
- // display marketing alert only once
- if($('#wrapper').css('opacity')) {
- if (!$.cookie('intro')) {
- // Gritter notification intro 1
- setTimeout(function () {
- var unique_id = $.gritter.add({
- // (string | mandatory) the heading of the notification
- title: 'Welcome to Blankon',
- // (string | mandatory) the text inside the notification
- text: 'Blankon is a theme fullpack admin template powered by Twitter bootstrap 3 front-end framework.',
- // (string | optional) the image to display on the left
- image: BlankonApp.handleBaseURL()+'/assets/global/img/icon/64/contact.png',
- // (bool | optional) if you want it to fade out on its own or just sit there
- sticky: false,
- // (int | optional) the time you want it to be alive for before fading out
- time: ''
- });
- // You can have it return a unique id, this can be used to manually remove it later using
- setTimeout(function () {
- $.gritter.remove(unique_id, {
- fade: true,
- speed: 'slow'
- });
- }, 12000);
- }, 5000);
- // Gritter notification intro 2
- setTimeout(function () {
- $.gritter.add({
- // (string | mandatory) the heading of the notification
- title: 'Playing sounds',
- // (string | mandatory) the text inside the notification
- text: 'Blankon made for playing small sounds, will help you with this task. Please make your sound system is active',
- // (string | optional) the image to display on the left
- image: BlankonApp.handleBaseURL()+'/assets/global/img/icon/64/sound.png',
- // (bool | optional) if you want it to fade out on its own or just sit there
- sticky: true,
- // (int | optional) the time you want it to be alive for before fading out
- time: ''
- });
- }, 8000);
- }
- }
}
};
diff --git a/client/index.html b/client/index.html
index d1c528f..d7e2683 100644
--- a/client/index.html
+++ b/client/index.html
@@ -8,6 +8,8 @@
+
+
@@ -26,7 +28,6 @@
-
@@ -37,7 +38,6 @@
-
@@ -132,7 +132,6 @@
-
diff --git a/docker_build.sh b/docker_build.sh
old mode 100644
new mode 100755
diff --git a/server/config/environment/development.js b/server/config/environment/development.js
index 6fea319..7c70bc0 100755
--- a/server/config/environment/development.js
+++ b/server/config/environment/development.js
@@ -8,6 +8,7 @@ module.exports = {
seedDB: true,
redisHost: 'localhost',
- apiUrl: 'http://ext-test.deepsouthsounds.com:8001',
+ //apiUrl: 'http://ext-test.deepsouthsounds.com:8001',
+ apiUrl: 'http://localhost:8001',
radioUrl: 'http://localhost:8000'
};