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

Refining token button; Investigating auth popup issue (#200)

Browse Source
This commit is contained in:
James Barnsley
2017-09-29 08:56:30 +13:00
parent 8f332d87c2
commit bf7252fc96
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/components/Modal/AuthorizationModal_Send.js
View File

@ -31,7 +31,7 @@ class AuthorizationModal_Send extends React.Component{
}
if (connections.length <= 0){
return <div className="no-results">No connections available</div>
return <div className="no-results">No peer connections available</div>
} else {
return (
<div className="list small pusher-connection-list">

2
src/js/components/SpotifyAuthenticationFrame.js
View File

@ -81,7 +81,7 @@ class SpotifyAuthenticationFrame extends React.Component{
'playlist-read-collaborative',
'ugc-image-upload' // playlist image uploading
]
var popup = window.open(url+'&scope='+scopes.join('%20'),"popup","height=680,width=400");
var popup = window.open(url+'&scope='+scopes.join('%20'),"popup","height=500,width=350");
// Start timer to check our popup's state
var timer = setInterval(checkPopup, 1000);

19
src/js/views/Settings.js
View File

@ -286,19 +286,13 @@ class Settings extends React.Component {
onBlur={e => this.handleBlur('locale',e.target.value)}
value={this.state.locale} />
<div className="description">
Lowercase <a href="http://en.wikipedia.org/wiki/ISO_639" target="_blank">ISO 639</a> language code and an uppercase <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2" target="_blank">ISO 3166-1 alpha-2</a> country code, joined by an underscore (eg <em>en_NZ</em>)
Lowercase <a href="http://en.wikipedia.org/wiki/ISO_639" target="_blank">ISO 639 language code</a> and an uppercase <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2" target="_blank">ISO 3166-1 alpha-2 country code</a>, joined by an underscore (eg <em>en_NZ</em>)
</div>
</div>
</div>
<h4 className="underline">Spotify</h4>
<div className="field">
<div className="name">Authorization</div>
<div className="input">
<SpotifyAuthenticationFrame />
{ this.renderSendAuthorizationButton() }
</div>
</div>
<div className="field current-user">
<div className="name">Current user</div>
<div className="input">
@ -306,6 +300,14 @@ class Settings extends React.Component {
{ this.renderSpotifyUser() }
</div>
</div>
</div>
<div className="field">
<div className="name">Authorization</div>
<div className="input">
<SpotifyAuthenticationFrame />
{ this.renderSendAuthorizationButton() }
{this.props.spotify.refreshing_token ? <button className="working">Refreshing...</button> : <button onClick={e => this.props.spotifyActions.refreshingToken()}>Force token refresh</button>}
</div>
</div>
<h4 className="underline">Advanced</h4>
@ -353,7 +355,6 @@ class Settings extends React.Component {
<div className="name">Reset</div>
<div className="input">
<ConfirmationButton className="destructive" content="Reset all settings" confirmingContent="Are you sure?" onConfirm={() => this.resetAllSettings()} />
<button onClick={e => this.props.spotifyActions.refreshingToken()}>Refresh Spotify token</button>
</div>
</div>

4
src/scss/global/_forms.scss
View File

@ -140,6 +140,7 @@ input[type="submit"] {
&.working {
position: relative;
cursor: wait !important;
&:after {
pointer-events: none;
@ -147,8 +148,7 @@ input[type="submit"] {
display: block;
content: '';
animation: slideloader 1s infinite;
background: $mid_grey;
opacity: 0.5;
background: rgba(200,200,200,0.4);
top: 0;
left: 0;
bottom: 0;