Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

「工作心得」、「工作經驗」的 wording 改為「評價」 #1372

Merged
merged 2 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GoodJob 職場透明化運動 官網
我們相信,當職場資訊變得足夠透明,在市場機制的運作下,好的公司更容易找到好人才,變得更有競爭力;條件相對差一點的公司將會提升薪資及福利,以招募更好的人才。台灣的產業整體而言向上提升,進入正向循環。

### 解決方案
* [職場透明化運動官網](https://www.goodjob.life):讓所有勞工可以分享自己的薪資、工時、面試經驗、工作經驗,以及實習經驗。
* [職場透明化運動官網](https://www.goodjob.life):讓所有勞工可以分享自己的薪資、工時、面試經驗、評價,以及實習經驗。
* [勞動知識小教室](https://www.goodjob.life/labor-rights):一系列實用的勞動權益懶人包
* [百工寫真](https://media.goodjob.life):採訪並報導勞工最真實的一面

Expand Down
2 changes: 1 addition & 1 deletion src/components/About/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const data2017 = [
},
{
month: 8,
Content: () => <div>工作經驗、面試經驗分享上線</div>,
Content: () => <div>評價、面試經驗分享上線</div>,
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/components/Buy/SubscriptionsSection/Captain.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Captain = ({ dataCount, endDateTime }) => (
<Section className={styles.captain}>
<P>
解鎖範圍:全站 {formatCommaSeparatedNumber(dataCount || 0)}{' '}
筆面試經驗、工作心得、薪資工時資料,及期間內新增的資料
筆面試經驗、評價、薪資工時資料,及期間內新增的資料
</P>
<P>
使用期間:現在 ~ {format(endDateTime || new Date(), 'yyyy-MM-dd hh:mm a')}
Expand Down
6 changes: 3 additions & 3 deletions src/components/CompanyAndJobTitle/Overview/Helmet.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const formatDataCount = (dataCount, unit, defaultStr) => {
};

const formatKeyword = name =>
`${name}薪水, ${name}加班情況, ${name}工時, ${name}工作心得, ${name}面試心得`;
`${name}薪水, ${name}加班情況, ${name}工時, ${name}評價, ${name}面試心得`;

const CompanyOverviewHelmet = ({
companyName,
Expand All @@ -36,7 +36,7 @@ const CompanyOverviewHelmet = ({
'',
);
const workExperiencesStr = formatDataCount(workExperiencesCount, '篇', '');
const description = `查看由${companyName}內部員工分享的${salaryWorkTimesStr}薪水及加班數據、${workExperiencesStr}工作心得,以及由面試者分享的${interviewExperiencesStr}面試經驗。`;
const description = `查看由${companyName}內部員工分享的${salaryWorkTimesStr}薪水及加班數據、${workExperiencesStr}評價,以及由面試者分享的${interviewExperiencesStr}面試經驗。`;

const path = generatePath('/companies/:companyName', { companyName });
const url = formatCanonicalPath(path);
Expand Down Expand Up @@ -80,7 +80,7 @@ const JobTitleOverviewHelmet = ({
'',
);
const workExperiencesStr = formatDataCount(workExperiencesCount, '篇', '');
const description = `查看由${jobTitle}分享的${salaryWorkTimesStr}薪水及加班數據、${workExperiencesStr}工作心得,以及由面試者分享的${interviewExperiencesStr}面試經驗。`;
const description = `查看由${jobTitle}分享的${salaryWorkTimesStr}薪水及加班數據、${workExperiencesStr}評價,以及由面試者分享的${interviewExperiencesStr}面試經驗。`;

const path = generatePath('/job-titles/:jobTitle', { jobTitle });
const url = formatCanonicalPath(path);
Expand Down
4 changes: 2 additions & 2 deletions src/components/CompanyAndJobTitle/Overview/Overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const Overview = ({
/>
</SnippetBlock>
<SnippetBlock
title="工作心得"
linkText={`查看 ${workExperiencesCount} 篇完整的工作心得 >>`}
title="評價"
linkText={`查看 ${workExperiencesCount} 篇完整的評價 >>`}
linkTo={generateTabURL({
pageType,
pageName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const ExperienceEntry = ({
<section className={styles.contentWrapper}>
<div className={styles.labels}>
<P size="s" className={styles.date}>
工作經驗 · {formatCreatedAt(createdAt)}
評價 · {formatCreatedAt(createdAt)}
</P>
<div className={styles.salaryRecommendWrapper}>
{weekWorkTime && canView && (
Expand Down
16 changes: 8 additions & 8 deletions src/components/CompanyAndJobTitle/WorkExperiences/Helmet.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ const CompanyWorkExperienceHelmet = ({
page,
}) => {
// title
const title = `${companyName} 工作心得列表 - 第${page}頁`;
const title = `${companyName} 評價列表 - 第${page}頁`;

// description
let description = `目前還沒有${companyName}的工作心得。分享你的工作心得,一起讓職場更透明!`;
let description = `目前還沒有${companyName}的評價。分享你的評價,一起讓職場更透明!`;
if (workExperiences && workExperiences.length > 0) {
description = `查看${workExperiences.length}${companyName}工作心得`;
description = `查看${workExperiences.length}${companyName}評價`;
}

// canonical url
Expand All @@ -39,7 +39,7 @@ const CompanyWorkExperienceHelmet = ({
<meta property="og:description" content={description} />
<meta
name="keywords"
content={`${companyName}工作心得, ${companyName}內部實況, ${companyName}企業文化, ${companyName}職場甘苦談`}
content={`${companyName}評價, ${companyName}內部實況, ${companyName}企業文化, ${companyName}職場甘苦談`}
/>
<meta property="og:url" content={url} />
<link rel="canonical" href={url} />
Expand All @@ -55,12 +55,12 @@ CompanyWorkExperienceHelmet.propTypes = {

const JobTitleWorkExperienceHelmet = ({ jobTitle, workExperiences, page }) => {
// title
const title = `${jobTitle} 工作心得列表 - 第${page}頁`;
const title = `${jobTitle} 評價列表 - 第${page}頁`;

// description
let description = `目前還沒有${jobTitle}的工作心得。分享你的工作心得,一起讓職場更透明!`;
let description = `目前還沒有${jobTitle}的評價。分享你的評價,一起讓職場更透明!`;
if (workExperiences && workExperiences.length > 0) {
description = `查看${workExperiences.length}${jobTitle}工作心得`;
description = `查看${workExperiences.length}${jobTitle}評價`;
}

// canonical url
Expand All @@ -81,7 +81,7 @@ const JobTitleWorkExperienceHelmet = ({ jobTitle, workExperiences, page }) => {
<meta property="og:description" content={description} />
<meta
name="keywords"
content={`${jobTitle}工作心得, ${jobTitle}職場甘苦談`}
content={`${jobTitle}評價, ${jobTitle}職場甘苦談`}
/>
<meta property="og:url" content={url} />
<link rel="canonical" href={url} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/ExperienceDetail/Article/ArticleInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const InterviewInfoBlocks = ({ experience, hideContent }) => {
{experience.job_title.name}
</InfoBlock>
{expInYearText !== null ? (
<InfoBlock label="相關職務工作經驗">{expInYearText}</InfoBlock>
<InfoBlock label="相關職務評價">{expInYearText}</InfoBlock>
) : null}
{experience.education ? (
<InfoBlock label="最高學歷">{experience.education}</InfoBlock>
Expand Down Expand Up @@ -146,7 +146,7 @@ const WorkInfoBlocks = ({ experience, hideContent }) => {
{experience.job_title.name}
</InfoBlock>
{expInYearText ? (
<InfoBlock label="自身相關職務工作經驗">{expInYearText}</InfoBlock>
<InfoBlock label="自身相關職務評價">{expInYearText}</InfoBlock>
) : null}
{experience.education ? (
<InfoBlock label="最高學歷">{experience.education}</InfoBlock>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ExperienceDetail/Heading/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
const formatType = type => {
switch (type) {
case 'work':
return '工作心得';
return '評價';
case 'interview':
return '面試經驗';
case 'intern':
return '實習心得';
default:
return '工作心得';
return '評價';
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const MoreExperiencesBlock = ({ experience }) => {
<div className={styles.container}>
<div className={styles.title}>
更多{experience.originalCompanyName}{experience.job_title.name}
的面試及工作心得...
的面試及評價...
</div>
{experiences.map(e => (
<ExperienceEntry
Expand Down
6 changes: 3 additions & 3 deletions src/components/ExperienceDetail/experienceSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { formatSalaryType } from 'common/formatter';

const typeMapping = {
interview: '面試經驗',
work: '工作心得',
work: '評價',
intern: '實習心得',
};

Expand Down Expand Up @@ -77,7 +77,7 @@ const interviewMetaDescriptionSelector = experience => {
content += `面試地區:${region}。`;
}
if (experience.experience_in_year) {
content += `相關職務工作經驗${experience_in_year} 年。`;
content += `相關職務評價${experience_in_year} 年。`;
}
if (interviewYear && interviewMonth) {
content += `面試時間:${interviewYear}${interviewMonth} 月。`;
Expand Down Expand Up @@ -113,7 +113,7 @@ const workMetaDescriptionSelector = experience => {
content += `工作地區:${region}。`;
}
if (experience.experience_in_year) {
content += `相關職務工作經驗${experience_in_year} 年。`;
content += `相關職務評價${experience_in_year} 年。`;
}
if (experience.education) {
content += `最高學歷:${experience.education}。`;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Guidelines/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const GuideLines = () => (
<Wrapper size="m" className={editorStyles.editor}>
<p>
GoodJob 的使用者您好!一旦您在 GoodJob
平台上發表內容(包含但不限於薪資及工時資訊、面試經驗分享、工作經驗分享、實習經驗分享、留言回覆以及檢舉的內容),即代表您同意遵守以下發文留言規則。我們未來有可能修訂本規則,您將會於本頁面或公告指定的頁面找到此規則的最新版本。
平台上發表內容(包含但不限於薪資及工時資訊、面試經驗分享、評價分享、實習經驗分享、留言回覆以及檢舉的內容),即代表您同意遵守以下發文留言規則。我們未來有可能修訂本規則,您將會於本頁面或公告指定的頁面找到此規則的最新版本。
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/LaborRightsMenu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const LaborRightsMenu = () => {
R.insert(4, {
link: shareLink,
coverUrl: AdvImage,
title: '留下你的面試經驗、工作經驗',
title: '留下你的面試經驗、評價',
}),
R.map(entryToProps),
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/LandingPage/ExperienceBlock/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { formatSalaryAmount, formatSalaryType } from 'common/formatter';
export const formatType = type => {
switch (type) {
case 'work':
return '工作心得';
return '評價';
case 'interview':
return '面試心得';
case 'intern':
return '實習心得';
default:
return '工作心得';
return '評價';
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/LandingPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const LandingPage = () => {
<Section padding>
<Wrapper size="l">
<Heading size="l" center marginBottom>
最新面試、工作心得
最新面試、評價
</Heading>
<Columns
Item={ExperienceBlock}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProductAndRefundPolicy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ const ProductAndRefundPolicy = () => (
<ol>
<li>
您已充分理解 GoodJob
職場透明化運動網站(以下簡稱本網站)上之薪資、面試經驗、工作心得等相關內容,皆為網友回報,本網站無法保證其資訊之正確性。
職場透明化運動網站(以下簡稱本網站)上之薪資、面試經驗、評價等相關內容,皆為網友回報,本網站無法保證其資訊之正確性。
</li>
<li>
當您完成購買本網站提供之訂閱制方案以解鎖內容,即代表您同意購買當下所顯示的價格與內容。本網站有權在不同階段進行優化,以不同價格出售方案。故本網站不提供補差價服務與變更服務內容。
</li>
<li>
本網站內容皆已於未付費狀態下部分揭露,例如:顯示網友回報薪資之範圍、面試經驗以及工作心得之部分內容。消費者應已具備足夠資訊決定是否付費購買訂閱制方案以獲得完整內容。因此本網站之訂閱制方案,在相關適用法律許可之範圍內,付款不可退還。
本網站內容皆已於未付費狀態下部分揭露,例如:顯示網友回報薪資之範圍、面試經驗以及評價之部分內容。消費者應已具備足夠資訊決定是否付費購買訂閱制方案以獲得完整內容。因此本網站之訂閱制方案,在相關適用法律許可之範圍內,付款不可退還。
</li>
<li>
本網站可能會出現暫時中斷或故障等現象,對於您暫時無法使用本網站而造成的損害,除故意或重大過失外,在相關適用法律許可之範圍內,不負任何賠償責任。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,7 @@ class WorkExperience extends React.PureComponent {
} = this.props;

return (
<IconHeadingBlock
heading="工作經驗"
Icon={Comment2}
marginTop
requiredText
>
<IconHeadingBlock heading="評價" Icon={Comment2} marginTop requiredText>
<div
style={{
marginBottom: '24px',
Expand All @@ -60,7 +55,7 @@ class WorkExperience extends React.PureComponent {
<TitleWithValidation
title={title}
onChange={handleState('title')}
placeholder="OO 股份有限公司工作經驗分享"
placeholder="OO 股份有限公司評價分享"
validator={titleValidator}
submitted={submitted}
changeValidationStatus={changeValidationStatus}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class WorkInfo extends React.PureComponent {
companyQuery={companyQuery}
onChange={v => {
handleState('companyQuery')(v);
handleState('title')(`${v} 工作經驗分享`);
handleState('title')(`${v} 評價分享`);
}}
onCompanyId={handleState('companyId')}
validator={companyQueryValidator}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ describe('interviewFormCheck tests', () => {
salaryAmount: 0,
weekWorkTime: '',
recommendToOthers: null,
title: '工作經驗分享',
title: '評價分享',
sections: {
1: {
subtitle: 'test',
Expand All @@ -192,7 +192,7 @@ describe('interviewFormCheck tests', () => {
education: '大學',
salaryType: 'month',
salaryAmount: 50000,
title: '工作經驗分享',
title: '評價分享',
weekWorkTime: 40,
recommendToOthers: 'no',
sections: {
Expand All @@ -211,7 +211,7 @@ describe('interviewFormCheck tests', () => {
companyQuery: '台積電',
region: '台北市',
jobTitle: '硬體工程師',
title: '工作經驗分享',
title: '評價分享',
sections: {
1: {
subtitle: 'test',
Expand Down
4 changes: 2 additions & 2 deletions src/components/ShareExperience/WorkExperiencesForm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const defaultForm = {
salaryAmount: '',
weekWorkTime: '',
recommendToOthers: null,
title: '工作經驗分享',
title: '評價分享',
sections: {
[firstSectionId]: createBlock.sections(firstSectionId)(),
},
Expand Down Expand Up @@ -315,7 +315,7 @@ class WorkExperiencesForm extends React.Component {
<div>
<StaticHelmet.ShareWork />
<Heading size="l" marginBottomS center>
工作經驗分享
評價分享
</Heading>
{this.state.submitted ? (
<div
Expand Down
4 changes: 1 addition & 3 deletions src/components/ShareExperience/common/ExperienceInYear.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ const ExperienceInYear = ({ jobTitle, experienceInYear, onChange }) => (
<div>
<InputTitle
text={
jobTitle
? `當時已經有幾年擔任${jobTitle}的經驗?`
: '自身相關職務工作經驗'
jobTitle ? `當時已經有幾年擔任${jobTitle}的經驗?` : '自身相關職務評價'
}
/>
<div
Expand Down
2 changes: 1 addition & 1 deletion src/components/TimeAndSalary/SearchScreen/Helmet.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { SITE_NAME } from 'constants/helmetData';

const SearchScreenHelmet = ({ keyword, page }) => {
const title = `查詢${keyword}的結果 - 第${page}頁`;
const description = `查詢${keyword}的薪水、加班狀況、面試心得、工作心得資料的結果`;
const description = `查詢${keyword}的薪水、加班狀況、面試心得、評價資料的結果`;

const query = page > 1 ? { q: keyword, p: page } : { q: keyword };
const url = formatCanonicalPath(
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/ShareExpSection/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ const ShareExpSection = ({ heading, Subheading }) => {
<Link to={generateShareWork()} className={styles.item}>
<img
src={WorkExperienceImg}
alt="分享工作經驗"
alt="分享評價"
className={styles.image}
/>
<P size="l" Tag="h3" bold className={styles.button}>
工作經驗
評價
</P>
<P className={styles.description} size="l">
想推薦工作、爆料的,這邊請!
Expand Down
Loading