BlockStorage/repertory-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated prettierrc

Browse Source
This commit is contained in:
sgraves76
2021-03-11 18:15:08 -06:00
parent c8b5d2351e
commit 468bdfa632
29 changed files with 131 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.prettierrc.json
View File

@@ -2,5 +2,6 @@
"trailingComma": "es5", "trailingComma": "es5",
"tabWidth": 2, "tabWidth": 2,
"semi": true, "semi": true,
"singleQuote": true "singleQuote": true,
"jsxBracketSameLine": true
} }

2
.vim/coc-settings.json
View File

@@ -16,6 +16,8 @@
"WINFSP", "WINFSP",
"blockstorage", "blockstorage",
"centos", "centos",
"fontawesome",
"fortawesome",
"msiexec", "msiexec",
"norestart", "norestart",
"randomstring", "randomstring",

8
public/index.html
View File

@@ -1,18 +1,18 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8" />
<meta <meta
name="viewport" name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no" content="width=device-width, initial-scale=1, shrink-to-fit=no"
/> />
<meta name="theme-color" content="#000000"/> <meta name="theme-color" content="#000000" />
<!-- <!--
manifest.json provides metadata used when your web app is added to the manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json"/> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"/> <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link <link
href="https://fonts.googleapis.com/css?family=Nunito:400,700" href="https://fonts.googleapis.com/css?family=Nunito:400,700"
rel="stylesheet" rel="stylesheet"

9
src/App.jsx
View File

@@ -275,8 +275,7 @@ class App extends IPCContainer {
mainContent.push( mainContent.push(
<Box <Box
key={'md_' + key++} key={'md_' + key++}
dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }} dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}>
>
<ReleaseVersionDisplay <ReleaseVersionDisplay
downloadDisabled={!downloadEnabled} downloadDisabled={!downloadEnabled}
version={selectedVersion} version={selectedVersion}
@@ -293,8 +292,7 @@ class App extends IPCContainer {
mainContent.push( mainContent.push(
<Box <Box
dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }} dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}
key={'md_' + key++} key={'md_' + key++}>
>
<MountItems <MountItems
s3Supported={s3Supported} s3Supported={s3Supported}
remoteSupported={remoteSupported} remoteSupported={remoteSupported}
@@ -308,8 +306,7 @@ class App extends IPCContainer {
mainContent.push( mainContent.push(
<Box <Box
dxStyle={{ padding: 'var(--default_spacing)', height: '170px' }} dxStyle={{ padding: 'var(--default_spacing)', height: '170px' }}
key={'md_' + key++} key={'md_' + key++}>
>
<Loading /> <Loading />
</Box> </Box>
); );

3
src/components/ApplicationBusy/ApplicationBusy.js
View File

@@ -15,8 +15,7 @@ const ApplicationBusy = ({ title }) => {
style={{ style={{
paddingLeft: 'calc(50% - 16px)', paddingLeft: 'calc(50% - 16px)',
paddingTop: 'var(--default_spacing)', paddingTop: 'var(--default_spacing)',
}} }}>
>
<Loader <Loader
color={'var(--heading_text_color)'} color={'var(--heading_text_color)'}
height={32} height={32}

3
src/components/DependencyList/Dependency/Dependency.js
View File

@@ -29,8 +29,7 @@ export default connect(mapStateToProps)((props) => {
onClick={() => { onClick={() => {
props.onDownload(); props.onDownload();
return false; return false;
}} }}>
>
<u>Install</u> <u>Install</u>
</a> </a>
) : ( ) : (

12
src/components/DependencyList/DependencyList.js
View File

@@ -53,8 +53,7 @@ export default connect(
paddingRight: '4px', paddingRight: '4px',
boxSizing: 'border-box', boxSizing: 'border-box',
display: 'block', display: 'block',
}} }}>
>
<a <a
href={'#'} href={'#'}
onClick={ onClick={
@@ -64,8 +63,7 @@ export default connect(
} }
style={{ style={{
cursor: props.AllowDismissDependencies ? 'pointer' : 'no-drop', cursor: props.AllowDismissDependencies ? 'pointer' : 'no-drop',
}} }}>
>
X X
</a> </a>
</div> </div>
@@ -80,15 +78,13 @@ export default connect(
height: 'auto', height: 'auto',
paddingBottom: '5px', paddingBottom: '5px',
boxSizing: 'border-box', boxSizing: 'border-box',
}} }}>
>
<h1 <h1
style={{ style={{
width: '100%', width: '100%',
textAlign: 'center', textAlign: 'center',
color: 'var(--text_color_error)', color: 'var(--text_color_error)',
}} }}>
>
Missing Dependencies Missing Dependencies
</h1> </h1>
</div> </div>

