Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cloud connect #7260

Merged
merged 1 commit into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ SITE_NAME=LBRY
SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland.
SITE_HELP_EMAIL=help@lbry.com
LOGO_TITLE=LBRY
CLOUD_CONNECT_SITE_NAME=Odysee
## Social media
TWITTER_ACCOUNT=LBRYcom
BRANDED_SITE=odysee
Expand Down
1 change: 1 addition & 0 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const config = {
LBRY_WEB_STREAMING_API: process.env.LBRY_WEB_STREAMING_API, //cdn.lbryplayer.xyz',
LBRY_WEB_BUFFER_API: process.env.LBRY_WEB_BUFFER_API,
SEARCH_SERVER_API: process.env.SEARCH_SERVER_API,
CLOUD_CONNECT_SITE_NAME: process.env.CLOUD_CONNECT_SITE_NAME,
COMMENT_SERVER_API: process.env.COMMENT_SERVER_API,
COMMENT_SERVER_NAME: process.env.COMMENT_SERVER_NAME,
SOCKETY_SERVER_API: process.env.SOCKETY_SERVER_API,
Expand Down
4 changes: 4 additions & 0 deletions static/app-strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2198,5 +2198,9 @@
"Default share url (%name%)": "Default share url (%name%)",
"Custom share url": "Custom share url",
"Share url": "Share url",
"Odysee Connect": "Odysee Connect",
"Log in to %CLOUD_CONNECT_SITE_NAME%": "Log in to %CLOUD_CONNECT_SITE_NAME%",
"Cloud Connect": "Cloud Connect",
"Connect your wallet to Odysee": "Connect your wallet to Odysee",
"--end--": "--end--"
}
6 changes: 1 addition & 5 deletions ui/component/header/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,9 @@ const Header = (props: Props) => {
</MenuItem>
) : !IS_WEB ? (
<>
<MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.AUTH}`)}>
<Icon aria-hidden icon={ICONS.SIGN_UP} />
{__('Sign Up')}
</MenuItem>
<MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.AUTH_SIGNIN}`)}>
<Icon aria-hidden icon={ICONS.SIGN_IN} />
{__('Sign In')}
{__('Cloud Connect')}
</MenuItem>
</>
) : null}
Expand Down
4 changes: 2 additions & 2 deletions ui/component/userEmailNew/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ function UserEmailNew(props: Props) {
return (
<div className={classnames('main__sign-up')}>
<Card
title={__('Join')}
title={__('Cloud Connect')}
// @if TARGET='app'
subtitle={__('An account allows you to earn rewards and backup your data.')}
subtitle={__('Connect your wallet to Odysee')}
// @endif
actions={
<div className={classnames({ 'card--disabled': DOMAIN === 'lbry.tv' && IS_WEB })}>
Expand Down
5 changes: 3 additions & 2 deletions ui/component/userEmailReturning/view.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import { CLOUD_CONNECT_SITE_NAME } from 'config';
import * as PAGES from 'constants/pages';
import React, { useState } from 'react';
import { FormField, Form } from 'component/common/form';
Expand Down Expand Up @@ -75,7 +75,8 @@ function UserEmailReturning(props: Props) {
<UserEmailVerify />
) : (
<Card
title={__('Log in to %SITE_NAME%', { SITE_NAME })}
title={__('Cloud Connect')}
subtitle={__('Log in to %CLOUD_CONNECT_SITE_NAME%', { CLOUD_CONNECT_SITE_NAME })}
actions={
<div>
<Form onSubmit={handleSubmit} className="section">
Expand Down
6 changes: 3 additions & 3 deletions ui/modal/modalFirstSubscription/view.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import { SITE_NAME } from 'config';
import { CLOUD_CONNECT_SITE_NAME } from 'config';
import React from 'react';
import { Modal } from 'modal/modal';
import Button from 'component/button';
Expand All @@ -11,7 +11,7 @@ type Props = {
accessToken: string,
user: any,
doAuth: () => void,
history: { push: string => void },
history: { push: (string) => void },
location: UrlLocation,
};

Expand All @@ -35,7 +35,7 @@ const ModalFirstSubscription = (props: Props) => {
{__('Awesome! You just followed your first channel.')}{' '}
{user && user.primary_email
? __('You will receive notifications related to new content.')
: __('Log in with %SITE_NAME% to receive notifications about new content.', { SITE_NAME })}
: __('Connect to %SITE_NAME% to receive notifications about new content.', { CLOUD_CONNECT_SITE_NAME })}
</>
}
actions={
Expand Down