secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Polishing modal fields and privacy settings

Browse Source
This commit is contained in:
James Barnsley
2018-06-06 21:11:27 +12:00
parent 12054ffcb4
commit 248e476f15
16 changed files with 21418 additions and 23218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/components/Modal/EditRadioModal.js
View File

@ -195,7 +195,7 @@ export default class EditRadioModal extends React.Component{
<h1>Radio</h1>
<h2 className="grey-text">Add and remove seeds to shape the sound of your radio. Radio uses Spotify's recommendations engine to suggest tracks similar to your seeds.</h2>
<form>
<form onSubmit={e => this.addSeed()}>
{this.renderSeeds()}
<div className="field text">
@ -204,10 +204,11 @@ export default class EditRadioModal extends React.Component{
<input
type="text"
onChange={e => this.setState({uri: e.target.value, error_message: null})}
value={this.state.uri} />
<span className="button discrete add-uri no-hover" onClick={e => this.addSeed()}>
value={this.state.uri}
/>
<button type="submit" className="discrete add-uri no-hover">
<Icon name="add" />Add
</span>
</button>
{this.state.error_message ? <span className="description error">{this.state.error_message}</span> : null}
</div>
</div>

30
src/js/components/Modal/InitialSetupModal.js
View File

@ -22,8 +22,11 @@ export default class InitialSetupModal extends React.Component{
handleSubmit(e){
e.preventDefault();
var self = this;
// Force local username change, even if remote connection absent/failed
this.props.pusherActions.setUsername(this.state.username, true);
this.props.pusherActions.setUsername(this.state.username);
this.props.uiActions.set({
initial_setup_complete: true,
allow_reporting: this.state.allow_reporting
@ -36,11 +39,19 @@ export default class InitialSetupModal extends React.Component{
this.setState({saving: true});
// Wait two seconds to allow our actions to complete
// Then reload the interface
// Wait a second to allow changes to apply to store
setTimeout(function(){
window.location.reload(true);
}, 2000);
// We've changed a connection setting, so need to reload
if (self.state.host !== self.props.host || self.state.port !== self.props.port || self.state.ssl !== self.props.ssl){
window.location.reload(true);
// Safe to just close modal
} else {
self.props.uiActions.closeModal();
}
}, 1000);
return false;
}
@ -85,7 +96,6 @@ export default class InitialSetupModal extends React.Component{
</div>
</div>
<div className="field checkbox">
<div className="name">Encryption</div>
<div className="input">
<label>
<input
@ -101,8 +111,7 @@ export default class InitialSetupModal extends React.Component{
</div>
</div>
<div className="field checkbox no-label">
<div className="name">Reporting</div>
<div className="field checkbox">
<div className="input">
<label>
<input
@ -113,13 +122,12 @@ export default class InitialSetupModal extends React.Component{
<span className="label">
Allow reporting of anonymous usage statistics
</span>
<div className="description">
Google Analytics and Sentry are used to collect usage data and errors to help trace issues and provide valuable insight into how we can continue to make improvements. All personal information is anonymized prior to collection.
</div>
</label>
</div>
</div>
{!this.state.allow_reporting ? <p className="description">This anonymous usage data is important in identifying errors and potential features that make Iris better for everyone. Want to know more? Read the <a href="https://github.com/jaedb/Iris/wiki/Terms-of-use#privacy-policy" target="_blank">privacy policy</a>.</p> : null}
<div className="actions centered-text">
<button className={"primary large"+(this.state.saving ? " working" : "")} onClick={e => this.handleSubmit(e)}>
{this.state.saving ? "Saving" : "Save"}