diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c21f93a..f1499d2cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [0.39.0] - [2019-3-19] +## [0.38.0] - [Unreleased] + +### Fixed ### Added -- Allows channel thumbnails to be clickable on file pages ([#3304](https://github.com/lbryio/lbry-desktop/pull/3304)) +- Dedicated Channel Creation page ([#3305](https://github.com/lbryio/lbry-desktop/pull/3305)) + +### Changed ## [0.37.2] - [2019-11-21] @@ -20,8 +24,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added -- 'New Channel' button in channels page ([#3305](https://github.com/lbryio/lbry-desktop/pull/3305)) -- Dedicated Channel Creation page ([#3305](https://github.com/lbryio/lbry-desktop/pull/3305)) - Setting to start the app minimized when you login (Linux/Windows only) ([#3236](https://github.com/lbryio/lbry-desktop/pull/3236)) - Search on downloads page ([#2969](https://github.com/lbryio/lbry-desktop/pull/2969)) - Clear support state when clearing cache in settings([#3149](https://github.com/lbryio/lbry-desktop/pull/3149)) diff --git a/package.json b/package.json index d19380fd8..360ed00cf 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "react-paginate": "^5.2.1", "react-redux": "^6.0.1", "react-router": "^5.0.0", - "react-router-dom": "^5.1.0", + "react-router-dom": "^5.0.0", "react-simplemde-editor": "^4.0.0", "react-spring": "^8.0.20", "react-sticky-box": "^0.8.0", diff --git a/ui/component/channelCreate/view.jsx b/ui/component/channelCreate/view.jsx index ccf0b48fa..9f1caebe1 100644 --- a/ui/component/channelCreate/view.jsx +++ b/ui/component/channelCreate/view.jsx @@ -1,8 +1,7 @@ // @flow -import React, { Fragment } from 'react'; +import React from 'react'; import { isNameValid } from 'lbry-redux'; -import { FormField } from 'component/common/form'; -import BusyIndicator from 'component/common/busy-indicator'; +import { Form, FormField } from 'component/common/form'; import Button from 'component/button'; import analytics from 'analytics'; @@ -38,7 +37,7 @@ class ChannelCreate extends React.PureComponent { (this: any).handleNewChannelNameChange = this.handleNewChannelNameChange.bind(this); (this: any).handleNewChannelBidChange = this.handleNewChannelBidChange.bind(this); - (this: any).handleCreateChannelClick = this.handleCreateChannelClick.bind(this); + (this: any).handleCreateChannel = this.handleCreateChannel.bind(this); } handleNewChannelNameChange(event: SyntheticInputEvent<*>) { @@ -78,7 +77,7 @@ class ChannelCreate extends React.PureComponent { }); } - handleCreateChannelClick() { + handleCreateChannel() { const { balance, createChannel, onSuccess } = this.props; const { newChannelBid, newChannelName } = this.state; @@ -125,7 +124,7 @@ class ChannelCreate extends React.PureComponent { } = this.state; return ( - +
{createChannelError &&
{createChannelError}
}
{ />
- {creatingChannel && } - + ); } } diff --git a/ui/component/channelForm/view.jsx b/ui/component/channelForm/view.jsx index 97c1e400d..5cb8e9f04 100644 --- a/ui/component/channelForm/view.jsx +++ b/ui/component/channelForm/view.jsx @@ -1,12 +1,5 @@ // @flow -/* - On submit, this component calls publish, which dispatches doPublishDesktop. - doPublishDesktop calls lbry-redux Lbry publish method using lbry-redux publish state as params. - Publish simply instructs the SDK to find the file path on disk and publish it with the provided metadata. - On web, the Lbry publish method call is overridden in platform/web/api-setup, using a function in platform/web/publish. - File upload is carried out in the background by that function. - */ import React, { useEffect, Fragment } from 'react'; import { CHANNEL_NEW, CHANNEL_ANONYMOUS } from 'constants/claim'; import { buildURI, isURIValid } from 'lbry-redux'; @@ -18,7 +11,6 @@ type Props = { name: ?string, channel: string, resolveUri: string => void, - // Add back type updatePublishForm: any => void, onSuccess: () => void, }; diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx index 9f18c6106..8b04ec24f 100644 --- a/ui/component/common/icon-custom.jsx +++ b/ui/component/common/icon-custom.jsx @@ -322,20 +322,4 @@ export const icons = { ), - [ICONS.NEW_CHANNEL]: buildIcon( - - - - - - - ), - [ICONS.NEW_PUBLISH]: buildIcon( - - - - - - - ), }; diff --git a/ui/component/publishForm/view.jsx b/ui/component/publishForm/view.jsx index 43a1d6112..4185fc464 100644 --- a/ui/component/publishForm/view.jsx +++ b/ui/component/publishForm/view.jsx @@ -11,12 +11,13 @@ import React, { useEffect, Fragment } from 'react'; import { CHANNEL_NEW, CHANNEL_ANONYMOUS } from 'constants/claim'; import { buildURI, isURIValid, isNameValid, THUMBNAIL_STATUSES } from 'lbry-redux'; import Button from 'component/button'; -import ChannelSection from 'component/selectChannel'; +import SelectChannel from 'component/selectChannel'; import classnames from 'classnames'; import TagsSelect from 'component/tagsSelect'; import PublishText from 'component/publishText'; import PublishPrice from 'component/publishPrice'; import PublishFile from 'component/publishFile'; +import PublishName from 'component/publishName'; import PublishAdditionalOptions from 'component/publishAdditionalOptions'; import PublishFormErrors from 'component/publishFormErrors'; import SelectThumbnail from 'component/selectThumbnail'; @@ -162,7 +163,7 @@ function PublishForm(props: Props) { - updatePublishForm({ channel })} /> + updatePublishForm({ channel })} />

{__('This is a username or handle that your content can be found under.')}{' '} {__('Ex. @Marvel, @TheBeatles, @BooksByJoe')} @@ -171,6 +172,7 @@ function PublishForm(props: Props) { } /> + diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx index 14d9d6202..a7e0a004f 100644 --- a/ui/component/router/view.jsx +++ b/ui/component/router/view.jsx @@ -24,7 +24,6 @@ import FourOhFourPage from 'page/fourOhFour'; import SignInPage from 'page/signIn'; import SignInVerifyPage from 'page/signInVerify'; import ChannelsPage from 'page/channels'; -import ChannelCreatePage from 'page/channelCreate'; // Tell the browser we are handling scroll restoration if ('scrollRestoration' in history) { @@ -93,7 +92,6 @@ function AppRouter(props: Props) { - {/* Below need to go at the end to make sure we don't match any of our pages first */} diff --git a/ui/component/selectChannel/view.jsx b/ui/component/selectChannel/view.jsx index 1222241b9..eae077657 100644 --- a/ui/component/selectChannel/view.jsx +++ b/ui/component/selectChannel/view.jsx @@ -77,25 +77,31 @@ class ChannelSection extends React.PureComponent { {fetchingChannels ? ( ) : ( - - - - {channels && - channels.map(({ name, claim_id: claimId }) => ( - - ))} - - - {addingChannel && } - + +

+ + + {channels && + channels.map(({ name, claim_id: claimId }) => ( + + ))} + + +
+ {addingChannel && ( +
+ +
+ )} +
)} ); diff --git a/ui/component/sideBar/view.jsx b/ui/component/sideBar/view.jsx index 4e56367a1..7fd0077ee 100644 --- a/ui/component/sideBar/view.jsx +++ b/ui/component/sideBar/view.jsx @@ -75,7 +75,7 @@ function SideBar(props: Props) {