From b59a9ef8178c13ab6dc21a4c46a1ef2aab1ee5f2 Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Fri, 22 Apr 2022 23:30:20 +0500 Subject: [PATCH 01/10] login form layout for ipad --- src/pages/signin/SignInPageLayout/index.js | 52 ++++++++++++++-------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index f9bca16bdc72..e30278d10c49 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -35,34 +35,48 @@ const SignInPageLayout = (props) => { ); + const hasRedirect = !_.isEmpty(backgroundStyle.redirectUri); + + const graphicLayout = () => ( + { + Link.openExternalLink(backgroundStyle.redirectUri); + }} + disabled={!hasRedirect} + > + + + ); + if (props.isSmallScreenWidth) { return content; } - const hasRedirect = !_.isEmpty(backgroundStyle.redirectUri); + if (props.isMediumScreenWidth) { + return ( + + {graphicLayout(props.isMediumScreenWidth)} + + {content} + + + ); + } return ( {content} - { - Link.openExternalLink(backgroundStyle.redirectUri); - }} - disabled={!hasRedirect} - > - - + {graphicLayout(props.isMediumScreenWidth)} ); From 615130ce8e02cc233e06906d55f9afa199b6cd5c Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Sat, 23 Apr 2022 00:23:28 +0500 Subject: [PATCH 02/10] review changes --- src/pages/signin/SignInPageLayout/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index e30278d10c49..35df9dfa9254 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -37,7 +37,7 @@ const SignInPageLayout = (props) => { const hasRedirect = !_.isEmpty(backgroundStyle.redirectUri); - const graphicLayout = () => ( + const graphicLayout = ( { if (props.isMediumScreenWidth) { return ( - {graphicLayout(props.isMediumScreenWidth)} + {graphicLayout} {content} @@ -76,7 +76,7 @@ const SignInPageLayout = (props) => { {content} - {graphicLayout(props.isMediumScreenWidth)} + {graphicLayout} ); From c75689d4d931638025163cc796b66cd6c029a79d Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Wed, 27 Apr 2022 04:52:11 +0500 Subject: [PATCH 03/10] Feedback change floating window and split window(On Desktop) --- config/webpack/webpack.dev.js | 1 + src/pages/signin/SignInPageLayout/SignInPageContent.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/webpack/webpack.dev.js b/config/webpack/webpack.dev.js index 482d4a08fbe5..de4d73558f47 100644 --- a/config/webpack/webpack.dev.js +++ b/config/webpack/webpack.dev.js @@ -27,6 +27,7 @@ module.exports = (env = {}) => { devServer: { contentBase: path.join(__dirname, '../../dist'), hot: true, + host: '0.0.0.0', ...proxySettings, historyApiFallback: true, }, diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index f787d197fe7d..1a02c11c9f91 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -55,7 +55,8 @@ const SignInPageContent = props => ( Date: Fri, 29 Apr 2022 03:08:57 +0500 Subject: [PATCH 04/10] Remove host:0.0.0.0 from webpack --- config/webpack/webpack.dev.js | 1 - 1 file changed, 1 deletion(-) diff --git a/config/webpack/webpack.dev.js b/config/webpack/webpack.dev.js index de4d73558f47..482d4a08fbe5 100644 --- a/config/webpack/webpack.dev.js +++ b/config/webpack/webpack.dev.js @@ -27,7 +27,6 @@ module.exports = (env = {}) => { devServer: { contentBase: path.join(__dirname, '../../dist'), hot: true, - host: '0.0.0.0', ...proxySettings, historyApiFallback: true, }, From 3983feab80706682aff5fc66f0d50edce7549acc Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Thu, 5 May 2022 08:24:29 +0500 Subject: [PATCH 05/10] Add min height requirement to show graphics --- src/pages/signin/SignInPageLayout/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index 35df9dfa9254..7e93f417a3a0 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -64,7 +64,7 @@ const SignInPageLayout = (props) => { if (props.isMediumScreenWidth) { return ( - {graphicLayout} + {props.windowHeight >= 854 && graphicLayout} {content} From 3f491f0de8fca1132f19015719d3124671de520d Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Tue, 10 May 2022 14:23:32 +0500 Subject: [PATCH 06/10] Move minHeigth value to variables file --- src/pages/signin/SignInPageLayout/index.js | 3 ++- src/styles/variables.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index 7e93f417a3a0..c10a1e7b39e0 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -8,6 +8,7 @@ import SVGImage from '../../../components/SVGImage'; import styles from '../../../styles/styles'; import * as StyleUtils from '../../../styles/StyleUtils'; import * as Link from '../../../libs/actions/Link'; +import variables from '../../../styles/variables'; const propTypes = { /** The children to show inside the layout */ @@ -64,7 +65,7 @@ const SignInPageLayout = (props) => { if (props.isMediumScreenWidth) { return ( - {props.windowHeight >= 854 && graphicLayout} + {props.windowHeight >= variables.minHeigthToShowGraphics && graphicLayout} {content} diff --git a/src/styles/variables.js b/src/styles/variables.js index 5ffd6bf29131..4894e84ee3ec 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -44,4 +44,5 @@ export default { tooltipzIndex: 10050, gutterWidth: 16, popoverMenuShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.06)', + minHeigthToShowGraphics: 854 }; From 44d6972fc18adfd6ea91d6d7ce5da4dd8c39c834 Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Tue, 10 May 2022 20:51:49 +0500 Subject: [PATCH 07/10] eslint changes --- src/pages/signin/SignInPageLayout/index.js | 2 +- src/styles/variables.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index c10a1e7b39e0..cfd265451909 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -8,7 +8,7 @@ import SVGImage from '../../../components/SVGImage'; import styles from '../../../styles/styles'; import * as StyleUtils from '../../../styles/StyleUtils'; import * as Link from '../../../libs/actions/Link'; -import variables from '../../../styles/variables'; +import variables from '../../../styles/variables'; const propTypes = { /** The children to show inside the layout */ diff --git a/src/styles/variables.js b/src/styles/variables.js index 4894e84ee3ec..00c00f2e6549 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -44,5 +44,5 @@ export default { tooltipzIndex: 10050, gutterWidth: 16, popoverMenuShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.06)', - minHeigthToShowGraphics: 854 + minHeightToShowGraphics: 854, }; From 306722acff4bd2f6c948dabd44883ffa6ab4fe6c Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Tue, 10 May 2022 20:56:46 +0500 Subject: [PATCH 08/10] Add height check with screen check --- src/pages/signin/SignInPageLayout/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js index cfd265451909..995b0c807548 100644 --- a/src/pages/signin/SignInPageLayout/index.js +++ b/src/pages/signin/SignInPageLayout/index.js @@ -62,10 +62,10 @@ const SignInPageLayout = (props) => { return content; } - if (props.isMediumScreenWidth) { + if (props.isMediumScreenWidth && props.windowHeight >= variables.minHeigthToShowGraphics) { return ( - {props.windowHeight >= variables.minHeigthToShowGraphics && graphicLayout} + {graphicLayout} {content} From ce25fc7c05b1f87656d5931656d46814d2ba5161 Mon Sep 17 00:00:00 2001 From: Aneeque Ahmad Date: Thu, 19 May 2022 04:07:12 +0500 Subject: [PATCH 09/10] Feedback helping comment and refactoring --- src/pages/signin/SignInPageLayout/SignInPageContent.js | 2 +- src/styles/variables.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index 1a02c11c9f91..f22fddd4fcac 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -55,7 +55,7 @@ const SignInPageContent = props => ( Date: Thu, 19 May 2022 20:17:46 +0500 Subject: [PATCH 10/10] Add empty object instead of false --- src/pages/signin/SignInPageLayout/SignInPageContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index f22fddd4fcac..4006d65a0093 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -56,7 +56,7 @@ const SignInPageContent = props => ( behavior="position" contentContainerStyle={[ props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {}, - !props.isMediumScreenWidth && styles.signInPageWideLeftContentMargin, + !props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {}, styles.mb3, StyleUtils.getModalPaddingStyles({ shouldAddBottomSafeAreaPadding: true,