diff --git a/API_REF.xlsx b/API_REF.xlsx index c7d12ac..db4a40e 100644 Binary files a/API_REF.xlsx and b/API_REF.xlsx differ diff --git a/TeamDBAwesome/TeamDBAwesome/js/adminController.js b/TeamDBAwesome/TeamDBAwesome/js/adminController.js index d8626e2..27f136a 100644 --- a/TeamDBAwesome/TeamDBAwesome/js/adminController.js +++ b/TeamDBAwesome/TeamDBAwesome/js/adminController.js @@ -1,99 +1,67 @@ // This controller will hold logic for the employee Portal homepage (Order List, Logout), Customer Info, Media Center, and Reports -angular.module('routerApp').controller('adminController', function($scope, $http, $log, $timeout, $cookies,urlService,$anchorScroll,$location,$q,$state,$rootScope) { - /* Retrieve Url */ - var url = urlService.web; - $cookies.put('PAGE','Admin'); +angular.module('routerApp').controller('adminController', function ($scope, $http, $log, $timeout, $cookies, urlService, $anchorScroll, $location, $q, $state, $rootScope) { + /* Retrieve Url */ + var url = urlService.web; + $cookies.put('PAGE', 'Admin'); - /* Functions Defined */ + /* Functions Defined */ - $scope.authenticateAdmin = function(id,pass){ - console.log("Authenticating"); - return $q(function(resolve,reject){ - var param = id + " " + pass; - var promise = $http.post(url + "/authenticateAdmin",param) - .success(function(data) { - if (data.STATUS == 555) { - $scope.authenticated = false; - resolve('We did it'); - } else { - $scope.authenticated = true; - resolve('We did it'); - } - }) - .error(function(data, status, headers, config) { - $scope.messages = 'There was a network error. Try again later.'; - reject('We did not do it'); - }); - }) - } - - $scope.logoutAdmin = function(){ - $scope.messages = 'You have been logged out.'; - $cookies.remove("PWD"); - $cookies.remove("ADMIN"); - $cookies.remove("LOGIN"); - $state.go('home'); - } - - - - -/* BEGIN LOGIC */ -var promise = $scope.authenticateAdmin($cookies.get('ADMIN'),$cookies.get('PWD')); -promise.then(function(){ - if($scope.authenticated == true){ - $scope.initAdmin(); - } - else if ($scope.authenticated == false)$scope.logoutAdmin(); -}); + // Logging out + $scope.logout = function () { + $cookies.remove('userid'); + $state.go('home'); + } -$scope.showMediaOptions = true; -$scope.showTrackFields = false; -$scope.showAlbumFields = false; -$scope.showArtistFields = false; -$scope.showGenreFields = false; -$scope.showMediaTypeFields = false; + /* BEGIN LOGIC */ -$scope.back = function () { $scope.showMediaOptions = true; $scope.showTrackFields = false; $scope.showAlbumFields = false; $scope.showArtistFields = false; $scope.showGenreFields = false; $scope.showMediaTypeFields = false; -} -$scope.toCreateTrack = function () { - $scope.showMediaOptions = false; - $scope.showTrackFields = true; -}; -$scope.toCreateAlbum = function () { - $scope.showMediaOptions = false; -}; -$scope.toCreateArtist = function () { - $scope.showMediaOptions = false; -}; -$scope.toCreateGenre = function () { - $scope.showMediaOptions = false; -}; -$scope.toCreateMediaType = function () { - $scope.showMediaOptions = false; -}; -$scope.playlists = [ - { - "playlistId": "1", - "name":"test1" - }, - { - "playlistId": "2", - "name":"test2" - }, - { - "playlistId": "3", - "name":"test3" + + $scope.back = function () { + $scope.showMediaOptions = true; + $scope.showTrackFields = false; + $scope.showAlbumFields = false; + $scope.showArtistFields = false; + $scope.showGenreFields = false; + $scope.showMediaTypeFields = false; } -]; + $scope.toCreateTrack = function () { + $scope.showMediaOptions = false; + $scope.showTrackFields = true; + }; + $scope.toCreateAlbum = function () { + $scope.showMediaOptions = false; + }; + $scope.toCreateArtist = function () { + $scope.showMediaOptions = false; + }; + $scope.toCreateGenre = function () { + $scope.showMediaOptions = false; + }; + $scope.toCreateMediaType = function () { + $scope.showMediaOptions = false; + }; + + $scope.playlists = [ + { + "playlistId": "1", + "name": "test1" + }, + { + "playlistId": "2", + "name": "test2" + }, + { + "playlistId": "3", + "name": "test3" + } + ]; }); \ No newline at end of file diff --git a/TeamDBAwesome/TeamDBAwesome/js/homeController.js b/TeamDBAwesome/TeamDBAwesome/js/homeController.js index 5ed7a21..35da345 100644 --- a/TeamDBAwesome/TeamDBAwesome/js/homeController.js +++ b/TeamDBAwesome/TeamDBAwesome/js/homeController.js @@ -61,7 +61,6 @@ angular.module('routerApp').controller('homeController', function ($scope, $http } $scope.toAdminPage = function (user) { - //$cookies.put('LOGIN','ADMIN ' + $cookies.get('DEPID') + ' ' + $cookies.get('PWD') ) //var promise = $scope.authenticateAdmin(user.username,user.password); //promise.then(function(){ // if($scope.authenticated == true){ @@ -77,19 +76,10 @@ angular.module('routerApp').controller('homeController', function ($scope, $http } $scope.toUserPage = function (user) { - //$cookies.put('LOGIN','ADMIN ' + $cookies.get('DEPID') + ' ' + $cookies.get('PWD') ) - //var promise = $scope.authenticateAdmin(user.username,user.password); - //promise.then(function(){ - // if($scope.authenticated == true){ - // $cookies.put('ADMIN',user.username); - //$cookies.put('PWD',user.password); - // $scope.messages = null; + // need to get userid from username + $cookies.put("userid", user.username); $state.go('user-home'); - //} - // else if ($scope.authenticated == false){ - // $scope.messages = 'Incorrect Login Information.'; - // } - // }); + } /* BEGIN LOGIC */ diff --git a/TeamDBAwesome/TeamDBAwesome/js/userController.js b/TeamDBAwesome/TeamDBAwesome/js/userController.js index acc2ec2..6e18bc4 100644 --- a/TeamDBAwesome/TeamDBAwesome/js/userController.js +++ b/TeamDBAwesome/TeamDBAwesome/js/userController.js @@ -5,6 +5,12 @@ angular.module('routerApp').controller('userController', function ($q, $window, $location.hash("top"); $scope.COOKIE = $cookies.getAll(); + // Logging out + $scope.logout = function () { + $cookies.remove('userid'); + $state.go('partial-home'); + } + // Customer Information Editing // Retrieve Data $scope.getUserInfo = function () { @@ -125,4 +131,4 @@ angular.module('routerApp').controller('userController', function ($q, $window, /* Begin Logic */ -}); \ No newline at end of file +}); diff --git a/TeamDBAwesome/TeamDBAwesome/pages/templates/admin-header.html b/TeamDBAwesome/TeamDBAwesome/pages/templates/admin-header.html index fd0c03a..afce85a 100644 --- a/TeamDBAwesome/TeamDBAwesome/pages/templates/admin-header.html +++ b/TeamDBAwesome/TeamDBAwesome/pages/templates/admin-header.html @@ -22,7 +22,7 @@
  •  View Reports
    • -
  • +
  •  Logout
    • diff --git a/TeamDBAwesome/TeamDBAwesome/pages/templates/user-header.html b/TeamDBAwesome/TeamDBAwesome/pages/templates/user-header.html index 4fda969..9f5a346 100644 --- a/TeamDBAwesome/TeamDBAwesome/pages/templates/user-header.html +++ b/TeamDBAwesome/TeamDBAwesome/pages/templates/user-header.html @@ -17,37 +17,36 @@ } - - \ No newline at end of file + + \ No newline at end of file