ueserPro

.gitignore

@@ -3,19 +3,16 @@
 .LSOverride
 azure.err
 iisnode.yml
-
 # Icon must ends with two \r.
 Icon
-
+node_modules
 
 # Thumbnails
 ._*
 
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
-node_modules/
-
 # Floobits
 .floo
 .floobit

client/app/account/auth.js

@@ -11,18 +11,16 @@ angular.module('otbo5ly.auth', [])
   $scope.signin = function () {
       Auth.signin($scope.user)
         .then(function (data) {
-          //console.log(data)
-
           if(data.status === '500'){
             $scope.msg = 'Wrong password or username!'
           } else {
 
             $scope.msg = '';
-
             $window.localStorage.setItem('com.otbo5ly', data.token);
 
             var userData = {ID:data.ID, 
               UserName: data.UserName, UserTypeName: data.UserTypeName};
+
 
             $window.localStorage.setItem('user.otbo5ly', JSON.stringify(userData));
 
@@ -33,9 +31,10 @@ angular.module('otbo5ly.auth', [])
             if(data.UserTypeName === 'cooker'){
               $rootScope.isCooker = true;
               $location.path('/users/'+ data.UserName );
-            } else {
-              $location.path('/');
-            }
+            }else if(data.UserTypeName === 'user'){
+                $rootScope.isUser = true;
+                $location.path('/userProfile/'+data.UserName);
+            }else{ $location.path('/') }
 
           }
 
@@ -54,7 +53,6 @@ angular.module('otbo5ly.auth', [])
       }
       Auth.signup($scope.user)
         .then(function (data) {
-          //console.log(data)
 
          if(data.status === '500'){
             $scope.msg = 'Wrong password or username!'

client/app/app.js

@@ -4,6 +4,7 @@ angular.module('otbo5ly', [
   'otbo5ly.auth',
   'otbo5ly.main',
   'otbo5ly.newOrder',
+  'otbo5ly.userProfile',
   'ngRoute'
 ])
 .config(function ($routeProvider, $httpProvider) {
@@ -38,6 +39,10 @@ angular.module('otbo5ly', [
       templateUrl: 'app/main/main.html',
       controller: 'MainController'
     })
+    .when('/userProfile/:user', {
+      templateUrl: 'app/profile/userProfile.html',
+      controller: 'userProfileController'
+    })
     .otherwise({redirectTo:'/'});
 
     // We add our $httpInterceptor into the array

client/app/main/main.js

@@ -4,7 +4,8 @@ angular.module('otbo5ly.main', [])
   $scope.data = {};
 
   	Users.getTodayCookings().then(function(data){
-  		$scope.data.cookings = data;
+      console.log(data)
+      $scope.data.cookings = data;
   	});
 
   	// Users.getTopCookers().then(function(data){

client/app/order/order.js

@@ -1,7 +1,7 @@
 angular.module('otbo5ly.newOrder', [])
 
 
-.controller('NewOrderController', function ($scope, $location, Users, Auth, OrderService) {
+.controller('NewOrderController', function ($scope, $location, Users, Auth, OrderService,$rootScope) {
 
 	$scope.order = {};
 
@@ -27,7 +27,8 @@ angular.module('otbo5ly.newOrder', [])
 				alert('Something went wrong try again');
 			} else {
 				alert('your order has been sent successfully')
-				$location.path('/');
+				  $rootScope.isUser = true;
+				$location.path('/userProfile/:user');
 			}
 		})
 	}

client/app/profile/orders.html

@@ -1,46 +1,94 @@
 <!-- In this page we are sending the cooker a message telling him
 	about the client's order details (time, cookName and quantity). -->
 <!-- We don't really care about the date because it will be sent the next day always. -->
-	<style>
+	<!-- <style>
 		.info {
 			background-color: #e7f3fe;
 			border-left: 30px solid #2196F3;
 		}
-	</style>
+	</style> -->
+	 <style>
+    .none {
+      background-color: #e7f3fe;
+      border-left: 30px solid #2196F3;
+    }
+    .yes{
+      background-color: #e7f3fe;
+      border-left: 30px solid #096d27;
+    }
+    .no {
+      background-color: #e7f3fe;
+      border-left: 30px solid #b21813;
+    }
+    .ifo{
+      background-color: #e7f3fe;
+      border-left: 10px solid #2196F3;
+      border-right: 10px solid #2196F3;
+      border-bottom: 10px solid #2196F3;
+      border-top: 10px solid #2196F3;
+
+    }
+    .animate-if {
+  	/*font-family: Courier*/
+    color: red;
+    font-size: 150%
+   }
+   .animate-iff {
+  background:white;
+  border:1px solid black;
+  padding:10px;
+  }
+
+  </style>
+
+
 
 	<div class="container" ng-controller="ProfileController" ng-init="getOrders()">
 		<br><br><br><br>
+
 		<h2><center><strong>You Have New Order</strong></center></h2>
-		<div class="info" ng-repeat="order in orders"><br>
+		<div  ng-repeat="order in orders" ><br>
+
+		<div ng-class="myVar ||  order.approved " >
+		<div class="ifo" >
+
+			<!-- <img ng-src="{{order.img}}" class="pull-right img-rounded " style="width: 400px height: 400px ; "/> --> 
 			<h2><strong><center>Order Details</center></strong></h2>
-			<ul style="font-size:18px">
+
+			<ul style="font-size:18px">	
+
 
 				<li><strong>Client Name:</strong>
 					<dd>- {{ order.CLientFullName }}</dd>
 				</li>
-				<li><strong>Cook Name:</strong>
-					<dd>- {{ order.Name }}</dd>
+				<li  ><strong>Cook Name:</strong>
+					<dd ng-if ="order.Name != 'special'"  > {{ order.Name }}</dd>
+					<dd ng-if ="order.Name == 'special'"  class="animate-if">- special order -- {{ order.DisheName }}</dd>
 				</li>
 				<br>
 				<li><strong>Amount:</strong>
 				<dd>- {{ order.Quantity }}</dd>
 				</li>
-				<br>
-				<li><strong>The Client Will Receive The Order AT :</strong>
+
+				<li><strong>Delivery Time :</strong>
 					<dd>- {{ order.DeliveryDate }}    - at {{order.DeliverTime}}</dd>
 				</li>
+				<br>
+			    <li><strong ng-if= "order.approved == 'yes'"><p style=" font-size: 25px;"> You accepted This Order</p></strong></li>
+			    <li ng-if= "order.approved == 'none'"><strong ><p style=" font-size: 25px;">Do You Agree This Order</p>
+	        	<input  id="yesbtn" type="submit" value="yes" ng-click="myVar='yes';acceptOrder(order.OrderID)"
+	        	ng-model="order.approved">
+				<input id="nobtn" type="submit" value="no" ng-click="myVar='no';dos();cancelOrder(order.OrderID)"
+				ng-model="order.approved">
+				</strong>
+				</li>
+				<br>
+			</ul><br>
 
-			</ul><br>	
 		</div>
-		<br><br>
-		<center><strong>
-			<p style=" font-size: 25px;"> I Can Handle It	<input type="checkbox" ng-model = "accept" ng-init = "false">
-			</p>
-		</strong>
-	</center>
-	<div ng-if="accept">
-		<center>
-			<h3><strong>Okay, Let's Start Cooking...<span class="glyphicon glyphicon-cutlery"></strong></h3>		
-		</center>
-	</div>
-</div>
+		</div>
+
+		</div>
+
+
+</div>

client/app/profile/profile.html

@@ -1,10 +1,11 @@
+<div  ng-init="getProfile()">
 <div class="row" style="
 background: url('assets/inside-bg.jpg');
 background-position: top;
 min-height: 500px;
 z-index: 2;
 padding-top: 100px;
-" ng-controller="ProfileController" ng-init="getProfile()">
+">
 
 <div class="row" style="padding-bottom: 50px;margin:0px;"><div class="col-md-10 col-md-offset-1 text-center">
 
@@ -19,7 +20,7 @@
 
   <h1 style="font-weight: bold;color: #fff;text-align: left;margin-bottom: 40px;">
   {{ data.FullName }}</h1>
-
+asdfssdfsd
   <div class="col-md-6 col-xs-12">
     <i class="glyphicon glyphicon-phone" style="font-size: 3em;"></i>
     <p style="line-height: 40px;font-size: 15pt;">
@@ -38,7 +39,7 @@ <h1 style="font-weight: bold;color: #fff;text-align: left;margin-bottom: 40px;">
 <div class="col-xs-12" style="margin-top: 50px;" ng-if="data.todayCook !== ''">  
   <span style="padding: 20px;font-size: 1.7em;color: #fff;"><b>{{ data.FullName }}</b> cooking for today is : <b>{{ data.todayCook.Name }}</b>, just for 
   <b>{{ data.todayCook.Price }}</b> JOD!</span>
-  <button ng-click="setOrder($root.UserID, data.todayCook.ID, 1, data.todayCook.FullName, data.todayCook.Name)" class="btn btn-lg btn-primary">Order now</button>
+
 </div>
 
 </div>
@@ -50,13 +51,13 @@ <h1 style="font-weight: bold;color: #fff;text-align: left;margin-bottom: 40px;">
 
 <div class="row" style="margin-top: 40px;">
 
-<div class="col-md-10 col-md-offset-1 col-xs-12">
+<div   class="col-md-10 col-md-offset-1 col-xs-12">
 
 
   <div class="panel panel-default">
-    <div class="panel-heading"><b>{{ data.user.FullName }}</b> schedule</div>
+    <div class="panel-heading"><b>{{ data.FullName }}</b> schedule</div>
 
-    <table class="table">
+    <table  class="table">
       <tbody>
       <tr style="font-weight: bold;">
         <td>Day</td>
@@ -85,5 +86,6 @@ <h1>User reviews <small> for {{ data.FullName }}</small></h1>
       </div>
     </div>
 
+  </div>
   </div>
   </div>

client/app/profile/profile.js

@@ -1,6 +1,6 @@
 angular.module('otbo5ly.profile', [])
 
-.controller('ProfileController', function ($scope, $routeParams, $window, $location, Users, OrderService) {
+.controller('ProfileController', function ($scope, $routeParams, $window, $location,$route, Users, OrderService,Approve) {
   $scope.data = {};
   $scope.orders = {};
 
@@ -29,4 +29,25 @@ angular.module('otbo5ly.profile', [])
 			 CookNamesID: cookNameID, FullName : FullName, cookName: cookName});
 	}
 
+	$scope.acceptOrder = function(orderId){
+		console.log(orderId)
+
+		Approve.acceptOrder({orderId:orderId}).then(function(){
+        	$route.reload();
+
+		})
+	}
+	$scope.cancelOrder = function(orderId){
+
+        Approve.cancelOrder({orderId:orderId}).then(function(){
+        	$route.reload();
+        })
+	}
+
+	$scope.dos=function(){
+    $(".no").fadeOut()
+}
+
+
+
 });