Changeset 6f9b7b0 for client_app/src/components/main

Timestamp:

01/10/21 21:16:40 (4 years ago)

Author:

i-ina <76742075+i-ina@…>

Branches:

master

Children:

fc8421e

Parents:

17abe5e

Message:

user login

File:

• client_app/src/components/main/App.js (modified) (2 diffs)

client_app/src/components/main/App.js

@@ -1 +1 @@
 import React, {Component} from 'react';
-import {BrowserRouter as Router, Route} from 'react-router-dom';
+import {BrowserRouter as Router, Route, Redirect} from 'react-router-dom';
 import Login from '../login/login';
 import Profile from "../data/profile";
@@ -12 +12 @@
     super(props);
     this.state = {
-      currentUser: {}
+        logged: false,
+        error: null,
+        currentUser: {}
     }
   }
 
   render(){
-      return(
-          <Router>
-              <HeaderComp acc={this.state.currentUser.email} accType={this.state.currentUser.type} name={this.state.currentUser.name}/>
-              <main>
-                  <Route path={"/login"} render={() => <Login onCompleteForm={this.attemptLogin}/>}/>
-                  <Route path={"/profile"} render={() => <Profile userProfile={this.state.currentUser}/>}/>
-                  <Route path={"/"}/>
-                  <Route path={"/jobs"}/>
-                  <Route path={"/internships"}/>
-              </main>
-          </Router>
-      );
+          return(
+              <Router>
+                  <HeaderComp acc={this.state.currentUser.email} accType={this.state.currentUser.type} name={this.state.currentUser.name}/>
+                  <main>
+                      <Route path={"/login"} render={() => <Login error={this.state.error} onCompleteForm={this.attemptLogin} loggedIn={this.state.logged}/>}/>
+                      <Route path={"/profile"} render={() => <Profile userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
+                  </main>
+              </Router>
+          );
   }
 
   attemptLogin = (email, password, type) => {
-
       UserLogin.login(email, password, type).then((res) =>{
           console.log(res.data);
-          this.setState({
-              currentUser: res.data
-          });
+          if(res.data.email==null){
+              this.setState({
+                  logged: false,
+                  error: res.data.error,
+              });
+          }else{
+              this.setState({
+                  logged: true,
+                  currentUser: res.data,
+                  error: null,
+              });
+          }
       });
+
+      if(this.state.currentUser.email!=null){
+          return <Redirect to={"/profile"}/>;
+      }
   }
 }