diff --git a/components/Group/Form/index.jsx b/components/Group/Form/index.jsx index 5364eaed..63061b0f 100644 --- a/components/Group/Form/index.jsx +++ b/components/Group/Form/index.jsx @@ -100,12 +100,12 @@ export default function GroupForm({ placeholder="想找什麼類型的夥伴?" /> !['master', 'doctor', 'other'].includes(edu.value), ); -_eduOptions.push({ key: 'noLimit', value: 'noLimit', label: '不限' }); +_eduOptions.push({ key: 'noLimit', value: 'noLimit', label: '終生學習' }); export const categoriesOptions = CATEGORIES; export const areasOptions = AREAS.filter((area) => area.label !== '線上'); @@ -47,7 +47,7 @@ const rules = { partnerStyle: z.string().max(50, '請勿輸入超過 50 字'), partnerEducationStep: z .array(z.enum(eduOptions.map(({ label }) => label))) - .min(1, '請選擇教育階段'), + .min(1, '請選擇的學習階段'), description: z .string() .min(1, '請輸入揪團描述') diff --git a/components/Group/SearchField/SelectedEducationStep.jsx b/components/Group/SearchField/SelectedEducationStep.jsx index b415449b..25caaff4 100644 --- a/components/Group/SearchField/SelectedEducationStep.jsx +++ b/components/Group/SearchField/SelectedEducationStep.jsx @@ -19,7 +19,7 @@ export default function SelectedEducationStep() { itemLabel="label" itemValue="label" renderValue={(selected) => - selected.length === 0 ? '適合的教育階段' : selected.join('、') + selected.length === 0 ? '適合的學習階段' : selected.join('、') } sx={{ '@media (max-width: 767px)': { diff --git a/constants/member.js b/constants/member.js index 6c2ca210..00e7dee6 100644 --- a/constants/member.js +++ b/constants/member.js @@ -8,7 +8,7 @@ export const GENDER = [ value: 'female', }, { - label: '其他', + label: '保持神秘', value: 'other', }, ]; @@ -46,7 +46,7 @@ export const ROLE = [ image: 'https://i.imgur.com/cXZXfBL.png', }, { - label: '其他', + label: '終生學習', key: 'other', value: 'other', image: 'https://i.imgur.com/Z7oGEnb.png', @@ -54,38 +54,38 @@ export const ROLE = [ ]; export const EDUCATION_STEP = [ - { - label: '學齡前', - key: 'preschool', - value: 'preschool', - }, - { - label: '國小低年級', - key: 'elementary-junior', - value: 'elementary-junior', - }, - { - label: '國小中年級', - key: 'elementary-middle', - value: 'elementary-middle', - }, - { - label: '國小高年級', - key: 'elementary-senior', - value: 'elementary-senior', - }, - { - label: '國中', - key: 'junior-high', - value: 'junior-high', - }, + // { + // label: '學齡前', + // key: 'preschool', + // value: 'preschool', + // }, + // { + // label: '國小低年級', + // key: 'elementary-junior', + // value: 'elementary-junior', + // }, + // { + // label: '國小中年級', + // key: 'elementary-middle', + // value: 'elementary-middle', + // }, + // { + // label: '國小高年級', + // key: 'elementary-senior', + // value: 'elementary-senior', + // }, + // { + // label: '國中', + // key: 'junior-high', + // value: 'junior-high', + // }, { label: '高中', key: 'high', value: 'high', }, { - label: '大學', + label: '大學以上', key: 'university', value: 'university', }, @@ -100,7 +100,7 @@ export const EDUCATION_STEP = [ value: 'doctor', }, { - label: '其他', + label: '終生學習', key: 'other', value: 'other', }, @@ -111,30 +111,30 @@ export const EDUCATION_STAGE = EDUCATION_STEP.filter( ); export const WANT_TO_DO_WITH_PARTNER = [ - { - label: '交朋友', - key: 'make-friends', - value: 'make-friends', - }, { label: '學習交流', key: 'interaction', value: 'interaction', }, { - label: '找老師', - key: 'find-teacher', - value: 'find-teacher', + label: '做專案/競賽', + key: 'do-project', + value: 'do-project', }, { - label: '揪團組課', + label: '自組課程', key: 'make-group-class', value: 'make-group-class', }, { - label: '做專案/競賽', - key: 'do-project', - value: 'do-project', + label: '找揪團', + key: 'find-group', + value: 'find-group', + }, + { + label: '找老師', + key: 'find-teacher', + value: 'find-teacher', }, { label: '找學生',