Merge branch 'users' of github.com:vs2961/reimagined-rotary-phone into users

Author: erickim0919

website/app/views.py

@@ -29,15 +29,17 @@ def serve():
 def dump_sorted():
     req_data = request.get_json()
     cars = Car.query
+    sort = False
     big_cars = []
-        
     if req_data["Price"]:
+        sort = True
         for price in req_data["Price"]:
             mini_cars = cars.filter(Car.MSRP <= price[1])\
                     .filter(Car.MSRP >= price[0])
             big_cars.append(mini_cars)
 
     if req_data["Type"]:
+        sort = True
         if len(big_cars) == 0:
             for car_type in req_data["Type"]:
                 mini_cars = cars.filter_by(type=car_type)
@@ -51,6 +53,7 @@ def dump_sorted():
             big_cars = poses.copy()
 
     if req_data["Seats"]:
+        sort = True
         if len(big_cars) == 0:
             for seat in req_data["Seats"]:
                 mini_cars = cars.filter(Car.seats.between(
@@ -63,18 +66,22 @@ def dump_sorted():
                     pos = big_cars[i].filter(Car.seats.between(seat[0], seat[1]))
                     poses.append(pos)
             big_cars = poses.copy()
-    final_list = []
-    for car in big_cars:
-        for k in car.all():
-            if k not in final_list:
-                final_list.append(k)
-    if req_data["sort_by"] == "MSRP":
-        cars = sorted([car.serialize() for car in final_list],
-                    key=lambda x: x[req_data["sort_by"]])
+    if sort:
+        final_list = []
+        for car in big_cars:
+            for k in car.all():
+                if k not in final_list:
+                    final_list.append(k)
+        if req_data["sort_by"] == "MSRP":
+            cars = sorted([car.serialize() for car in final_list],
+                        key=lambda x: x[req_data["sort_by"]])
+        else:
+            cars = sorted([car.serialize() for car in final_list],
+                        key=lambda x: x[req_data["sort_by"]], reverse=True)
     else:
-        cars = sorted([car.serialize() for car in final_list],
+        cars = sorted([car.serialize() for car in cars.all()],
                     key=lambda x: x[req_data["sort_by"]], reverse=True)
-        
+            
     return jsonify(split(cars, 3))
 
 
@@ -83,13 +90,16 @@ def dump_rating():
     req_data = request.get_json()
     cars = Car.query
     big_cars = []
+    sort = False
     if req_data["Price"]:
+        sort = True
         for price in req_data["Price"]:
             mini_cars = cars.filter(Car.MSRP <= price[1])\
                     .filter(Car.MSRP >= price[0])
             big_cars.append(mini_cars)
 
     if req_data["Type"]:
+        sort = True
         if len(big_cars) == 0:
             for car_type in req_data["Type"]:
                 mini_cars = cars.filter_by(type=car_type)
@@ -103,6 +113,7 @@ def dump_rating():
             big_cars = poses.copy()
 
     if req_data["Seats"]:
+        sort = True
         if len(big_cars) == 0:
             for seat in req_data["Seats"]:
                 mini_cars = cars.filter(Car.seats.between(
@@ -115,13 +126,17 @@ def dump_rating():
                     pos = big_cars[i].filter(Car.seats.between(seat[0], seat[1]))
                     poses.append(pos)
             big_cars = poses.copy()
-    final_list = []
-    for car in big_cars:
-        for k in car.all():
-            if k not in final_list:
-                final_list.append(k)
-    cars = sorted([car.serialize() for car in final_list],
-                  key=lambda x: x[req_data["sort_by"]], reverse=True)
+    if sort:
+        final_list = []
+        for car in big_cars:
+            for k in car.all():
+                if k not in final_list:
+                    final_list.append(k)
+        cars = sorted([car.serialize() for car in final_list],
+                      key=lambda x: x[req_data["sort_by"]], reverse=True)
+    else:
+        cars = sorted([car.serialize() for car in cars.all()],
+                      key=lambda x: x[req_data["sort_by"]], reverse=True)
 
     return jsonify(cars)
 

website/client/src/homepage/Welcome.js

@@ -53,7 +53,6 @@ class Welcome extends React.PureComponent {
 			Price: [],
 			Type: [],
 			Seats: [],
-			futureRound: this.rounds[1],
 			sort_by: this.state.currentFilter,
 		};
 

website/client/src/results/ResultPage.js

@@ -23,7 +23,7 @@ class ResultPage extends React.PureComponent {
 			this.sortedRatings = this.props.location.state.sortedRatings;
 			this.sortedMpg = this.props.location.state.sortedMpg;
 		}
-		console.log(this.badgePrices);
+		console.log(this.sortedPrices);
 
 		this.state = {
 			currentFilter: this.sortedPrices,
@@ -120,6 +120,7 @@ class ResultPage extends React.PureComponent {
 				<Grid container>
 					{/* maps each car onto the page */}
 					{Object.entries(this.state.currentFilter).map(([key, value]) => {
+                        console.log(value);
 						var badges = {};
 						var foundPrice = false;
 						for (var i = 0; i < this.badgePrices.length && !foundPrice; i++) {