Changeset 19398ad for jobvista-frontend/src/views

Timestamp:

05/16/24 23:09:21 (6 months ago)

Author:

223021 <daniel.ilievski.2@…>

Branches:

main

Children:

28b3398

Parents:

d8b6c91

Message:

Implemented backend and frontend CRUD operations for job advertisements

Location:

jobvista-frontend/src/views

Files:

• auth/SignInForm.js (modified) (2 diffs)
• auth/SignUpJobSeekerForm.js (modified) (1 diff)
• auth/SignUpRecruiterForm.js (modified) (1 diff)
• auth/auth.css (modified) (1 diff)
• dashboard/Dashboard.css (added)
• dashboard/Dashboard.js (modified) (1 diff)
• job_advertisements/AddJobAdModal.js (added)
• job_advertisements/DeleteJobAdModal.js (added)
• job_advertisements/EditJobAdModal.js (added)
• job_advertisements/Form.css (added)
• job_advertisements/JobAdDetails.css (added)
• job_advertisements/JobAdDetails.js (added)
• job_advertisements/JobAdvertisements.css (added)
• job_advertisements/JobAdvertisements.js (added)
• selectOptions.js (added)
• static/Header.js (modified) (5 diffs)

jobvista-frontend/src/views/auth/SignInForm.js

@@ -70 +70 @@
                             <div className="d-grid mb-3">
                                 <button
-                                    className="btn btn-lg btn-primary text-uppercase fw-bold mb-2"
+                                    className="btn btn-lg auth-primary-btn text-uppercase fw-bold mb-2"
                                     type="submit">Sign in
                                 </button>
@@ -85 +85 @@
                         <div className="row">
                             <div className="col-md-6">
-                                <Link to="/signup/recruiter" className="btn btn-outline-primary text-uppercase fw-bold mb-2 w-100">SIGN UP AS RECRUITER</Link>
+                                <Link to="/signup/recruiter" className="btn auth-secondary-btn text-uppercase fw-bold mb-2 w-100">SIGN UP AS RECRUITER</Link>
                             </div>
                             <div className="col-md-6">
-                                <Link to="/signup/job-seeker" className="btn btn-outline-primary text-uppercase fw-bold mb-2 w-100">SIGN UP AS JOB SEEKER</Link>
+                                <Link to="/signup/job-seeker" className="btn auth-secondary-btn text-uppercase fw-bold mb-2 w-100">SIGN UP AS JOB SEEKER</Link>
                             </div>
                         </div>

jobvista-frontend/src/views/auth/SignUpJobSeekerForm.js

@@ -83 +83 @@
                             <div className="d-grid mb-3">
                                 <button
-                                    className="btn btn-lg btn-primary text-uppercase fw-bold mb-2"
+                                    className="btn btn-lg auth-primary-btn text-uppercase fw-bold mb-2"
                                     type="submit">Submit
                                 </button>

jobvista-frontend/src/views/auth/SignUpRecruiterForm.js

@@ -80 +80 @@
                             <div className="d-grid mb-3">
                                 <button
-                                    className="btn btn-lg btn-primary text-uppercase fw-bold mb-2"
+                                    className="btn btn-lg auth-primary-btn text-uppercase fw-bold mb-2"
                                     type="submit">Submit
                                 </button>

jobvista-frontend/src/views/auth/auth.css

@@ -3 +3 @@
     padding: 5px 5px;
 }
+
+.form-container {
+    margin-bottom: 80px;
+}
+
+.auth-primary-btn{
+    background-color: rgba(1,38,90,0.80);
+    //background-color: #a1c4fd ;
+    color: white;
+}
+.auth-primary-btn:hover {
+    background-color: rgba(1,38,90,1);
+    color: white;
+}
+
+.auth-secondary-btn {
+    border: 2px solid rgba(1,38,90,0.7);
+    color: midnightblue;
+}
+
+.auth-secondary-btn:hover {
+    background-color: rgba(1,38,90,0.8);
+    color: white;
+}

jobvista-frontend/src/views/dashboard/Dashboard.js

