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

Precursor to scroll position history; Restoring Genius API; Settings services

Browse Source
This commit is contained in:
James Barnsley
2018-03-31 20:36:36 +13:00
parent 2b186e9ef7
commit 9ecddcc1b5
12 changed files with 26406 additions and 27319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ export default class GridItem extends React.Component{
handleClick(e){
if (this.props.onClick && e.target.tagName.toLowerCase() !== 'a'){
this.props.onClick(e)
this.props.onClick(e);
}
}

27
src/js/components/Link.js Executable file
View File

@ -0,0 +1,27 @@
import React from 'react'
import { Link } from 'react-router'
export default class Link extends React.Component{
constructor(props){
super(props);
}
handleClick(e){
if (!this.props.retainScroll){
window.scrollTo(0, 0);
}
}
render(){
return (
<Link
onClick={e => this.handleClick(e)}
className={this.props.className ? this.props.className : null}
to={to}>
{this.props.children}
</Link>
);
}
}

18
src/js/components/Services.js
View File

@ -164,7 +164,7 @@ class Services extends React.Component{
}
renderLastfm(){
var user_object = this.props.core.users["lastfm:user:"+this.props.lastfm.session.name];
var user_object = (this.props.lastfm.session ? this.props.core.users["lastfm:user:"+this.props.lastfm.session.name] : null);
if (user_object){
var user = (
<span className="user">
@ -265,22 +265,22 @@ class Services extends React.Component{
renderMenu(){
if (this.props.spotify.me){
var spotify_user = <Thumbnail circle={true} size="small" images={this.props.spotify.me.images} />
var spotify_icon = <Thumbnail circle={true} size="small" images={this.props.spotify.me.images} />
} else {
var spotify_user = <Thumbnail circle={true} size="small" />
var spotify_icon = <Thumbnail circle={true} size="small" />
}
if (this.props.core.users["lastfm:user:"+this.props.lastfm.session.name]){
var lastfm_user = <Thumbnail circle={true} size="small" images={this.props.core.users["lastfm:user:"+this.props.lastfm.session.name].image} />
if (this.props.lastfm.session && this.props.core.users["lastfm:user:"+this.props.lastfm.session.name]){
var lastfm_icon = <Thumbnail circle={true} size="small" images={this.props.core.users["lastfm:user:"+this.props.lastfm.session.name].image} />
} else {
var lastfm_user = <Thumbnail circle={true} size="small" />
var lastfm_icon = <FontAwesome name="lastfm" />
}
return (
<div className="menu">
<div className="menu-item-wrapper">
<Link className={"menu-item"+(this.props.active == 'spotify' ? ' active' : '')} to={this.props.active == 'spotify' ? global.baseURL+'settings' : global.baseURL+'settings/service/spotify'}>
{spotify_user}
{spotify_icon}
<div className="title">
Spotify
</div>
@ -289,7 +289,7 @@ class Services extends React.Component{
</div>
<div className="menu-item-wrapper">
<Link className={"menu-item"+(this.props.active == 'lastfm' ? ' active' : '')} to={this.props.active == 'lastfm' ? global.baseURL+'settings' : global.baseURL+'settings/service/lastfm'}>
{lastfm_user}
{lastfm_icon}
<div className="title">
LastFM
</div>
@ -298,7 +298,7 @@ class Services extends React.Component{
</div>
<div className="menu-item-wrapper">
<Link className={"menu-item"+(this.props.active == 'snapcast' ? ' active' : '')} to={this.props.active == 'snapcast' ? global.baseURL+'settings' : global.baseURL+'settings/service/snapcast'}>
<FontAwesome name="rss" />
<FontAwesome name="sliders" />
<div className="title">
Snapcast
</div>