From a71555725cc6f1c88736f1d52d68615927e8c4d9 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:16:41 -0400 Subject: [PATCH 01/14] spelling: being Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- docs/development.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index 2fd0dca8e..21bf0cbab 100644 --- a/docs/development.md +++ b/docs/development.md @@ -1,6 +1,6 @@ ## Development -Bruno is deing developed as a desktop app. You need to load the app by running the nextjs app in one terminal and then run the electron app in another terminal. +Bruno is being developed as a desktop app. You need to load the app by running the nextjs app in one terminal and then run the electron app in another terminal. ### Dependencies * NodeJS v18 From 9947a55b8dcab4234527adcca19887700e177d72 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:15:41 -0400 Subject: [PATCH 02/14] spelling: bottom Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/RequestTabs/StyledWrapper.js | 2 +- packages/bruno-app/src/themes/dark.js | 2 +- packages/bruno-app/src/themes/light.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js index 553843c77..ec76ec5b5 100644 --- a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js +++ b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - border-bottom: 1px solid ${(props) => props.theme.requestTabs.borromBorder}; + border-bottom: 1px solid ${(props) => props.theme.requestTabs.bottomBorder}; ul { padding: 0; diff --git a/packages/bruno-app/src/themes/dark.js b/packages/bruno-app/src/themes/dark.js index 8971749fd..1d67e80b7 100644 --- a/packages/bruno-app/src/themes/dark.js +++ b/packages/bruno-app/src/themes/dark.js @@ -174,7 +174,7 @@ const darkTheme = { requestTabs: { color: '#ccc', bg: '#2A2D2F', - borromBorder: '#444', + bottomBorder: '#444', icon: { color: '#9f9f9f', hoverColor: 'rgb(204, 204, 204)', diff --git a/packages/bruno-app/src/themes/light.js b/packages/bruno-app/src/themes/light.js index 8e3d8585d..a65e4a2fa 100644 --- a/packages/bruno-app/src/themes/light.js +++ b/packages/bruno-app/src/themes/light.js @@ -178,7 +178,7 @@ const lightTheme = { requestTabs: { color: 'rgb(52, 52, 52)', bg: '#f7f7f7', - borromBorder: '#efefef', + bottomBorder: '#efefef', icon: { color: '#9f9f9f', hoverColor: 'rgb(76 76 76)', From f77d9558398502bc1d910b3b39a8b5f0e8acda57 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:16:51 -0400 Subject: [PATCH 03/14] spelling: environments Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/providers/Hotkeys/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-app/src/providers/Hotkeys/index.js b/packages/bruno-app/src/providers/Hotkeys/index.js index a3b6c882e..a50e71dfb 100644 --- a/packages/bruno-app/src/providers/Hotkeys/index.js +++ b/packages/bruno-app/src/providers/Hotkeys/index.js @@ -93,7 +93,7 @@ export const HotkeysProvider = (props) => { }; }, [activeTabUid, tabs, saveRequest, collections]); - // edit environmentss (ctrl/cmd + e) + // edit environments (ctrl/cmd + e) useEffect(() => { Mousetrap.bind(['command+e', 'ctrl+e'], (e) => { const activeTab = find(tabs, (t) => t.uid === activeTabUid); From 6471ca74c37a2a21497ae032347474ee2657765b Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:17:01 -0400 Subject: [PATCH 04/14] spelling: ephemeral Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/RequestTabs/index.js | 2 +- .../bruno-app/src/components/Sidebar/NewRequest/index.js | 8 ++++---- .../src/providers/ReduxStore/slices/collections/index.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/bruno-app/src/components/RequestTabs/index.js b/packages/bruno-app/src/components/RequestTabs/index.js index 7a8ed4a84..3063771e8 100644 --- a/packages/bruno-app/src/components/RequestTabs/index.js +++ b/packages/bruno-app/src/components/RequestTabs/index.js @@ -76,7 +76,7 @@ const RequestTabs = () => { }); }; - // Todo: Must support ephermal requests + // Todo: Must support ephemeral requests return ( {newRequestModalOpen && ( diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js index 2adcee0fa..dc70b69c4 100644 --- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js +++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js @@ -5,14 +5,14 @@ import toast from 'react-hot-toast'; import { uuid } from 'utils/common'; import Modal from 'components/Modal'; import { useDispatch } from 'react-redux'; -import { newEphermalHttpRequest } from 'providers/ReduxStore/slices/collections'; +import { newEphemeralHttpRequest } from 'providers/ReduxStore/slices/collections'; import { newHttpRequest } from 'providers/ReduxStore/slices/collections/actions'; import { addTab } from 'providers/ReduxStore/slices/tabs'; import HttpMethodSelector from 'components/RequestPane/QueryUrl/HttpMethodSelector'; import { getDefaultRequestPaneTab } from 'utils/collections'; import StyledWrapper from './StyledWrapper'; -const NewRequest = ({ collection, item, isEphermal, onClose }) => { +const NewRequest = ({ collection, item, isEphemeral, onClose }) => { const dispatch = useDispatch(); const inputRef = useRef(); const formik = useFormik({ @@ -34,10 +34,10 @@ const NewRequest = ({ collection, item, isEphermal, onClose }) => { }) }), onSubmit: (values) => { - if (isEphermal) { + if (isEphemeral) { const uid = uuid(); dispatch( - newEphermalHttpRequest({ + newEphemeralHttpRequest({ uid: uid, requestName: values.requestName, requestType: values.requestType, diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js index ea22f1ded..495989eb1 100644 --- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js +++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js @@ -229,7 +229,7 @@ export const collectionsSlice = createSlice({ } } }, - newEphermalHttpRequest: (state, action) => { + newEphemeralHttpRequest: (state, action) => { const collection = findCollectionByUid(state.collections, action.payload.collectionUid); if (collection && collection.items && collection.items.length) { @@ -1154,7 +1154,7 @@ export const { requestCancelled, responseReceived, saveRequest, - newEphermalHttpRequest, + newEphemeralHttpRequest, collectionClicked, collectionFolderClicked, requestUrlChanged, From 64a58522273a6791b82d4629771d77283d88bbf0 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:17:09 -0400 Subject: [PATCH 05/14] spelling: evaluated Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-electron/src/bru/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-electron/src/bru/index.js b/packages/bruno-electron/src/bru/index.js index 2a0d21da5..45b10004f 100644 --- a/packages/bruno-electron/src/bru/index.js +++ b/packages/bruno-electron/src/bru/index.js @@ -7,7 +7,7 @@ const bruToEnvJson = (bru) => { const json = bruToEnvJsonV2(bru); // the app env format requires each variable to have a type - // this need to be evaulated and safely removed + // this need to be evaluated and safely removed // i don't see it being used in schema validation if (json && json.variables && json.variables.length) { each(json.variables, (v) => (v.type = 'text')); From 3eb26834c74d594b78f8938ed179d46c80da473c Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:23:36 -0400 Subject: [PATCH 06/14] spelling: github Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/BrunoSupport/index.js | 2 +- packages/bruno-app/src/components/Preferences/Support/index.js | 2 +- packages/bruno-app/src/components/Welcome/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bruno-app/src/components/BrunoSupport/index.js b/packages/bruno-app/src/components/BrunoSupport/index.js index 155145a22..190ef6ef4 100644 --- a/packages/bruno-app/src/components/BrunoSupport/index.js +++ b/packages/bruno-app/src/components/BrunoSupport/index.js @@ -29,7 +29,7 @@ const BrunoSupport = ({ onClose }) => {
- Github + GitHub
diff --git a/packages/bruno-app/src/components/Preferences/Support/index.js b/packages/bruno-app/src/components/Preferences/Support/index.js index 0e14d6fe1..dfd6fabed 100644 --- a/packages/bruno-app/src/components/Preferences/Support/index.js +++ b/packages/bruno-app/src/components/Preferences/Support/index.js @@ -27,7 +27,7 @@ const Support = () => {
- Github + GitHub
diff --git a/packages/bruno-app/src/components/Welcome/index.js b/packages/bruno-app/src/components/Welcome/index.js index 5b483932a..b3531265c 100644 --- a/packages/bruno-app/src/components/Welcome/index.js +++ b/packages/bruno-app/src/components/Welcome/index.js @@ -93,7 +93,7 @@ const Welcome = () => {
- Github + GitHub
From c623aa0909529fe9486f8848584e467fd2f7f03f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:17:24 -0400 Subject: [PATCH 07/14] spelling: header Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/Modal/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-app/src/components/Modal/index.js b/packages/bruno-app/src/components/Modal/index.js index 2a6a327b4..213c62efe 100644 --- a/packages/bruno-app/src/components/Modal/index.js +++ b/packages/bruno-app/src/components/Modal/index.js @@ -3,7 +3,7 @@ import StyledWrapper from './StyledWrapper'; const ModalHeader = ({ title, handleCancel }) => (
- {title ?
{title}
: null} + {title ?
{title}
: null} {handleCancel ? (
handleCancel() : null}> × From 76a743b74ef46ce22a793c6b605374ecfacc1085 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:17:56 -0400 Subject: [PATCH 08/14] spelling: interpreted Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/CodeEditor/index.js | 2 +- .../bruno-app/src/components/RequestPane/QueryEditor/index.js | 2 +- packages/bruno-app/src/components/SingleLineEditor/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bruno-app/src/components/CodeEditor/index.js b/packages/bruno-app/src/components/CodeEditor/index.js index 4ff9b46bc..bcc13b5c2 100644 --- a/packages/bruno-app/src/components/CodeEditor/index.js +++ b/packages/bruno-app/src/components/CodeEditor/index.js @@ -80,7 +80,7 @@ export default class CodeEditor extends React.Component { } componentDidUpdate(prevProps) { - // Ensure the changes caused by this update are not interpretted as + // Ensure the changes caused by this update are not interpreted as // user-input changes which could otherwise result in an infinite // event loop. this.ignoreChangeEvent = true; diff --git a/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js b/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js index 32f2fe0e1..622a34329 100644 --- a/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js +++ b/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js @@ -142,7 +142,7 @@ export default class QueryEditor extends React.Component { } componentDidUpdate(prevProps) { - // Ensure the changes caused by this update are not interpretted as + // Ensure the changes caused by this update are not interpreted as // user-input changes which could otherwise result in an infinite // event loop. this.ignoreChangeEvent = true; diff --git a/packages/bruno-app/src/components/SingleLineEditor/index.js b/packages/bruno-app/src/components/SingleLineEditor/index.js index eef157ff9..5c4ba12d7 100644 --- a/packages/bruno-app/src/components/SingleLineEditor/index.js +++ b/packages/bruno-app/src/components/SingleLineEditor/index.js @@ -88,7 +88,7 @@ class SingleLineEditor extends Component { }; componentDidUpdate(prevProps) { - // Ensure the changes caused by this update are not interpretted as + // Ensure the changes caused by this update are not interpreted as // user-input changes which could otherwise result in an infinite // event loop. this.ignoreChangeEvent = true; From 8f803234cefbd75aaca6f5e07c32bdab47e2d28a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:23:46 -0400 Subject: [PATCH 09/14] spelling: javascript Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-js/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-js/src/utils.js b/packages/bruno-js/src/utils.js index aca101962..37aef4f74 100644 --- a/packages/bruno-js/src/utils.js +++ b/packages/bruno-js/src/utils.js @@ -11,7 +11,7 @@ const JS_KEYWORDS = ` .filter((word) => word.length > 0); /** - * Creates a function from a Javascript expression + * Creates a function from a JavaScript expression * * When the function is called, the variables used in this expression are picked up from the context * From 7313d1b4d7d2bea127993b500db8bff3ecdeace5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:18:22 -0400 Subject: [PATCH 10/14] spelling: occurred Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .../EnvironmentSettings/CreateEnvironment/index.js | 2 +- .../EnvironmentSettings/DeleteEnvironment/index.js | 2 +- .../EnvironmentDetails/EnvironmentVariables/index.js | 2 +- .../EnvironmentSettings/RenameEnvironment/index.js | 2 +- .../src/components/RequestPane/GraphQLRequestPane/index.js | 2 +- .../RequestPane/GraphQLRequestPane/useGraphqlSchema.js | 2 +- .../src/components/RequestPane/HttpRequestPane/index.js | 2 +- packages/bruno-app/src/components/RequestTabPanel/index.js | 2 +- .../Collection/CollectionItem/CloneCollectionItem/index.js | 2 +- .../Sidebar/Collections/Collection/RemoveCollection/index.js | 2 +- .../Sidebar/Collections/CreateOrOpenCollection/index.js | 2 +- .../src/components/Sidebar/CreateCollection/index.js | 2 +- packages/bruno-app/src/components/Sidebar/NewFolder/index.js | 2 +- packages/bruno-app/src/components/Sidebar/NewRequest/index.js | 4 ++-- packages/bruno-app/src/components/Sidebar/TitleBar/index.js | 2 +- packages/bruno-app/src/components/Welcome/index.js | 2 +- packages/bruno-electron/src/app/collections.js | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js index 753d0fb24..d412687e2 100644 --- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js +++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js @@ -27,7 +27,7 @@ const CreateEnvironment = ({ collection, onClose }) => { toast.success('Environment created in collection'); onClose(); }) - .catch(() => toast.error('An error occured while created the environment')); + .catch(() => toast.error('An error occurred while created the environment')); } }); diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js index c9a63c574..8ca6fc41d 100644 --- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js +++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js @@ -14,7 +14,7 @@ const DeleteEnvironment = ({ onClose, environment, collection }) => { toast.success('Environment deleted successfully'); onClose(); }) - .catch(() => toast.error('An error occured while deleting the environment')); + .catch(() => toast.error('An error occurred while deleting the environment')); }; return ( diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js index 2f1d05f63..748626768 100644 --- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js +++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js @@ -23,7 +23,7 @@ const EnvironmentVariables = ({ environment, collection }) => { type: 'CHANGES_SAVED' }); }) - .catch(() => toast.error('An error occured while saving the changes')); + .catch(() => toast.error('An error occurred while saving the changes')); }; const addVariable = () => { diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js index a79bff497..dc928d4c6 100644 --- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js +++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js @@ -27,7 +27,7 @@ const RenameEnvironment = ({ onClose, environment, collection }) => { toast.success('Environment renamed successfully'); onClose(); }) - .catch(() => toast.error('An error occured while renaming the environment')); + .catch(() => toast.error('An error occurred while renaming the environment')); } }); diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js index 4442be42c..773d8011c 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js @@ -114,7 +114,7 @@ const GraphQLRequestPane = ({ item, collection, leftPaneWidth, onSchemaLoad, tog const focusedTab = find(tabs, (t) => t.uid === activeTabUid); if (!focusedTab || !focusedTab.uid || !focusedTab.requestPaneTab) { - return
An error occured!
; + return
An error occurred!
; } const getTabClassname = (tabName) => { diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js index 308a65e61..7cfe7f951 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js @@ -40,7 +40,7 @@ const useGraphqlSchema = (endpoint, environment) => { .catch((err) => { setIsLoading(false); setError(err); - toast.error('Error occured while loading GraphQL Schema'); + toast.error('Error occurred while loading GraphQL Schema'); }); }; diff --git a/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js index 052689fb5..caace776f 100644 --- a/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js +++ b/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js @@ -62,7 +62,7 @@ const HttpRequestPane = ({ item, collection, leftPaneWidth }) => { const focusedTab = find(tabs, (t) => t.uid === activeTabUid); if (!focusedTab || !focusedTab.uid || !focusedTab.requestPaneTab) { - return
An error occured!
; + return
An error occurred!
; } const getTabClassname = (tabName) => { diff --git a/packages/bruno-app/src/components/RequestTabPanel/index.js b/packages/bruno-app/src/components/RequestTabPanel/index.js index 65ae097b0..f719eb0f3 100644 --- a/packages/bruno-app/src/components/RequestTabPanel/index.js +++ b/packages/bruno-app/src/components/RequestTabPanel/index.js @@ -112,7 +112,7 @@ const RequestTabPanel = () => { } if (!focusedTab || !focusedTab.uid || !focusedTab.collectionUid) { - return
An error occured!
; + return
An error occurred!
; } let collection = find(collections, (c) => c.uid === focusedTab.collectionUid); diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js index d23dca713..96a1da61d 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js @@ -28,7 +28,7 @@ const CloneCollectionItem = ({ collection, item, onClose }) => { onClose(); }) .catch((err) => { - toast.error(err ? err.message : 'An error occured while cloning the request'); + toast.error(err ? err.message : 'An error occurred while cloning the request'); }); } }); diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js index ec4cfae42..c151de895 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js @@ -13,7 +13,7 @@ const RemoveCollection = ({ onClose, collection }) => { toast.success('Collection removed'); onClose(); }) - .catch(() => toast.error('An error occured while removing the collection')); + .catch(() => toast.error('An error occurred while removing the collection')); }; return ( diff --git a/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js index 09933cfaa..0feaa45c8 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js @@ -19,7 +19,7 @@ const CreateOrOpenCollection = () => { const handleOpenCollection = () => { dispatch(openCollection()).catch( - (err) => console.log(err) && toast.error('An error occured while opening the collection') + (err) => console.log(err) && toast.error('An error occurred while opening the collection') ); }; const CreateLink = () => ( diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js index c5e163403..8a65bedb2 100644 --- a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js +++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js @@ -36,7 +36,7 @@ const CreateCollection = ({ onClose }) => { toast.success('Collection created'); onClose(); }) - .catch(() => toast.error('An error occured while creating the collection')); + .catch(() => toast.error('An error occurred while creating the collection')); } }); diff --git a/packages/bruno-app/src/components/Sidebar/NewFolder/index.js b/packages/bruno-app/src/components/Sidebar/NewFolder/index.js index f73c3c16e..9245d7abc 100644 --- a/packages/bruno-app/src/components/Sidebar/NewFolder/index.js +++ b/packages/bruno-app/src/components/Sidebar/NewFolder/index.js @@ -32,7 +32,7 @@ const NewFolder = ({ collection, item, onClose }) => { onSubmit: (values) => { dispatch(newFolder(values.folderName, collection.uid, item ? item.uid : null)) .then(() => onClose()) - .catch((err) => toast.error(err ? err.message : 'An error occured while adding the request')); + .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request')); } }); diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js index dc70b69c4..f5753aced 100644 --- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js +++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js @@ -56,7 +56,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => { ); onClose(); }) - .catch((err) => toast.error(err ? err.message : 'An error occured while adding the request')); + .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request')); } else { dispatch( newHttpRequest({ @@ -69,7 +69,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => { }) ) .then(() => onClose()) - .catch((err) => toast.error(err ? err.message : 'An error occured while adding the request')); + .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request')); } } }); diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js index 1d8d74f51..daaf1f452 100644 --- a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js +++ b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js @@ -46,7 +46,7 @@ const TitleBar = () => { const handleOpenCollection = () => { dispatch(openCollection()).catch( - (err) => console.log(err) && toast.error('An error occured while opening the collection') + (err) => console.log(err) && toast.error('An error occurred while opening the collection') ); }; diff --git a/packages/bruno-app/src/components/Welcome/index.js b/packages/bruno-app/src/components/Welcome/index.js index b3531265c..625f18abd 100644 --- a/packages/bruno-app/src/components/Welcome/index.js +++ b/packages/bruno-app/src/components/Welcome/index.js @@ -19,7 +19,7 @@ const Welcome = () => { const handleOpenCollection = () => { dispatch(openCollection()).catch( - (err) => console.log(err) && toast.error('An error occured while opening the collection') + (err) => console.log(err) && toast.error('An error occurred while opening the collection') ); }; diff --git a/packages/bruno-electron/src/app/collections.js b/packages/bruno-electron/src/app/collections.js index 01de9c4ba..77cf86c22 100644 --- a/packages/bruno-electron/src/app/collections.js +++ b/packages/bruno-electron/src/app/collections.js @@ -67,7 +67,7 @@ const openCollection = async (win, watcher, collectionPath, options = {}) => { } catch (err) { if (!options.dontSendDisplayErrors) { win.webContents.send('main:display-error', { - error: err.message || 'An error occured while opening the local collection' + error: err.message || 'An error occurred while opening the local collection' }); } } From 00b6e007af4f7c1ecdaa2b706f2f13916eb607e5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:18:46 -0400 Subject: [PATCH 11/14] spelling: people Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-lang/v1/src/body-tag.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-lang/v1/src/body-tag.js b/packages/bruno-lang/v1/src/body-tag.js index 8f89e4912..a1ddbb1e5 100644 --- a/packages/bruno-lang/v1/src/body-tag.js +++ b/packages/bruno-lang/v1/src/body-tag.js @@ -66,7 +66,7 @@ const bodyXmlTag = between(bodyXmlBegin)(bodyEnd)(everyCharUntil(bodyEnd)).map(( * We have deprecated form-url-encoded type in body tag, it was a misspelling on my part * The new type is form-urlencoded * - * Very few peope would have used this. I launched this to the public on 22 Jan 2023 + * Very few people would have used this. I launched this to the public on 22 Jan 2023 * And I am making the change on 23 Jan 2023 * * This deprecated tag can be removed on 1 April 2023 From 86cda2cf5a9ee4c8a8a04595f73dd467bdd47312 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:22:01 -0400 Subject: [PATCH 12/14] spelling: sample Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- tests/pages/home.page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pages/home.page.js b/tests/pages/home.page.js index e9cfa9b30..4aff24ce1 100644 --- a/tests/pages/home.page.js +++ b/tests/pages/home.page.js @@ -10,7 +10,7 @@ exports.HomePage = class HomePage { // sample collection this.loadSampleCollectionSuccessToast = page.getByText('Sample Collection loaded successfully'); - this.sampeCollectionSelector = page.locator('#sidebar-collection-name'); + this.sampleCollectionSelector = page.locator('#sidebar-collection-name'); this.getUsersSelector = page.getByText('Users'); this.getSingleUserSelector = page.getByText('Single User'); this.getUserNotFoundSelector = page.getByText('User Not Found'); @@ -43,7 +43,7 @@ exports.HomePage = class HomePage { } async getUsers() { - await this.sampeCollectionSelector.click(); + await this.sampleCollectionSelector.click(); await this.getUsersSelector.click(); await this.sendRequestButton.click(); } From f23dcf50a4b7726c72f509073d78f537add62ab9 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:22:18 -0400 Subject: [PATCH 13/14] spelling: separator Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-app/src/components/Dropdown/StyledWrapper.js | 2 +- packages/bruno-app/src/themes/dark.js | 2 +- packages/bruno-app/src/themes/light.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bruno-app/src/components/Dropdown/StyledWrapper.js b/packages/bruno-app/src/components/Dropdown/StyledWrapper.js index 64e878d74..ceb2fb1d7 100644 --- a/packages/bruno-app/src/components/Dropdown/StyledWrapper.js +++ b/packages/bruno-app/src/components/Dropdown/StyledWrapper.js @@ -43,7 +43,7 @@ const Wrapper = styled.div` } &.border-top { - border-top: solid 1px ${(props) => props.theme.dropdown.seperator}; + border-top: solid 1px ${(props) => props.theme.dropdown.separator}; } } } diff --git a/packages/bruno-app/src/themes/dark.js b/packages/bruno-app/src/themes/dark.js index 1d67e80b7..122d16252 100644 --- a/packages/bruno-app/src/themes/dark.js +++ b/packages/bruno-app/src/themes/dark.js @@ -70,7 +70,7 @@ const darkTheme = { bg: 'rgb(48, 48, 49)', hoverBg: '#185387', shadow: 'rgb(0 0 0 / 36%) 0px 2px 8px', - seperator: '#444', + separator: '#444', labelBg: '#4a4949' }, diff --git a/packages/bruno-app/src/themes/light.js b/packages/bruno-app/src/themes/light.js index a65e4a2fa..846940cdb 100644 --- a/packages/bruno-app/src/themes/light.js +++ b/packages/bruno-app/src/themes/light.js @@ -70,7 +70,7 @@ const lightTheme = { bg: '#fff', hoverBg: '#e9e9e9', shadow: 'rgb(50 50 93 / 25%) 0px 6px 12px -2px, rgb(0 0 0 / 30%) 0px 3px 7px -3px', - seperator: '#e7e7e7', + separator: '#e7e7e7', labelBg: '#f3f3f3' }, From 7ba471f26afa4aec9d5aa3c86313a4d38fa9f00d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:22:28 -0400 Subject: [PATCH 14/14] spelling: serialization Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/bruno-js/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-js/src/utils.js b/packages/bruno-js/src/utils.js index 37aef4f74..7d6b2db30 100644 --- a/packages/bruno-js/src/utils.js +++ b/packages/bruno-js/src/utils.js @@ -119,7 +119,7 @@ const createResponseParser = (response = {}) => { }; /** - * Objects that are created inside vm2 execution context result in an serilaization error when sent to the renderer process + * Objects that are created inside vm2 execution context result in an serialization error when sent to the renderer process * Error sending from webFrameMain: Error: Failed to serialize arguments * at s.send (node:electron/js2c/browser_init:169:631) * at g.send (node:electron/js2c/browser_init:165:2156)