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

Backend functional, just need to tidy UI

Browse Source
This commit is contained in:
James Barnsley
2018-01-12 09:08:12 +13:00
parent 59e751eea9
commit c4c3ecf45e
8 changed files with 405 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mopidy_iris/static/app.css
View File

@ -3219,6 +3219,13 @@ input[type="submit"] {
.field.range .input-range__track,
.field.range .input-range__slider-container {
transition: none; }
.field.range .input-range__track--background {
background: #a3a19f; }
.field.range .input-range__track--active {
background: #32b5f2; }
.field.range .input-range__slider {
background: #32b5f2;
border-color: #32b5f2; }
.field .description {
display: inline-block;
padding: 10px 14px;
@ -5835,6 +5842,17 @@ main .track-view {
.discover-view .autocomplete-field .input:after {
background: #32b5f2; }
.discover-view .tunabilities {
margin: 10px -10px; }
.discover-view .tunabilities .tunability {
width: 25%;
box-sizing: border-box;
padding: 10px; }
.discover-view .tunabilities .tunability label {
text-transform: capitalize; }
.discover-view .tunabilities .tunability .input-range .input-range__label-container {
display: none; }
.discover-view section .grid {
padding-bottom: 20px; }

203
mopidy_iris/static/app.js
View File

@ -2574,6 +2574,7 @@ function getFavorites() {
function getRecommendations() {
var uris = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
var limit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 20;
var tunabilities = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
return function (dispatch, getState) {
@ -2614,6 +2615,16 @@ function getRecommendations() {
endpoint += '&seed_genres=' + genres.join(',');
endpoint += '&limit=' + limit;
console.log(tunabilities);
if (tunabilities) {
for (var key in tunabilities) {
if (tunabilities.hasOwnProperty(key)) {
endpoint += '&' + key + '=' + tunabilities[key];
}
}
}
sendRequest(dispatch, getState, endpoint).then(function (response) {
var tracks = Object.assign([], response.tracks);
@ -69613,9 +69624,115 @@ var Discover = function (_React$Component) {
adding_seed: false,
seeds: [],
tunabilities: {
loudness: {
acousticness: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100
max: 100,
value: {
min: 0,
max: 100
}
},
danceability: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
energy: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
instrumentalness: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
key: {
enabled: false,
min: 0,
max: 11,
value: {
min: 0,
max: 11
}
},
liveness: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
loudness: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
popularity: {
enabled: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
speechiness: {
enabled: false,
convert_to_decimal: true,
description: "The presence of spoken words in a track",
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
tempo: {
enabled: false,
convert_to_decimal: true,
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
},
valence: {
enabled: false,
convert_to_decimal: true,
description: "The musical positiveness conveyed by a track",
min: 0,
max: 100,
value: {
min: 0,
max: 100
}
}
}
};
@ -69707,7 +69824,21 @@ var Discover = function (_React$Component) {
var tunabilities = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state.tunabilities;
if (seeds.length > 0) {
this.props.spotifyActions.getRecommendations(seeds, 50, tunabilities);
var digested_tunabilities = {};
for (var key in tunabilities) {
if (tunabilities.hasOwnProperty(key) && tunabilities[key].enabled) {
var tunability = tunabilities[key];
if (tunability.convert_to_decimal) {
tunability.value.max = tunability.max / 100;
tunability.value.min = tunability.min / 100;
}
digested_tunabilities[key + "_max"] = tunability.value.max;
digested_tunabilities[key + "_min"] = tunability.value.min;
}
}
this.props.spotifyActions.getRecommendations(seeds, 50, digested_tunabilities);
}
}
}, {
@ -69721,7 +69852,6 @@ var Discover = function (_React$Component) {
var seeds = this.state.seeds;
seeds.splice(index, 1);
this.setState({ seeds: seeds });
this.getRecommendations(seeds);
}
}, {
key: 'handleSelect',
@ -69729,7 +69859,6 @@ var Discover = function (_React$Component) {
var seeds = this.state.seeds;
seeds.push(uri);
this.setState({ seeds: seeds });
this.getRecommendations(seeds);
}
}, {
key: 'renderSeeds',
@ -69807,8 +69936,14 @@ var Discover = function (_React$Component) {
key: 'setTunability',
value: function setTunability(name, value) {
var tunabilities = this.state.tunabilities;
tunabilities[name] = value;
console.log(tunabilities);
tunabilities[name].value = value;
this.setState({ tunabilities: tunabilities });
}
}, {
key: 'toggleTunability',
value: function toggleTunability(name) {
var tunabilities = this.state.tunabilities;
tunabilities[name].enabled = !tunabilities[name].enabled;
this.setState({ tunabilities: tunabilities });
}
}, {
@ -69819,11 +69954,12 @@ var Discover = function (_React$Component) {
var tunabilities = [];
for (var key in this.state.tunabilities) {
if (this.state.tunabilities.hasOwnProperty(key)) {
var tunability = {
name: key,
value: this.state.tunabilities[key]
};
tunabilities.push(tunability);
var tunability = Object.assign({}, this.state.tunabilities[key], {
name: key
});
if (tunability.enabled) {
tunabilities.push(tunability);
}
}
}
@ -69837,16 +69973,30 @@ var Discover = function (_React$Component) {
_react2.default.createElement(
'label',
null,
tunability.name
_react2.default.createElement(
'span',
{ className: 'has-tooltip sentence' },
tunability.name,
_react2.default.createElement(
'span',
{ className: 'tooltip' },
tunability.description
)
)
),
_react2.default.createElement(_reactInputRange2.default, {
maxValue: 100,
minValue: 0,
value: tunability.value,
onChange: function onChange(value) {
return _this3.setTunability(tunability.name, value);
}
})
_react2.default.createElement(
'div',
{ className: 'input' },
_react2.default.createElement(_reactInputRange2.default, {
disabled: !tunability.enabled,
minValue: tunability.min,
maxValue: tunability.max,
value: tunability.value,
onChange: function onChange(value) {
return _this3.setTunability(tunability.name, value);
}
})
)
);
})
);
@ -69964,6 +70114,8 @@ var Discover = function (_React$Component) {
}, {
key: 'render',
value: function render() {
var _this5 = this;
return _react2.default.createElement(
'div',
{ className: 'view discover-view' },
@ -69985,7 +70137,14 @@ var Discover = function (_React$Component) {
'Add seeds and musical properties below to build your sound'
),
this.renderSeeds(),
this.renderTunabilities()
this.renderTunabilities(),
_react2.default.createElement(
'span',
{ className: 'button primary', onClick: function onClick(e) {
return _this5.getRecommendations();
} },
'Apply'
)
)
),
this.renderResults()

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -38,7 +38,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1515641948";
var build = "1515697971";
var version = "3.11.0";
// Construct the script tag