Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some cleaning up
  • Loading branch information
adl13006 committed Dec 10, 2015
1 parent bb65e81 commit 2736dcd
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
3 changes: 2 additions & 1 deletion TeamDBAwesome/TeamDBAwesome/js/homeController.js
Expand Up @@ -75,7 +75,8 @@ angular.module('routerApp').controller('homeController', function ($scope, $http
else { else {
$cookies.put("userid", user.username); $cookies.put("userid", user.username);
console.log($cookies.get('userid')); console.log($cookies.get('userid'));
$cookies.put('name', response.firstname); console.log(response);
$cookies.put('name', response.FName);
$state.go('user-home'); $state.go('user-home');
} }
}) })
Expand Down
1 change: 1 addition & 0 deletions TeamDBAwesome/TeamDBAwesome/js/userController.js
Expand Up @@ -555,4 +555,5 @@ angular.module('routerApp').controller('userController', function ($q, $window,
} }


//End Playlist Editor //End Playlist Editor
$scope.name = $cookies.get('name');
}); });
2 changes: 1 addition & 1 deletion TeamDBAwesome/TeamDBAwesome/pages/partial-login.html
Expand Up @@ -2,7 +2,7 @@
<div class="row"> <div class="row">
<div ng-controller='homeController'> <div ng-controller='homeController'>
<div class="text-center"> <div class="text-center">
<h1>Please sign in</h1> use user 1 <h1>Please sign in</h1>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6 col-sm-offset-3"> <div class="col-sm-6 col-sm-offset-3">
Expand Down
10 changes: 9 additions & 1 deletion TeamDBAwesome/TeamDBAwesome/pages/user-home.html
Expand Up @@ -17,7 +17,15 @@
</style> </style>


<div ng-controller="userController" data-ng-init="initPortal()"> <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"> <form name="myForm">
<table> <table>
<td width="90%"><center><input type="text" ng-model="token" class="form-control" placeholder="Search our music database!" /></center></td> <td width="90%"><center><input type="text" ng-model="token" class="form-control" placeholder="Search our music database!" /></center></td>
Expand Down

0 comments on commit 2736dcd

Please sign in to comment.