Merge pull request dandiflower#49 from dandiflower/jessica

not crashing anymore still logging data...
hannahlim213 · Jul 13, 2018 · 27728da · 27728da
2 parents a544148 + a6c2d3d
commit 27728da
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/client/src/components/Quiz/QuestionForm.js b/client/src/components/Quiz/QuestionForm.js
@@ -10,6 +10,7 @@ import "./Form.css";
 
 
 class QuestionForm extends React.Component {
+
     state = {
         userId: ""
     };
@@ -61,7 +62,7 @@ class QuestionForm extends React.Component {
                 if (response.data === true) {
                     this.setState({ persons: response.data });
 
-                    // // window.location.pathname = "/results"
+                    window.location.pathname = "/results"
                     // this.props.history.push(`/person/results/${userId}` )
                 }
             })
@@ -76,8 +77,9 @@ class QuestionForm extends React.Component {
     // is the user authorized????
     componentDidMount() {
         this.getUserID()
+        this.getSlideVal = this.getSlideVal.bind(this);
         // setTimeout(() => {
-            console.log(this.state.userId);
+        //     console.log(this.state.userId);
         // }, 100);
         axios.defaults.headers.common['Authorization'] = localStorage.getItem('jwtToken');
         axios.get('/api/person')
@@ -143,16 +145,6 @@ class QuestionForm extends React.Component {
                     <div className="row">
                         <div className="col-md-12">
                             <form>
-                                <p>
-                                    {localStorage.getItem('jwtToken') &&
-                                        <button
-                                            className="btn btn-primary"
-                                            onClick={this.logout}>
-                                            Logout
-                                    </button>
-                                    }
-                                </p>
-
 
                                 <p>First name: </p>
                                 <Input
@@ -426,6 +418,17 @@ class QuestionForm extends React.Component {
                                     Submit
                                 </FormBtn>
                                 <br /> <br />
+
+                                <p>
+                                    {localStorage.getItem('jwtToken') &&
+                                        <button
+                                            className="btn btn-primary"
+                                            onClick={this.logout}>
+                                            Logout
+                                    </button>
+                                    }
+                                </p>
+
                             </form>
 
                         </div>

diff --git a/client/src/components/Results/Results.css b/client/src/components/Results/Results.css
@@ -4,7 +4,8 @@
 } */
 
 #results--card--center {
-    position: fixed;
+    /* position: fixed; */
+    height: 4000px;
     margin-bottom: -200px;
     margin-left: 5%;
     width: 90%;

diff --git a/client/src/components/Results/Results.js b/client/src/components/Results/Results.js
@@ -1,4 +1,5 @@
 import React from "react";
+import axios from 'axios';
 import Navbar from "../Navbar/Navbar";
 import HELPERS from "../../utils/helpers.js";
 import "./Results.css";
@@ -29,6 +30,22 @@ getChartData() {
     });
 }
 
+// is the user authorized????
+componentDidMount() {
+
+    axios.defaults.headers.common['Authorization'] = localStorage.getItem('jwtToken');
+    axios.get('/api/person')
+        .then(res => {
+            this.setState({ persons: res.data });
+            console.log("this.state.persons", this.state.persons);
+            this.props.history.push()
+        })
+        .catch((error) => {
+            if (error.response.status === 401) {
+                this.props.history.push("/login");
+            }
+        });
+}
 
 logout() {
     localStorage.removeItem('jwtToken');

diff --git a/client/src/components/Slidebar/Slidebar.js b/client/src/components/Slidebar/Slidebar.js
@@ -15,7 +15,12 @@ class CustomizedSlider extends React.Component {
         sliderValue: value
       })
       // console.log("value", value)
-      this.props.onChange(this.props.id, this.state.sliderValue);
+
+
+      // THIS CODE IS THROWING ERROR ....
+      // this.props.onChange(this.props.id, this.state.sliderValue);
+
+
       // return this.props.sliderValues(this.state.sliderValue)