Merge branch 'main' into cmartins-refactorGetUserDetails

Expensify · Jul 7, 2022 · 6ac86ad · 6ac86ad
2 parents 92416ec + 99ed3b8
commit 6ac86ad
Show file tree

Hide file tree

Showing 70 changed files with 12,980 additions and 5,231 deletions.
diff --git a/.github/workflows/deployHelpSite.yml b/.github/workflows/deployHelpSite.yml
diff --git a/CLA.md b/CLA.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/FORMS.md b/FORMS.md
diff --git a/HOW_TO_CREATE_A_PLAN.md b/HOW_TO_CREATE_A_PLAN.md
diff --git a/OfflineUX.md b/OfflineUX.md
diff --git a/PERFORMANCE.md b/PERFORMANCE.md
diff --git a/PR_REVIEW_GUIDELINES.md b/PR_REVIEW_GUIDELINES.md
@@ -1 +1 @@
-This file has been moved [here](./docs/PR_REVIEW_GUIDELINES.md).
+This file has been moved [here](contributingGuides/PR_REVIEW_GUIDELINES.md).
diff --git a/README.md b/README.md
@@ -19,11 +19,11 @@
 * [Deploying](#deploying)
 
 #### Additional Reading
-* [API Details](docs/API.md)
-* [Offline First](./docs/OFFLINE_UX.md)
-* [Contributing to Expensify](./docs/CONTRIBUTING.md)
-* [Expensify Code of Conduct](./docs/CODE_OF_CONDUCT.md)
-* [Contributor License Agreement](./docs/CLA.md)
+* [API Details](contributingGuides/API.md)
+* [Offline First](contributingGuides/OFFLINE_UX.md)
+* [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
+* [Expensify Code of Conduct](CODE_OF_CONDUCT.md)
+* [Contributor License Agreement](contributingGuides/CLA.md)
 
 ----
 
@@ -86,7 +86,7 @@ variables referenced here get updated since your local `.env` file is ignored.
    requests to the backend. External contributors should set this to `true` otherwise they'll have CORS errors.
    If you don't want to start the proxy server set this explicitly to `false`
 - `CAPTURE_METRICS` (optional) - Set this to `true` to capture performance metrics and see them in Flipper
-   see [PERFORMANCE.md](./docs/PERFORMANCE.md#performance-metrics-opt-in-on-local-release-builds) for more information
+   see [PERFORMANCE.md](contributingGuides/PERFORMANCE.md#performance-metrics-opt-in-on-local-release-builds) for more information
 - `ONYX_METRICS` (optional) - Set this to `true` to capture even more performance metrics and see them in Flipper
    see [React-Native-Onyx#benchmarks](https://github.com/Expensify/react-native-onyx#benchmarks) for more information
 
@@ -286,9 +286,9 @@ This application is built with the following principles.
     4. Brain pushes data into UI inputs (Device input -> React component).
     5. UI inputs push data to the server (React component -> Action -> XHR to server).
     6. Go to 1
-    ![New Expensify Data Flow Chart](/docs/data_flow.png)
+    ![New Expensify Data Flow Chart](/contributingGuides/data_flow.png)
 1. **Offline first**
-    - Be sure to read [OFFLINE_UX.md](./docs/OFFLINE_UX.md)!
+    - Be sure to read [OFFLINE_UX.md](contributingGuides/OFFLINE_UX.md)!
     - All data that is brought into the app and is necessary to display the app when offline should be stored on disk in persistent storage (eg. localStorage on browser platforms). [AsyncStorage](https://reactnative.dev/docs/asyncstorage) is a cross-platform abstraction layer that is used to access persistent storage.
     - All data that is displayed, comes from persistent storage.
 1. **UI Binds to data on disk**

diff --git a/STORYBOOK.md b/STORYBOOK.md
diff --git a/STYLE.md b/STYLE.md
diff --git a/STYLING.md b/STYLING.md
diff --git a/TESTING_MACOS_AND_IOS.md b/TESTING_MACOS_AND_IOS.md
diff --git a/docs/API.md → contributingGuides/API.md b/docs/API.md → contributingGuides/API.md
diff --git a/docs/CLA.md → contributingGuides/CLA.md b/docs/CLA.md → contributingGuides/CLA.md
diff --git a/docs/CONTRIBUTING.md → contributingGuides/CONTRIBUTING.md b/docs/CONTRIBUTING.md → contributingGuides/CONTRIBUTING.md
diff --git a/docs/FORMS.md → contributingGuides/FORMS.md b/docs/FORMS.md → contributingGuides/FORMS.md
diff --git a/docs/HOW_TO_CREATE_A_PLAN.md → contributingGuides/HOW_TO_CREATE_A_PLAN.md b/docs/HOW_TO_CREATE_A_PLAN.md → contributingGuides/HOW_TO_CREATE_A_PLAN.md
diff --git a/docs/OFFLINE_UX.md → contributingGuides/OFFLINE_UX.md b/docs/OFFLINE_UX.md → contributingGuides/OFFLINE_UX.md
@@ -95,7 +95,7 @@ This pattern blocks the user from interacting with an entire page.
 
 The following flowchart can be used to determine which UX pattern should be used.
 
-![New Expensify Data Flow Chart](/docs/OfflineUX_Patterns_Flowchart.png)
+![New Expensify Data Flow Chart](/contributingGuides/OfflineUX_Patterns_Flowchart.png)
 
 ### Answering Questions on the Flow Chart
 

diff --git a/docs/OfflineUX_Patterns_Flowchart.png → ...ngGuides/OfflineUX_Patterns_Flowchart.png b/docs/OfflineUX_Patterns_Flowchart.png → ...ngGuides/OfflineUX_Patterns_Flowchart.png
diff --git a/docs/PERFORMANCE.md → contributingGuides/PERFORMANCE.md b/docs/PERFORMANCE.md → contributingGuides/PERFORMANCE.md
diff --git a/docs/PR_REVIEW_GUIDELINES.md → contributingGuides/PR_REVIEW_GUIDELINES.md b/docs/PR_REVIEW_GUIDELINES.md → contributingGuides/PR_REVIEW_GUIDELINES.md
diff --git a/docs/STORYBOOK.md → contributingGuides/STORYBOOK.md b/docs/STORYBOOK.md → contributingGuides/STORYBOOK.md
diff --git a/docs/STYLE.md → contributingGuides/STYLE.md b/docs/STYLE.md → contributingGuides/STYLE.md
diff --git a/docs/STYLING.md → contributingGuides/STYLING.md b/docs/STYLING.md → contributingGuides/STYLING.md
diff --git a/docs/TESTING_MACOS_AND_IOS.md → contributingGuides/TESTING_MACOS_AND_IOS.md b/docs/TESTING_MACOS_AND_IOS.md → contributingGuides/TESTING_MACOS_AND_IOS.md
diff --git a/docs/data_flow.png → contributingGuides/data_flow.png b/docs/data_flow.png → contributingGuides/data_flow.png
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
diff --git a/desktop/package.json b/desktop/package.json
@@ -5,7 +5,7 @@
   "scripts": {},
   "dependencies": {
     "electron-context-menu": "^2.3.0",
-    "electron-log": "^4.3.5",
+    "electron-log": "^4.4.7",
     "electron-serve": "^1.0.0",
     "electron-updater": "^4.3.4"
   },

diff --git a/help/.gitignore → docs/.gitignore b/help/.gitignore → docs/.gitignore
diff --git a/help/404.html → docs/404.html b/help/404.html → docs/404.html
diff --git a/help/Gemfile → docs/Gemfile b/help/Gemfile → docs/Gemfile
@@ -7,12 +7,9 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.2.2"
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.5"
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
+
+gem "github-pages", group: :jekyll_plugins
+
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This file has been moved [here](./docs/PR_REVIEW_GUIDELINES.md).
		This file has been moved [here](contributingGuides/PR_REVIEW_GUIDELINES.md).