diff --git a/website/package.json b/website/package.json index f52f52e..1ddc586 100644 --- a/website/package.json +++ b/website/package.json @@ -1,6 +1,6 @@ { "name": "vaxandme", - "version": "1.1.0", + "version": "1.1.1", "private": true, "dependencies": { "firebase": "^8.4.1", diff --git a/website/public/styles/extrasmall.css b/website/public/styles/extrasmall.css index 6c71a79..556dfa3 100644 --- a/website/public/styles/extrasmall.css +++ b/website/public/styles/extrasmall.css @@ -349,7 +349,6 @@ footer .by { .tip-container { display: flex; flex-direction: row; - align-items: center; padding: 2rem 4rem; padding-left: 2rem; border-radius: 1rem; @@ -363,10 +362,16 @@ footer .by { padding-left: 2rem; } .tip .overline { - font-size: 1.4rem; + font-size: 1.6rem; } .tip .subheader { - font-size: 3.2rem; + font-size: 2rem; + letter-spacing: 0.2rem; + margin-top: 0.4rem; +} +.tip .header { + font-size: 6rem; + letter-spacing: 0.5rem; } @keyframes loading { diff --git a/website/public/styles/medium.css b/website/public/styles/medium.css index 6951a27..b8a5946 100644 --- a/website/public/styles/medium.css +++ b/website/public/styles/medium.css @@ -106,6 +106,7 @@ footer { .tip-container { width: fit-content; + max-width: 45rem; } diff --git a/website/src/index.js b/website/src/index.js index d377be9..f5151fe 100644 --- a/website/src/index.js +++ b/website/src/index.js @@ -19,7 +19,7 @@ if (window.location.host !== "www.vaxand.me") { firebase.functions().useEmulator(window.location.host.split(":")[0], 5001); } -const fb_functions = firebase.app().functions('us-central1'); +const fb_functions = firebase.functions(); const saveResult = fb_functions.httpsCallable("saveResultV1"); const getPastResult = fb_functions.httpsCallable("getPastResultV1"); const getStats = fb_functions.httpsCallable("getStatsV1"); @@ -559,7 +559,7 @@ class App extends React.Component { {answerDose} ) : null} -

+

{dose === VAX_DOSES.ONE && answerDose === VAX_DOSES.TWO ? "(You can comeback later to tell us about Dose 2)" : "(Select all side effects that you experienced)"} @@ -728,7 +728,7 @@ class App extends React.Component { ) : null} {!loading ? (

-

+

Select Vaccine

@@ -757,7 +757,7 @@ class App extends React.Component { ) : null} {this.shouldShowDoses() ? (
-

+

Select Dose

@@ -785,7 +785,7 @@ class App extends React.Component { {this.shouldShowAgeGroup() ? (
-

+

Select Age Group

@@ -828,7 +828,7 @@ class App extends React.Component {
-
+
Use data from:
-
- Based on{" "} - {this.getSampleSize() +
+ Based on + {` ${this.getSampleSize() .toString() - .replace(/\B(?=(\d{3})+(?!\d))/g, ",")}{" "} + .replace(/\B(?=(\d{3})+(?!\d))/g, ",")} `} individual experiences
{Object.keys(stats).length < 1 ? ( -
+
Failed to get stats from Vax&Me
) : null} @@ -862,21 +862,15 @@ class App extends React.Component {
ⓘ
-
+
NET EFFICACY
-
- {name} was effective for -
-

+

{VAX_EFFICACY[name][age]}%

-
- of people who took it, in the {age} age group +
+ of vaccine trial participants who took the {name}{" "} + vaccine (in the {age} age group) did not get COVID-19
@@ -948,7 +942,7 @@ class App extends React.Component {

You can comeback and update your experience at any time!

-

+

(Just use the same device)