Changeset 19ad843 for client_app/src/components/main

Timestamp:

01/13/21 01:08:25 (3 years ago)

Author:

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

Branches:

master

Children:

7944fab

Parents:

351c43f

Message:

dropdown

File:

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

client_app/src/components/main/App.js

@@ -15 +15 @@
 import CompanyInternships from "../work/company_internships";
 import UserRegister from "../../repository/register_repo";
+import RegisterUser from "../register/register_user_form";
 
 class App extends Component{
@@ -32 +33 @@
                   <HeaderComp acc={this.state.currentUser.email} accType={this.state.currentUser.type} name={this.state.currentUser.name} removeState={this.removeState}/>
                   <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={"/user/jobs"} render={() => <UserJobs userProfile={this.state.currentUser}/>} />
-                      <Route path={"/user/internships"} render={() => <UserInternships userProfile={this.state.currentUser}/>} />
-                      <Route path={"/user/projects"} render={() => <UserProjects userProfile={this.state.currentUser}/>} />
-                      <Route path={"/team/jobs"} render={() => <TeamJobs userProfile={this.state.currentUser} />}/>
-                      <Route path={"/team/projects"} render={() => <TeamProjects userProfile={this.state.currentUser} />}/>
-                      <Route path={"/company/jobs"} render={() => <CompanyJobs userProfile={this.state.currentUser} />}/>
-                      <Route path={"/company/internships"} render={() => <CompanyInternships userProfile={this.state.currentUser}/>} />
-                      <Route path={"/profile/edit"} />
-                      <Route path={"/job/edit"} />
-                      <Route path={"/internship/edit"}/>
-                      <Route path={"/project/edit"} />
+                      <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={"/user/jobs"} render={() => <UserJobs userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/user/internships"} render={() => <UserInternships userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/user/projects"} render={() => <UserProjects userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/team/jobs"} render={() => <TeamJobs userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/team/projects"} render={() => <TeamProjects userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/company/jobs"} render={() => <CompanyJobs userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/company/internships"} render={() => <CompanyInternships userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/register/user"} render={() => <RegisterUser error={null}/>}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
@@ -78 +76 @@
       });
 
-
-
-      registerUser = () =>{
-          UserRegister.userRegister()
-      }
-
       if(this.state.currentUser.email!=null){
           return <Redirect to={"/profile"}/>;