More cookies (#67)

* Fixed issues with cookies being passed between components * Fixed company authentication creation bug. Made cookies work for loading company specific dashboard
eigenfoo-archives · Apr 18, 2019 · ff258f3 · ff258f3
1 parent a7c3c54
commit ff258f3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/euphoria-frontend/src/App.js b/euphoria-frontend/src/App.js
@@ -26,14 +26,14 @@ class App extends Component {
       <div>
         <Switch>
           <Route exact path="/" component={Splash} />
-          <Route path="/signin" render={(props) => (<Signin {...props} />)} />
+          <Route path="/signin" render={(props) => (<Signin cookies={this.props.cookies} {...props} />)} />
           <Route path="/signup" component={Signup} />
-          <Route exact path="/postings" render={(props) => (<Postings {...props} />)} />
-          <Route path="/postings/apply/:postingId" render={(props) => (<Apply {...props} />)} />
-          <Route exact path="/dashboard" render={(props) => (<Dashboard {...props} />)} />
-          <Route exact path="/dashboard/post" render={(props) => (<Post {...props} />)} />
-          <Route path="/dashboard/post/edit/:postingId" render={(props) => (<Editpost {...props} />)} />
-          <Route path="/dashboard/applications/:postingId" render={(props) => (<Applications {...props} />)} />
+          <Route exact path="/postings" render={(props) => (<Postings cookies={this.props.cookies} {...props} />)} />
+          <Route path="/postings/apply/:postingId" render={(props) => (<Apply cookies={this.props.cookies} {...props} />)} />
+          <Route exact path="/dashboard" render={(props) => (<Dashboard cookies={this.props.cookies} {...props} />)} />
+          <Route exact path="/dashboard/post" render={(props) => (<Post cookies={this.props.cookies} {...props} />)} />
+          <Route path="/dashboard/post/edit/:postingId" render={(props) => (<Editpost cookies={this.props.cookies} {...props} />)} />
+          <Route path="/dashboard/applications/:postingId" render={(props) => (<Applications cookies={this.props.cookies} {...props} />)} />
           <Route path="/404" component={NotFound} />
           <Redirect to="/404" />
         </Switch>

diff --git a/euphoria-frontend/src/views/Apply.jsx b/euphoria-frontend/src/views/Apply.jsx
@@ -16,7 +16,7 @@ class Apply extends Component {
 
   componentDidMount() {
     let url = "http://localhost:8080/api/posting/" + this.props.match.params.postingId;
-    console.log(this.props);
+
     this.handleGet(url);
   }
 
@@ -110,7 +110,7 @@ class Apply extends Component {
             <Image
               src={require('../images/Logo.png')}
               fluid
-              onClick={() => this.handleRedirect("/posting")}
+              onClick={() => this.handleRedirect("/postings")}
             />
           </div>
         </div>

diff --git a/euphoria-frontend/src/views/Dashboard.jsx b/euphoria-frontend/src/views/Dashboard.jsx
@@ -5,7 +5,7 @@ class Dashboard extends Component {
   constructor(props, context) {
     super(props);
 
-    this.dashboardUrl = "http://localhost:8080/api/posting/company/" + this.props.cookies.get("id");
+    this.dashboardUrl = "http://localhost:8080/api/posting/company/" + this.props.cookies.get("id")
 
     this.state = {
       companyPostingsData: [],

diff --git a/euphoria-frontend/src/views/Signin.jsx b/euphoria-frontend/src/views/Signin.jsx
@@ -63,15 +63,15 @@ class Signin extends Component {
       .then(data => {
         const cookie = data[0];
 
-        if(cookie != null){
-          const cookies = this.props.cookies;
+        if(!(cookie == null)){
+          const cookiesProp = this.props.cookies;
 
-          cookies.set("username", username, { path: '/' });
-          cookies.set("id", cookies.id, { path: '/' });
-          cookies.set("isUser", cookies.isUser, { path: '/' });
-          cookies.set("authenticationHash", cookie.cookie, { path: '/' });
+          cookiesProp.set("username", username, { path: '/' });
+          cookiesProp.set("id", cookie.id, { path: '/' });
+          cookiesProp.set("isUser", cookie.isUser, { path: '/' });
+          cookiesProp.set("authenticationHash", cookie.cookie, { path: '/' });
 
-          if(cookies.isUser){
+          if(cookie.isUser){
             this.handleRedirect("/postings")
           }
           else{

diff --git a/euphoria-frontend/src/views/Signup.jsx b/euphoria-frontend/src/views/Signup.jsx
@@ -94,21 +94,24 @@ class Signup extends Component {
         website,
         description
       };
+      console.log(userPayload)
     }
 
     fetch(userUrl, {
         method: "POST",
         body: JSON.stringify(userPayload)
       }) //FIXME add check for is user exists
       .then(response => response.json())
-      .then(data => this.createUserAuthentication(data[0].userId))
+      .then(data => {
+        this.createUserAuthentication((isUser) ? data[0].userId : data[0].companyId)
+      })
       .catch(err => {
       })
 
     return;
   }
 
-  createUserAuthentication(userId) {
+  createUserAuthentication(id) {
     const {
       isUser,
       username,
@@ -118,12 +121,14 @@ class Signup extends Component {
     const authenticationUrl = "http://localhost:8080/api/authentication";
 
     let authenticationPayload = {
-      id: userId,
+      id: id,
       username: username,
       passwordHash: password,
       isUser: isUser
     };
 
+    console.log(authenticationPayload);
+
     fetch(authenticationUrl, {
         method: "POST",
         body: JSON.stringify(authenticationPayload)
@@ -234,7 +239,7 @@ class Signup extends Component {
         </Form.Group>
 
         <Form.Group controlId="formGridWebsite">
-          <Form.Label>Email</Form.Label>
+          <Form.Label>Website</Form.Label>
           <Form.Control
             required
             type="website"