Other fixes from demo day

ucladevx · May 8, 2018 · bf3fc00 · bf3fc00
1 parent 493df25
commit bf3fc00
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 32 deletions.
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
@@ -15,7 +15,7 @@ const Header = props => (
       </div>
     ) : (
       <div className="tab">
-        <Link to="/login">Login</Link>
+        <Link to="/register">Login</Link>
       </div>
     )}
   </div>

diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js
@@ -9,6 +9,7 @@ import linkState from "linkstate";
 class RideModal extends React.Component {
   constructor(props) {
     super(props);
+    console.log(props.trip);
     this.state = {
       trip: props.trip,
       form: props.trip,
@@ -54,11 +55,15 @@ class RideModal extends React.Component {
   }
 
   render() {
-    const { scrollbox, driver } = this.props;
+    const { scrollbox, driver, visible } = this.props;
     const { trip, form, editing } = this.state;
 
     return (
-      <Modal styles={{ padding: "2rem" }} onClose={this.closeModal} open={true}>
+      <Modal
+        styles={{ padding: "2rem" }}
+        onClose={this.closeModal}
+        open={visible}
+      >
         <h2>
           {trip.start_city} to {trip.end_city}
         </h2>
@@ -101,13 +106,11 @@ class RideModal extends React.Component {
                     onClick={this.delete}
                   />
                 )}
-                {/*!driver && (
-                  <Button
-                    label="Contact driver"
-                    onClick={this.delete}
-                  />
-                )*/
-                /* TODO: probably shouldn't be this.delete for contact driver? */}
+                {!driver && (
+                  <Button label="Contact driver" onClick={this.delete} />
+                )
+                /* TODO: probably shouldn't be this.delete for contact driver? */
+                }
               </Col>
               <Col>{driver && <Button label="Edit" onClick={this.edit} />}</Col>
             </div>

diff --git a/src/components/SidebarContent/index.js b/src/components/SidebarContent/index.js
@@ -23,6 +23,10 @@ const sidebarMapping = [
     name: "Messages",
     link: "/messages",
   },
+  {
+    name: "Driver",
+    link: "/driver",
+  },
 ];
 
 const renderLinks = () =>

diff --git a/src/containers/dashboard.js b/src/containers/dashboard.js
@@ -45,13 +45,13 @@ class Dashboard extends React.Component {
     await this.setState({
       selectedTrip: {
         seats: 3,
-        start_city: "Los Angeles",
-        end_city: "San Jose",
+        start_city: "UCLA",
+        end_city: "UCB",
         start_dest_lat: "1",
         start_dest_lon: "1",
         end_dest_lat: "2",
         end_dest_lon: "2",
-        price_per_seat: 20,
+        price_per_seat: 11,
         info:
           "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse at lectus sed odio ornare auctor ac eget massa. Aliquam erat volutpat. Donec placerat risus leo, vel aliquet neque venenatis nec. Sed pulvinar sed urna sagittis eleifend. Fusce quam libero, sagittis quis metus placerat, volutpat mattis mi. Cras sit amet metus tincidunt, tempus dui id, blandit urna. Sed ipsum nibh, dignissim nec enim sed, vehicula condimentum odio. Sed malesuada malesuada magna in dignissim. Ut pellentesque malesuada augue, ac convallis nunc ultrices sit amet. Phasellus laoreet, enim ut congue accumsan, leo mi gravida arcu, sed consectetur augue sem maximus augue. Curabitur sed vulputate justo, vel lacinia quam.",
       },
@@ -89,9 +89,10 @@ class Dashboard extends React.Component {
           <RideModal
             trip={selectedTrip}
             closeModal={this.closeModal}
-            driver={true}
+            visible={modalVisible}
           />
         )}
+        <h1> Upcoming Rides </h1>
         <ul>{upcomingCards}</ul>
       </div>
     );

diff --git a/src/containers/driver.js b/src/containers/driver.js
@@ -46,13 +46,13 @@ class DriverPanel extends React.Component {
     this.setState({
       selectedTrip: {
         seats: 3,
-        start_city: "Los Angeles",
-        end_city: "San Jose",
+        start_city: "UCLA",
+        end_city: "UCB",
         start_dest_lat: "1",
         start_dest_lon: "1",
         end_dest_lat: "2",
         end_dest_lon: "2",
-        price_per_seat: 20,
+        price_per_seat: 11,
         info:
           "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse at lectus sed odio ornare auctor ac eget massa. Aliquam erat volutpat. Donec placerat risus leo, vel aliquet neque venenatis nec. Sed pulvinar sed urna sagittis eleifend. Fusce quam libero, sagittis quis metus placerat, volutpat mattis mi. Cras sit amet metus tincidunt, tempus dui id, blandit urna. Sed ipsum nibh, dignissim nec enim sed, vehicula condimentum odio. Sed malesuada malesuada magna in dignissim. Ut pellentesque malesuada augue, ac convallis nunc ultrices sit amet. Phasellus laoreet, enim ut congue accumsan, leo mi gravida arcu, sed consectetur augue sem maximus augue. Curabitur sed vulputate justo, vel lacinia quam.",
       },
@@ -96,7 +96,7 @@ class DriverPanel extends React.Component {
   render() {
     const {} = this.props;
     const { trips, selectedTrip, modalVisible, err } = this.state;
-
+    console.log(selectedTrip);
     const tripCards = trips.map(tripInfo => (
       <li>
         <RideCard
@@ -109,7 +109,6 @@ class DriverPanel extends React.Component {
         />
       </li>
     ));
-
     return (
       <div className="driver container">
         <Card>
@@ -128,13 +127,15 @@ class DriverPanel extends React.Component {
           <h2> Upcoming rides </h2>
           {tripCards}
         </Row>
-        <RideModal
-          trip={selectedTrip}
-          visible={modalVisible}
-          closeModal={this.closeModal}
-          delete={this.deleteRide}
-          driver
-        />
+        {modalVisible && (
+          <RideModal
+            trip={selectedTrip}
+            visible={modalVisible}
+            closeModal={this.closeModal}
+            delete={this.deleteRide}
+            driver
+          />
+        )}
       </div>
     );
   }

diff --git a/src/containers/home.js b/src/containers/home.js
@@ -9,7 +9,7 @@ class Home extends React.Component {
   render() {
     return (
       <div className="home">
-        <Landing loggedIn={true} />
+        <Landing loggedIn={false} />
       </div>
     );
   }

diff --git a/src/containers/landing.js b/src/containers/landing.js
@@ -12,7 +12,7 @@ class Landing extends React.Component {
   }
   render() {
     const { loggedIn, isDriver } = this.props;
-
+    console.log(loggedIn);
     const onFindClick = loggedIn
       ? () => this.props.changePage("/find")
       : () => this.props.changePage("/register");

diff --git a/src/containers/register.js b/src/containers/register.js
@@ -79,7 +79,7 @@ class Register extends React.Component {
             )}
             {register_car && (
               <div className="register-car">
-                <h4>Optional: You may register as driver.</h4>
+                <h4>Optional: You may register as a driver.</h4>
                 <h5>Please enter your car details.</h5>
                 <Row>
                   <Input

diff --git a/src/reducers/initialState.js b/src/reducers/initialState.js
@@ -1,7 +1,7 @@
 export default {
   user: {
-    loggedIn: true,
-    isDriver: true,
-    isAdmin: true,
+    loggedIn: false,
+    isDriver: false,
+    isAdmin: false,
   },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ const Header = props => ( @@
           </div>
         ) : (
           <div className="tab">
-            <Link to="/login">Login</Link>
+            <Link to="/register">Login</Link>
           </div>
         )}
       </div>
@@ Expand Down @@