From f742741194533e31ef1c2252cea3db210fd87695 Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Thu, 6 Oct 2022 01:08:11 +1000 Subject: [PATCH 01/32] fix "Composer goes to the top on pressing expand" --- src/components/OfflineWithFeedback.js | 2 +- src/pages/home/report/ReportFooter.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js index 54d6bc0ab9be..e995e753fb7c 100644 --- a/src/components/OfflineWithFeedback.js +++ b/src/components/OfflineWithFeedback.js @@ -89,7 +89,7 @@ const OfflineWithFeedback = (props) => { return ( {!hideChildren && ( - + {children} )} diff --git a/src/pages/home/report/ReportFooter.js b/src/pages/home/report/ReportFooter.js index ac52539d3150..9fde142e6557 100644 --- a/src/pages/home/report/ReportFooter.js +++ b/src/pages/home/report/ReportFooter.js @@ -90,6 +90,8 @@ class ReportFooter extends React.Component { Date: Tue, 11 Oct 2022 01:58:29 +1000 Subject: [PATCH 02/32] float text to top when composer expanded --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index bba8f24ed62d..2f49bcab3f59 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1410,7 +1410,7 @@ const styles = { }, 0), textInputFullCompose: { - alignSelf: 'flex-end', + alignSelf: 'flex-start', flex: 1, maxHeight: '100%', }, From 1150a97bde4b9d1ed7b7a5493acc89e9741d25d0 Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Wed, 12 Oct 2022 06:51:11 +1000 Subject: [PATCH 03/32] stretch input to full height in composer when expanded --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 2f49bcab3f59..6a65074aec6d 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1410,7 +1410,7 @@ const styles = { }, 0), textInputFullCompose: { - alignSelf: 'flex-start', + alignSelf: 'stretch', flex: 1, maxHeight: '100%', }, From 61e52788799fe7796f39e19c1a2163cc8082ee26 Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Wed, 12 Oct 2022 07:26:38 +1000 Subject: [PATCH 04/32] fix invalid prop warning --- src/pages/home/report/ReportFooter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ReportFooter.js b/src/pages/home/report/ReportFooter.js index 9fde142e6557..11d8806a5c03 100644 --- a/src/pages/home/report/ReportFooter.js +++ b/src/pages/home/report/ReportFooter.js @@ -90,8 +90,8 @@ class ReportFooter extends React.Component { Date: Wed, 12 Oct 2022 19:55:35 +1000 Subject: [PATCH 05/32] add contentContainerStyle propsTypes in OfflineWithFeedback --- src/components/OfflineWithFeedback.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js index e995e753fb7c..a2e11e627958 100644 --- a/src/components/OfflineWithFeedback.js +++ b/src/components/OfflineWithFeedback.js @@ -40,6 +40,9 @@ const propTypes = { /** Additional styles to add after local styles. Applied to the parent container */ style: stylePropTypes, + /** Additional styles to add after local styles. Applied to the children wrapper container */ + contentContainerStyle: stylePropTypes, + /** Additional style object for the error row */ errorRowStyles: stylePropTypes, @@ -51,6 +54,7 @@ const defaultProps = { errors: null, onClose: () => {}, style: [], + contentContainerStyle: [], errorRowStyles: [], }; From bbe4676b4e13cb6f40aa2c5699fc95e9296b7ac7 Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Wed, 12 Oct 2022 20:53:56 +1000 Subject: [PATCH 06/32] fix text centered in expanded composer issue in android --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index 6a65074aec6d..dfe1ae0a2f9c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1413,6 +1413,7 @@ const styles = { alignSelf: 'stretch', flex: 1, maxHeight: '100%', + textAlignVertical: 'top', }, editInputComposeSpacing: { From 4a66ae4110f077986376657e04b4fa0f970eb15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 13:25:35 -0500 Subject: [PATCH 07/32] install jekyll-seo-tag --- docs/Gemfile | 2 ++ docs/Gemfile.lock | 1 + docs/_config.yml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/docs/Gemfile b/docs/Gemfile index 34133513fc9a..7cad729ee45b 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -30,3 +30,5 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] gem "webrick", "~> 1.7" + +gem 'jekyll-seo-tag' diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 276ffcdc3367..c51a81d0b60d 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -260,6 +260,7 @@ DEPENDENCIES github-pages http_parser.rb (~> 0.6.0) jekyll-feed (~> 0.12) + jekyll-seo-tag tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.1) diff --git a/docs/_config.yml b/docs/_config.yml index 2ea71f94b445..4e8a257a17fe 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -5,3 +5,6 @@ defaults: values: layout: "default" exclude: [README.md, TEMPLATE.md] + +plugins: + - jekyll-seo-tag \ No newline at end of file From d561a2b4b8388aff9c319cf225713bc45c3470d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 13:28:35 -0500 Subject: [PATCH 08/32] add SEO tags to head --- docs/_layouts/default.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 9b1a7c647a2d..40b231d3066a 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -14,6 +14,9 @@ + + + {% seo %} From a7f995c448e8a08bf08338d6d8510a003dbd7a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 13:49:39 -0500 Subject: [PATCH 09/32] add default metadescription values for all the site --- docs/_config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/_config.yml b/docs/_config.yml index 4e8a257a17fe..64455dcef48c 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -4,6 +4,11 @@ defaults: path: "" # an empty string here means all files in the project values: layout: "default" + title: Expensify Help + tagline: Find all the answers to all your Expensify questions, as well as support for user and admin questions from the Expensify Community + description: The Community is a great place for Expensify users and experts to help one another, access training and implementation advice, discuss best practice approaches and contribute their feature and functionality ideas. + url: help.expensify.com + author: Expensify exclude: [README.md, TEMPLATE.md] plugins: From 68fbb86576f1e717c58379cae73c2a5d4e8f1497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 14:06:36 -0500 Subject: [PATCH 10/32] add specific meta descriptions to smart scan article and hub pages --- docs/_config.yml | 1 + docs/articles/request-money/SmartScan.md | 2 ++ docs/hubs/request-money.html | 1 + docs/hubs/send-money.html | 1 + 4 files changed, 5 insertions(+) diff --git a/docs/_config.yml b/docs/_config.yml index 64455dcef48c..57a9fe56f5f6 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -9,6 +9,7 @@ defaults: description: The Community is a great place for Expensify users and experts to help one another, access training and implementation advice, discuss best practice approaches and contribute their feature and functionality ideas. url: help.expensify.com author: Expensify + logo: /assets/images/expensify-help.svg exclude: [README.md, TEMPLATE.md] plugins: diff --git a/docs/articles/request-money/SmartScan.md b/docs/articles/request-money/SmartScan.md index 542704cc62f3..300c014bb983 100644 --- a/docs/articles/request-money/SmartScan.md +++ b/docs/articles/request-money/SmartScan.md @@ -1,4 +1,6 @@ --- +title: Smart Scan +description: SmartScan is the time-saving tool that every Expensify user needs. Using SmartScan, you can quickly upload receipts and walk away to take care of more important things. --- # About diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index 6eff0606150b..b330e690821e 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -1,6 +1,7 @@ --- layout: default lhn_content: 'request-money' +title: Request money ---

diff --git a/docs/hubs/send-money.html b/docs/hubs/send-money.html index 859cdd242fe1..8547602c0ed2 100644 --- a/docs/hubs/send-money.html +++ b/docs/hubs/send-money.html @@ -1,6 +1,7 @@ --- layout: default lhn_content: 'send-money' +title: Send money ---

From 162486ffd156ee14f74d52531a4708297c41247c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 14:26:40 -0500 Subject: [PATCH 11/32] update template with meta description variables --- docs/TEMPLATE.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/TEMPLATE.md b/docs/TEMPLATE.md index 7532ab74ac2c..d72048e23538 100644 --- a/docs/TEMPLATE.md +++ b/docs/TEMPLATE.md @@ -1,4 +1,9 @@ --- +title: The title of the post, page, or document +description: A short description of the page's content +image: URL to an image associated with the post, page, or document (e.g., /assets/page-pic.jpg) +author: Page-, post-, or document-specific author information (see [Advanced usage](https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/advanced-usage.md#author-information)) +locale: Page-, post-, or document-specific locale information. Takes priority over existing front matter attribute lang. --- From b5724e20930d05aaedf2f017c929cbdb5bbc812d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 13 Oct 2022 14:27:04 -0500 Subject: [PATCH 12/32] update instructions to add meta descriptions to articles --- docs/README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/README.md b/docs/README.md index c583fd94eb81..1e39b3df6267 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,6 +53,21 @@ Copy the [template](https://github.com/Expensify/App/blob/main/docs/TEMPLATE.md) The sections of the article will be filled and nested automatically in the LHN, just ensure to use the [heading markdown tags](https://www.markdownguide.org/cheat-sheet/) correctly. +## Add meta-description tags for SEO + +At the top of template file we're going to find a few variables that will help us to define the meta-description of the article for SEO: + +``` +--- +description: A short description of the page's content +image: URL to an image associated with the post, page, or document (e.g., /assets/page-pic.jpg) +author: Page-, post-, or document-specific author information. +locale: Page-, post-, or document-specific locale information. Takes priority over existing front matter attribute lang. +--- +``` + +Just update the content for each variable accordingly or remove it if the information is not available. More details [here](https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md#usage). + ## Add a new entry in the hub page There are 3 main components in the hub page: 1. Stage title, 2. Row of Card buttons and 3. Card buttons. From 1a8a78b706ac94fbb261d2c67ee77ad142b0c2cd Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Sat, 15 Oct 2022 01:08:56 +1000 Subject: [PATCH 13/32] fix "Fix the error" link on form submit --- src/components/FormAlertWithSubmitButton.js | 6 +++--- src/components/FormAlertWrapper.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/FormAlertWithSubmitButton.js b/src/components/FormAlertWithSubmitButton.js index c3ef4b464c9a..3fbb5ac607b7 100644 --- a/src/components/FormAlertWithSubmitButton.js +++ b/src/components/FormAlertWithSubmitButton.js @@ -28,7 +28,7 @@ const propTypes = { message: PropTypes.string, /** Callback fired when the "fix the errors" link is pressed */ - onFixTheErrorsPressed: PropTypes.func, + onFixTheErrorsLinkPressed: PropTypes.func, /** Submit function */ onSubmit: PropTypes.func.isRequired, @@ -43,7 +43,7 @@ const defaultProps = { isMessageHtml: false, containerStyles: [], isLoading: false, - onFixTheErrorsPressed: () => {}, + onFixTheErrorsLinkPressed: () => {}, enabledWhenOffline: false, }; @@ -53,7 +53,7 @@ const FormAlertWithSubmitButton = props => ( isAlertVisible={props.isAlertVisible} isMessageHtml={props.isMessageHtml} message={props.message} - onFixTheErrorsPressed={props.onFixTheErrorsPressed} + onFixTheErrorsLinkPressed={props.onFixTheErrorsLinkPressed} > {isOffline => ((isOffline && !props.enabledWhenOffline) ? (