added state & district selection

Author: hardikjparmar

ios/Podfile.lock

@@ -203,8 +203,6 @@ PODS:
     - React-jsi (= 0.64.0)
     - React-perflogger (= 0.64.0)
   - React-jsinspector (0.64.0)
-  - react-native-notifications (3.4.2):
-    - React-Core
   - react-native-safe-area-context (3.2.0):
     - React-Core
   - React-perflogger (0.64.0)
@@ -275,6 +273,8 @@ PODS:
     - React-Core
   - RNCMaskedView (0.1.11):
     - React
+  - RNCPicker (1.15.0):
+    - React-Core
   - RNGestureHandler (1.10.3):
     - React-Core
   - RNKeychain (7.0.0):
@@ -312,6 +312,8 @@ PODS:
     - React-Core
   - RNSha256 (1.4.7):
     - React
+  - RNSVG (12.1.1):
+    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -332,7 +334,6 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
-  - react-native-notifications (from `../node_modules/react-native-notifications`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -348,11 +349,13 @@ DEPENDENCIES:
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
+  - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSha256 (from `../node_modules/react-native-sha256`)
+  - RNSVG (from `../node_modules/react-native-svg`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -390,8 +393,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
-  react-native-notifications:
-    :path: "../node_modules/react-native-notifications"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   React-perflogger:
@@ -422,6 +423,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCMaskedView:
     :path: "../node_modules/@react-native-community/masked-view"
+  RNCPicker:
+    :path: "../node_modules/@react-native-picker/picker"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNKeychain:
@@ -432,6 +435,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-screens"
   RNSha256:
     :path: "../node_modules/react-native-sha256"
+  RNSVG:
+    :path: "../node_modules/react-native-svg"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -452,7 +457,6 @@ SPEC CHECKSUMS:
   React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1
   React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b
   React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301
-  react-native-notifications: 51ed8167f70f01c5000ba81a4465ea98b4612e23
   react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
   React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
   React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
@@ -468,11 +472,13 @@ SPEC CHECKSUMS:
   ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
   RNCAsyncStorage: f47a7e8f927f7c9da947491fc55752eb9ce17f2d
   RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
+  RNCPicker: 5256da29a92406cac439ac6605719e233714a86a
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f
   RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad
   RNScreens: bd1523c3bde7069b8e958e5a16e1fc7722ad0bdd
   RNSha256: bf2c90a9e0cec6dcbcc4100e4e19715ae7feaa34
+  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
   Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
 
 PODFILE CHECKSUM: 55e4074caf798c70301cff54fd03c77bbff60f00

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.15.4",
     "@react-native-community/masked-view": "^0.1.11",
+    "@react-native-picker/picker": "^1.15.0",
     "@react-navigation/native": "^5.9.4",
     "@react-navigation/stack": "^5.14.4",
     "@types/react-native-push-notification": "^7.2.0",

src/API/APIEndpoints.ts

@@ -1,12 +1,9 @@
 export const baseUrl = 'https://cdn-api.co-vin.in/api';
 export const generateOTP = `/v2/auth/generateMobileOTP`;
 export const confirmOTP = `/v2/auth/validateMobileOtp`;
-// const getSlotUrl =
-//   'https://api.demo.co-vin.in/api/v2/appointment/sessions/public/calendarByDistrict?district_id=395&date=06-05-2021';
-// 'https://cdn-api.co-vin.in/api/v2/appointment/sessions/public/findByDistrict?district_id=395&date=06-05-2021';
-//   'https://cdn-api.co-vin.in/api/v2/appointment/sessions/public/calendarByDistrict?district_id=395&date=06-05-2021';
-export const getSlots = `/v2/appointment/sessions/calendarByDistrict`;
+export const getSlots = `/v2/appointment/sessions/public/calendarByDistrict`;
 export const getBeneficieryDetails = `/v2/appointment/beneficiaries`;
 export const bookAppointment = '/v2/appointment/schedule';
 export const getCaptcha = '/v2/auth/getRecaptcha';
 export const cancelAppointment = '/v2/appointment/cancel';
+export const getDistricts = '/v2/admin/location/districts';

src/API/APIHelper.ts

@@ -9,11 +9,13 @@ import {
   bookAppointment as bookAppointmentUrl,
   getCaptcha as getCaptchaUrl,
   cancelAppointment,
+  getDistricts as getDistrictsUrl,
 } from './APIEndpoints';
 import {removeCredentials} from '../Storage/LocalStorage';
 import {Center} from '../Types/SlotTypes';
 import Navigator from '../Navigation/RootNavigation';
 import {Beneficiary} from '../Types/BeneficiaryTypes';
+import {DISTRICT} from '../Constants/Constants';
 
 let api = axios.create({
   baseURL: baseUrl,
@@ -130,16 +132,31 @@ export const getSlots = async (
     };
   }
   count += 1;
+  console.log('DistrictId: ' + districtId);
+  console.log('date: ' + date);
+  console.log('token: ' + token);
+  console.log('vaccine: ' + vaccine);
+
+  let headers: any;
+  if (token === '') {
+    headers = {
+      accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Accept-Language': 'hi_IN',
+    };
+  } else {
+    headers = {
+      accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Accept-Language': 'hi_IN',
+      Authorization: `Bearer ${token}`,
+    };
+  }
   try {
     const response = await api({
       url: getSlotUrl,
       method: 'get',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json',
-        'Accept-Language': 'hi_IN',
-        Authorization: `Bearer ${token}`,
-      },
+      headers: headers,
       params: params,
     });
 
@@ -202,9 +219,6 @@ export const getCaptcha = async (token: string) => {
   return undefined;
 };
 
-/**
- * curl -X POST "https://api.demo.co-vin.in/api/v2/appointment/schedule" -H "accept: application/json" -H "Content-Type: application/json" -H "x-api-key: 3sjOr2rmM52GzhpMHjDEE1kpQeRxwFDr4YcBEimi" -H "Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiI2OTRkNmQ3MS0wY2FiLTRjNGMtYTk2Ni02NjRlZDRjNTc1NjEiLCJ1c2VyX2lkIjoiNjk0ZDZkNzEtMGNhYi00YzRjLWE5NjYtNjY0ZWQ0YzU3NTYxIiwidXNlcl90eXBlIjoiQkVORUZJQ0lBUlkiLCJtb2JpbGVfbnVtYmVyIjo5NzI2MTg0ODM3LCJiZW5lZmljaWFyeV9yZWZlcmVuY2VfaWQiOjIxMzk1NzA3Njg1NDIyLCJzZWNyZXRfa2V5IjoiYjVjYWIxNjctNzk3Ny00ZGYxLTgwMjctYTYzYWExNDRmMDRlIiwidWEiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xMF8xKSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvMzkuMC4yMTcxLjk1IFNhZmFyaS81MzcuMzYiLCJkYXRlX21vZGlmaWVkIjoiMjAyMS0wNS0wOVQxNDoyMzo0MS4yNTVaIiwiaWF0IjoxNjIwNTcwMjIxLCJleHAiOjE2MjA1NzExMjF9.NV65xMZJFZg7vTcwHH8FSdMZF0qbM7-sCW3Gfo3YUvc" -d "{\"dose\":1,\"session_id\":\"3fa85f64-5717-4562-b3fc-2c963f66afa6\",\"slot\":\"FORENOON\",\"beneficiaries\":[\"1234567890123\",\"9876543210987\"]}"
- */
 export const bookAppointment = async (
   token: string,
   dose: number,
@@ -276,3 +290,24 @@ export const cancelBooking = async (
   }
   return undefined;
 };
+
+export const getDistricts = async (
+  stateId: number,
+): Promise<DISTRICT[] | undefined> => {
+  try {
+    const response = await api({
+      url: getDistrictsUrl + '/' + stateId,
+      method: 'get',
+      headers: {
+        accept: 'application/json',
+        'Accept-Language': 'hi_IN',
+      },
+    });
+    if (response) {
+      return response.data.districts;
+    }
+  } catch (error) {
+    console.error(`ERROR: ${error}`);
+  }
+  return undefined;
+};

src/App.tsx

@@ -25,7 +25,7 @@ import Navigator from './Navigation/RootNavigation';
 import BeneficiaryListScreen from './Components/BeneficiaryListScreen/BeneficiaryListScreen';
 
 import {
-  districtId,
+  DISTRICT_ID_PREF,
   FEE_PREF,
   minAge,
   VACCINE_PREF,
@@ -42,6 +42,7 @@ import {
 } from './Components/SettingsScreen/SettingsScreen';
 import {
   getUserAgePreference,
+  getUserDistrictIdPreference,
   getUserFeeTypePreference,
   getUserVaccinePreference,
 } from './Storage/LocalStorage';
@@ -111,10 +112,16 @@ const App = () => {
     const agePromise = getUserAgePreference();
     const vaccinePromise = getUserVaccinePreference();
     const feePromise = getUserFeeTypePreference();
+    const districtIdPromise = getUserDistrictIdPreference();
 
-    const allPromise = Promise.all([agePromise, vaccinePromise, feePromise]);
+    const allPromise = Promise.all([
+      agePromise,
+      vaccinePromise,
+      feePromise,
+      districtIdPromise,
+    ]);
 
-    allPromise.then(([age, vaccine, fee]) => {
+    allPromise.then(([age, vaccine, fee, disId]) => {
       let preferredAge = minAge;
       if (age) {
         preferredAge = age;
@@ -130,11 +137,16 @@ const App = () => {
         preferredFees = fee;
       }
       console.log('Preferred Fee: ' + preferredFees);
+      let preferredDistrictId = DISTRICT_ID_PREF;
+      if (disId) {
+        preferredDistrictId = disId;
+      }
+      console.log('Preferred District: ' + preferredDistrictId);
       const vaccineParam =
         preferredVaccine !== VaccineType[VaccineType.BOTH]
           ? preferredVaccine
           : undefined;
-      getSlots(districtId, today(), '', vaccineParam).then(res => {
+      getSlots(preferredDistrictId, today(), '', vaccineParam).then(res => {
         if (res) {
           setCenters(res);
           const filteredList = res.filter(item => {