LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

fixed channel select to display logged in channel by default

Browse source
This commit is contained in:
bill bittner 2018-06-04 16:33:38 -07:00
parent c0a64a456a
commit f423709cc0
12 changed files with 79 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/build/components/ChannelSelectDropdown/index.js
View file

@ -21,8 +21,7 @@ var ChannelSelectDropdown = function ChannelSelectDropdown(_ref) {
value: selectedChannel,
onChange: handleSelection
}, loggedInChannelName && _react.default.createElement("option", {
value: loggedInChannelName,
id: "publish-channel-select-channel-option"
value: loggedInChannelName
}, loggedInChannelName), _react.default.createElement("option", {
value: _publish_channel_select_states.LOGIN
}, "Existing"), _react.default.createElement("option", {

29
client/build/containers/ChannelSelect/view.js
View file

@ -60,6 +60,15 @@ function (_React$Component) {
}
_createClass(ChannelSelect, [{
key: "componentWillMount",
value: function componentWillMount() {
var loggedInChannelName = this.props.loggedInChannelName;
if (loggedInChannelName) {
this.props.onChannelSelect(loggedInChannelName);
}
}
}, {
key: "toggleAnonymousPublish",
value: function toggleAnonymousPublish(event) {
var value = event.target.value;
@ -79,27 +88,33 @@ function (_React$Component) {
}, {
key: "render",
value: function render() {
var _this$props = this.props,
publishInChannel = _this$props.publishInChannel,
channelError = _this$props.channelError,
selectedChannel = _this$props.selectedChannel,
loggedInChannelName = _this$props.loggedInChannelName;
return _react.default.createElement("div", null, _react.default.createElement(_PublishDetailsRow.default, {
label: _react.default.createElement(_ChooseAnonymousPublishRadio.default, {
publishInChannel: this.props.publishInChannel,
publishInChannel: publishInChannel,
toggleAnonymousPublish: this.toggleAnonymousPublish
}),
content: _react.default.createElement(_ChooseChannelPublishRadio.default, {
publishInChannel: this.props.publishInChannel,
publishInChannel: publishInChannel,
toggleAnonymousPublish: this.toggleAnonymousPublish
})
}), _react.default.createElement(_ErrorDisplay.default, {
errorMessage: this.props.channelError,
errorMessage: channelError,
defaultMessage: 'Publish anonymously or in a channel'
}), this.props.publishInChannel && _react.default.createElement("div", null, _react.default.createElement(_PublishDetailsRow.default, {
label: _react.default.createElement(_Label.default, {
value: 'Channel:'
}),
content: _react.default.createElement(_ChannelSelectDropdown.default, {
selectedChannel: this.props.selectedChannel,
handleSelection: this.handleSelection
}, "loggedInChannelName=", this.props.loggedInChannelName)
}), this.props.selectedChannel === _publish_channel_select_states.LOGIN && _react.default.createElement(_ChannelLoginForm.default, null), this.props.selectedChannel === _publish_channel_select_states.CREATE && _react.default.createElement(_ChannelCreateForm.default, null)));
selectedChannel: selectedChannel,
handleSelection: this.handleSelection,
loggedInChannelName: loggedInChannelName
})
}), selectedChannel === _publish_channel_select_states.LOGIN && _react.default.createElement(_ChannelLoginForm.default, null), selectedChannel === _publish_channel_select_states.CREATE && _react.default.createElement(_ChannelCreateForm.default, null)));
}
}]);

13
client/build/reducers/publish.js
View file

