From 0ba3d78b27558d398e2e65203d424a262ddc9ac1 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 22 Oct 2021 12:55:08 -0400 Subject: [PATCH] cloud connect --- .env.defaults | 1 + config.js | 1 + static/app-strings.json | 4 ++++ ui/component/header/view.jsx | 6 +----- ui/component/userEmailNew/view.jsx | 4 ++-- ui/component/userEmailReturning/view.jsx | 5 +++-- ui/modal/modalFirstSubscription/view.jsx | 6 +++--- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.env.defaults b/.env.defaults index 8aa09d98e..3123bfaec 100644 --- a/.env.defaults +++ b/.env.defaults @@ -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 diff --git a/config.js b/config.js index 49e215c5b..f7ab434b1 100644 --- a/config.js +++ b/config.js @@ -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, diff --git a/static/app-strings.json b/static/app-strings.json index 2ca94edf1..6e57c4e15 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -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--" } diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx index cfedb816a..8d249aedd 100644 --- a/ui/component/header/view.jsx +++ b/ui/component/header/view.jsx @@ -346,13 +346,9 @@ const Header = (props: Props) => { ) : !IS_WEB ? ( <> - history.push(`/$/${PAGES.AUTH}`)}> - - {__('Sign Up')} - history.push(`/$/${PAGES.AUTH_SIGNIN}`)}> - {__('Sign In')} + {__('Cloud Connect')} ) : null} diff --git a/ui/component/userEmailNew/view.jsx b/ui/component/userEmailNew/view.jsx index fae39b355..36ce764d5 100644 --- a/ui/component/userEmailNew/view.jsx +++ b/ui/component/userEmailNew/view.jsx @@ -94,9 +94,9 @@ function UserEmailNew(props: Props) { return (
diff --git a/ui/component/userEmailReturning/view.jsx b/ui/component/userEmailReturning/view.jsx index 8866e938a..5803db8fc 100644 --- a/ui/component/userEmailReturning/view.jsx +++ b/ui/component/userEmailReturning/view.jsx @@ -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'; @@ -75,7 +75,8 @@ function UserEmailReturning(props: Props) { ) : (
diff --git a/ui/modal/modalFirstSubscription/view.jsx b/ui/modal/modalFirstSubscription/view.jsx index 1e73123f1..33533b0fc 100644 --- a/ui/modal/modalFirstSubscription/view.jsx +++ b/ui/modal/modalFirstSubscription/view.jsx @@ -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'; @@ -11,7 +11,7 @@ type Props = { accessToken: string, user: any, doAuth: () => void, - history: { push: string => void }, + history: { push: (string) => void }, location: UrlLocation, }; @@ -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={