deranjer/goTorrent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rewriting how file prio works, adding token generation to backend, minor fixes

Browse Source
This commit is contained in:
deranjer
2018-03-19 21:22:57 -04:00
parent a56a507ca2
commit fa46ba6025
10 changed files with 194 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
goTorrentWebUI/src/BottomMenu/Tabs/fileTab.js
View File

@@ -7,7 +7,7 @@ import { ProgressBarCell } from '../../CustomCells/progressBarCell';
import {
SortingState, IntegratedSorting, VirtualTableLayout, SelectionState,
SortingState, IntegratedSorting, IntegratedSelection, VirtualTableLayout, SelectionState,
} from '@devexpress/dx-react-grid';
import {
@@ -131,7 +131,8 @@ class FileTab extends React.Component {
<TableColumnResizing columnWidths={this.state.columnWidths} onColumnWidthsChange={this.changeColumnWidths}/>
<TableColumnReordering order={this.state.columnOrder} onOrderChange={this.changeColumnOrder} />
<TableSelection selectByRowClick highlightSelected />
<IntegratedSelection />
<TableSelection selectByRowClick highlightSelected showSelectAll />
<TableHeaderRow allowSorting allowResizing allowDragging />
</Grid>
</Paper>

5
goTorrentWebUI/src/TopMenu/Modals/RSSModal/RSSTorrentList.js
View File

@@ -4,7 +4,7 @@ import Button from 'material-ui/Button';
import Paper from 'material-ui/Paper';
import {
SortingState, IntegratedSorting, VirtualTableLayout, SelectionState,
SortingState, IntegratedSorting, IntegratedSelection, VirtualTableLayout, SelectionState,
} from '@devexpress/dx-react-grid';
import {
@@ -98,7 +98,8 @@ class RSSTorrentList extends React.Component {
<TableColumnResizing columnWidths={this.state.columnWidths} onColumnWidthsChange={this.changeColumnWidths}/>
<TableColumnReordering order={this.state.columnOrder} onOrderChange={this.changeColumnOrder} />
<TableSelection selectByRowClick highlightSelected />
<IntegratedSelection />
<TableSelection selectByRowClick highlightSelected showSelectAll />
<TableHeaderRow allowSorting allowResizing allowDragging />
</Grid>
</Paper>

5
goTorrentWebUI/src/login.js
View File

@@ -88,7 +88,7 @@ export default class Login extends React.Component {
render() {
const { classes, onClose, handleRequestClose, handleSubmit } = this.props;
return (
<Dialog open={this.state.open} onClose={this.handleRequestClose} ignoreBackdropClick={true} disableBackdrop={true}>
<Dialog open={this.state.open} onClose={this.handleRequestClose} disableBackdropClick disableEscapeKeyDown>
<DialogTitle>Login Here</DialogTitle>
<DialogContent>
<DialogContentText>
@@ -106,9 +106,10 @@ export default class Login extends React.Component {
type="text"
placeholder="Username"
fullWidth
required
onChange={this.setUserNameValue}
/>
<TextField id="password" type="password" label="Password" placeholder="Password" fullWidth onChange={this.setPasswordValue} />
<TextField id="password" type="password" label="Password" placeholder="Password" required fullWidth onChange={this.setPasswordValue} />
</DialogContent>
<DialogActions>
<Button onClick={this.handleRequestClose} color="primary">

16
goTorrentWebUI/src/store/reducer.js
View File

@@ -157,6 +157,7 @@ const reducer = (state = initialState, action) => {
if (buttonStateTest.length > 0 && buttonStateTest2.length === 0){
let buttonStateFinal = [{startButton: "default", stopButton: "primary", deleteButton: "secondary", fSeedButton: "default", fRecheckButton: "primary"}]
console.log("ButtonStateFil")
return {
...state,
buttonState: buttonStateFinal
@@ -179,14 +180,13 @@ const reducer = (state = initialState, action) => {
};
}
}
return {
...state,
buttonState: buttonStateFinal
};
default:
return state;
let buttonStateFinal = state.buttonStateDefault //If we can't match, just make it default
return {
...state,
buttonState: buttonStateFinal
};
}
};
console.log("no actiontypes found", action)

5
goTorrentWebUI/src/torrentlist.js
View File

@@ -5,7 +5,7 @@ import {BootstrapTable, TableHeaderColumn} from 'react-bootstrap-table';
import Paper from 'material-ui/Paper';
import {
SortingState, IntegratedSorting, VirtualTableLayout, SelectionState, FilteringState, IntegratedFiltering,
SortingState, IntegratedSorting, IntegratedSelection, VirtualTableLayout, SelectionState, FilteringState, IntegratedFiltering,
} from '@devexpress/dx-react-grid';
import {
@@ -134,7 +134,8 @@ class TorrentListTable extends React.Component {
<DragDropProvider/>
<TableColumnResizing columnWidths={this.state.columnWidths} onColumnWidthsChange={this.changeColumnWidths}/>
<TableColumnReordering order={this.state.columnOrder} onOrderChange={this.changeColumnOrder} />
<TableSelection selectByRowClick highlightSelected />
<IntegratedSelection />
<TableSelection selectByRowClick highlightSelected showSelectAll />
<TableHeaderRow allowSorting allowResizing allowDragging />
</Grid>
</Paper>