Changeset db94dbd

Timestamp:

01/14/21 22:54:45 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

5b36317

Parents:

be373a8

Message:

work register

Location:

client_app

Files:

• package-lock.json (modified) (5 diffs)
• package.json (modified) (1 diff)
• src/components/main/App.js (modified) (3 diffs)
• src/components/work/company_internships.js (modified) (1 diff)
• src/components/work/company_jobs.js (modified) (1 diff)
• src/components/work/team_jobs.js (modified) (1 diff)
• src/components/work/team_projects.js (modified) (1 diff)
• src/components/work_register/internship_register.js (added)
• src/components/work_register/job_register.js (added)
• src/components/work_register/project_register.js (added)
• src/repository/job_register_repo.js (deleted)
• src/repository/work_register_repo.js (added)

client_app/package-lock.json

@@ -1137 +1137 @@
       "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
     },
+    "@date-fns/upgrade": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@date-fns/upgrade/-/upgrade-1.0.3.tgz",
+      "integrity": "sha512-0BLzKmXwWw3Zh3cZzW4xScmwGijXCAulaFdikqNiSnK8PAgYYSWWxOP/kuJFpKaoIT5KzstVGyHsjA7t/QXi1Q==",
+      "requires": {
+        "date-fns": "^2.1"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.2.2",
@@ -3997 +4005 @@
       }
     },
+    "classnames": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+    },
     "clean-css": {
       "version": "4.2.3",
@@ -4766 +4779 @@
         "whatwg-mimetype": "^2.3.0",
         "whatwg-url": "^8.0.0"
+      }
+    },
+    "date-fns": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
+      "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ=="
+    },
+    "dayzed": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/dayzed/-/dayzed-3.2.1.tgz",
+      "integrity": "sha512-3jnjfUOGxGA31iYAR2QfiDzWVfl3ccejm7/ya5P1gYpOtc9b4PEcl0xUAf7f74czEteAC/oPQCspNv/LAJlIYw==",
+      "requires": {
+        "@babel/runtime": "^7.6.2",
+        "date-fns": "^2.0.0"
       }
     },
@@ -6658 +6685 @@
         "mime-types": "^2.1.12"
       }
+    },
+    "format-string-by-pattern": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/format-string-by-pattern/-/format-string-by-pattern-1.2.1.tgz",
+      "integrity": "sha512-x7JY+q8XvBmHCf4ZSQiiG+8fmC02oiei1JoAsUcdHcy8Kn6LwaE1KUlQ8ph3fNnIcWY65B3aVuKArdbAEQxpLg=="
     },
     "forwarded": {
@@ -12502 +12534 @@
       }
     },
+    "react-semantic-ui-datepickers": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/react-semantic-ui-datepickers/-/react-semantic-ui-datepickers-2.12.0.tgz",
+      "integrity": "sha512-IlwyruitM42x/EIcb7aZOaJZxl7aWr/ckib+0Xut4cCURQwYz+LiWxWZhVmHmCgT2lZS6QCXDbyfAxvRnXEqww==",
+      "requires": {
+        "@babel/runtime": "7.12.1",
+        "@date-fns/upgrade": "1.0.3",
+        "classnames": "2.2.6",
+        "core-js": "3.6.5",
+        "date-fns": "2.16.1",
+        "dayzed": "3.2.1",
+        "format-string-by-pattern": "1.2.1",
+        "react-fast-compare": "3.2.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
+          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "core-js": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+        }
+      }
+    },
     "read-pkg": {
       "version": "2.0.0",

client_app/package.json

@@ -12 +12 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.1",
+    "react-semantic-ui-datepickers": "^2.12.0",
     "semantic-ui-css": "^2.4.1",
     "semantic-ui-react": "^2.0.1",

client_app/src/components/main/App.js

@@ -21 +21 @@
 import EditCompany from "../account_edit/company_edit";
 import EditTeam from "../account_edit/team_edit";
+import JobRegister from "../work_register/job_register";
+import InternshipRegister from "../work_register/internship_register";
+import ProjectRegister from "../work_register/project_register";
 
 class App extends Component{
@@ -55 +58 @@
                       <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={"/register/job"} render={() => <JobRegister accountId={this.state.currentUser.id} type={this.state.currentUser.type} updateJobs={this.updateJobs} />}/>
+                      <Route path={"/register/internship"} render={() => <InternshipRegister accountId={this.state.currentUser.id} type={this.state.currentUser.type} updateInternships={this.updateInternships} />}/>
+                      <Route path={"/register/project"} render={() => <ProjectRegister accountId={this.state.currentUser.id} type={this.state.currentUser.type} updateInternships={this.updateProjects} />}/>
                       <Route path={"/logout"} render={() => <Redirect to={"/login"}/>}/>
                       <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
@@ -83 +89 @@
   }
 
+  updateJobs = (job) => {
+      this.setState(prevState => ({
+         currentUser:{
+             ...prevState.currentUser,
+             jobs: [...prevState.currentUser.jobs, job]
+         }
+      }))
+  }
+
+    updateInternships = (internship) => {
+        this.setState(prevState => ({
+            currentUser:{
+                ...prevState.currentUser,
+                internships: [...prevState.currentUser.internships, internship]
+            }
+        }))
+    }
+
+    updateProjects = (project) => {
+        this.setState(prevState => ({
+            currentUser:{
+                ...prevState.currentUser,
+                projects: [...prevState.currentUser.projects, project]
+            }
+        }))
+    }
+
   attemptLogin = (email, password, type) => {
       UserLogin.login(email, password, type).then((res) =>{

client_app/src/components/work/company_internships.js

@@ -10 +10 @@
             return(
                 <Container textAlign="left">
-                    <Button as={Link} to={"/internships/add"} primary>Add</Button>
-                    <h1>Registered Jobs:</h1>
+                    <Button as={Link} to={"/register/internship"} primary>Add</Button>
+                    <h1>Registered Internships:</h1>
                     {props.userProfile.internships.map(item =>{
                         return <Internships

client_app/src/components/work/company_jobs.js

@@ -10 +10 @@
             return(
                 <Container textAlign="left">
-                    <Button as={Link} to={"/job/add"} primary>Add</Button>
+                    <Button as={Link} to={"/register/job"} primary>Add</Button>
                     <h1>Registered Jobs:</h1>
                     {props.userProfile.jobs.map(item =>{

client_app/src/components/work/team_jobs.js

@@ -10 +10 @@
             return(
                 <Container textAlign="left">
-                    <Button as={Link} to={"/job/add"} primary>Add</Button>
+                    <Button as={Link} to={"/register/job"} primary>Add</Button>
                     <h1>Registered Jobs:</h1>
                     {props.userProfile.jobs.map(item =>{

client_app/src/components/work/team_projects.js

@@ -10 +10 @@
             return(
                 <Container textAlign="left">
-                    <Button as={Link} to={"/project/add"} primary>Add</Button>
-                    <h1>Registered Jobs:</h1>
+                    <Button as={Link} to={"/register/project"} primary>Add</Button>
+                    <h1>Registered Projects:</h1>
                     {props.userProfile.projects.map(item =>{
                         return <Projects