diff --git a/firebase.json b/firebase.json index 7324544..ed181fb 100644 --- a/firebase.json +++ b/firebase.json @@ -8,8 +8,40 @@ ], "rewrites": [ { - "source": "**", + "source": "/copyright", + "destination" : "/copyright.html" + }, + { + "source": "/privacy", + "destination" : "/privacy.html" + }, + { + "source": "/jj", "destination": "/index.html" + }, + { + "source": "/pb", + "destination": "/index.html" + }, + { + "source": "/md", + "destination": "/index.html" + }, + { + "source": "/jj/**", + "destination": "/index.html" + }, + { + "source": "/pb/**", + "destination": "/index.html" + }, + { + "source": "/md/**", + "destination": "/index.html" + }, + { + "source": "**", + "destination": "/404.html" } ] }, diff --git a/functions/lib/index.js b/functions/lib/index.js index 2932e32..884a28d 100644 --- a/functions/lib/index.js +++ b/functions/lib/index.js @@ -60,11 +60,11 @@ exports.saveResult = functions.https.onCall(async (data, context) => { incrementValue = 1; } if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[`${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(incrementValue); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(incrementValue); } }); @@ -86,11 +86,11 @@ exports.saveResult = functions.https.onCall(async (data, context) => { symptom !== "age") { if (existingData[symptom] === true) { if (existingData.dose) { - undoDoc[`${existingData.dose}.${existingData.age}.${symptom}`] = + undoDoc[`${existingData.dose}.${existingData.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(-1); } else { - undoDoc[`${existingData.age}.${symptom}`] = + undoDoc[`${existingData.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(-1); } } @@ -115,11 +115,11 @@ exports.saveResult = functions.https.onCall(async (data, context) => { Object.keys(docData).forEach((symptom) => { if (docData[symptom] === true) { if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[`${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } } @@ -145,11 +145,11 @@ exports.saveResult = functions.https.onCall(async (data, context) => { Object.keys(docData).forEach((symptom) => { if (docData[symptom] === true) { if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[`${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } } @@ -165,12 +165,19 @@ exports.saveResult = functions.https.onCall(async (data, context) => { exports.getPastResult = functions.https.onCall(async (data, context) => { if (!!data && !!context) { const { gid } = data; - return await admin + const existingData = await admin .firestore() .collection("results") .doc(serializeGaId(gid)) .get() .then((doc) => doc.data()); + if (existingData) { + if (existingData["NAUSEA / VOMITING"]) { + existingData["NAUSEA OR VOMITING"] = + existingData["NAUSEA / VOMITING"]; + } + return existingData; + } } return undefined; }); diff --git a/functions/lib/index.js.map b/functions/lib/index.js.map index aa15299..042d860 100644 --- a/functions/lib/index.js.map +++ b/functions/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/functions/src/index.ts b/functions/src/index.ts index feed6c1..d96f6b5 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -73,10 +73,11 @@ export const saveResult = functions.https.onCall( incrementValue = 1; } if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[ + `${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(incrementValue); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(incrementValue); } }); @@ -98,10 +99,11 @@ export const saveResult = functions.https.onCall( if (existingData[symptom] === true) { if (existingData.dose) { undoDoc[ - `${existingData.dose}.${existingData.age}.${symptom}`] = + `${existingData.dose}.${existingData.age}.${ + symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(-1); } else { - undoDoc[`${existingData.age}.${symptom}`] = + undoDoc[`${existingData.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(-1); } } @@ -126,10 +128,11 @@ export const saveResult = functions.https.onCall( Object.keys(docData).forEach((symptom : string) => { if (docData[symptom] === true) { if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[ + `${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } } @@ -154,10 +157,11 @@ export const saveResult = functions.https.onCall( Object.keys(docData).forEach((symptom : string) => { if (docData[symptom] === true) { if (data.dose) { - updateDoc[`${data.dose}.${data.age}.${symptom}`] = + updateDoc[ + `${data.dose}.${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } else { - updateDoc[`${data.age}.${symptom}`] = + updateDoc[`${data.age}.${symptom.replace("/", "OR")}`] = admin.firestore.FieldValue.increment(1); } } @@ -174,12 +178,19 @@ export const saveResult = functions.https.onCall( export const getPastResult = functions.https.onCall(async (data, context) => { if (!!data && !!context) { const {gid} = data; - return await admin + const existingData : admin.firestore.DocumentData | undefined = await admin .firestore() .collection("results") .doc(serializeGaId(gid)) .get() .then((doc) => doc.data()); + if (existingData) { + if (existingData["NAUSEA / VOMITING"]) { + existingData["NAUSEA OR VOMITING"] = + existingData["NAUSEA / VOMITING"]; + } + return existingData; + } } return undefined; }); diff --git a/website/package.json b/website/package.json index 2087413..c5fbfa0 100644 --- a/website/package.json +++ b/website/package.json @@ -14,7 +14,8 @@ "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", - "deploy": "firebase deploy --only hosting" + "deploy": "firebase deploy --only hosting", + "serve" : "firebase serve --only hosting" }, "eslintConfig": { "extends": [ diff --git a/website/public/.htaccess b/website/public/.htaccess deleted file mode 100644 index f2d38d2..0000000 --- a/website/public/.htaccess +++ /dev/null @@ -1,3 +0,0 @@ -RewriteEngine On - -DirectoryIndex index.html \ No newline at end of file diff --git a/website/public/404.html b/website/public/404.html new file mode 100644 index 0000000..57ac265 --- /dev/null +++ b/website/public/404.html @@ -0,0 +1,119 @@ + + +
+ + + + + + + + + +COPYRIGHT
++ Unauthorized copying of this website via any medium is strictly + prohibited. Designed and developed by Alba Rajanibala and Ayushya + Amitabh. +
++ All content on this website, unless otherwise cited is the + intellectual property of Alba Rajanibala and Ayushya Amitabh, and + may not be copied, edited, or reproduced without permission. +
++ Data shown is based on FDA clinical trials. +
+ +