From bcc30efe3c1cb579b4452a699834fce1793e8507 Mon Sep 17 00:00:00 2001 From: Antonia Lewis Date: Sun, 29 Nov 2015 13:45:44 -0500 Subject: [PATCH] Added Working Logout buttons --- API_REF.xlsx | Bin 9892 -> 10019 bytes .../TeamDBAwesome/js/adminController.js | 132 +++++++----------- .../TeamDBAwesome/js/homeController.js | 16 +-- .../TeamDBAwesome/js/userController.js | 8 +- .../pages/templates/admin-header.html | 2 +- .../pages/templates/user-header.html | 65 +++++---- 6 files changed, 93 insertions(+), 130 deletions(-) diff --git a/API_REF.xlsx b/API_REF.xlsx index c7d12ac64e042a735cfd224bc880c0773f26511f..db4a40eea907e4fd23267c6339be4917f61bb9cc 100644 GIT binary patch delta 2167 zcmV--2#EKjO`}e*WD5%ErV8ng0ssIq29s_J9Dmzx+b|4$AFzKQw1;g#7H1c9LlGzF zlB_U>EkTpM7EmlE)+S4uBscZnkIJp9?d~bgp?FB~9BMdzC>7kJ^U~;)z3&egpw5ku zdYiJ_)wg$F82G@o;L2!BS&g2JM=xIty$?XS+NZ1t!Coeb&kHQM?;DGnA{*mM9_X*z zCV$>K(M|s8gUdxx7;A zsyuvl&f=88;gCw&J9=LZPBCu(Yk#UE8HDDUp>`miiarJ~ZgsstH^_RlEf8U$(+_97G*Hw8!sLgLocz-e*l3=9_~S>&toUjUP#0~E8|4H^pyk}GC(+5-Rp&<>IrAAeU{lcG2neV?lR4;1eM1jJj3Q`2ov zO+QT4*3Mp@BScL#5H^Wz_rISniHao9i~FE}9?o|^NmgIps?vKUTu@eLJ_;h=BX!OS zTJJOeuRp(ip8KAVxGr$XYLfZyMEGCUzkOPr7=IB5LZk-_waEN~l+7{>MSdU^76EHW z4S)aa7_YE|N4^h5!wD|*OH~=hQ8W!JOl#jTEcqA?w%gI1Y*>D*NG%NsCnc8Pzc|oF zT-d673|)o!%dz>Kv#J4#EiI{h*QCBz<;&-N%{bnc5ceCJ;QYd^9~}CM=9~$(lL63$ z#!)xsMYsroX}u~aM4-~{ak9(&uW0#%=6`;;Ug-q=P02~z+<>Cc_b*IpBIS|IY(7iN+HoX9BpM38s^gwgIR8hwJ&(84BiU zI+@OAWBmu5=78&&BTj>K7A0tO3Z|DdPLp}-%EC>9s;eo1uI>g)yk2p3@?fwa%c8+* zOwn?%git$${i?uFEZ>9L3TUg>b$_%9Ulluifbhx+knyYv++{^qR&DpeMWkKCql-wo zh>eSw^!pACaqGKk?gYfIzqv1&Q7-}RCNr@WgF!$BueqCBF}Mh1g}Ld0O#7oyy?j&G zaZ#w3G9SLLKDO+p5(aS_#lnihMIbBCO%G(&ABCEx(cP)Q-5Rv4#(RVK$bWkm5!*HB zfedsK4Cr|86Zcr4R;8rLR+RSp?c7aT}(SboiZa!yvGf>e#`QqZD3RI9*otD zPd$*NEnnBqyOslFl=^l`V}H9LdoZ>R_0bIZ_rD|`^=Q7`MrX`Ns^0@~WWNU!w{6qS zwI%!?FI&i!;@Fb>$3DzZL*Av=YRhO1Lu@JbV;^S7_+4^~TrrKE7IHDkz=j7|k~?w~ zU13eE7JAam-EmC@)*Cn_IE((|zc+QR$R?I1sq=?js-#^PO#_;vgIU>JHh52dV7{ld z@Jh1NM*)bHo3la`z`bORIv}VG^Oi~2=3kx;a1YZySa`QZ3DzrcD3FX}q8#9*_a!65i6v<68o^e+!r>T zs62l_uV6v%(cSDNo1zF!!ETfQGy=CmQ@@s>%6&pE#;PmMxmNR&@HgfPv3^l#kZ)C>!In8PiTgX%u%d+GlZ_#l5d;^VNLS;P62o_y2>~ z>}Ryc+8x&FUJy@!w9b9~YSM22lc56?lM5ygvw1PbY<3h9pm001%ulYt~s0v8UG z>J256`Xnj>84r^tB|ib(lV&9#9Fi+$blL*|0MHHq02lxO00000000000000n8Iz(V tDg^0QAWoCeB^Clf9h2xKJp$q%lYbv6lTaoq0w*Dpd?q3W=OX|B008b{3a|hG delta 2032 zcmVEb84)X7BLkQPPa(x13+1d5X*#7vGXYh!|3MB*fX*gnlGFFL@ zhk$K2-#>n3U>%nU&y>V~m1x;GeEY_?)&ccO8?e+leeZcTPBG_ps5DBd?3Ky6qo3yB zS$}PiCpJZNdFI`YMqj*~3&|i>g>(V?e8-@W;%|Y|8o0Y

