Changeset 580ba1a

Timestamp:

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

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

be373a8

Parents:

df3a395

Message:

register and edit

Location:

client_app/src

Files:

• components/account_edit/company_edit.js (added)
• components/account_edit/user_edit.js (added)
• components/filter/search.js (added)
• components/main/App.js (modified) (5 diffs)
• components/profiles/company_profile.js (modified) (1 diff)
• components/profiles/team_profile.js (modified) (1 diff)
• components/register/register_company_form.js (modified) (4 diffs)
• repository/edit_account_repo.js (added)
• repository/search_repo.js (added)

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({

client_app/src/components/profiles/company_profile.js

@@ -10 +10 @@
             <h2>E-mail: {props.data.email}</h2>
             <h3>Address: {props.data.address.country} {props.data.address.city} {props.data.address.street}</h3>
-            <Button primary as={Link} to={"/profile/edit"}>Edit</Button>
+            <Button primary as={Link} to={"/company/edit"}>Edit</Button>
         </Container>
     );

client_app/src/components/profiles/team_profile.js

@@ -10 +10 @@
             <h2>E-mail: {props.data.email}</h2>
             <h3>Members: {props.data.members}</h3>
-            <Button primary as={Link} to={"/profile/edit"}>Edit</Button>
+            <Button primary as={Link} to={"/team/edit"}>Edit</Button>
         </Container>
     );

client_app/src/components/register/register_company_form.js

@@ -13 +13 @@
             password: "",
             name:"",
-            members: "",
+            country: "",
             city: "",
             street: "",
@@ -34 +34 @@
             this.state.password,
             this.state.name,
-            this.state.country
-            ,this.state.city,
+            this.state.country,
+            this.state.city,
             this.state.street
         ).then(res =>{
@@ -52 +52 @@
         }).catch(err => {
             this.setState({
-                error: "Company already exists!",
+                error: "User already exists!",
                 success: null
             })
@@ -58 +58 @@
     }
 
-    componentDidMount(){
-        this.props.message(null);
-    }
-
     render() {
-        if(this.state.success!=null){
-            return(
+        if (this.state.success != null) {
+            return (
                 <Redirect to={"/login"}/>
             );
         }
 
-            return (
-                <Container>
-                    <h1 style={{color: "red"}}>{this.state.error}</h1>
-                    <Form onSubmit={this.attemptCompanyRegister}>
-                        <Form.Input id="email" name="email" type='email' required fluid label='E-mail'
-                                    placeholder='Enter e-mail.' onChange={this.handleCheck}/>
-                        <Form.Input id="password" name="password" type='password' required fluid label='Password'
-                                    placeholder='Enter password.' onChange={this.handleCheck}/>
-                        <Form.Input id="name" name="name" type='text' required fluid label='Name'
-                                    placeholder='Enter company name.' onChange={this.handleCheck}/>
-                        <Form.Input id="country" name="country" type='text' required fluid label='Country'
-                                    placeholder='Enter your country.' onChange={this.handleCheck}/>
-                        <Form.Input id="city" name="city" type='text' required fluid label='City'
-                                    placeholder='Enter your city.' onChange={this.handleCheck}/>
-                        <Form.Input id="street" name="street" type='text' required fluid label='Street'
-                                    placeholder='Enter address street.' onChange={this.handleCheck}/>
-                        <Form.Field control={Button}>Register</Form.Field>
-                    </Form>
-                </Container>
-            );
+        return (
+            <Container>
+                <h1 style={{color: "red"}}>{this.state.error}</h1>
+                <Form onSubmit={this.attemptCompanyRegister}>
+                    <Form.Input id="email" name="email" type='email' required fluid label='E-mail'
+                                placeholder='Enter e-mail.' onChange={this.handleCheck}/>
+                    <Form.Input id="password" name="password" type='password' required fluid label='Password'
+                                placeholder='Enter password.' onChange={this.handleCheck}/>
+                    <Form.Input id="name" name="name" type='text' required fluid label='Name'
+                                placeholder='Enter company name.' onChange={this.handleCheck}/>
+                    <Form.Input id="country" name="country" type='text' required fluid label='Country'
+                                placeholder='Enter your country.' onChange={this.handleCheck}/>
+                    <Form.Input id="city" name="city" type='text' required fluid label='City'
+                                placeholder='Enter your city.' onChange={this.handleCheck}/>
+                    <Form.Input id="street" name="street" type='text' required fluid label='Street'
+                                placeholder='Enter address street.' onChange={this.handleCheck}/>
+                    <Form.Field control={Button}>Register</Form.Field>
+                </Form>
+            </Container>
+        );
     }
 }