diff --git a/App.js b/App.js index db14bf46..1d1bcde0 100644 --- a/App.js +++ b/App.js @@ -10,12 +10,11 @@ import AppNavigator from './navigation/AppNavigator'; Sentry.init({ dsn: 'https://dacd32167a384e189eab16e9588c0e67@sentry.io/5172575', - enableInExpoDevelopment: true, + enableInExpoDevelopment: false, release: 'v1.1.0', - debug: true, - environment: 'development', + debug: false, + environment: process.env.NODE_ENV, }); - export default function App(props) { const [isLoadingComplete, setLoadingComplete] = useState(false); diff --git a/app.json b/app.json index 57031b8e..bb840151 100644 --- a/app.json +++ b/app.json @@ -3,12 +3,9 @@ "name": "Healthy Corners Rewards", "slug": "healthy-corners-rewards", "privacy": "public", - "platforms": [ - "ios", - "android", - "web" - ], - "version": "1.0.1", + "sdkVersion": "37.0.0", + "platforms": ["ios", "android", "web"], + "version": "1.1.0", "primaryColor": "#008550", "orientation": "portrait", "icon": "./assets/images/icon.png", @@ -20,12 +17,10 @@ "updates": { "fallbackToCacheTimeout": 0 }, - "assetBundlePatterns": [ - "**/*" - ], + "assetBundlePatterns": ["**/*"], "ios": { "bundleIdentifier": "org.calblueprint.HealthyCornersRewards", - "buildNumber": "1.0.1", + "buildNumber": "1.1.2", "supportsTablet": true, "infoPlist": { "NSLocationWhenInUseUsageDescription": "To find nearby stores and see what products are available.", @@ -36,15 +31,21 @@ "lyft", "waze" ] + }, + "config": { + "googleMapsApiKey": "AIzaSyAt2wwpTvYIBhVpgkFZ3fa7dY3Kw2cc5uU" } }, "android": { "package": "org.calblueprint.HealthyCornersRewards", "googleServicesFile": "./google-services.json", - "permissions": [ - "ACCESS_COARSE_LOCATION", - "ACCESS_FINE_LOCATION" - ] + "config": { + "googleMaps": { + "apiKey": "AIzaSyD_-M-Tjp0-QN2exYtlNZk3eMBnQPPkxWk" + } + }, + "permissions": ["ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION"], + "versionCode": 3 }, "hooks": { "postPublish": [ diff --git a/lib/airtable/airtable.js b/lib/airtable/airtable.js index 27465a8e..29407c1f 100644 --- a/lib/airtable/airtable.js +++ b/lib/airtable/airtable.js @@ -9,13 +9,15 @@ If you're adding a new function: make sure you add a corresponding test (at least 1) for it in airtable.spec.js */ import Airtable from 'airtable'; +import getEnvVars from '../../environment'; import { Columns } from './schema'; -const BASE_ID = 'appYfW7a2loPD26Vg'; +const { AIRTABLE_API_KEY, AIRTABLE_BASE_ID } = getEnvVars(); +const BASE_ID = AIRTABLE_BASE_ID; const VIEW = 'Grid view'; const ENDPOINT_URL = 'https://api.airtable.com'; -const apiKey = process.env.REACT_APP_AIRTABLE_API_KEY; +const apiKey = AIRTABLE_API_KEY; Airtable.configure({ endpointUrl: ENDPOINT_URL, diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js index 7ac2db1e..9342aa8e 100644 --- a/navigation/AppNavigator.js +++ b/navigation/AppNavigator.js @@ -29,7 +29,7 @@ function DrawerNavigator() { {/* ); @@ -55,6 +55,7 @@ export default function createAppContainer() { screenOptions={{ headerShown: false, cardStyle: { backgroundColor: Colors.lightest }, + gestureEnabled: false, }}> resource.category === 'COVID-19 (Coronavirus)' + const CrisisResources = resources.filter( + resource => resource.category === 'Crisis Response' ); const DCCentralKitchenResources = resources.filter( resource => resource.category === 'DC Central Kitchen Resources' @@ -42,7 +42,7 @@ export default class ResourcesScreen extends React.Component { resource => resource.category === 'Resources for Seniors' ); this.setState({ - CovidResources, + CrisisResources, DCCentralKitchenResources, CommunityResources, GovernmentResources, @@ -63,11 +63,8 @@ export default class ResourcesScreen extends React.Component { Resources - - {this.state.CovidResources.map(resource => ( + + {this.state.CrisisResources.map(resource => (