diff --git a/.expo/packager-info.json b/.expo/packager-info.json index 7391ba78..f9703325 100644 --- a/.expo/packager-info.json +++ b/.expo/packager-info.json @@ -1,9 +1,9 @@ { "devToolsPort": 19002, - "expoServerPort": null, - "packagerPort": null, - "packagerPid": null, + "expoServerPort": 19000, + "packagerPort": 19001, + "packagerPid": 25344, "expoServerNgrokUrl": null, "packagerNgrokUrl": null, "ngrokPid": null -} \ No newline at end of file +} diff --git a/.expo/settings.json b/.expo/settings.json index 5a8130ae..11031936 100644 --- a/.expo/settings.json +++ b/.expo/settings.json @@ -3,5 +3,6 @@ "lanType": "ip", "dev": true, "minify": false, - "urlRandomness": "vx-5x5" -} \ No newline at end of file + "urlRandomness": "vx-5x5", + "https": false +} diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json index a87945cf..5d42c6d8 100644 --- a/amplify/.config/project-config.json +++ b/amplify/.config/project-config.json @@ -1,6 +1,6 @@ { "projectName": "RNConfInABox", - "version": "2.0", + "version": "3.0", "frontend": "javascript", "javascript": { "framework": "react-native", diff --git a/amplify/backend/api/rnconfinabox/transform.conf.json b/amplify/backend/api/rnconfinabox/transform.conf.json new file mode 100644 index 00000000..98e1e19f --- /dev/null +++ b/amplify/backend/api/rnconfinabox/transform.conf.json @@ -0,0 +1,4 @@ +{ + "Version": 5, + "ElasticsearchWarning": true +} \ No newline at end of file diff --git a/package.json b/package.json index 380f08f0..0a0e2f44 100644 --- a/package.json +++ b/package.json @@ -10,23 +10,28 @@ "eject": "expo eject" }, "dependencies": { + "@react-native-community/netinfo": "^5.9.4", "aws-amplify": "2.2.1", "aws-amplify-react": "3.1.2", "aws-amplify-react-native": "2.2.3", "date-fns": "^1.30.1", - "expo": "^33.0.0", - "react": "16.8.3", - "react-dom": "^16.8.6", - "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz", + "expo": "^38.0.0", + "expo-font": "^8.2.1", + "react": "16.11.0", + "react-dom": "16.11.0", + "react-native": "https://github.com/expo/react-native/archive/sdk-38.0.0.tar.gz", + "react-native-gesture-handler": "^1.6.1", + "react-native-maps": "^0.27.1", + "react-native-screens": "^2.9.0", "react-native-snap-carousel": "^3.8.0", - "react-native-web": "^0.11.4", + "react-native-web": "~0.11.7", "react-native-web-maps": "^0.2.0", "react-navigation": "^3.11.1", "uuid": "^3.3.2" }, "devDependencies": { - "@expo/webpack-config": "^0.7.0", - "babel-preset-expo": "^5.1.1" + "@expo/webpack-config": "^0.12.16", + "babel-preset-expo": "^8.2.3" }, "private": true } diff --git a/src/Main.js b/src/Main.js index 46dcd47c..0bc8cdb9 100644 --- a/src/Main.js +++ b/src/Main.js @@ -5,7 +5,7 @@ import { Hub, Auth } from 'aws-amplify' import { withAuthenticator } from 'aws-amplify-react-native' import AmplifyTheme from 'aws-amplify-react-native/src/AmplifyTheme' import { FontAwesome } from '@expo/vector-icons' -import { Font } from 'expo' +import * as Font from 'expo-font'; import Schedule from './Schedule' import Profile from './Profile' @@ -50,7 +50,9 @@ class TabNavWithProps extends React.Component { Font.loadAsync({ 'Gotham Rounded': require('./assets/fonts/GothamRnd-Light.otf'), 'GothamRnd Medium': require('./assets/fonts/GothamRnd-Medium.otf'), - 'Gotham Bold': require('./assets/fonts/GothamRnd-Bold.otf') + 'Gotham Bold': require('./assets/fonts/GothamRnd-Bold.otf'), + 'Ionicons': require('./assets/fonts/GothamRnd-Bold.otf') + }); } static router = TabNavigator.router