Changeset df3a395

Timestamp:

01/13/21 17:24:58 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

580ba1a

Parents:

7944fab

Message:

registration complete for all users

Files:

• client_app/src/components/main/App.js (modified) (5 diffs)
• client_app/src/components/register/register_company_form.js (added)
• client_app/src/components/register/register_team_form.js (added)
• client_app/src/components/register/register_user_form.js (modified) (5 diffs)
• client_app/src/repository/register_repo.js (modified) (2 diffs)
• src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java (modified) (1 diff)

client_app/src/components/main/App.js

@@ -14 +14 @@
 import TeamJobs from "../work/team_jobs";
 import CompanyInternships from "../work/company_internships";
-import UserRegister from "../../repository/register_repo";
 import RegisterUser from "../register/register_user_form";
+import RegisterCompany from "../register/register_company_form";
+import RegisterTeam from "../register/register_team_form";
 
 class App extends Component{
@@ -23 +24 @@
         logged: false,
         error: null,
+        success: null,
         currentUser: {
         }
@@ -33 +35 @@
                   <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={"/login"} render={() => <Login success={this.state.success} 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}/>}/>
@@ -42 +44 @@
                       <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} success={null}/>}/>
+                      <Route path={"/register/user"} render={() => <RegisterUser message={this.setSuccess} />}/>
+                      <Route path={"/register/company"} render={() => <RegisterCompany message={this.setSuccess} />}/>
+                      <Route path={"/register/team"} render={() => <RegisterTeam message={this.setSuccess}/>}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
@@ -58 +62 @@
   }
 
+  setSuccess = (message) => {
+      this.setState({
+          success: message
+      })
+  }
 
   attemptLogin = (email, password, type) => {

client_app/src/components/register/register_user_form.js

@@ -6 +6 @@
 import UserRegister from "../../repository/register_repo";
 import {Component} from "react/cjs/react.production.min";
+import Login from "../login/login";
 
 class RegisterUser extends Component {
@@ -18 +19 @@
             retainedSkills: [],
             skillsToLearn: [],
-            error: props.error,
-            success: props.success,
+            error: null,
+            success: null,
             sortedOptions:[]
         }
@@ -58 +59 @@
                     error: null
                 })
+
+                this.props.message(this.state.success);
             }else{
                 this.setState({
@@ -73 +76 @@
 
     render() {
-        console.log(this.state.success);
-
         if(this.state.success!=null){
             return(
-                <Redirect to={"/login"} success={this.state.success}/>
+                <Redirect to={"/login"}/>
             );
         }
@@ -106 +107 @@
 
     componentDidMount(){
+        this.props.message(null);
+
         SkillFetch.fetchAll().then((data) =>{
             var sorted = [];

client_app/src/repository/register_repo.js

@@ -12 +12 @@
         });
     },
-    teamRegister:(email, password, name, members) => {
+    teamRegister: (email, password, name, members) => {
         return axios.post("/register/team",{
             "email": email,
@@ -20 +20 @@
         });
     },
-    companyRegister:(email, password, name, country, city, street) => {
+    companyRegister: (email, password, name, country, city, street) => {
         return axios.post("/register/company",{
             "email": email,

src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java

@@ -106 +106 @@
         }
 
+        System.out.println(email);
+
         if(this.companyRepository.findByEmail(email).isPresent()){
             throw new UserExistsException();