Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions e2e/team.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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], 'キルザー・杏', '共同創立者・レガシー・ディレクター')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ describe('TeamMemberCard', () => {
titleEN: 'Lead',
titleJA: 'リード',
image: 'example.png',
status: 'active',
url: 'https://example.com'
} as TeamMember

Expand Down Expand Up @@ -49,6 +50,7 @@ describe('TeamMemberCard', () => {
titleEN: 'Lead',
titleJA: '',
image: 'example.png',
status: 'active',
url: 'https://example.com'
} as TeamMember

Expand Down
3 changes: 2 additions & 1 deletion src/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"wiki": "Wiki"
},
"team": {
"title": "✨ Leadership Team ✨"
"title": "✨ Leadership Team ✨",
"subtitle": "✨ Legacy Leadership Team ✨"
},
"job": {
"title": "✨ Job Board ✨"
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"wiki": "Wiki"
},
"team": {
"title": "✨ リーダーシップチーム ✨"
"title": "✨ リーダーシップチーム ✨",
"subtitle": "✨ レガシー・リーダーシップチーム ✨"
},
"job": {
"title": "✨ 求人情報 ✨"
Expand Down
23 changes: 20 additions & 3 deletions src/routes/Team/Team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,20 @@ const Team: FC = () => {

const teamGrid: ReactNode[] = []
team.forEach((member: TeamMember) => {
teamGrid.push(<Grid key={member.nameEN}>
<TeamMemberCard member={member} />
</Grid>)
if (member.status == 'active') {
teamGrid.push(<Grid key={member.nameEN}>
<TeamMemberCard member={member} />
</Grid>)
}
})

const legacyTeamGrid: ReactNode[] = []
team.forEach((member: TeamMember) => {
if (member.status == 'legacy') {
legacyTeamGrid.push(<Grid key={member.nameEN}>
<TeamMemberCard member={member} />
</Grid>)
}
})

return <Container style={{ padding: 32 }} aria-label="team-container">
Expand All @@ -26,6 +37,12 @@ const Team: FC = () => {
{teamGrid}
</Grid>
</Stack>
<Stack spacing={2}>
<Typography variant="h1">{t('team.subtitle')}</Typography>
<Grid container spacing={2}>
{legacyTeamGrid}
</Grid>
</Stack>
</Container>
}

Expand Down
6 changes: 6 additions & 0 deletions src/routes/Team/__test__/Team.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ describe('Team', () => {
const title = await screen.findByText('✨ Leadership Team ✨')
expect(title).toBeVisible()
})

it('should render the Team page', async () => {
render(<Team />)
const subtitle = await screen.findByText('✨ Legacy Leadership Team ✨')
expect(subtitle).toBeVisible()
})
})
29 changes: 19 additions & 10 deletions src/routes/Team/team.json
Original file line number Diff line number Diff line change
@@ -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": ""
},
{
Expand All @@ -29,6 +32,7 @@
"titleEN": "Lead",
"titleJA": "リード",
"image": "Rossella.jpg",
"status": "active",
"url": "https://www.rossellaferrandino.info/"
},
{
Expand All @@ -37,6 +41,7 @@
"titleEN": "Lead",
"titleJA": "リード",
"image": "Ishika.jpg",
"status": "active",
"url": ""
},
{
Expand All @@ -45,6 +50,7 @@
"titleEN": "Co-founder & Legacy Director",
"titleJA": "共同創立者・レガシー・ディレクター",
"image": "Ann.jpg",
"status": "legacy",
"url": "https://annkilzer.net"
},
{
Expand All @@ -53,6 +59,7 @@
"titleEN": "Legacy Lead",
"titleJA": "レガシー・リード",
"image": "Ania.jpg",
"status": "legacy",
"url": ""
},
{
Expand All @@ -61,6 +68,7 @@
"titleEN": "Legacy Lead",
"titleJA": "レガシー・リード",
"image": "Krizza.jpg",
"status": "legacy",
"url": ""
},
{
Expand All @@ -69,6 +77,7 @@
"titleEN": "Legacy Lead",
"titleJA": "レガシー・リード",
"image": "Aidan.jpg",
"status": "legacy",
"url": ""
}
]
1 change: 1 addition & 0 deletions src/types/TeamMember.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ type TeamMember = {
titleEN: string
titleJA: string
image: string
status: string
url: string
}

Expand Down
Loading