Skip to content

Commit 2bad2e1

Browse files
RishadAlamRishadAlam
authored
Merge pull request #119 from Bit-Apps-Pro/rishad-dev-tmp
Version updated to v2.6.10
2 parents 7ebd3fc + cbf7e9f commit 2bad2e1

File tree

11 files changed

+294
-163
lines changed

11 files changed

+294
-163
lines changed

‎bitwpfi.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Plugin Name: Bit Integrations
55
* Plugin URI: https://bitapps.pro/bit-integrations
66
* Description: Bit Integrations is a platform that integrates with over 300+ different platforms to help with various tasks on your WordPress site, like WooCommerce, Form builder, Page builder, LMS, Sales funnels, Bookings, CRM, Webhooks, Email marketing, Social media and Spreadsheets, etc
7-
* Version: 2.6.9
7+
* Version: 2.6.10
88
* Author: Automation & Integration Plugin - Bit Apps
99
* Author URI: https://bitapps.pro
1010
* Text Domain: bit-integrations
@@ -24,7 +24,7 @@
2424
$btcbi_db_version = '1.1';
2525

2626
// Define most essential constants.
27-
define('BTCBI_VERSION', '2.6.9');
27+
define('BTCBI_VERSION', '2.6.10');
2828
define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
2929

3030
require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

‎frontend-dev/src/components/AllIntegrations/GoogleSheet/GoogleSheetAuthorization.jsx‎

Lines changed: 106 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import AuthorizationAccountList from '../../OneClickRadioComponents/Authorizatio
1313
import bitsFetch from '../../../Utils/bitsFetch'
1414
import Loader from '../../Loaders/Loader'
1515

