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 e3c475c3..ddeb7b5a 100644 --- a/client/src/components/About.jsx +++ b/client/src/components/About.jsx @@ -11,6 +11,7 @@ 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 { Transition, animated } from 'react-spring'; import { CodivId, AdvisoryBoard } from '../utils/imgUrl'; // TODO add once we get it :) @@ -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} - - - - ))} - - -
- - -
+ + Take our Beta Survey! + + {/* */} + + + )} + + ); }; diff --git a/client/src/components/DiagnosticContainer.jsx b/client/src/components/DiagnosticContainer.jsx index 2ffa5ecf..bd0cad04 100644 --- a/client/src/components/DiagnosticContainer.jsx +++ b/client/src/components/DiagnosticContainer.jsx @@ -3,6 +3,7 @@ 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'; @@ -43,14 +44,24 @@ function DiagnosticContainer() { return hasSubmitted() ? (
- - {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 cbbd5154..d8af8639 100644 --- a/client/src/components/OnboardUser.jsx +++ b/client/src/components/OnboardUser.jsx @@ -7,6 +7,7 @@ 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'; @@ -102,334 +103,345 @@ 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 && } - + + )} + ); };