6
src/components/NewReleases/NewRelease/NewRelease.jsx
View File

@@ -74,8 +74,7 @@ export default connect(
<td width="50%"> <td width="50%">
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={displayChanges} clicked={displayChanges}>
>
Changes Changes
</Button> </Button>
</td> </td>
@@ -86,8 +85,7 @@ export default connect(
{!isActiveRelease ? ( {!isActiveRelease ? (
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={setReleaseAndVersion} clicked={setReleaseAndVersion}>
>
Activate Activate
</Button> </Button>
) : null} ) : null}

3
src/components/ReleaseVersionDisplay/ReleaseVersionDisplay.js
View File

@@ -138,8 +138,7 @@ export default connect(
colSpan={20} colSpan={20}
key={key++} key={key++}
row={5} row={5}
rowSpan={7} rowSpan={7}>
>
Install Install
</Button> </Button>
); );

3
src/components/UI/Box/Box.js
View File

@@ -20,8 +20,7 @@ const Box = (props) => {
<div <div
onClick={props.clicked} onClick={props.clicked}
className={styleList.join(' ')} className={styleList.join(' ')}
style={{ ...props.dxStyle }} style={{ ...props.dxStyle }}>
>
{props.children} {props.children}
</div> </div>
); );

3
src/components/UI/Button/Button.js
View File

@@ -8,8 +8,7 @@ const Button = (props) => {
autoFocus={props.autoFocus} autoFocus={props.autoFocus}
className={'Button'} className={'Button'}
style={props.buttonStyles} style={props.buttonStyles}
onClick={props.clicked} onClick={props.clicked}>
>
{props.children} {props.children}
</button> </button>
); );

3
src/components/UI/DropDown/DropDown.js
View File

@@ -21,8 +21,7 @@ const DropDown = (props) => {
autoFocus={props.autoFocus} autoFocus={props.autoFocus}
disabled={props.disabled} disabled={props.disabled}
onChange={props.changed} onChange={props.changed}
value={props.selected} value={props.selected}>
>
{options} {options}
</select> </select>
</div> </div>

3
src/components/UI/Grid/Grid.js
View File

@@ -115,8 +115,7 @@ export default class Grid extends Component {
col={col} col={col}
rowSpan={rowSpan} rowSpan={rowSpan}
colSpan={colSpan} colSpan={colSpan}
key={'gc_' + i} key={'gc_' + i}>
>
{child} {child}
</GridComponent> </GridComponent>
); );

3
src/components/UpgradeUI/UpgradeUI.js
View File

@@ -59,8 +59,7 @@ export default connect(
<td width="50%"> <td width="50%">
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => props.setDismissUIUpgrade(true)} clicked={() => props.setDismissUIUpgrade(true)}>
>
Cancel Cancel
</Button> </Button>
</td> </td>

9
src/components/YesNo/YesNo.js
View File

