From 2ac193e64c5946c0615f35f7603ff09f8dd41494 Mon Sep 17 00:00:00 2001 From: Jonathan Taveras Date: Mon, 23 Dec 2019 19:48:10 -0400 Subject: [PATCH 1/6] hotfix actions --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 007d1a3..e3f7302 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,4 +18,5 @@ jobs: expo-version: 3.x expo-username: beyondx expo-password: beyondthex - - run: expo publish + - run: npm ci + - run: expo publish \ No newline at end of file From 9ac754cc1ff796948b4718b067a3fe0ee70ef73a Mon Sep 17 00:00:00 2001 From: francinelucca Date: Thu, 26 Dec 2019 12:52:55 -0400 Subject: [PATCH 2/6] Fix Leyenda en Home y Calendario --- App/Components/Calendar/Calendar.js | 65 +++++++---------------------- App/Components/Home/Home.js | 16 +++---- 2 files changed, 19 insertions(+), 62 deletions(-) diff --git a/App/Components/Calendar/Calendar.js b/App/Components/Calendar/Calendar.js index cdbba8d..62edd2e 100644 --- a/App/Components/Calendar/Calendar.js +++ b/App/Components/Calendar/Calendar.js @@ -15,7 +15,7 @@ import Pill from '../FileInput/FilePill'; class Calendar extends React.Component { leftText = () => { - return ; + return ; }; rightText = () => { @@ -35,61 +35,23 @@ class Calendar extends React.Component { ); }; - renderClassInfoIndicator = () => { + renderInfoIndicators = () => { + const { showingPrivate } = this.props; return ( - + - + - - + + - - ); - }; - - renderEventPrivateInfoIndicator = () => { - return ( - - - - - ); - }; - - renderEventInfoIndicator = () => { - return ( - - - - - ); - }; - - renderEventInfoIndicators = () => { - return ( - - {this.renderEventInfoIndicator()} - {this.renderEventPrivateInfoIndicator()} - - // - // - // - ); - }; - - renderInfoCalendar = () => { - return ( - - ); }; @@ -210,7 +172,7 @@ class Calendar extends React.Component { }} > {hasFilter ? : null} - {this.renderInfoCalendar()} + {this.renderInfoIndicators()} {isLoading ? ( @@ -246,6 +208,7 @@ const styles = StyleSheet.create({ ...spacers.MR_1, }, infoText: { color: colors.GRAY }, + classInfoText: { color: colors.GRAY, ...spacers.MR_8 }, infoEventCalendar: { height: toBaseDesignPx(7), width: toBaseDesignPx(7), diff --git a/App/Components/Home/Home.js b/App/Components/Home/Home.js index 5b508a8..0820971 100644 --- a/App/Components/Home/Home.js +++ b/App/Components/Home/Home.js @@ -18,7 +18,7 @@ class Home extends React.Component { const { actualMonth } = this.props; return ( - + ); @@ -33,17 +33,11 @@ class Home extends React.Component { - - - - - - - - + + @@ -203,7 +197,7 @@ const styles = StyleSheet.create({ width: toBaseDesignPx(7), borderRadius: toBaseDesignPx(3.5), backgroundColor: colors.ORANGE_LIGHT, - ...spacers.MR_2, + ...spacers.MR_1, }, infoTransparentCalendar: { height: toBaseDesignPx(7), @@ -226,7 +220,7 @@ const styles = StyleSheet.create({ classesContainer: { ...spacers.MT_10 }, classesTitle: { ...fonts.SIZE_XXL, color: colors.GRAY }, infoText: { color: colors.GRAY }, - infoPrivateText: { color: colors.GRAY, ...spacers.MR_1 }, + infoPrivateText: { color: colors.GRAY }, transparentInfo: { color: colors.TRANSPARENT }, }); From 2612c9e6b8616e307972e0054c0f3dd6412e2b62 Mon Sep 17 00:00:00 2001 From: francinelucca Date: Thu, 26 Dec 2019 13:52:55 -0400 Subject: [PATCH 3/6] Fix Bug TimePicker select hours adds 4 --- App/Components/Common/TimePicker/TimePicker.js | 6 +----- App/Screens/PostInfo/PostInfo.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/App/Components/Common/TimePicker/TimePicker.js b/App/Components/Common/TimePicker/TimePicker.js index 36eed75..ab17d75 100644 --- a/App/Components/Common/TimePicker/TimePicker.js +++ b/App/Components/Common/TimePicker/TimePicker.js @@ -22,13 +22,9 @@ class TimePicker extends React.Component { : Moment(props.time).minutes() }`; const timeDate = Moment(props.time).toDate(); - const newDate = new Date(timeDate.getTime() + timeDate.getTimezoneOffset() * 60 * 1000); - const offset = timeDate.getTimezoneOffset() / 60; - const hours = timeDate.getHours(); - newDate.setHours(hours + offset); return { date: strDate, - timePicked: newDate, + timePicked: timeDate, }; } return null; diff --git a/App/Screens/PostInfo/PostInfo.js b/App/Screens/PostInfo/PostInfo.js index 252d3c7..9e790eb 100644 --- a/App/Screens/PostInfo/PostInfo.js +++ b/App/Screens/PostInfo/PostInfo.js @@ -275,8 +275,8 @@ class PostInfo extends React.Component { section: postSectionId, type: isPublic ? 'public' : 'private', postId, - endDate: endDate ? Moment(endDate).utc() : null, - startDate: startDate ? Moment(startDate).utc() : null, + endDate: endDate ? this.convertDate(endDate) : null, + startDate: startDate ? this.convertDate(startDate) : null, dateTime: startDate ? Moment(startDate) .utc() @@ -289,6 +289,17 @@ class PostInfo extends React.Component { setModalVisible(true); }; + convertDate = date => { + const momentDate = Moment(date) + .utc() + .toDate(); + const newDate = new Date(momentDate.getTime() + momentDate.getTimezoneOffset() * 60 * 1000); + const offset = momentDate.getTimezoneOffset() / 60; + const hours = momentDate.getHours(); + newDate.setHours(hours + offset); + return newDate; + }; + deletePost = () => { const { logger } = this.props; const { postId } = this.state; From 9e71b4b297f0a6d37bbd603088ab987872272b57 Mon Sep 17 00:00:00 2001 From: francinelucca Date: Thu, 26 Dec 2019 14:43:14 -0400 Subject: [PATCH 4/6] DropDown: make more intuitive with down arrow on input: --- App/Components/Common/DropDown/DropDown.js | 23 +++++++++++++++++++++- App/Components/PostInfo/PostInfo.js | 1 - 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/App/Components/Common/DropDown/DropDown.js b/App/Components/Common/DropDown/DropDown.js index 117cb04..f89db09 100644 --- a/App/Components/Common/DropDown/DropDown.js +++ b/App/Components/Common/DropDown/DropDown.js @@ -11,6 +11,7 @@ import { fonts, colors, toBaseDesignPx, spacers } from '../../../Core/Theme'; // Common import Text from '../Text'; import InLineComponent from '../InLineComponent'; +import Icon, { ICON_TYPE, ICON_SIZE } from '../Icon'; class DropDownComponent extends React.Component { constructor(props) { @@ -46,6 +47,20 @@ class DropDownComponent extends React.Component { ); }; + renderIcon = () => { + return ( + + + + ); + }; + renderLabel = () => { const { label, labelStyle, hasError } = this.props; const errorLabelStyle = hasError ? styles.errorLabelStyle : null; @@ -58,7 +73,6 @@ class DropDownComponent extends React.Component { text={label} style={[this.getLabelStyle(), errorLabelStyle, labelStyle]} /> - {this.renderErrorLabel()} @@ -115,9 +129,14 @@ class DropDownComponent extends React.Component { style={{ inputIOS: [this.getDropDownStyle(), style], inputAndroid: [this.getDropDownStyle(), style], + iconContainer: { + top: 5, + right: 15, + }, }} value={valueFromState} useNativeAndroidPickerStyle={false} + Icon={() => this.renderIcon()} {...rest} /> @@ -144,12 +163,14 @@ const styles = StyleSheet.create({ color: colors.BLACK, ...spacers.MT_9, ...spacers.MB_14, + ...spacers.PR_5, }, dropDownDisabled: { ...fonts.SEMI_BOLD, color: colors.DISABLED, ...spacers.MT_9, ...spacers.MB_14, + ...spacers.PR_5, }, errorLabelStyle: { color: colors.ERROR, diff --git a/App/Components/PostInfo/PostInfo.js b/App/Components/PostInfo/PostInfo.js index a38f9dd..4d67c06 100644 --- a/App/Components/PostInfo/PostInfo.js +++ b/App/Components/PostInfo/PostInfo.js @@ -266,7 +266,6 @@ class PostInfo extends React.Component { renderResourceSection = () => { const { hasResources, goToResources } = this.props; - console.log(hasResources); if (hasResources) { return ( From a1c88de86d4d8843af00a9df73a764eadac6e1f0 Mon Sep 17 00:00:00 2001 From: francinelucca Date: Thu, 26 Dec 2019 15:16:04 -0400 Subject: [PATCH 5/6] Dont Show Description Section if Post Doesn't Have it --- App/Components/PostInfo/PostInfo.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/App/Components/PostInfo/PostInfo.js b/App/Components/PostInfo/PostInfo.js index a38f9dd..979546e 100644 --- a/App/Components/PostInfo/PostInfo.js +++ b/App/Components/PostInfo/PostInfo.js @@ -266,7 +266,6 @@ class PostInfo extends React.Component { renderResourceSection = () => { const { hasResources, goToResources } = this.props; - console.log(hasResources); if (hasResources) { return ( @@ -279,6 +278,20 @@ class PostInfo extends React.Component { return null; }; + renderDescriptionSection = () => { + const { postDescription } = this.props; + + if (postDescription) { + return ( +
+ +
+ ); + } + + return null; + }; + renderCommentsSection = () => { const { isPrivate, goToComments } = this.props; @@ -294,7 +307,7 @@ class PostInfo extends React.Component { }; render() { - const { postTitle, postDescription, className, renderSubTasks } = this.props; + const { postTitle, className, renderSubTasks } = this.props; return ( @@ -307,9 +320,7 @@ class PostInfo extends React.Component { {this.renderEventTime()} -
- -
+ {this.renderDescriptionSection()} {this.renderCommentsSection()} {this.renderResourceSection()} {renderSubTasks()} From 984c53ed6f5b4e017aad4d09ea6e99818eb2638f Mon Sep 17 00:00:00 2001 From: Jonathan Taveras Date: Sat, 28 Dec 2019 09:02:00 -0400 Subject: [PATCH 6/6] Hotfix develop --- .github/workflows/main.yml | 22 ---------------------- .yml | 2 -- App/Screens/Calendar/Calendar.js | 7 +------ yarn.lock | 18 +----------------- 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/main.yml delete mode 100644 .yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index e3f7302..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Expo Publish - -on: - push: - branches: - - master -jobs: - publish: - name: Install and publish - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - uses: actions/setup-node@v1 - with: - node-version: 12.x - - uses: expo/expo-github-action@v4 - with: - expo-version: 3.x - expo-username: beyondx - expo-password: beyondthex - - run: npm ci - - run: expo publish \ No newline at end of file diff --git a/.yml b/.yml deleted file mode 100644 index 5bf58b3..0000000 --- a/.yml +++ /dev/null @@ -1,2 +0,0 @@ -- name: Expo GitHub Action - uses: expo/expo-github-action@4.1.0 diff --git a/App/Screens/Calendar/Calendar.js b/App/Screens/Calendar/Calendar.js index f3d29bf..ba85578 100644 --- a/App/Screens/Calendar/Calendar.js +++ b/App/Screens/Calendar/Calendar.js @@ -290,9 +290,4 @@ const mapStateToProps = (state, props) => { }; }; -export default WithLogger( - connect( - mapStateToProps, - null - )(Calendar) -); +export default WithLogger(connect(mapStateToProps, null)(Calendar)); diff --git a/yarn.lock b/yarn.lock index 52e47a9..d1ba351 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6702,22 +6702,6 @@ node-notifier@^5.2.1, node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-pre-gyp@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" @@ -9357,7 +9341,7 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tar@^4, tar@^4.4.2: +tar@^4: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==