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

46 jobs page #61

Merged
merged 20 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from 14 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
Binary file added public/Amazon-logo.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can we try to compress this image, I know we can half this 🙇‍♀️

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, but I think the image could actually appear larger as the card has a lot of negative space. Mind if we address this in a follow up PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no worries, that's fine too 👍

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/Header/DesktopHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const DesktopHeader: FC = () => {
<StyledNavLink to="/team" style={{ textDecoration: 'none', color: 'white' }}>
<Typography variant="overline">{t('header.team')}</Typography>
</StyledNavLink>
<StyledNavLink to="/jobs" style={{ textDecoration: 'none', color: 'white' }}>
<Typography variant="overline">{t('header.job')}</Typography>
</StyledNavLink>
<StyledNavLink to="/codeofconduct" style={{ textDecoration: 'none', color: 'white' }}>
<Typography variant="overline">{t('header.codeOfConduct')}</Typography>
</StyledNavLink>
Expand Down
88 changes: 88 additions & 0 deletions src/components/JobCard/JobCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { FC } from 'react'
import { Grid, Avatar, Typography, Button, Chip, Card, CardContent } from '@mui/material'
import BusinessIcon from '@mui/icons-material/Business'
import LocationOnIcon from '@mui/icons-material/LocationOn'
import AccountBalanceWalletIcon from '@mui/icons-material/AccountBalanceWallet'
import AccessTimeIcon from '@mui/icons-material/AccessTime'
import JobData from '@/types/JobListing'


interface JobCardProps {
job: JobData
}

const JobCard: FC<JobCardProps> = ({ job }) => {
const handleReadMoreClick = () => {
window.open(job.jobPostingUrl, '_blank', 'noopener,noreferrer')
}

return <Card sx={{ bgcolor: 'primary.dark', width: '100%' }}>
<CardContent>
<Grid item xs={12} md={2} display={{ xs: 'flex', sm: 'flex', md: 'none' }} alignItems="center" justifyContent="right" sx={{ marginBottom: { xs: 4, sm: 4 }, marginRight: 2 }}>
<AccessTimeIcon sx={{ marginRight: 1 }} />
<Typography fontSize="body2">
{job.publicationDate}
</Typography>
</Grid>
<Grid container alignItems="center">
<Grid item xs={12} sm={12} md={2} display="flex" justifyContent="center">
<Avatar
sx={{ bgcolor: 'white', width: 135, height: 135, borderRadius: 2, img: {objectFit: 'contain', width: '90%', height: '100%'}
}}
alt={`${job.company} logo`}
MariaAmariya marked this conversation as resolved.
Show resolved Hide resolved
src={job.logoUrl}
/>
</Grid>
<Grid item xs={12} sm={12} md={8} mt={2}>
<Typography variant="h5" mb={2} mt={2} component="div" sx={{ textAlign: 'left' }}>
{job.title}
</Typography>
<Grid container spacing={2}>
<Grid item xs={12} sm={4} sx={{ display: 'flex', justifyContent: { xs: 'flex-start', sm: 'center' }, alignItems: 'center' }}>
<BusinessIcon />
<Typography fontSize="body2" sx={{ ml: 1 }}>{job.company}</Typography>
</Grid>
<Grid item xs={12} sm={4} sx={{ display: 'flex', justifyContent: { xs: 'flex-start', sm: 'center' }, alignItems: 'center' }}>
<LocationOnIcon />
<Typography fontSize="body2" sx={{ ml: 1 }}>{job.location}</Typography>
</Grid>
{job.salary != '' &&
<Grid item xs={12} sm={4} sx={{ display: 'flex', justifyContent: { xs: 'flex-start', sm: 'center' }, alignItems: 'center' }}>
<AccountBalanceWalletIcon />
<Typography fontSize="body2" sx={{ ml: 1 }}>{job.salary}</Typography>
</Grid>
}
</Grid>
MariaAmariya marked this conversation as resolved.
Show resolved Hide resolved
<Grid direction='row' spacing={1} mt={2} justifyContent="flex-start" flexWrap="wrap">
{job.tags.map((tag, index) => (
<Chip key={index} label={tag} sx={{ bgcolor: 'secondary.dark', height: 32, borderRadius: '8px', mt: { xs: 2, sm: 0 }, ml: { xs: 1, sm: 1 }, flexShrink: 0 }} />
))}
</Grid>
MariaAmariya marked this conversation as resolved.
Show resolved Hide resolved
</Grid>
<Grid container xs={12} sm={12} md={2} paddingRight={2} sx={{ alignItems: 'flex-end', justifyContent: 'flex-start', flexDirection: 'column' }}>
<Grid item display={{ xs: 'none', sm: 'none', md: 'flex' }} alignItems="center" justifyContent="right" paddingBottom={3}>
<AccessTimeIcon sx={{ marginRight: 2 }} />
<Typography fontSize="body2">
{job.publicationDate}
</Typography>
</Grid>
<Grid item display="flex-end" sx={{ marginTop:{xs: 3}, paddingLeft: {md: 3} }}>
<Button
variant="contained"
color="tertiary"
onClick={handleReadMoreClick}
sx={{
padding: '4px 8px',
transform: { md:'translateY(40px)' } ,
}}
>
Read More
</Button>
</Grid>
</Grid>
</Grid>
</CardContent>
</Card>
}

export default JobCard
3 changes: 3 additions & 0 deletions src/components/SideDrawer/DrawerContents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const DrawerContents: FC<DrawerContentsProps> = ({ closeDrawer }) => {
<ListItem>
<StyledNavLink to='/team'>{t('sidebar.team')}</StyledNavLink>
</ListItem>
<ListItem>
<StyledNavLink to='/job'>{t('sidebar.job')}</StyledNavLink>
</ListItem>
<ListItem>
<StyledNavLink to='/codeofconduct'>{t('sidebar.codeOfConduct')}</StyledNavLink>
</ListItem>
Expand Down
10 changes: 8 additions & 2 deletions src/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"header": {
"codeOfConduct": "Code of Conduct",
"subtitle": "Women in Software Engineering Japan",
"team": "Team"
"team": "Team",
"job": "Jobs"
},
"home": {
"helloWorld": "✨ Hello World ✨",
Expand All @@ -13,9 +14,14 @@
},
"sidebar": {
"codeOfConduct": "Code of Conduct",
"team": "Team"
"team": "Team",
"job": "Job Board"
},
"team": {
"title": "✨ Leadership Team ✨"
}
,
"job": {
"title": "✨ Job Board ✨"
}
}
9 changes: 7 additions & 2 deletions src/i18n/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"header": {
"codeOfConduct": "行動規範",
"subtitle": "ウーマン・イン・ソフトウェアエンジニアリング",
"team": "チーム"
"team": "チーム",
"job": "求人掲示板"
},
"home": {
"helloWorld": "✨ Hello 世界 ✨",
Expand All @@ -13,9 +14,13 @@
},
"sidebar": {
"codeOfConduct": "Code of Conduct",
"team": "チーム"
"team": "チーム",
"job": "求人掲示板"
},
"team": {
"title": "✨ リーダーシップ・チーム ✨"
},
"job": {
"title": "✨ 求人掲示板 ✨"
}
}
24 changes: 24 additions & 0 deletions src/routes/JobBoard/JobBoard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { FC, ReactNode } from 'react'
import JobCard from '@/components/JobCard/JobCard'
import { Container, Stack, Typography } from '@mui/material'
import { useTranslation } from 'react-i18next'
import job from '@/routes/JobBoard/jobs.json'
import JobData from '@/types/JobListing'