@@ +1 @@
+import "./Dashboard.css"
+
+import {useDispatch, useSelector} from "react-redux";
+import {useEffect, useState} from "react";
+import {JobAdvertisementActions} from "../../redux/actions/jobAdvertisementActions";
+import {formatRelativeTime, sortElementsByDateCreated} from "../../utils/utils";
+import {dataRangeOptions, industryOptions, industryOptionsFilter, sortOptions} from "../selectOptions";
+import Select from "react-select";
+import Roles from "../../enumerations/Roles";
+import {Link} from "react-router-dom";
+import JobType from "../../enumerations/JobType";
+
 export const Dashboard = () => {
+
+    const dispatch = useDispatch();
+
+    const [jobAdvertisements, setJobAdvertisements] = useState([]);
+    let jobAdvertisementsState = useSelector(state => state.jobAd.jobAdvertisements)
+    const auth = useSelector(state => state.auth.currentUser);
+
+    const [role, setRole] = useState("");
+    const [sortOrder, setSortOrder] = useState("newest");
+    const [selectedDateRange, setSelectedDateRange] = useState("all");
+    const [searchTerm, setSearchTerm] = useState("");
+    const [dispatched, setDispatched] = useState(false)
+
+    useEffect(() => {
+        if (auth) {
+            setRole(auth.role);
+        }
+    }, [auth]);
+
+    useEffect(() => {
+        if(!dispatched && jobAdvertisementsState.length == 0) {
+            dispatch(JobAdvertisementActions.fetchJobAdvertisements((success, response) => {
+                if (success && response.data.length > 0) {
+                    setJobAdvertisements(sortElementsByDateCreated(response.data))
+                }
+                setDispatched(true)
+                console.log("Fetch all job advertisements GET")
+                console.log(response.data)
+            }))
+
+        } else {
+            setJobAdvertisements(jobAdvertisementsState)
+            console.log("Fetch all job advertisements STATE")
+        }
+    }, [])
 
 
     return (
         <div className="container">
-            <div className="row justify-content">
-                <div className="col-md-4">
-                    <div className="card">
-                        <h5 className="card-title">Job Listing Name</h5>
-                        <p>Job Listing Data</p>
+            <div className="head-dashboard-box">
+                <div className="row">
+                    <div className="col-md-3">
+                        <div className="search-container head-component">
+                            <i className="fa-solid fa-magnifying-glass blue-colored"></i>
+                            <input
+                                className="search-input"
+                                type="text"
+                                placeholder="Search job advertisement by title..."
+                                //value={searchTerm}
+                                //onChange={event => setSearchTerm(event.target.value)}
+                            />
+                        </div>
                     </div>
-                </div>
-                <div className="col-md-4">
-                    <div className="card">
-                        <h5 className="card-title">Job Listing Name</h5>
-                        <p>Job Listing Data</p>
-                    </div>
-                </div>
-                <div className="col-md-4">
-                    <div className="card">
-                        <h5 className="card-title">Job Listing Name</h5>
-                        <p>Job Listing Data</p>
+                    <div className="col-md-9">
+                        <div className="sort-section item">
+                            <Select
+                                defaultValue={{value: "all", label: "All industries"}}
+                                //value={sortOrder.value}
+                                //onChange ={option => setSortOrder(option.value)}
+                                options={industryOptionsFilter}
+                                className="sort-range sort"
+                            />
+                        </div>
+                        <div className="sort-section item">
+                            <Select
+                                defaultValue={{value: "newest", label: "Date (Newest First)"}}
+                                //value={sortOrder.value}
+                                //onChange ={option => setSortOrder(option.value)}
+                                options = {sortOptions}
+                                className="sort-range sort"
+                            />
+                        </div>
+                        <div className="date-range-section item">
+                            <Select
+                                defaultValue={{value: "all", label: "Lifetime"}}
+                                //value={selectedDateRange.value}
+                                //onChange={option => setSelectedDateRange(option.value)}
+                                options={dataRangeOptions}
+                                className="date-range sort"
+                            />
+                        </div>
                     </div>
                 </div>
             </div>
+            <div className="row row-cols-1 row-cols-md-4 g-4">
 
+                {jobAdvertisements &&
+                    jobAdvertisements.map((jobAd, index) => (
+                        <div key={index} className="col">
+                            <div className="custom-card">
+                                <div className="card-head">
+                                    <span className="hourly-salary"><b>${jobAd.startingSalary}/hr</b></span>
+                                    <span className="job-type"> {jobAd.jobType===JobType.JOB ? "Job" : "Internship"}</span>
+                                    {!jobAd.active && <span className="expired">Expired</span>}
+                                </div>
+                                <div className="card-body">
+                                    <h5 className="card-title">{jobAd.title}</h5>
+                                    <span>{jobAd.industry} • <span style={{color: "black", fontWeight: "bold"}}>{formatRelativeTime(jobAd.postedOn)}</span></span>
+                                    <div className="card-info">
+                                        <span><i className="fa-solid fa-building" style={{color: "#000000"}}></i> Company: <span style={{color: "black", fontWeight: "bold"}}>{jobAd.recruiterName}</span></span> <br/>
+                                    </div>
+
+                                    <div className="aligned">
+                                        <Link to={`/job-advertisements/view/${jobAd.id}`} className="card-button">Read more</Link>
+                                        {role===Roles.JOBSEEKER &&
+                                            <>
+                                                {jobAd.active && <button className="card-button">Apply now</button> }
+                                                {!jobAd.active && <button className="card-button disabled">Apply now</button> }
+                                            </>
+                                        }
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    ))}
+
+            </div>
         </div>
     )

jobvista-frontend/src/views/static/Header.js

@@ -5 +5 @@
 import {AuthActions} from "../../redux/actions/authActions";
 import Roles from "../../enumerations/Roles";
+import {useNavigate} from "react-router";
 
-export const Header = () => {
+export const Header = (props) => {
 
     const auth = useSelector(state => state.auth.currentUser);
     const dispatch = useDispatch();
+    const navigator = useNavigate();
 
-    const [role, setRole] = useState(null);
-    const [username, setUsername] = useState(null);
+    const [role, setRole] = useState("");
+    const [username, setUsername] = useState("");
 
     const signOut = () => {
@@ -20 +22 @@
 
     useEffect(() => {
-
         if (auth) {
             setRole(auth.role);
@@ -34 +35 @@
                 <div className="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul className="navbar-nav me-auto mb-2 mb-lg-0">
-                        <NavLink to="/" className="nav-item nav-link" activeClassName="active">Home</NavLink>
+                        <NavLink to="/" className="nav-item nav-link">Home</NavLink>
                         {role==Roles.JOBSEEKER &&
                             <>
-                                <NavLink to="/applications" className="nav-item nav-link" activeClassName="active">Applications</NavLink>
-                                <NavLink to="/favoritejobs" className="nav-item nav-link" activeClassName="active">Saved</NavLink>
+                                <NavLink to="/applications" className="nav-item nav-link" >Applications</NavLink>
+                                <NavLink to="/favoritejobs" className="nav-item nav-link" >Saved</NavLink>
                             </>
 
@@ -44 +45 @@
                         {role==Roles.RECRUITER &&
                             <>
-                                <NavLink to="/jobadvertisements" className="nav-item nav-link" activeClassName="active">Job Advertisements</NavLink>
-                                <NavLink to="/favoritejobs" className="nav-item nav-link" activeClassName="active">Saved</NavLink>
+                                <NavLink to="/my-job-advertisements" className="nav-item nav-link" >Job Advertisements</NavLink>
+                                <NavLink to="/favoritejobs" className="nav-item nav-link" >Saved</NavLink>
                             </>
                         }
@@ -61 +62 @@
 
 
-                            <Link onClick={signOut} className="btn btn-outline-secondary">Log out</Link>
+                            <Link onClick={signOut} className="btn auth-secondary-btn">Log out</Link>
                         </> :
                         <>
-                            <Link to="/signin" className="btn btn-outline-secondary">Sign in</Link>
+                            <Link to="/signin" className="btn auth-secondary-btn">Sign in</Link>
                         </>
                     }