v1.1.1/release
fix stylings
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vaxandme",
|
"name": "vaxandme",
|
||||||
"version": "1.1.0",
|
"version": "1.1.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"firebase": "^8.4.1",
|
"firebase": "^8.4.1",
|
||||||
|
|||||||
@@ -349,7 +349,6 @@ footer .by {
|
|||||||
.tip-container {
|
.tip-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
|
||||||
padding: 2rem 4rem;
|
padding: 2rem 4rem;
|
||||||
padding-left: 2rem;
|
padding-left: 2rem;
|
||||||
border-radius: 1rem;
|
border-radius: 1rem;
|
||||||
@@ -363,10 +362,16 @@ footer .by {
|
|||||||
padding-left: 2rem;
|
padding-left: 2rem;
|
||||||
}
|
}
|
||||||
.tip .overline {
|
.tip .overline {
|
||||||
font-size: 1.4rem;
|
font-size: 1.6rem;
|
||||||
}
|
}
|
||||||
.tip .subheader {
|
.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 {
|
@keyframes loading {
|
||||||
|
|||||||
@@ -106,6 +106,7 @@ footer {
|
|||||||
|
|
||||||
.tip-container {
|
.tip-container {
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
|
max-width: 45rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+17
-23
@@ -19,7 +19,7 @@ if (window.location.host !== "www.vaxand.me") {
|
|||||||
firebase.functions().useEmulator(window.location.host.split(":")[0], 5001);
|
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 saveResult = fb_functions.httpsCallable("saveResultV1");
|
||||||
const getPastResult = fb_functions.httpsCallable("getPastResultV1");
|
const getPastResult = fb_functions.httpsCallable("getPastResultV1");
|
||||||
const getStats = fb_functions.httpsCallable("getStatsV1");
|
const getStats = fb_functions.httpsCallable("getStatsV1");
|
||||||
@@ -559,7 +559,7 @@ class App extends React.Component {
|
|||||||
{answerDose}
|
{answerDose}
|
||||||
</h6>
|
</h6>
|
||||||
) : null}
|
) : null}
|
||||||
<p className="question" data-font="sans-italic">
|
<p className="question" data-font="sans">
|
||||||
{dose === VAX_DOSES.ONE && answerDose === VAX_DOSES.TWO
|
{dose === VAX_DOSES.ONE && answerDose === VAX_DOSES.TWO
|
||||||
? "(You can comeback later to tell us about Dose 2)"
|
? "(You can comeback later to tell us about Dose 2)"
|
||||||
: "(Select all side effects that you experienced)"}
|
: "(Select all side effects that you experienced)"}
|
||||||
@@ -728,7 +728,7 @@ class App extends React.Component {
|
|||||||
) : null}
|
) : null}
|
||||||
{!loading ? (
|
{!loading ? (
|
||||||
<div className="question-container">
|
<div className="question-container">
|
||||||
<p className="question" data-font="sans-italic">
|
<p className="question" data-font="sans">
|
||||||
Select Vaccine
|
Select Vaccine
|
||||||
</p>
|
</p>
|
||||||
<div className="answers-container">
|
<div className="answers-container">
|
||||||
@@ -757,7 +757,7 @@ class App extends React.Component {
|
|||||||
) : null}
|
) : null}
|
||||||
{this.shouldShowDoses() ? (
|
{this.shouldShowDoses() ? (
|
||||||
<div className="question-container">
|
<div className="question-container">
|
||||||
<p className="question" data-font="sans-italic">
|
<p className="question" data-font="sans">
|
||||||
Select Dose
|
Select Dose
|
||||||
</p>
|
</p>
|
||||||
<div className="answers-container">
|
<div className="answers-container">
|
||||||
@@ -785,7 +785,7 @@ class App extends React.Component {
|
|||||||
|
|
||||||
{this.shouldShowAgeGroup() ? (
|
{this.shouldShowAgeGroup() ? (
|
||||||
<div className="question-container">
|
<div className="question-container">
|
||||||
<p className="question" data-font="sans-italic">
|
<p className="question" data-font="sans">
|
||||||
Select Age Group
|
Select Age Group
|
||||||
</p>
|
</p>
|
||||||
<div className="answers-container">
|
<div className="answers-container">
|
||||||
@@ -828,7 +828,7 @@ class App extends React.Component {
|
|||||||
</h6>
|
</h6>
|
||||||
</div>
|
</div>
|
||||||
<div className="result-header-select">
|
<div className="result-header-select">
|
||||||
<h6 className="overline" data-font="sans-italic">
|
<h6 className="overline" data-font="sans">
|
||||||
Use data from:
|
Use data from:
|
||||||
</h6>
|
</h6>
|
||||||
<select
|
<select
|
||||||
@@ -842,15 +842,15 @@ class App extends React.Component {
|
|||||||
<option key={dataKey}>{DATA_CHOICES[dataKey]}</option>
|
<option key={dataKey}>{DATA_CHOICES[dataKey]}</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
<h6 className="overline success" data-font="sans-italic">
|
<h6 className="overline success" data-font="sans">
|
||||||
Based on{" "}
|
Based on
|
||||||
{this.getSampleSize()
|
{` ${this.getSampleSize()
|
||||||
.toString()
|
.toString()
|
||||||
.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}{" "}
|
.replace(/\B(?=(\d{3})+(?!\d))/g, ",")} `}
|
||||||
individual experiences
|
individual experiences
|
||||||
</h6>
|
</h6>
|
||||||
{Object.keys(stats).length < 1 ? (
|
{Object.keys(stats).length < 1 ? (
|
||||||
<h6 className="overline errored" data-font="sans-italic">
|
<h6 className="overline errored" data-font="sans">
|
||||||
Failed to get stats from Vax&Me
|
Failed to get stats from Vax&Me
|
||||||
</h6>
|
</h6>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -862,21 +862,15 @@ class App extends React.Component {
|
|||||||
<div className="tip-container">
|
<div className="tip-container">
|
||||||
<div className="tip-icon">ⓘ</div>
|
<div className="tip-icon">ⓘ</div>
|
||||||
<div className="tip">
|
<div className="tip">
|
||||||
<h6
|
<h6 className="subheader" data-font="sans">
|
||||||
style={{ marginBottom: "1.2rem" }}
|
|
||||||
className="overline"
|
|
||||||
data-font="sans"
|
|
||||||
>
|
|
||||||
NET EFFICACY
|
NET EFFICACY
|
||||||
</h6>
|
</h6>
|
||||||
<h6 className="overline" data-font="sans-italic">
|
<h3 className="header" data-font="sans-bold">
|
||||||
{name} was effective for
|
|
||||||
</h6>
|
|
||||||
<h3 className="subheader" data-font="sans-bold">
|
|
||||||
{VAX_EFFICACY[name][age]}%
|
{VAX_EFFICACY[name][age]}%
|
||||||
</h3>
|
</h3>
|
||||||
<h6 className="overline" data-font="sans-italic">
|
<h6 className="overline" data-font="sans">
|
||||||
of people who took it, in the {age} age group
|
of vaccine trial participants who took the <u>{name}</u>{" "}
|
||||||
|
vaccine (in the <u>{age}</u> age group) did not get COVID-19
|
||||||
</h6>
|
</h6>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -948,7 +942,7 @@ class App extends React.Component {
|
|||||||
<p className="question" data-font="sans">
|
<p className="question" data-font="sans">
|
||||||
You can comeback and update your experience at any time!
|
You can comeback and update your experience at any time!
|
||||||
</p>
|
</p>
|
||||||
<p className="question" data-font="sans-italic">
|
<p className="question" data-font="sans">
|
||||||
(Just use the same device)
|
(Just use the same device)
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user