From 3a8d7ee5af4147cb9d824134b7a99841987bd725 Mon Sep 17 00:00:00 2001 From: Joseph McCombs Date: Sun, 7 Feb 2021 13:58:35 -0500 Subject: [PATCH 01/10] feat: autofill for organization --- domains/Auth/SignUp/index.js | 58 ++++++++++++++++++----------- modules/cached-resources/read.js | 63 +++++++++++++++----------------- package-lock.json | 2 +- 3 files changed, 68 insertions(+), 55 deletions(-) diff --git a/domains/Auth/SignUp/index.js b/domains/Auth/SignUp/index.js index f95b45037..db123eb94 100644 --- a/domains/Auth/SignUp/index.js +++ b/domains/Auth/SignUp/index.js @@ -1,26 +1,29 @@ -import { Formik } from 'formik'; -import React from 'react'; +import React, { useEffect } from 'react'; import { - ActivityIndicator, - KeyboardAvoidingView, - Platform, SafeAreaView, + ActivityIndicator, StyleSheet, - View + View, + KeyboardAvoidingView, + Platform } from 'react-native'; -import { ScrollView } from 'react-native-gesture-handler'; import { - Button, Checkbox, Text + Checkbox, Button, Text } from 'react-native-paper'; +import { ScrollView } from 'react-native-gesture-handler'; +import { Formik } from 'formik'; import * as yup from 'yup'; +import { retrieveSignUpFunction } from '../../../services/parse/auth'; import FormInput from '../../../components/FormikFields/FormInput'; import TermsModal from '../../../components/TermsModal'; -import { populateCache } from '../../../modules/cached-resources'; -import I18n from '../../../modules/i18n'; // STYLING import { theme } from '../../../modules/theme'; -import { retrieveSignUpFunction } from '../../../services/parse/auth'; + +import { populateCache, cacheAutofillData } from '../../../modules/cached-resources'; +import Autofill from '../../../components/FormikFields/PaperInputPicker/AutoFill'; + +import I18n from '../../../modules/i18n'; const validationSchema = yup.object().shape({ firstname: yup @@ -41,7 +44,7 @@ const validationSchema = yup.object().shape({ .min(10, 'Seems a bit short..'), organization: yup .string() - .label('Username') + .label('Organization') .required(), password: yup .string() @@ -59,10 +62,17 @@ const validationSchema = yup.object().shape({ export default function SignUp({ navigation }) { const [checked, setChecked] = React.useState(false); const [visible, setVisible] = React.useState(false); - + const [scrollViewScroll, setScrollViewScroll] = React.useState(); const handleLogIn = () => { navigation.navigate('Sign In'); }; + + useEffect(() => { + cacheAutofillData('organization').then((result) => { + console.log(result) + }) + }, []) + return ( Back - + - @@ -168,8 +184,8 @@ export default function SignUp({ navigation }) { {formikProps.isSubmitting ? ( ) : ( - - )} + + )} @@ -223,4 +239,4 @@ const styles = StyleSheet.create({ marginBottom: 'auto' }, -}); +}); \ No newline at end of file diff --git a/modules/cached-resources/read.js b/modules/cached-resources/read.js index 2901eff6b..29e9dc5a5 100644 --- a/modules/cached-resources/read.js +++ b/modules/cached-resources/read.js @@ -1,8 +1,8 @@ +import { residentIDQuery, customQueryService } from '../../services/parse/crud'; import retrievePuenteAutofillData from '../../services/aws'; -import { customQueryService, residentIDQuery } from '../../services/parse/crud'; -import getTasks from '../../services/tasky'; -import { getData, storeData } from '../async-storage'; import checkOnlineStatus from '../offline'; +import { getData, storeData } from '../async-storage'; +import getTasks from '../../services/tasky'; async function residentQuery(queryParams) { let records = await residentIDQuery(queryParams); @@ -22,8 +22,29 @@ async function cacheAutofillData(parameter) { checkOnlineStatus().then((connected) => { if (connected) { retrievePuenteAutofillData('all').then((result) => { - storeData(result, 'autofill_information'); - resolve(result[parameter]); + // cache organizations tied to all users + customQueryService(0, 500, 'User', 'adminVerified', "true").then((users) => { + const orgsCapitalized = []; + const orgResults = []; + users.forEach((user) => { + console.log(user.get("organization")) + const org = user.get("organization") + if (org !== null && org !== undefined && org !== '') { + const orgCapitalized = org.toUpperCase().trim() || ''; + if (!orgsCapitalized.includes(orgCapitalized) && org !== '') { + orgsCapitalized.push(orgCapitalized); + orgResults.push(org); + } + } + }); + const autofillData = result; + autofillData["organization"] = orgResults; + storeData(autofillData, 'autofill_information') + resolve(autofillData[parameter]); + }, () => { + storeData(result, 'autofill_information'); + resolve(result[parameter]); + }) }, (error) => { reject(error); }); @@ -67,29 +88,6 @@ function customFormsQuery(surveyingOrganization) { }); } -function assetFormsQuery() { - return new Promise((resolve, reject) => { - checkOnlineStatus().then((online) => { - if (online) { - customQueryService(0, 5000, 'FormSpecificationsV2', 'typeOfForm', 'Assets').then(async (forms) => { - await storeData(forms, 'assetForms'); - resolve(JSON.parse(JSON.stringify(forms))); - }, (error) => { - reject(error); - }); - } else { - getData('assetForms').then((forms) => { - resolve(forms); - }, (error) => { - reject(error); - }); - } - }, (error) => { - reject(error); - }); - }); -} - function getTasksAsync() { return new Promise((resolve, reject) => { checkOnlineStatus().then(async (online) => { @@ -114,10 +112,9 @@ function getTasksAsync() { } export { - assetFormsQuery, - cacheAutofillData, + residentQuery, cacheResidentData, + cacheAutofillData, customFormsQuery, - getTasksAsync, - residentQuery -}; + getTasksAsync +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3ff10acd7..69cf333a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.5.0", + "version": "10.5.4", "lockfileVersion": 1, "requires": true, "dependencies": { From 46e37fcd0212784c6609212e33ffa342d03740cc Mon Sep 17 00:00:00 2001 From: Joseph McCombs Date: Mon, 8 Feb 2021 22:35:55 -0500 Subject: [PATCH 02/10] feat: ui update for autofill --- .../PaperInputPicker/AutoFill/index.js | 112 ++++++++---------- domains/Auth/SignUp/index.js | 6 - modules/cached-resources/read.js | 2 +- 3 files changed, 51 insertions(+), 69 deletions(-) diff --git a/components/FormikFields/PaperInputPicker/AutoFill/index.js b/components/FormikFields/PaperInputPicker/AutoFill/index.js index 213ba286a..c45c4d24d 100644 --- a/components/FormikFields/PaperInputPicker/AutoFill/index.js +++ b/components/FormikFields/PaperInputPicker/AutoFill/index.js @@ -9,6 +9,7 @@ import { TextInput } from 'react-native-paper'; import { getData } from '../../../../modules/async-storage'; import { cacheAutofillData } from '../../../../modules/cached-resources'; import I18n from '../../../../modules/i18n'; +import { theme } from '../../../../modules/theme'; import { stylesDefault, stylesPaper } from '../index.style'; YellowBox.ignoreWarnings(['VirtualizedLists should never be nested']); @@ -56,7 +57,7 @@ export default class AutoFill extends Component { label, translatedLabel, formikProps, formikKey, scrollViewScroll, setScrollViewScroll } = this.props; - const placeholder = `${I18n.t('components.autofill.placeholder')} ${I18n.t(label)} ${I18n.t('components.autofill.placeholder_end')}`; + const placeholder = I18n.t(label); return ( @@ -71,57 +72,51 @@ export default class AutoFill extends Component { style={stylesDefault.label} /> ) : ( - - + { - this.setState({ query: text }); - formikProps.setFieldValue(formikKey, text); - }} - placeholder={placeholder} - listStyle={styles.listContainer} - keyExtractor={(item,) => item.key} - onStartShouldSetResponderCapture={() => { - // this allows for us to scroll within the result list when the user is toouching it - // and on the screen when they are not - setScrollViewScroll(false); - if (fields.length === 0 + onChangeText={(text) => { + this.setState({ query: text }); + formikProps.setFieldValue(formikKey, text); + }} + placeholder={placeholder} + listStyle={styles.listContainer} + keyExtractor={(item,) => item.key} + onStartShouldSetResponderCapture={() => { + // this allows for us to scroll within the result list when the user is toouching it + // and on the screen when they are not + setScrollViewScroll(false); + if (fields.length === 0 && scrollViewScroll === false) { - setScrollViewScroll(true); - } - }} - renderItem={({ item }) => ( - // you can change the view you want to show in suggestion from here - { - this.setState({ query: item }); - formikProps.setFieldValue(formikKey, item); - }} - > - - {item} - - - )} - /> - - {fields.length > 0 ? ( - {query} - ) : ( - {placeholder} - )} + setScrollViewScroll(true); + } + }} + renderItem={({ item }) => ( + // you can change the view you want to show in suggestion from here + { + this.setState({ query: item }); + formikProps.setFieldValue(formikKey, item); + }} + > + + {item} + + + )} + /> - - )} + )} ); } @@ -129,30 +124,23 @@ export default class AutoFill extends Component { const styles = StyleSheet.create({ container: { - // backgroundColor: '#F5FCFF', flex: 1, - padding: 16, - // marginTop: 40, - marginBottom: 40, + paddingLeft: 15, + paddingRight: 15, + paddingTop: 10, + marginBottom: 75, }, - autocompleteContainer: { - backgroundColor: '#ffffff', - borderWidth: 0 - }, - descriptionContainer: { - flex: 1, - justifyContent: 'center', - borderRadius: 20 + textInputContainer: { + borderColor: theme.colors.primary, + borderWidth: 1, + color: 'red' }, itemText: { fontSize: 15, paddingTop: 5, paddingBottom: 5, margin: 2, - }, - infoText: { - textAlign: 'center', - fontSize: 16, + flex: 1 }, listContainer: { height: 80, diff --git a/domains/Auth/SignUp/index.js b/domains/Auth/SignUp/index.js index db123eb94..80a7492bc 100644 --- a/domains/Auth/SignUp/index.js +++ b/domains/Auth/SignUp/index.js @@ -67,12 +67,6 @@ export default function SignUp({ navigation }) { navigation.navigate('Sign In'); }; - useEffect(() => { - cacheAutofillData('organization').then((result) => { - console.log(result) - }) - }, []) - return ( { // cache organizations tied to all users - customQueryService(0, 500, 'User', 'adminVerified', "true").then((users) => { + customQueryService(0, 500, 'User', 'adminVerified', true).then((users) => { const orgsCapitalized = []; const orgResults = []; users.forEach((user) => { From 43bd4cd0241b24c230a30425d555d7005b8089ba Mon Sep 17 00:00:00 2001 From: Joseph McCombs Date: Mon, 8 Feb 2021 22:40:03 -0500 Subject: [PATCH 03/10] chore: linting --- App.js | 4 +- .../PaperInputPicker/AutoFill/index.js | 80 +++++++++---------- domains/Auth/SignUp/index.js | 43 +++++----- modules/cached-resources/read.js | 23 +++--- 4 files changed, 74 insertions(+), 76 deletions(-) diff --git a/App.js b/App.js index 03a357368..e8df75d14 100644 --- a/App.js +++ b/App.js @@ -2,10 +2,10 @@ import React from 'react'; import { Platform } from 'react-native'; import { Provider as PaperProvider } from 'react-native-paper'; import { enableScreens } from 'react-native-screens'; -import useCachedResources from './modules/cached-resources/useCachedResources' -// import { Provider as StoreProvider } from 'react-redux'; +// import { Provider as StoreProvider } from 'react-redux'; import MainNavigation from './components/MainNavigation'; +import useCachedResources from './modules/cached-resources/useCachedResources'; // import configureStore from './modules/state-management/configure-store'; import { theme } from './modules/theme'; diff --git a/components/FormikFields/PaperInputPicker/AutoFill/index.js b/components/FormikFields/PaperInputPicker/AutoFill/index.js index c45c4d24d..088108562 100644 --- a/components/FormikFields/PaperInputPicker/AutoFill/index.js +++ b/components/FormikFields/PaperInputPicker/AutoFill/index.js @@ -72,51 +72,51 @@ export default class AutoFill extends Component { style={stylesDefault.label} /> ) : ( - - + { - this.setState({ query: text }); - formikProps.setFieldValue(formikKey, text); - }} - placeholder={placeholder} - listStyle={styles.listContainer} - keyExtractor={(item,) => item.key} - onStartShouldSetResponderCapture={() => { - // this allows for us to scroll within the result list when the user is toouching it - // and on the screen when they are not - setScrollViewScroll(false); - if (fields.length === 0 + onChangeText={(text) => { + this.setState({ query: text }); + formikProps.setFieldValue(formikKey, text); + }} + placeholder={placeholder} + listStyle={styles.listContainer} + keyExtractor={(item,) => item.key} + onStartShouldSetResponderCapture={() => { + // this allows for us to scroll within the result list when the user is toouching it + // and on the screen when they are not + setScrollViewScroll(false); + if (fields.length === 0 && scrollViewScroll === false) { - setScrollViewScroll(true); - } - }} - renderItem={({ item }) => ( - // you can change the view you want to show in suggestion from here - { - this.setState({ query: item }); - formikProps.setFieldValue(formikKey, item); - }} - > - - {item} - - - )} - /> - - )} + setScrollViewScroll(true); + } + }} + renderItem={({ item }) => ( + // you can change the view you want to show in suggestion from here + { + this.setState({ query: item }); + formikProps.setFieldValue(formikKey, item); + }} + > + + {item} + + + )} + /> + + )} ); } diff --git a/domains/Auth/SignUp/index.js b/domains/Auth/SignUp/index.js index 80a7492bc..a443ad08e 100644 --- a/domains/Auth/SignUp/index.js +++ b/domains/Auth/SignUp/index.js @@ -1,29 +1,27 @@ -import React, { useEffect } from 'react'; +import { Formik } from 'formik'; +import React from 'react'; import { - SafeAreaView, ActivityIndicator, - StyleSheet, - View, KeyboardAvoidingView, - Platform + Platform, + SafeAreaView, + StyleSheet, + View } from 'react-native'; +import { ScrollView } from 'react-native-gesture-handler'; import { - Checkbox, Button, Text + Button, Checkbox, Text } from 'react-native-paper'; -import { ScrollView } from 'react-native-gesture-handler'; -import { Formik } from 'formik'; import * as yup from 'yup'; -import { retrieveSignUpFunction } from '../../../services/parse/auth'; import FormInput from '../../../components/FormikFields/FormInput'; +import Autofill from '../../../components/FormikFields/PaperInputPicker/AutoFill'; import TermsModal from '../../../components/TermsModal'; +import { populateCache } from '../../../modules/cached-resources'; +import I18n from '../../../modules/i18n'; // STYLING import { theme } from '../../../modules/theme'; - -import { populateCache, cacheAutofillData } from '../../../modules/cached-resources'; -import Autofill from '../../../components/FormikFields/PaperInputPicker/AutoFill'; - -import I18n from '../../../modules/i18n'; +import { retrieveSignUpFunction } from '../../../services/parse/auth'; const validationSchema = yup.object().shape({ firstname: yup @@ -77,7 +75,8 @@ export default function SignUp({ navigation }) { - @@ -151,11 +150,11 @@ export default function SignUp({ navigation }) { secureTextEntry /> @@ -178,8 +177,8 @@ export default function SignUp({ navigation }) { {formikProps.isSubmitting ? ( ) : ( - - )} + + )} @@ -233,4 +232,4 @@ const styles = StyleSheet.create({ marginBottom: 'auto' }, -}); \ No newline at end of file +}); diff --git a/modules/cached-resources/read.js b/modules/cached-resources/read.js index 78e492921..234c92cfc 100644 --- a/modules/cached-resources/read.js +++ b/modules/cached-resources/read.js @@ -1,8 +1,8 @@ -import { residentIDQuery, customQueryService } from '../../services/parse/crud'; import retrievePuenteAutofillData from '../../services/aws'; -import checkOnlineStatus from '../offline'; -import { getData, storeData } from '../async-storage'; +import { customQueryService, residentIDQuery } from '../../services/parse/crud'; import getTasks from '../../services/tasky'; +import { getData, storeData } from '../async-storage'; +import checkOnlineStatus from '../offline'; async function residentQuery(queryParams) { let records = await residentIDQuery(queryParams); @@ -27,8 +27,7 @@ async function cacheAutofillData(parameter) { const orgsCapitalized = []; const orgResults = []; users.forEach((user) => { - console.log(user.get("organization")) - const org = user.get("organization") + const org = user.get('organization'); if (org !== null && org !== undefined && org !== '') { const orgCapitalized = org.toUpperCase().trim() || ''; if (!orgsCapitalized.includes(orgCapitalized) && org !== '') { @@ -38,13 +37,13 @@ async function cacheAutofillData(parameter) { } }); const autofillData = result; - autofillData["organization"] = orgResults; - storeData(autofillData, 'autofill_information') + autofillData.organization = orgResults; + storeData(autofillData, 'autofill_information'); resolve(autofillData[parameter]); }, () => { storeData(result, 'autofill_information'); resolve(result[parameter]); - }) + }); }, (error) => { reject(error); }); @@ -112,9 +111,9 @@ function getTasksAsync() { } export { - residentQuery, - cacheResidentData, cacheAutofillData, + cacheResidentData, customFormsQuery, - getTasksAsync -}; \ No newline at end of file + getTasksAsync, + residentQuery +}; From f96c3061a3c5594b4e0e4a33ff40f7daf47b0147 Mon Sep 17 00:00:00 2001 From: Joseph McCombs Date: Sat, 20 Feb 2021 12:11:40 -0500 Subject: [PATCH 04/10] fix: android autofill respond to user --- .../PaperInputPicker/AutoFill/index.js | 87 ++++++++++++------- 1 file changed, 57 insertions(+), 30 deletions(-) diff --git a/components/FormikFields/PaperInputPicker/AutoFill/index.js b/components/FormikFields/PaperInputPicker/AutoFill/index.js index 213ba286a..eb1ab32ae 100644 --- a/components/FormikFields/PaperInputPicker/AutoFill/index.js +++ b/components/FormikFields/PaperInputPicker/AutoFill/index.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { + Platform, StyleSheet, Text, TouchableOpacity, View, YellowBox } from 'react-native'; @@ -9,6 +10,7 @@ import { TextInput } from 'react-native-paper'; import { getData } from '../../../../modules/async-storage'; import { cacheAutofillData } from '../../../../modules/cached-resources'; import I18n from '../../../../modules/i18n'; +import { theme } from '../../../../modules/theme'; import { stylesDefault, stylesPaper } from '../index.style'; YellowBox.ignoreWarnings(['VirtualizedLists should never be nested']); @@ -56,12 +58,12 @@ export default class AutoFill extends Component { label, translatedLabel, formikProps, formikKey, scrollViewScroll, setScrollViewScroll } = this.props; - const placeholder = `${I18n.t('components.autofill.placeholder')} ${I18n.t(label)} ${I18n.t('components.autofill.placeholder_end')}`; + const placeholder = I18n.t(label); return ( {/* handle issues where autofil does not populate any data */} - {!values ? ( + {!values && ( 40 ? '' : translatedLabel} onChangeText={formikProps.handleChange(formikKey)} @@ -70,18 +72,20 @@ export default class AutoFill extends Component { theme={stylesPaper} style={stylesDefault.label} /> - ) : ( + )} + {values && Platform.OS === 'ios' && ( { this.setState({ query: text }); formikProps.setFieldValue(formikKey, text); @@ -94,7 +98,7 @@ export default class AutoFill extends Component { // and on the screen when they are not setScrollViewScroll(false); if (fields.length === 0 - && scrollViewScroll === false) { + && scrollViewScroll === false) { setScrollViewScroll(true); } }} @@ -113,13 +117,43 @@ export default class AutoFill extends Component { )} /> - - {fields.length > 0 ? ( - {query} - ) : ( - {placeholder} + + )} + {values && Platform.OS === 'android' && ( + + { + this.setState({ query: text }); + formikProps.setFieldValue(formikKey, text); + }} + placeholder={placeholder} + listStyle={styles.listContainer} + keyExtractor={(item,) => item.key} + renderItem={({ item }) => ( + // you can change the view you want to show in suggestion from here + { + this.setState({ query: item }); + formikProps.setFieldValue(formikKey, item); + }} + > + + {item} + + )} - + /> )} @@ -129,30 +163,23 @@ export default class AutoFill extends Component { const styles = StyleSheet.create({ container: { - // backgroundColor: '#F5FCFF', flex: 1, - padding: 16, - // marginTop: 40, - marginBottom: 40, - }, - autocompleteContainer: { - backgroundColor: '#ffffff', - borderWidth: 0 + paddingLeft: 15, + paddingRight: 15, + paddingTop: 10, + marginBottom: 75, }, - descriptionContainer: { - flex: 1, - justifyContent: 'center', - borderRadius: 20 + textInputContainer: { + borderColor: theme.colors.primary, + borderWidth: 1, + color: 'red' }, itemText: { fontSize: 15, paddingTop: 5, paddingBottom: 5, margin: 2, - }, - infoText: { - textAlign: 'center', - fontSize: 16, + flex: 1 }, listContainer: { height: 80, From 0c98500dbe52e165b8a03f7dc7477856c6b49fa5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Feb 2021 18:19:09 +0000 Subject: [PATCH 05/10] fix(deps): pin dependencies --- package-lock.json | 2 +- package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3888a7fda..eb32c75eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.6.0", + "version": "10.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bc22120f5..ab330d68c 100644 --- a/package.json +++ b/package.json @@ -47,10 +47,10 @@ "axios": "0.19.2", "expo": "38.0.8", "expo-asset": "8.1.7", - "expo-camera": "^10.0.0", + "expo-camera": "10.0.0", "expo-constants": "9.1.1", "expo-font": "8.2.1", - "expo-image-picker": "^10.0.0", + "expo-image-picker": "10.0.0", "expo-linking": "1.0.1", "expo-localization": "8.2.1", "expo-location": "8.2.1", @@ -59,7 +59,7 @@ "expo-web-browser": "8.3.1", "formik": "2.1.5", "i18n-js": "3.7.1", - "lodash": "^4.17.20", + "lodash": "4.17.20", "metro-config": "0.63.0", "native-base": "2.13.8", "parse": "2.14.0", From eb25c1dc04426a307452b299370bf7f4db573efd Mon Sep 17 00:00:00 2001 From: Joseph McCombs Date: Sat, 20 Feb 2021 14:29:50 -0500 Subject: [PATCH 06/10] fix: adding assets back to cachedResourcecs --- modules/cached-resources/read.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/cached-resources/read.js b/modules/cached-resources/read.js index 234c92cfc..6940490bf 100644 --- a/modules/cached-resources/read.js +++ b/modules/cached-resources/read.js @@ -110,7 +110,31 @@ function getTasksAsync() { }); } +function assetFormsQuery() { + return new Promise((resolve, reject) => { + checkOnlineStatus().then((online) => { + if (online) { + customQueryService(0, 5000, 'FormSpecificationsV2', 'typeOfForm', 'Assets').then(async (forms) => { + await storeData(forms, 'assetForms'); + resolve(JSON.parse(JSON.stringify(forms))); + }, (error) => { + reject(error); + }); + } else { + getData('assetForms').then((forms) => { + resolve(forms); + }, (error) => { + reject(error); + }); + } + }, (error) => { + reject(error); + }); + }); +} + export { + assetFormsQuery, cacheAutofillData, cacheResidentData, customFormsQuery, From 31dd324a290bae204fca555c1620901ea920e6ab Mon Sep 17 00:00:00 2001 From: Hope Tambala Date: Wed, 24 Feb 2021 16:01:08 -0500 Subject: [PATCH 07/10] chore(release): 10.6.2 --- CHANGELOG.md | 7 +++++++ app.json | 6 +++--- package.json | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dab7e0cc..8e0d12ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [10.6.2](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.1...v10.6.2) (2021-02-24) + + +### Bug fixes + +* **deps:** pin dependencies ([0c98500](https://github.com/hopetambala/puente-reactnative-collect/commit/0c98500dbe52e165b8a03f7dc7477856c6b49fa5)) + ### [10.6.1](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.0...v10.6.1) (2021-02-19) diff --git a/app.json b/app.json index 3749924ce..ef85373ae 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "android", "web" ], - "version": "10.6.1", + "version": "10.6.2", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "myapp", @@ -23,7 +23,7 @@ ], "ios": { "supportsTablet": true, - "buildNumber": "10.6.1", + "buildNumber": "10.6.2", "infoPlist": { "NSLocationWhenInUseUsageDescription": "This app uses your location to geo-tag surveys accurately." } @@ -32,7 +32,7 @@ "favicon": "./assets/images/favicon.png" }, "android": { - "versionCode": 380100601, + "versionCode": 380100602, "permissions": [ "ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION", diff --git a/package.json b/package.json index ab330d68c..0aa8cb209 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.6.1", + "version": "10.6.2", "main": "node_modules/expo/AppEntry.js", "scripts": { "start": "expo start", From 8e8d3485f7cf7e6792c71338055f8a09f82f0a17 Mon Sep 17 00:00:00 2001 From: Hope Tambala Date: Wed, 24 Feb 2021 16:02:28 -0500 Subject: [PATCH 08/10] Revert "chore(release): 10.6.2" This reverts commit 31dd324a290bae204fca555c1620901ea920e6ab. --- CHANGELOG.md | 7 ------- app.json | 6 +++--- package.json | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e0d12ef6..5dab7e0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,6 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [10.6.2](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.1...v10.6.2) (2021-02-24) - - -### Bug fixes - -* **deps:** pin dependencies ([0c98500](https://github.com/hopetambala/puente-reactnative-collect/commit/0c98500dbe52e165b8a03f7dc7477856c6b49fa5)) - ### [10.6.1](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.0...v10.6.1) (2021-02-19) diff --git a/app.json b/app.json index ef85373ae..3749924ce 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "android", "web" ], - "version": "10.6.2", + "version": "10.6.1", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "myapp", @@ -23,7 +23,7 @@ ], "ios": { "supportsTablet": true, - "buildNumber": "10.6.2", + "buildNumber": "10.6.1", "infoPlist": { "NSLocationWhenInUseUsageDescription": "This app uses your location to geo-tag surveys accurately." } @@ -32,7 +32,7 @@ "favicon": "./assets/images/favicon.png" }, "android": { - "versionCode": 380100602, + "versionCode": 380100601, "permissions": [ "ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION", diff --git a/package.json b/package.json index 0aa8cb209..ab330d68c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.6.2", + "version": "10.6.1", "main": "node_modules/expo/AppEntry.js", "scripts": { "start": "expo start", From 258225e18e9fc7dfe6405a9b1b8b0f08650dfc20 Mon Sep 17 00:00:00 2001 From: Hope Tambala Date: Wed, 24 Feb 2021 23:49:25 -0500 Subject: [PATCH 09/10] chore(release): 10.6.2 --- app.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app.json b/app.json index 3749924ce..ef85373ae 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "android", "web" ], - "version": "10.6.1", + "version": "10.6.2", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "myapp", @@ -23,7 +23,7 @@ ], "ios": { "supportsTablet": true, - "buildNumber": "10.6.1", + "buildNumber": "10.6.2", "infoPlist": { "NSLocationWhenInUseUsageDescription": "This app uses your location to geo-tag surveys accurately." } @@ -32,7 +32,7 @@ "favicon": "./assets/images/favicon.png" }, "android": { - "versionCode": 380100601, + "versionCode": 380100602, "permissions": [ "ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION", diff --git a/package.json b/package.json index ab330d68c..0aa8cb209 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.6.1", + "version": "10.6.2", "main": "node_modules/expo/AppEntry.js", "scripts": { "start": "expo start", From 1857aaa52e8b640a3de96c3f32a981cf7ac162e8 Mon Sep 17 00:00:00 2001 From: Hope Tambala Date: Wed, 24 Feb 2021 23:49:38 -0500 Subject: [PATCH 10/10] chore(release): 10.6.3 --- CHANGELOG.md | 14 ++++++++++++++ app.json | 6 +++--- package.json | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dab7e0cc..f5134a3f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [10.6.3](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.2...v10.6.3) (2021-02-25) + + +### New Features + +* autofill for organization ([3a8d7ee](https://github.com/hopetambala/puente-reactnative-collect/commit/3a8d7ee5af4147cb9d824134b7a99841987bd725)) +* ui update for autofill ([46e37fc](https://github.com/hopetambala/puente-reactnative-collect/commit/46e37fcd0212784c6609212e33ffa342d03740cc)) + + +### Bug fixes + +* adding assets back to cachedResourcecs ([eb25c1d](https://github.com/hopetambala/puente-reactnative-collect/commit/eb25c1dc04426a307452b299370bf7f4db573efd)) +* android autofill respond to user ([f96c306](https://github.com/hopetambala/puente-reactnative-collect/commit/f96c3061a3c5594b4e0e4a33ff40f7daf47b0147)) + ### [10.6.1](https://github.com/hopetambala/puente-reactnative-collect/compare/v10.6.0...v10.6.1) (2021-02-19) diff --git a/app.json b/app.json index ef85373ae..04d2a3b76 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "android", "web" ], - "version": "10.6.2", + "version": "10.6.3", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "myapp", @@ -23,7 +23,7 @@ ], "ios": { "supportsTablet": true, - "buildNumber": "10.6.2", + "buildNumber": "10.6.3", "infoPlist": { "NSLocationWhenInUseUsageDescription": "This app uses your location to geo-tag surveys accurately." } @@ -32,7 +32,7 @@ "favicon": "./assets/images/favicon.png" }, "android": { - "versionCode": 380100602, + "versionCode": 380100603, "permissions": [ "ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION", diff --git a/package.json b/package.json index 0aa8cb209..0a29fcf56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "puente-reactnative", - "version": "10.6.2", + "version": "10.6.3", "main": "node_modules/expo/AppEntry.js", "scripts": { "start": "expo start",