Changeset 580ba1a for client_app/src/components/main

Timestamp:

01/14/21 02:31:15 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

be373a8

Parents:

df3a395

Message:

register and edit

File:

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

client_app/src/components/main/App.js

@@ -17 +17 @@
 import RegisterCompany from "../register/register_company_form";
 import RegisterTeam from "../register/register_team_form";
+import Search from "../filter/search";
+import EditUser from "../account_edit/user_edit";
+import EditCompany from "../account_edit/company_edit";
 
 class App extends Component{
@@ -30 +33 @@
   }
 
-  render(){
+    render(){
           return(
               <Router>
@@ -47 +50 @@
                       <Route path={"/register/company"} render={() => <RegisterCompany message={this.setSuccess} />}/>
                       <Route path={"/register/team"} render={() => <RegisterTeam message={this.setSuccess}/>}/>
+                      <Route path={"/user/search"} render={() => <Search loggedIn={this.state.logged}/>}/>
+                      <Route path={"/user/edit"} render={() => <EditUser oldUser={this.state.currentUser} updateUser={this.updateUser} message={this.setSuccess}/>}/>
+                      <Route path={"/company/edit"} render={() => <EditCompany oldUser={this.state.currentUser} updateUser={this.updateUser} message={this.setSuccess}/>}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
@@ -62 +68 @@
   }
 
+  updateUser = (user) =>{
+      this.setState({
+          currentUser: user
+      })
+  }
+
   setSuccess = (message) => {
       this.setState({
@@ -70 +82 @@
   attemptLogin = (email, password, type) => {
       UserLogin.login(email, password, type).then((res) =>{
-          console.log(res.data);
           if(res.data.email==null){
               this.setState({