Merge pull request #30 from sarthakpranesh/dev

Fixed cross origin request error

App.tsx

@@ -104,7 +104,7 @@ const MainApp = () => {
 
   return (
     <View onLayout={onLayout} style={{ flex: 1 }}>
-      <StatusBar style="auto" />
+      <StatusBar style="auto" hidden />
       <RootNavigator />
     </View>
   );

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Covid19",
     "slug": "Covid19",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Covid19",
-    "version": "4.0.0"
+    "version": "4.0.1"
   },
   "build": {
     "distDir": "../web-build",

src/services/API/DiseaseApi.ts → src/services/API/Disease.ts

@@ -1,5 +1,16 @@
 import axios from "axios";
 
+export type GlobalCases = {
+  confirmed: number;
+  deaths: number;
+  recovered: number;
+  deathsToday: number;
+  newConfirmed: number;
+  totalSerious: number;
+};
+
+export type CountryCases = GlobalCases;
+
 export type TimelineData = {
   date: string;
   active: number;
@@ -15,6 +26,58 @@ export type CasesTimeline = {
   recovered: any;
 };
 
+export const fetchGlobalData: () => Promise<GlobalCases> = () => {
+  return new Promise((resolve, reject) => {
+    axios
+      .get("https://disease.sh/v3/covid-19/all")
+      .then((response) => {
+        if (response.data.cases) {
+          const results: GlobalCases = {
+            confirmed: response.data.cases,
+            deaths: response.data.deaths,
+            recovered: response.data.recovered,
+            deathsToday: response.data.todayDeaths,
+            newConfirmed: response.data.todayCases,
+            totalSerious: response.data.critical,
+          };
+          return resolve(results);
+        }
+        reject(new Error("Ninja API returned no data"));
+      })
+      .catch((err) => {
+        console.log("Ninja API error (Global): ", err.message);
+        reject(err.message);
+      });
+  });
+};
+
+export const fetchCountryData: (country: string) => Promise<CountryCases> = (
+  country
+) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .get(`https://disease.sh/v3/covid-19/countries/${country}?strict=true`)
+      .then((response) => {
+        if (response.data.cases) {
+          const results: CountryCases = {
+            confirmed: response.data.cases,
+            deaths: response.data.deaths,
+            recovered: response.data.recovered,
+            deathsToday: response.data.todayDeaths,
+            newConfirmed: response.data.todayCases,
+            totalSerious: response.data.critical,
+          };
+          return resolve(results);
+        }
+        reject(new Error("Ninja API returned no data!"));
+      })
+      .catch((err) => {
+        console.log("Ninja API error (Country): ", err.message);
+        reject(err.message);
+      });
+  });
+};
+
 // get cases timeline
 const getCasesTimeline = (country: string): Promise<CasesTimeline> => {
   return new Promise((resolve, reject) => {

src/services/API/functions/getCovidData.ts

@@ -1,10 +1,11 @@
-import { fetchTimelineData, TimelineData } from "../DiseaseApi";
 import {
+  fetchTimelineData,
+  TimelineData,
   fetchGlobalData,
   fetchCountryData,
   GlobalCases,
   CountryCases,
-} from "../NinjaApi";
+} from "../Disease";
 
 export type HomeScreenData = {
   global: GlobalCases;