@ -63,9 +63,16 @@ var customizedPublishReducer = function customizedPublishReducer(siteConfig) {
switch (action.type) {
case actions.FILE_SELECTED:
return Object.assign({}, initialState, {
// note: clears to initial state
file: action.data
return Object.assign({}, state, {
file: action.data,
claim: '',
metadata: {
title: '',
description: '',
license: '',
nsfw: false
},
thumbnail: null
});
case actions.FILE_CLEAR:

11
client/scss/_variables.scss Normal file
View file

@ -0,0 +1,11 @@
$base-color: white;
$primary-color: black;
$secondary-color: #9b9b9b;
$tertiary-color: #ccccc0;
$interactive-color : blue;
$primary-padding: 3em;
$secondary-padding: 2em;
$background-color: $base-color;
$font-color: $primary-color;

1
client/scss/all.scss
View file

@ -1,3 +1,4 @@
@import '_variables';
@import '_reset';
@import '_font';
@import '_html';

4
client/scss/components/_column.scss
View file

@ -1,4 +1,4 @@
.column {
padding-left: 2em;
padding-right: 2em;
padding-left: $primary-padding;
padding-right: $primary-padding;
}

1
client/scss/components/_horizontal-split.scss
View file

@ -5,6 +5,5 @@
align-items : flex-start;
.column {
width: 50%;
padding: 0 2em 0 2em;
}
};

8
client/scss/components/_nav-bar.scss
View file

@ -1,7 +1,7 @@
.nav-bar {
padding-left: 2em;
padding-right: 2em;
border-bottom: 0.5px solid #cacaca;
padding-left: $primary-padding;
padding-right: $primary-padding;
border-bottom: 0.5px solid $tertiary-color;
}
// old
@ -15,7 +15,7 @@
}
.nav-bar-link {
padding: 1.5rem;
padding: $secondary-padding;
display: inline-block;
}

2
client/scss/components/_page-content.scss
View file

@ -1,5 +1,5 @@
.page-content {
margin: 2em;
margin: $primary-padding;
// fill the parent flex container
flex: 1 0 auto;
// be a flex container for children

7
client/src/components/ChannelSelectDropdown/index.jsx
View file

@ -9,12 +9,7 @@ const ChannelSelectDropdown = ({ selectedChannel, handleSelection, loggedInChann
value={selectedChannel}
onChange={handleSelection}>
{ loggedInChannelName && (
<option
value={loggedInChannelName}
id='publish-channel-select-channel-option'
>
{loggedInChannelName}
</option>
<option value={loggedInChannelName} >{loggedInChannelName}</option>
)}
<option value={LOGIN}>Existing</option>
<option value={CREATE}>New</option>

25
client/src/containers/ChannelSelect/view.jsx
View file

@ -15,6 +15,12 @@ class ChannelSelect extends React.Component {
this.toggleAnonymousPublish = this.toggleAnonymousPublish.bind(this);
this.handleSelection = this.handleSelection.bind(this);
}
componentWillMount () {
const { loggedInChannelName } = this.props;
if (loggedInChannelName) {
this.props.onChannelSelect(loggedInChannelName);
}
}
toggleAnonymousPublish (event) {
const value = event.target.value;
if (value === 'anonymous') {
@ -28,24 +34,25 @@ class ChannelSelect extends React.Component {
this.props.onChannelSelect(selectedOption);
}
render () {
const { publishInChannel, channelError, selectedChannel, loggedInChannelName } = this.props;
return (
<div>
<PublishDetailsRow
label={
<ChooseAnonymousPublishRadio
publishInChannel={this.props.publishInChannel}
publishInChannel={publishInChannel}
toggleAnonymousPublish={this.toggleAnonymousPublish}
/>
}
content={
<ChooseChannelPublishRadio
publishInChannel={this.props.publishInChannel}
publishInChannel={publishInChannel}
toggleAnonymousPublish={this.toggleAnonymousPublish}
/>
}
/>
<ErrorDisplay
errorMessage={this.props.channelError}
errorMessage={channelError}
defaultMessage={'Publish anonymously or in a channel'}
/>
@ -57,14 +64,14 @@ class ChannelSelect extends React.Component {
}
content={
<ChannelSelectDropdown
selectedChannel={this.props.selectedChannel}
handleSelection={this.handleSelection}>
loggedInChannelName={this.props.loggedInChannelName}
</ChannelSelectDropdown>
selectedChannel={selectedChannel}
handleSelection={this.handleSelection}
loggedInChannelName={loggedInChannelName}
/>
}
/>
{ (this.props.selectedChannel === LOGIN) && <ChannelLoginForm /> }
{ (this.props.selectedChannel === CREATE) && <ChannelCreateForm /> }
{ (selectedChannel === LOGIN) && <ChannelLoginForm /> }
{ (selectedChannel === CREATE) && <ChannelCreateForm /> }
</div>
)}
</div>

10
client/src/reducers/publish.js
View file

@ -46,8 +46,16 @@ const customizedPublishReducer = (siteConfig) => {
return (state = initialState, action) => {
switch (action.type) {
case actions.FILE_SELECTED:
return Object.assign({}, initialState, { // note: clears to initial state
return Object.assign({}, state, {
file : action.data,
claim : '',
metadata: {
title : '',
description: '',
license : '',
nsfw : false,
},
thumbnail: null,
});
case actions.FILE_CLEAR:
return initialState;