github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13570 from overleaf/mj-twitter-login

Browse source 
[web] Deprecate twitter login

GitOrigin-RevId: a1e81463b652239b780587976a96b65a8c6827f1
This commit is contained in:
Mathias Jakobsen 2023-06-29 15:38:54 +02:00 committed by Copybot
parent 9e8be31bdf
commit c3a2786d82
5 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/frontend/extracted-translations.json
View file

@ -553,6 +553,7 @@
"log_in_with_primary_email_address": "", "log_in_with_primary_email_address": "",
"log_viewer_error": "", "log_viewer_error": "",
"login_with_service": "", "login_with_service": "",
"login_with_service_will_stop_working_soon": "",
"logs_and_output_files": "", "logs_and_output_files": "",
"looking_multiple_licenses": "", "looking_multiple_licenses": "",
"looks_like_youre_at": "", "looks_like_youre_at": "",

6
services/web/frontend/js/features/settings/components/linking-section.tsx
View file

@ -160,11 +160,15 @@ function SSOLinkingWidgetContainer({
description = t('linked_collabratec_description') description = t('linked_collabratec_description')
break break
case 'google': case 'google':
case 'twitter':
description = `${t('login_with_service', { description = `${t('login_with_service', {
service: subscription.provider.name, service: subscription.provider.name,
})}.` })}.`
break break
case 'twitter':
description = t('login_with_service_will_stop_working_soon', {
service: subscription.provider.name,
})
break
case 'orcid': case 'orcid':
description = t('oauth_orcid_description') description = t('oauth_orcid_description')
break break

9
services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
View file

@ -7,11 +7,20 @@ import IEEELogo from '../../../../shared/svgs/ieee-logo'
import GoogleLogo from '../../../../shared/svgs/google-logo' import GoogleLogo from '../../../../shared/svgs/google-logo'
import OrcidLogo from '../../../../shared/svgs/orcid-logo' import OrcidLogo from '../../../../shared/svgs/orcid-logo'
import LinkingStatus from './status' import LinkingStatus from './status'
import Icon from '../../../../shared/components/icon'
const providerLogos: { readonly [p: string]: JSX.Element } = { const providerLogos: { readonly [p: string]: JSX.Element } = {
collabratec: <IEEELogo />, collabratec: <IEEELogo />,
google: <GoogleLogo />, google: <GoogleLogo />,
orcid: <OrcidLogo />, orcid: <OrcidLogo />,
twitter: (
<Icon
type="exclamation-triangle"
fw
className="text-warning"
style={{ fontSize: '32px', width: '40px' }}
/>
),
} }
type SSOLinkingWidgetProps = { type SSOLinkingWidgetProps = {

4
services/web/frontend/stylesheets/components/buttons.less
View file

@ -335,3 +335,7 @@ input[type='button'] {
padding-left: 20px; padding-left: 20px;
padding-right: 0; padding-right: 0;
} }
.login-expand-more-btn {
display: list-item;
}

1
services/web/locales/en.json
View file

@ -922,6 +922,7 @@
"login_to_overleaf": "Log in to Overleaf", "login_to_overleaf": "Log in to Overleaf",
"login_with_email": "Log in with your email", "login_with_email": "Log in with your email",
"login_with_service": "Log in with __service__", "login_with_service": "Log in with __service__",
"login_with_service_will_stop_working_soon": "Login with __service__ will stop working soon. If you log in with __service__, please take a moment to set up another SSO provider or a password.",
"logs_and_output_files": "Logs and output files", "logs_and_output_files": "Logs and output files",
"longer_compile_timeout": "Longer <0>compile timeout</0>", "longer_compile_timeout": "Longer <0>compile timeout</0>",
"looking_multiple_licenses": "Looking for multiple licenses?", "looking_multiple_licenses": "Looking for multiple licenses?",