Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

APPS-2313: CDSS WOA-5 Remediation of ADA compliance violations #40

Merged
merged 16 commits into from
Sep 24, 2020
Merged

APPS-2313: CDSS WOA-5 Remediation of ADA compliance violations #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
68ff980
APPS-2315 provide aria label to LUK Select
bergieboy Sep 21, 2020
20e779f
provides proper contrast between the placeholder text and it's backgr…
bergieboy Sep 21, 2020
e3fa376
APPS-2326 Set `user-scalable` to yes & `maximum-scale` to 5 on meta tag
bergieboy Sep 21, 2020
7ea84df
use LUK Colors and rename fn to getTheme
bergieboy Sep 22, 2020
211800a
oops
bergieboy Sep 22, 2020
de70488
This is singular now
bergieboy Sep 22, 2020
5eb7251
set aria-autocomplete to 'none' on the input element in `react-select`
bergieboy Sep 23, 2020
d870262
bump LUK and add contributor ;)
bergieboy Sep 23, 2020
1c88f90
update package-lock
bergieboy Sep 23, 2020
7b3439e
explanation for yucky assignment of aria attribute
bergieboy Sep 23, 2020
c622c3b
add styles provider
bergieboy Sep 23, 2020
857c2ce
update button to use endIcon
bergieboy Sep 23, 2020
4929776
removed buttons that aren't being used
bergieboy Sep 23, 2020
6765614
replaced InfoButton with LUK Button and styled
bergieboy Sep 23, 2020
7b66942
InfoButton is no more
bergieboy Sep 23, 2020
55df2ad
this needs to happen on render
bergieboy Sep 23, 2020
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
1,846 changes: 1,300 additions & 546 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
{
"name": "Hristo Oskov",
"email": "hristo@openlattice.com"
},
{
"name": "Todd Bergman",
"email": "todd@openlattice.com"
}
],
"repository": {
Expand Down Expand Up @@ -50,7 +54,7 @@
"immutable": "4.0.0-rc.9",
"jwt-decode": "~2.2.0",
"lattice": "~0.73.0",
"lattice-ui-kit": "~0.30.1",
"lattice-ui-kit": "~0.38.0",
"lodash": "~4.17.10",
"loglevel": "~1.6.0",
"luxon": "~1.21.0",
Expand Down
33 changes: 0 additions & 33 deletions src/components/buttons/BasicButton.js
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions src/components/buttons/DropdownButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ const DropdownButtonWrapper = styled.div`
position: relative;
`;

const BaseButton = styled(Button)`
svg {
margin-left: 10px;
}
`;

const MenuContainer = styled.div`
background-color: white;
border-radius: 3px;
Expand Down Expand Up @@ -101,14 +95,14 @@ class DropdownButton extends Component<Props, State> {

return (
<DropdownButtonWrapper>
<BaseButton
<Button
endIcon={<FontAwesomeIcon icon={faChevronDown} fixedWidth />}
isLoading={isLoading}
onBlur={this.closeDropdown}
onClick={this.toggleDropdown}
size={size}>
{title}
<FontAwesomeIcon icon={faChevronDown} fixedWidth />
</BaseButton>
</Button>
{ open && (
<MenuContainer offset={size}>
{options.map((option) => (
Expand Down
34 changes: 0 additions & 34 deletions src/components/buttons/InfoButton.js
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions src/components/buttons/LinkButton.js
View file
Open in desktop

This file was deleted.

17 changes: 10 additions & 7 deletions src/containers/app/AppContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
Spinner,
ThemeProvider,
lightTheme,
StylesProvider
Copy link
Member

Choose a reason for hiding this comment

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

Please sort.

} from 'lattice-ui-kit';
import { connect } from 'react-redux';
import { Redirect, Route, Switch } from 'react-router-dom';
Expand Down Expand Up @@ -131,13 +132,15 @@ class AppContainer extends Component<Props> {
return (
<ThemeProvider theme={lightTheme}>
<MuiPickersUtilsProvider utils={LatticeLuxonUtils}>
<AppContainerWrapper>
<AppHeaderContainer />
<AppContentOuterWrapper>
{ this.renderUnsupportedBrowserModal() }
{ this.renderAppContent() }
</AppContentOuterWrapper>
</AppContainerWrapper>
<StylesProvider injectFirst>
<AppContainerWrapper>
<AppHeaderContainer />
<AppContentOuterWrapper>
{ this.renderUnsupportedBrowserModal() }
{ this.renderAppContent() }
</AppContentOuterWrapper>
</AppContainerWrapper>
</StylesProvider>
</MuiPickersUtilsProvider>
</ThemeProvider>
);
Expand Down
28 changes: 7 additions & 21 deletions src/containers/location/providers/EditFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
// @flow

import React from 'react';

import styled, { css } from 'styled-components';
import styled from 'styled-components';
import { faChevronLeft } from '@fortawesome/pro-light-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { List, Map } from 'immutable';
import { Colors } from 'lattice-ui-kit';
import { FILTER_HEADERS } from './constants';
import { Button, Colors } from 'lattice-ui-kit';
import { APP_CONTAINER_WIDTH, HEADER_HEIGHT } from '../../../core/style/Sizes';

import ActiveOnlyFilter from './filters/ActiveOnlyFilter';
import ChildrenFilter from './filters/ChildrenFilter';
import DayAndTimeFilter from './filters/DayAndTimeFilter';
import RadiusFilter from './filters/RadiusFilter';
import TypeOfCareFilter from './filters/TypeOfCareFilter';
import InfoButton from '../../../components/buttons/InfoButton';
import { ContentOuterWrapper, ContentWrapper } from '../../../components/layout';
import { PROVIDERS } from '../../../utils/constants/StateConstants';
import { LABELS, HEADER_LABELS } from '../../../utils/constants/Labels';
Expand Down Expand Up @@ -75,16 +71,6 @@ const EditFilterHeader = styled.div`
color: #555E6F;
`;

const fixedBottomButtonStyle = css`
border-radius: 3px;
border: none;
width: 100%;
font-family: Inter;
font-weight: 600;
font-size: 14px;
line-height: 17px;
`;

const ApplyButtonWrapper = styled.div`
position: fixed;
padding: 10px ${PADDING}px 30px ${PADDING}px;
Expand All @@ -93,10 +79,10 @@ const ApplyButtonWrapper = styled.div`
height: 70px;
background-color: white;
z-index: 16;
`;
const SaveFilterButton = styled(InfoButton)`
${fixedBottomButtonStyle}
button {
width: 100%;
}
`;

const FILTER_COMPONENTS = {
Expand Down Expand Up @@ -160,9 +146,9 @@ export default class EditFilter extends React.Component {

</StyledContentWrapper>
<ApplyButtonWrapper>
<SaveFilterButton disabled={!isValid} onClick={() => onSave({ field, value })}>
<Button color="primary" disabled={!isValid} onClick={() => onSave({ field, value })}>
{renderText(LABELS.SAVE)}
</SaveFilterButton>
</Button>
</ApplyButtonWrapper>
</StyledContentOuterWrapper>
);
Expand Down
Loading