Skip to content

Commit 4859ed0

Browse files
sidiDevsidiDev
committed
fix buggs
1 parent 97e67af commit 4859ed0

File tree

13 files changed

+136
-50
lines changed

13 files changed

+136
-50
lines changed

‎components/JobCard/JobCard.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,53 @@ export default ({ jobs }) => {
1616
<img src={items.company.avatar} className="w-full h-full rounded-full" />
1717
</div>
1818
</div>
19-
<div className="flex-1 items-center justify-between lg:flex">
20-
<div className="lg:w-8/12">
19+
<div className="flex-1 items-center justify-between xl:flex">
20+
<div className="">
2121
<div>
2222
<span className="text-xl font-semibold">{items.company.companyName}</span>
2323
</div>
2424
<div>
25-
<p className="text-gray-600 text-lg font-medium mt-1 break-words">
25+
<p className="text-gray-600 font-medium mt-1">
2626
{items.jobTitle}
2727
</p>
2828
</div>
29-
<div className="items-center space-y-1 mt-1 text-gray-500 text-sm sm:text-base sm:flex sm:space-x-2">
29+
<div className="items-center space-y-2 mt-2 text-gray-500 sm:flex sm:space-x-2 sm:space-y-0 md:block md:space-y-2 md:space-x-0 lg:flex lg:space-x-2 lg:space-y-0">
3030
<span className="flex items-center">
31-
<svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 mr-1" viewBox="0 0 20 20" fill="currentColor">
31+
<svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 mr-1 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
3232
<path fill-rule="evenodd" d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z" clip-rule="evenodd" />
3333
</svg>
3434
{items.location}
3535
</span>
36-
<span className="text-4xl hidden sm:inline-block">&#8729;</span>
36+
<span className="text-4xl hidden sm:inline-block md:hidden lg:inline-block">&#8729;</span>
3737
<span className="flex items-center">
38-
<svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 mr-1" viewBox="0 0 20 20" fill="currentColor">
38+
<svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 mr-1 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
3939
<path fill-rule="evenodd" d="M6 6V5a3 3 0 013-3h2a3 3 0 013 3v1h2a2 2 0 012 2v3.57A22.952 22.952 0 0110 13a22.95 22.95 0 01-8-1.43V8a2 2 0 012-2h2zm2-1a1 1 0 011-1h2a1 1 0 011 1v1H8V5zm1 5a1 1 0 011-1h.01a1 1 0 110 2H10a1 1 0 01-1-1z" clip-rule="evenodd" />
4040
<path d="M2 13.692V16a2 2 0 002 2h12a2 2 0 002-2v-2.308A24.974 24.974 0 0110 15c-2.796 0-5.487-.46-8-1.308z" />
4141
</svg>
4242
{items.jobType}
4343
</span>
4444
</div>
4545
</div>
46-
<div className="items-center text-gray-500 space-y-1 sm:space-y-0 sm:flex sm:space-x-2 lg:text-base lg:space-y-1 lg:block lg:space-x-0">
46+
<div className="mt-2 space-y-2 items-center text-gray-500 sm:space-y-0 sm:flex sm:space-x-2 md:block md:space-x-0 md:space-y-2 lg:space-x-4 lg:flex lg:space-y-0 xl:block xl:space-x-0 xl:space-y-2">
4747
{
4848
items.salary ? (
49-
<span className="font-semibold text-gray-900">${items.salary}<span className="text-sm font-normal"> / year</span></span>
49+
<div className="flex items-center">
50+
<svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 mr-1 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
51+
<path d="M8.433 7.418c.155-.103.346-.196.567-.267v1.698a2.305 2.305 0 01-.567-.267C8.07 8.34 8 8.114 8 8c0-.114.07-.34.433-.582zM11 12.849v-1.698c.22.071.412.164.567.267.364.243.433.468.433.582 0 .114-.07.34-.433.582a2.305 2.305 0 01-.567.267z" />
52+
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-13a1 1 0 10-2 0v.092a4.535 4.535 0 00-1.676.662C6.602 6.234 6 7.009 6 8c0 .99.602 1.765 1.324 2.246.48.32 1.054.545 1.676.662v1.941c-.391-.127-.68-.317-.843-.504a1 1 0 10-1.51 1.31c.562.649 1.413 1.076 2.353 1.253V15a1 1 0 102 0v-.092a4.535 4.535 0 001.676-.662C13.398 13.766 14 12.991 14 12c0-.99-.602-1.765-1.324-2.246A4.535 4.535 0 0011 9.092V7.151c.391.127.68.317.843.504a1 1 0 101.511-1.31c-.563-.649-1.413-1.076-2.354-1.253V5z" clipRule="evenodd" />
53+
</svg>
54+
<span>
55+
${items.salary}K USD
56+
</span>
57+
</div>
5058
) : ''
5159
}
52-
<span className="flex items-center">
53-
<svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 mr-1" viewBox="0 0 20 20" fill="currentColor">
60+
<div className="flex items-center">
61+
<svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 mr-1 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
5462
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z" clip-rule="evenodd" />
5563
</svg>
5664
{moment(items.date).fromNow()}
57-
</span>
65+
</div>
5866
</div>
5967
</div>
6068
</a>

‎components/JobDetails/Details/Details.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default ({ job }) => {
2+
return (
3+
<div className="mt-6 prose md:mt-0" dangerouslySetInnerHTML={{__html:job.jobDetails}}>
4+
</div>
5+
)
6+
}

‎components/JobDetails/JobDetails.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import ApplyBtn from "./ApplyBtn/ApplyBtn"
2-
import Details from "../../sideComponents/Details/Details"
2+
import Details from "./Details/Details"
33

44
export default ({ data, job }) => {
55
return (
66
<div className="col-span-2">
7-
<h1 className="text-3xl font-semibold mt-4 md:mt-0 md:block">{job.jobTitle}</h1>
7+
<h1 className="hidden text-3xl font-semibold mt-4 mb-7 md:mt-0 md:block">{job.jobTitle}</h1>
88
<Details job={job} />
99
<ApplyBtn data={data} w="w-full sm:px-4 sm:w-auto md:hidden" />
1010
</div>

‎components/SearchJobList/JobList.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,27 @@ export default ({
2424
<>
2525

2626
<ul className="space-y-4">
27-
<JobCard jobs={jobs} />
27+
{
28+
!jobs ? (
29+
<div className="lg:ml-24">
30+
<p className="text-xl text-gray-500">
31+
The search did not match any jobs
32+
</p>
33+
<span className="block mt-3 text-xl text-gray-900">
34+
Tips to improve the search
35+
</span>
36+
<div className="mt-3 prose">
37+
<ul>
38+
<li>Try more general keywords</li>
39+
<li>Check your spelling</li>
40+
<li>Replace abbervisations with the entire word</li>
41+
</ul>
42+
</div>
43+
</div>
44+
) : (
45+
<JobCard jobs={jobs} />
46+
)
47+
}
2848
</ul>
2949
{
3050
docsCount > count ? (

‎dashboard/company/PostNewJob/NewJobForm.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import data from '../../../json/data.json'
77
export default ({ states }) => {
88

99
const {
10-
jobType, setLocation, setJobType, setSalary, setExpLevel, setJobTitle,
10+
jobType, expLevel, setLocation, setJobType, setSalary, setExpLevel, setJobTitle,
1111
jobTitleAlert, locationAlert, jobTypeAlert, salaryAlert, expLevelAlert
1212
} = states
1313

@@ -44,7 +44,7 @@ export default ({ states }) => {
4444
<span className="block text-xs text-red-600">{jobTypeAlert}</span>
4545
</div>
4646
<div>
47-
<ExpLevel data={data} setExpLevel={setExpLevel} />
47+
<ExpLevel data={data} defaultValue={expLevel} setExpLevel={setExpLevel} />
4848
<span className="block text-xs text-red-600">{expLevelAlert}</span>
4949
</div>
5050
</div>

‎package-lock.json

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"dependencies": {
1111
"@fullhuman/postcss-purgecss": "^4.0.3",
12+
"@tailwindcss/typography": "^0.4.1",
1213
"autoprefixer": "^10.3.1",
1314
"axios": "^0.21.1",
1415
"cookie": "^0.4.1",

‎pages/dashboard/company/new/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const index = ({ data }) => {
9595
<form onSubmit={handleSubmit}>
9696
<div className="mt-12 mx-4 grid-cols-3 md:gap-8 lg:gap-12 md:grid">
9797
<NewJobForm states={ {
98-
jobType, setLocation, setJobType, setSalary, setExpLevel, setJobTitle,
98+
jobType, expLevel, setLocation, setJobType, setSalary, setExpLevel, setJobTitle,
9999
jobTitleAlert, locationAlert, jobTypeAlert, salaryAlert, expLevelAlert
100100
} } />
101101
<NewJobEditor jobDetailsAlert={ jobDetailsAlert } defaultValue={jobDetails} getContent={(e) => setJobDetails(e)} />

‎pages/job/[id].js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Index = ({ data, job }) => {
2323
<JobHeader company={jobData.company} />
2424
<main className="mt-12 mb-3">
2525
<article>
26-
<h1 className="text-2xl font-semibold mb-5 md:hidden">{jobData.jobTitle}</h1>
26+
<h1 className="text-2xl font-semibold mb-8 md:hidden">{jobData.jobTitle}</h1>
2727
<div className="grid-cols-3 md:grid md:gap-4 lg:gap-12">
2828
<JobDetailsSide job={jobData} data={data} />
2929
<JobDetails job={jobData} data={data} />

‎pages/search/index.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,21 @@ function Home({ data }) {
2222
const [docsCount, setDocsCount] = useState(8)
2323

2424
useEffect(() => {
25+
26+
setLoading(true)
27+
2528
axios.post(`${api}/api/jobs/search`, { query, count }).then(res => {
26-
if (res.data.jobs) {
29+
console.log(res.data.jobs)
30+
if (res.data.state) {
2731
setJobs(res.data.jobs)
2832
setLoading(false)
2933
seJobStatet(false)
3034
setDocsCount(res.data.docs)
35+
} else if (!res.data.state) {
36+
setJobs(res.data.state)
37+
setLoading(false)
38+
seJobStatet(false)
39+
setDocsCount(0)
3140
}
3241
})
3342
}, [query, count])

0 commit comments

Comments
 (0)