const JobBoard:FC = () => {
const { t } = useTranslation()

const jobGrid: ReactNode[] = []
job.forEach((jobDescription: JobData) => {
jobGrid.push(<JobCard job={jobDescription}/>)
})

return <Container style={{ padding: 32 }} aria-label="job-board-container">
<Stack spacing={4}>
<Typography variant="h1">{t('job.title')}</Typography>
{jobGrid}
</Stack>
</Container>
}

export default JobBoard
32 changes: 32 additions & 0 deletions src/routes/JobBoard/jobs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"title": "Sr. Software Development Engineer, Japan Pricing and Promotions",
"company": "Amazon Japan",
"logoUrl": "/Amazon-logo.png",
"location": "Tokyo, Japan",
"jobPostingUrl": "https://www.amazon.jobs/en/jobs/2719073/sr-software-development-engineer-japan-pricing-and-promotions",
"salary": "",
"publicationDate": "2024/08/25",
"tags": ["Full Time", "Senior Level", "English"]
},
{
"title": "Software Development Engineer, Amazon Points, JP Points CX",
"company": "Amazon Japan",
"logoUrl": "/Amazon-logo.png",
"location": "Tokyo, Japan",
"jobPostingUrl": "https://www.amazon.jobs/en/jobs/2725444/software-development-engineer-amazon-points-jp-points-cx",
"salary": "",
"publicationDate": "2024/08/25",
"tags": ["Full Time", "English"]
},
{
"title": "Senior Business Intelligence Engineer, JP Retail Science",
"company": "Amazon Japan",
"logoUrl": "/Amazon-logo.png",
"location": "Tokyo, Japan",
"jobPostingUrl": "https://www.amazon.jobs/en/jobs/2560382/senior-business-intelligence-engineer-jp-retail-science",
"salary": "",
"publicationDate": "2024/08/25",
"tags": ["Full Time", "Senior Level", "SQL skills", "English"]
}
]
5 changes: 5 additions & 0 deletions src/routes/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import BaseLayout from './BaseLayout'
import NotFound from './NotFound/NotFound'
import CodeOfConduct from './CodeOfConduct/CodeOfConduct'
import Team from './Team/Team'
import JobBoard from './JobBoard/JobBoard'

