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

chore: staging env #560

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
12ff581
chore(about/coc): add SVG assets
foxlee2525 Aug 7, 2024
086d8dc
refactor(about/coc): Update CSS and PNG to SVG
foxlee2525 Aug 7, 2024
45b1117
fix(about/coc): fix responsive breakpoint for two-column layout
foxlee2525 Aug 7, 2024
715044d
refactor(sponsor): non-i18n content adjustment
wanyewei Aug 17, 2024
1ea9de2
chore: Dockerfile setting for staging
SivanYeh Jul 14, 2024
1c84e5d
feat: open the schedule page
Ritabear Jul 20, 2024
07a94a6
feat(poster-session): adjust content
mhsiungw Aug 25, 2024
6be4f1d
refactor(poster-session): change selectedPoster initialValue to empty…
mhsiungw Aug 25, 2024
2a6402c
chore(poster-session): update poster-session text and location info
mhsiungw Aug 30, 2024
b0f13e8
Merge branch 'main' into staging_env
SivanYeh Aug 30, 2024
78383a4
Merge branch 'feature/add-poster-session-page-UI' into staging_env
SivanYeh Aug 30, 2024
47cb994
feat: open the schedule page
Ritabear Jul 20, 2024
908993e
Merge pull request #559 from pycontw/feat/schedule
SivanYeh Aug 30, 2024
8c0587d
feat(staff): switch off
SivanYeh Aug 30, 2024
827e02c
Merge branch 'main' into chore/temporary-close-staff
SivanYeh Aug 30, 2024
d126b1a
Merge pull request #578 from pycontw/chore/temporary-close-staff
SivanYeh Aug 30, 2024
2df3c1b
fix(nav-bar): put back "showConferencePage"
SivanYeh Aug 30, 2024
91aafc9
feat(poster-session): adjust zh-hant name
SivanYeh Aug 30, 2024
ec142b4
Merge pull request #579 from pycontw/chore/temporary-close-staff
SivanYeh Aug 30, 2024
726b332
Merge branch 'feature/add-poster-session-page-UI' into staging_env
SivanYeh Aug 30, 2024
9b1db38
fix(nav-bar): switch off cfp
SivanYeh Aug 30, 2024
1bb8a80
feat(poster-session): adjust zh-hant name
SivanYeh Aug 30, 2024
bb94b03
Merge branch 'feature/add-poster-session-page-UI' into staging_env
SivanYeh Aug 30, 2024
df56f68
Merge pull request #580 from pycontw/chore/temporary-close-staff
SivanYeh Aug 30, 2024
2757a61
refactor(sponsor): non-i18n content adjustment
wanyewei Aug 31, 2024
4e8bbe9
Merge pull request #563 from foxlee2525/feat/png-to-svg-and-css-update
SivanYeh Aug 31, 2024
4f658a7
Merge pull request #572 from pycontw/chor---Non-i18n-content-rearrang…
SivanYeh Aug 31, 2024
5d8c55c
Merge pull request #575 from pycontw/feature/add-poster-session-page-UI
SivanYeh Aug 31, 2024
32da75e
feat(staff): add reviewers
CharisLai Aug 31, 2024
4383f32
fix(staff): photography and del photo of program
CharisLai Aug 31, 2024
f16762d
Merge remote-tracking branch 'upstream/main' into feat/2024_staff_rev…
CharisLai Aug 31, 2024
1bbfb4a
Merge branch 'staging_env' of https://github.com/pycontw/pycontw-fron…
SivanYeh Sep 7, 2024
a60a185
fix(staff): reviewer names
SivanYeh Sep 7, 2024
c96232a
Merge branch 'feat/2024_staff_reviewers' into staging_env
SivanYeh Sep 7, 2024
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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV ROUTER_BASE /2024/
ENV BASE_URL http://pycontw-2024:8000
ENV BUILD_TARGET server
ENV HOST 0.0.0.0
ENV API_URL_BROWSER https://tw.pycon.org/prs
ENV API_URL_BROWSER https://staging.pycon.tw/prs

RUN npm run build

