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.

Sign up for GitHub

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

Development #207

Merged
merged 2 commits into from
Jan 23, 2018
Merged

Development #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1266147
add 2px border-radius
mar-bi Jan 23, 2018
4e6a68e
Merge pull request #206 from chingu-voyage3/dev/mar-bi/185-rounded-co…
miljan-fsd Jan 23, 2018
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
6 changes: 4 additions & 2 deletions src/layouts/components/FilterAndSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const FilterButton = styled.button`
color: ${props => props.theme.primary.dark};
text-transform: uppercase;
border: 2px solid transparent;
border-radius: 2px;
cursor: pointer;
&:hover,
&:focus {
Expand Down Expand Up @@ -68,8 +69,7 @@ const Filter = props => {
<FilterButton
key={index}
onClick={handleClick}
className={!index ? 'active' : ''}
>
className={!index ? 'active' : ''}>
{elem}
</FilterButton>
))}
Expand All @@ -90,6 +90,7 @@ const StyledInput = styled.input`
padding: 8px 4px;
font-size: 1rem;
border: 2px solid ${({ theme }) => theme.secondary.red};
border-radius: 2px 0 0 2px;
color: ${({ theme }) => theme.primary.dark};
max-width: 190px;
${media.tablet`
Expand All @@ -103,6 +104,7 @@ const StyledButton = styled.button`
padding: 9px 4px;
border: 1px solid ${({ theme }) => theme.secondary.red};
border-left-width: 0;
border-radius: 0 2px 2px 0;
background-color: ${({ theme }) => theme.secondary.red};
color: ${({ theme }) => theme.primary.dark};
cursor: pointer;
Expand Down
97 changes: 72 additions & 25 deletions src/layouts/components/JobsFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const FilterName = styled.button`
background-color: ${props => props.theme.primary.light};
color: ${props => props.theme.white};
border: none;
border-radius: 2px;
display: flex;
justify-content: space-between;
&:hover,
Expand Down Expand Up @@ -94,6 +95,7 @@ const OptionContainer = styled.div`
display: none;
position: absolute;
background-color: ${props => props.theme.white};
border-radius: 2px;
min-width: 12rem;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
Expand Down Expand Up @@ -218,12 +220,24 @@ class JobsFilter extends React.Component {
color={({ theme }) => theme.white}
/>
</FilterName>
<OptionContainer id="opt-cont-1" onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>any</FilterOption>
<FilterOption onClick={this.handleOption}>full-time</FilterOption>
<FilterOption onClick={this.handleOption}>part-time</FilterOption>
<FilterOption onClick={this.handleOption}>remote</FilterOption>
<FilterOption onClick={this.handleOption}>internship</FilterOption>
<OptionContainer
id="opt-cont-1"
onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>
any
</FilterOption>
<FilterOption onClick={this.handleOption}>
full-time
</FilterOption>
<FilterOption onClick={this.handleOption}>
part-time
</FilterOption>
<FilterOption onClick={this.handleOption}>
remote
</FilterOption>
<FilterOption onClick={this.handleOption}>
internship
</FilterOption>
</OptionContainer>
</StyledFilter>

Expand All @@ -237,12 +251,24 @@ class JobsFilter extends React.Component {
color={({ theme }) => theme.white}
/>
</FilterName>
<OptionContainer id="opt-cont-2" onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>any</FilterOption>
<FilterOption onClick={this.handleOption}>front-end</FilterOption>
<FilterOption onClick={this.handleOption}>back-end</FilterOption>
<FilterOption onClick={this.handleOption}>full-stack</FilterOption>
<FilterOption onClick={this.handleOption}>santa claus</FilterOption>
<OptionContainer
id="opt-cont-2"
onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>
any
</FilterOption>
<FilterOption onClick={this.handleOption}>
front-end
</FilterOption>
<FilterOption onClick={this.handleOption}>
back-end
</FilterOption>
<FilterOption onClick={this.handleOption}>
full-stack
</FilterOption>
<FilterOption onClick={this.handleOption}>
santa claus
</FilterOption>
</OptionContainer>
</StyledFilter>

Expand All @@ -256,12 +282,24 @@ class JobsFilter extends React.Component {
color={({ theme }) => theme.white}
/>
</FilterName>
<OptionContainer id="opt-cont-3" onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>any</FilterOption>
<FilterOption onClick={this.handleOption}>junior</FilterOption>
<FilterOption onClick={this.handleOption}>middle</FilterOption>
<FilterOption onClick={this.handleOption}>senior</FilterOption>
<FilterOption onClick={this.handleOption}>wizard</FilterOption>
<OptionContainer
id="opt-cont-3"
onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>
any
</FilterOption>
<FilterOption onClick={this.handleOption}>
junior
</FilterOption>
<FilterOption onClick={this.handleOption}>
middle
</FilterOption>
<FilterOption onClick={this.handleOption}>
senior
</FilterOption>
<FilterOption onClick={this.handleOption}>
wizard
</FilterOption>
</OptionContainer>
</StyledFilter>

Expand All @@ -275,19 +313,28 @@ class JobsFilter extends React.Component {
color={({ theme }) => theme.white}
/>
</FilterName>
<OptionContainer id="opt-cont-4" onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>any</FilterOption>
<FilterOption onClick={this.handleOption}>my city</FilterOption>
<FilterOption onClick={this.handleOption}>my country</FilterOption>
<FilterOption onClick={this.handleOption}>earth</FilterOption>
<OptionContainer
id="opt-cont-4"
onMouseLeave={this.handleMouseLeave}>
<FilterOption onClick={this.handleOption}>
any
</FilterOption>
<FilterOption onClick={this.handleOption}>
my city
</FilterOption>
<FilterOption onClick={this.handleOption}>
my country
</FilterOption>
<FilterOption onClick={this.handleOption}>
earth
</FilterOption>
</OptionContainer>
</StyledFilter>

<SubmitButton
color={this.props.theme.primary.light}
type="submit"
onClick={this.handleSubmit}
>
onClick={this.handleSubmit}>
Submit
</SubmitButton>
</FilterContainer>
Expand Down