@@ -27,8 +27,7 @@ export default connect(
minWidth: '180px', minWidth: '180px',
height: 'auto', height: 'auto',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
}} }}>
>
<div style={{ width: '100%', height: 'auto' }}> <div style={{ width: '100%', height: 'auto' }}>
<h1 style={{ width: '100%', textAlign: 'center' }}>{props.Title}</h1> <h1 style={{ width: '100%', textAlign: 'center' }}>{props.Title}</h1>
</div> </div>
@@ -38,16 +37,14 @@ export default connect(
<td width="50%"> <td width="50%">
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => props.hideConfirmYesNo(true)} clicked={() => props.hideConfirmYesNo(true)}>
>
Yes Yes
</Button> </Button>
</td> </td>
<td width="50%"> <td width="50%">
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => props.hideConfirmYesNo(false)} clicked={() => props.hideConfirmYesNo(false)}>
>
No No
</Button> </Button>
</td> </td>

30
src/containers/AddMount/AddMount.js
View File

@@ -137,14 +137,12 @@ export default connect(
width: 'auto', width: 'auto',
height: 'auto', height: 'auto',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
}} }}>
>
<h1 <h1
style={{ style={{
textAlign: 'center', textAlign: 'center',
paddingBottom: 'var(--default_spacing)', paddingBottom: 'var(--default_spacing)',
}} }}>
>
Add Remote Mount Add Remote Mount
</h1> </h1>
<Text text={'Hostname or IP'} textAlign={'left'} type={'Heading2'} /> <Text text={'Hostname or IP'} textAlign={'left'} type={'Heading2'} />
@@ -178,15 +176,13 @@ export default connect(
<div style={{ display: 'flex', flexDirection: 'row' }}> <div style={{ display: 'flex', flexDirection: 'row' }}>
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => this.addRemoteMount()} clicked={() => this.addRemoteMount()}>
>
OK OK
</Button> </Button>
<div style={{ paddingLeft: 'var(--default_spacing)' }} /> <div style={{ paddingLeft: 'var(--default_spacing)' }} />
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => this.setState({ DisplayRemote: false })} clicked={() => this.setState({ DisplayRemote: false })}>
>
Cancel Cancel
</Button> </Button>
</div> </div>
@@ -201,14 +197,12 @@ export default connect(
width: 'auto', width: 'auto',
height: 'auto', height: 'auto',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
}} }}>
>
<h1 <h1
style={{ style={{
textAlign: 'center', textAlign: 'center',
paddingBottom: 'var(--default_spacing)', paddingBottom: 'var(--default_spacing)',
}} }}>
>
Add S3 Mount Add S3 Mount
</h1> </h1>
<div style={{ display: 'flex', flexDirection: 'row' }}> <div style={{ display: 'flex', flexDirection: 'row' }}>
@@ -283,15 +277,13 @@ export default connect(
<div style={{ width: '200%' }} /> <div style={{ width: '200%' }} />
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => this.addS3Mount()} clicked={() => this.addS3Mount()}>
>
OK OK
</Button> </Button>
<div style={{ paddingLeft: 'var(--default_spacing)' }} /> <div style={{ paddingLeft: 'var(--default_spacing)' }} />
<Button <Button
buttonStyles={{ width: '100%' }} buttonStyles={{ width: '100%' }}
clicked={() => this.setState({ DisplayS3: false })} clicked={() => this.setState({ DisplayS3: false })}>
>
Cancel Cancel
</Button> </Button>
</div> </div>
@@ -306,8 +298,7 @@ export default connect(
{this.props.remoteSupported ? ( {this.props.remoteSupported ? (
<Button <Button
className={'AddMountButton'} className={'AddMountButton'}
clicked={this.handleAddRemoteMount} clicked={this.handleAddRemoteMount}>
>
Add Remote Mount Add Remote Mount
</Button> </Button>
) : null} ) : null}
@@ -317,8 +308,7 @@ export default connect(
{this.props.s3Supported ? ( {this.props.s3Supported ? (
<Button <Button
className={'AddMountButton'} className={'AddMountButton'}
clicked={this.handleAddS3Mount} clicked={this.handleAddS3Mount}>
>
Add S3 Mount Add S3 Mount
</Button> </Button>
) : null} ) : null}

29
src/containers/Configuration/Configuration.js
View File

@@ -163,7 +163,7 @@ class Configuration extends IPCContainer {
}); });
}; };
onGetConfigReply = (event, arg) => { onGetConfigReply = (_, arg) => {
if (arg.data.Success) { if (arg.data.Success) {
const list = this.createItemList(arg.data.Config, this.state.Template); const list = this.createItemList(arg.data.Config, this.state.Template);
const itemListCopy = JSON.parse(JSON.stringify(list.ItemList)); const itemListCopy = JSON.parse(JSON.stringify(list.ItemList));
@@ -207,7 +207,7 @@ class Configuration extends IPCContainer {
} }
}; };
onGetConfigTemplateReply = (event, arg) => { onGetConfigTemplateReply = (_, arg) => {
if (arg.data.Success) { if (arg.data.Success) {
this.setState( this.setState(
{ {
@@ -318,16 +318,14 @@ class Configuration extends IPCContainer {
<td align="center" width="50%"> <td align="center" width="50%">
<Button <Button
clicked={this.saveAndClose} clicked={this.saveAndClose}
disabled={this.state.Saving} disabled={this.state.Saving}>
>
Yes Yes
</Button> </Button>
</td> </td>
<td align="center" width="50%"> <td align="center" width="50%">
<Button <Button
clicked={this.props.hideConfiguration} clicked={this.props.hideConfiguration}
disabled={this.state.Saving} disabled={this.state.Saving}>
>
No No
</Button> </Button>
</td> </td>
@@ -340,6 +338,12 @@ class Configuration extends IPCContainer {
} }
let autoFocus = true; let autoFocus = true;
const getAutoFocus = () => {
return autoFocus;
};
const setAutoFocus = (value) => {
autoFocus = value;
};
let objectItems = []; let objectItems = [];
for (const key of Object.keys(this.state.ObjectLookup)) { for (const key of Object.keys(this.state.ObjectLookup)) {
@@ -348,8 +352,8 @@ class Configuration extends IPCContainer {
<h2>{key}</h2> <h2>{key}</h2>
<div> <div>
{this.state.ObjectLookup[key].map((k, i) => { {this.state.ObjectLookup[key].map((k, i) => {
const shouldFocus = autoFocus; const shouldFocus = getAutoFocus();
autoFocus = false; setAutoFocus(false);
return !k.advanced || return !k.advanced ||
(this.state.ShowAdvanced && k.advanced && !k.remote) || (this.state.ShowAdvanced && k.advanced && !k.remote) ||
this.showRemoteConfigItem(k, this.state.ObjectLookup[key]) ? ( this.showRemoteConfigItem(k, this.state.ObjectLookup[key]) ? (
@@ -407,13 +411,11 @@ class Configuration extends IPCContainer {
marginTop: '-4px', marginTop: '-4px',
boxSizing: 'border-box', boxSizing: 'border-box',
display: 'block', display: 'block',
}} }}>
>
<a <a
href={'#'} href={'#'}
onClick={this.checkSaveRequired} onClick={this.checkSaveRequired}
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}>
>
X X
</a> </a>
</div> </div>
@@ -434,8 +436,7 @@ class Configuration extends IPCContainer {
clicked={() => { clicked={() => {
this.props.displayPinnedManager(true); this.props.displayPinnedManager(true);
return false; return false;
}} }}>
>
&nbsp;Pinned File Manager...&nbsp; &nbsp;Pinned File Manager...&nbsp;
</Button> </Button>
) : null} ) : null}

3
src/containers/Configuration/ConfigurationItem/ConfigurationItem.js
View File

@@ -46,8 +46,7 @@ export default connect(
onClick={() => { onClick={() => {
displayInfo(); displayInfo();
return false; return false;
}} }}>
>
<FontAwesomeIcon icon={faInfoCircle} /> <FontAwesomeIcon icon={faInfoCircle} />
</a> </a>
); );

24
src/containers/MountItems/MountItem/MountItem.js
View File

@@ -112,8 +112,7 @@ export default connect(
colSpan={inputColumnSpan - 8} colSpan={inputColumnSpan - 8}
key={'i' + key++} key={'i' + key++}
row={secondRow} row={secondRow}
rowSpan={7} rowSpan={7}>
>
<input <input
disabled={!props.MState.AllowMount || props.MState.Mounted} disabled={!props.MState.AllowMount || props.MState.Mounted}
maxLength={4096} maxLength={4096}
@@ -135,8 +134,7 @@ export default connect(
disabled={props.MState.Mounted || !props.MState.AllowMount} disabled={props.MState.Mounted || !props.MState.AllowMount}
key={'b' + key++} key={'b' + key++}
row={secondRow} row={secondRow}
rowSpan={7} rowSpan={7}>
>
... ...
</Button> </Button>
); );
@@ -172,8 +170,7 @@ export default connect(
colSpan={21} colSpan={21}
disabled={!props.MState.AllowMount} disabled={!props.MState.AllowMount}
row={secondRow} row={secondRow}
rowSpan={7} rowSpan={7}>
>
{buttonDisplay} {buttonDisplay}
</Button> </Button>
); );
@@ -183,8 +180,7 @@ export default connect(
col={inputColumnSpan + 24} col={inputColumnSpan + 24}
colSpan={28} colSpan={28}
row={secondRow} row={secondRow}
rowSpan={7} rowSpan={7}>
>
<CheckBox <CheckBox
changed={handleAutoMountChanged} changed={handleAutoMountChanged}
checked={props.PState.AutoMount} checked={props.PState.AutoMount}
@@ -198,8 +194,7 @@ export default connect(
col={inputColumnSpan + 24 + 28} col={inputColumnSpan + 24 + 28}
colSpan={24} colSpan={24}
row={secondRow} row={secondRow}
rowSpan={7} rowSpan={7}>
>
<CheckBox <CheckBox
changed={handleAutoRestartChanged} changed={handleAutoRestartChanged}
checked={props.PState.AutoRestart} checked={props.PState.AutoRestart}
@@ -222,8 +217,7 @@ export default connect(
removeControl = ( removeControl = (
<RootElem <RootElem
col={(dimensions) => dimensions.columns - 6} col={(dimensions) => dimensions.columns - 6}
row={secondRow + 3} row={secondRow + 3}>
>
<a href={'#'} onClick={handleRemoveMount} style={removeStyle}> <a href={'#'} onClick={handleRemoveMount} style={removeStyle}>
<FontAwesomeIcon icon={faTrashAlt} /> <FontAwesomeIcon icon={faTrashAlt} />
</a> </a>
@@ -264,8 +258,7 @@ export default connect(
} }
} }
rowSpan={5} rowSpan={5}
style={{ ...pointer, fontWeight: 'normal' }} style={{ ...pointer, fontWeight: 'normal' }}>
>
<u>Export</u> <u>Export</u>
</a> </a>
) : null} ) : null}
@@ -281,8 +274,7 @@ export default connect(
} }
} }
rowSpan={5} rowSpan={5}
style={{ ...pointer, fontWeight: 'normal' }} style={{ ...pointer, fontWeight: 'normal' }}>
>
<u>Import</u> <u>Import</u>
</a> </a>
) : null} ) : null}

12
src/containers/MountItems/MountItems.js
View File

@@ -430,8 +430,7 @@ class MountItems extends IPCContainer {
clicked={() => clicked={() =>
this.cancelRetryMount(provider, () => this.detectMounts()) this.cancelRetryMount(provider, () => this.detectMounts())
} }
key={'rl_' + retryList.length} key={'rl_' + retryList.length}>
>
Cancel {provider} Remount ( Cancel {provider} Remount (
{this.state.RetryItems[provider].RetrySeconds}s) {this.state.RetryItems[provider].RetrySeconds}s)
</Button> </Button>
@@ -451,15 +450,13 @@ class MountItems extends IPCContainer {
<Modal> <Modal>
<Box <Box
dxDark dxDark
dxStyle={{ padding: 'var(--default_spacing)', minWidth: '70vw' }} dxStyle={{ padding: 'var(--default_spacing)', minWidth: '70vw' }}>
>
<h1 <h1
style={{ style={{
textAlign: 'center', textAlign: 'center',
paddingBottom: 'var(--default_spacing)', paddingBottom: 'var(--default_spacing)',
color: 'var(--text_color_error)', color: 'var(--text_color_error)',
}} }}>
>
Mount Failed Mount Failed
</h1> </h1>
{retryList} {retryList}
@@ -563,8 +560,7 @@ class MountItems extends IPCContainer {
this.props.remoteSupported || this.props.s3Supported this.props.remoteSupported || this.props.s3Supported
? 'MountItemsRemote' ? 'MountItemsRemote'
: 'MountItems' : 'MountItems'
} }>
>
{items} {items}
</div> </div>
<div style={{ paddingTop: 'var(--default_spacing)' }} /> <div style={{ paddingTop: 'var(--default_spacing)' }} />

9
src/containers/PinnedManager/PinnedManager.js
View File

@@ -119,8 +119,7 @@ export default connect(
this.grabDirectoryItems(); this.grabDirectoryItems();
} }
); );
}} }}>
>
<FontAwesomeIcon <FontAwesomeIcon
icon={faFolder} icon={faFolder}
fixedWidth fixedWidth
@@ -177,16 +176,14 @@ export default connect(
height: 'calc(100vh - (var(--default_spacing) * 4)', height: 'calc(100vh - (var(--default_spacing) * 4)',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
width: 'calc(100vw - (var(--default_spacing) * 4)', width: 'calc(100vw - (var(--default_spacing) * 4)',
}} }}>
>
<div className={'PinnedManager'}> <div className={'PinnedManager'}>
<div className={'PinnedManagerHeading'}> <div className={'PinnedManagerHeading'}>
<div className={'PinnedManagerClose'}> <div className={'PinnedManagerClose'}>
<a <a
href={'#'} href={'#'}
onClick={() => this.props.displayPinnedManager(false)} onClick={() => this.props.displayPinnedManager(false)}
style={{ cursor: 'pointer', flex: '0' }} style={{ cursor: 'pointer', flex: '0' }}>
>
X X
</a> </a>
</div> </div>

