Layout changes
This commit is contained in:
@@ -2,10 +2,10 @@ import React from 'react';
|
|||||||
import * as Constants from '../../../constants';
|
import * as Constants from '../../../constants';
|
||||||
import Button from '../../UI/Button/Button';
|
import Button from '../../UI/Button/Button';
|
||||||
|
|
||||||
export default ({release}) => {
|
export default ({release, lastItem}) => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<h3>{'[' + Constants.RELEASE_TYPES[release.Release] + '] ' + release.Display }</h3>
|
<h2>{'[' + Constants.RELEASE_TYPES[release.Release] + '] ' + release.Display }</h2>
|
||||||
<table cellSpacing={0} cellPadding={0} width="97%">
|
<table cellSpacing={0} cellPadding={0} width="97%">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr style={{height: '4px'}}/>
|
<tr style={{height: '4px'}}/>
|
||||||
@@ -20,7 +20,7 @@ export default ({release}) => {
|
|||||||
<Button buttonStyles={{width: '100%'}}>Install</Button>
|
<Button buttonStyles={{width: '100%'}}>Install</Button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr style={{height: 'var(--default_spacing)'}}/>
|
{lastItem ? null : <tr style={{height: 'var(--default_spacing)'}}/>}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -19,8 +19,10 @@ const mapDispatchToProps = dispatch => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(props => {
|
export default connect(mapStateToProps, mapDispatchToProps)(props => {
|
||||||
const newReleases = props.NewReleasesAvailable.map(i => {
|
const newReleases = props.NewReleasesAvailable.map((i, idx) => {
|
||||||
return <NewRelease key={'new_release_' + i.Release + '_' + i.Version} release={i} />;
|
return <NewRelease key={'new_release_' + i.Release + '_' + i.Version}
|
||||||
|
lastItem={idx === (props.NewReleasesAvailable.length - 1)}
|
||||||
|
release={i} />;
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
|
|||||||
<h1 style={{color: 'var(--text_color_error)', textAlign: 'center', paddingBottom: 'var(--default_spacing)'}}>Add Remote Mount</h1>
|
<h1 style={{color: 'var(--text_color_error)', textAlign: 'center', paddingBottom: 'var(--default_spacing)'}}>Add Remote Mount</h1>
|
||||||
<Text text={'Hostname or IP'}
|
<Text text={'Hostname or IP'}
|
||||||
textAlign={'left'}
|
textAlign={'left'}
|
||||||
type={'Heading1'}/>
|
type={'Heading2'}/>
|
||||||
<input onChange={e => this.setState({HostNameOrIp: e.target.value.trim()})}
|
<input onChange={e => this.setState({HostNameOrIp: e.target.value.trim()})}
|
||||||
className={'ConfigurationItemInput'}
|
className={'ConfigurationItemInput'}
|
||||||
type={'text'}
|
type={'text'}
|
||||||
@@ -73,7 +73,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
|
|||||||
<div style={{paddingTop: 'var(--default_spacing)'}}/>
|
<div style={{paddingTop: 'var(--default_spacing)'}}/>
|
||||||
<Text text={'Port'}
|
<Text text={'Port'}
|
||||||
textAlign={'left'}
|
textAlign={'left'}
|
||||||
type={'Heading1'}/>
|
type={'Heading2'}/>
|
||||||
<input max={65535}
|
<input max={65535}
|
||||||
min={1025}
|
min={1025}
|
||||||
onChange={e => this.setState({Port: e.target.value})}
|
onChange={e => this.setState({Port: e.target.value})}
|
||||||
@@ -83,7 +83,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
|
|||||||
<div style={{paddingTop: 'var(--default_spacing)'}}/>
|
<div style={{paddingTop: 'var(--default_spacing)'}}/>
|
||||||
<Text text={'Remote Token'}
|
<Text text={'Remote Token'}
|
||||||
textAlign={'left'}
|
textAlign={'left'}
|
||||||
type={'Heading1'}/>
|
type={'Heading2'}/>
|
||||||
<input onChange={e => this.setState({Token: e.target.value})}
|
<input onChange={e => this.setState({Token: e.target.value})}
|
||||||
className={'ConfigurationItemInput'}
|
className={'ConfigurationItemInput'}
|
||||||
type={'text'}
|
type={'text'}
|
||||||
@@ -114,4 +114,4 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ class Configuration extends IPCContainer {
|
|||||||
for (const key of Object.keys(this.state.ObjectLookup)) {
|
for (const key of Object.keys(this.state.ObjectLookup)) {
|
||||||
objectItems.push((
|
objectItems.push((
|
||||||
<div key={key}>
|
<div key={key}>
|
||||||
<h1>{key}</h1>
|
<h2>{key}</h2>
|
||||||
<div>
|
<div>
|
||||||
{
|
{
|
||||||
this.state.ObjectLookup[key].map((k, i) => {
|
this.state.ObjectLookup[key].map((k, i) => {
|
||||||
@@ -330,7 +330,7 @@ class Configuration extends IPCContainer {
|
|||||||
this.props.DisplayConfiguration) + ' Configuration'}</h1>
|
this.props.DisplayConfiguration) + ' Configuration'}</h1>
|
||||||
<div style={{overflowY: 'auto', height: '90%'}}>
|
<div style={{overflowY: 'auto', height: '90%'}}>
|
||||||
{objectItems}
|
{objectItems}
|
||||||
{(configurationItems.length > 0) ? <h1>Settings</h1> : null}
|
{(configurationItems.length > 0) ? <h2>Settings</h2> : null}
|
||||||
{configurationItems}
|
{configurationItems}
|
||||||
</div>
|
</div>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
|
|||||||
col={configButton ? 6 : 0}
|
col={configButton ? 6 : 0}
|
||||||
rowSpan={5}
|
rowSpan={5}
|
||||||
text={props.remote ? props.provider.substr(6) : props.provider}
|
text={props.remote ? props.provider.substr(6) : props.provider}
|
||||||
type={'Heading1'}/>
|
type={'Heading2'}/>
|
||||||
{inputControls}
|
{inputControls}
|
||||||
{actionsDisplay}
|
{actionsDisplay}
|
||||||
{autoMountControl}
|
{autoMountControl}
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
--control_transparent_background: rgba(10, 10, 16, 0.5);
|
--control_transparent_background: rgba(10, 10, 16, 0.5);
|
||||||
--control_dark_transparent_background: rgba(10, 10, 16, 0.7);
|
--control_dark_transparent_background: rgba(10, 10, 16, 0.7);
|
||||||
|
|
||||||
--text_color: rgba(200, 200, 240, 0.7);
|
--text_color: rgba(200, 200, 240, 0.65);
|
||||||
--text_color_hover: rgba(200, 200, 225, 0.7);
|
--text_color_hover: rgba(200, 200, 225, 0.65);
|
||||||
--text_color_error: rgba(203, 120, 120, 0.7);
|
--text_color_error: rgba(203, 120, 120, 0.8);
|
||||||
--heading_text_color: rgba(132, 160, 230, 0.7);
|
--heading_text_color: rgba(132, 160, 230, 0.8);
|
||||||
--heading_other_text_color: var(--heading_text_color);
|
--heading_other_text_color: rgba(132, 160, 230, 0.65);
|
||||||
--text_color_transition: color 0.3s;
|
--text_color_transition: color 0.3s;
|
||||||
|
|
||||||
--default_font_size: 14px;
|
--default_font_size: 14px;
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ export const loadReleases = () => {
|
|||||||
|
|
||||||
dispatch(setNewReleasesAvailable(newReleases));
|
dispatch(setNewReleasesAvailable(newReleases));
|
||||||
if (getState().relver.NewReleasesAvailable.length > 0) {
|
if (getState().relver.NewReleasesAvailable.length > 0) {
|
||||||
|
localStorage.setItem('previous_releases', storedReleases);
|
||||||
dispatch(showWindow());
|
dispatch(showWindow());
|
||||||
}
|
}
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ export const getIPCRenderer = () => {
|
|||||||
export const getNewReleases = (existingReleases, newReleases) => {
|
export const getNewReleases = (existingReleases, newReleases) => {
|
||||||
const ret = [];
|
const ret = [];
|
||||||
|
|
||||||
existingReleases = Constants.RELEASE_TYPES.reduce((map, release) => {
|
/*existingReleases = Constants.RELEASE_TYPES.reduce((map, release) => {
|
||||||
map[release] = [];
|
map[release] = [];
|
||||||
return map;
|
return map;
|
||||||
}, {});
|
}, {});*/
|
||||||
|
|
||||||
if (existingReleases && newReleases) {
|
if (existingReleases && newReleases) {
|
||||||
Constants.RELEASE_TYPES.forEach(release => {
|
Constants.RELEASE_TYPES.forEach(release => {
|
||||||
@@ -42,9 +42,9 @@ export const getNewReleases = (existingReleases, newReleases) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
ret.splice(0, 0, {
|
ret.push({
|
||||||
Display: '1.1.1',
|
Display: '1.1.1',
|
||||||
Release: 0,
|
Release: 1,
|
||||||
Version: 2,
|
Version: 2,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user