Skip to content

Commit

Permalink
Merge branch 'dev' into feature/learning-marathon
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnsonMao
JohnsonMao authored Dec 16, 2024
2 parents 7f6e601 + 6b4aaab commit 088ec63
Show file tree
Hide file tree
Showing 22 changed files with 173 additions and 188 deletions.
10 changes: 5 additions & 5 deletions components/Marathon/Apply/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ export default function Apply() {
<StyledTimelineGroup sx={{ marginBottom: '8px' }}>
<StyledDateCard>
<StyledDateGroup>
<div className="date">12/15</div>
<div className="weekday"><span>日</span></div>
<div className="date">12/16</div>
<div className="weekday"><span>一</span></div>
</StyledDateGroup>
</StyledDateCard>
<StyledContent>
Expand Down Expand Up @@ -193,8 +193,8 @@ export default function Apply() {
<StyledTimelineGroup sx={{ marginBottom: '8px' }}>
<StyledDateCard className="time">
<StyledDateGroup>
<div className="date">02/03</div>
<div className="weekday"><span>日</span></div>
<div className="date">01/27</div>
<div className="weekday"><span>一</span></div>
</StyledDateGroup>
</StyledDateCard>
<StyledContent>
Expand Down Expand Up @@ -253,7 +253,7 @@ export default function Apply() {
<StyledTime component="p" sx={{ lineBreak: 'none' }}>14:00-15:00</StyledTime>
</StyledDateCard>
<StyledContent>
線上暖身活動
暖身活動（線上）
</StyledContent>
</StyledTimelineGroup>

Expand Down
8 changes: 4 additions & 4 deletions components/Marathon/Equip/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function Equip() {
<ul>
<li>3 次 1 小時一對一諮詢</li>
<li>2 次 1 小時團體諮詢</li>
<li>Mentor 每兩週對學員的學習進度給予回饋</li>
<li>引導師每兩週對學員的學習進度給予回饋</li>
</ul>
</StyledList>
</StyledCard>
Expand All @@ -84,7 +84,7 @@ export default function Equip() {
<ul>
<li>5 次 1 小時全員每月聚會</li>
<li>專屬學習小組，5 次 1 小時學習小組每月聚會</li>
<li>島島阿學 Discord 社群即時交流</li>
<li>島島阿學Discord社群即時交流</li>
<li>島島阿學網站找夥伴找揪團功能</li>
</ul>
</StyledList>
Expand All @@ -93,7 +93,7 @@ export default function Equip() {
backgroundColor: '#DEF5F5'
}}
>
<StyledTitle component="h4">「AI 個人化學習工具」<br />引導你學習方向及自律學習</StyledTitle>
<StyledTitle component="h4">「AI個人化學習工具」<br />引導你學習方向及自律學習</StyledTitle>
<StyledList>
<ul>
<li>具引導性的自主學習模板</li>
Expand All @@ -102,7 +102,7 @@ export default function Equip() {
<li>進度安排與檢核表</li>
<li>自我檢核表</li>
<li>學習成果分享專區</li>
<li>AI智慧推薦與引導</li>
<li>AI推薦與引導</li>
</ul>
</StyledList>
</StyledCard>
Expand Down
4 changes: 2 additions & 2 deletions components/Marathon/Faq/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function Faq() {
<Accordion
title="所有課程和活動都會有錄影嗎？"
>
僅有工作坊會有錄影，小組討論和Mentor 團體諮詢不會有錄影。
僅有工作坊會有錄影，學習小組會議、引導師諮詢、社群活動等不會有錄影。
</Accordion>
<Accordion
title="我最後的成果會有誰看到呢？"
Expand All @@ -127,7 +127,7 @@ export default function Faq() {
<Accordion
title="所有活動都是線上嗎？"
>
本次計劃皆是線上進行，參與者需要有電腦和網路參與。
本次計劃鼓勵各地學習者參與，故多數活動為線上，但為增加實體互動，部分社群活動將以實體為主，實體地點將視入圍學員所在地調整，詳細請參考重要時程。
</Accordion>
<Accordion
title="結束後會收到完成證書嗎？"
Expand Down
1 change: 0 additions & 1 deletion components/Marathon/Mentors.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ const Mentors = () => {
</IconButton>
</div>
</div>

<div
className="mt-9 overflow-x-hidden select-none"
onTouchStart={handleTouchStart}
Expand Down
6 changes: 3 additions & 3 deletions components/Marathon/Price/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export default function Price() {
return (
<StyledGroup>
<StyledParagraph component="p" sx={{ marginBottom: '36px' }}>
報名無需費用，入選後才需繳交！<br />
申請無需費用，入選後才需繳交！<br />
完賽可退全額！
</StyledParagraph>
<StyledDiscount sx={{ marginBottom: '16px' }}>
Expand All @@ -355,7 +355,7 @@ export default function Price() {
<StyledPriceCard>
<div className="title">
<span>早鳥價</span>
<span className="note">12/31 23:59 前報名</span>
<span className="note">12/31 23:59 前申請</span>
</div>
<div className="price">
<p className="curr">NT$</p>
Expand Down Expand Up @@ -408,7 +408,7 @@ export default function Price() {
<ul>
<li>活動費用於入選公告後再繳費即可，主辦單位將會寄發繳費通知到入選者信箱</li>
<li>若完成指定的條件，會退回活動費用</li>
<li>島島阿學提供三名中低收入戶學習者免活動費用的參與機會，報名時須提供證明</li>
<li>島島阿學提供三名中低收入戶學習者免活動費用的參與機會，申請時須提供證明</li>
<li>申請期間有不定期的折價優惠活動，至高可折 500 元，歡迎追蹤島島阿學 Instagram 與 FB 粉絲專頁。</li>
</ul>
</StyledList>
Expand Down
50 changes: 26 additions & 24 deletions components/Marathon/SignUp/ConfirmForm.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,32 +287,34 @@ export default function ConfirmForm({
};

useEffect(() => {
switch (marathonState.apiState) {
case 'success': {
toast.success('更新成功');
break;
}
case 'Reject': {
toast.error('更新失敗');
break;
}
default:
switch (marathonState.apiStateWithType) {
case 'updateMarathonProfileSuccess': {
toast.success('更新成功');
router.push('/learning-marathon/success');
break;
}
}, [user.apiState]);

useEffect(() => {
if (
marathonState._id &&
hasClickSubmitButton &&
(marathonState.apiState === 'success')) {
router.push('/learning-marathon/success');
case 'createMarathonProfileByTokenSuccess': {
toast.success('申請成功');
router.push('/learning-marathon/success');
break;
}
case 'updateMarathonProfileFailure': {
toast.error('更新失敗');
break;
}
case 'createMarathonProfileByTokenFailure': {
toast.error('申請失敗');
break;
}
default:
}
}, [hasClickSubmitButton, user.apiState, marathonState.apiState]);
}, [marathonState.apiStateWithType]);

return (
<>
<StyledMarathonTitleSection>
<div className="tag">
<span>徵件計畫</span>
<span>學習計畫</span>
</div>
<h2>學習主題名稱：{marathonState?.title}</h2>
</StyledMarathonTitleSection>
Expand Down Expand Up @@ -374,7 +376,7 @@ export default function ConfirmForm({
}}
>
<Typography component="p">
{newMarathon?.resources}
{marathonState?.resources}
</Typography>
</Box>
</StyledSection>
Expand Down Expand Up @@ -412,7 +414,7 @@ export default function ConfirmForm({
/>
</StyledSection>
<StyledSection sx={{ mt: '16px' }}>
<StyledSectionTitle component="h3">報名的資格</StyledSectionTitle>
<StyledSectionTitle component="h3">申請資格</StyledSectionTitle>
<StyledFormControlLabel
sx={{ marginBottom: '8px' }}
value=""
Expand Down Expand Up @@ -495,7 +497,7 @@ export default function ConfirmForm({
<StyledNote
component="p"
>
主辦單位將於報名成功後，確認並通知各報名者須繳交之費用
主辦單位將於申請成功後，確認並通知各申請者須繳交之費用
</StyledNote>
</StyledSection>
<StyledButtonGroup>
Expand All @@ -509,7 +511,7 @@ export default function ConfirmForm({
variant="contained"
onClick={onSubmit}
>
提交報名
提交申請
</StyledButton>
</StyledButtonGroup>
</>
Expand Down
4 changes: 2 additions & 2 deletions components/Marathon/SignUp/MarathonForm.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ export default function MarathonForm({
marginBottom: '20px',
}}
>
計劃內容在報名截止日前皆可修改。<br />
入選公告後，所有入選者及報名者亦可持續修改學習計劃
計劃內容在申請截止日前皆可修改。<br />
入選公告後，所有入選者及申請者亦可持續修改學習計劃
</Typography>

<Box sx={{ marginTop: '24px', width: '100%' }}>
Expand Down
Loading

0 comments on commit 088ec63

Please sign in to comment.