From c19ab46c08591794922c8d6fed016e61214a111c Mon Sep 17 00:00:00 2001
From: Balsam-Faysal <blsam.2332016@gmail.com>
Date: Thu, 26 Jul 2018 13:41:28 +0300
Subject: [PATCH] resolve changes requests #13 #18

---
 client/src/App.css                            | 40 +++----------------
 client/src/App.js                             |  3 +-
 .../components/detailscard/detailscard.css    |  4 +-
 client/src/components/detailscard/index.js    |  6 +--
 client/src/components/input/index.js          |  1 -
 client/src/components/select/index.js         |  1 -
 client/src/pages/updateFlight/index.js        |  2 +-
 7 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/client/src/App.css b/client/src/App.css
index 44bf6b0..c2b98b0 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -1,35 +1,5 @@
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-.App {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.App-logo {
-  animation: App-logo-spin infinite 20s linear;
-  height: 80px;
-}
-
-.App-header {
-  background-color: #222;
-  height: 150px;
-  padding: 20px;
-  color: white;
-}
-
-.App-title {
-  font-size: 1.5em;
-}
-
-.App-intro {
-  font-size: large;
-}
-
-@keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-}
+ * {
+   margin: 0;
+   padding: 0;
+   box-sizing: border-box;
+ }
diff --git a/client/src/App.js b/client/src/App.js
index 78fedc2..577e488 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import Login from './pages/login';
-// import Flight from './pages/flights';
 import AddFlight from './pages/addFlight';
 import UpdateFlight from './pages/updateFlight';
 import './App.css';
@@ -8,7 +7,7 @@ import './App.css';
 class App extends Component {
   render() {
     return (
-      <Login />
+      <UpdateFlight />
     );
   }
 }
diff --git a/client/src/components/detailscard/detailscard.css b/client/src/components/detailscard/detailscard.css
index 65ab833..63f549b 100644
--- a/client/src/components/detailscard/detailscard.css
+++ b/client/src/components/detailscard/detailscard.css
@@ -13,7 +13,7 @@
   font-family: 'Volkhov';
   font-size: 15px;
   width: 100%;
-  margin: 10px 0 10px 0;
+  margin: 10px 0;
 }
 
 .duration-label {
@@ -29,7 +29,7 @@
 }
 
 .labels-container {
-  padding: 0 10px 0 10px;
+  padding: 0 10px;
   width: 300px;
   height: 30px;
   margin-bottom: 10px;
diff --git a/client/src/components/detailscard/index.js b/client/src/components/detailscard/index.js
index 0bf42d8..c461ba8 100644
--- a/client/src/components/detailscard/index.js
+++ b/client/src/components/detailscard/index.js
@@ -4,18 +4,18 @@ import './detailscard.css'
 
 class Card extends Component {
   render() {
-    const { flightduration } = this.props;
+    const { flightduration, destination , origin} = this.props;
     return (
       <div className='center-div'>
         <div className='container-card-details'>
           <label className='flightno-style'>Flight no.</label>
           <div className='labels-container'>
             <label className='duration-label'>From</label>
-            <label className='float-style'>f</label>
+            <label className='float-style'>{origin}</label>
           </div>
           <div className='labels-container'>
             <label className='duration-label'>To</label>
-            <label className='float-style'>f</label>
+            <label className='float-style'>{destination}</label>
           </div>
           <div className='labels-container'>
             <label className='duration-label'>Flight duration</label>
diff --git a/client/src/components/input/index.js b/client/src/components/input/index.js
index d489774..f4e9f0c 100644
--- a/client/src/components/input/index.js
+++ b/client/src/components/input/index.js
@@ -8,7 +8,6 @@ class Input extends Component {
     return (
       <div className='container-input'>
         <label className='label-style'>{labelText}</label>
-        {/* <i class={iconclass}></i> */}
         <input className='input-style' placeholder={placeholder}/>
       </div>
     );
diff --git a/client/src/components/select/index.js b/client/src/components/select/index.js
index 741f8dd..35f5eae 100644
--- a/client/src/components/select/index.js
+++ b/client/src/components/select/index.js
@@ -8,7 +8,6 @@ class Select extends Component {
     return (
       <div className='container-select'>
         <label className='label-style'>{labelText}</label>
-        {/* <i class={iconclass}></i> */}
         <select className='select-style'>
           <option>{firstItem}</option>
           <option>balsam</option>
diff --git a/client/src/pages/updateFlight/index.js b/client/src/pages/updateFlight/index.js
index 81bec19..63bbd67 100644
--- a/client/src/pages/updateFlight/index.js
+++ b/client/src/pages/updateFlight/index.js
@@ -17,7 +17,7 @@ class UpdateFlight extends Component {
             <div className="sub-container-sidenav-form">
               <Sidenav thirdTap={true}/>
               <div className="sub-container-form">
-                <DetailsCard flightduration='00 hours'/>
+                <DetailsCard flightduration='00 hours' destination='destination' origin='origin' />
                 <Input labelText='Departure time' iconclass='fa fa-user' placeholder='00:00:00 am' />
                 <Input labelText='Boarding time' iconclass='fa fa-user' placeholder='00:00:00 am' />
                 <Input labelText='Gate no.' iconclass='fa fa-user' placeholder='ex:1234' />