Merge branch 'master' of https://github.com/cseg-tech/nyc-housingautomation

Author: raghavmecheri

app/static/dist/bundle.js

@@ -59,27 +59,37 @@ export default class Dashboard extends React.Component {
     console.log(this.state);
     let {open_complaints, closed_complaints, address, num_complaints} = this.state;
     return (
-      <div>
+      <div className="dash">
         <Row>
           <Col sm={2} className="leftSection">
             <h3 style={{textAllign:"center"}}>70 Morningside drive</h3>
+            <div className="buttons">
             <Button style={{textAllign:"center"}} variant="primary" >Change Building</Button>
+            </div>
             <br />
+            <div className="buttons">
             <Button style={{textAllign:"center"}} variant="primary" >Edit Noficiations</Button>
+            </div>
             <br />
+            <div className="buttons">
             <Button style={{textAllign:"center"}} variant="primary" onClick={this.props.signOut}>Logout</Button>
+            </div>
             <br />
             <a href="https://portal.311.nyc.gov/article/?kanumber=KA-01082" class="complain">Complain!</a>
           </Col>
           <Col sm={10} className="rightSection">
             <div className="headerDiv">
+
               <div className="headerLeft">
                 <h3>{num_complaints} Complaints</h3>
                 <h4>{address}</h4>
               </div>
+
               <Button className="accountButton">Account</Button>
             </div>
+
             <div className="complaintDiv">
+
               <div className="upperPortion">
                 <Row>
                   <Col sm={6}>
@@ -94,23 +104,51 @@ export default class Dashboard extends React.Component {
                   </Col>
                 </Row>
               </div>
+
               <div className="lowerPortion">
                 <Row>
-                  <Col sm={4}>
-                    <Card header="Administrative" data={closed_complaints} />
+                  <Col>
+                    <div className="centerWrapper">
+                      <h4>Admin here</h4>
+                        <div className="comp">
+                        <h4>Open Complaints</h4>
+                        {
+                          open_complaints.map((complaint) => (
+                            <p>{JSON.stringify(complaint)}</p>
+                          ))
+                        }
+                        </div>
+                    </div>
                   </Col>
-                  <Col sm={4}>
-                    <Card header="Environmental" data={closed_complaints} />
+                  <Col>
+                    <div className="centerWrapper">
+                      <h4>Env here</h4>
+                        <div className="comp">
+                        <h4>Closed Complaints</h4>
+                        {
+                          closed_complaints.map((complaint) => (
+                            <p>{JSON.stringify(complaint)}</p>
+                          ))
+                        }
+                        </div>
+                     </div>
                   </Col>
-                  <Col sm={4}>
-                    <Card header="Safety" data={closed_complaints} />
+                  <Col>
+                    <div className="centerWrapper">
+                      <h4>Safety here</h4>
+                        <div className="comp">
+                        <h4>Placeholder</h4>
+                        </div>
+                    </div>
                   </Col>
                 </Row>
               </div>
+
+
             </div>
           </Col>
         </Row>
       </div>
     );
   }
-}
+}

app/static/js/components/Dashboard.js

@@ -1,3 +1,6 @@
+.dash {
+	overflow: hidden;
+}
 .hero {
 	height: 100vh;
 	width: 100vw;
@@ -141,7 +144,17 @@
   border: 1px solid #333;
 }
 
-.card {
-	overflow-y: scroll;
-	height: 50vh;
+.comp {
+	text-align: center;
+	width: 20vw;
+  height: 50vh;
+	border-radius: 10px;
+	overflow-y: auto;
+	border-width: 1px;
+	border: solid black;
+	overflow-x: hidden;
+}
+
+.buttons {
+	text-align: center;
 }

app/static/js/styles/Master.css

@@ -2,5 +2,5 @@
 from app import app 
 
 if __name__ == '__main__':
-    # output = subprocess.call(["./refreshReact.sh"])
+ #   output = subprocess.call(["./refreshReact.sh"])
     app.run()

app/static/package-lock.json

@@ -0,0 +1,2 @@
+hello
+