16-
1716
export default function GoogleSheetAuthorization({
1817
formID,
1918
sheetConf,
@@ -24,14 +23,15 @@ export default function GoogleSheetAuthorization({
2423
setIsLoading,
2524
setSnackbar,
2625
redirectLocation,
27-
isEdit
26+
isEdit,
27+
isInfo
2828
}) {
2929
const [isAuthorized, setIsAuthorized] = useState(false)
3030
const [error, setError] = useState({ clientId: '', clientSecret: '' })
3131
const btcbi = useRecoilValue($btcbi)
3232
const { googleSheet } = tutorialLinks
3333
const [authData, setAuthData] = useState([])
34-
const [authInfo, setAuthInfo] = useRecoilState(authInfoAtom);
34+
const [authInfo, setAuthInfo] = useRecoilState(authInfoAtom)
3535
const [selectedAuthType, setSelectedAuthType] = useState('Custom Authorization')
3636
// const [selectedUserId, setSelectedUserId] = useState(null)
3737

@@ -58,8 +58,8 @@ export default function GoogleSheetAuthorization({
5858
// setIsLoading(false);
5959
// };
6060

61-
const processAuth = (option) => {
62-
handleAuthorize(sheetConf, option, setError, setIsLoading);
61+
const processAuth = option => {
62+
handleAuthorize(sheetConf, option, setError, setIsLoading)
6363
}
6464

6565
const getAuthData = () => {
@@ -68,9 +68,9 @@ export default function GoogleSheetAuthorization({
6868
actionName: sheetConf.type
6969
}
7070

71-
bitsFetch(null, 'auth/get', queryParams, 'GET').then((res) => {
71+
bitsFetch(null, 'auth/get', queryParams, 'GET').then(res => {
7272
if (res.success && res.data.data.length > 0) {
73-
setAuthData(res.data.data);
73+
setAuthData(res.data.data)
7474
}
7575
setIsLoading(false)
7676
})
@@ -82,7 +82,6 @@ export default function GoogleSheetAuthorization({
8282
// }
8383
// }, [])
8484

85-
8685
// useEffect(() => {
8786

8887
// if (step === 1 && isEdit) {
@@ -97,21 +96,29 @@ export default function GoogleSheetAuthorization({
9796
// }
9897
// }, [authData])
9998

100-
101-
const handleVerificationCode = async (authInfo) => {
102-
await tokenHelper(authInfo, sheetConf, setSheetConf, setIsAuthorized, selectedAuthType, authData, setAuthData, setIsLoading, setSnackbar);
99+
const handleVerificationCode = async authInfo => {
100+
await tokenHelper(
101+
authInfo,
102+
sheetConf,
103+
setSheetConf,
104+
setIsAuthorized,
105+
selectedAuthType,
106+
authData,
107+
setAuthData,
108+
setIsLoading,
109+
setSnackbar
110+
)
103111
setAuthInfo(undefined)
104112
// getAuthData()
105113
}
106114

107115
useEffect(() => {
108-
if (!authInfo || Object.keys(authInfo).length === 0) return;
109-
110-
handleVerificationCode(authInfo);
111-
}, [authInfo]);
116+
if (!authInfo || Object.keys(authInfo).length === 0) return
112117

118+
handleVerificationCode(authInfo)
119+
}, [authInfo])
113120

114-
const handleInput = (e) => {
121+
const handleInput = e => {
115122
const newConf = { ...sheetConf }
116123
const rmError = { ...error }
117124
rmError[e.target.name] = ''
@@ -133,13 +140,7 @@ export default function GoogleSheetAuthorization({
133140
}, 300)
134141

135142
setstep(2)
136-
refreshSpreadsheets(
137-
formID,
138-
sheetConf,
139-
setSheetConf,
140-
setIsLoading,
141-
setSnackbar
142-
)
143+
refreshSpreadsheets(formID, sheetConf, setSheetConf, setIsLoading, setSnackbar)
143144
}
144145

145146
return (
@@ -149,10 +150,7 @@ export default function GoogleSheetAuthorization({
149150
{googleSheet?.youTubeLink && (
150151
<TutorialLink title="Google Sheets" youTubeLink={googleSheet?.youTubeLink} />
151152
)}
152-
{googleSheet?.docLink && (
153-
<TutorialLink title="Google Sheets" docLink={googleSheet?.docLink} />
154-
)}
155-
153+
{googleSheet?.docLink && <TutorialLink title="Google Sheets" docLink={googleSheet?.docLink} />}
156154

157155
{/* <div>
158156
<h2>Choose channel</h2>
@@ -164,37 +162,89 @@ export default function GoogleSheetAuthorization({
164162
/>
165163
</div> */}
166164

167-
{selectedAuthType === "Custom Authorization" && (
165+
{selectedAuthType === 'Custom Authorization' && (
168166
<div>
169-
<div className="mt-3"><b>{__('Integration Name:', 'bit-integrations')}</b></div>
170-
<input className="btcd-paper-inp w-6 mt-1" onChange={handleInput} name="name" value={sheetConf.name} type="text" placeholder={__('Integration Name...', 'bit-integrations')} />
167+
<div className="mt-3">
168+
<b>{__('Integration Name:', 'bit-integrations')}</b>
169+
</div>
170+
<input
171+
className="btcd-paper-inp w-6 mt-1"
172+
onChange={handleInput}
173+
name="name"
174+
value={sheetConf.name}
175+
type="text"
176+
placeholder={__('Integration Name...', 'bit-integrations')}
177+
disabled={isInfo}
178+
/>
171179

172-
<div className="mt-3"><b>{__('Homepage URL:', 'bit-integrations')}</b></div>
173-
<CopyText value={`${window.location.origin}`} className="field-key-cpy w-6 ml-0" setSnackbar={setSnackbar} />
180+
<div className="mt-3">
181+
<b>{__('Homepage URL:', 'bit-integrations')}</b>
182+
</div>
183+
<CopyText
184+
value={`${window.location.origin}`}
185+
className="field-key-cpy w-6 ml-0"
186+
setSnackbar={setSnackbar}
187+
/>
174188

175-
<div className="mt-3"><b>{__('Authorized Redirect URIs:', 'bit-integrations')}</b></div>
176-
<CopyText value={redirectLocation || `${btcbi.api.base}/redirect`} className="field-key-cpy w-6 ml-0" setSnackbar={setSnackbar} />
189+
<div className="mt-3">
190+
<b>{__('Authorized Redirect URIs:', 'bit-integrations')}</b>
191+
</div>
192+
<CopyText
193+
value={redirectLocation || `${btcbi.api.base}/redirect`}
194+
className="field-key-cpy w-6 ml-0"
195+
setSnackbar={setSnackbar}
196+
/>
177197

178198
<small className="d-blk mt-5">
179-
{__('To get Client ID and SECRET , Please Visit', 'bit-integrations')}
180-
{' '}
181-
<a className="btcd-link" href="https://console.developers.google.com/apis/credentials" target="_blank" rel="noreferrer">{__('Google API Console', 'bit-integrations')}</a>
199+
{__('To get Client ID and SECRET , Please Visit', 'bit-integrations')}{' '}
200+
<a
201+
className="btcd-link"
202+
href="https://console.developers.google.com/apis/credentials"
203+
target="_blank"
204+
rel="noreferrer">
205+
{__('Google API Console', 'bit-integrations')}
206+
</a>
182207
</small>
183208

184-
<div className="mt-3"><b>{__('Client id:', 'bit-integrations')}</b></div>
185-
<input className="btcd-paper-inp w-6 mt-1" onChange={handleInput} name="clientId" value={sheetConf.clientId} type="text" placeholder={__('Client id...', 'bit-integrations')} />
209+
<div className="mt-3">
210+
<b>{__('Client id:', 'bit-integrations')}</b>
211+
</div>
212+
<input
213+
className="btcd-paper-inp w-6 mt-1"
214+
onChange={handleInput}
215+
name="clientId"
216+
value={sheetConf.clientId}
217+
type="text"
218+
placeholder={__('Client id...', 'bit-integrations')}
219+
disabled={isInfo}
220+
/>
186221
<div style={{ color: 'red', fontSize: '15px' }}>{error.clientId}</div>
187222

188-
<div className="mt-3"><b>{__('Client secret:', 'bit-integrations')}</b></div>
189-
<input className="btcd-paper-inp w-6 mt-1" onChange={handleInput} name="clientSecret" value={sheetConf.clientSecret} type="text" placeholder={__('Client secret...', 'bit-integrations')} />
223+
<div className="mt-3">
224+
<b>{__('Client secret:', 'bit-integrations')}</b>
225+
</div>
226+
<input
227+
className="btcd-paper-inp w-6 mt-1"
228+
onChange={handleInput}
229+
name="clientSecret"
230+
value={sheetConf.clientSecret}
231+
type="text"
232+
placeholder={__('Client secret...', 'bit-integrations')}
233+
disabled={isInfo}
234+
/>
190235
<div style={{ color: 'red', fontSize: '15px' }}>{error.clientSecret}</div>
191236

192-
<button onClick={() => processAuth(selectedAuthType)} className="btn btcd-btn-lg purple sh-sm flx" type="button" disabled={isLoading}>
193-
{isAuthorized ? __('Authorized ✔', 'bit-integrations') : __('Authorize', 'bit-integrations')}
237+
<button
238+
onClick={() => processAuth(selectedAuthType)}
239+
className="btn btcd-btn-lg purple sh-sm flx"
240+
type="button"
241+
disabled={isLoading || isInfo}>
242+
{isAuthorized || isInfo
243+
? __('Authorized ✔', 'bit-integrations')
244+
: __('Authorize', 'bit-integrations')}
194245
{isLoading && <LoaderSm size={20} clr="#022217" className="ml-2" />}
195246
</button>
196247
<br />
197-
198248
</div>
199249
)}
200250
{isLoading && selectedAuthType !== 'Custom Authorization' && (
@@ -221,14 +271,22 @@ export default function GoogleSheetAuthorization({
221271
/>
222272
</>
223273
} */}
224-
{(isAuthorized && selectedAuthType === "One Click Authorization") &&
225-
(<button onClick={() => processAuth()} className="btn btcd-btn-lg purple sh-sm flx" type="button" disabled={isLoading}>
274+
{isAuthorized && selectedAuthType === 'One Click Authorization' && (
275+
<button
276+
onClick={() => processAuth()}
277+
className="btn btcd-btn-lg purple sh-sm flx"
278+
type="button"
279+
disabled={isLoading}>
226280
{isAuthorized ? __('Authorized ✔', 'bit-integrations') : __('Authorize', 'bit-integrations')}
227281
{isLoading && <LoaderSm size={20} clr="#022217" className="ml-2" />}
228282
</button>
229-
)}
283+
)}
230284
<br />
231-
<button onClick={() => nextPage(2)} className="btn f-right btcd-btn-lg purple sh-sm flx" type="button" disabled={!isAuthorized}>
285+
<button
286+
onClick={() => nextPage(2)}
287+
className="btn f-right btcd-btn-lg purple sh-sm flx"
288+
type="button"
289+
disabled={!isAuthorized}>
232290
{__('Next', 'bit-integrations')}
233291
<BackIcn className="ml-1 rev-icn" />
234292
</button>

0 commit comments

Comments
 (0)