Skip to content

Feature/topbar filters visual indicator #514

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

Merged
vikasrohit merged 3 commits into from
Nov 3, 2016
Merged

Feature/topbar filters visual indicator #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
436b950
Github issue #320 [Search] - when filters are hide don't take them in…
Nov 3, 2016
3f9f197
Github issue #320 [Search] - when filters are hide don't take them in…
Nov 3, 2016
7f92415
Merge branch 'dev' into feature/topbar-filters-visual-indicator
Nov 3, 2016
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
4 changes: 3 additions & 1 deletion src/components/TopBar/TopBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ require('./TopBar.scss')
import React, {PropTypes, Component} from 'react'
import { Link } from 'react-router'
import cn from 'classnames'
import _ from 'lodash'
import { UserDropdown, Icons } from 'appirio-tech-react-components'

const { ConnectLogoBeta } = Icons
Expand Down Expand Up @@ -94,6 +95,7 @@ class TopBar extends Component {
if (isProjectDetails) {
return <ProjectToolBar isPowerUser={isPowerUser} logo={logo} avatar={avatar} project={project} />
}
const noOfFilters = _.keys(criteria).length - 1 // -1 for default sort criteria

return (
// <Sticky>
Expand All @@ -116,7 +118,7 @@ class TopBar extends Component {
href="javascript:"
className={cn('tc-btn tc-btn-sm', {active: isFilterVisible})}
onClick={this.props.onToggleFilter}
>Filters</a>
>Filters { noOfFilters > 0 && <span className="filter-indicator">{ noOfFilters }</span> }</a>
</div>}
</div>
{avatar}
Expand Down
20 changes: 17 additions & 3 deletions src/components/TopBar/TopBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ $tc-body-large : 20px;

.search-bar{
margin: 0 auto;
width: 585px;
width: 605px;
padding-top: 15px;
display: flex;
justify-content:space-between;
Expand All @@ -88,9 +88,11 @@ $tc-body-large : 20px;
height: 30px;
}
.search-filter{
width: 77px;
width: 97px;
.tc-btn{
display: block;
display: flex;
align-items: center;
justfiy-content: center;
padding: 5px 0 5px 34px;
text-align: left;
color: $tc-gray-40;
Expand Down Expand Up @@ -118,6 +120,18 @@ $tc-body-large : 20px;
}
}
}

.filter-indicator {
width: 15px;
height: 15px;
margin-left: $base-unit;
background-color: $tc-dark-blue-90;
border-radius: 26px;
color: $tc-white;
display: flex;
justify-content: center;
align-items: center;
}
}
}
.welcome-info{
Expand Down
13 changes: 7 additions & 6 deletions src/projects/list/components/Projects/Projects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ class Projects extends Component {
// check for criteria specified in URL.
const queryParams = _.get(this.props, 'location.query', null)
if (!_.isEmpty(queryParams)) {
if (queryParams.sort) criteria.sort = queryParams.sort
if (queryParams.name) criteria.name = decodeURIComponent(queryParams.name)
if (queryParams.status) criteria.status = queryParams.status
if (queryParams.type) criteria.type = queryParams.type
if (queryParams.memberOnly) criteria.memberOnly = queryParams.memberOnly
const initialCriteria = {}
if (queryParams.sort) initialCriteria.sort = queryParams.sort
if (queryParams.name) initialCriteria.name = decodeURIComponent(queryParams.name)
if (queryParams.status) initialCriteria.status = queryParams.status
if (queryParams.type) initialCriteria.type = queryParams.type
if (queryParams.memberOnly) initialCriteria.memberOnly = queryParams.memberOnly
if (queryParams.page) pageNum = parseInt(queryParams.page)
loadProjects(criteria, pageNum)
loadProjects(initialCriteria, pageNum)
} else {
this.routeWithParams(criteria, pageNum)
}
Expand Down