Merge pull request #40 from vs2961/users

Add no cars page for profile

Author: vs2961

Scraping/kbb_parser.py

@@ -52,8 +52,8 @@ def getCars(html, site, out):
             continue
 
         if chosen_horsepower == "0":
-            bruh = chosen_car.replace(" ", "+") + "+HP"
-            a = requests.get(f"https://www.google.com/search?q={bruh}/").text
+            hp1 = chosen_car.replace(" ", "+") + "+HP"
+            a = requests.get(f"https://www.google.com/search?q={hp1}/").text
             soup3 = BeautifulSoup(a, features="html.parser")
             try:
                 chosen_horsepower = soup3.findAll("div", {"class":"BNeawe iBp4i AP7Wnd"})[0].text[0:3]

website/app/production.db

@@ -29,37 +29,59 @@ 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)
                 big_cars.append(mini_cars)
         else:
+            poses = []
             for i in range(len(big_cars)):
                 for car_type in req_data["Type"]:
-                    big_cars[i] = big_cars[i].filter_by(type=car_type)
+                    pos = big_cars[i].filter_by(type=car_type)
+                    poses.append(pos)
+            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(
                     seat[0], seat[1]))
+                big_cars.append(mini_cars)
         else:
+            poses = []
             for i in range(len(big_cars)):
                 for seat in req_data["Seats"]:
-                    big_cars[i] = big_cars[i].filter(Car.seats.between(seat[0], seat[1]))
-    final_list = []
-    for car in big_cars:
-        for k in car.all():
-            final_list.append(k)
-    cars = sorted([car.serialize() for car in final_list],
-                  key=lambda x: x[req_data["sort_by"]], reverse=True)
+                    pos = big_cars[i].filter(Car.seats.between(seat[0], seat[1]))
+                    poses.append(pos)
+            big_cars = poses.copy()
+    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 cars.all()],
+                    key=lambda x: x[req_data["sort_by"]], reverse=True)
+            
     return jsonify(split(cars, 3))
 
 
@@ -68,14 +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)
-    print("AFTER PRICE: ")
-    print(big_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)
@@ -89,25 +113,30 @@ 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(
                     seat[0], seat[1]))
+                big_cars.append(mini_cars)
         else:
             poses = []
             for i in range(len(big_cars)):
                 for seat in req_data["Seats"]:
                     pos = big_cars[i].filter(Car.seats.between(seat[0], seat[1]))
                     poses.append(pos)
             big_cars = poses.copy()
-    print(len(big_cars))
-    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/app/views.py

@@ -5,6 +5,7 @@
   "dependencies": {
     "@material-ui/core": "^4.9.9",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "^4.0.0-alpha.55",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

website/client/package-lock.json

@@ -3,12 +3,7 @@ import "../styles/about.css";
 import Grid from '@material-ui/core/Grid'
 import IntroCard from './IntroCard'
 function About() {
-    const what = `
-        Look, we get it. Buying cars is a hassle. Car salesperson aren't good people! 
-    They're going to scam you to buy at whatever price they're coaxing you at! 
-    But today, my fellow car enthusiast, it all changes. With EZCar, you are going to 
-    have a honest experience in finding the car for you. Don't worry! We'll obviously help you in the entire process. 
-    Just create an account and get started!`
+    const what = "More than 3 in 5 Americans believe that they are exploited when shopping at car dealerships. They seek a \“more transparent pricing process\” as well as more \“flexibility and speed.\” We get it: buying cars is a hassle. That\’s why we created EZCar: your personal car dealer. We start with the specs that matter to you––gas mileage, seating, price––and serve up the best rides. Simple, streamlined, EZ!"
 
     const how = `Our application is for the modern world. No one likes to get bogged down with a ton of text. 
     Images and icons are the new thing! We've made the car search  a whole lot friendlier and interactive.
@@ -25,23 +20,20 @@ function About() {
         <div >
             <h1>Welcome!</h1>
             <Grid container spacing={3}>
-                <Grid item xs={4}>
-                    <IntroCard title={"What is this?"} text={what}/>
+                <Grid item xs={6}>
+                    <IntroCard title={"Our Story"} text={what}/>
                 </Grid>
-                <Grid item xs={4}>
-                    <IntroCard title={"Get Started"} text={get_started}/>
-                </Grid>
-                <Grid item xs={4}>
-                    <IntroCard title={"Background Info"} text={who}/>
+                <Grid item xs={6}>
+                    <IntroCard title={"Tutorials"} hasImage = {true} imageSource = {"tutorial1.gif"}/>
+
                 </Grid>
-                <Grid item xs={4}>
-                    <IntroCard title={"How?"} text={how}/>
+                <Grid item xs={6}>
+                    <IntroCard title={"Code Used"} text={get_started}/>
                 </Grid>
-                <Grid item xs={4}>
-                    <iframe width="100%" height="100%"
-                        src="https://www.youtube.com/embed/tgbNymZ7vqY">
-                    </iframe>
+                <Grid item xs={6}>
+                    <IntroCard title={"Team"} text={who}/>
                 </Grid>
+
             </Grid>
         </div>
     )

website/client/package.json

@@ -41,8 +41,8 @@ function MaterialInfoDrawer() {
           setState({ ...state, [anchor]: open });
     } 
 
-    const routes = ["/", "/profile", "/cars", "/about"]
-    const icons = [<BugReportIcon/>, <AccountCircleIcon/>, <DriveEtaIcon/>, <InfoIcon/>]
+    const routes = ["/", "/profile", "/about"]
+    const icons = [<DriveEtaIcon/>, <AccountCircleIcon/>, <InfoIcon/>]
     const [cookies, setCookie, removeCookie] = useCookies(['username', 'id']);
 
     const topics = (anchor) => (
@@ -51,7 +51,7 @@ function MaterialInfoDrawer() {
         onKeyDown={toggleDrawer(anchor, false)}>
             {/* Just maps out the topics, making listitems for each one */}
             <List>
-            {['Introduction', 'Profile', 'Cars', 'About'].map((text, index) => (
+            {['Introduction', 'Profile', 'About'].map((text, index) => (
                 <>
                 <ListItem button key={index}>
                     {text == 'Profile' && typeof cookies.id == "undefined" ? null : <NavLink key={index} to={routes[index]} >