diff --git a/.github/workflows/plugin-check.yml b/.github/workflows/plugin-check.yml index f88d2c71f..f29883626 100644 --- a/.github/workflows/plugin-check.yml +++ b/.github/workflows/plugin-check.yml @@ -37,6 +37,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 with: + version: 9 run_install: false - name: Get pnpm store directory @@ -66,7 +67,7 @@ jobs: - name: Build plugin run: | - pnpm production + pnpm build bash .github/copy-assets - name: WordPress Plugin Check diff --git a/.prettierrc b/.prettierrc index daf67ce34..e390d2ed3 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,7 +4,6 @@ "printWidth": 105, "singleQuote": true, "trailingComma": "none", - "jsxBracketSameLine": true, "useTabs": false, "quoteProps": "as-needed", "jsxSingleQuote": false, diff --git a/composer.json b/composer.json index e7a6e0bb7..765e3cb82 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ }, "require": { "bitapps/wp-telemetry": "v0.0.9", - "typisttech/imposter-plugin": "*" + "typisttech/imposter-plugin": "^0.6.2" }, "extra": { "imposter": { diff --git a/composer.lock b/composer.lock index f47b5a5ae..4668d9f75 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9f7baab1235411d6132c7c026411dbb9", + "content-hash": "2011ff2b7a4005209f7af1696e980073", "packages": [ { "name": "bitapps/wp-telemetry", @@ -3276,5 +3276,5 @@ "prefer-lowest": false, "platform": {}, "platform-dev": {}, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 000000000..56f7f62e2 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,67 @@ +const importPlugin = require('eslint-plugin-import') +const jsxA11yPlugin = require('eslint-plugin-jsx-a11y') +const reactPlugin = require('eslint-plugin-react') +const reactHooksPlugin = require('eslint-plugin-react-hooks') + +module.exports = [ + { + ignores: ['assets/**', 'build/**', 'vendor/**', 'node_modules/**'], + linterOptions: { + reportUnusedDisableDirectives: false + } + }, + { + files: ['frontend/src/**/*.{js,jsx}'], + plugins: { + import: importPlugin, + 'jsx-a11y': jsxA11yPlugin, + react: reactPlugin, + 'react-hooks': reactHooksPlugin + }, + languageOptions: { + ecmaVersion: 2022, + sourceType: 'module', + parserOptions: { + ecmaFeatures: { + jsx: true + } + } + }, + settings: { + react: { + version: '18.3' + }, + 'import/resolver': { + node: { + extensions: ['.js', '.jsx', '.json'] + } + } + }, + rules: { + ...importPlugin.configs.recommended.rules, + ...reactPlugin.configs.recommended.rules, + ...reactHooksPlugin.configs.recommended.rules, + ...jsxA11yPlugin.configs.recommended.rules, + 'react/react-in-jsx-scope': 'off', + 'react/jsx-uses-react': 'off', + 'react/prop-types': 'off', + 'react/no-unknown-property': 'off', + 'react/display-name': 'off', + 'react/no-unescaped-entities': 'off', + 'react/jsx-no-target-blank': 'off', + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/set-state-in-effect': 'off', + 'react-hooks/immutability': 'off', + 'react-hooks/preserve-manual-memoization': 'off', + 'react-hooks/refs': 'off', + 'react-hooks/purity': 'off', + 'import/no-duplicates': 'off', + 'import/no-named-as-default': 'off', + 'jsx-a11y/click-events-have-key-events': 'off', + 'jsx-a11y/no-static-element-interactions': 'off', + 'jsx-a11y/label-has-associated-control': 'off', + 'jsx-a11y/alt-text': 'off', + 'jsx-a11y/no-autofocus': 'off' + } + } +] diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index ddd9f8267..f4cc7dcaa 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -4,7 +4,7 @@ /* eslint-disable react/jsx-one-expression-per-line */ import { lazy, Suspense, useEffect, useState } from 'react' -import { Route, Routes } from 'react-router-dom' +import { Route, Routes } from 'react-router' import './resource/sass/app.scss' // eslint-disable-next-line import/no-extraneous-dependencies import { Toaster } from 'react-hot-toast' @@ -33,6 +33,17 @@ const Error404 = lazy(() => import('./pages/Error404')) function App() { const loaderStyle = { height: '82vh' } const btcbi = useRecoilValue($appConfigState) + const defaultLoaderFallback = + const integrationsElement = ( + + + + ) + const authResponseElement = ( + + + + ) // check if integrations are available const { data, isLoading } = useFetch({ payload: {}, action: 'flow/list', method: 'get' }) @@ -113,7 +124,7 @@ function App() { }> + } @@ -122,7 +133,7 @@ function App() { }> + } @@ -131,29 +142,21 @@ function App() { }> + } /> - }> - - - } - /> + + + + - }> - - - } - /> + + + + } /> diff --git a/frontend/src/components/AllIntegrations/ACPT/ACPT.jsx b/frontend/src/components/AllIntegrations/ACPT/ACPT.jsx index 34b8f3185..3b7fd0be7 100644 --- a/frontend/src/components/AllIntegrations/ACPT/ACPT.jsx +++ b/frontend/src/components/AllIntegrations/ACPT/ACPT.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/ACPT/EditACPT.jsx b/frontend/src/components/AllIntegrations/ACPT/EditACPT.jsx index 768f3f3e8..7cc28a43f 100644 --- a/frontend/src/components/AllIntegrations/ACPT/EditACPT.jsx +++ b/frontend/src/components/AllIntegrations/ACPT/EditACPT.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/AcademyLms/AcademyLms.jsx b/frontend/src/components/AllIntegrations/AcademyLms/AcademyLms.jsx index 1daefe964..53aa81a7d 100644 --- a/frontend/src/components/AllIntegrations/AcademyLms/AcademyLms.jsx +++ b/frontend/src/components/AllIntegrations/AcademyLms/AcademyLms.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/AcademyLms/EditAcademyLms.jsx b/frontend/src/components/AllIntegrations/AcademyLms/EditAcademyLms.jsx index f2cf0298c..e516c24d9 100644 --- a/frontend/src/components/AllIntegrations/AcademyLms/EditAcademyLms.jsx +++ b/frontend/src/components/AllIntegrations/AcademyLms/EditAcademyLms.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaign.jsx b/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaign.jsx index bf5ac1d51..066a2782c 100644 --- a/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaign.jsx +++ b/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaign.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/ActiveCampaign/EditActiveCampaign.jsx b/frontend/src/components/AllIntegrations/ActiveCampaign/EditActiveCampaign.jsx index 82f28152c..39c809ed1 100644 --- a/frontend/src/components/AllIntegrations/ActiveCampaign/EditActiveCampaign.jsx +++ b/frontend/src/components/AllIntegrations/ActiveCampaign/EditActiveCampaign.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Acumbamail/Acumbamail.jsx b/frontend/src/components/AllIntegrations/Acumbamail/Acumbamail.jsx index b7bc45093..be1186206 100644 --- a/frontend/src/components/AllIntegrations/Acumbamail/Acumbamail.jsx +++ b/frontend/src/components/AllIntegrations/Acumbamail/Acumbamail.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Acumbamail/EditAcumbamail.jsx b/frontend/src/components/AllIntegrations/Acumbamail/EditAcumbamail.jsx index a072e2ad1..6eb149064 100644 --- a/frontend/src/components/AllIntegrations/Acumbamail/EditAcumbamail.jsx +++ b/frontend/src/components/AllIntegrations/Acumbamail/EditAcumbamail.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/AdvancedFormIntegration/AdvancedFormIntegration.jsx b/frontend/src/components/AllIntegrations/AdvancedFormIntegration/AdvancedFormIntegration.jsx index e75bf9cad..26fa7011e 100644 --- a/frontend/src/components/AllIntegrations/AdvancedFormIntegration/AdvancedFormIntegration.jsx +++ b/frontend/src/components/AllIntegrations/AdvancedFormIntegration/AdvancedFormIntegration.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/AdvancedFormIntegration/EditAdvancedFormIntegration.jsx b/frontend/src/components/AllIntegrations/AdvancedFormIntegration/EditAdvancedFormIntegration.jsx index 539dbd054..075286647 100644 --- a/frontend/src/components/AllIntegrations/AdvancedFormIntegration/EditAdvancedFormIntegration.jsx +++ b/frontend/src/components/AllIntegrations/AdvancedFormIntegration/EditAdvancedFormIntegration.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Affiliate/Affiliate.jsx b/frontend/src/components/AllIntegrations/Affiliate/Affiliate.jsx index e1759cc54..41ee8a75f 100644 --- a/frontend/src/components/AllIntegrations/Affiliate/Affiliate.jsx +++ b/frontend/src/components/AllIntegrations/Affiliate/Affiliate.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Affiliate/EditAffiliate.jsx b/frontend/src/components/AllIntegrations/Affiliate/EditAffiliate.jsx index 9292214e7..ed536aa48 100644 --- a/frontend/src/components/AllIntegrations/Affiliate/EditAffiliate.jsx +++ b/frontend/src/components/AllIntegrations/Affiliate/EditAffiliate.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/AgiledCRM/Agiled.jsx b/frontend/src/components/AllIntegrations/AgiledCRM/Agiled.jsx index ad7d73d2d..1d6af93b8 100644 --- a/frontend/src/components/AllIntegrations/AgiledCRM/Agiled.jsx +++ b/frontend/src/components/AllIntegrations/AgiledCRM/Agiled.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/AgiledCRM/EditAgiled.jsx b/frontend/src/components/AllIntegrations/AgiledCRM/EditAgiled.jsx index 68af0f92b..3c57ceeca 100644 --- a/frontend/src/components/AllIntegrations/AgiledCRM/EditAgiled.jsx +++ b/frontend/src/components/AllIntegrations/AgiledCRM/EditAgiled.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Airtable/Airtable.jsx b/frontend/src/components/AllIntegrations/Airtable/Airtable.jsx index bd31c341d..903555c8c 100644 --- a/frontend/src/components/AllIntegrations/Airtable/Airtable.jsx +++ b/frontend/src/components/AllIntegrations/Airtable/Airtable.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-console */ /* eslint-disable no-unused-expressions */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Airtable/EditAirtable.jsx b/frontend/src/components/AllIntegrations/Airtable/EditAirtable.jsx index 8d2791bee..5d11f12a6 100644 --- a/frontend/src/components/AllIntegrations/Airtable/EditAirtable.jsx +++ b/frontend/src/components/AllIntegrations/Airtable/EditAirtable.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Albato/Albato.jsx b/frontend/src/components/AllIntegrations/Albato/Albato.jsx index 18b415652..3480b5ffd 100644 --- a/frontend/src/components/AllIntegrations/Albato/Albato.jsx +++ b/frontend/src/components/AllIntegrations/Albato/Albato.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Albato/EditAlbato.jsx b/frontend/src/components/AllIntegrations/Albato/EditAlbato.jsx index 1b63c4778..9ce632052 100644 --- a/frontend/src/components/AllIntegrations/Albato/EditAlbato.jsx +++ b/frontend/src/components/AllIntegrations/Albato/EditAlbato.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/AntApps/AntApps.jsx b/frontend/src/components/AllIntegrations/AntApps/AntApps.jsx index 3b77cec64..820b0a2df 100644 --- a/frontend/src/components/AllIntegrations/AntApps/AntApps.jsx +++ b/frontend/src/components/AllIntegrations/AntApps/AntApps.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/AntApps/EditAntApps.jsx b/frontend/src/components/AllIntegrations/AntApps/EditAntApps.jsx index e286294e5..02760731c 100644 --- a/frontend/src/components/AllIntegrations/AntApps/EditAntApps.jsx +++ b/frontend/src/components/AllIntegrations/AntApps/EditAntApps.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Asana/Asana.jsx b/frontend/src/components/AllIntegrations/Asana/Asana.jsx index 37d9517c6..5d764e427 100644 --- a/frontend/src/components/AllIntegrations/Asana/Asana.jsx +++ b/frontend/src/components/AllIntegrations/Asana/Asana.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Asana/EditAsana.jsx b/frontend/src/components/AllIntegrations/Asana/EditAsana.jsx index d39681f53..683dad139 100644 --- a/frontend/src/components/AllIntegrations/Asana/EditAsana.jsx +++ b/frontend/src/components/AllIntegrations/Asana/EditAsana.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/AutomatorWP/AutomatorWP.jsx b/frontend/src/components/AllIntegrations/AutomatorWP/AutomatorWP.jsx index 7ad6e0dd0..b35834a54 100644 --- a/frontend/src/components/AllIntegrations/AutomatorWP/AutomatorWP.jsx +++ b/frontend/src/components/AllIntegrations/AutomatorWP/AutomatorWP.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/AutomatorWP/EditAutomatorWP.jsx b/frontend/src/components/AllIntegrations/AutomatorWP/EditAutomatorWP.jsx index 89af7d9e6..6ed4202b2 100644 --- a/frontend/src/components/AllIntegrations/AutomatorWP/EditAutomatorWP.jsx +++ b/frontend/src/components/AllIntegrations/AutomatorWP/EditAutomatorWP.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Autonami/Autonami.jsx b/frontend/src/components/AllIntegrations/Autonami/Autonami.jsx index 47e1f0d57..22343676d 100644 --- a/frontend/src/components/AllIntegrations/Autonami/Autonami.jsx +++ b/frontend/src/components/AllIntegrations/Autonami/Autonami.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Autonami/EditAutonami.jsx b/frontend/src/components/AllIntegrations/Autonami/EditAutonami.jsx index e547e1f45..a69429ec1 100644 --- a/frontend/src/components/AllIntegrations/Autonami/EditAutonami.jsx +++ b/frontend/src/components/AllIntegrations/Autonami/EditAutonami.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/BenchMark/BenchMark.jsx b/frontend/src/components/AllIntegrations/BenchMark/BenchMark.jsx index e2a27e2a7..e69246ddc 100644 --- a/frontend/src/components/AllIntegrations/BenchMark/BenchMark.jsx +++ b/frontend/src/components/AllIntegrations/BenchMark/BenchMark.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/BenchMark/EditBenchMark.jsx b/frontend/src/components/AllIntegrations/BenchMark/EditBenchMark.jsx index 4925d6cd6..f9ffbfd87 100644 --- a/frontend/src/components/AllIntegrations/BenchMark/EditBenchMark.jsx +++ b/frontend/src/components/AllIntegrations/BenchMark/EditBenchMark.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Bento/Bento.jsx b/frontend/src/components/AllIntegrations/Bento/Bento.jsx index 644757f58..c17a84ddb 100644 --- a/frontend/src/components/AllIntegrations/Bento/Bento.jsx +++ b/frontend/src/components/AllIntegrations/Bento/Bento.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Bento/EditBento.jsx b/frontend/src/components/AllIntegrations/Bento/EditBento.jsx index bfaa7f8e5..707aa6f13 100644 --- a/frontend/src/components/AllIntegrations/Bento/EditBento.jsx +++ b/frontend/src/components/AllIntegrations/Bento/EditBento.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/BitForm/BitForm.jsx b/frontend/src/components/AllIntegrations/BitForm/BitForm.jsx index dac237d21..18af9d557 100644 --- a/frontend/src/components/AllIntegrations/BitForm/BitForm.jsx +++ b/frontend/src/components/AllIntegrations/BitForm/BitForm.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { $appConfigState } from '../../../GlobalStates' diff --git a/frontend/src/components/AllIntegrations/BitForm/EditBitForm.jsx b/frontend/src/components/AllIntegrations/BitForm/EditBitForm.jsx index 649651420..28383ed37 100644 --- a/frontend/src/components/AllIntegrations/BitForm/EditBitForm.jsx +++ b/frontend/src/components/AllIntegrations/BitForm/EditBitForm.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/BuddyBoss/BuddyBoss.jsx b/frontend/src/components/AllIntegrations/BuddyBoss/BuddyBoss.jsx index cfebe14a2..ca0812eed 100644 --- a/frontend/src/components/AllIntegrations/BuddyBoss/BuddyBoss.jsx +++ b/frontend/src/components/AllIntegrations/BuddyBoss/BuddyBoss.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/BuddyBoss/EditBuddyBoss.jsx b/frontend/src/components/AllIntegrations/BuddyBoss/EditBuddyBoss.jsx index 0b5dac48f..ef5d7c1b5 100644 --- a/frontend/src/components/AllIntegrations/BuddyBoss/EditBuddyBoss.jsx +++ b/frontend/src/components/AllIntegrations/BuddyBoss/EditBuddyBoss.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/CampaignMonitor/CampaignMonitor.jsx b/frontend/src/components/AllIntegrations/CampaignMonitor/CampaignMonitor.jsx index 082a6d8a0..5a0765335 100644 --- a/frontend/src/components/AllIntegrations/CampaignMonitor/CampaignMonitor.jsx +++ b/frontend/src/components/AllIntegrations/CampaignMonitor/CampaignMonitor.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/CampaignMonitor/EditCampaignMonitor.jsx b/frontend/src/components/AllIntegrations/CampaignMonitor/EditCampaignMonitor.jsx index 0f6834a24..34dd5a5f0 100644 --- a/frontend/src/components/AllIntegrations/CampaignMonitor/EditCampaignMonitor.jsx +++ b/frontend/src/components/AllIntegrations/CampaignMonitor/EditCampaignMonitor.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/CapsuleCRM/CapsuleCRM.jsx b/frontend/src/components/AllIntegrations/CapsuleCRM/CapsuleCRM.jsx index e80c2814a..1117c6a6a 100644 --- a/frontend/src/components/AllIntegrations/CapsuleCRM/CapsuleCRM.jsx +++ b/frontend/src/components/AllIntegrations/CapsuleCRM/CapsuleCRM.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/CapsuleCRM/EditCapsuleCRM.jsx b/frontend/src/components/AllIntegrations/CapsuleCRM/EditCapsuleCRM.jsx index 9cdfe6510..06e63fb2a 100644 --- a/frontend/src/components/AllIntegrations/CapsuleCRM/EditCapsuleCRM.jsx +++ b/frontend/src/components/AllIntegrations/CapsuleCRM/EditCapsuleCRM.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Clickup/Clickup.jsx b/frontend/src/components/AllIntegrations/Clickup/Clickup.jsx index 693c039fd..38d8a03bd 100644 --- a/frontend/src/components/AllIntegrations/Clickup/Clickup.jsx +++ b/frontend/src/components/AllIntegrations/Clickup/Clickup.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Clickup/EditClickup.jsx b/frontend/src/components/AllIntegrations/Clickup/EditClickup.jsx index 650c8ff3a..7aee936e4 100644 --- a/frontend/src/components/AllIntegrations/Clickup/EditClickup.jsx +++ b/frontend/src/components/AllIntegrations/Clickup/EditClickup.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ClinchPad/ClinchPad.jsx b/frontend/src/components/AllIntegrations/ClinchPad/ClinchPad.jsx index b686e763f..b4ede8997 100644 --- a/frontend/src/components/AllIntegrations/ClinchPad/ClinchPad.jsx +++ b/frontend/src/components/AllIntegrations/ClinchPad/ClinchPad.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ClinchPad/EditClinchPad.jsx b/frontend/src/components/AllIntegrations/ClinchPad/EditClinchPad.jsx index 814f9d90c..2530a0489 100644 --- a/frontend/src/components/AllIntegrations/ClinchPad/EditClinchPad.jsx +++ b/frontend/src/components/AllIntegrations/ClinchPad/EditClinchPad.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/CompanyHub/CompanyHub.jsx b/frontend/src/components/AllIntegrations/CompanyHub/CompanyHub.jsx index cf069e438..7382ca494 100644 --- a/frontend/src/components/AllIntegrations/CompanyHub/CompanyHub.jsx +++ b/frontend/src/components/AllIntegrations/CompanyHub/CompanyHub.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/CompanyHub/EditCompanyHub.jsx b/frontend/src/components/AllIntegrations/CompanyHub/EditCompanyHub.jsx index c1c1d1641..d0e69adb1 100644 --- a/frontend/src/components/AllIntegrations/CompanyHub/EditCompanyHub.jsx +++ b/frontend/src/components/AllIntegrations/CompanyHub/EditCompanyHub.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ConstantContact/ConstantContact.jsx b/frontend/src/components/AllIntegrations/ConstantContact/ConstantContact.jsx index b8f9a05c5..46591c148 100644 --- a/frontend/src/components/AllIntegrations/ConstantContact/ConstantContact.jsx +++ b/frontend/src/components/AllIntegrations/ConstantContact/ConstantContact.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ConstantContact/EditConstantContact.jsx b/frontend/src/components/AllIntegrations/ConstantContact/EditConstantContact.jsx index bc9c953b3..50ffd9108 100644 --- a/frontend/src/components/AllIntegrations/ConstantContact/EditConstantContact.jsx +++ b/frontend/src/components/AllIntegrations/ConstantContact/EditConstantContact.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ConvertKit/ConvertKit.jsx b/frontend/src/components/AllIntegrations/ConvertKit/ConvertKit.jsx index 805e3ede6..7e569fed0 100644 --- a/frontend/src/components/AllIntegrations/ConvertKit/ConvertKit.jsx +++ b/frontend/src/components/AllIntegrations/ConvertKit/ConvertKit.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/ConvertKit/EditConvertKit.jsx b/frontend/src/components/AllIntegrations/ConvertKit/EditConvertKit.jsx index 0a2df639b..e65b9f31a 100644 --- a/frontend/src/components/AllIntegrations/ConvertKit/EditConvertKit.jsx +++ b/frontend/src/components/AllIntegrations/ConvertKit/EditConvertKit.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useEffect, useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/CopperCRM/CopperCRM.jsx b/frontend/src/components/AllIntegrations/CopperCRM/CopperCRM.jsx index 8c84ac529..eb51de9cc 100644 --- a/frontend/src/components/AllIntegrations/CopperCRM/CopperCRM.jsx +++ b/frontend/src/components/AllIntegrations/CopperCRM/CopperCRM.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/CopperCRM/EditCopperCRM.jsx b/frontend/src/components/AllIntegrations/CopperCRM/EditCopperCRM.jsx index c015e1613..718de9fd7 100644 --- a/frontend/src/components/AllIntegrations/CopperCRM/EditCopperCRM.jsx +++ b/frontend/src/components/AllIntegrations/CopperCRM/EditCopperCRM.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/CustomAction/CustomAction.jsx b/frontend/src/components/AllIntegrations/CustomAction/CustomAction.jsx index a080b1a50..659d6e1df 100644 --- a/frontend/src/components/AllIntegrations/CustomAction/CustomAction.jsx +++ b/frontend/src/components/AllIntegrations/CustomAction/CustomAction.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import uuid from 'react-uuid' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/CustomAction/EditCustomAction.jsx b/frontend/src/components/AllIntegrations/CustomAction/EditCustomAction.jsx index e4690dd17..a1bac402f 100644 --- a/frontend/src/components/AllIntegrations/CustomAction/EditCustomAction.jsx +++ b/frontend/src/components/AllIntegrations/CustomAction/EditCustomAction.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useEffect, useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/CustomApi/CustomApi.jsx b/frontend/src/components/AllIntegrations/CustomApi/CustomApi.jsx index 4df74fe2b..7b44ce2f2 100644 --- a/frontend/src/components/AllIntegrations/CustomApi/CustomApi.jsx +++ b/frontend/src/components/AllIntegrations/CustomApi/CustomApi.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/CustomApi/EditCustomApi.jsx b/frontend/src/components/AllIntegrations/CustomApi/EditCustomApi.jsx index e15baa2d3..ed7e32d6d 100644 --- a/frontend/src/components/AllIntegrations/CustomApi/EditCustomApi.jsx +++ b/frontend/src/components/AllIntegrations/CustomApi/EditCustomApi.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Demio/Demio.jsx b/frontend/src/components/AllIntegrations/Demio/Demio.jsx index d80bb3e4c..2bf0370a9 100644 --- a/frontend/src/components/AllIntegrations/Demio/Demio.jsx +++ b/frontend/src/components/AllIntegrations/Demio/Demio.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Demio/EditDemio.jsx b/frontend/src/components/AllIntegrations/Demio/EditDemio.jsx index da9f6cb4e..a19851baf 100644 --- a/frontend/src/components/AllIntegrations/Demio/EditDemio.jsx +++ b/frontend/src/components/AllIntegrations/Demio/EditDemio.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/DirectIq/DirectIq.jsx b/frontend/src/components/AllIntegrations/DirectIq/DirectIq.jsx index 082bb9680..1ae62154e 100644 --- a/frontend/src/components/AllIntegrations/DirectIq/DirectIq.jsx +++ b/frontend/src/components/AllIntegrations/DirectIq/DirectIq.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/DirectIq/EditDirectIq.jsx b/frontend/src/components/AllIntegrations/DirectIq/EditDirectIq.jsx index be30f3825..29b382f1d 100644 --- a/frontend/src/components/AllIntegrations/DirectIq/EditDirectIq.jsx +++ b/frontend/src/components/AllIntegrations/DirectIq/EditDirectIq.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Discord/Discord.jsx b/frontend/src/components/AllIntegrations/Discord/Discord.jsx index ffafaf24d..a20579d2c 100644 --- a/frontend/src/components/AllIntegrations/Discord/Discord.jsx +++ b/frontend/src/components/AllIntegrations/Discord/Discord.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Discord/DiscordIntegLayout.jsx b/frontend/src/components/AllIntegrations/Discord/DiscordIntegLayout.jsx index 2aede6baf..94f59b612 100644 --- a/frontend/src/components/AllIntegrations/Discord/DiscordIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/Discord/DiscordIntegLayout.jsx @@ -1,5 +1,5 @@ import MultiSelect from 'react-multiple-select-dropdown-lite' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import CheckBox from '../../Utilities/CheckBox' import Loader from '../../Loaders/Loader' diff --git a/frontend/src/components/AllIntegrations/Discord/EditDiscord.jsx b/frontend/src/components/AllIntegrations/Discord/EditDiscord.jsx index 66e9bcba8..cad07968a 100644 --- a/frontend/src/components/AllIntegrations/Discord/EditDiscord.jsx +++ b/frontend/src/components/AllIntegrations/Discord/EditDiscord.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Dokan/Dokan.jsx b/frontend/src/components/AllIntegrations/Dokan/Dokan.jsx index 3a1570bac..c7b00bf16 100644 --- a/frontend/src/components/AllIntegrations/Dokan/Dokan.jsx +++ b/frontend/src/components/AllIntegrations/Dokan/Dokan.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Dokan/EditDokan.jsx b/frontend/src/components/AllIntegrations/Dokan/EditDokan.jsx index d2b042b50..d51d8412c 100644 --- a/frontend/src/components/AllIntegrations/Dokan/EditDokan.jsx +++ b/frontend/src/components/AllIntegrations/Dokan/EditDokan.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Drip/Drip.jsx b/frontend/src/components/AllIntegrations/Drip/Drip.jsx index 227b77738..f3b64227f 100644 --- a/frontend/src/components/AllIntegrations/Drip/Drip.jsx +++ b/frontend/src/components/AllIntegrations/Drip/Drip.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Drip/DripAuthorization.jsx b/frontend/src/components/AllIntegrations/Drip/DripAuthorization.jsx index 511ecc9a6..dd9739ad0 100644 --- a/frontend/src/components/AllIntegrations/Drip/DripAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/Drip/DripAuthorization.jsx @@ -47,9 +47,9 @@ export default function DripAuthorization({ 'First go to your', 'bit-integrations' )} ${__( - 'Drip user settings', - 'bit-integrations' - )}. + 'Drip user settings', + 'bit-integrations' + )}.
  • ${__('Copy the the API Token from "User Info"', 'bit-integrations')}
    • ` diff --git a/frontend/src/components/AllIntegrations/Drip/EditDrip.jsx b/frontend/src/components/AllIntegrations/Drip/EditDrip.jsx index 7b5b15e01..23ce523d2 100644 --- a/frontend/src/components/AllIntegrations/Drip/EditDrip.jsx +++ b/frontend/src/components/AllIntegrations/Drip/EditDrip.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Dropbox/Dropbox.jsx b/frontend/src/components/AllIntegrations/Dropbox/Dropbox.jsx index fc1e861e5..93bb9cb31 100644 --- a/frontend/src/components/AllIntegrations/Dropbox/Dropbox.jsx +++ b/frontend/src/components/AllIntegrations/Dropbox/Dropbox.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Dropbox/EditDropbox.jsx b/frontend/src/components/AllIntegrations/Dropbox/EditDropbox.jsx index d2557e485..e0b7e5711 100644 --- a/frontend/src/components/AllIntegrations/Dropbox/EditDropbox.jsx +++ b/frontend/src/components/AllIntegrations/Dropbox/EditDropbox.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/EditActionHook.jsx b/frontend/src/components/AllIntegrations/EditActionHook.jsx index 520559173..f50afd45a 100644 --- a/frontend/src/components/AllIntegrations/EditActionHook.jsx +++ b/frontend/src/components/AllIntegrations/EditActionHook.jsx @@ -276,8 +276,8 @@ function EditActionHook() { {isLoading ? __('Stop', 'bit-integrations') : flow.flow_details.fields - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } diff --git a/frontend/src/components/AllIntegrations/EditCustomFormSubmissionInteg.jsx b/frontend/src/components/AllIntegrations/EditCustomFormSubmissionInteg.jsx index f04ee421a..92169dc61 100644 --- a/frontend/src/components/AllIntegrations/EditCustomFormSubmissionInteg.jsx +++ b/frontend/src/components/AllIntegrations/EditCustomFormSubmissionInteg.jsx @@ -232,8 +232,8 @@ function EditCustomFormSubmissionInteg({ setSnackbar }) { {isLoading ? __('Stop', 'bit-integrations') : flow.flow_details.fields - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } diff --git a/frontend/src/components/AllIntegrations/EditCustomTrigger.jsx b/frontend/src/components/AllIntegrations/EditCustomTrigger.jsx index 344460953..2e5eb040b 100644 --- a/frontend/src/components/AllIntegrations/EditCustomTrigger.jsx +++ b/frontend/src/components/AllIntegrations/EditCustomTrigger.jsx @@ -207,8 +207,8 @@ function EditCustomTrigger() { {isLoading ? __('Stop', 'bit-integrations') : flow.flow_details?.rawData - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } diff --git a/frontend/src/components/AllIntegrations/EditInteg.jsx b/frontend/src/components/AllIntegrations/EditInteg.jsx index 9878ef725..efd63ee93 100644 --- a/frontend/src/components/AllIntegrations/EditInteg.jsx +++ b/frontend/src/components/AllIntegrations/EditInteg.jsx @@ -1,6 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import { lazy, memo, Suspense, useEffect, useState } from 'react' -import { Link, useParams } from 'react-router-dom' +import { Link, useParams } from 'react-router' import { useRecoilState, useResetRecoilState, useSetRecoilState } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../GlobalStates' import useFetch from '../../hooks/useFetch' @@ -139,8 +139,8 @@ const EditAutomatorWP = lazy(() => import('./AutomatorWP/EditAutomatorWP')) const EditUncannyAutomator = lazy(() => import('./UncannyAutomator/EditUncannyAutomator')) const EditThriveAutomator = lazy(() => import('./ThriveAutomator/EditThriveAutomator')) const EditWPWebhooks = lazy(() => import('./WPWebhooks/EditWPWebhooks')) -const EditAdvancedFormIntegration = lazy(() => - import('./AdvancedFormIntegration/EditAdvancedFormIntegration') +const EditAdvancedFormIntegration = lazy( + () => import('./AdvancedFormIntegration/EditAdvancedFormIntegration') ) const EditPerfexCRM = lazy(() => import('./PerfexCRM/EditPerfexCRM')) const EditSureTriggers = lazy(() => import('./SureTriggers/EditSureTriggers')) @@ -171,8 +171,8 @@ const EditACPT = lazy(() => import('./ACPT/EditACPT')) const EditWishlistMember = lazy(() => import('./WishlistMember/EditWishlistMember')) const EditFluentCart = lazy(() => import('./FluentCart/EditFluentCart')) const EditWPCafe = lazy(() => import('./WPCafe/EditWPCafe')) -const EditTeamsForWooCommerceMemberships = lazy(() => - import('./TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships') +const EditTeamsForWooCommerceMemberships = lazy( + () => import('./TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships') ) const EditSeoPress = lazy(() => import('./SeoPress/EditSeoPress')) diff --git a/frontend/src/components/AllIntegrations/ElasticEmail/EditElasticEmail.jsx b/frontend/src/components/AllIntegrations/ElasticEmail/EditElasticEmail.jsx index 3c9039dd0..9cdc3e36c 100644 --- a/frontend/src/components/AllIntegrations/ElasticEmail/EditElasticEmail.jsx +++ b/frontend/src/components/AllIntegrations/ElasticEmail/EditElasticEmail.jsx @@ -2,7 +2,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ElasticEmail/ElasticEmail.jsx b/frontend/src/components/AllIntegrations/ElasticEmail/ElasticEmail.jsx index 9b78172b0..28fec95c7 100644 --- a/frontend/src/components/AllIntegrations/ElasticEmail/ElasticEmail.jsx +++ b/frontend/src/components/AllIntegrations/ElasticEmail/ElasticEmail.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/EmailOctopus/EditEmailOctopus.jsx b/frontend/src/components/AllIntegrations/EmailOctopus/EditEmailOctopus.jsx index 06d2a9129..a0361be55 100644 --- a/frontend/src/components/AllIntegrations/EmailOctopus/EditEmailOctopus.jsx +++ b/frontend/src/components/AllIntegrations/EmailOctopus/EditEmailOctopus.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/EmailOctopus/EmailOctopus.jsx b/frontend/src/components/AllIntegrations/EmailOctopus/EmailOctopus.jsx index 26c070818..ddc223151 100644 --- a/frontend/src/components/AllIntegrations/EmailOctopus/EmailOctopus.jsx +++ b/frontend/src/components/AllIntegrations/EmailOctopus/EmailOctopus.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Encharge/EditEncharge.jsx b/frontend/src/components/AllIntegrations/Encharge/EditEncharge.jsx index ff162d372..36913756e 100644 --- a/frontend/src/components/AllIntegrations/Encharge/EditEncharge.jsx +++ b/frontend/src/components/AllIntegrations/Encharge/EditEncharge.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Encharge/Encharge.jsx b/frontend/src/components/AllIntegrations/Encharge/Encharge.jsx index 29f73d66d..1304aed38 100644 --- a/frontend/src/components/AllIntegrations/Encharge/Encharge.jsx +++ b/frontend/src/components/AllIntegrations/Encharge/Encharge.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Fabman/EditFabman.jsx b/frontend/src/components/AllIntegrations/Fabman/EditFabman.jsx index 290a84024..0e9561cb4 100644 --- a/frontend/src/components/AllIntegrations/Fabman/EditFabman.jsx +++ b/frontend/src/components/AllIntegrations/Fabman/EditFabman.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState, useEffect } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Fabman/Fabman.jsx b/frontend/src/components/AllIntegrations/Fabman/Fabman.jsx index df4d95ef3..7644e8587 100644 --- a/frontend/src/components/AllIntegrations/Fabman/Fabman.jsx +++ b/frontend/src/components/AllIntegrations/Fabman/Fabman.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/FlowMattic/EditFlowMattic.jsx b/frontend/src/components/AllIntegrations/FlowMattic/EditFlowMattic.jsx index 3e1efac6d..7d9de88e2 100644 --- a/frontend/src/components/AllIntegrations/FlowMattic/EditFlowMattic.jsx +++ b/frontend/src/components/AllIntegrations/FlowMattic/EditFlowMattic.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/FlowMattic/FlowMattic.jsx b/frontend/src/components/AllIntegrations/FlowMattic/FlowMattic.jsx index 1dc12db15..e9e2925ad 100644 --- a/frontend/src/components/AllIntegrations/FlowMattic/FlowMattic.jsx +++ b/frontend/src/components/AllIntegrations/FlowMattic/FlowMattic.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Flowlu/EditFlowlu.jsx b/frontend/src/components/AllIntegrations/Flowlu/EditFlowlu.jsx index 674172f68..ec7749289 100644 --- a/frontend/src/components/AllIntegrations/Flowlu/EditFlowlu.jsx +++ b/frontend/src/components/AllIntegrations/Flowlu/EditFlowlu.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Flowlu/Flowlu.jsx b/frontend/src/components/AllIntegrations/Flowlu/Flowlu.jsx index f2a787ff5..471be8b75 100644 --- a/frontend/src/components/AllIntegrations/Flowlu/Flowlu.jsx +++ b/frontend/src/components/AllIntegrations/Flowlu/Flowlu.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/FluentCRM/EditFluentCrm.jsx b/frontend/src/components/AllIntegrations/FluentCRM/EditFluentCrm.jsx index f2dcfb30c..9a4aab262 100644 --- a/frontend/src/components/AllIntegrations/FluentCRM/EditFluentCrm.jsx +++ b/frontend/src/components/AllIntegrations/FluentCRM/EditFluentCrm.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/FluentCRM/FluentCrm.jsx b/frontend/src/components/AllIntegrations/FluentCRM/FluentCrm.jsx index 30a790255..3894a9f58 100644 --- a/frontend/src/components/AllIntegrations/FluentCRM/FluentCrm.jsx +++ b/frontend/src/components/AllIntegrations/FluentCRM/FluentCrm.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/FluentCart/EditFluentCart.jsx b/frontend/src/components/AllIntegrations/FluentCart/EditFluentCart.jsx index 28883d2a7..ca82cffd8 100644 --- a/frontend/src/components/AllIntegrations/FluentCart/EditFluentCart.jsx +++ b/frontend/src/components/AllIntegrations/FluentCart/EditFluentCart.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/FluentCart/FluentCart.jsx b/frontend/src/components/AllIntegrations/FluentCart/FluentCart.jsx index 73c3ff1e1..cbf14465b 100644 --- a/frontend/src/components/AllIntegrations/FluentCart/FluentCart.jsx +++ b/frontend/src/components/AllIntegrations/FluentCart/FluentCart.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/FluentSupport/EditFluentSupport.jsx b/frontend/src/components/AllIntegrations/FluentSupport/EditFluentSupport.jsx index c85e61984..aab2cd83c 100644 --- a/frontend/src/components/AllIntegrations/FluentSupport/EditFluentSupport.jsx +++ b/frontend/src/components/AllIntegrations/FluentSupport/EditFluentSupport.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/FluentSupport/FluentSupport.jsx b/frontend/src/components/AllIntegrations/FluentSupport/FluentSupport.jsx index 7897fa652..2a4a7a44b 100644 --- a/frontend/src/components/AllIntegrations/FluentSupport/FluentSupport.jsx +++ b/frontend/src/components/AllIntegrations/FluentSupport/FluentSupport.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/FreshSales/EditFreshSales.jsx b/frontend/src/components/AllIntegrations/FreshSales/EditFreshSales.jsx index 3786b649a..c2a8d2eb5 100644 --- a/frontend/src/components/AllIntegrations/FreshSales/EditFreshSales.jsx +++ b/frontend/src/components/AllIntegrations/FreshSales/EditFreshSales.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/FreshSales/FreshSales.jsx b/frontend/src/components/AllIntegrations/FreshSales/FreshSales.jsx index b7c0fe3b7..e07784b1f 100644 --- a/frontend/src/components/AllIntegrations/FreshSales/FreshSales.jsx +++ b/frontend/src/components/AllIntegrations/FreshSales/FreshSales.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/FreshSales/FreshSalesAuthorization.jsx b/frontend/src/components/AllIntegrations/FreshSales/FreshSalesAuthorization.jsx index b2695a59c..595e17942 100644 --- a/frontend/src/components/AllIntegrations/FreshSales/FreshSalesAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/FreshSales/FreshSalesAuthorization.jsx @@ -42,9 +42,9 @@ export default function FreshSalesAuthorization({ 'Goto', 'bit-integrations' )} ${__( - 'Generate API Token', - 'bit-integrations' - )} + 'Generate API Token', + 'bit-integrations' + )}
  • ${__( 'Copy the Token and paste into API Token field of your authorization form.', 'bit-integrations' diff --git a/frontend/src/components/AllIntegrations/Freshdesk/EditFreshdesk.jsx b/frontend/src/components/AllIntegrations/Freshdesk/EditFreshdesk.jsx index 0c4d5013e..8a0d56fd0 100644 --- a/frontend/src/components/AllIntegrations/Freshdesk/EditFreshdesk.jsx +++ b/frontend/src/components/AllIntegrations/Freshdesk/EditFreshdesk.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Freshdesk/Freshdesk.jsx b/frontend/src/components/AllIntegrations/Freshdesk/Freshdesk.jsx index f6b985c02..ac39e9a35 100644 --- a/frontend/src/components/AllIntegrations/Freshdesk/Freshdesk.jsx +++ b/frontend/src/components/AllIntegrations/Freshdesk/Freshdesk.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GamiPress/EditGamiPress.jsx b/frontend/src/components/AllIntegrations/GamiPress/EditGamiPress.jsx index 553a15011..e08fe9864 100644 --- a/frontend/src/components/AllIntegrations/GamiPress/EditGamiPress.jsx +++ b/frontend/src/components/AllIntegrations/GamiPress/EditGamiPress.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GamiPress/GamiPress.jsx b/frontend/src/components/AllIntegrations/GamiPress/GamiPress.jsx index beb8394c0..9856b036f 100644 --- a/frontend/src/components/AllIntegrations/GamiPress/GamiPress.jsx +++ b/frontend/src/components/AllIntegrations/GamiPress/GamiPress.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GetResponse/EditGetResponse.jsx b/frontend/src/components/AllIntegrations/GetResponse/EditGetResponse.jsx index 459a1cf23..4a03c324f 100644 --- a/frontend/src/components/AllIntegrations/GetResponse/EditGetResponse.jsx +++ b/frontend/src/components/AllIntegrations/GetResponse/EditGetResponse.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GetResponse/GetResponse.jsx b/frontend/src/components/AllIntegrations/GetResponse/GetResponse.jsx index f59038f3e..40db1aa72 100644 --- a/frontend/src/components/AllIntegrations/GetResponse/GetResponse.jsx +++ b/frontend/src/components/AllIntegrations/GetResponse/GetResponse.jsx @@ -2,7 +2,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GetResponse/GetResponseAuthorization.jsx b/frontend/src/components/AllIntegrations/GetResponse/GetResponseAuthorization.jsx index c634cf9a1..dadb748af 100644 --- a/frontend/src/components/AllIntegrations/GetResponse/GetResponseAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/GetResponse/GetResponseAuthorization.jsx @@ -50,9 +50,9 @@ export default function GetResponseAuthorization({ 'Goto', 'bit-integrations' )} ${__( - 'Generate API Token', - 'bit-integrations' - )}
    • + 'Generate API Token', + 'bit-integrations' + )}
  • ${__( 'Copy the Token and paste into API Token field of your authorization form.', 'bit-integrations' diff --git a/frontend/src/components/AllIntegrations/Getgist/EditGetgist.jsx b/frontend/src/components/AllIntegrations/Getgist/EditGetgist.jsx index 08dd91c8b..9777b17fc 100644 --- a/frontend/src/components/AllIntegrations/Getgist/EditGetgist.jsx +++ b/frontend/src/components/AllIntegrations/Getgist/EditGetgist.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { __ } from '../../../Utils/i18nwrap' import EditFormInteg from '../EditFormInteg' diff --git a/frontend/src/components/AllIntegrations/Getgist/Getgist.jsx b/frontend/src/components/AllIntegrations/Getgist/Getgist.jsx index cdb778a8b..4283ad888 100644 --- a/frontend/src/components/AllIntegrations/Getgist/Getgist.jsx +++ b/frontend/src/components/AllIntegrations/Getgist/Getgist.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/GiveWp/EditGiveWp.jsx b/frontend/src/components/AllIntegrations/GiveWp/EditGiveWp.jsx index d2c58d057..2cfefd8fa 100644 --- a/frontend/src/components/AllIntegrations/GiveWp/EditGiveWp.jsx +++ b/frontend/src/components/AllIntegrations/GiveWp/EditGiveWp.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GiveWp/GiveWp.jsx b/frontend/src/components/AllIntegrations/GiveWp/GiveWp.jsx index db0dcf630..8b535fca8 100644 --- a/frontend/src/components/AllIntegrations/GiveWp/GiveWp.jsx +++ b/frontend/src/components/AllIntegrations/GiveWp/GiveWp.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GoogleCalendar/EditGoogleCalendar.jsx b/frontend/src/components/AllIntegrations/GoogleCalendar/EditGoogleCalendar.jsx index bef1ed4dd..d845f652d 100644 --- a/frontend/src/components/AllIntegrations/GoogleCalendar/EditGoogleCalendar.jsx +++ b/frontend/src/components/AllIntegrations/GoogleCalendar/EditGoogleCalendar.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GoogleCalendar/GoogleCalendar.jsx b/frontend/src/components/AllIntegrations/GoogleCalendar/GoogleCalendar.jsx index 15e95415d..090e08b72 100644 --- a/frontend/src/components/AllIntegrations/GoogleCalendar/GoogleCalendar.jsx +++ b/frontend/src/components/AllIntegrations/GoogleCalendar/GoogleCalendar.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GoogleContacts/EditGoogleContacts.jsx b/frontend/src/components/AllIntegrations/GoogleContacts/EditGoogleContacts.jsx index 753fb5fca..5d52e5928 100644 --- a/frontend/src/components/AllIntegrations/GoogleContacts/EditGoogleContacts.jsx +++ b/frontend/src/components/AllIntegrations/GoogleContacts/EditGoogleContacts.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GoogleContacts/GoogleContacts.jsx b/frontend/src/components/AllIntegrations/GoogleContacts/GoogleContacts.jsx index 650ba0af8..c9eaf6278 100644 --- a/frontend/src/components/AllIntegrations/GoogleContacts/GoogleContacts.jsx +++ b/frontend/src/components/AllIntegrations/GoogleContacts/GoogleContacts.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GoogleDrive/EditGoogleDrive.jsx b/frontend/src/components/AllIntegrations/GoogleDrive/EditGoogleDrive.jsx index a29cd0553..f88b6011d 100644 --- a/frontend/src/components/AllIntegrations/GoogleDrive/EditGoogleDrive.jsx +++ b/frontend/src/components/AllIntegrations/GoogleDrive/EditGoogleDrive.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GoogleDrive/GoogleDrive.jsx b/frontend/src/components/AllIntegrations/GoogleDrive/GoogleDrive.jsx index 88f1db5bd..698e4882b 100644 --- a/frontend/src/components/AllIntegrations/GoogleDrive/GoogleDrive.jsx +++ b/frontend/src/components/AllIntegrations/GoogleDrive/GoogleDrive.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/GoogleSheet/EditGoogleSheet.jsx b/frontend/src/components/AllIntegrations/GoogleSheet/EditGoogleSheet.jsx index 638c57323..adafc58d8 100644 --- a/frontend/src/components/AllIntegrations/GoogleSheet/EditGoogleSheet.jsx +++ b/frontend/src/components/AllIntegrations/GoogleSheet/EditGoogleSheet.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/GoogleSheet/GoogleSheet.jsx b/frontend/src/components/AllIntegrations/GoogleSheet/GoogleSheet.jsx index d747c9cb7..65cfee903 100644 --- a/frontend/src/components/AllIntegrations/GoogleSheet/GoogleSheet.jsx +++ b/frontend/src/components/AllIntegrations/GoogleSheet/GoogleSheet.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Gravitec/EditGravitec.jsx b/frontend/src/components/AllIntegrations/Gravitec/EditGravitec.jsx index 86b7e9f60..89b4427d7 100644 --- a/frontend/src/components/AllIntegrations/Gravitec/EditGravitec.jsx +++ b/frontend/src/components/AllIntegrations/Gravitec/EditGravitec.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Gravitec/Gravitec.jsx b/frontend/src/components/AllIntegrations/Gravitec/Gravitec.jsx index 08a7f829e..fa35a7e5d 100644 --- a/frontend/src/components/AllIntegrations/Gravitec/Gravitec.jsx +++ b/frontend/src/components/AllIntegrations/Gravitec/Gravitec.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Groundhogg/EditGroundhogg.jsx b/frontend/src/components/AllIntegrations/Groundhogg/EditGroundhogg.jsx index 3808c25e7..06c38d6bb 100644 --- a/frontend/src/components/AllIntegrations/Groundhogg/EditGroundhogg.jsx +++ b/frontend/src/components/AllIntegrations/Groundhogg/EditGroundhogg.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Groundhogg/Groundhogg.jsx b/frontend/src/components/AllIntegrations/Groundhogg/Groundhogg.jsx index aeeeac74f..8e3a9fae3 100644 --- a/frontend/src/components/AllIntegrations/Groundhogg/Groundhogg.jsx +++ b/frontend/src/components/AllIntegrations/Groundhogg/Groundhogg.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { $appConfigState } from '../../../GlobalStates' diff --git a/frontend/src/components/AllIntegrations/HighLevel/EditHighLevel.jsx b/frontend/src/components/AllIntegrations/HighLevel/EditHighLevel.jsx index aad873f5e..fc36f76d8 100644 --- a/frontend/src/components/AllIntegrations/HighLevel/EditHighLevel.jsx +++ b/frontend/src/components/AllIntegrations/HighLevel/EditHighLevel.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/HighLevel/HighLevel.jsx b/frontend/src/components/AllIntegrations/HighLevel/HighLevel.jsx index 51972f936..1be201d97 100644 --- a/frontend/src/components/AllIntegrations/HighLevel/HighLevel.jsx +++ b/frontend/src/components/AllIntegrations/HighLevel/HighLevel.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Hubspot/EditHubspot.jsx b/frontend/src/components/AllIntegrations/Hubspot/EditHubspot.jsx index 854a58f81..30356042f 100644 --- a/frontend/src/components/AllIntegrations/Hubspot/EditHubspot.jsx +++ b/frontend/src/components/AllIntegrations/Hubspot/EditHubspot.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Hubspot/Hubspot.jsx b/frontend/src/components/AllIntegrations/Hubspot/Hubspot.jsx index 22c52b9d3..24cdee009 100644 --- a/frontend/src/components/AllIntegrations/Hubspot/Hubspot.jsx +++ b/frontend/src/components/AllIntegrations/Hubspot/Hubspot.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/IFTTT/EditIFTTT.jsx b/frontend/src/components/AllIntegrations/IFTTT/EditIFTTT.jsx index 5f49bbd60..ebd5ec3f4 100644 --- a/frontend/src/components/AllIntegrations/IFTTT/EditIFTTT.jsx +++ b/frontend/src/components/AllIntegrations/IFTTT/EditIFTTT.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/IFTTT/IFTTT.jsx b/frontend/src/components/AllIntegrations/IFTTT/IFTTT.jsx index 131fae652..a24520385 100644 --- a/frontend/src/components/AllIntegrations/IFTTT/IFTTT.jsx +++ b/frontend/src/components/AllIntegrations/IFTTT/IFTTT.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Insightly/EditInsightly.jsx b/frontend/src/components/AllIntegrations/Insightly/EditInsightly.jsx index a7d3cff24..ff8add150 100644 --- a/frontend/src/components/AllIntegrations/Insightly/EditInsightly.jsx +++ b/frontend/src/components/AllIntegrations/Insightly/EditInsightly.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Insightly/Insightly.jsx b/frontend/src/components/AllIntegrations/Insightly/Insightly.jsx index 5f93425ad..c5dde8742 100644 --- a/frontend/src/components/AllIntegrations/Insightly/Insightly.jsx +++ b/frontend/src/components/AllIntegrations/Insightly/Insightly.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/IntegInfo.jsx b/frontend/src/components/AllIntegrations/IntegInfo.jsx index e9136eace..488f3543a 100644 --- a/frontend/src/components/AllIntegrations/IntegInfo.jsx +++ b/frontend/src/components/AllIntegrations/IntegInfo.jsx @@ -3,7 +3,7 @@ /* eslint-disable react/no-unstable-nested-components */ /* eslint-disable react/jsx-no-undef */ import { lazy, Suspense, useEffect, useState } from 'react' -import { Link, useParams } from 'react-router-dom' +import { Link, useParams } from 'react-router' import useFetch from '../../hooks/useFetch' import { __ } from '../../Utils/i18nwrap' import SnackMsg from '../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Integrately/EditIntegrately.jsx b/frontend/src/components/AllIntegrations/Integrately/EditIntegrately.jsx index 2e8548b49..d90922384 100644 --- a/frontend/src/components/AllIntegrations/Integrately/EditIntegrately.jsx +++ b/frontend/src/components/AllIntegrations/Integrately/EditIntegrately.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Integrately/Integrately.jsx b/frontend/src/components/AllIntegrations/Integrately/Integrately.jsx index 844538860..77593c86c 100644 --- a/frontend/src/components/AllIntegrations/Integrately/Integrately.jsx +++ b/frontend/src/components/AllIntegrations/Integrately/Integrately.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/IntegrationHelpers/IntegrationHelpers.js b/frontend/src/components/AllIntegrations/IntegrationHelpers/IntegrationHelpers.js index aec0abc18..2e9502287 100644 --- a/frontend/src/components/AllIntegrations/IntegrationHelpers/IntegrationHelpers.js +++ b/frontend/src/components/AllIntegrations/IntegrationHelpers/IntegrationHelpers.js @@ -509,7 +509,7 @@ export const handleAuthorize = ( grantTokenResponse = JSON.parse(bitformsZoho) localStorage.removeItem(`__${integ}`) } - + if ( !grantTokenResponse.code || grantTokenResponse.error || diff --git a/frontend/src/components/AllIntegrations/IntegrationHelpers/WebHook/Authorization.jsx b/frontend/src/components/AllIntegrations/IntegrationHelpers/WebHook/Authorization.jsx index 1c291f946..5297ba015 100644 --- a/frontend/src/components/AllIntegrations/IntegrationHelpers/WebHook/Authorization.jsx +++ b/frontend/src/components/AllIntegrations/IntegrationHelpers/WebHook/Authorization.jsx @@ -1,7 +1,6 @@ import React, { useEffect } from 'react' import MultiSelect from 'react-multiple-select-dropdown-lite' import CloseIcn from '../../../../Icons/CloseIcn' -import EyeIcon from '../../../../Icons/EyeIcon' import TrashIcn from '../../../../Icons/TrashIcn' import { __ } from '../../../../Utils/i18nwrap' import Button from '../../../Utilities/Button' diff --git a/frontend/src/components/AllIntegrations/Integromat/EditIntegromat.jsx b/frontend/src/components/AllIntegrations/Integromat/EditIntegromat.jsx index 330f6112b..2cbedbab7 100644 --- a/frontend/src/components/AllIntegrations/Integromat/EditIntegromat.jsx +++ b/frontend/src/components/AllIntegrations/Integromat/EditIntegromat.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Integromat/Integromat.jsx b/frontend/src/components/AllIntegrations/Integromat/Integromat.jsx index db6cd5289..8f0114dfe 100644 --- a/frontend/src/components/AllIntegrations/Integromat/Integromat.jsx +++ b/frontend/src/components/AllIntegrations/Integromat/Integromat.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/JetEngine/EditJetEngine.jsx b/frontend/src/components/AllIntegrations/JetEngine/EditJetEngine.jsx index 190f21e7c..a353d7613 100644 --- a/frontend/src/components/AllIntegrations/JetEngine/EditJetEngine.jsx +++ b/frontend/src/components/AllIntegrations/JetEngine/EditJetEngine.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/JetEngine/JetEngine.jsx b/frontend/src/components/AllIntegrations/JetEngine/JetEngine.jsx index fa1b28f6f..4a16fa6bb 100644 --- a/frontend/src/components/AllIntegrations/JetEngine/JetEngine.jsx +++ b/frontend/src/components/AllIntegrations/JetEngine/JetEngine.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Keap/EditKeap.jsx b/frontend/src/components/AllIntegrations/Keap/EditKeap.jsx index be61d62d0..1ef865a10 100644 --- a/frontend/src/components/AllIntegrations/Keap/EditKeap.jsx +++ b/frontend/src/components/AllIntegrations/Keap/EditKeap.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Keap/Keap.jsx b/frontend/src/components/AllIntegrations/Keap/Keap.jsx index 68740c321..0f229853f 100644 --- a/frontend/src/components/AllIntegrations/Keap/Keap.jsx +++ b/frontend/src/components/AllIntegrations/Keap/Keap.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Keap/KeapCommonFunc.js b/frontend/src/components/AllIntegrations/Keap/KeapCommonFunc.js index 4923a7fca..b66021c6e 100644 --- a/frontend/src/components/AllIntegrations/Keap/KeapCommonFunc.js +++ b/frontend/src/components/AllIntegrations/Keap/KeapCommonFunc.js @@ -72,13 +72,29 @@ export const handleAuthorize = ( } else { const newConf = { ...confTmp } newConf.accountServer = grantTokenResponse['accounts-server'] - tokenHelper(grantTokenResponse, newConf, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) + tokenHelper( + grantTokenResponse, + newConf, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi + ) } } }, 500) } -const tokenHelper = (grantToken, confTmp, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) => { +const tokenHelper = ( + grantToken, + confTmp, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi +) => { const tokenRequestParams = { ...grantToken } tokenRequestParams.clientId = confTmp.clientId tokenRequestParams.clientSecret = confTmp.clientSecret diff --git a/frontend/src/components/AllIntegrations/Keap/KeapIntegLayout.jsx b/frontend/src/components/AllIntegrations/Keap/KeapIntegLayout.jsx index cabac6ee4..7aa166756 100644 --- a/frontend/src/components/AllIntegrations/Keap/KeapIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/Keap/KeapIntegLayout.jsx @@ -1,4 +1,4 @@ -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import Loader from '../../Loaders/Loader' import KeapActions from './KeapActions' diff --git a/frontend/src/components/AllIntegrations/KirimEmail/EditKirimEmail.jsx b/frontend/src/components/AllIntegrations/KirimEmail/EditKirimEmail.jsx index c8e4d9b5b..6f63627fc 100644 --- a/frontend/src/components/AllIntegrations/KirimEmail/EditKirimEmail.jsx +++ b/frontend/src/components/AllIntegrations/KirimEmail/EditKirimEmail.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/KirimEmail/KirimEmail.jsx b/frontend/src/components/AllIntegrations/KirimEmail/KirimEmail.jsx index a8c86ad3f..266cbb0fc 100644 --- a/frontend/src/components/AllIntegrations/KirimEmail/KirimEmail.jsx +++ b/frontend/src/components/AllIntegrations/KirimEmail/KirimEmail.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Klaviyo/EditKlaviyo.jsx b/frontend/src/components/AllIntegrations/Klaviyo/EditKlaviyo.jsx index 7ca3f9536..941e8c1c5 100644 --- a/frontend/src/components/AllIntegrations/Klaviyo/EditKlaviyo.jsx +++ b/frontend/src/components/AllIntegrations/Klaviyo/EditKlaviyo.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Klaviyo/Klaviyo.jsx b/frontend/src/components/AllIntegrations/Klaviyo/Klaviyo.jsx index 7f1f9dd67..0fdb00f4d 100644 --- a/frontend/src/components/AllIntegrations/Klaviyo/Klaviyo.jsx +++ b/frontend/src/components/AllIntegrations/Klaviyo/Klaviyo.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import Steps from '../../Utilities/Steps' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Klaviyo/KlaviyoAuthorization.jsx b/frontend/src/components/AllIntegrations/Klaviyo/KlaviyoAuthorization.jsx index 9303aa3bc..10a3abef3 100644 --- a/frontend/src/components/AllIntegrations/Klaviyo/KlaviyoAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/Klaviyo/KlaviyoAuthorization.jsx @@ -43,9 +43,9 @@ function KlaviyoAuthorization({ 'Goto Settings and click on', 'bit-integrations' )} ${__( - 'API Keys.', - 'bit-integrations' - )}
    • + 'API Keys.', + 'bit-integrations' + )}
  • ${__('Click on Create Private API key.', 'bit-integrations')}
  • ${__( 'Copy the Private API Key and paste into API Key field of your authorization form.', diff --git a/frontend/src/components/AllIntegrations/KonnectzIT/EditKonnectzIT.jsx b/frontend/src/components/AllIntegrations/KonnectzIT/EditKonnectzIT.jsx index e8e2e2d84..28bb3ea67 100644 --- a/frontend/src/components/AllIntegrations/KonnectzIT/EditKonnectzIT.jsx +++ b/frontend/src/components/AllIntegrations/KonnectzIT/EditKonnectzIT.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/KonnectzIT/KonnectzIT.jsx b/frontend/src/components/AllIntegrations/KonnectzIT/KonnectzIT.jsx index b9b6056bf..8de3bb400 100644 --- a/frontend/src/components/AllIntegrations/KonnectzIT/KonnectzIT.jsx +++ b/frontend/src/components/AllIntegrations/KonnectzIT/KonnectzIT.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/LMFWC/EditLMFWC.jsx b/frontend/src/components/AllIntegrations/LMFWC/EditLMFWC.jsx index 2616353c8..c3502c8d9 100644 --- a/frontend/src/components/AllIntegrations/LMFWC/EditLMFWC.jsx +++ b/frontend/src/components/AllIntegrations/LMFWC/EditLMFWC.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/LMFWC/LMFWC.jsx b/frontend/src/components/AllIntegrations/LMFWC/LMFWC.jsx index 008ea4e4b..b81fa7cc8 100644 --- a/frontend/src/components/AllIntegrations/LMFWC/LMFWC.jsx +++ b/frontend/src/components/AllIntegrations/LMFWC/LMFWC.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/LMFWC/LMFWCAuthorization.jsx b/frontend/src/components/AllIntegrations/LMFWC/LMFWCAuthorization.jsx index 673ca5fe3..2ad64134e 100644 --- a/frontend/src/components/AllIntegrations/LMFWC/LMFWCAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/LMFWC/LMFWCAuthorization.jsx @@ -43,9 +43,9 @@ export default function LMFWCAuthorization({ const ActiveInstructions = ` ${__('Requirements', 'bit-integrations')}

    ${__('WordPress permalinks must be enabled at', 'bit-integrations')}: ${__( - 'Settings', - 'bit-integrations' - )} > ${__('Permalinks', 'bit-integrations')}

    + 'Settings', + 'bit-integrations' + )} > ${__('Permalinks', 'bit-integrations')}

    ${__('To Get Consumer key & Consumer secret', 'bit-integrations')}

    • ${__('First go to "WooCommerce"', 'bit-integrations')}
      • diff --git a/frontend/src/components/AllIntegrations/LearnDash/EditLearnDash.jsx b/frontend/src/components/AllIntegrations/LearnDash/EditLearnDash.jsx index d6a68890d..16322edc1 100644 --- a/frontend/src/components/AllIntegrations/LearnDash/EditLearnDash.jsx +++ b/frontend/src/components/AllIntegrations/LearnDash/EditLearnDash.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/LearnDash/LearnDash.jsx b/frontend/src/components/AllIntegrations/LearnDash/LearnDash.jsx index fc1b5c01d..f0cd81ded 100644 --- a/frontend/src/components/AllIntegrations/LearnDash/LearnDash.jsx +++ b/frontend/src/components/AllIntegrations/LearnDash/LearnDash.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Lemlist/EditLemlist.jsx b/frontend/src/components/AllIntegrations/Lemlist/EditLemlist.jsx index 1882ad8ea..ce5283385 100644 --- a/frontend/src/components/AllIntegrations/Lemlist/EditLemlist.jsx +++ b/frontend/src/components/AllIntegrations/Lemlist/EditLemlist.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Lemlist/Lemlist.jsx b/frontend/src/components/AllIntegrations/Lemlist/Lemlist.jsx index 2ff405deb..d41403de1 100644 --- a/frontend/src/components/AllIntegrations/Lemlist/Lemlist.jsx +++ b/frontend/src/components/AllIntegrations/Lemlist/Lemlist.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/LifterLms/EditLifterLms.jsx b/frontend/src/components/AllIntegrations/LifterLms/EditLifterLms.jsx index 84a2a11ac..2f6c2b6a3 100644 --- a/frontend/src/components/AllIntegrations/LifterLms/EditLifterLms.jsx +++ b/frontend/src/components/AllIntegrations/LifterLms/EditLifterLms.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/LifterLms/LifterLms.jsx b/frontend/src/components/AllIntegrations/LifterLms/LifterLms.jsx index 0d9b3280f..3a79212b8 100644 --- a/frontend/src/components/AllIntegrations/LifterLms/LifterLms.jsx +++ b/frontend/src/components/AllIntegrations/LifterLms/LifterLms.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Line/EditLine.jsx b/frontend/src/components/AllIntegrations/Line/EditLine.jsx index ec1da9acf..ab87bdb60 100644 --- a/frontend/src/components/AllIntegrations/Line/EditLine.jsx +++ b/frontend/src/components/AllIntegrations/Line/EditLine.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Line/Line.jsx b/frontend/src/components/AllIntegrations/Line/Line.jsx index a32f36daf..5dff1e24e 100644 --- a/frontend/src/components/AllIntegrations/Line/Line.jsx +++ b/frontend/src/components/AllIntegrations/Line/Line.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Line/LineCommonFunc.js b/frontend/src/components/AllIntegrations/Line/LineCommonFunc.js index 735c9998f..f5b1dc63a 100644 --- a/frontend/src/components/AllIntegrations/Line/LineCommonFunc.js +++ b/frontend/src/components/AllIntegrations/Line/LineCommonFunc.js @@ -36,11 +36,11 @@ export const handleAuthorize = async ( 'bit-integrations' )}` : typeof result?.data === 'string' - ? `${__('Authorization failed Cause:', 'bit-integrations')} ${result.data}. ${__( - 'Please try again', - 'bit-integrations' - )}` - : __('Authorization failed. Please try again', 'bit-integrations') + ? `${__('Authorization failed Cause:', 'bit-integrations')} ${result.data}. ${__( + 'Please try again', + 'bit-integrations' + )}` + : __('Authorization failed. Please try again', 'bit-integrations') setSnackbar({ show: true, msg }) } diff --git a/frontend/src/components/AllIntegrations/LionDesk/EditLionDesk.jsx b/frontend/src/components/AllIntegrations/LionDesk/EditLionDesk.jsx index d6c3a8b02..70b6766df 100644 --- a/frontend/src/components/AllIntegrations/LionDesk/EditLionDesk.jsx +++ b/frontend/src/components/AllIntegrations/LionDesk/EditLionDesk.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/LionDesk/LionDesk.jsx b/frontend/src/components/AllIntegrations/LionDesk/LionDesk.jsx index d1dc6c1d7..6a237cbfe 100644 --- a/frontend/src/components/AllIntegrations/LionDesk/LionDesk.jsx +++ b/frontend/src/components/AllIntegrations/LionDesk/LionDesk.jsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Livestorm/EditLivestorm.jsx b/frontend/src/components/AllIntegrations/Livestorm/EditLivestorm.jsx index 536998711..58502d13a 100644 --- a/frontend/src/components/AllIntegrations/Livestorm/EditLivestorm.jsx +++ b/frontend/src/components/AllIntegrations/Livestorm/EditLivestorm.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Livestorm/Livestorm.jsx b/frontend/src/components/AllIntegrations/Livestorm/Livestorm.jsx index 9984e724c..217e3b03d 100644 --- a/frontend/src/components/AllIntegrations/Livestorm/Livestorm.jsx +++ b/frontend/src/components/AllIntegrations/Livestorm/Livestorm.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Log.jsx b/frontend/src/components/AllIntegrations/Log.jsx index 6d3b3004b..245b4a9ba 100644 --- a/frontend/src/components/AllIntegrations/Log.jsx +++ b/frontend/src/components/AllIntegrations/Log.jsx @@ -1,5 +1,5 @@ import { memo, useCallback, useRef, useState } from 'react' -import { Link, useParams } from 'react-router-dom' +import { Link, useParams } from 'react-router' import noData from '../../resource/img/nodata.svg' import bitsFetch from '../../Utils/bitsFetch' import { __ } from '../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mail/Mail.jsx b/frontend/src/components/AllIntegrations/Mail/Mail.jsx index 388ebcbeb..28c8306fe 100644 --- a/frontend/src/components/AllIntegrations/Mail/Mail.jsx +++ b/frontend/src/components/AllIntegrations/Mail/Mail.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-restricted-syntax */ import React, { useEffect, useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $appConfigState, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailBluster/EditMailBluster.jsx b/frontend/src/components/AllIntegrations/MailBluster/EditMailBluster.jsx index 0c684f04b..ea5dbd4a0 100644 --- a/frontend/src/components/AllIntegrations/MailBluster/EditMailBluster.jsx +++ b/frontend/src/components/AllIntegrations/MailBluster/EditMailBluster.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailBluster/MailBluster.jsx b/frontend/src/components/AllIntegrations/MailBluster/MailBluster.jsx index 7728269d8..e73a896b2 100644 --- a/frontend/src/components/AllIntegrations/MailBluster/MailBluster.jsx +++ b/frontend/src/components/AllIntegrations/MailBluster/MailBluster.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailBluster/MailBlusterAuthorization.jsx b/frontend/src/components/AllIntegrations/MailBluster/MailBlusterAuthorization.jsx index 852dd40bf..333727bdf 100644 --- a/frontend/src/components/AllIntegrations/MailBluster/MailBlusterAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/MailBluster/MailBlusterAuthorization.jsx @@ -45,9 +45,9 @@ export default function MailBlusterAuthorization({ 'Goto', 'bit-integrations' )} ${__( - 'Generate API Token', - 'bit-integrations' - )} + 'Generate API Token', + 'bit-integrations' + )}
    • ${__( 'Copy the Token and paste into API Token field of your authorization form.', 'bit-integrations' diff --git a/frontend/src/components/AllIntegrations/MailChimp/EditMailChimp.jsx b/frontend/src/components/AllIntegrations/MailChimp/EditMailChimp.jsx index e3a451f2a..540fa8539 100644 --- a/frontend/src/components/AllIntegrations/MailChimp/EditMailChimp.jsx +++ b/frontend/src/components/AllIntegrations/MailChimp/EditMailChimp.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailChimp/MailChimp.jsx b/frontend/src/components/AllIntegrations/MailChimp/MailChimp.jsx index 371aa83e9..98f682c13 100644 --- a/frontend/src/components/AllIntegrations/MailChimp/MailChimp.jsx +++ b/frontend/src/components/AllIntegrations/MailChimp/MailChimp.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailMint/EditMailMint.jsx b/frontend/src/components/AllIntegrations/MailMint/EditMailMint.jsx index c90e9d383..2072187ec 100644 --- a/frontend/src/components/AllIntegrations/MailMint/EditMailMint.jsx +++ b/frontend/src/components/AllIntegrations/MailMint/EditMailMint.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailMint/MailMint.jsx b/frontend/src/components/AllIntegrations/MailMint/MailMint.jsx index 111a5ae69..d251adf89 100644 --- a/frontend/src/components/AllIntegrations/MailMint/MailMint.jsx +++ b/frontend/src/components/AllIntegrations/MailMint/MailMint.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailPoet/EditMailPoet.jsx b/frontend/src/components/AllIntegrations/MailPoet/EditMailPoet.jsx index 8acd8f89c..7d2a38e73 100644 --- a/frontend/src/components/AllIntegrations/MailPoet/EditMailPoet.jsx +++ b/frontend/src/components/AllIntegrations/MailPoet/EditMailPoet.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailPoet/MailPoet.jsx b/frontend/src/components/AllIntegrations/MailPoet/MailPoet.jsx index 3e8783640..eb554ab18 100644 --- a/frontend/src/components/AllIntegrations/MailPoet/MailPoet.jsx +++ b/frontend/src/components/AllIntegrations/MailPoet/MailPoet.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailRelay/EditMailRelay.jsx b/frontend/src/components/AllIntegrations/MailRelay/EditMailRelay.jsx index 5090bab46..621bee81f 100644 --- a/frontend/src/components/AllIntegrations/MailRelay/EditMailRelay.jsx +++ b/frontend/src/components/AllIntegrations/MailRelay/EditMailRelay.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailRelay/MailRelay.jsx b/frontend/src/components/AllIntegrations/MailRelay/MailRelay.jsx index c34981eff..214bc28d6 100644 --- a/frontend/src/components/AllIntegrations/MailRelay/MailRelay.jsx +++ b/frontend/src/components/AllIntegrations/MailRelay/MailRelay.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailerLite/EditMailerLite.jsx b/frontend/src/components/AllIntegrations/MailerLite/EditMailerLite.jsx index ad7edf948..1a981a6d8 100644 --- a/frontend/src/components/AllIntegrations/MailerLite/EditMailerLite.jsx +++ b/frontend/src/components/AllIntegrations/MailerLite/EditMailerLite.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useEffect, useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailerLite/MailerLite.jsx b/frontend/src/components/AllIntegrations/MailerLite/MailerLite.jsx index fe7aba2a7..367f00ac4 100644 --- a/frontend/src/components/AllIntegrations/MailerLite/MailerLite.jsx +++ b/frontend/src/components/AllIntegrations/MailerLite/MailerLite.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx b/frontend/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx index f6848e1e2..e55f79693 100644 --- a/frontend/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx +++ b/frontend/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MailerPress/MailerPress.jsx b/frontend/src/components/AllIntegrations/MailerPress/MailerPress.jsx index 8ede4c48c..757f9576d 100644 --- a/frontend/src/components/AllIntegrations/MailerPress/MailerPress.jsx +++ b/frontend/src/components/AllIntegrations/MailerPress/MailerPress.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Mailercloud/EditMailercloud.jsx b/frontend/src/components/AllIntegrations/Mailercloud/EditMailercloud.jsx index bd2473a34..16330396e 100644 --- a/frontend/src/components/AllIntegrations/Mailercloud/EditMailercloud.jsx +++ b/frontend/src/components/AllIntegrations/Mailercloud/EditMailercloud.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mailercloud/Mailercloud.jsx b/frontend/src/components/AllIntegrations/Mailercloud/Mailercloud.jsx index 7fc5a6144..d3345a80c 100644 --- a/frontend/src/components/AllIntegrations/Mailercloud/Mailercloud.jsx +++ b/frontend/src/components/AllIntegrations/Mailercloud/Mailercloud.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import StepPage from '../../Utilities/StepPage' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Mailercloud/MailercloudAuthorization.jsx b/frontend/src/components/AllIntegrations/Mailercloud/MailercloudAuthorization.jsx index 61d024f15..cef680b40 100644 --- a/frontend/src/components/AllIntegrations/Mailercloud/MailercloudAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/Mailercloud/MailercloudAuthorization.jsx @@ -43,9 +43,9 @@ function MailercloudAuthorization({ 'Goto Account and click on', 'bit-integrations' )} ${__( - 'Integration', - 'bit-integrations' - )}
      • + 'Integration', + 'bit-integrations' + )}
    • ${__('Click on API Integrations .', 'bit-integrations')}
    • ${__( 'Copy the API Key and paste into API Key field of your authorization form.', diff --git a/frontend/src/components/AllIntegrations/Mailify/EditMailify.jsx b/frontend/src/components/AllIntegrations/Mailify/EditMailify.jsx index 3604befec..5f98eebb7 100644 --- a/frontend/src/components/AllIntegrations/Mailify/EditMailify.jsx +++ b/frontend/src/components/AllIntegrations/Mailify/EditMailify.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/Mailify/Mailify.jsx b/frontend/src/components/AllIntegrations/Mailify/Mailify.jsx index c3e9d71cd..df2ee8051 100644 --- a/frontend/src/components/AllIntegrations/Mailify/Mailify.jsx +++ b/frontend/src/components/AllIntegrations/Mailify/Mailify.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Mailjet/EditMailjet.jsx b/frontend/src/components/AllIntegrations/Mailjet/EditMailjet.jsx index 93d9d4e5e..b9e364e99 100644 --- a/frontend/src/components/AllIntegrations/Mailjet/EditMailjet.jsx +++ b/frontend/src/components/AllIntegrations/Mailjet/EditMailjet.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { memo, useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mailjet/Mailjet.jsx b/frontend/src/components/AllIntegrations/Mailjet/Mailjet.jsx index ddccf7eb2..92b3364a8 100644 --- a/frontend/src/components/AllIntegrations/Mailjet/Mailjet.jsx +++ b/frontend/src/components/AllIntegrations/Mailjet/Mailjet.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Mailster/EditMailster.jsx b/frontend/src/components/AllIntegrations/Mailster/EditMailster.jsx index 614142779..6ce53bf73 100644 --- a/frontend/src/components/AllIntegrations/Mailster/EditMailster.jsx +++ b/frontend/src/components/AllIntegrations/Mailster/EditMailster.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { memo, useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mailster/Mailster.jsx b/frontend/src/components/AllIntegrations/Mailster/Mailster.jsx index 1447b8cce..dd3cd5143 100644 --- a/frontend/src/components/AllIntegrations/Mailster/Mailster.jsx +++ b/frontend/src/components/AllIntegrations/Mailster/Mailster.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Mailup/EditMailup.jsx b/frontend/src/components/AllIntegrations/Mailup/EditMailup.jsx index e700b4404..285998acb 100644 --- a/frontend/src/components/AllIntegrations/Mailup/EditMailup.jsx +++ b/frontend/src/components/AllIntegrations/Mailup/EditMailup.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mailup/Mailup.jsx b/frontend/src/components/AllIntegrations/Mailup/Mailup.jsx index b1b2c754d..b937f17c8 100644 --- a/frontend/src/components/AllIntegrations/Mailup/Mailup.jsx +++ b/frontend/src/components/AllIntegrations/Mailup/Mailup.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/MasterStudyLms/EditMasterStudyLms.jsx b/frontend/src/components/AllIntegrations/MasterStudyLms/EditMasterStudyLms.jsx index 89bba7bc2..0e2972bfe 100644 --- a/frontend/src/components/AllIntegrations/MasterStudyLms/EditMasterStudyLms.jsx +++ b/frontend/src/components/AllIntegrations/MasterStudyLms/EditMasterStudyLms.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MasterStudyLms/MasterStudyLms.jsx b/frontend/src/components/AllIntegrations/MasterStudyLms/MasterStudyLms.jsx index 1f14d553c..2994fa020 100644 --- a/frontend/src/components/AllIntegrations/MasterStudyLms/MasterStudyLms.jsx +++ b/frontend/src/components/AllIntegrations/MasterStudyLms/MasterStudyLms.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mautic/EditMautic.jsx b/frontend/src/components/AllIntegrations/Mautic/EditMautic.jsx index 81be9695c..f801019fd 100644 --- a/frontend/src/components/AllIntegrations/Mautic/EditMautic.jsx +++ b/frontend/src/components/AllIntegrations/Mautic/EditMautic.jsx @@ -2,7 +2,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Mautic/Mautic.jsx b/frontend/src/components/AllIntegrations/Mautic/Mautic.jsx index da5eef8c3..bc63fcff3 100644 --- a/frontend/src/components/AllIntegrations/Mautic/Mautic.jsx +++ b/frontend/src/components/AllIntegrations/Mautic/Mautic.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Memberpress/EditMemberpress.jsx b/frontend/src/components/AllIntegrations/Memberpress/EditMemberpress.jsx index c2271e879..34191dcd4 100644 --- a/frontend/src/components/AllIntegrations/Memberpress/EditMemberpress.jsx +++ b/frontend/src/components/AllIntegrations/Memberpress/EditMemberpress.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Memberpress/Memberpress.jsx b/frontend/src/components/AllIntegrations/Memberpress/Memberpress.jsx index 505ed9793..e54b79421 100644 --- a/frontend/src/components/AllIntegrations/Memberpress/Memberpress.jsx +++ b/frontend/src/components/AllIntegrations/Memberpress/Memberpress.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Moosend/EditMoosend.jsx b/frontend/src/components/AllIntegrations/Moosend/EditMoosend.jsx index a79869b7b..7ef1cc0a1 100644 --- a/frontend/src/components/AllIntegrations/Moosend/EditMoosend.jsx +++ b/frontend/src/components/AllIntegrations/Moosend/EditMoosend.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Moosend/Moosend.jsx b/frontend/src/components/AllIntegrations/Moosend/Moosend.jsx index a95dd8666..7d66b1a7d 100644 --- a/frontend/src/components/AllIntegrations/Moosend/Moosend.jsx +++ b/frontend/src/components/AllIntegrations/Moosend/Moosend.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import StepPage from '../../Utilities/StepPage' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/MoxieCRM/EditMoxieCRM.jsx b/frontend/src/components/AllIntegrations/MoxieCRM/EditMoxieCRM.jsx index fceaf90aa..bbb721fcd 100644 --- a/frontend/src/components/AllIntegrations/MoxieCRM/EditMoxieCRM.jsx +++ b/frontend/src/components/AllIntegrations/MoxieCRM/EditMoxieCRM.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/MoxieCRM/MoxieCRM.jsx b/frontend/src/components/AllIntegrations/MoxieCRM/MoxieCRM.jsx index 69221961e..3d3cd9e76 100644 --- a/frontend/src/components/AllIntegrations/MoxieCRM/MoxieCRM.jsx +++ b/frontend/src/components/AllIntegrations/MoxieCRM/MoxieCRM.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/N8n/EditN8n.jsx b/frontend/src/components/AllIntegrations/N8n/EditN8n.jsx index 99a0997b0..c7c9dcedd 100644 --- a/frontend/src/components/AllIntegrations/N8n/EditN8n.jsx +++ b/frontend/src/components/AllIntegrations/N8n/EditN8n.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/N8n/N8n.jsx b/frontend/src/components/AllIntegrations/N8n/N8n.jsx index 2540f5a17..8355c085f 100644 --- a/frontend/src/components/AllIntegrations/N8n/N8n.jsx +++ b/frontend/src/components/AllIntegrations/N8n/N8n.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/NewInteg.jsx b/frontend/src/components/AllIntegrations/NewInteg.jsx index aede675b0..74de6bd0a 100644 --- a/frontend/src/components/AllIntegrations/NewInteg.jsx +++ b/frontend/src/components/AllIntegrations/NewInteg.jsx @@ -2,7 +2,7 @@ /* eslint-disable react/no-unstable-nested-components */ /* eslint-disable react/jsx-no-undef */ import { lazy, Suspense, useEffect } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState } from 'recoil' import { $newFlow } from '../../GlobalStates' import { __ } from '../../Utils/i18nwrap' @@ -170,8 +170,8 @@ const ACPT = lazy(() => import('./ACPT/ACPT')) const WishlistMember = lazy(() => import('./WishlistMember/WishlistMember')) const FluentCart = lazy(() => import('./FluentCart/FluentCart')) const WPCafe = lazy(() => import('./WPCafe/WPCafe')) -const TeamsForWooCommerceMemberships = lazy(() => - import('./TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships') +const TeamsForWooCommerceMemberships = lazy( + () => import('./TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships') ) const SeoPress = lazy(() => import('./SeoPress/SeoPress')) diff --git a/frontend/src/components/AllIntegrations/Newsletter/EditNewsletter.jsx b/frontend/src/components/AllIntegrations/Newsletter/EditNewsletter.jsx index 55b72cbec..e44f67ff3 100644 --- a/frontend/src/components/AllIntegrations/Newsletter/EditNewsletter.jsx +++ b/frontend/src/components/AllIntegrations/Newsletter/EditNewsletter.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { memo, useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Newsletter/Newsletter.jsx b/frontend/src/components/AllIntegrations/Newsletter/Newsletter.jsx index bc244b496..62860ada1 100644 --- a/frontend/src/components/AllIntegrations/Newsletter/Newsletter.jsx +++ b/frontend/src/components/AllIntegrations/Newsletter/Newsletter.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Nimble/EditNimble.jsx b/frontend/src/components/AllIntegrations/Nimble/EditNimble.jsx index 5cd899084..3a282351c 100644 --- a/frontend/src/components/AllIntegrations/Nimble/EditNimble.jsx +++ b/frontend/src/components/AllIntegrations/Nimble/EditNimble.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Nimble/Nimble.jsx b/frontend/src/components/AllIntegrations/Nimble/Nimble.jsx index 7246cc87c..886771844 100644 --- a/frontend/src/components/AllIntegrations/Nimble/Nimble.jsx +++ b/frontend/src/components/AllIntegrations/Nimble/Nimble.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Notion/EditNotion.jsx b/frontend/src/components/AllIntegrations/Notion/EditNotion.jsx index 6be924f3f..5f82c73ef 100644 --- a/frontend/src/components/AllIntegrations/Notion/EditNotion.jsx +++ b/frontend/src/components/AllIntegrations/Notion/EditNotion.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Notion/Notion.jsx b/frontend/src/components/AllIntegrations/Notion/Notion.jsx index 1d7ff64b6..f51578d61 100644 --- a/frontend/src/components/AllIntegrations/Notion/Notion.jsx +++ b/frontend/src/components/AllIntegrations/Notion/Notion.jsx @@ -2,7 +2,7 @@ /* eslint-disable import/no-named-as-default-member */ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import StepPage from '../../Utilities/StepPage' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Notion/NotionCommonFunc.js b/frontend/src/components/AllIntegrations/Notion/NotionCommonFunc.js index d85ce5237..3686a8cf6 100644 --- a/frontend/src/components/AllIntegrations/Notion/NotionCommonFunc.js +++ b/frontend/src/components/AllIntegrations/Notion/NotionCommonFunc.js @@ -20,7 +20,16 @@ export const handleInput = (e, conf, setConf, error, setError) => { setConf(newConf) } -export const handleAuthorize = (conf, setConf, error, setError, setAuthorized, loading, setLoading, btcbi) => { +export const handleAuthorize = ( + conf, + setConf, + error, + setError, + setAuthorized, + loading, + setLoading, + btcbi +) => { if (!conf.clientId || !conf.clientSecret) { setError({ clientId: !conf.clientId ? __("Client Id can't be empty") : '', diff --git a/frontend/src/components/AllIntegrations/NutshellCRM/EditNutshellCRM.jsx b/frontend/src/components/AllIntegrations/NutshellCRM/EditNutshellCRM.jsx index cc6e4a868..155922d56 100644 --- a/frontend/src/components/AllIntegrations/NutshellCRM/EditNutshellCRM.jsx +++ b/frontend/src/components/AllIntegrations/NutshellCRM/EditNutshellCRM.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/NutshellCRM/NutshellCRM.jsx b/frontend/src/components/AllIntegrations/NutshellCRM/NutshellCRM.jsx index ce7afcdeb..7f16604b8 100644 --- a/frontend/src/components/AllIntegrations/NutshellCRM/NutshellCRM.jsx +++ b/frontend/src/components/AllIntegrations/NutshellCRM/NutshellCRM.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/OmniSend/EditOmniSend.jsx b/frontend/src/components/AllIntegrations/OmniSend/EditOmniSend.jsx index 958ad8984..85a24f27a 100644 --- a/frontend/src/components/AllIntegrations/OmniSend/EditOmniSend.jsx +++ b/frontend/src/components/AllIntegrations/OmniSend/EditOmniSend.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/OmniSend/OmniSend.jsx b/frontend/src/components/AllIntegrations/OmniSend/OmniSend.jsx index fcbce5a2a..1ddc249bf 100644 --- a/frontend/src/components/AllIntegrations/OmniSend/OmniSend.jsx +++ b/frontend/src/components/AllIntegrations/OmniSend/OmniSend.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/OmniSend/OmniSendAuthorization.jsx b/frontend/src/components/AllIntegrations/OmniSend/OmniSendAuthorization.jsx index a71fc5322..16ff0f6d7 100644 --- a/frontend/src/components/AllIntegrations/OmniSend/OmniSendAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/OmniSend/OmniSendAuthorization.jsx @@ -43,9 +43,9 @@ export default function OmniSendAuthorization({ 'Goto', 'bit-integrations' )} ${__( - 'Generate API Token', - 'bit-integrations' - )}
      • + 'Generate API Token', + 'bit-integrations' + )}
    • ${__( 'Copy the Token and paste into API Token field of your authorization form.', 'bit-integrations' diff --git a/frontend/src/components/AllIntegrations/OneDrive/EditOneDrive.jsx b/frontend/src/components/AllIntegrations/OneDrive/EditOneDrive.jsx index 9e63098b7..e69c76422 100644 --- a/frontend/src/components/AllIntegrations/OneDrive/EditOneDrive.jsx +++ b/frontend/src/components/AllIntegrations/OneDrive/EditOneDrive.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/OneDrive/OneDrive.jsx b/frontend/src/components/AllIntegrations/OneDrive/OneDrive.jsx index a87e3229c..64bf53cb1 100644 --- a/frontend/src/components/AllIntegrations/OneDrive/OneDrive.jsx +++ b/frontend/src/components/AllIntegrations/OneDrive/OneDrive.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/OneDrive/OneDriveAuthorization.jsx b/frontend/src/components/AllIntegrations/OneDrive/OneDriveAuthorization.jsx index 28c9d3256..c6ac3dad0 100644 --- a/frontend/src/components/AllIntegrations/OneDrive/OneDriveAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/OneDrive/OneDriveAuthorization.jsx @@ -128,7 +128,14 @@ export default function OneDriveAuthorization({ <> diff --git a/frontend/src/components/AllIntegrations/Slack/EditSlack.jsx b/frontend/src/components/AllIntegrations/Slack/EditSlack.jsx index ffdf1e9de..14a1bed79 100644 --- a/frontend/src/components/AllIntegrations/Slack/EditSlack.jsx +++ b/frontend/src/components/AllIntegrations/Slack/EditSlack.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Slack/Slack.jsx b/frontend/src/components/AllIntegrations/Slack/Slack.jsx index 7d51cdf11..1fc7389a7 100644 --- a/frontend/src/components/AllIntegrations/Slack/Slack.jsx +++ b/frontend/src/components/AllIntegrations/Slack/Slack.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Slack/SlackIntegLayout.jsx b/frontend/src/components/AllIntegrations/Slack/SlackIntegLayout.jsx index d929ece9f..0da29c2bd 100644 --- a/frontend/src/components/AllIntegrations/Slack/SlackIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/Slack/SlackIntegLayout.jsx @@ -1,6 +1,6 @@ import { useRef } from 'react' import MultiSelect from 'react-multiple-select-dropdown-lite' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import Loader from '../../Loaders/Loader' import { setFieldInputOnMsgBody } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/SliceWp/EditSliceWp.jsx b/frontend/src/components/AllIntegrations/SliceWp/EditSliceWp.jsx index 0bbd55cae..2313a16b4 100644 --- a/frontend/src/components/AllIntegrations/SliceWp/EditSliceWp.jsx +++ b/frontend/src/components/AllIntegrations/SliceWp/EditSliceWp.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SliceWp/SliceWp.jsx b/frontend/src/components/AllIntegrations/SliceWp/SliceWp.jsx index dbbaf644a..2eaf559d6 100644 --- a/frontend/src/components/AllIntegrations/SliceWp/SliceWp.jsx +++ b/frontend/src/components/AllIntegrations/SliceWp/SliceWp.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilValue } from 'recoil' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Smaily/EditSmaily.jsx b/frontend/src/components/AllIntegrations/Smaily/EditSmaily.jsx index 2678eb6f4..666e40692 100644 --- a/frontend/src/components/AllIntegrations/Smaily/EditSmaily.jsx +++ b/frontend/src/components/AllIntegrations/Smaily/EditSmaily.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Smaily/Smaily.jsx b/frontend/src/components/AllIntegrations/Smaily/Smaily.jsx index a14e7c3e0..68e67543d 100644 --- a/frontend/src/components/AllIntegrations/Smaily/Smaily.jsx +++ b/frontend/src/components/AllIntegrations/Smaily/Smaily.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/SmartSuite/EditSmartSuite.jsx b/frontend/src/components/AllIntegrations/SmartSuite/EditSmartSuite.jsx index 273ee8ade..ec5275d05 100644 --- a/frontend/src/components/AllIntegrations/SmartSuite/EditSmartSuite.jsx +++ b/frontend/src/components/AllIntegrations/SmartSuite/EditSmartSuite.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SmartSuite/SmartSuite.jsx b/frontend/src/components/AllIntegrations/SmartSuite/SmartSuite.jsx index e75062c11..5ce16ecbc 100644 --- a/frontend/src/components/AllIntegrations/SmartSuite/SmartSuite.jsx +++ b/frontend/src/components/AllIntegrations/SmartSuite/SmartSuite.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/SperseIO/EditSperseIO.jsx b/frontend/src/components/AllIntegrations/SperseIO/EditSperseIO.jsx index 17ddffc98..dea566ed4 100644 --- a/frontend/src/components/AllIntegrations/SperseIO/EditSperseIO.jsx +++ b/frontend/src/components/AllIntegrations/SperseIO/EditSperseIO.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/SperseIO/SperseIO.jsx b/frontend/src/components/AllIntegrations/SperseIO/SperseIO.jsx index b45eefb6f..7c3a19858 100644 --- a/frontend/src/components/AllIntegrations/SperseIO/SperseIO.jsx +++ b/frontend/src/components/AllIntegrations/SperseIO/SperseIO.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/SuiteDash/EditSuiteDash.jsx b/frontend/src/components/AllIntegrations/SuiteDash/EditSuiteDash.jsx index b70aa0f75..4ddedf401 100644 --- a/frontend/src/components/AllIntegrations/SuiteDash/EditSuiteDash.jsx +++ b/frontend/src/components/AllIntegrations/SuiteDash/EditSuiteDash.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SuiteDash/SuiteDash.jsx b/frontend/src/components/AllIntegrations/SuiteDash/SuiteDash.jsx index 0fcdcbd68..bfe6139c9 100644 --- a/frontend/src/components/AllIntegrations/SuiteDash/SuiteDash.jsx +++ b/frontend/src/components/AllIntegrations/SuiteDash/SuiteDash.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/SureCart/EditSureCart.jsx b/frontend/src/components/AllIntegrations/SureCart/EditSureCart.jsx index 1feaea26f..13e531971 100644 --- a/frontend/src/components/AllIntegrations/SureCart/EditSureCart.jsx +++ b/frontend/src/components/AllIntegrations/SureCart/EditSureCart.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SureCart/SureCart.jsx b/frontend/src/components/AllIntegrations/SureCart/SureCart.jsx index f69523017..c13cddd3b 100644 --- a/frontend/src/components/AllIntegrations/SureCart/SureCart.jsx +++ b/frontend/src/components/AllIntegrations/SureCart/SureCart.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/SureMembers/EditSureMembers.jsx b/frontend/src/components/AllIntegrations/SureMembers/EditSureMembers.jsx index 050b85e45..fb901d064 100644 --- a/frontend/src/components/AllIntegrations/SureMembers/EditSureMembers.jsx +++ b/frontend/src/components/AllIntegrations/SureMembers/EditSureMembers.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SureMembers/SureMembers.jsx b/frontend/src/components/AllIntegrations/SureMembers/SureMembers.jsx index 7377160bb..d73b15431 100644 --- a/frontend/src/components/AllIntegrations/SureMembers/SureMembers.jsx +++ b/frontend/src/components/AllIntegrations/SureMembers/SureMembers.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/SureTriggers/EditSureTriggers.jsx b/frontend/src/components/AllIntegrations/SureTriggers/EditSureTriggers.jsx index 7039cbce3..d77081f51 100644 --- a/frontend/src/components/AllIntegrations/SureTriggers/EditSureTriggers.jsx +++ b/frontend/src/components/AllIntegrations/SureTriggers/EditSureTriggers.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/SureTriggers/SureTriggers.jsx b/frontend/src/components/AllIntegrations/SureTriggers/SureTriggers.jsx index 4f1ba0231..1a352c8d4 100644 --- a/frontend/src/components/AllIntegrations/SureTriggers/SureTriggers.jsx +++ b/frontend/src/components/AllIntegrations/SureTriggers/SureTriggers.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/SyncSpider/EditSyncSpider.jsx b/frontend/src/components/AllIntegrations/SyncSpider/EditSyncSpider.jsx index dee3a5589..657af778d 100644 --- a/frontend/src/components/AllIntegrations/SyncSpider/EditSyncSpider.jsx +++ b/frontend/src/components/AllIntegrations/SyncSpider/EditSyncSpider.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/SyncSpider/SyncSpider.jsx b/frontend/src/components/AllIntegrations/SyncSpider/SyncSpider.jsx index 44b5998b5..07e669705 100644 --- a/frontend/src/components/AllIntegrations/SyncSpider/SyncSpider.jsx +++ b/frontend/src/components/AllIntegrations/SyncSpider/SyncSpider.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/SystemeIO/EditSystemeIO.jsx b/frontend/src/components/AllIntegrations/SystemeIO/EditSystemeIO.jsx index 71de2b5cf..005a0b229 100644 --- a/frontend/src/components/AllIntegrations/SystemeIO/EditSystemeIO.jsx +++ b/frontend/src/components/AllIntegrations/SystemeIO/EditSystemeIO.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/SystemeIO/SystemeIO.jsx b/frontend/src/components/AllIntegrations/SystemeIO/SystemeIO.jsx index c8849d347..621dba407 100644 --- a/frontend/src/components/AllIntegrations/SystemeIO/SystemeIO.jsx +++ b/frontend/src/components/AllIntegrations/SystemeIO/SystemeIO.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships.jsx b/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships.jsx index e6e0220f1..54ba5c404 100644 --- a/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships.jsx +++ b/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/EditTeamsForWooCommerceMemberships.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships.jsx b/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships.jsx index e2dd3770d..38dcff916 100644 --- a/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships.jsx +++ b/frontend/src/components/AllIntegrations/TeamsForWooCommerceMemberships/TeamsForWooCommerceMemberships.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Telegram/EditTelegram.jsx b/frontend/src/components/AllIntegrations/Telegram/EditTelegram.jsx index a879d6588..02984d7da 100644 --- a/frontend/src/components/AllIntegrations/Telegram/EditTelegram.jsx +++ b/frontend/src/components/AllIntegrations/Telegram/EditTelegram.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Telegram/Telegram.jsx b/frontend/src/components/AllIntegrations/Telegram/Telegram.jsx index ed8259a59..4b307d27d 100644 --- a/frontend/src/components/AllIntegrations/Telegram/Telegram.jsx +++ b/frontend/src/components/AllIntegrations/Telegram/Telegram.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Telegram/TelegramIntegLayout.jsx b/frontend/src/components/AllIntegrations/Telegram/TelegramIntegLayout.jsx index 50835fc95..fea0fb3a5 100644 --- a/frontend/src/components/AllIntegrations/Telegram/TelegramIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/Telegram/TelegramIntegLayout.jsx @@ -1,5 +1,5 @@ import MultiSelect from 'react-multiple-select-dropdown-lite' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import CheckBox from '../../Utilities/CheckBox' import Loader from '../../Loaders/Loader' diff --git a/frontend/src/components/AllIntegrations/TheEventsCalendar/EditTheEventsCalendar.jsx b/frontend/src/components/AllIntegrations/TheEventsCalendar/EditTheEventsCalendar.jsx index db5ffd2fc..e07246164 100644 --- a/frontend/src/components/AllIntegrations/TheEventsCalendar/EditTheEventsCalendar.jsx +++ b/frontend/src/components/AllIntegrations/TheEventsCalendar/EditTheEventsCalendar.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/TheEventsCalendar/TheEventsCalendar.jsx b/frontend/src/components/AllIntegrations/TheEventsCalendar/TheEventsCalendar.jsx index 986e28391..663a9046d 100644 --- a/frontend/src/components/AllIntegrations/TheEventsCalendar/TheEventsCalendar.jsx +++ b/frontend/src/components/AllIntegrations/TheEventsCalendar/TheEventsCalendar.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ThriveAutomator/EditThriveAutomator.jsx b/frontend/src/components/AllIntegrations/ThriveAutomator/EditThriveAutomator.jsx index a48879e3d..d9bb2f268 100644 --- a/frontend/src/components/AllIntegrations/ThriveAutomator/EditThriveAutomator.jsx +++ b/frontend/src/components/AllIntegrations/ThriveAutomator/EditThriveAutomator.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ThriveAutomator/ThriveAutomator.jsx b/frontend/src/components/AllIntegrations/ThriveAutomator/ThriveAutomator.jsx index fafa0f74b..f518b5cbe 100644 --- a/frontend/src/components/AllIntegrations/ThriveAutomator/ThriveAutomator.jsx +++ b/frontend/src/components/AllIntegrations/ThriveAutomator/ThriveAutomator.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Trello/EditTrello.jsx b/frontend/src/components/AllIntegrations/Trello/EditTrello.jsx index 36548314b..be4182885 100644 --- a/frontend/src/components/AllIntegrations/Trello/EditTrello.jsx +++ b/frontend/src/components/AllIntegrations/Trello/EditTrello.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Trello/Trello.jsx b/frontend/src/components/AllIntegrations/Trello/Trello.jsx index 1472c3b62..09bed071d 100644 --- a/frontend/src/components/AllIntegrations/Trello/Trello.jsx +++ b/frontend/src/components/AllIntegrations/Trello/Trello.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/TutorLms/EditTutorLms.jsx b/frontend/src/components/AllIntegrations/TutorLms/EditTutorLms.jsx index c5753069c..0d3c15f43 100644 --- a/frontend/src/components/AllIntegrations/TutorLms/EditTutorLms.jsx +++ b/frontend/src/components/AllIntegrations/TutorLms/EditTutorLms.jsx @@ -2,7 +2,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { __ } from '../../../Utils/i18nwrap' import EditFormInteg from '../EditFormInteg' diff --git a/frontend/src/components/AllIntegrations/TutorLms/TutorLms.jsx b/frontend/src/components/AllIntegrations/TutorLms/TutorLms.jsx index 1c2522582..446419f4f 100644 --- a/frontend/src/components/AllIntegrations/TutorLms/TutorLms.jsx +++ b/frontend/src/components/AllIntegrations/TutorLms/TutorLms.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Twilio/EditTwilio.jsx b/frontend/src/components/AllIntegrations/Twilio/EditTwilio.jsx index 2454f8101..2334487e0 100644 --- a/frontend/src/components/AllIntegrations/Twilio/EditTwilio.jsx +++ b/frontend/src/components/AllIntegrations/Twilio/EditTwilio.jsx @@ -2,7 +2,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Twilio/Twilio.jsx b/frontend/src/components/AllIntegrations/Twilio/Twilio.jsx index 04562f1a6..16dd8b18b 100644 --- a/frontend/src/components/AllIntegrations/Twilio/Twilio.jsx +++ b/frontend/src/components/AllIntegrations/Twilio/Twilio.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/UncannyAutomator/EditUncannyAutomator.jsx b/frontend/src/components/AllIntegrations/UncannyAutomator/EditUncannyAutomator.jsx index 3aa398e9e..0b079492e 100644 --- a/frontend/src/components/AllIntegrations/UncannyAutomator/EditUncannyAutomator.jsx +++ b/frontend/src/components/AllIntegrations/UncannyAutomator/EditUncannyAutomator.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/UncannyAutomator/UncannyAutomator.jsx b/frontend/src/components/AllIntegrations/UncannyAutomator/UncannyAutomator.jsx index 3faa04f81..c5249a378 100644 --- a/frontend/src/components/AllIntegrations/UncannyAutomator/UncannyAutomator.jsx +++ b/frontend/src/components/AllIntegrations/UncannyAutomator/UncannyAutomator.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Vbout/EditVbout.jsx b/frontend/src/components/AllIntegrations/Vbout/EditVbout.jsx index 73a7529ea..d98b996a9 100644 --- a/frontend/src/components/AllIntegrations/Vbout/EditVbout.jsx +++ b/frontend/src/components/AllIntegrations/Vbout/EditVbout.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Vbout/Vbout.jsx b/frontend/src/components/AllIntegrations/Vbout/Vbout.jsx index 70493097a..e5ae345ee 100644 --- a/frontend/src/components/AllIntegrations/Vbout/Vbout.jsx +++ b/frontend/src/components/AllIntegrations/Vbout/Vbout.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Voxel/EditVoxel.jsx b/frontend/src/components/AllIntegrations/Voxel/EditVoxel.jsx index c6820f7bf..45f28b44c 100644 --- a/frontend/src/components/AllIntegrations/Voxel/EditVoxel.jsx +++ b/frontend/src/components/AllIntegrations/Voxel/EditVoxel.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Voxel/Voxel.jsx b/frontend/src/components/AllIntegrations/Voxel/Voxel.jsx index a311173d7..3d2ed25c1 100644 --- a/frontend/src/components/AllIntegrations/Voxel/Voxel.jsx +++ b/frontend/src/components/AllIntegrations/Voxel/Voxel.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPCafe/EditWPCafe.jsx b/frontend/src/components/AllIntegrations/WPCafe/EditWPCafe.jsx index 34dfcbfcf..80c0fb3fb 100644 --- a/frontend/src/components/AllIntegrations/WPCafe/EditWPCafe.jsx +++ b/frontend/src/components/AllIntegrations/WPCafe/EditWPCafe.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WPCafe/WPCafe.jsx b/frontend/src/components/AllIntegrations/WPCafe/WPCafe.jsx index 33da45606..8975bbaa5 100644 --- a/frontend/src/components/AllIntegrations/WPCafe/WPCafe.jsx +++ b/frontend/src/components/AllIntegrations/WPCafe/WPCafe.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPCourseware/EditWPCourseware.jsx b/frontend/src/components/AllIntegrations/WPCourseware/EditWPCourseware.jsx index 275d9aed9..dd2d31b54 100644 --- a/frontend/src/components/AllIntegrations/WPCourseware/EditWPCourseware.jsx +++ b/frontend/src/components/AllIntegrations/WPCourseware/EditWPCourseware.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WPCourseware/WPCourseware.jsx b/frontend/src/components/AllIntegrations/WPCourseware/WPCourseware.jsx index dfc67dac1..7d18338e3 100644 --- a/frontend/src/components/AllIntegrations/WPCourseware/WPCourseware.jsx +++ b/frontend/src/components/AllIntegrations/WPCourseware/WPCourseware.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPForo/EditWPForo.jsx b/frontend/src/components/AllIntegrations/WPForo/EditWPForo.jsx index 5599f318d..ad651e681 100644 --- a/frontend/src/components/AllIntegrations/WPForo/EditWPForo.jsx +++ b/frontend/src/components/AllIntegrations/WPForo/EditWPForo.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WPForo/WPForo.jsx b/frontend/src/components/AllIntegrations/WPForo/WPForo.jsx index d4a38b193..542977f0e 100644 --- a/frontend/src/components/AllIntegrations/WPForo/WPForo.jsx +++ b/frontend/src/components/AllIntegrations/WPForo/WPForo.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPFusion/EditWPFusion.jsx b/frontend/src/components/AllIntegrations/WPFusion/EditWPFusion.jsx index 4448a241d..7de36d0d8 100644 --- a/frontend/src/components/AllIntegrations/WPFusion/EditWPFusion.jsx +++ b/frontend/src/components/AllIntegrations/WPFusion/EditWPFusion.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPFusion/WPFusion.jsx b/frontend/src/components/AllIntegrations/WPFusion/WPFusion.jsx index 966baf35e..9bcc0fd66 100644 --- a/frontend/src/components/AllIntegrations/WPFusion/WPFusion.jsx +++ b/frontend/src/components/AllIntegrations/WPFusion/WPFusion.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/WPWebhooks/EditWPWebhooks.jsx b/frontend/src/components/AllIntegrations/WPWebhooks/EditWPWebhooks.jsx index a8d3a4374..f9295250c 100644 --- a/frontend/src/components/AllIntegrations/WPWebhooks/EditWPWebhooks.jsx +++ b/frontend/src/components/AllIntegrations/WPWebhooks/EditWPWebhooks.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WPWebhooks/WPWebhooks.jsx b/frontend/src/components/AllIntegrations/WPWebhooks/WPWebhooks.jsx index 6c4e89477..bc598c7dc 100644 --- a/frontend/src/components/AllIntegrations/WPWebhooks/WPWebhooks.jsx +++ b/frontend/src/components/AllIntegrations/WPWebhooks/WPWebhooks.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/WebHooks/EditWebHooks.jsx b/frontend/src/components/AllIntegrations/WebHooks/EditWebHooks.jsx index 7c9dc6fb4..34297ead8 100644 --- a/frontend/src/components/AllIntegrations/WebHooks/EditWebHooks.jsx +++ b/frontend/src/components/AllIntegrations/WebHooks/EditWebHooks.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WebHooks/WebHooks.jsx b/frontend/src/components/AllIntegrations/WebHooks/WebHooks.jsx index a70f0cf24..c3b706621 100644 --- a/frontend/src/components/AllIntegrations/WebHooks/WebHooks.jsx +++ b/frontend/src/components/AllIntegrations/WebHooks/WebHooks.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/WhatsApp/EditWhatsApp.jsx b/frontend/src/components/AllIntegrations/WhatsApp/EditWhatsApp.jsx index dff4e5bb5..8623a7082 100644 --- a/frontend/src/components/AllIntegrations/WhatsApp/EditWhatsApp.jsx +++ b/frontend/src/components/AllIntegrations/WhatsApp/EditWhatsApp.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WhatsApp/WhatsApp.jsx b/frontend/src/components/AllIntegrations/WhatsApp/WhatsApp.jsx index 867c176a5..d3b27baf7 100644 --- a/frontend/src/components/AllIntegrations/WhatsApp/WhatsApp.jsx +++ b/frontend/src/components/AllIntegrations/WhatsApp/WhatsApp.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WhatsApp/WhatsAppIntegLayout.jsx b/frontend/src/components/AllIntegrations/WhatsApp/WhatsAppIntegLayout.jsx index c9528a20d..bfd9941be 100644 --- a/frontend/src/components/AllIntegrations/WhatsApp/WhatsAppIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/WhatsApp/WhatsAppIntegLayout.jsx @@ -1,6 +1,6 @@ import { create } from 'mutative' import MultiSelect from 'react-multiple-select-dropdown-lite' -import { useParams } from 'react-router-dom' +import { useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import Loader from '../../Loaders/Loader' import TinyMCE from '../../Utilities/TinyMCE' diff --git a/frontend/src/components/AllIntegrations/WishlistMember/EditWishlistMember.jsx b/frontend/src/components/AllIntegrations/WishlistMember/EditWishlistMember.jsx index d6de442ea..cfa4affc1 100644 --- a/frontend/src/components/AllIntegrations/WishlistMember/EditWishlistMember.jsx +++ b/frontend/src/components/AllIntegrations/WishlistMember/EditWishlistMember.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WishlistMember/WishlistMember.jsx b/frontend/src/components/AllIntegrations/WishlistMember/WishlistMember.jsx index 025d61883..aab56f70d 100644 --- a/frontend/src/components/AllIntegrations/WishlistMember/WishlistMember.jsx +++ b/frontend/src/components/AllIntegrations/WishlistMember/WishlistMember.jsx @@ -1,6 +1,6 @@ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/WooCommerce/EditWooCommerce.jsx b/frontend/src/components/AllIntegrations/WooCommerce/EditWooCommerce.jsx index f21d09efb..55dcbc75e 100644 --- a/frontend/src/components/AllIntegrations/WooCommerce/EditWooCommerce.jsx +++ b/frontend/src/components/AllIntegrations/WooCommerce/EditWooCommerce.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/WooCommerce/WooCommerce.jsx b/frontend/src/components/AllIntegrations/WooCommerce/WooCommerce.jsx index 565ed4981..778490f3d 100644 --- a/frontend/src/components/AllIntegrations/WooCommerce/WooCommerce.jsx +++ b/frontend/src/components/AllIntegrations/WooCommerce/WooCommerce.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-nested-ternary */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Woodpecker/EditWoodpecker.jsx b/frontend/src/components/AllIntegrations/Woodpecker/EditWoodpecker.jsx index 07f11adc5..284f986f9 100644 --- a/frontend/src/components/AllIntegrations/Woodpecker/EditWoodpecker.jsx +++ b/frontend/src/components/AllIntegrations/Woodpecker/EditWoodpecker.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Woodpecker/Woodpecker.jsx b/frontend/src/components/AllIntegrations/Woodpecker/Woodpecker.jsx index 5378d021a..34fb5e2d8 100644 --- a/frontend/src/components/AllIntegrations/Woodpecker/Woodpecker.jsx +++ b/frontend/src/components/AllIntegrations/Woodpecker/Woodpecker.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import toast from 'react-hot-toast' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Woodpecker/WoodpeckerAuthorization.jsx b/frontend/src/components/AllIntegrations/Woodpecker/WoodpeckerAuthorization.jsx index 871ddb136..c5c4bf3b4 100644 --- a/frontend/src/components/AllIntegrations/Woodpecker/WoodpeckerAuthorization.jsx +++ b/frontend/src/components/AllIntegrations/Woodpecker/WoodpeckerAuthorization.jsx @@ -46,9 +46,9 @@ export default function WoodpeckerAuthorization({ 'Log into your Woodpecker account on', 'bit-integrations' )} ${__( - 'app.woodpecker.co.', - 'bit-integrations' - )}
      • + 'app.woodpecker.co.', + 'bit-integrations' + )}
    • ${__( 'Go to the Marketplace → INTEGRATIONS → API keys.', 'bit-integrations' diff --git a/frontend/src/components/AllIntegrations/ZagoMail/EditZagoMail.jsx b/frontend/src/components/AllIntegrations/ZagoMail/EditZagoMail.jsx index d78b23dd4..544837ca8 100644 --- a/frontend/src/components/AllIntegrations/ZagoMail/EditZagoMail.jsx +++ b/frontend/src/components/AllIntegrations/ZagoMail/EditZagoMail.jsx @@ -2,7 +2,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import SnackMsg from '../../Utilities/SnackMsg' import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree' diff --git a/frontend/src/components/AllIntegrations/ZagoMail/ZagoMail.jsx b/frontend/src/components/AllIntegrations/ZagoMail/ZagoMail.jsx index cebdae39e..a3e1bb093 100644 --- a/frontend/src/components/AllIntegrations/ZagoMail/ZagoMail.jsx +++ b/frontend/src/components/AllIntegrations/ZagoMail/ZagoMail.jsx @@ -2,7 +2,7 @@ import { __ } from '../../../Utils/i18nwrap' import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/Zapier/EditZapier.jsx b/frontend/src/components/AllIntegrations/Zapier/EditZapier.jsx index deeb37d06..f22b66175 100644 --- a/frontend/src/components/AllIntegrations/Zapier/EditZapier.jsx +++ b/frontend/src/components/AllIntegrations/Zapier/EditZapier.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Zapier/Zapier.jsx b/frontend/src/components/AllIntegrations/Zapier/Zapier.jsx index 113220bac..f5c447d04 100644 --- a/frontend/src/components/AllIntegrations/Zapier/Zapier.jsx +++ b/frontend/src/components/AllIntegrations/Zapier/Zapier.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/Zendesk/EditZendesk.jsx b/frontend/src/components/AllIntegrations/Zendesk/EditZendesk.jsx index f809020fb..16d90b7ee 100644 --- a/frontend/src/components/AllIntegrations/Zendesk/EditZendesk.jsx +++ b/frontend/src/components/AllIntegrations/Zendesk/EditZendesk.jsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { toast } from 'react-hot-toast' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Zendesk/Zendesk.jsx b/frontend/src/components/AllIntegrations/Zendesk/Zendesk.jsx index 81aacabfa..710473429 100644 --- a/frontend/src/components/AllIntegrations/Zendesk/Zendesk.jsx +++ b/frontend/src/components/AllIntegrations/Zendesk/Zendesk.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-unused-expressions */ import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoAnalytics/EditZohoAnalytics.jsx b/frontend/src/components/AllIntegrations/ZohoAnalytics/EditZohoAnalytics.jsx index 75477b13b..f1c847166 100644 --- a/frontend/src/components/AllIntegrations/ZohoAnalytics/EditZohoAnalytics.jsx +++ b/frontend/src/components/AllIntegrations/ZohoAnalytics/EditZohoAnalytics.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalytics.jsx b/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalytics.jsx index 8ab4e7181..cd46bf9a2 100644 --- a/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalytics.jsx +++ b/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalytics.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalyticsIntegLayout.jsx b/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalyticsIntegLayout.jsx index 52ae36de2..30f368807 100644 --- a/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalyticsIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/ZohoAnalytics/ZohoAnalyticsIntegLayout.jsx @@ -1,6 +1,5 @@ import { __ } from '../../../Utils/i18nwrap' import Loader from '../../Loaders/Loader' -import ZohoAnalyticsActions from './ZohoAnalyticsActions' import { refreshTableHeaders, refreshTables, refreshWorkspaces } from './ZohoAnalyticsCommonFunc' import ZohoAnalyticsFieldMap, { addFieldMap } from './ZohoAnalyticsFieldMap' @@ -132,18 +131,6 @@ export default function ZohoAnalyticsIntegLayout({ + -
      -
      -
      - {__('Utilities', 'bit-integrations')} -
      -
      - - )} diff --git a/frontend/src/components/AllIntegrations/ZohoBigin/EditZohoBigin.jsx b/frontend/src/components/AllIntegrations/ZohoBigin/EditZohoBigin.jsx index 00e8e887d..2f9b2d125 100644 --- a/frontend/src/components/AllIntegrations/ZohoBigin/EditZohoBigin.jsx +++ b/frontend/src/components/AllIntegrations/ZohoBigin/EditZohoBigin.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoBigin/ZohoBigin.jsx b/frontend/src/components/AllIntegrations/ZohoBigin/ZohoBigin.jsx index 17dad315d..b62fd30db 100644 --- a/frontend/src/components/AllIntegrations/ZohoBigin/ZohoBigin.jsx +++ b/frontend/src/components/AllIntegrations/ZohoBigin/ZohoBigin.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { __ } from '../../../Utils/i18nwrap' import 'react-multiple-select-dropdown-lite/dist/index.css' diff --git a/frontend/src/components/AllIntegrations/ZohoCRM/EditZohoCRM.jsx b/frontend/src/components/AllIntegrations/ZohoCRM/EditZohoCRM.jsx index 17a62ce7a..d7b1fb346 100644 --- a/frontend/src/components/AllIntegrations/ZohoCRM/EditZohoCRM.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCRM/EditZohoCRM.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoCRM/ZohoCRM.jsx b/frontend/src/components/AllIntegrations/ZohoCRM/ZohoCRM.jsx index ea57f9ef9..4da3d0489 100644 --- a/frontend/src/components/AllIntegrations/ZohoCRM/ZohoCRM.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCRM/ZohoCRM.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' diff --git a/frontend/src/components/AllIntegrations/ZohoCampaigns/EditZohoCampaigns.jsx b/frontend/src/components/AllIntegrations/ZohoCampaigns/EditZohoCampaigns.jsx index 92902f0f8..a3f32585a 100644 --- a/frontend/src/components/AllIntegrations/ZohoCampaigns/EditZohoCampaigns.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCampaigns/EditZohoCampaigns.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoCampaigns/ZohoCampaigns.jsx b/frontend/src/components/AllIntegrations/ZohoCampaigns/ZohoCampaigns.jsx index 4911d701b..2fe8585b3 100644 --- a/frontend/src/components/AllIntegrations/ZohoCampaigns/ZohoCampaigns.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCampaigns/ZohoCampaigns.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoCreator/EditZohoCreator.jsx b/frontend/src/components/AllIntegrations/ZohoCreator/EditZohoCreator.jsx index 7f0facde4..fa049c28c 100644 --- a/frontend/src/components/AllIntegrations/ZohoCreator/EditZohoCreator.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCreator/EditZohoCreator.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreator.jsx b/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreator.jsx index 052b24a0d..d63321bbd 100644 --- a/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreator.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreator.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreatorIntegLayout.jsx b/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreatorIntegLayout.jsx index 16bcc9c4a..c33c89ade 100644 --- a/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreatorIntegLayout.jsx +++ b/frontend/src/components/AllIntegrations/ZohoCreator/ZohoCreatorIntegLayout.jsx @@ -1,7 +1,6 @@ import { __ } from '../../../Utils/i18nwrap' import Loader from '../../Loaders/Loader' import { addFieldMap } from '../IntegrationHelpers/IntegrationHelpers' -import ZohoCreatorActions from './ZohoCreatorActions' import { refreshApplications, refreshFields, refreshForms } from './ZohoCreatorCommonFunc' import ZohoCreatorFieldMap from './ZohoCreatorFieldMap' @@ -175,12 +174,6 @@ export default function ZohoCreatorIntegLayout({
      )} -
      - {__('Utilities', 'bit-integrations')} -
      -
      - - )} diff --git a/frontend/src/components/AllIntegrations/ZohoDesk/EditZohoDesk.jsx b/frontend/src/components/AllIntegrations/ZohoDesk/EditZohoDesk.jsx index 251bc491f..835e40a67 100644 --- a/frontend/src/components/AllIntegrations/ZohoDesk/EditZohoDesk.jsx +++ b/frontend/src/components/AllIntegrations/ZohoDesk/EditZohoDesk.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoDesk/ZohoDesk.jsx b/frontend/src/components/AllIntegrations/ZohoDesk/ZohoDesk.jsx index 88daf9077..cf4ded903 100644 --- a/frontend/src/components/AllIntegrations/ZohoDesk/ZohoDesk.jsx +++ b/frontend/src/components/AllIntegrations/ZohoDesk/ZohoDesk.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoFlow/EditZohoFlow.jsx b/frontend/src/components/AllIntegrations/ZohoFlow/EditZohoFlow.jsx index 41ae015db..e3710aa1a 100644 --- a/frontend/src/components/AllIntegrations/ZohoFlow/EditZohoFlow.jsx +++ b/frontend/src/components/AllIntegrations/ZohoFlow/EditZohoFlow.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoFlow/ZohoFlow.jsx b/frontend/src/components/AllIntegrations/ZohoFlow/ZohoFlow.jsx index 3da0df8df..793a84a8d 100644 --- a/frontend/src/components/AllIntegrations/ZohoFlow/ZohoFlow.jsx +++ b/frontend/src/components/AllIntegrations/ZohoFlow/ZohoFlow.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import SnackMsg from '../../Utilities/SnackMsg' import Steps from '../../Utilities/Steps' import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers' diff --git a/frontend/src/components/AllIntegrations/ZohoMarketingHub/EditZohoMarketingHub.jsx b/frontend/src/components/AllIntegrations/ZohoMarketingHub/EditZohoMarketingHub.jsx index 6c09c4061..0464150fa 100644 --- a/frontend/src/components/AllIntegrations/ZohoMarketingHub/EditZohoMarketingHub.jsx +++ b/frontend/src/components/AllIntegrations/ZohoMarketingHub/EditZohoMarketingHub.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoMarketingHub/ZohoMarketingHub.jsx b/frontend/src/components/AllIntegrations/ZohoMarketingHub/ZohoMarketingHub.jsx index 1b6103427..71bd6be68 100644 --- a/frontend/src/components/AllIntegrations/ZohoMarketingHub/ZohoMarketingHub.jsx +++ b/frontend/src/components/AllIntegrations/ZohoMarketingHub/ZohoMarketingHub.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoRecruit/EditZohoRecruit.jsx b/frontend/src/components/AllIntegrations/ZohoRecruit/EditZohoRecruit.jsx index 758b1135e..e149850ad 100644 --- a/frontend/src/components/AllIntegrations/ZohoRecruit/EditZohoRecruit.jsx +++ b/frontend/src/components/AllIntegrations/ZohoRecruit/EditZohoRecruit.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoRecruit/ZohoRecruit.jsx b/frontend/src/components/AllIntegrations/ZohoRecruit/ZohoRecruit.jsx index 7e200a725..39b885d82 100644 --- a/frontend/src/components/AllIntegrations/ZohoRecruit/ZohoRecruit.jsx +++ b/frontend/src/components/AllIntegrations/ZohoRecruit/ZohoRecruit.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/ZohoSheet/EditZohoSheet.jsx b/frontend/src/components/AllIntegrations/ZohoSheet/EditZohoSheet.jsx index 3fa171a2c..b499408b7 100644 --- a/frontend/src/components/AllIntegrations/ZohoSheet/EditZohoSheet.jsx +++ b/frontend/src/components/AllIntegrations/ZohoSheet/EditZohoSheet.jsx @@ -2,7 +2,7 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZohoSheet/ZohoSheet.jsx b/frontend/src/components/AllIntegrations/ZohoSheet/ZohoSheet.jsx index 5a76e1cd1..e5d493cff 100644 --- a/frontend/src/components/AllIntegrations/ZohoSheet/ZohoSheet.jsx +++ b/frontend/src/components/AllIntegrations/ZohoSheet/ZohoSheet.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-console */ /* eslint-disable no-unused-expressions */ import { useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import toast from 'react-hot-toast' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Zoom/EditZoom.jsx b/frontend/src/components/AllIntegrations/Zoom/EditZoom.jsx index a380c4296..741d851db 100644 --- a/frontend/src/components/AllIntegrations/Zoom/EditZoom.jsx +++ b/frontend/src/components/AllIntegrations/Zoom/EditZoom.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/Zoom/Zoom.jsx b/frontend/src/components/AllIntegrations/Zoom/Zoom.jsx index 5025609c0..3f0465b7f 100644 --- a/frontend/src/components/AllIntegrations/Zoom/Zoom.jsx +++ b/frontend/src/components/AllIntegrations/Zoom/Zoom.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/AllIntegrations/Zoom/ZoomCommonFunc.js b/frontend/src/components/AllIntegrations/Zoom/ZoomCommonFunc.js index 6d4e0c191..3ab747f7d 100644 --- a/frontend/src/components/AllIntegrations/Zoom/ZoomCommonFunc.js +++ b/frontend/src/components/AllIntegrations/Zoom/ZoomCommonFunc.js @@ -188,13 +188,29 @@ export const handleAuthorize = ( } else { const newConf = { ...confTmp } newConf.accountServer = grantTokenResponse['accounts-server'] - tokenHelper(grantTokenResponse, newConf, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) + tokenHelper( + grantTokenResponse, + newConf, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi + ) } } }, 500) } -const tokenHelper = (grantToken, confTmp, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) => { +const tokenHelper = ( + grantToken, + confTmp, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi +) => { const tokenRequestParams = { ...grantToken } tokenRequestParams.clientId = confTmp.clientId tokenRequestParams.clientSecret = confTmp.clientSecret diff --git a/frontend/src/components/AllIntegrations/ZoomWebinar/EditZoomWebinar.jsx b/frontend/src/components/AllIntegrations/ZoomWebinar/EditZoomWebinar.jsx index 78a5cdedc..04119e7c6 100644 --- a/frontend/src/components/AllIntegrations/ZoomWebinar/EditZoomWebinar.jsx +++ b/frontend/src/components/AllIntegrations/ZoomWebinar/EditZoomWebinar.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { useState } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import { useRecoilState, useRecoilValue } from 'recoil' import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates' import { __ } from '../../../Utils/i18nwrap' diff --git a/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomCommonFunc.js b/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomCommonFunc.js index 8ba163f5b..30804a974 100644 --- a/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomCommonFunc.js +++ b/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomCommonFunc.js @@ -144,13 +144,29 @@ export const handleAuthorize = ( } else { const newConf = { ...confTmp } newConf.accountServer = grantTokenResponse['accounts-server'] - tokenHelper(grantTokenResponse, newConf, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) + tokenHelper( + grantTokenResponse, + newConf, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi + ) } } }, 500) } -const tokenHelper = (grantToken, confTmp, setConf, setisAuthorized, setIsLoading, setSnackbar, btcbi) => { +const tokenHelper = ( + grantToken, + confTmp, + setConf, + setisAuthorized, + setIsLoading, + setSnackbar, + btcbi +) => { const tokenRequestParams = { ...grantToken } tokenRequestParams.clientId = confTmp.clientId tokenRequestParams.clientSecret = confTmp.clientSecret diff --git a/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomWebinar.jsx b/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomWebinar.jsx index cda12f9b4..b0ba98e95 100644 --- a/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomWebinar.jsx +++ b/frontend/src/components/AllIntegrations/ZoomWebinar/ZoomWebinar.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import 'react-multiple-select-dropdown-lite/dist/index.css' -import { useNavigate, useParams } from 'react-router-dom' +import { useNavigate, useParams } from 'react-router' import BackIcn from '../../../Icons/BackIcn' import { __ } from '../../../Utils/i18nwrap' import SnackMsg from '../../Utilities/SnackMsg' diff --git a/frontend/src/components/Flow/New/SelectAction.jsx b/frontend/src/components/Flow/New/SelectAction.jsx index 7c6505c97..e0393c6ed 100644 --- a/frontend/src/components/Flow/New/SelectAction.jsx +++ b/frontend/src/components/Flow/New/SelectAction.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil' import c from 'react-multiple-select-dropdown-lite' import { $appConfigState, $flowStep, $newFlow } from '../../../GlobalStates' diff --git a/frontend/src/components/Integrations.jsx b/frontend/src/components/Integrations.jsx index 4a5351e74..30c05c7f6 100644 --- a/frontend/src/components/Integrations.jsx +++ b/frontend/src/components/Integrations.jsx @@ -1,6 +1,6 @@ /* eslint-disable-next-line no-undef */ import { useState } from 'react' -import { Route, Routes } from 'react-router-dom' +import { Route, Routes } from 'react-router' import EditInteg from './AllIntegrations/EditInteg' import IntegInfo from './AllIntegrations/IntegInfo' import Log from './AllIntegrations/Log' @@ -14,7 +14,10 @@ function Integrations() {
      - } /> + + } /> + } /> + } /> diff --git a/frontend/src/components/Triggers/ActionHook.jsx b/frontend/src/components/Triggers/ActionHook.jsx index 4baec707b..e6568e2e3 100644 --- a/frontend/src/components/Triggers/ActionHook.jsx +++ b/frontend/src/components/Triggers/ActionHook.jsx @@ -217,9 +217,9 @@ const ActionHook = () => {
    • ${__('Click Next and Go', 'bit-integrations')}

    ${__('Important', 'bit-integrations')}: ${__( - 'Choose a consistent and unique identifier for each form entry, like a Form ID or PostID. If unavailable, create and hide a custom field to serve as the unique key.', - 'bit-integrations' - )}

    + 'Choose a consistent and unique identifier for each form entry, like a Form ID or PostID. If unavailable, create and hide a custom field to serve as the unique key.', + 'bit-integrations' + )}

    ${__( 'Bit Integrations Trigger Hooks', @@ -295,8 +295,8 @@ const ActionHook = () => { {isLoading ? __('Stop', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } {selectedFields.length > 0 && ( diff --git a/frontend/src/components/Triggers/CustomFormSubmission.jsx b/frontend/src/components/Triggers/CustomFormSubmission.jsx index bfdeee28f..6c9f35b95 100644 --- a/frontend/src/components/Triggers/CustomFormSubmission.jsx +++ b/frontend/src/components/Triggers/CustomFormSubmission.jsx @@ -244,8 +244,8 @@ const CustomFormSubmission = () => { {isLoading ? __('Waiting for form submission...', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } {newFlow.triggerDetail?.data?.length > 0 && !skipPrimaryKey && ( @@ -342,13 +342,13 @@ const info = newFlow => `

    ${sprintf( )}

    • ${__('Important', 'bit-integrations')}: ${__( - 'The Fetch button will keep spinning until you submit the form/task.', - 'bit-integrations' -)}

    + 'The Fetch button will keep spinning until you submit the form/task.', + 'bit-integrations' + )}

    ${__('Important', 'bit-integrations')}: ${__( - 'Choose a consistent unique identifier like Form ID (default) or Post ID for each form entry, or create a hidden custom field if unavailable.', - 'bit-integrations' -)}

    + 'Choose a consistent unique identifier like Form ID (default) or Post ID for each form entry, or create a hidden custom field if unavailable.', + 'bit-integrations' + )}

    ${ newFlow?.triggerDetail?.note ? `

    Note

    ${newFlow?.triggerDetail?.note}` diff --git a/frontend/src/components/Triggers/CustomTrigger.jsx b/frontend/src/components/Triggers/CustomTrigger.jsx index 582eda799..5f7e1a052 100644 --- a/frontend/src/components/Triggers/CustomTrigger.jsx +++ b/frontend/src/components/Triggers/CustomTrigger.jsx @@ -240,8 +240,8 @@ const CustomTrigger = () => { {isLoading ? __('Stop', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } diff --git a/frontend/src/components/Triggers/TriggerHelpers/CoblocksHelper.jsx b/frontend/src/components/Triggers/TriggerHelpers/CoblocksHelper.jsx index 137f723b9..a59cfba7e 100644 --- a/frontend/src/components/Triggers/TriggerHelpers/CoblocksHelper.jsx +++ b/frontend/src/components/Triggers/TriggerHelpers/CoblocksHelper.jsx @@ -190,8 +190,8 @@ const CoblocksHelper = () => { {isLoading ? __('Stop', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } {selectedFields.length > 0 && ( diff --git a/frontend/src/components/Triggers/TriggerHelpers/EssentialBlocksHelper.jsx b/frontend/src/components/Triggers/TriggerHelpers/EssentialBlocksHelper.jsx index 5a9e80d35..8a8b0199c 100644 --- a/frontend/src/components/Triggers/TriggerHelpers/EssentialBlocksHelper.jsx +++ b/frontend/src/components/Triggers/TriggerHelpers/EssentialBlocksHelper.jsx @@ -186,8 +186,8 @@ const EssentialBlocksHelper = () => { {isLoading ? __('Stop', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } {selectedFields.length > 0 && ( diff --git a/frontend/src/components/Triggers/TriggerHelpers/SpectraHelper.jsx b/frontend/src/components/Triggers/TriggerHelpers/SpectraHelper.jsx index e49303dc5..71a1144db 100644 --- a/frontend/src/components/Triggers/TriggerHelpers/SpectraHelper.jsx +++ b/frontend/src/components/Triggers/TriggerHelpers/SpectraHelper.jsx @@ -191,8 +191,8 @@ const SpectraHelper = () => { {isLoading ? __('Stop', 'bit-integrations') : newFlow.triggerDetail?.data - ? __('Fetched ✔', 'bit-integrations') - : __('Fetch', 'bit-integrations')} + ? __('Fetched ✔', 'bit-integrations') + : __('Fetch', 'bit-integrations')} {isLoading && } {selectedFields.length > 0 && ( diff --git a/frontend/src/components/Utilities/MenuBtn.jsx b/frontend/src/components/Utilities/MenuBtn.jsx index 3472d3a5c..588169579 100644 --- a/frontend/src/components/Utilities/MenuBtn.jsx +++ b/frontend/src/components/Utilities/MenuBtn.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react' -import { Link } from 'react-router-dom' +import { Link } from 'react-router' import CopyIcn from '../../Icons/CopyIcn' import EditIcn from '../../Icons/EditIcn' import InfoIcn from '../../Icons/InfoIcn' diff --git a/frontend/src/config/devHotModule.js b/frontend/src/config/devHotModule.js index e34a31684..5074c3ef6 100644 --- a/frontend/src/config/devHotModule.js +++ b/frontend/src/config/devHotModule.js @@ -1,3 +1,4 @@ +/* eslint-disable import/no-unresolved */ import RefreshRuntime from '/@react-refresh' RefreshRuntime.injectIntoGlobalHook(window) diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index 823246d28..0e1e1aba8 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-undef */ import { Suspense } from 'react' import ReactDOM from 'react-dom/client' -import { HashRouter } from 'react-router-dom' +import { HashRouter } from 'react-router' import { RecoilRoot } from 'recoil' import RecoilNexus from 'recoil-nexus' import App from './App' diff --git a/frontend/src/pages/AllIntegrations.jsx b/frontend/src/pages/AllIntegrations.jsx index b831aecc6..53cdea63f 100644 --- a/frontend/src/pages/AllIntegrations.jsx +++ b/frontend/src/pages/AllIntegrations.jsx @@ -3,7 +3,7 @@ /* eslint-disable max-len */ import { lazy, memo, useCallback, useEffect, useState } from 'react' import toast from 'react-hot-toast' -import { Link } from 'react-router-dom' +import { Link } from 'react-router' import Loader from '../components/Loaders/Loader' import ConfirmModal from '../components/Utilities/ConfirmModal' import MenuBtn from '../components/Utilities/MenuBtn' diff --git a/frontend/src/pages/Error404.jsx b/frontend/src/pages/Error404.jsx index 522f30fda..d16e8490d 100644 --- a/frontend/src/pages/Error404.jsx +++ b/frontend/src/pages/Error404.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { Link, useNavigate } from 'react-router-dom' +import { Link, useNavigate } from 'react-router' import { __ } from '../Utils/i18nwrap' import space from '../resource/img/space.svg' diff --git a/frontend/src/pages/Welcome.jsx b/frontend/src/pages/Welcome.jsx index 4cc9f46c5..71bd981e9 100644 --- a/frontend/src/pages/Welcome.jsx +++ b/frontend/src/pages/Welcome.jsx @@ -1,6 +1,6 @@ /* eslint-disable no-unused-vars */ // eslint-disable-next-line import/no-extraneous-dependencies -import { Link } from 'react-router-dom' +import { Link } from 'react-router' import { __ } from '../Utils/i18nwrap' import greeting from '../resource/img/home.svg' diff --git a/frontend/src/resource/css/cashback-modal.css b/frontend/src/resource/css/cashback-modal.css index 4015a583f..d836ca245 100644 --- a/frontend/src/resource/css/cashback-modal.css +++ b/frontend/src/resource/css/cashback-modal.css @@ -104,7 +104,8 @@ display: flex; align-items: center; --active: 0.15; - box-shadow: 0 0 calc(var(--active) * 8em) calc(var(--active) * 1em) hsl(260 97% 61% / 0.75), + box-shadow: + 0 0 calc(var(--active) * 8em) calc(var(--active) * 1em) hsl(260 97% 61% / 0.75), 0 0.05em 0 0 hsl(260 calc(var(--active) * 97%) calc((var(--active) * 50%) + 30%)) inset, 0 -0.05em 0 0 hsl(260 calc(var(--active) * 97%) calc(var(--active) * 60%)) inset !important; } @@ -119,7 +120,7 @@ justify-content: center; align-items: center; font-family: 'Outfit', sans-serif; - background-image: url(../img/bit-social-promo.png); + background-image: url(../img/bit-social-promo.webp); background-repeat: no-repeat; background-position: left; color: #fff; diff --git a/frontend/src/resource/css/newRelease.css b/frontend/src/resource/css/newRelease.css index 3e6370c11..0e0b295b4 100644 --- a/frontend/src/resource/css/newRelease.css +++ b/frontend/src/resource/css/newRelease.css @@ -1,7 +1,8 @@ .button { --active: 0.15; position: relative; - box-shadow: 0 0 calc(var(--active) * 6em) calc(var(--active) * 3em) hsl(260 97% 61% / 0.75), + box-shadow: + 0 0 calc(var(--active) * 6em) calc(var(--active) * 3em) hsl(260 97% 61% / 0.75), 0 0.05em 0 0 hsl(260 calc(var(--active) * 97%) calc((var(--active) * 50%) + 30%)) inset, 0 -0.05em 0 0 hsl(260 calc(var(--active) * 97%) calc(var(--active) * 60%)) inset !important; } diff --git a/frontend/src/resource/icons/style.css b/frontend/src/resource/icons/style.css index dacd85c7e..a3c233edf 100644 --- a/frontend/src/resource/icons/style.css +++ b/frontend/src/resource/icons/style.css @@ -1,8 +1,10 @@ @font-face { font-family: 'btcd-icn'; src: url('fonts/btcd-icn.eot?zeuff'); - src: url('fonts/btcd-icn.eot?zeuff#iefix') format('embedded-opentype'), - url('fonts/btcd-icn.ttf?zeuff') format('truetype'), url('fonts/btcd-icn.woff?zeuff') format('woff'), + src: + url('fonts/btcd-icn.eot?zeuff#iefix') format('embedded-opentype'), + url('fonts/btcd-icn.ttf?zeuff') format('truetype'), + url('fonts/btcd-icn.woff?zeuff') format('woff'), url('fonts/btcd-icn.svg?zeuff#btcd-icn') format('svg'); font-weight: normal; font-style: normal; diff --git a/frontend/src/resource/js/file-upload.js b/frontend/src/resource/js/file-upload.js index 5910225f2..6e604a711 100644 --- a/frontend/src/resource/js/file-upload.js +++ b/frontend/src/resource/js/file-upload.js @@ -27,9 +27,8 @@ export function delItem(el) { fInp.files = createFileList(...fileList.files) if (fInp.files.length > 0) { - el.parentNode.parentNode.parentNode.querySelector( - '.btcd-f-title' - ).innerHTML = `${fInp.files.length} File Selected` + el.parentNode.parentNode.parentNode.querySelector('.btcd-f-title').innerHTML = + `${fInp.files.length} File Selected` } else { el.parentNode.parentNode.parentNode.querySelector('.btcd-f-title').innerHTML = 'No File Chosen' } @@ -143,9 +142,8 @@ export function handleFile(e) { // set File list view if (e.target.files.length > 0) { - e.target.parentNode.querySelector( - '.btcd-f-title' - ).innerHTML = `${e.target.files.length} File Selected` + e.target.parentNode.querySelector('.btcd-f-title').innerHTML = + `${e.target.files.length} File Selected` e.target.parentNode.parentNode.querySelector('.btcd-files').innerHTML = '' for (let i = 0; i < e.target.files.length; i += 1) { let img = null diff --git a/frontend/src/resource/js/flowy.min.js b/frontend/src/resource/js/flowy.min.js index 86c816f0c..d10f92f4b 100644 --- a/frontend/src/resource/js/flowy.min.js +++ b/frontend/src/resource/js/flowy.min.js @@ -1,5 +1,5 @@ var flowy = function (e, t, l, i, n, o, r) { - t || (t = function () {}), + ;(t || (t = function () {}), l || (l = function () {}), i || (i = function () { @@ -22,7 +22,7 @@ var flowy = function (e, t, l, i, n, o, r) { t = t.parentElement || t.parentNode } while (t !== null && t.nodeType === 1) return null - }) + })) let d = !1 function c(e, t, l) { return i(e, t, l) @@ -30,7 +30,7 @@ var flowy = function (e, t, l, i, n, o, r) { function a(e, t) { return n(e, t) } - ;(flowy.load = function () { + ;((flowy.load = function () { if (!d) { d = !0 var i = [] @@ -55,7 +55,7 @@ var flowy = function (e, t, l, i, n, o, r) { var S = !1 let b = 0 const L = document.createElement('DIV') - L.classList.add('indicator'), + ;(L.classList.add('indicator'), L.classList.add('invisible'), s.appendChild(L), (flowy.import = function (e) { @@ -78,21 +78,21 @@ var flowy = function (e, t, l, i, n, o, r) { for (var t = 0; t < i.length; t++) { e.blocks.push({ id: i[t].id, parent: i[t].parent, data: [], attr: [] }) const l = document.querySelector(`.blockid[value='${i[t].id}']`).parentNode - l.querySelectorAll('input').forEach(l => { + ;(l.querySelectorAll('input').forEach(l => { const i = l.getAttribute('name') const n = l.value e.blocks[t].data.push({ name: i, value: n }) }), Array.prototype.slice.call(l.attributes).forEach(l => { const i = {} - ;(i[l.name] = l.value), e.blocks[t].attr.push(i) - }) + ;((i[l.name] = l.value), e.blocks[t].attr.push(i)) + })) } return e } }), (flowy.deleteBlocks = function () { - ;(i = []), (s.innerHTML = "") + ;((i = []), (s.innerHTML = "")) }), (flowy.beginDrag = function (e) { if ( @@ -106,7 +106,7 @@ var flowy = function (e, t, l, i, n, o, r) { ) { h = e.target.closest('.create-flowy') const l = e.target.closest('.create-flowy').cloneNode(!0) - e.target.closest('.create-flowy').classList.add('dragnow'), + ;(e.target.closest('.create-flowy').classList.add('dragnow'), l.classList.add('block'), l.classList.remove('create-flowy'), i.length === 0 @@ -137,7 +137,7 @@ var flowy = function (e, t, l, i, n, o, r) { (w = y - e.target.closest('.create-flowy').getBoundingClientRect().left), (f = C - e.target.closest('.create-flowy').getBoundingClientRect().top), (g.style.left = `${y - w}px`), - (g.style.top = `${C - f}px`) + (g.style.top = `${C - f}px`)) } let n }), @@ -165,10 +165,10 @@ var flowy = function (e, t, l, i, n, o, r) { else if (v) for (var t = i.map(e => e.id), o = 0; o < i.length; o++) { if (k(t[o])) { - ;(v = !1), + ;((v = !1), c(g, !1, document.querySelector(`.blockid[value='${t[o]}']`).parentNode) ? T(g, o, t) - : ((v = !1), q()) + : ((v = !1), q())) break } o == i.length - 1 && ((v = !1), q()) @@ -176,15 +176,15 @@ var flowy = function (e, t, l, i, n, o, r) { else if (R) for (t = i.map(e => e.id), o = 0; o < i.length; o++) { if (k(t[o])) { - ;(v = !1), g.classList.remove('dragging'), T(g, o, t) + ;((v = !1), g.classList.remove('dragging'), T(g, o, t)) break } if (o == i.length - 1) { if (a(g, i.filter(e => e.id == t[o])[0])) { - ;(v = !1), g.classList.remove('dragging'), T(g, t.indexOf(b), t) + ;((v = !1), g.classList.remove('dragging'), T(g, t.indexOf(b), t)) break } - ;(R = !1), (n = []), (v = !1), q() + ;((R = !1), (n = []), (v = !1), q()) break } } @@ -196,19 +196,19 @@ var flowy = function (e, t, l, i, n, o, r) { : ((y = e.clientX), (C = e.clientY)), S) ) { - ;(R = !0), g.classList.add('dragging') + ;((R = !0), g.classList.add('dragging')) const t = parseInt(g.querySelector('.blockid').value) - ;(b = i.filter(e => e.id == t)[0].parent), + ;((b = i.filter(e => e.id == t)[0].parent), n.push(i.filter(e => e.id == t)[0]), (i = i.filter(e => e.id != t)), - t != 0 && document.querySelector(`.arrowid[value='${t}']`).parentNode.remove() + t != 0 && document.querySelector(`.arrowid[value='${t}']`).parentNode.remove()) for (var l = i.filter(e => e.parent == t), o = !1, r = [], d = []; !o; ) { for (var c = 0; c < l.length; c++) if (l[c] != t) { n.push(i.filter(e => e.id == l[c].id)[0]) const e = document.querySelector(`.blockid[value='${l[c].id}']`).parentNode const t = document.querySelector(`.arrowid[value='${l[c].id}']`).parentNode - ;(e.style.left = `${ + ;((e.style.left = `${ e.getBoundingClientRect().left + window.scrollX - (g.getBoundingClientRect().left + window.scrollX) @@ -231,7 +231,7 @@ var flowy = function (e, t, l, i, n, o, r) { g.appendChild(e), g.appendChild(t), r.push(l[c].id), - d.push(l[c].id) + d.push(l[c].id)) } r.length == 0 ? (o = !0) : ((l = i.filter(e => r.includes(e.parent))), (r = [])) } @@ -243,7 +243,7 @@ var flowy = function (e, t, l, i, n, o, r) { a = d[c] i = i.filter(e => e.id != a) } - i.length > 1 && D(), (S = !1) + ;(i.length > 1 && D(), (S = !1)) } if ( (v @@ -267,14 +267,14 @@ var flowy = function (e, t, l, i, n, o, r) { y < s.getBoundingClientRect().width + s.getBoundingClientRect().left + 10 ? (s.scrollLeft += 10) : y < s.getBoundingClientRect().left + 10 && y > s.getBoundingClientRect().left - 10 - ? (s.scrollLeft -= 10) - : C > s.getBoundingClientRect().height + s.getBoundingClientRect().top - 10 && - C < s.getBoundingClientRect().height + s.getBoundingClientRect().top + 10 - ? (s.scrollTop += 10) - : C < s.getBoundingClientRect().top + 10 && - C > s.getBoundingClientRect().top - 10 && - (s.scrollLeft -= 10) - g.getBoundingClientRect().left, + ? (s.scrollLeft -= 10) + : C > s.getBoundingClientRect().height + s.getBoundingClientRect().top - 10 && + C < s.getBoundingClientRect().height + s.getBoundingClientRect().top + 10 + ? (s.scrollTop += 10) + : C < s.getBoundingClientRect().top + 10 && + C > s.getBoundingClientRect().top - 10 && + (s.scrollLeft -= 10) + ;(g.getBoundingClientRect().left, window.scrollX, parseInt(window.getComputedStyle(g).width), s.scrollLeft, @@ -282,11 +282,11 @@ var flowy = function (e, t, l, i, n, o, r) { g.getBoundingClientRect().top, window.scrollY, s.scrollTop, - s.getBoundingClientRect().top + s.getBoundingClientRect().top) const h = i.map(e => e.id) for (c = 0; c < i.length; c++) { if (k(h[c])) { - document + ;(document .querySelector(`.blockid[value='${h[c]}']`) .parentNode.appendChild(document.querySelector('.indicator')), (document.querySelector('.indicator').style.left = `${ @@ -295,7 +295,7 @@ var flowy = function (e, t, l, i, n, o, r) { (document.querySelector('.indicator').style.top = `${ document.querySelector(`.blockid[value='${h[c]}']`).parentNode.offsetHeight }px`), - document.querySelector('.indicator').classList.remove('invisible') + document.querySelector('.indicator').classList.remove('invisible')) break } c == i.length - 1 && @@ -312,7 +312,7 @@ var flowy = function (e, t, l, i, n, o, r) { document.addEventListener('mousemove', flowy.moveBlock, !1), document.addEventListener('touchmove', flowy.moveBlock, !1), document.addEventListener('mouseup', flowy.endDrag, !1), - document.addEventListener('touchend', flowy.endDrag, !1) + document.addEventListener('touchend', flowy.endDrag, !1)) } function k(e) { const t = @@ -331,11 +331,11 @@ var flowy = function (e, t, l, i, n, o, r) { ) } function q() { - s.appendChild(document.querySelector('.indicator')), g.parentNode.removeChild(g) + ;(s.appendChild(document.querySelector('.indicator')), g.parentNode.removeChild(g)) } function X(e) { if (e == 'drop') - c(g, !0, void 0), + (c(g, !0, void 0), (v = !1), (g.style.top = `${ g.getBoundingClientRect().top + window.scrollY - (p + window.scrollY) + s.scrollTop @@ -362,14 +362,14 @@ var flowy = function (e, t, l, i, n, o, r) { s.getBoundingClientRect().top, width: parseInt(window.getComputedStyle(g).width), height: parseInt(window.getComputedStyle(g).height) - }) + })) else if (e == 'rearrange') { - g.classList.remove('dragging'), (R = !1) + ;(g.classList.remove('dragging'), (R = !1)) for (let t = 0; t < n.length; t++) if (n[t].id != parseInt(g.querySelector('.blockid').value)) { const e = document.querySelector(`.blockid[value='${n[t].id}']`).parentNode const l = document.querySelector(`.arrowid[value='${n[t].id}']`).parentNode - ;(e.style.left = `${ + ;((e.style.left = `${ e.getBoundingClientRect().left + window.scrollX - window.scrollX + s.scrollLeft - 1 - u }px`), (e.style.top = `${ @@ -396,9 +396,9 @@ var flowy = function (e, t, l, i, n, o, r) { parseInt(e.offsetHeight) / 2 + s.scrollTop - s.getBoundingClientRect().top - - 1) + 1)) } - ;(n.filter(e => e.id == 0)[0].x = + ;((n.filter(e => e.id == 0)[0].x = g.getBoundingClientRect().left + window.scrollX + parseInt(window.getComputedStyle(g).width) / 2 + @@ -411,11 +411,11 @@ var flowy = function (e, t, l, i, n, o, r) { s.scrollTop - s.getBoundingClientRect().top), (i = i.concat(n)), - (n = []) + (n = [])) } } function I(e, t, l, n) { - t < 0 + ;(t < 0 ? ((s.innerHTML += `
    `)) + (document.querySelector(`.arrowid[value="${n.id}"]`).parentNode.innerHTML = + `