Merge branch 'master' into dev

goodjoblife · Jul 6, 2024 · d3ab117 · d3ab117
2 parents 6a97125 + 87a597d
commit d3ab117
Show file tree

Hide file tree

Showing 24 changed files with 329 additions and 816 deletions.
diff --git a/...ponents/TimeAndSalary/common/InfoModal.js → ...anyAndJobTitle/TimeAndSalary/InfoModal.js b/...ponents/TimeAndSalary/common/InfoModal.js → ...anyAndJobTitle/TimeAndSalary/InfoModal.js
diff --git a/...TimeAndSalary/common/InfoModal.module.css → ...bTitle/TimeAndSalary/InfoModal.module.css b/...TimeAndSalary/common/InfoModal.module.css → ...bTitle/TimeAndSalary/InfoModal.module.css
diff --git a/src/components/CompanyAndJobTitle/TimeAndSalary/WorkingHourTable.js b/src/components/CompanyAndJobTitle/TimeAndSalary/WorkingHourTable.js
@@ -4,11 +4,8 @@ import R from 'ramda';
 import { InfoButton } from 'common/Modal';
 import Table from 'common/table/Table';
 import { pageType as pageTypeMapping } from 'constants/companyJobTitle';
-import {
-  InfoSalaryModal,
-  InfoTimeModal,
-} from '../../TimeAndSalary/common/InfoModal';
-import styles from '../../TimeAndSalary/common/WorkingHourTable.module.css';
+import { InfoSalaryModal, InfoTimeModal } from './InfoModal';
+import styles from './WorkingHourTable.module.css';
 import {
   getNameAsJobTitle,
   getNameAsCompanyName,

diff --git a/...Salary/common/WorkingHourTable.module.css → ...TimeAndSalary/WorkingHourTable.module.css b/...Salary/common/WorkingHourTable.module.css → ...TimeAndSalary/WorkingHourTable.module.css
diff --git a/src/components/TimeAndSalary/CallToShareData.js b/src/components/TimeAndSalary/CallToShareData.js
diff --git a/src/components/TimeAndSalary/MobileInfoButtons.js b/src/components/TimeAndSalary/MobileInfoButtons.js
diff --git a/src/components/TimeAndSalary/MobileInfoButtons.module.css b/src/components/TimeAndSalary/MobileInfoButtons.module.css
diff --git a/src/components/TimeAndSalary/common/AboutThisJobModal.js b/src/components/TimeAndSalary/common/AboutThisJobModal.js
diff --git a/src/components/TimeAndSalary/common/Columns.module.css b/src/components/TimeAndSalary/common/Columns.module.css
diff --git a/src/components/TimeAndSalary/common/DashBoardTable.js b/src/components/TimeAndSalary/common/DashBoardTable.js
diff --git a/src/components/TimeAndSalary/common/DashBoardTable.module.css b/src/components/TimeAndSalary/common/DashBoardTable.module.css
diff --git a/src/components/TimeAndSalary/common/formatter.js b/src/components/TimeAndSalary/common/formatter.js
@@ -1,30 +1,9 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { formatSalaryAmount, formatSalaryType } from 'common/formatter';
-import MagnifierPlus from 'common/icons/MagnifierPlus';
 import employmentType from 'constants/employmentType';
 import styles from './formatter.module.css';
 
-export const getCompany = item => (
-  <div>
-    <Link to={`/companies/${encodeURIComponent(item.company.name)}`}>
-      {item.company.name}
-    </Link>
-  </div>
-);
-
-export const getJobTitle = item => {
-  const { job_title: jobTitle, sector } = item;
-  return (
-    <div>
-      <Link to={`/job-titles/${encodeURIComponent(jobTitle.name)}`}>
-        {jobTitle.name}
-      </Link>{' '}
-      <span className={`pM ${styles.sector}`}>{sector}</span>
-    </div>
-  );
-};
-
 export const getNameAsCompanyName = (o, row) => (
   <Link to={`/companies/${encodeURIComponent(o.name)}`}>
     {row.originalCompanyName}{' '}
@@ -131,15 +110,3 @@ export const formatWage = wage => {
 
 export const formatDate = ({ year, month }) =>
   `${year}.${month >= 10 ? '' : 0}${month}`;
-
-export const getAboutThisJobButton = toggleAboutThisJobModal => d => {
-  const aboutThisJob = d.about_this_job;
-  if (!aboutThisJob) return null;
-
-  const title = `${d.company.name} ${d.job_title.name}`;
-  return (
-    <div onClick={() => toggleAboutThisJobModal(aboutThisJob, title)}>
-      <MagnifierPlus style={{ width: 23, height: 23 }} />
-    </div>
-  );
-};