IX#yKq`qr*bsD=R)7B zuo|B%qc$|9DGuSaj!5dlwR`3#p6d+T@TSxq>;c`C8*VTW?nAq6joid(8(l8en>O|^ z??S}C%y^jz+gWpxB(O0&{?q1JVXhvrzkhboV_}l6eAQuk3)Ag-v-mk*f!h7XxU+~> zWV}uU^SBn?FFZD)!%?^tIK&s*E;Jw{xD;Whl5z-(A62MaVL?f-MI58G1Ng?1 z6;cLhfTI7Jqp%$hUW}zPG-Jn0%CM5rEO-Y1H_^VDW)Or0sj3m_b)x~4s(7DeaDVv6 z&u9h#j5>Zk)9N#S$3>#(wS{YKDqngfK7$a=1~8}WsS+`owVAg%`CpdTJV)RbT9F?B zo?_GvQclAg59n}ogQ1ZK_9DwLAxnl8R$WvJ#d%(Pix+a&;U3#_#sgRRnF-_oYsXGUrcKTtUcKMajVNgKaNEel2;Kqja58z5Q#|MhB7f__tQ_ zFwKPSya3g0>-r**l;d#ZWpxYG&e1yt6ppLd&paNzk>L}w5DqU34i`VLd!z#Z0L2Xe z02lz1AtoAsoR?c~+AtKy-zV)mM1EfqhdUxnYw5H;OqzCmHi-eNNu1fHwBLTmHV|Tm zD(s<myeZ@wBf$WW20FV$BMsUX3UU z%546)t+*iT0?z${ha@{`n;TEQWSQWSZ&V0!k#*ER^DLT0ptM}%3{IfK9tgTg(I-5A zz+)7DEf*$0zZpHqi|as<^$%LmOwkuIk3G5tm)q#w=PoZo1BCq{Up&v>SyqA?Fzy`clDX!8-+zsK z+%farGCDGEP5lnU8~Yth(v(d**3RI6`)dpPqd0L!{(Tp7tsrlj*Lq`gnjvu}_I(#~ z&G=2@78YvHxK~0xGjJCkyD!_7swP|dm542?WKhtJ*?(bl3cDc3AzUk7>#bO?iEFN4 zxjo(O;P(%O9V-r@tTvph(+w;oZ(8>URr@;Ng27&Ge$u3<=0XX=6j+!u*z?6>Zdds8 z53uDw0F$8u6a?9}581O*9W?=e+Rly{x(;;=6bHgO6z@XvZVPMDl4M{1-n9F$Lod8c z&v~EsoHXfhrwX(IV`ZraIO>ELf##)r&KvW{uNic-S>@4@0>c72udit^IH zyD2L$PJ%_Aq%Gyu056@ZC?S?FK{4C$4(-KxX%ut*XcnYme8m<(;xO!g5e1G3<`}7g zL3JkLBU11)vRa#>0SHc@00r7v5_KZ-<8@$^{d1sET23Y1zVe-paocRc58~Oqv+``* zZnvFnw~68NN91$zHf^c~QrCCI0cWY;lpA2KG}%NJ#T|MD18R?MW-s{^1!xLpBRQZE z*cF<(weVGLQ_>o%uee}V)=m81m`e~(`|MG>QcISS-;!V0^gCqKb0n(Mgjl;Vg-^VQUcBmlT;;70?-bVr6oTBl#}HpARHGzuzREf006}e z000;O000000000000000=ophBCMpEkwh!5pPbL-u!W@%lCOraUACvwcDU;78Dgvk= Ollvwj252Jy0000l(!$&T 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