From 2736dcd30e7aa99490d24592c7b9588cc8f9539d Mon Sep 17 00:00:00 2001
From: Antonia Lewis <antonia.lewis@uconn.edu>
Date: Thu, 10 Dec 2015 13:34:34 -0500
Subject: [PATCH] Some cleaning up

---
 TeamDBAwesome/TeamDBAwesome/js/homeController.js     |  3 ++-
 TeamDBAwesome/TeamDBAwesome/js/userController.js     |  1 +
 TeamDBAwesome/TeamDBAwesome/pages/partial-login.html |  2 +-
 TeamDBAwesome/TeamDBAwesome/pages/user-home.html     | 10 +++++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/TeamDBAwesome/TeamDBAwesome/js/homeController.js b/TeamDBAwesome/TeamDBAwesome/js/homeController.js
index 2cb054e..29ad7cb 100644
--- a/TeamDBAwesome/TeamDBAwesome/js/homeController.js
+++ b/TeamDBAwesome/TeamDBAwesome/js/homeController.js
@@ -75,7 +75,8 @@ angular.module('routerApp').controller('homeController', function ($scope, $http
                 else {
                     $cookies.put("userid", user.username);
                     console.log($cookies.get('userid'));
-                    $cookies.put('name', response.firstname);
+                    console.log(response);
+                    $cookies.put('name', response.FName);
                     $state.go('user-home');
                 }
             })
diff --git a/TeamDBAwesome/TeamDBAwesome/js/userController.js b/TeamDBAwesome/TeamDBAwesome/js/userController.js
index c8321ad..dd1a2fc 100644
--- a/TeamDBAwesome/TeamDBAwesome/js/userController.js
+++ b/TeamDBAwesome/TeamDBAwesome/js/userController.js
@@ -555,4 +555,5 @@ angular.module('routerApp').controller('userController', function ($q, $window,
     }
 
     //End Playlist Editor
+    $scope.name = $cookies.get('name');
 });
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/partial-login.html b/TeamDBAwesome/TeamDBAwesome/pages/partial-login.html
index f0d24c2..ab06c30 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/partial-login.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/partial-login.html
@@ -2,7 +2,7 @@
 <div class="row">
   <div ng-controller='homeController'>
     <div class="text-center">
-        <h1>Please sign in</h1> use user 1
+        <h1>Please sign in</h1>
     </div>
     <div class="row">
         <div class="col-sm-6 col-sm-offset-3">
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/user-home.html b/TeamDBAwesome/TeamDBAwesome/pages/user-home.html
index 2001818..f9a8f4a 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/user-home.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/user-home.html
@@ -17,7 +17,15 @@
 </style>
 
 <div ng-controller="userController" data-ng-init="initPortal()">
-    <center><h1>~~ Browse our Media ~~</h1></center>
+    <center><pre><h3>Welcome {{name}}</h3>
+   ____ _               _                  _                        __  __          _ _       
+  / ___| |__   ___  ___| | __   ___  _   _| |_    ___  _   _ _ __  |  \/  | ___  __| (_) __ _ 
+ | |   | '_ \ / _ \/ __| |/ /  / _ \| | | | __|  / _ \| | | | '__| | |\/| |/ _ \/ _` | |/ _` |
+ | |___| | | |  __/ (__|   <  | (_) | |_| | |_  | (_) | |_| | |    | |  | |  __/ (_| | | (_| |
+  \____|_| |_|\___|\___|_|\_\  \___/ \__,_|\__|  \___/ \__,_|_|    |_|  |_|\___|\__,_|_|\__,_|
+                                                                                              
+
+</pre></center>
     <form name="myForm">
         <table>
             <td width="90%"><center><input type="text" ng-model="token" class="form-control" placeholder="Search our music database!" /></center></td>