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

WAITP-1474: Update success illustration on DataTrak #5159

Merged
merged 8 commits into from
Nov 17, 2023
Merged

WAITP-1474: Update success illustration on DataTrak #5159

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d52a67
generify high-five graphic filename
jaskfla Nov 10, 2023
2423ea1
update submission success graphic
jaskfla Nov 10, 2023
7d41360
define margins along block/inline axes
jaskfla Nov 10, 2023
bde6843
Merge branch 'datatrak-web-epic' into waitp-1474-update-success-graphic
jaskfla Nov 12, 2023
dc7e0a9
success screen fix horizontal overflow
jaskfla Nov 12, 2023
8dc2044
define survey success image dimen with `rem`
jaskfla Nov 12, 2023
8458afe
relabel button ‘Close’ → ‘Return to dashboard’
jaskfla Nov 12, 2023
b24d3c8
Merge branch 'datatrak-web-epic' into waitp-1474-update-success-graphic
jaskfla Nov 13, 2023
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
0 ...s/datatrak-web/public/survey-activity.svg → .../datatrak-web/public/tupaia-high-five.svg
View file
Open in desktop
File renamed without changes
14 changes: 8 additions & 6 deletions packages/datatrak-web/src/features/Survey/Screens/SurveySuccessScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ const Container = styled.div`
`;

const StyledImg = styled.img`
aspect-ratio: 1;
width: 23rem;
max-width: 80%;
max-height: 50%;
margin-bottom: 2.75rem;
margin-block-end: 2.75rem;
`;

const Title = styled(Typography).attrs({
Expand All @@ -41,18 +43,18 @@ const Title = styled(Typography).attrs({
font-size: 1.375rem;
font-weight: 600;
text-align: center;
margin-bottom: 1rem;
margin-block-end: 1rem;
${({ theme }) => theme.breakpoints.up('md')} {
font-size: 1.9rem;
margin-bottom: 1.19rem;
margin-block-end: 1.19rem;
}
`;

const Text = styled(Typography)`
max-width: 34.6rem;
width: 100%;
text-align: center;
margin-bottom: 1.875rem;
margin-block-end: 1.875rem;
`;

const ButtonGroup = styled.div`
Expand Down Expand Up @@ -94,7 +96,7 @@ export const SurveySuccessScreen = () => {
return (
<Wrapper>
<Container>
<StyledImg src="/submit-success.svg" alt="Survey submit success" />
<StyledImg src="/tupaia-high-five.svg" alt="Survey submit success" />
<Title>Survey submitted!</Title>
<Text>{text}</Text>
<ButtonGroup>
Expand All @@ -104,7 +106,7 @@ export const SurveySuccessScreen = () => {
</Button>
)}
<Button to="/" fullWidth>
Close
Return to dashboard
</Button>
</ButtonGroup>
</Container>
Expand Down
2 changes: 1 addition & 1 deletion packages/datatrak-web/src/views/LandingPage/ActivityFeedSection/ActivityFeedSurveyItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const ListItemImageContainer = styled.div`
`;

const Image = styled.img.attrs({
src: '/survey-activity.svg',
src: '/tupaia-high-five.svg',
})`
height: 100%;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion packages/datatrak-web/src/views/SurveyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const SurveyScreenContainer = styled.div<{
overflow: ${({ $scrollable }) => ($scrollable ? 'auto' : 'hidden')};
align-items: flex-start;
height: calc(100vh - ${HEADER_HEIGHT} - ${SURVEY_TOOLBAR_HEIGHT});
width: 100vw;
width: 100%;
jaskfla marked this conversation as resolved.
Show resolved Hide resolved
${({ theme }) => theme.breakpoints.up('md')} {
margin-left: -1.25rem;
padding-top: ${({ $scrollable }) => ($scrollable ? '0' : '2rem')};
Expand Down