NoshSpot · wishinghand · Sep 21, 2016 · Sep 21, 2016 · Sep 22, 2016 · Sep 22, 2016
diff --git a/app/css/custom.css b/app/css/custom.css
diff --git a/app/img/city.jpg b/app/img/city.jpg
diff --git a/app/img/foodImage.jpg b/app/img/foodImage.jpg
diff --git a/app/img/fooddelivery.jpg b/app/img/fooddelivery.jpg
diff --git a/app/img/gathering.jpg b/app/img/gathering.jpg
diff --git a/app/img/goodQuality.jpg b/app/img/goodQuality.jpg
diff --git a/app/img/mainFoodBackground.jpg b/app/img/mainFoodBackground.jpg
diff --git a/app/img/personTexting.jpg b/app/img/personTexting.jpg
diff --git a/app/img/pizza.jpg b/app/img/pizza.jpg
diff --git a/app/index.html b/app/index.html
@@ -3,43 +3,54 @@
 <head>
 	<meta charset="UTF-8">
 	<title>NoshSpot - Customer</title>
+	<!-- bower:css -->
+	<link rel="stylesheet" href="bower_components/angular-toastr/dist/angular-toastr.css" />
+	<link rel="stylesheet" href="bower_components/bulma/css/bulma.css" />
+	<!-- endbower -->
+	<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
+    <link href="https://fonts.googleapis.com/css?family=Lobster" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
 	<!-- inject:css -->
 	<link rel="stylesheet" href="css/custom.css">
 	<!-- endinject -->
 </head>
 <body>
-	<nav class="nav">
-        <div class="nav-left">
-            <a id="navName" class="nav-item is-brand" >
-                    NoshSpot
-            </a>
-        </div>
 
-        <span class="nav-toggle">
-            <span></span>
-        <span></span>
-        <span></span>
-        </span>
-        <div class="nav-right nav-menu">
-            <a class="nav-item nav-link" ui-sref="restaurants.list">Restuarants</a>
-        </div>
-    </nav>
-    <hr>
 	<main>
 		<div ui-view></div>
 	</main>
+
+	 <footer class="footer">
+        <div class="container">
+            <div class="content has-text-centered">
+              <p>
+                <strong>NoshSpot Creators:</strong> Dreu Stepanik, Michele Kempinsky, Ryan Dowdy, Herberto Basulto, Cole Logan, Jason Land, Reggie Sibbley, Christian Nagal, Vincent Duong
+              </p>
+            </div>
+        </div>
+    </footer>
+
+  <!-- stripe CDN -->
+  <script type="text/javascript" src="https://js.stripe.com/v2/"></script>
+  <!-- bower:js -->
+  <script src="bower_components/angular/angular.js"></script>
+  <script src="bower_components/angular-toastr/dist/angular-toastr.tpls.js"></script>
+  <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
+  <script src="bower_components/angular-stripe-checkout/angular-stripe-checkout.js"></script>
+  <!-- endbower -->
+
 	<!-- inject:js -->
-	<script src="../node_modules/angular/angular.js"></script>
-	<script src="../node_modules/angular-ui-router/release/angular-ui-router.js"></script>
-	<script src="../node_modules/angular-toastr/dist/angular-toastr.js"></script>
-	<script src="../node_modules/angular-toastr/dist/angular-toastr.tpls.js"></script>
 	<script src="js/app.module.js"></script>
 	<script src="js/core/crud.factory.js"></script>
 	<script src="js/core/customer.factory.js"></script>
+	<script src="js/core/order.factory.js"></script>
+	<script src="js/core/orderItem.factory.js"></script>
+	<script src="js/core/payment.factory.js"></script>
 	<script src="js/core/restaurant.factory.js"></script>
 	<script src="js/core/review.factory.js"></script>
-	<script src="js/orders/orders.controller.js"></script>
+	<script src="js/core/stripePayment.factory.js"></script>
 	<script src="js/login/login.controller.js"></script>
+	<script src="js/orders/orders.controller.js"></script>
 	<script src="js/restaurant/restaurant.detail.controller.js"></script>
 	<script src="js/restaurant/restaurant.list.controller.js"></script>
 	<!-- endinject -->

diff --git a/app/js/app.module.js b/app/js/app.module.js
@@ -2,43 +2,47 @@
     'use strict';
 
     angular
-        .module('app', ['ui.router', 'toastr'])
+        .module('app', ['ui.router', 'toastr', 'stripe.checkout'])
         .value('apiUrl', 'http://localhost:61815/api')
         .config(appConfig);
 
-    appConfig.$inject = ['$urlRouterProvider', '$stateProvider'];
+    appConfig.$inject = ['$urlRouterProvider', '$stateProvider', 'StripeCheckoutProvider'];
 
