Changeset be373a8 for client_app/src

Timestamp:

01/14/21 03:04:24 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

db94dbd

Parents:

580ba1a

Message:

edit complete

Location:

client_app/src/components

Files:

• account_edit/company_edit.js (modified) (4 diffs)
• account_edit/team_edit.js (added)
• account_edit/user_edit.js (modified) (1 diff)
• main/App.js (modified) (3 diffs)

client_app/src/components/account_edit/company_edit.js

@@ -11 +11 @@
         super(props);
         this.state = {
-            email: "",
-            password: "",
-            name:"",
-            members: "",
-            city: "",
-            street: "",
+            email: props.oldUser.email,
+            name: props.oldUser.name,
+            country: props.oldUser.address.country,
+            city: props.oldUser.address.city,
+            street: props.oldUser.address.street,
             error: null,
-            success: null
+            success: null,
+            id: props.oldUser.id,
+            oldEmail: props.oldUser.email,
+            type: props.oldUser.type
         }
         this.attemptCompanyEdit = this.attemptCompanyEdit.bind(this);
@@ -32 +34 @@
     attemptCompanyEdit = () => {
         AccountEdit.companyEdit(
+            this.state.id,
+            this.state.oldEmail,
             this.state.email,
-            this.state.password,
             this.state.name,
-            this.state.country
-            ,this.state.city,
+            this.state.country,
+            this.state.city,
             this.state.street
         ).then(res =>{
-            if(res.data.success!=null){
-                this.setState({
-                    success: res.data.success,
-                    error: null
-                })
-                this.props.message(this.state.success);
-            }else{
-                this.setState({
-                    error: res.data.error,
-                    success: null
-                })
-            }
+            this.setState({
+                success: true,
+                error: null
+            })
+            this.props.updateUser(res.data);
         }).catch(err => {
             this.setState({
@@ -66 +62 @@
         if(this.state.success!=null){
             return(
-                <Redirect to={"/login"}/>
+                <Redirect to={"/profile"}/>
+            );
+        }
+
+        if(this.state.type!=="COMPANY"){
+            return(
+                <Redirect to={"/profile"}/>
             );
         }
@@ -73 +75 @@
             <Container>
                 <h1 style={{color: "red"}}>{this.state.error}</h1>
-                <Form onSubmit={this.attemptCompanyRegister}>
+                <Form onSubmit={this.attemptCompanyEdit}>
                     <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}/>
+                                placeholder='Enter e-mail.' value={this.state.email} onChange={this.handleCheck}/>
                     <Form.Input id="name" name="name" type='text' required fluid label='Name'
-                                placeholder='Enter company name.' onChange={this.handleCheck}/>
+                                placeholder='Enter company name.' value={this.state.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 country.' value={this.state.country} onChange={this.handleCheck}/>
+                    <Form.Input id="city" name="city" type='text' value={this.state.city} 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}/>
+                                placeholder='Enter address street.' value={this.state.street} onChange={this.handleCheck}/>
                     <Form.Field control={Button}>Register</Form.Field>
                 </Form>

client_app/src/components/account_edit/user_edit.js

@@ -79 +79 @@
                 error: null
             })
+
             this.props.updateUser(res.data);
         }).catch(err => {
             this.setState({
                 success: null,
-                error: "Error editing user.",
+                error: "User already exists.",
             })
         });

client_app/src/components/main/App.js

@@ -20 +20 @@
 import EditUser from "../account_edit/user_edit";
 import EditCompany from "../account_edit/company_edit";
+import EditTeam from "../account_edit/team_edit";
 
 class App extends Component{
@@ -53 +54 @@
                       <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={"/team/edit"} render={() => <EditTeam oldUser={this.state.currentUser} updateUser={this.updateUser} message={this.setSuccess}/>}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
@@ -76 +78 @@
   setSuccess = (message) => {
       this.setState({
-          success: message
+          success: message,
+          error: null
       })
   }