Changeset 2e507a8 for client_app/src/components/data

Timestamp:

01/12/21 21:10:56 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

47067ae

Parents:

a70db1a

Message:

front end additions

Location:

client_app/src/components/data

Files:

• components/company_jobs.js (added)
• components/item_components/internship_component.js (added)
• components/item_components/job_component.js (added)
• components/item_components/project_component.js (added)
• components/profiles/company_profile.js (added)
• components/profiles/team_profile.js (added)
• components/profiles/user_profile.js (added)
• components/user_internships.js (added)
• components/user_jobs.js (modified) (2 diffs)
• components/user_profile.js (deleted)
• components/user_projects.js (added)
• profile.js (modified) (2 diffs)

client_app/src/components/data/components/user_jobs.js

@@ -1 +1 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { Container, Card } from 'semantic-ui-react'
+import { Container, Card } from 'semantic-ui-react';
+import Jobs from '../components/item_components/job_component';
 
 
@@ -7 +8 @@
     var itemsArray = [];
 
-    if(props.userProfile.email!=null){
-        props.userProfile.jobs.forEach(item => {
-            let obj = {}
-            obj.header = item.title;
-            obj.description = item.description + "\n" + "Contact: " + item.accountEmail;
-            if(item.accountType=="TEAM"){
-                obj.meta = "Team: " + item.accountName + " / Salary: " + item.salary
-            }else{
-                obj.meta = "Company: " + item.accountName + " / Salary: " + item.salary
-            }
-
-            itemsArray.push(obj);
-        });
-
-        return(
-            <Container textAlign="left">
-                <h1>Jobs for you!</h1>
-                <Card.Group items={itemsArray} />
-            </Container>
-        );
+    if(props.userProfile.type==="USER"){
+        if(props.userProfile.email!=null){
+            return(
+                <Container textAlign="left">
+                    <h1>Jobs for you!</h1>
+                    {props.userProfile.jobs.map(item =>{
+                        return <Jobs
+                            title={item.title}
+                            description={item.description}
+                            accountName={item.accountName}
+                            accountEmail={item.accountEmail}
+                            skills={item.skillsRequired}
+                            type={props.userProfile.type}
+                        />
+                    })}
+                </Container>
+            );
+        }
     }
 

client_app/src/components/data/profile.js

@@ -1 +1 @@
 import React from 'react';
-import UserDetails from "./components/user_profile";
+import UserDetails from "./components/profiles/user_profile";
 import { Redirect } from "react-router-dom";
+import CompanyProfile from "./components/profiles/company_profile";
+import TeamProfile from "./components/profiles/team_profile";
 
 const Profile = (props) => {
@@ -17 +19 @@
     }
 
+    if(props.userProfile.type==="COMPANY"){
+        return (
+            <CompanyProfile data={{
+                email: props.userProfile.email,
+                name: props.userProfile.name,
+                address: props.userProfile.address
+            }}/>
+        );
+    }
+
+    if(props.userProfile.type==="TEAM"){
+        return (
+            <TeamProfile data={{
+                email: props.userProfile.email,
+                name: props.userProfile.name,
+                members: props.userProfile.members
+            }}/>
+        );
+    }
+
     return(
         <Redirect to={"/login"}/>