From 53a2eb4b2e0a844bba543c2392c2a622fce0e336 Mon Sep 17 00:00:00 2001 From: AdhamAH Date: Fri, 17 Apr 2020 19:47:07 +0200 Subject: [PATCH 1/2] motion --- client/src/components/About.jsx | 116 ++-- client/src/components/DiagnosticContainer.jsx | 16 +- client/src/components/OnboardUser.jsx | 643 +++++++++--------- 3 files changed, 406 insertions(+), 369 deletions(-) diff --git a/client/src/components/About.jsx b/client/src/components/About.jsx index e3c475c3..d137a84b 100644 --- a/client/src/components/About.jsx +++ b/client/src/components/About.jsx @@ -12,6 +12,7 @@ import { makeStyles } from '@material-ui/core/styles'; import Container from '@material-ui/core/Container'; import Link from '@material-ui/core/Link'; import { CodivId, AdvisoryBoard } from '../utils/imgUrl'; +import { Transition, animated } from 'react-spring'; // TODO add once we get it :) function Copyright() { @@ -86,61 +87,70 @@ const About = () => { const classes = useStyles(); return ( -
- -
-
- - - For the community, by the community + + + {props => ( + +
+
+ + + For the community, by the community + + + CoronaTracker is an easy-to-use, private-by-design, open-source application for monitoring your + health and staying informed during the COVID-19 crisis. Here's what we've accomplished so + far + + +
+ + {/* End hero unit */} + + {cards.map(card => ( + + + + + + {card.title} + + {card.about} + + + + ))} + + +
+
+ + Support Us! - - CoronaTracker is an easy-to-use, private-by-design, open-source application for monitoring your health - and staying informed during the COVID-19 crisis. Here's what we've accomplished so far + + Star our GitHub, fill out our user survey, anything counts! CoronaTracker is made with{' '} + + ❤️ + {' '} + in NYC and across the globe - -
- - {/* End hero unit */} - - {cards.map(card => ( - - - - - - {card.title} - - {card.about} - - - - ))} - - -
-
- - Support Us! - - - Star our GitHub, fill out our user survey, anything counts! CoronaTracker is made with{' '} - - ❤️ - {' '} - in NYC and across the globe - - - Take our Beta Survey! - - {/* */} -
- -
+ + Take our Beta Survey! + + {/* */} + + + )} + + ); }; diff --git a/client/src/components/DiagnosticContainer.jsx b/client/src/components/DiagnosticContainer.jsx index 2ffa5ecf..ccf2dd40 100644 --- a/client/src/components/DiagnosticContainer.jsx +++ b/client/src/components/DiagnosticContainer.jsx @@ -6,6 +6,8 @@ import { Typography } from '@material-ui/core'; import HealthLogToggle from './HealthLogToggle'; import Survey from './survey/Survey'; +import { Transition, animated } from 'react-spring'; + const useStyles = makeStyles({ hr: { width: '100px', @@ -43,6 +45,14 @@ function DiagnosticContainer() { return hasSubmitted() ? (
+ + + {props => ( + {t('hello')} {userSession.loadUserData().profile.name} @@ -51,7 +61,11 @@ function DiagnosticContainer() {
-
+ + + )} + + ) : ( ); diff --git a/client/src/components/OnboardUser.jsx b/client/src/components/OnboardUser.jsx index cbbd5154..de83587e 100644 --- a/client/src/components/OnboardUser.jsx +++ b/client/src/components/OnboardUser.jsx @@ -12,6 +12,8 @@ import DeletionDialog from './DeletionDialog'; import buttonsCss from '../css/buttons'; import DeleteAllDataDialog from './DeleteAllDataDialog'; +import { Transition, animated } from 'react-spring'; + const useStyles = makeStyles(() => ({ root: { paddingBottom: '15em', @@ -102,340 +104,351 @@ const OnboardUser = props => { const classes = useStyles(); return ( - - - - Welcome to CoronaTracker! - - - Let's get your profile set up with a few quick questions and start logging your health: - - - - - - - Age (Years): - - - - + {props => ( + + + + + Welcome to CoronaTracker! + + + Let's get your profile set up with a few quick questions and start logging your health: + + + + + + + Age (Years): + + + + - - - - - - Gender: - - - - - - - - - - - - City: - - - - + + + + + + Gender: + + + + + + + + + + + + City: + + + + - - - - - - State: - - - - + + + + + + State: + + + + - - - - - - Zip: - - - - + + + + + + Zip: + + + + - - - - - - Do you smoke? - - - - - - + - - - - - - - Are you Obese (BMI)? - - - - - + + + + + + + Are you Obese (BMI)? + + + + + - + - - - - - - - Do you have asthma? - - - - - + + + + + + + Do you have asthma? + + + + + + + + + + - + + - + DELETE ALL OBSERVATION DATA + + {showDeletionDialog && } + + + {showDeletionDialog && } - - - - - {showDeletionDialog && } - - - {showDeletionDialog && } - + + )} + ); }; OnboardUser.propTypes = { setDemographicsComorbiditiesThunk: PropTypes.func.isRequired, + style: PropTypes.object.isRequired }; const mapDispatchToProps = dispatch => { From 448c0614c1f12f40509250755fd63b6f4097daf3 Mon Sep 17 00:00:00 2001 From: AdhamAH Date: Fri, 17 Apr 2020 19:50:44 +0200 Subject: [PATCH 2/2] verion bump --- client/package.json | 2 +- client/src/components/About.jsx | 2 +- client/src/components/DiagnosticContainer.jsx | 43 +++++++++---------- client/src/components/OnboardUser.jsx | 7 ++- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/client/package.json b/client/package.json index a17a68aa..4a902bb0 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "corona-tracker", - "version": "1.0.0", + "version": "1.0.1", "homepage": ".", "private": true, "prettier": "@blockstack/prettier-config", diff --git a/client/src/components/About.jsx b/client/src/components/About.jsx index d137a84b..ddeb7b5a 100644 --- a/client/src/components/About.jsx +++ b/client/src/components/About.jsx @@ -11,8 +11,8 @@ import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import Container from '@material-ui/core/Container'; import Link from '@material-ui/core/Link'; -import { CodivId, AdvisoryBoard } from '../utils/imgUrl'; import { Transition, animated } from 'react-spring'; +import { CodivId, AdvisoryBoard } from '../utils/imgUrl'; // TODO add once we get it :) function Copyright() { diff --git a/client/src/components/DiagnosticContainer.jsx b/client/src/components/DiagnosticContainer.jsx index ccf2dd40..bd0cad04 100644 --- a/client/src/components/DiagnosticContainer.jsx +++ b/client/src/components/DiagnosticContainer.jsx @@ -3,11 +3,10 @@ import { useBlockstack } from 'react-blockstack'; import { useTranslation } from 'react-i18next'; import { makeStyles } from '@material-ui/core/styles'; import { Typography } from '@material-ui/core'; +import { Transition, animated } from 'react-spring'; import HealthLogToggle from './HealthLogToggle'; import Survey from './survey/Survey'; -import { Transition, animated } from 'react-spring'; - const useStyles = makeStyles({ hr: { width: '100px', @@ -45,27 +44,25 @@ function DiagnosticContainer() { return hasSubmitted() ? (
- - - {props => ( - - - {t('hello')} {userSession.loadUserData().profile.name} - - - {t('todayText')} {today.toLocaleDateString(undefined, dateOptions)}{' '} - -
- - - - )} - -
+ + {props => ( + + + {t('hello')} {userSession.loadUserData().profile.name} + + + {t('todayText')} {today.toLocaleDateString(undefined, dateOptions)}{' '} + +
+ + + )} + + ) : ( ); diff --git a/client/src/components/OnboardUser.jsx b/client/src/components/OnboardUser.jsx index de83587e..d8af8639 100644 --- a/client/src/components/OnboardUser.jsx +++ b/client/src/components/OnboardUser.jsx @@ -7,13 +7,12 @@ import { connect } from 'react-redux'; import { useHistory } from 'react-router-dom'; import { useBlockstack } from 'react-blockstack'; import { Typography, Select, MenuItem, FormControl, Grid, ButtonGroup, Button } from '@material-ui/core'; +import { Transition, animated } from 'react-spring'; import actions from '../redux/actions/actions'; import DeletionDialog from './DeletionDialog'; import buttonsCss from '../css/buttons'; import DeleteAllDataDialog from './DeleteAllDataDialog'; -import { Transition, animated } from 'react-spring'; - const useStyles = makeStyles(() => ({ root: { paddingBottom: '15em', @@ -105,8 +104,9 @@ const OnboardUser = props => { return ( {props => ( @@ -448,7 +448,6 @@ const OnboardUser = props => { OnboardUser.propTypes = { setDemographicsComorbiditiesThunk: PropTypes.func.isRequired, - style: PropTypes.object.isRequired }; const mapDispatchToProps = dispatch => {