const browserRouter = createHashRouter([{
element: <BaseLayout />,
Expand All @@ -25,6 +26,10 @@ const browserRouter = createHashRouter([{
path: 'team',
element: <Team />
},
{
path: 'jobs',
element: <JobBoard />
},
{
path: 'theme',
element: <ThemePreview />
Expand Down
2 changes: 1 addition & 1 deletion src/routes/ThemePreview/__test__/ColorSwatch.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('ColorSwatch', () => {
it('should display a tertiary color swatch', async () => {
render(<ColorSwatch color='tertiary' data-testid="swatch" />)
const swatch = await screen.findByTestId('swatch')
expect(swatch).toHaveStyle('background-color: rgb(0, 105, 92);')
expect(swatch).toHaveStyle('background-color: rgb(40,53,147);')
})

it('should gracefully handle an unknown color', async () => {
Expand Down
14 changes: 7 additions & 7 deletions src/theme/theme.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import createTheme from '@mui/material/styles/createTheme'
import typography from './typography/default'
import { teal, lightBlue, deepPurple, purple, grey } from '@mui/material/colors'
import { lightBlue, deepPurple, purple, grey, indigo } from '@mui/material/colors'

const theme = createTheme({
palette: {
mode: 'dark',
primary: {
light: purple[200],
light: purple[700],
main: purple[800],
dark: purple[700],
dark: purple[900],
contrastText: '#FFF'
},
secondary: {
Expand All @@ -18,9 +18,9 @@ const theme = createTheme({
contrastText: '#000',
},
tertiary: {
light: teal[400],
main: teal[800],
dark: teal[900],
light: indigo[500],
main: indigo[800],
dark: indigo[900],
contrastText: '#fff',
},
action: {
Expand All @@ -35,8 +35,8 @@ const theme = createTheme({
paper: deepPurple[900]
},
divider: lightBlue[300]

},

MariaAmariya marked this conversation as resolved.
Show resolved Hide resolved
typography
})

Expand Down
12 changes: 12 additions & 0 deletions src/types/JobListing.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
type JobListing = {
title: string,
company: string,
logoUrl: string,
location: string,
jobPostingUrl: string,
salary: string,
publicationDate: string, // date format should be YYYY/MM/DD
tags: string []
}

export default JobListing
Loading