-    function appConfig($urlRouterProvider, $stateProvider) {
+    function appConfig($urlRouterProvider, $stateProvider, StripeCheckoutProvider) {
 
-    	$urlRouterProvider.otherwise('/restaurants');
+        StripeCheckoutProvider.defaults({
+            key: 'pk_test_XE4OKSyJR5b8YXIX41XXEsN6'
+        });
 
-    	$stateProvider
-    	.state('restaurants', {
-            url: '/restaurants', 
-            abstract: true, 
-            template: '<div ui-view></div>'
-        })
+    	$urlRouterProvider.otherwise('/login');
+
+        $stateProvider
+            .state('restaurants', {
+                url: '/restaurants',
+                abstract: true,
+                template: '<div ui-view></div>'
+            })
             .state('restaurants.list', {
-                url: '/list',
+                url: '/list?customerId',
                 controller: 'RestaurantListController as restaurantList',
                 templateUrl: 'js/restaurant/restaurantList.html'
             })
             .state('restaurants.detail', {
-                url: '/detail?restaurantId',
+                url: '/detail?restaurantId?customerId',
                 controller: 'RestaurantDetailController as restaurantDetail',
-                templateUrl: 'js/restaurant/restaurant.detail.html'//Make sure this works
+                templateUrl: 'js/restaurant/restaurant.detail.html' //Make sure this works
+            })
+            .state('login', {
+                url: '/login',
+                controller: 'LoginController as login',
+                templateUrl: 'js/login/login.html'
             })
-        .state('login', {
-            url: '/login',  
-            controller: 'LoginController as login',
-            templateUrl: 'js/login/login.html'  
-        })
-        .state('orders', {
-            url: '/orders', 
-            controller: 'OrdersController as orders',
-            templateUrl: 'js/orders/orders.html'
-        })
+            .state('orders', {
+                url: '/orders?customerId', 
+                controller: 'OrdersController as orders',
+                templateUrl: 'js/orders/orders.html'
+            });
 
     }
 
-})();
+})();
diff --git a/app/js/core/crud.factory.js b/app/js/core/crud.factory.js
@@ -21,19 +21,19 @@
 
         ////////////////
 
-         function getAll() {
-        var deferred = $q.defer();
-
-        $http.get(endpoint)
-          .success(function(data) {
-            deferred.resolve(data);
-          })
-          .error(function(error) {
-            console.log(error);
-            deferred.reject('There was a problem fetching ' + entityName.toLowerCase() + 's.');
-          });
-
-        return deferred.promise;
+        function getAll() {
+          var deferred = $q.defer();
+
+          $http.get(endpoint)
+            .success(function(data) {
+              deferred.resolve(data);
+            })
+            .error(function(error) {
+              console.log(error);
+              deferred.reject('There was a problem fetching ' + entityName.toLowerCase() + 's.');
+            });
+
+          return deferred.promise;
       }
 
       function getById(id) {

diff --git a/app/js/core/order.factory.js b/app/js/core/order.factory.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('app')
+    .factory('OrderFactory', OrderFactory);
+
+  OrderFactory.$inject = ['$http', '$q', 'CRUDFactory', 'apiUrl'];
+
+  /* @ngInject */
+  function OrderFactory($http, $q, CRUDFactory, apiUrl) {
+    return CRUDFactory(apiUrl + '/orders', 'order');
+  }
+})();
diff --git a/app/js/core/orderItem.factory.js b/app/js/core/orderItem.factory.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('app')
+    .factory('OrderItemFactory', OrderItemFactory);
+
+  OrderItemFactory.$inject = ['$http', '$q', 'CRUDFactory', 'apiUrl'];
+
+  /* @ngInject */
+  function OrderItemFactory($http, $q, CRUDFactory, apiUrl) {
+    return CRUDFactory(apiUrl + '/orderItems', 'orderItem');
+  }
+})();
diff --git a/app/js/core/payment.factory.js b/app/js/core/payment.factory.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('app')
+    .factory('PaymentFactory', PaymentFactory);
+
+  PaymentFactory.$inject = ['$http', '$q', 'CRUDFactory', 'apiUrl'];
+
+  /* @ngInject */
+  function PaymentFactory($http, $q, CRUDFactory, apiUrl) {
+    return CRUDFactory(apiUrl + '/payments', 'payment');
+  }
+})();
diff --git a/app/js/core/stripePayment.factory.js b/app/js/core/stripePayment.factory.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('app')
+    .factory('StripePaymentFactory', StripePaymentFactory);
+
+  StripePaymentFactory.$inject = ['$http', '$q', 'CRUDFactory', 'apiUrl'];
+
+  /* @ngInject */
+  function StripePaymentFactory($http, $q, CRUDFactory, apiUrl) {
+    return CRUDFactory(apiUrl + '/payments/charge', 'payment');
+  }
+})();
diff --git a/app/js/login/login.controller.js b/app/js/login/login.controller.js
@@ -5,23 +5,55 @@
         .module('app')
         .controller('LoginController', LoginController);
 
-    LoginController.$inject = ['$state', '$stateParams'];
+    LoginController.$inject = ['$state', '$stateParams', 'customerFactory'];
 
     /* @ngInject */
-    function LoginController($state, $stateParams) {
+    function LoginController($state, $stateParams, customerFactory) {
         var vm = this;
         vm.title = 'LoginController';
         vm.loginInfo = {};
+        vm.customers;
+        vm.newCustomer = {};
+        vm.expand = false;
+
         vm.loginCustomer = loginCustomer;
+        vm.addNewCustomer = addNewCustomer;
+
+        allCustomers();
         ////////////////
 
+        function allCustomers() {
+            customerFactory.getAll().then(
+                function(data){
+                    vm.customers = data;
+                }
+            );
+        }
+
+        function addNewCustomer(newCustomer){
+            if (vm.password === vm.confirmPassword) {
+                customerFactory.add(newCustomer).then(
+                    function(data){
+                        console.log(data);
+                        $state.go('restaurants.list', {customerId: data.customerId});
+                    },
+                    function(error){
+                        console.log(error);
+                    }
+                );
+            }
+            else {
+                alert("Passwords do not match");
+            }
+        }
+
         function loginCustomer() {
         	if(vm.loginInfo.password != 'butts') {
         		alert("You entered the wrong password");
         	}
         	else
         	{
-        		$state.go('restaurants.list');
+        		$state.go('restaurants.list', {customerId: vm.selectedCustomer});
         	}
         }
     }