diff --git a/e2e/team.spec.ts b/e2e/team.spec.ts index e1f014d..eb75bbc 100644 --- a/e2e/team.spec.ts +++ b/e2e/team.spec.ts @@ -24,13 +24,16 @@ test('shows the team in English', async ({ page }) => { const heading = teamContainer.getByText('✨ Leadership Team ✨') await expect(heading).toBeVisible() + const legacyHeading = teamContainer.getByText('✨ Legacy Leadership Team ✨') + await expect(legacyHeading).toBeVisible() + const cards = await teamContainer.getByLabel('team-member-card').all() expect(cards).toHaveLength(9) await verifyTeamMemberCard(cards[0], 'Paty Cortez', 'Director') - await verifyTeamMemberCard(cards[1], 'Maria Tenorio', 'Lead') - await verifyTeamMemberCard(cards[2], 'Daria Vazhenina', 'ML & Data Science Lead') + await verifyTeamMemberCard(cards[1], 'Daria Vazhenina', 'Director') + await verifyTeamMemberCard(cards[2], 'Maria Tenorio', 'Lead') await verifyTeamMemberCard(cards[3], 'Rossella Ferrandino', 'Lead') await verifyTeamMemberCard(cards[4], 'Ishika Bhosale', 'Lead') await verifyTeamMemberCard(cards[5], 'Ann Kilzer', 'Co-founder & Legacy Director') @@ -75,12 +78,15 @@ test('shows the team in Japanese', async ({ page, viewport }) => { const heading = teamContainer.getByText('✨ リーダーシップチーム ✨') await expect(heading).toBeVisible() + const legacyHeading = teamContainer.getByText('✨ レガシー・リーダーシップチーム ✨') + await expect(legacyHeading).toBeVisible() + const cards = await teamContainer.getByLabel('team-member-card').all() expect(cards).toHaveLength(9) - await verifyTeamMemberCard(cards[0], 'Paty Cortez', 'ディレクター') - await verifyTeamMemberCard(cards[1], 'Maria Tenorio', 'リード') - await verifyTeamMemberCard(cards[2], 'バジェニナ・ダリヤ', 'ML&データサイエンス・リード') + await verifyTeamMemberCard(cards[0], 'コルテス・パティ', 'ディレクター') + await verifyTeamMemberCard(cards[1], 'バジェニナ・ダリヤ', 'ディレクター') + await verifyTeamMemberCard(cards[2], 'テノリオ・マリア', 'リード') await verifyTeamMemberCard(cards[3], 'フェッランディノ・ロッセッラ', 'リード') await verifyTeamMemberCard(cards[4], 'ビーオゼール・イシカ', 'リード') await verifyTeamMemberCard(cards[5], 'キルザー・杏', '共同創立者・レガシー・ディレクター') diff --git a/src/components/TeamMemberCard/__team__/TeamMemberCard.test.tsx b/src/components/TeamMemberCard/__team__/TeamMemberCard.test.tsx index 7363e0e..2f9a29b 100644 --- a/src/components/TeamMemberCard/__team__/TeamMemberCard.test.tsx +++ b/src/components/TeamMemberCard/__team__/TeamMemberCard.test.tsx @@ -14,6 +14,7 @@ describe('TeamMemberCard', () => { titleEN: 'Lead', titleJA: 'リード', image: 'example.png', + status: 'active', url: 'https://example.com' } as TeamMember @@ -49,6 +50,7 @@ describe('TeamMemberCard', () => { titleEN: 'Lead', titleJA: '', image: 'example.png', + status: 'active', url: 'https://example.com' } as TeamMember diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json index 7566272..bf17541 100644 --- a/src/i18n/en/translation.json +++ b/src/i18n/en/translation.json @@ -29,7 +29,8 @@ "wiki": "Wiki" }, "team": { - "title": "✨ Leadership Team ✨" + "title": "✨ Leadership Team ✨", + "subtitle": "✨ Legacy Leadership Team ✨" }, "job": { "title": "✨ Job Board ✨" diff --git a/src/i18n/ja/translation.json b/src/i18n/ja/translation.json index 7c79d2f..83fad13 100644 --- a/src/i18n/ja/translation.json +++ b/src/i18n/ja/translation.json @@ -29,7 +29,8 @@ "wiki": "Wiki" }, "team": { - "title": "✨ リーダーシップチーム ✨" + "title": "✨ リーダーシップチーム ✨", + "subtitle": "✨ レガシー・リーダーシップチーム ✨" }, "job": { "title": "✨ 求人情報 ✨" diff --git a/src/routes/Team/Team.tsx b/src/routes/Team/Team.tsx index da6f0d3..31187cf 100644 --- a/src/routes/Team/Team.tsx +++ b/src/routes/Team/Team.tsx @@ -14,9 +14,20 @@ const Team: FC = () => { const teamGrid: ReactNode[] = [] team.forEach((member: TeamMember) => { - teamGrid.push( - - ) + if (member.status == 'active') { + teamGrid.push( + + ) + } + }) + + const legacyTeamGrid: ReactNode[] = [] + team.forEach((member: TeamMember) => { + if (member.status == 'legacy') { + legacyTeamGrid.push( + + ) + } }) return @@ -26,6 +37,12 @@ const Team: FC = () => { {teamGrid} + + {t('team.subtitle')} + + {legacyTeamGrid} + + } diff --git a/src/routes/Team/__test__/Team.test.tsx b/src/routes/Team/__test__/Team.test.tsx index dc16a51..57d490c 100644 --- a/src/routes/Team/__test__/Team.test.tsx +++ b/src/routes/Team/__test__/Team.test.tsx @@ -9,4 +9,10 @@ describe('Team', () => { const title = await screen.findByText('✨ Leadership Team ✨') expect(title).toBeVisible() }) + + it('should render the Team page', async () => { + render() + const subtitle = await screen.findByText('✨ Legacy Leadership Team ✨') + expect(subtitle).toBeVisible() + }) }) diff --git a/src/routes/Team/team.json b/src/routes/Team/team.json index 9e47955..a4fa698 100644 --- a/src/routes/Team/team.json +++ b/src/routes/Team/team.json @@ -1,26 +1,29 @@ [ { "nameEN": "Paty Cortez", - "nameJA": "", + "nameJA": "コルテス・パティ", "titleEN": "Director", "titleJA": "ディレクター", "image": "Paty.jpg", + "status": "active", + "url": "" + }, + { + "nameEN": "Daria Vazhenina", + "nameJA": "バジェニナ・ダリヤ", + "titleEN": "Director", + "titleJA": "ディレクター", + "image": "Daria.jpg", + "status": "active", "url": "" }, { "nameEN": "Maria Tenorio", - "nameJA": "", + "nameJA": "テノリオ・マリア", "titleEN": "Lead", "titleJA": "リード", "image": "Maria.jpg", - "url": "" - }, - { - "nameEN": "Daria Vazhenina", - "nameJA": "バジェニナ・ダリヤ", - "titleEN": "ML & Data Science Lead", - "titleJA": "ML&データサイエンス・リード", - "image": "Daria.jpg", + "status": "active", "url": "" }, { @@ -29,6 +32,7 @@ "titleEN": "Lead", "titleJA": "リード", "image": "Rossella.jpg", + "status": "active", "url": "https://www.rossellaferrandino.info/" }, { @@ -37,6 +41,7 @@ "titleEN": "Lead", "titleJA": "リード", "image": "Ishika.jpg", + "status": "active", "url": "" }, { @@ -45,6 +50,7 @@ "titleEN": "Co-founder & Legacy Director", "titleJA": "共同創立者・レガシー・ディレクター", "image": "Ann.jpg", + "status": "legacy", "url": "https://annkilzer.net" }, { @@ -53,6 +59,7 @@ "titleEN": "Legacy Lead", "titleJA": "レガシー・リード", "image": "Ania.jpg", + "status": "legacy", "url": "" }, { @@ -61,6 +68,7 @@ "titleEN": "Legacy Lead", "titleJA": "レガシー・リード", "image": "Krizza.jpg", + "status": "legacy", "url": "" }, { @@ -69,6 +77,7 @@ "titleEN": "Legacy Lead", "titleJA": "レガシー・リード", "image": "Aidan.jpg", + "status": "legacy", "url": "" } ] diff --git a/src/types/TeamMember.ts b/src/types/TeamMember.ts index f46224e..933f8f6 100644 --- a/src/types/TeamMember.ts +++ b/src/types/TeamMember.ts @@ -4,6 +4,7 @@ type TeamMember = { titleEN: string titleJA: string image: string + status: string url: string }