Skip to content

Commit

Permalink
Updated apr,may
Browse files Browse the repository at this point in the history
  • Loading branch information
kiloking committed Mar 18, 2024
1 parent 4de7996 commit 461824f
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/App/Carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Carousel ({slides}) {
return <a href={currData.ticket_link} target="__blank" className="btn blue">{t('order_ticket_10')}</a> ;
case 'free_reserve':
return <a href={currData.reserve_link} target="__blank" className="btn blue">{t('reserve_ticket')}</a> ;
case 'buyfirst':
case 'buyfirst':
return <a href={currData.ticket_link2} target="__blank" className="btn blue2">{t('order_ticket_first')}</a> ;
default:
return 'foo';
Expand Down
4 changes: 2 additions & 2 deletions src/App/Guide.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ function Guide() {
<td>
{t(`${item.show}`)}
{ item.show2 &&
<div>{t(`${item.show2}`)}</div>
<div className='border-t-dashed'>{t(`${item.show2}`)}</div>
}

</td>

<td>
<Trans i18nKey={item.title}></Trans>
{ item.title2 &&
<div> <Trans i18nKey={item.title2}></Trans></div>
<div className='border-t-dashed'> <Trans i18nKey={item.title2}></Trans></div>
}
{item.price && <div className='text_free'>{t(`${item.price}`)}</div>}
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/App/Report.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function Report() {
<div>+</div>
<div>{t('guide_category_1')}</div>
</div>
<div className="item-price-content-number">NT$ <span>399</span> / 時間 <span>60 {t('minute')}</span></div>
<div className="item-price-content-number">NT$ <span>299</span> / 時間 <span>60 {t('minute')}</span></div>

</div>
<div className="item-price-content" data-aos="fade-up" data-aos-delay="500">
Expand Down
25 changes: 24 additions & 1 deletion src/App/ScheduleData.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,33 @@ export const data_9 = [
]

export const month_data = [
{title:'feb_title',index:4},
{title:'apr_title',index:4},
{title:'may_title',index:4},
]

export const data = [
{
id:5,
title:'apr_title',
subtitle:'apr_subtitle',
data:[
{ time:"14:00", show:"show_name_9", title:"guide_category_4"},
{ time:"15:00", show:"mar_show_name_3",title:"guide_category_2"},
{ time:"16:00", show:"show_name_9", title:"guide_category_4"},
{ time:"17:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"},
{ time:"18:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"},
]
}, {
id:5,
title:'may_title',
data:[
{ time:"14:00", show:"show_name_9", title:"guide_category_4"},
{ time:"15:00", show:"mar_show_name_3",title:"guide_category_2"},
{ time:"16:00", show:"show_name_9", title:"guide_category_4"},
{ time:"17:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"},
{ time:"18:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"},
]
},
{
id:5,
title:'feb_title',
Expand Down
22 changes: 13 additions & 9 deletions src/App/_mobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,26 @@
text-align: center;
}
.content{
.dates_info{
flex-direction: column;
.dates_date{
.dates_info{
flex-direction: column;
.dates_date{
width: 100%;
}
}
.data-list{
flex-direction: column;
width: 70%;
}
.guide_table {
width: 100%;
}
}
.data-list{
flex-direction: column;
width: 70%;
}


}

}

}

.partner {
.title{
font-size: 30px;
Expand Down
5 changes: 5 additions & 0 deletions src/App/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,11 @@ body{
.text_free{
color: #fc2b2b;
}
.border-t-dashed{
border-top: dashed #aaa 1px;
margin-top: 10px;
padding-top: 10px;
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"feb_title":"February",
"mar_title":"March",
"apr_title":"April",
"apr_subtitle":"4/12(Fri.) ~ 4/14(Sun.) No performances during the special exhibition period. The special exhibition is currently being finalized—stay tuned!",
"apr_title1":"April 4/1-4/14 ",
"apr_title2":"April 4/15-4/30",
"may_title":"MAY SCHEDULE",
Expand Down
1 change: 1 addition & 0 deletions src/locales/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"feb_title":"二月份場次表",
"mar_title":"三月份場次表",
"apr_title":"四月份場次表",
"apr_subtitle":"4/12(五) ~ 4/14(日) 特展期間無場次開放,特展內容最終確認中!",
"apr_title1":"四月份場次表 4/1-4/14 ",
"apr_title2":"四月份場次表 4/15-4/30",
"may_title":"五月份場次表",
Expand Down

0 comments on commit 461824f

Please sign in to comment.