Merge pull request #1064 from lbryio/updateMessaging #1065
|
|
@ -16,7 +16,7 @@ import EditPage from '@pages/EditPage';
|
|||
const App = () => {
|
||||
return (
|
||||
<Switch>
|
||||
<Route exact path='/' component={HomePage} />
|
||||
<Route exact path='/' component={AboutPage} />
|
||||
<Route exact path='/about' component={AboutPage} />
|
||||
<Route exact path='/tos' component={TosPage} />
|
||||
<Route exact path='/faq' component={FaqPage} />
|
||||
|
|
|
|||
|
|
@ -1,32 +1,13 @@
|
|||
import React from 'react';
|
||||
import Row from '@components/Row';
|
||||
import {Link} from 'react-router-dom';
|
||||
|
||||
const AboutSpeechDetails = () => {
|
||||
return (
|
||||
<div>
|
||||
<Row>
|
||||
<p className={'text--large'}>
|
||||
<Link className={'link--primary'} to='/tos'>Terms of Service</Link>
|
||||
<br />
|
||||
<Link className={'link--primary'} to='/faq'>Frequently Asked Questions</Link>
|
||||
</p>
|
||||
</Row>
|
||||
<Row>
|
||||
<p className={'text--large'}>
|
||||
Spee.ch is a media-hosting site that reads from and publishes content to the <a className='link--primary' href='https://lbry.com'>LBRY</a> blockchain.
|
||||
</p>
|
||||
<p className={'text--large'}>
|
||||
Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the <a className='link--primary' href='https://lbry.com/get'>LBRY</a> network. This means that your images are stored in multiple locations without a single point of failure.
|
||||
</p>
|
||||
</Row>
|
||||
<Row>
|
||||
<h3>Contribute</h3>
|
||||
<p className={'text--large'}>
|
||||
If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a className='link--primary' href='https://github.com/lbryio/spee.ch'>github repo</a> and go to town!
|
||||
</p>
|
||||
<p className={'text--large'}>
|
||||
If you want to improve spee.ch, join our <a className='link--primary' href='https://chat.lbry.com'>discord channel</a> or solve one of our <a className='link--primary' href='https://github.com/lbryio/spee.ch/issues'>github issues</a>.
|
||||
Spee.ch's journey may be on hold, but LBRY is still on mission. We'd like to thank all of our testers and early adopters for helping us explore this use case.
|
||||
We're really excited about <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a> and can't wait to see you over there for a fully featured experience.
|
||||
</p>
|
||||
</Row>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,13 @@ const AboutSpeechOverview = () => {
|
|||
return (
|
||||
<div>
|
||||
<Row>
|
||||
<p className={'text--extra-large'}>Spee.ch is an open-source project. Please contribute to the existing site, or fork it and make your own.</p>
|
||||
<p className={'text--extra-large'}>Lbry is no longer supporting Spee.ch. However, we're excited to show you <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a>!</p>
|
||||
</Row>
|
||||
<Row>
|
||||
<div className={'text--large'}>
|
||||
<a className='link--primary' target='_blank' href='https://twitter.com/spee_ch'>TWITTER</a><br/>
|
||||
<a className='link--primary' target='_blank' href='https://github.com/lbryio/spee.ch'>GITHUB</a><br/>
|
||||
<a className='link--primary' target='_blank' href='https://twitter.com/lbry'>TWITTER</a><br/>
|
||||
<a className='link--primary' target='_blank' href='https://github.com/lbryio/'>GITHUB</a><br/>
|
||||
<a className='link--primary' target='_blank' href='https://discord.gg/YjYbwhS'>DISCORD CHANNEL</a><br/>
|
||||
<a className='link--primary' target='_blank' href='https://github.com/lbryio/spee.ch/blob/master/README.md'>DOCUMENTATION</a><br/>
|
||||
</div>
|
||||
</Row>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ class NavigationLinks extends React.Component {
|
|||
const { channelName, showPublish, closedRegistration } = this.props;
|
||||
return (
|
||||
<div className='navigation-links'>
|
||||
{showPublish && <NavLink
|
||||
className='nav-bar-link link--nav'
|
||||
activeClassName='link--nav-active'
|
||||
to='/'
|
||||
exact
|
||||
>
|
||||
Publish
|
||||
</NavLink>}
|
||||
{/*{showPublish && <NavLink*/}
|
||||
{/* className='nav-bar-link link--nav'*/}
|
||||
{/* activeClassName='link--nav-active'*/}
|
||||
{/* to='/'*/}
|
||||
{/* exact*/}
|
||||
{/*>*/}
|
||||
{/* Publish*/}
|
||||
{/*</NavLink>}*/}
|
||||
<NavLink
|
||||
className='nav-bar-link link--nav'
|
||||
activeClassName='link--nav-active'
|
||||
|
|
@ -48,24 +48,24 @@ class NavigationLinks extends React.Component {
|
|||
>
|
||||
About
|
||||
</NavLink>
|
||||
{ channelName ? (
|
||||
<NavBarChannelOptionsDropdown
|
||||
channelName={this.props.channelName}
|
||||
handleSelection={this.handleSelection}
|
||||
defaultSelection={this.props.channelName}
|
||||
VIEW={VIEW}
|
||||
LOGOUT={LOGOUT}
|
||||
/>
|
||||
) : !closedRegistration && (
|
||||
<NavLink
|
||||
id='nav-bar-login-link'
|
||||
className='nav-bar-link link--nav'
|
||||
activeClassName='link--nav-active'
|
||||
to='/login'
|
||||
>
|
||||
Channel
|
||||
</NavLink>
|
||||
)}
|
||||
{/*{ channelName ? (*/}
|
||||
{/* <NavBarChannelOptionsDropdown*/}
|
||||
{/* channelName={this.props.channelName}*/}
|
||||
{/* handleSelection={this.handleSelection}*/}
|
||||
{/* defaultSelection={this.props.channelName}*/}
|
||||
{/* VIEW={VIEW}*/}
|
||||
{/* LOGOUT={LOGOUT}*/}
|
||||
{/* />*/}
|
||||
{/*) : !closedRegistration && (*/}
|
||||
{/* <NavLink*/}
|
||||
{/* id='nav-bar-login-link'*/}
|
||||
{/* className='nav-bar-link link--nav'*/}
|
||||
{/* activeClassName='link--nav-active'*/}
|
||||
{/* to='/login'*/}
|
||||
{/* >*/}
|
||||
{/* Channel*/}
|
||||
{/* </NavLink>*/}
|
||||
{/*)}*/}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@ class PublishDisabledMessage extends React.Component {
|
|||
<div className={'publish-disabled-message'}>
|
||||
<div className={'message'}>
|
||||
<p className={'text--secondary'}>Publishing is currently disabled.</p>
|
||||
<p className={'text--secondary'}>
|
||||
Try <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a>
|
||||
</p>
|
||||
<p className={'text--secondary'}>{message}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -64,18 +64,19 @@ const getClaimIdAndServeAsset = (
|
|||
claimDataValues.outpoint ||
|
||||
`${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`;
|
||||
logger.debug('Outpoint:', outpoint);
|
||||
return db.Blocked.isNotBlocked(outpoint).then(() => {
|
||||
return db.Blocked.isNotBlocked(outpoint)
|
||||
// .then(() => {
|
||||
// If content was found, is approved, and not blocked - log a view.
|
||||
if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) {
|
||||
db.Views.create({
|
||||
time: Date.now(),
|
||||
isChannel: false,
|
||||
claimId: claimDataValues.claim_id || claimDataValues.claimId,
|
||||
publisherId: claimDataValues.publisher_id || claimDataValues.certificateId,
|
||||
ip,
|
||||
});
|
||||
}
|
||||
});
|
||||
// if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) {
|
||||
// db.Views.create({
|
||||
// time: Date.now(),
|
||||
// isChannel: false,
|
||||
// claimId: claimDataValues.claim_id || claimDataValues.claimId,
|
||||
// publisherId: claimDataValues.publisher_id || claimDataValues.certificateId,
|
||||
// ip,
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
})
|
||||
.then(() => {
|
||||
return db.File.findOne({
|
||||
|
|
|
|||
Loading…
Reference in a new issue