3
src/containers/SelectAppPlatform/SelectAppPlatform.js
View File

@@ -83,8 +83,7 @@ class SelectAppPlatform extends IPCContainer {
/> />
<Button <Button
clicked={this.handleTestClicked} clicked={this.handleTestClicked}
disabled={this.props.InstallTestActive} disabled={this.props.InstallTestActive}>
>
Test Test
</Button> </Button>
</div> </div>

18
src/containers/SkynetExport/SkynetExport.js
View File

@@ -179,8 +179,7 @@ export default connect(
height: '90vh', height: '90vh',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
width: 'calc(100vw - (var(--default_spacing) * 4)', width: 'calc(100vw - (var(--default_spacing) * 4)',
}} }}>
>
<div <div
style={{ style={{
float: 'right', float: 'right',
@@ -189,13 +188,11 @@ export default connect(
marginTop: '-4px', marginTop: '-4px',
boxSizing: 'border-box', boxSizing: 'border-box',
display: 'block', display: 'block',
}} }}>
>
<a <a
href={'#'} href={'#'}
onClick={() => this.props.displaySkynetExport(false)} onClick={() => this.props.displaySkynetExport(false)}
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}>
>
X X
</a> </a>
</div> </div>
@@ -205,8 +202,7 @@ export default connect(
<div <div
className={ className={
this.state.second_stage ? 'SkynetExportList' : 'SkynetExportTree' this.state.second_stage ? 'SkynetExportList' : 'SkynetExportTree'
} }>
>
{this.state.second_stage ? ( {this.state.second_stage ? (
this.state.checked.map((path) => { this.state.checked.map((path) => {
return ( return (
@@ -324,8 +320,7 @@ export default connect(
this.setState({ this.setState({
second_stage: false, second_stage: false,
}) })
} }>
>
{'Back'} {'Back'}
</Button> </Button>
) : null} ) : null}
@@ -336,8 +331,7 @@ export default connect(
marginTop: 'var(--default_spacing)', marginTop: 'var(--default_spacing)',
width: 'auto', width: 'auto',
}} }}
clicked={this.handleNavigation} clicked={this.handleNavigation}>
>
{this.state.second_stage ? 'Export' : 'Next'} {this.state.second_stage ? 'Export' : 'Next'}
</Button> </Button>
</div> </div>

18
src/containers/SkynetImport/SkynetImport.js
View File

@@ -191,8 +191,7 @@ export default connect(
height: 'auto', height: 'auto',
padding: 'var(--default_spacing)', padding: 'var(--default_spacing)',
width: 'calc(100vw - (var(--default_spacing) * 4)', width: 'calc(100vw - (var(--default_spacing) * 4)',
}} }}>
>
<div <div
style={{ style={{
float: 'right', float: 'right',
@@ -201,13 +200,11 @@ export default connect(
marginTop: '-4px', marginTop: '-4px',
boxSizing: 'border-box', boxSizing: 'border-box',
display: 'block', display: 'block',
}} }}>
>
<a <a
href={'#'} href={'#'}
onClick={() => this.props.displaySkynetImport(false)} onClick={() => this.props.displaySkynetImport(false)}
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}>
>
X X
</a> </a>
</div> </div>
@@ -236,8 +233,7 @@ export default connect(
marginTop: 'var(--default_spacing)', marginTop: 'var(--default_spacing)',
width: 'auto', width: 'auto',
}} }}
clicked={this.displaySyntax} clicked={this.displaySyntax}>
>
Import Syntax... Import Syntax...
</Button> </Button>
<div className={'SkynetActionButtons'}> <div className={'SkynetActionButtons'}>
@@ -253,8 +249,7 @@ export default connect(
this.setState({ this.setState({
second_stage: false, second_stage: false,
}) })
} }>
>
{'Back'} {'Back'}
</Button> </Button>
) : null} ) : null}
@@ -265,8 +260,7 @@ export default connect(
marginTop: 'var(--default_spacing)', marginTop: 'var(--default_spacing)',
width: 'auto', width: 'auto',
}} }}
clicked={this.handleNavigation} clicked={this.handleNavigation}>
>
{this.state.second_stage ? 'Import' : 'Next'} {this.state.second_stage ? 'Import' : 'Next'}
</Button> </Button>
</div> </div>

6
src/containers/UI/Password/Password.js
View File

@@ -122,8 +122,7 @@ export default class Password extends Component {
<a <a
href={'#'} href={'#'}
className={'PasswordLink'} className={'PasswordLink'}
onClick={this.handleActionClick} onClick={this.handleActionClick}>
>
<u>{this.state.button_text}</u> <u>{this.state.button_text}</u>
</a> </a>
)} )}
@@ -144,8 +143,7 @@ export default class Password extends Component {
<a <a
href={'#'} href={'#'}
className={'PasswordShowHide'} className={'PasswordShowHide'}
onClick={this.handleShowHideClick} onClick={this.handleShowHideClick}>
>
<FontAwesomeIcon <FontAwesomeIcon
icon={this.state.show_password ? faEye : faEyeSlash} icon={this.state.show_password ? faEye : faEyeSlash}
fixedWidth fixedWidth