self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Desktop, Mobile: Hide links to login after process is successful (#10571)

Browse Source
This commit is contained in:
pedr 2024-06-12 11:09:52 -03:00 committed by GitHub
parent 4495fc9a03
commit 53d7bc86ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/app-desktop/gui/JoplinCloudLoginScreen.tsx
View File

@ -1,4 +1,4 @@
import { useEffect, useMemo, useReducer, useState } from 'react';
import { Fragment, useEffect, useMemo, useReducer, useState } from 'react';
import ButtonBar from './ConfigScreen/ButtonBar';
import { _ } from '@joplin/lib/locale';
import { clipboard } from 'electron';
@ -77,22 +77,26 @@ const JoplinCloudScreenComponent = (props: Props) => {
return (
<div className="login-page">
<div className="page-container">
<p className="text">{_('To allow Joplin to synchronise with Joplin Cloud, please login using this URL:')}</p>
<div className="buttons-container">
<Button
onClick={onAuthorizeClicked}
title={_('Authorise')}
iconName='fa fa-external-link-alt'
level={ButtonLevel.Primary}
/>
<Button
onClick={onCopyToClipboardClicked}
title={_('Copy link to website')}
iconName='fa fa-clone'
level={ButtonLevel.Secondary}
/>
{state.active !== 'COMPLETED' ? (
<Fragment>
<p className="text">{_('To allow Joplin to synchronise with Joplin Cloud, please login using this URL:')}</p>
<div className="buttons-container">
<Button
onClick={onAuthorizeClicked}
title={_('Authorise')}
iconName='fa fa-external-link-alt'
level={ButtonLevel.Primary}
/>
<Button
onClick={onCopyToClipboardClicked}
title={_('Copy link to website')}
iconName='fa fa-clone'
level={ButtonLevel.Secondary}
/>
</div>
</div>
</Fragment>
) : null}
<p className={state.className}>{state.message()}
{state.active === 'ERROR' ? (
<span className={state.className}>{state.errorMessage}</span>

48
packages/app-mobile/components/screens/JoplinCloudLoginScreen.tsx
View File

@ -145,28 +145,32 @@ const JoplinCloudScreenComponent = (props: Props) => {
<View style={styles.root}>
<ScreenHeader title={_('Joplin Cloud Login')} />
<View style={styles.containerStyle}>
<Text style={styles.text}>
{_('To allow Joplin to synchronise with Joplin Cloud, please login using this URL:')}
</Text>
<View style={styles.buttonsContainer}>
<View style={{ marginBottom: 20 }}>
<Button
onPress={onAuthoriseClicked}
icon='open-in-new'
mode='contained'
>
{_('Authorise')}
</Button>
</View>
<Text style={styles.smallTextStyle}>Or</Text>
<Button
onPress={onCopyToClipboardClicked}
icon='content-copy'
mode='outlined'
>{_('Copy link to website')}
</Button>
</View>
{ state.active !== 'COMPLETED' ?
<React.Fragment>
<Text style={styles.text}>
{_('To allow Joplin to synchronise with Joplin Cloud, please login using this URL:')}
</Text>
<View style={styles.buttonsContainer}>
<View style={{ marginBottom: 20 }}>
<Button
onPress={onAuthoriseClicked}
icon='open-in-new'
mode='contained'
>
{_('Authorise')}
</Button>
</View>
<Text style={styles.smallTextStyle}>{_('Or')}</Text>
<Button
onPress={onCopyToClipboardClicked}
icon='content-copy'
mode='outlined'
>{_('Copy link to website')}
</Button>
</View>
</React.Fragment>
: null
}
<Text style={styles[state.className]}>{state.message()}
{state.active === 'ERROR' ? (
<Text style={styles[state.className]}>{state.errorMessage}</Text>