Expand Down
2 changes: 1 addition & 1 deletion components/core/header/nav-bar/NavBar.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ export default genI18nMessages({
proposalSystemUrl: '投稿系統',
codeOfConduct: '行為準則',
cfpPoster: '如何投稿海報',
posterSession: '海報環節',
posterSession: '海報展',
},
})
2 changes: 1 addition & 1 deletion components/core/layout/TwoColWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default {

<style lang="postcss" scpoed>
.two-col-layout {
@media (min-width: 1024px) {
@media (min-width: 1194px) {
grid-template-columns: 1fr 5fr;
}
}
Expand Down
2 changes: 2 additions & 0 deletions i18n/about/staff.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export default genI18nMessages({
},
{
key: 'reviewer',
teamName: 'Reviewer',
},
],
og: {
Expand Down Expand Up @@ -142,6 +143,7 @@ export default genI18nMessages({
},
{
key: 'reviewer',
teamName: '審稿',
},
],
og: {
Expand Down
708 changes: 339 additions & 369 deletions i18n/conference/poster-session.i18n.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions i18n/sponsor/index.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ export default genI18nMessages({
'If you are interested in the event, please leave contact information below, ' +
'and we will provide the sponsorship packages detail to you. Or contact us ' +
'directly via {contact} to get any further information.',
terms: {
contact: '[email protected]',
},
cta: {
text: 'Application Form',
},
Expand Down Expand Up @@ -97,9 +94,6 @@ export default genI18nMessages({
summary:
'若想了解 PyConTW 2024 完整的贊助方案,歡迎點擊下方按鈕填寫表單留下您的聯絡資料' +
'索取贊助書或是直接透過贊助組信箱 {contact} 聯絡我們,讓我們了解貴單位的需求!',
terms: {
contact: '[email protected]',
},
cta: {
text: '索取贊助書',
},
Expand Down
25 changes: 10 additions & 15 deletions pages/about/code-of-conduct.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="py-10 md:pb-24 lg:pb-24">
<banner>
<banner class="bg-center bg-no-repeat">
<core-h1 :title="$t('title')"></core-h1>
<p class="leading-6">
{{ $t('pageAbstract') }}
Expand All @@ -9,7 +9,7 @@
<div class="mx-2 my-3 flex flex-wrap justify-center">
<div v-for="(img, i) in introImgs" :key="`intro_img_${i}`">
<div
class="mx-2 my-3 h-24 w-32 bg-contain bg-no-repeat md:mx-5 md:h-40 md:w-56"
class="mx-2 my-3 h-24 w-32 rounded-lg bg-contain bg-cover bg-no-repeat md:mx-5 md:h-40 md:w-56"
:style="getImgStyle(img)"
></div>
</div>
Expand Down Expand Up @@ -176,13 +176,13 @@ import ExtLink from '@/components/core/links/ExtLink.vue'
import IntroImg1 from '@/static/img/about/code-of-conduct/Intro-1.png'
import IntroImg2 from '@/static/img/about/code-of-conduct/Intro-2.png'
import IntroImg3 from '@/static/img/about/code-of-conduct/Intro-3.png'
import Icon1 from '@/static/img/about/code-of-conduct/Icon-1.png'
import Icon2 from '@/static/img/about/code-of-conduct/Icon-2.png'
import Icon3 from '@/static/img/about/code-of-conduct/Icon-3.png'
import ProcedureZh from '@/static/img/about/code-of-conduct/procedure-zh.png'
import ProcedureZhRwd from '@/static/img/about/code-of-conduct/procedure-zh-rwd.png'
import ProcedureEn from '@/static/img/about/code-of-conduct/procedure-en.png'
import ProcedureEnRwd from '@/static/img/about/code-of-conduct/procedure-en-rwd.png'
import Icon1 from '@/static/img/about/code-of-conduct/Icon-1.svg'
import Icon2 from '@/static/img/about/code-of-conduct/Icon-2.svg'
import Icon3 from '@/static/img/about/code-of-conduct/Icon-3.svg'
import ProcedureZh from '@/static/img/about/code-of-conduct/procedure-zh.svg'
import ProcedureZhRwd from '@/static/img/about/code-of-conduct/procedure-zh-rwd.svg'
import ProcedureEn from '@/static/img/about/code-of-conduct/procedure-en.svg'
import ProcedureEnRwd from '@/static/img/about/code-of-conduct/procedure-en-rwd.svg'
import TwoColWrapper from '@/components/core/layout/TwoColWrapper'

export default {
Expand All @@ -209,8 +209,6 @@ export default {
bannerStyle() {
return {
'background-image': `url(${this.aboutBanner})`,
'background-repeat': 'no-repeat',
'background-position': 'center',
}
},
sub2Imgs() {
Expand All @@ -225,8 +223,6 @@ export default {
getImgStyle(img) {
return {
'background-image': `url(${img})`,
'border-radius': '5%',
'background-size': 'cover',
}
},
getSub1Style(img) {
Expand All @@ -237,7 +233,6 @@ export default {
getSub2Style(img) {
return {
'background-image': `url(${img})`,
'background-position': 'center',
}
},
},
Expand Down Expand Up @@ -298,7 +293,7 @@ export default {
}

.sub2_img {
@apply mx-2 my-2 hidden bg-no-repeat md:mx-5;
@apply mx-2 my-2 hidden bg-center bg-no-repeat md:mx-5;
width: 30rem;
height: 40rem;
}
Expand Down
39 changes: 38 additions & 1 deletion pages/about/staff.vue
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,44 @@ export default {
{ name: 'Zoey', photo: 'default.jpg' },
],
finance: [{ name: 'Rock', photo: 'finance/Rock.jpg' }],
reviewer: [],
reviewer: [
{ name: 'Killik Kuo', photo: 'default.jpg' },
{ name: 'TENGLIN YU', photo: 'reviewer/Tenglin Yu.jpg' },
{ name: 'Max Lai', photo: 'default.jpg' },
{ name: '黃坤賢', photo: 'default.jpg' },
{ name: 'Pochun', photo: 'reviewer/Pochun.jpeg' },
{ name: 'Wei Lee', photo: 'default.jpg' },
{ name: 'JunWei Song', photo: 'reviewer/JunWei Song.jpeg' },
{ name: 'Chihsuan Huang', photo: 'default.jpg' },
{ name: 'kir', photo: 'reviewer/Kir.jpg' },
{ name: '曾君宇', photo: 'default.jpg' },
{ name: 'Jian-Ming Huang', photo: 'default.jpg' },
{ name: 'Stanley Huang', photo: 'default.jpg' },
{ name: 'Yu Hsun Lee', photo: 'reviewer/Yu Hsun Lee.jpg' },
{ name: 'WeiLin', photo: 'reviewer/Wei Lin.jpg' },
{ name: 'petertc', photo: 'reviewer/petertc.jpeg' },
{ name: 'Keith Yang', photo: 'default.jpg' },
{ name: '郭學聰(橘向日葵)', photo: 'default.jpg' },
{ name: 'Shuhsi Lin', photo: 'default.jpg' },
{ name: 'Sosorry', photo: 'default.jpg' },
{ name: 'Candy', photo: 'default.jpg' },
{ name: 'Louie Lu', photo: 'default.jpg' },
{ name: 'Yuan Chao', photo: 'reviewer/Yuan Chao.jpg' },
{ name: '阿哲', photo: 'default.jpg' },
{ name: 'Daisuke Saito', photo: 'default.jpg' },
{ name: 'Adrian Liaw', photo: 'default.jpg' },
{ name: 'Zong-Han Xie', photo: 'default.jpg' },
{ name: 'Tzu-Ping Chung', photo: 'default.jpg' },
{
name: 'Cheng-Lung Sung',
photo: 'reviewer/Cheng-Lung Sung.jpg',
},
{ name: 'Kuo-Tung Kao', photo: 'default.jpg' },
{ name: 'Maurice Ling', photo: 'default.jpg' },
{ name: 'KK', photo: 'default.jpg' },
{ name: 'Chihchun Tsai', photo: 'default.jpg' },
{ name: '陳俊嘉 ccc', photo: 'default.jpg' },
],
photography: [
{ name: 'Andy', photo: 'photography/Andy.jpg' },
{ name: 'Deimos', photo: 'photography/Deimos.jpg' },
Expand Down
25 changes: 16 additions & 9 deletions pages/conference/poster-session.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@
</i18n>
</banner>
<i18n-page-wrapper class="px-2 sm:px-8 md:px-16 lg:px-32" custom-x>
<core-h2 :title="$t('location.title')"></core-h2>
<i18n path="location.description" tag="p"> </i18n>
<core-h2 :title="$t('time.title')"></core-h2>
<i18n path="time.description.main" tag="p"> </i18n>
<i18n path="time.description.sub" tag="p"> </i18n>
<core-h2 :title="$t('posters.title')"></core-h2>
<div class="poster-session__container">
<article
v-for="poster in $t('posters')"
v-for="poster in $t('posters.list')"
:id="poster.id"
:key="poster.id"
class="poster-session__card"
Expand Down Expand Up @@ -80,6 +86,7 @@ import I18nPageWrapper from '@/components/core/i18n/PageWrapper'
import i18n from '@/i18n/conference/poster-session.i18n'
import Banner from '@/components/core/layout/Banner'
import CoreH1 from '@/components/core/titles/H1'
import CoreH2 from '@/components/core/titles/H2'
import Modal from './_components/modal/Modal'

export default {
Expand All @@ -88,21 +95,21 @@ export default {
components: {
Banner,
CoreH1,
CoreH2,
I18nPageWrapper,
Modal,
},
data() {
return {
isOpened: false,
selectedPoster: {
id: '1',
name: 'KK',
type: '社群講',
community: '台灣數位遊牧者社群',
topics: ['社群經營', '人際溝通', '經驗分享'],
title: '第一次當總召的我,竟然想在第一屆就辦三百人的年會',
summary:
'分享如何舉辦第一屆的三百人年會,包含志工招募、遇到問題與解決方式、大變動等等',
id: '',
name: '',
type: '',
community: '',
topics: [],
title: '',
summary: '',
},
}
},
Expand Down
2 changes: 1 addition & 1 deletion pages/sponsor/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
href="mailto:[email protected]"
highlight
underline
>{{ $t('terms.contact') }}</ext-link
>[email protected]</ext-link
>
</template>
</i18n>
Expand Down
13 changes: 13 additions & 0 deletions static/img/about/code-of-conduct/Icon-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/img/about/code-of-conduct/Icon-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading