diff --git a/client/app/app.js b/client/app/app.js index 7e1c5b7..03c70f1 100755 --- a/client/app/app.js +++ b/client/app/app.js @@ -1,24 +1,24 @@ 'use strict'; angular.module('dssWebApp', [ - 'ngCookies', - 'ngResource', - 'ngAnimate', - 'ngSanitize', - 'btford.socket-io', - 'ui.router', - 'angular-loading-bar', - 'js-data', - 'ui.bootstrap', - 'dialogs.main', - 'infinite-scroll', - 'angularFileUpload', - 'angulartics', - 'angular-jwt', - 'http-auth-interceptor', - 'angular-smilies', - 'angulartics.google.analytics' -]) + 'ngCookies', + 'ngResource', + 'ngAnimate', + 'ngSanitize', + 'btford.socket-io', + 'ui.router', + 'angular-loading-bar', + 'js-data', + 'ui.bootstrap', + 'dialogs.main', + 'infinite-scroll', + 'angularFileUpload', + 'angulartics', + 'angular-jwt', + 'http-auth-interceptor', + 'angular-smilies', + 'angulartics.google.analytics' + ]) .config(function ($stateProvider, $sceDelegateProvider, $httpProvider, $urlRouterProvider, $locationProvider, $provide, jwtInterceptorProvider, $analyticsProvider, dialogsProvider, DSProvider, DSHttpAdapterProvider, SERVER_CONFIG, STORAGE) { @@ -51,72 +51,84 @@ angular.module('dssWebApp', [ ]); $locationProvider.html5Mode(true); }).run(function ($http, $rootScope, $state, $anchorScroll, $window, LoginService, Session, SocketService) { - $rootScope.isPlaying = false; + $rootScope.isPlaying = false; - $rootScope.setCurrentUser = function (user) { - console.log('Current user', user); - $rootScope.currentUser = user; - }; - $rootScope.connectSockets = function () { - SocketService.connectSocket(Session.getSession()); - SocketService.registerHandler('site:broadcast', function (data) { - console.log(data); - $.notify({ - message: data, - icon: '/assets/images/yeoman.png' - }, { - placement: { - from: 'bottom', - align: 'left' - }, - icon_type: 'image' - }); + $rootScope.setCurrentUser = function (user) { + console.log('Current user', user); + $rootScope.currentUser = user; + }; + $rootScope.connectSockets = function () { + SocketService.connectSocket(Session.getSession()); + SocketService.registerHandler('site:broadcast', function (data) { + console.log(data); + $.notify({ + message: data, + icon: '/assets/images/yeoman.png' + }, { + placement: { + from: 'bottom', + align: 'left' + }, + icon_type: 'image' }); - }; - - hello.init({ - facebook: '154504534677009', - twitter: 'qmvJ6tptgd8G9T9WYp6P3Q', - google: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com' - }, { - redirect_uri: '/' }); + }; - //ensure login before state change - $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { - if (!$rootScope.currentUser && Session.getLocalToken() != null && Session.getBackend()) { - LoginService.loginUser().then(function (user) { - LoginService.getUserProfile() - .then(function(user){ - $rootScope.setCurrentUser(user); - $rootScope.connectSockets(); + hello.init({ + facebook: '154504534677009', + twitter: 'qmvJ6tptgd8G9T9WYp6P3Q', + google: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com' + }, { + redirect_uri: '/' + }); + + //ensure login before state change + $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { + if (!$rootScope.currentUser && Session.getLocalToken() != null && Session.getBackend()) { + LoginService.loginUser().then(function (user) { + LoginService.getUserProfile() + .then(function (user) { + $rootScope.setCurrentUser(user); + $rootScope.connectSockets(); + return $state.go(toState.name, toParams); + }); + }, function (result) { + console.log('Unable to login', result); + if (result.code === 403 || result.code === 400 || result.code === 401 || result.code === 500) { + LoginService.logoutUser() + .then(function () { return $state.go(toState.name, toParams); }); - }, function (result) { - console.log('Unable to login', result); - if (result.code === 403 || result.code === 400 || result.code === 401 || result.code === 500) { - LoginService.logoutUser() - .then(function () { - return $state.go(toState.name, toParams); - }); - } else { - debugger; - console.error('Ooops'); - LoginService.logoutUser() - .then(function () { - return $state.go(toState.name, toParams); - }); - } - }); - event.preventDefault(); - } - }); - $rootScope.$on('$viewContentLoaded', function (evt, absNewUrl, absOldUrl) { - $anchorScroll(); - //$window.scrollTop(0, 0); - }); - $rootScope.$on('$locationChangeSuccess', function (evt, absNewUrl, absOldUrl) { - $anchorScroll(); - }); - + } else { + debugger; + console.error('Ooops'); + LoginService.logoutUser() + .then(function () { + return $state.go(toState.name, toParams); + }); + } + }); + event.preventDefault(); + } }); + $rootScope.$on('$viewContentLoaded', function (evt, absNewUrl, absOldUrl) { + $anchorScroll(); + //$window.scrollTop(0, 0); + }); + $rootScope.$on('$locationChangeSuccess', function (evt, absNewUrl, absOldUrl) { + $anchorScroll(); + }); + /* + $rootScope.$on('$stateChangeError', function (event, toState, toParams, fromState, fromParams, error) { + console.log('$stateChangeError - fired when an error occurs during transition.'); + console.log(arguments); + }); + $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) { + console.log('$stateChangeSuccess to ' + toState.name + '- fired once the state transition is complete.'); + }); + $rootScope.$on('$stateNotFound', function (event, unfoundState, fromState, fromParams) { + console.log('$stateNotFound ' + unfoundState.to + ' - fired when a state cannot be found by its name.'); + console.log(unfoundState, fromState, fromParams); + }); + */ +}); diff --git a/client/app/app.less b/client/app/app.less index f43350b..a0876c5 100755 --- a/client/app/app.less +++ b/client/app/app.less @@ -19,8 +19,8 @@ @import 'views/mixes/mixes.less'; @import 'views/mixes/upload/upload.less'; @import 'views/schedule/schedule.less'; -@import 'views/users/item/userItem.less'; -@import 'views/users/users.less'; +@import 'views/user/item/userItem.less'; +@import 'views/user/user.less'; // endinjector #page-content { diff --git a/client/app/components/comments/comments.jade b/client/app/components/comments/comments.jade index 8d19802..b5712ac 100644 --- a/client/app/components/comments/comments.jade +++ b/client/app/components/comments/comments.jade @@ -33,7 +33,7 @@ span.text-info() i.fa.fa-globe strong - a(ui-sref='root.users.user({slug: comment.slug})') {{comment.display_name}} + a(ui-sref='root.user({user: comment.slug})') {{comment.display_name}} | commented. p {{comment.comment}} p diff --git a/client/app/components/footer/footer.html b/client/app/components/footer/footer.html index 3a56199..abe2084 100755 --- a/client/app/components/footer/footer.html +++ b/client/app/components/footer/footer.html @@ -6,7 +6,7 @@
- + {{mix.user.first_name}} - {{mix.title}} diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html index c62fd8f..523707e 100755 --- a/client/app/components/navbar/navbar.html +++ b/client/app/components/navbar/navbar.html @@ -1,18 +1,9 @@
- Deep|South|Sounds + Deep|South|Sounds