Changeset 7944fab for client_app

Timestamp:

01/13/21 03:56:56 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

df3a395

Parents:

19ad843

Message:

finished user registration

Location:

client_app/src

Files:

• components/login/login.js (modified) (1 diff)
• components/main/App.js (modified) (1 diff)
• components/register/register_user_form.js (modified) (5 diffs)
• repository/register_repo.js (modified) (2 diffs)

client_app/src/components/login/login.js

@@ -29 +29 @@
         return(
             <Container>
+                <h1 style={{color: "green"}}>{props.success}</h1>
                 <h1 style={{color: "red"}}>{props.error}</h1>
                 <Form onSubmit={onFormSubmit}>

client_app/src/components/main/App.js

@@ -42 +42 @@
                       <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={"/register/user"} render={() => <RegisterUser error={null} success={null}/>}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>

client_app/src/components/register/register_user_form.js

@@ -1 +1 @@
 import React from 'react';
 import 'semantic-ui-react';
-import {Button, Container, Form} from "semantic-ui-react";
+import {Button, Container, Dropdown, Form, Label} from "semantic-ui-react";
 import { Redirect } from 'react-router-dom';
 import SkillFetch from "../../repository/skill_repo";
@@ -18 +18 @@
             retainedSkills: [],
             skillsToLearn: [],
-            allSkills: [],
-            error: props.error
+            error: props.error,
+            success: props.success,
+            sortedOptions:[]
         }
+        this.attemptRegister = this.attemptRegister.bind(this);
     }
 
@@ -30 +32 @@
     }
 
+    setKnown = (e, {value}) =>{
+        this.setState({
+            retainedSkills: value
+        })
+    }
+
+    setToKnow = (e, {value}) =>{
+        this.setState({
+            skillsToLearn: value
+        })
+    }
+
+    attemptRegister(){
+        UserRegister.userRegister(
+            this.state.email,
+            this.state.password,
+            this.state.name,
+            this.state.surname,
+            this.state.retainedSkills,
+            this.state.skillsToLearn
+        ).then(res => {
+            if(res.data.success!=null){
+                this.setState({
+                    success: res.data.success,
+                    error: null
+                })
+            }else{
+                this.setState({
+                    error: res.data.error,
+                    success: null
+                })
+            }
+        }).catch(err => {
+            this.setState({
+                error: "User already exists!",
+                success: null
+            })
+        });
+    }
+
     render() {
+        console.log(this.state.success);
+
+        if(this.state.success!=null){
+            return(
+                <Redirect to={"/login"} success={this.state.success}/>
+            );
+        }
+
         return (
             <Container>
@@ -43 +93 @@
                     <Form.Input id="surname" name="surname" type='text' required fluid label='Surname'
                                 placeholder='Enter surname.' onChange={this.handleCheck}/>
-                                <label>Skills you know:</label>
-                    <select multiple="" class="ui dropdown">
-                        {this.state.allSkills.map(item => {
-                            return <option value={item.id}>{item.name}</option>
-                        })}
-                    </select>
+                                <Label>Select skills you know:</Label>
+                    <Dropdown placeholder="Skills you know..." fluid multiple selection options={this.state.sortedOptions} onChange={this.setKnown}/>
+                    <br/>
+                    <Label>Select skills you want to know:</Label>
+                    <Dropdown placeholder="Skills you want to learn..." fluid multiple selection options={this.state.sortedOptions} onChange={this.setToKnow}/>
+                    <br/>
                     <Button type="submit">Register</Button>
                 </Form>
@@ -57 +107 @@
     componentDidMount(){
         SkillFetch.fetchAll().then((data) =>{
+            var sorted = [];
+            data.data.forEach(item => {
+               var obj = {
+                   key: item.id,
+                   text: item.name,
+                   value: item.id
+               }
+               sorted.push(obj);
+            });
+
             this.setState({
-                allSkills: data.data
+                sortedOptions: sorted
             })
-        })
-    }
-
-    attemptRegister(){
-        UserRegister.userRegister(
-            this.state.email,
-            this.state.password,
-            this.state.name,
-            this.state.surname,
-            this.state.retainedSkills,
-            this.state.skillsToLearn
-        ).then(data => {
-            if(data.success){
-                return <Redirect to={"/login"}/>
-            }else{
-                return <Redirect to={"/user/register"}  error={data.error}/>
-            }
         })
     }

client_app/src/repository/register_repo.js

@@ -2 +2 @@
 
 const UserRegister = {
-    userRegister: (email, password, name, surname, skillsRetained, skillsToLearn) => {
+    userRegister: (email, password, name, surname, retainedSkills, skillsToLearn) => {
         return axios.post("/register/user", {
             "email": email,
@@ -8 +8 @@
             "name": name,
             "surname": surname,
-            "skillsRetained": skillsRetained,
+            "retainedSkills": retainedSkills,
             "skillsToLearn": skillsToLearn
         });