Skip to content

Commit

Permalink
Merge pull request #16 from lego37yoon/dev
Browse files Browse the repository at this point in the history
티켓 매진 반영 및 키노트 연사 추가
  • Loading branch information
sukso96100 authored Aug 23, 2023
2 parents 261c542 + 2b80723 commit 8050140
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 27 deletions.
Binary file added public/speakers/385.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/speakers/386.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 31 additions & 20 deletions src/components/FeaturedSessions.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,56 @@ const { baseUrl, sessionEndpoint } = Astro.props;
const lang = getLangFromUrl(Astro.url);
const t = useTranslations(lang);
const sessions = data.results ? data.results[0].contributions : null;
const imgList = [190, 203, 209, 210, 219, 272, 288, 290, 298, 299];
const speakerList = [190, 219, 290, 299];
const imgList = [190, 203, 209, 210, 219, 272, 288, 290, 298, 299, 385, 386];
const speakerList = [190, 219, 290, 299, 385, 386];
const sessionList = sessions ?
sessions.filter(item => speakerList.includes(item["speakers"][0]["person_id"])).map(item => {
const speakers = [item["speakers"][0]["fullName"]];
const speakers = [
{
name: item["speakers"][0]["fullName"],
img: item["speakers"][0]["person_id"]
}
];
if (item["speakers"].length > 1) {
for (let speaker = 1; speaker < item["speakers"].length; speaker++) {
speakers.push(item["speakers"][speaker]["fullName"]);
speakers.push({
name: item["speakers"][speaker]["fullName"],
img: item["speakers"][speaker]["person_id"]
});
}
}
return {
title: item["title"],
type: item["type"],
speaker: speakers.join("·"),
imgId: item["speakers"][0]["person_id"],
speaker: speakers,
url: item["url"]
};
}).slice(0, 4) : null;
}).slice(0, 5) : null;
---

<Strip shallow element="section">
<h2>{t("featured.tagline")}</h2>
<Row>
{sessionList ? sessionList.map(item => (
<Col size={6}>
<div class="p-media-object--large">
<img class="p-media-object__image is-round"
src={imgList.includes(item.imgId) ? `/speakers/${item.imgId}.png` : "/speakers/default.png"} alt="" />
<div class="p-media-object__details">
<a href={item.url}>
<h3>{item.speaker}</h3>
</a>
<p class="p-media-object__content">{item.title}</p>
{sessionList ? sessionList.map(item =>
item.speaker ? item.speaker.map(person => (
<Col size={6}>
<div class="p-media-object--large">
<img class="p-media-object__image is-round"
src={imgList.includes(person.img) ? `/speakers/${person.img}.png` : "/speakers/default.png"} alt="" />
<div class="p-media-object__details">
<a href={item.url}>
<h3>{person.name}</h3>
</a>
<p class="p-media-object__content">{item.title}</p>
</div>
</div>
</div>
</Col>
)) : <p>오류가 발생하여 불러오지 못했습니다.</p>}
</Col>
)): ""
) : <p>오류가 발생하여 불러오지 못했습니다.</p>}
</Row>
<Row style={{marginTop: "1em"}}>
<Col size={12} className="u-align-text--right">
Expand Down
12 changes: 6 additions & 6 deletions src/i18n/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export const ui = {
'sponsorship.tagline': '지금 후원사로 등록하세요',
'sponsorship.desc': 'UbuCon Korea 2023에 후원하고, 우분투 커뮤니티에서의 후원사 브랜딩을 강화하거나, 새로운 동료를 채용하세요.',
'sponsorship.details': '후원사 등록하기',
'tickets.tagline': '티켓 구입하기',
'tickets.desc': '행사를 즐기실 준비가 되셨나요? 지금 티켓을 구입하시고, 9월 9일 토요일 한국마이크로소프트에서 만나요! 우분투한국커뮤니티 회비 회원, 학생, 얼리버드 구입자는 10% 할인 혜택을 받을 수 있습니다.',
'tickets.details': '티켓 구입하기',
'tickets.tagline': '티켓 구입 안내',
'tickets.desc': '티켓이 모두 매진되었습니다. 9월 9일 토요일 한국마이크로소프트에서 만나요! 현장 참여가 어려우신 분들을 위해, 온라인 스트리밍도 예정되어 있으니 많은 관심 부탁드립니다.',
'tickets.details': '티켓 구입 안내',
'cfp.title': '발표 제안 제출안내',
'cfp.desc': '세션 및 워크숍 발표 제안이 마감되었습니다. 우분투를 개발 생산성 향상에 활용해 본 경험이 있거나, 우분투 및 관련 오픈소스와 연관하여 짧게나마 공유하고 싶은 경험이 있다면, 9월 9일 당일 라이트닝 토크 세션에서 지원해보세요!',
'cfp.submit': '제안서 제출안내',
Expand Down Expand Up @@ -54,9 +54,9 @@ export const ui = {
'sponsorship.tagline': 'Become a sponsor today',
'sponsorship.desc': 'Sponsor UbuCon Korea 2023 to empower your branding in Ubuntu Community and hire new people.',
'sponsorship.details': 'Become a sponsor',
'tickets.tagline': 'Get your tickets now',
'tickets.desc': 'Are you ready to enjoy UbuCon Korea 2023? Get a ticket today and meet at Microsoft Korea on Saturday, September 9! For those who are students, members of Ubuntu Korea Community, or registering tickets during early bird periods, you can get a 10% discount on the original price.',
'tickets.details': 'Get tickets',
'tickets.tagline': 'About buying tickets',
'tickets.desc': 'The tickets are all sold out. Meet at Microsoft Korea on Saturday, September 9! For those who cannot participate in the venue, we will provide online streaming at the same time. So, stay tuned!',
'tickets.details': 'Ticket Information',
'cfp.title': 'Call for proposals',
'cfp.desc': 'The call for proposals is closed. If you have any experience on boosting your developer productivity using Ubuntu, or have your own unique experience around Ubuntu and FOSS to share briefly, attend on Saturday, September 9 and try to become a speaker in a session of lightning talks!',
'cfp.submit': 'Read the submission notice',
Expand Down
3 changes: 2 additions & 1 deletion src/pages/[lang]/sponsors/[...slug].astro
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const { lang, slug } = Astro.params;
const page = Astro.props;
const { Content } = await page.render();
const partnerCategory = ["Government", "Media"];
const sponsorColorMap = {
Government: "grey",
Diamond: "diamond",
Expand All @@ -45,7 +46,7 @@ const sponsorColorMap = {
class="p-chip"
style={{ backgroundColor: sponsorColorMap[page.data.class] }}
>
<span class="p-chip__value">{page.data.class === "Government" ? `${page.data.class} Partner` : `${page.data.class} Sponsor`}</span
<span class="p-chip__value">{partnerCategory.includes(page.data.class) ? `${page.data.class} Partner` : `${page.data.class} Sponsor`}</span
>
</button>
<h1>{page.data.title}</h1>
Expand Down

0 comments on commit 8050140

Please sign in to comment.