Merge remote-tracking branch 'origin/develop' into develop

Kerry-G · Mar 23, 2018 · be5b2f8 · be5b2f8
2 parents 6e08e77 + e4fb407
commit be5b2f8
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 48 deletions.
diff --git a/application/api/qa.py b/application/api/qa.py
@@ -116,7 +116,7 @@ def questionsRoute():
 			status = 'OK'
 			message = 'List of several questions by user_id'
 		elif 'engineer' in questionArgs:
-			questions = Questions.getQuestionByEngineer(questionArgs['engineer'], id)
+			questions = Questions.getQuestionsByEngineer(questionArgs['engineer'], id)
 			success = True
 			status = 'OK'
 			message = 'List of several questions by engineer'

diff --git a/application/util/__init__.py b/application/util/__init__.py
@@ -4,7 +4,7 @@
 def convertRequestDataToDict(data):
 	if data == b'':
 		return {}
-	data  = data.decode('utf8').replace("'",'"')
+	data  = data.decode('utf8')
 	data = json.loads(data)
 	return data
 

diff --git a/static/src/components/body/Profile/Profile.js b/static/src/components/body/Profile/Profile.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux'
 import ProfileCard from './ProfileCard'
 import Question from '..//Questions//Question'
 import Search from '..//Questions//Search'
+import { updateUser } from './../../../store/auth'
 
 
 class Profile extends Component {
@@ -92,6 +93,7 @@ class Profile extends Component {
 		//Own account
 		if (!this.state.alert && (this.props.match.params.id === this.props.user.id)) {
 			ProfileInfo = <div> 
+				{updateUser(this.state.user)}
 				<ProfileCard user={this.props.user} />
 			 </div> 
 		} else if (!this.state.alert && (!(this.props.match.params.id === this.state.id))) { //viewing another person's profile

diff --git a/static/src/components/header/Header.js b/static/src/components/header/Header.js
@@ -9,23 +9,21 @@ class Header extends Component {
   render() {
     let image = "\\images\\ask-eng.png"
     return (
-      <Row className="header">
-        <Col xs={9} lg={7} md={7}>
-          <h1>
-            <Link to='/' style={{ textDecoration: 'none', color: "#E27A3F" }}>
-              <Image src={image} width={30} circle />&nbsp;Ask<small>ENG</small>
-            </Link>    
-          </h1>
-        </Col>
-        <Col xs={3} lg={5} md={5}>
+      <div className="header">
+
+        <h1>
+          <Link to='/' style={{ textDecoration: 'none', color: "#E27A3F" }}>
+            <img src={image} width={30} circle />&nbsp;Ask<small>ENG</small>
+          </Link>
+        </h1>
+
           <div className ="menu">
-            <Col style={{float: "right"}}>
               <Headermenu
-              user = {this.props.user}/>
-            </Col>
+                user = {this.props.user}
+              />
           </div>  
-        </Col>
-      </Row>
+
+      </div>
     );
   }
 }

diff --git a/static/src/styles.css b/static/src/styles.css
@@ -22,10 +22,12 @@ h1 {
 .header {
   margin: 0 0 25px;
   background: #ecf0f1;
-  box-shadow: 0 2px 12px 1px rgba(127, 140, 141, 0.6); }
+  box-shadow: 0 2px 12px 1px rgba(127, 140, 141, 0.6);
+  display: flex;
+  justify-content: space-between; }
 
 .header h1 {
-  font-size: 5rem;
+  font-size: 3rem;
   color: #E27A3F;
   font-weight: 600; }
 
@@ -43,15 +45,6 @@ h1 {
 .para {
   margin-top: 1.5rem; }
 
-.menu .btn-toolbar {
-  display: inline-block;
-  vertical-align: middle;
-  margin: auto 1rem; }
-
-.menu {
-  margin-top: 1.5rem;
-  float: right; }
-
 /* END HEADER */
 .jumbotron {
   background-color: #ecf0f1; }
@@ -165,10 +158,6 @@ h1 {
 .modal-content {
   border: 0; }
 
-.menu {
-  float: left;
-  width: 100%; }
-
 label {
   font-weight: 300; }
 

diff --git a/static/src/styles.scss b/static/src/styles.scss
@@ -39,16 +39,22 @@ h1{
     margin: 0 0 25px;
     background:$offwhite;
     box-shadow: 0 2px 12px 1px rgba(127,140,141,0.6);
+    display:flex;
+    justify-content: space-between;
 }
 .header h1{
-    font-size: 5rem;
+    font-size: 3rem;
     color:$main;
     font-weight: 600;
 }
 .header h1 small{
-    color:$main;;
+    color:$main;
 }
-
+// .menu .btn-toolbar{
+//     display: inline-block;
+//     vertical-align: middle;
+//     margin: auto 1rem;
+// }
 .logoutBtn{
     color: #ffffff;
     cursor: pointer;
@@ -60,16 +66,6 @@ h1{
 .para{
     margin-top: 1.5rem;
 }
-.menu .btn-toolbar{
-    display: inline-block;
-        vertical-align: middle;
-        margin: auto 1rem;
-
-}
-.menu {
-    margin-top: 1.5rem;
-    float: right; 
-}
 /* END HEADER */
 .jumbotron{
     background-color: $offwhite;
@@ -182,10 +178,6 @@ h1{
 .modal-content{
     border: 0;
 }
-.menu{ 
-    float: left;
-    width: 100%;  
-}
 label{
     font-weight: 300;
 }