Merge branch 'dev' into amp

ohcnetwork · Apr 25, 2021 · eea1290 · eea1290
2 parents c59c061 + 4d16028
commit eea1290
Show file tree

Hide file tree

Showing 28 changed files with 651 additions and 5,534 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @coronasafe/code-reviewers @coronasafe/life
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/components/AmbulanceCard.jsx b/components/AmbulanceCard.jsx
@@ -29,7 +29,7 @@ const AmbulanceCard = ({
                                     {name ? name : 'Ambulance'}
                                     <span>
                                         {verificationStatus &&
-                                            verificationStatus.toLocaleLowerCase() == 'verified' ? (
+                                        verificationStatus.toLocaleLowerCase() == 'verified' ? (
                                             <FontAwesomeIcon
                                                 className="text-green-600 w-5 ml-4"
                                                 title="Verified"
@@ -86,7 +86,7 @@ const AmbulanceCard = ({
                             )}
                         </div>
                     </div>
-                    <hr />
+                    <hr className="dark:border-gray-900" />
                     <div className="flex justify-between items-center mx-4 mt-2 pb-3">
                         <div className="font-mono text-gray-700 text-sm dark:text-white">
                             {lastVerifiedOn && `Verified @ ${parseDateString(lastVerifiedOn)}`}

diff --git a/components/HelplineCard.jsx b/components/HelplineCard.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import '@fortawesome/fontawesome-svg-core/styles.css';
-import { faLink, faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
+import { faLink, faMapMarker, faMapMarkerAlt, faPhoneAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { parseDateString } from '../lib/utils';
 
@@ -21,25 +21,30 @@ const HelplineCard = ({
             <div className="p-4 flex justify-between flex-col md:flex-row">
                 <div>
                     <div className="font-bold text-2xl">
-                        <div>
-                            <h1>{category}</h1>
-                            <div className="text-sm mt-1 mb-3 text-gray-700 font-semibold dark:text-white">
-                                <span>({subCategory})</span>
+                        {category && (
+                            <div>
+                                <h1>{category}</h1>
+                                {subCategory && (
+                                    <div className="text-sm mt-1 mb-3 text-gray-700 font-semibold dark:text-white">
+                                        <span>({subCategory})</span>
+                                    </div>
+                                )}
                             </div>
-                        </div>
+                        )}
                         <div className="text-sm  uppercase mt-3 text-gray-700 font-semibold dark:text-white">
+                            <FontAwesomeIcon icon={faMapMarkerAlt} className="w-3 mr-2" />
                             <span className="mr-2">{district}</span>|
                             <span className="ml-2">{state}</span>
                         </div>
-                        <div className="w-11/12 max-w-3xl mt-2">
-                            <div className="text-sm mb-3">{source}</div>
+                        <div className="w-11/12 max-w-3xl my-2">
+                            <div className="text-sm">{source}</div>
                         </div>
                     </div>
                 </div>
-                <div className="flex items-start flex-col">
+                <div className="flex items-start flex-row justify-between md:flex-col">
                     {phone1 && (
                         <a
-                            className="font-mono text-gray-800 hover:text-gray-900 text-lg font-bold dark:text-white"
+                            className="text-gray-800 hover:text-gray-900 text-lg font-bold dark:text-white"
                             href={`tel:${phone1}`}>
                             <FontAwesomeIcon
                                 title={`${phone1}`}
@@ -51,25 +56,32 @@ const HelplineCard = ({
                     )}
                     {slink && (
                         <a
-                            className="font-mono text-gray-700 font-bold text-xl hover:text-gray-900 dark:text-white"
+                            className="text-gray-700 font-bold text-xl hover:text-gray-900 dark:text-white"
                             target="_blank"
                             href={slink}>
                             <FontAwesomeIcon
                                 title={`${slink}`}
                                 className="text-xl w-6"
                                 icon={faLink}
                             />
-                            <span className="ml-2 text-lg mt-1">Source Link</span>
+                            <span className="ml-2 text-base mt-1">Source Link</span>
                         </a>
                     )}
                 </div>
             </div>
-            <hr />
-            <div className="flex justify-between items-center mx-2 mt-2 pb-3">
-                <div className="font-semibold">{description}</div>
-                <div className="font-mono text-gray-700 text-sm dark:text-white">
-                    {lastVerifiedOn && `Verified @ ${parseDateString(lastVerifiedOn)}`}
-                </div>
+            <hr className="dark:border-gray-900" />
+            <div className="flex justify-between items-center flex-wrap mx-2 mt-2 pb-3">
+                <div className="font-semibold text-sm">{description}</div>
+                {lastVerifiedOn && (
+                    <div className="text-gray-700 text-xs dark:text-white">
+                        <div>
+                            <span>Checked on: </span>
+                            <span className="font-bold">
+                                {`${parseDateString(lastVerifiedOn)}`}
+                            </span>
+                        </div>
+                    </div>
+                )}
             </div>
         </div>
     );

diff --git a/components/HospitalCard.jsx b/components/HospitalCard.jsx
@@ -3,10 +3,11 @@ import '@fortawesome/fontawesome-svg-core/styles.css';
 import {
     faPhoneAlt,
     faCheckCircle,
-    faExclamationTriangle
+    faExclamationTriangle,
+    faMapMarkerAlt
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { parseDateString } from '../lib/utils';
+import { isVerified, parseDateString } from '../lib/utils';
 
 const HospitalCard = ({
     name,
@@ -26,21 +27,22 @@ const HospitalCard = ({
                         {name}
                         <span>
                             {(verificationStatus && verificationStatus.toLocaleLowerCase()) ==
-                                'verified' ? (
+                            'verified' ? (
                                 <FontAwesomeIcon
-                                    className="text-green-600 w-5 ml-4"
+                                    className="text-green-600 w-2 md:w-4 ml-4"
                                     title="Verified"
                                     icon={faCheckCircle}
                                 />
                             ) : (
                                 <FontAwesomeIcon
-                                    className="text-yellow-400 w-4 ml-4"
+                                    className="text-yellow-400 w-2 md:w-4 ml-4"
                                     title="Not verified"
                                     icon={faExclamationTriangle}
                                 />
                             )}
                         </span>
-                        <div className="text-sm  uppercase mt-3 text-gray-700 dark:text-gray-400  font-semibold">
+                        <div className="text-sm uppercase mt-3 text-gray-700 dark:text-gray-400  font-semibold">
+                            <FontAwesomeIcon icon={faMapMarkerAlt} className="w-3 mr-2" />
                             <span className="mr-2">{district}</span>|
                             <span className="ml-2">{state}</span>
                         </div>
@@ -49,7 +51,7 @@ const HospitalCard = ({
                 <div className="flex space-x-7 items-start mt-1">
                     {phone1 && (
                         <a
-                            className="font-mono text-gray-800 hover:text-gray-900 dark:text-white text-lg font-bold"
+                            className="text-gray-800 hover:text-gray-900 dark:text-white text-lg font-bold"
                             href={`tel:${phone1}`}>
                             <FontAwesomeIcon
                                 title={`${phone1}`}
@@ -61,11 +63,20 @@ const HospitalCard = ({
                     )}
                 </div>
             </div>
-            <hr />
+            <hr className="dark:border-gray-900" />
             <div className="flex justify-between items-center px-2  mx-3 mt-2 pb-3 flex-wrap">
                 <div className="font-semibold dark:text-gray-400">{pointOfContact}</div>
-                <div className="font-mono text-gray-700 dark:text-gray-400 text-sm">
-                    {lastVerifiedOn && `Verified @ ${parseDateString(lastVerifiedOn)}`}
+                <div className="text-gray-700 dark:text-gray-400 text-sm">
+                    {lastVerifiedOn && (
+                        <div className="text-gray-700 text-xs dark:text-white">
+                            <div>
+                                <span>{isVerified(verificationStatus) ? "Verified on: " : "Checked on: " }</span>
+                                <span className="font-bold">
+                                    {`${parseDateString(lastVerifiedOn)}`}
+                                </span>
+                            </div>
+                        </div>
+                    )}
                 </div>
             </div>
         </div>

diff --git a/components/MedicinesCard.jsx b/components/MedicinesCard.jsx
@@ -94,7 +94,7 @@ const MedicinesCard = ({
                     )}
                 </div>
             </div>
-            <hr className="dark:text-gray-500" />
+            <hr className="dark:border-gray-900" />
             <div className="flex justify-between items-center mx-4 mt-2 pb-3 flex-wrap">
                 <div className="font-semibold dark:text-gray-400">{description}</div>
                 <div className="font-mono text-gray-700 dark:text-gray-400 text-sm">

diff --git a/components/OxygenCard.jsx b/components/OxygenCard.jsx
@@ -32,7 +32,7 @@ const OxygenCard = ({
                             {name}
                             <span>
                                 {verifiedStatus &&
-                                    verifiedStatus.toLocaleLowerCase() == 'verified' ? (
+                                verifiedStatus.toLocaleLowerCase() == 'verified' ? (
                                     <FontAwesomeIcon
                                         className="text-green-600 w-5 ml-4"
                                         title="Verified"
@@ -84,7 +84,7 @@ const OxygenCard = ({
                     )}
                 </div>
             </div>
-            <hr />
+            <hr className="dark:border-gray-900" />
             <div className="flex justify-between items-center mx-4 mt-2 pb-3 flex-wrap">
                 <div className="font-semibold dark:text-gray-400">{description}</div>
                 <div className="font-mono text-gray-700 text-sm dark:text-gray-400">

diff --git a/components/PlasmaCard.jsx b/components/PlasmaCard.jsx
@@ -30,7 +30,7 @@ const PlasmaCard = ({
                             {name}
                             <span>
                                 {verifiedStatus &&
-                                    verifiedStatus.toLocaleLowerCase() == 'verified' ? (
+                                verifiedStatus.toLocaleLowerCase() == 'verified' ? (
                                     <FontAwesomeIcon
                                         className="text-green-600 w-5 ml-4"
                                         title="Verified"
@@ -79,7 +79,7 @@ const PlasmaCard = ({
                     )}
                 </div>
             </div>
-            <hr />
+            <hr className="dark:border-gray-900" />
             <div className="flex justify-between items-center mx-2 mt-2 pb-3">
                 <div className="font-semibold">{description}</div>
                 <div className="font-mono text-gray-700 text-sm dark:text-white">

diff --git a/data/active_district_data.json b/data/active_district_data.json
@@ -979,7 +979,7 @@
             "ambulance": false,
             "contact": true,
             "district": "Mandsaur",
-            "doctor": false,
+            "doctor": true,
             "helpline": true,
             "hospitals": false,
             "id": "rec6tZ6GAfOYYIz9k",
@@ -7497,7 +7497,7 @@
             "hospitals": true,
             "id": "rectw4LhqVzZ7VIZ9",
             "medicine": true,
-            "oxygen": false,
+            "oxygen": true,
             "plasma": false,
             "state": "Karnataka"
         },

diff --git a/data/ambulance.json b/data/ambulance.json
@@ -3435,17 +3435,17 @@
         },
         {
             "area": null,
-            "comment": "Ringing, no one picking up",
+            "comment": "Not Available \nRinging, no one picking up",
             "createdTime": "2021-04-19T07:48:08.000Z",
             "district": "Kurukshetra",
             "id": "recVv8rhTuWO3HBjN",
-            "lastVerifiedOn": "2021-04-23T12:57:27.000Z",
+            "lastVerifiedOn": "2021-04-24T08:35:18.000Z",
             "name": null,
             "phone1": "9812026380",
             "phone2": null,
             "source": null,
             "state": "Haryana",
-            "verificationStatus": "Unresponsive",
+            "verificationStatus": "Verified",
             "verifiedBy": "Aamod Kulkarni"
         },
         {
@@ -4742,17 +4742,17 @@
         },
         {
             "area": null,
-            "comment": "Busy",
+            "comment": "Not Available \nBusy",
             "createdTime": "2021-04-19T07:48:08.000Z",
             "district": "New Delhi",
             "id": "recfFxFIllrgI2WDl",
-            "lastVerifiedOn": "2021-04-23T07:19:18.000Z",
+            "lastVerifiedOn": "2021-04-24T08:37:50.000Z",
             "name": null,
             "phone1": "8860074107",
             "phone2": null,
             "source": null,
             "state": "Delhi (NCT)",
-            "verificationStatus": "Unresponsive",
+            "verificationStatus": "Verified",
             "verifiedBy": "Aamod Kulkarni"
         },
         {
@@ -5169,20 +5169,18 @@
         },
         {
             "area": null,
-            "comment": null,
+            "comment": "Not Available ",
             "createdTime": "2021-04-19T07:48:08.000Z",
             "district": "Bathinda",
             "id": "rechlSqJDJo8xTb3m",
-            "lastVerifiedOn": null,
+            "lastVerifiedOn": "2021-04-24T08:40:30.000Z",
             "name": null,
             "phone1": "0164-2235902",
             "phone2": null,
             "source": null,
             "state": "Punjab",
-            "verificationStatus": null,
-            "verifiedBy": [
-                {}
-            ]
+            "verificationStatus": "Verified",
+            "verifiedBy": "MANISH NAYYAR"
         },
         {
             "area": null,
@@ -5831,17 +5829,17 @@
         },
         {
             "area": null,
-            "comment": "Busy",
+            "comment": "Not Available \nBusy",
             "createdTime": "2021-04-19T07:48:08.000Z",
             "district": "Dadra & Nagar Haveli",
             "id": "recoZvcgM65IhTpmv",
-            "lastVerifiedOn": "2021-04-23T07:21:13.000Z",
+            "lastVerifiedOn": "2021-04-24T08:34:20.000Z",
             "name": null,
             "phone1": "9825085033",
             "phone2": null,
             "source": null,
             "state": "Dadra and Nagar Haveli and Daman & Diu (UT)",
-            "verificationStatus": "Unresponsive",
+            "verificationStatus": "Verified",
             "verifiedBy": "Aamod Kulkarni"
         },
         {