This commit is contained in:
James Barnsley
2021-05-10 21:07:15 +12:00
parent 4f681091ab
commit 4cc2bba1ef
4 changed files with 281 additions and 387 deletions

View File

@ -169375,8 +169375,7 @@ function getTrackLyrics(uri, path) {
return function (dispatch, getState) { return function (dispatch, getState) {
dispatch(coreActions.itemLoaded({ dispatch(coreActions.itemLoaded({
uri: uri, uri: uri,
lyrics: null, lyrics: undefined
lyrics_path: null
})); }));
var url = "//".concat(getState().mopidy.host, ":").concat(getState().mopidy.port, "/iris/http/get_lyrics?path=").concat(path, "&connection_id=").concat(getState().pusher.connection_id); var url = "//".concat(getState().mopidy.host, ":").concat(getState().mopidy.port, "/iris/http/get_lyrics?path=").concat(path, "&connection_id=").concat(getState().pusher.connection_id);
var config = { var config = {
@ -169401,24 +169400,26 @@ function getTrackLyrics(uri, path) {
return response.json(); return response.json();
}).then(function (data) { }).then(function (data) {
if (data.result) { if (data.result) {
var html = $(data.result); var html = $(data.result); // Give the JS thread a moment to render the complex page (lots of JS within it)
var lyrics = html.find('.lyrics');
if (lyrics.length > 0) { setTimeout(function () {
lyrics = lyrics.first(); var lyrics = html.find('div[class^="Lyrics__Container"], div.lyrics');
lyrics.find('a').replaceWith(function (k, v) {
return v;
});
var lyrics_html = lyrics.html();
lyrics_html = lyrics_html.replace(/(\[)/g, '<span class="mid_grey-text">[');
lyrics_html = lyrics_html.replace(/(\])/g, ']</span>'); // console.debug(lyrics_html);
dispatch(coreActions.itemLoaded({ if (lyrics.length > 0) {
uri: uri, lyrics = lyrics.first();
lyrics: lyrics_html, lyrics.find('a').replaceWith(function (k, v) {
lyrics_path: path return v;
})); });
} var lyrics_html = lyrics.html();
lyrics_html = lyrics_html.replace(/(\[)/g, '<span class="mid_grey-text">[');
lyrics_html = lyrics_html.replace(/(\])/g, ']</span>');
dispatch(coreActions.itemLoaded({
uri: uri,
lyrics: lyrics_html,
lyrics_path: path
}));
}
}, 500);
} else { } else {
dispatch(coreActions.handleException('Could not get track lyrics', data.error)); dispatch(coreActions.handleException('Could not get track lyrics', data.error));
} }
@ -194732,43 +194733,19 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js"); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
/* harmony import */ var redux__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); /* harmony import */ var _components_Link__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../components/Link */ "./src/js/components/Link.js");
/* harmony import */ var _components_Link__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../components/Link */ "./src/js/components/Link.js"); /* harmony import */ var _Modal__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Modal */ "./src/js/views/modals/Modal.js");
/* harmony import */ var _Modal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Modal */ "./src/js/views/modals/Modal.js"); /* harmony import */ var _components_Thumbnail__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../components/Thumbnail */ "./src/js/components/Thumbnail.js");
/* harmony import */ var _components_Thumbnail__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../components/Thumbnail */ "./src/js/components/Thumbnail.js"); /* harmony import */ var _components_LinksSentence__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../components/LinksSentence */ "./src/js/components/LinksSentence.js");
/* harmony import */ var _components_LinksSentence__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../components/LinksSentence */ "./src/js/components/LinksSentence.js"); /* harmony import */ var _components_Loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../components/Loader */ "./src/js/components/Loader.js");
/* harmony import */ var _components_Loader__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../components/Loader */ "./src/js/components/Loader.js"); /* harmony import */ var _components_Icon__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../components/Icon */ "./src/js/components/Icon.js");
/* harmony import */ var _components_Icon__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../components/Icon */ "./src/js/components/Icon.js"); /* harmony import */ var _components_Fields_ProgressSlider__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../components/Fields/ProgressSlider */ "./src/js/components/Fields/ProgressSlider.js");
/* harmony import */ var _components_Fields_ProgressSlider__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../components/Fields/ProgressSlider */ "./src/js/components/Fields/ProgressSlider.js"); /* harmony import */ var _services_ui_actions__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../services/ui/actions */ "./src/js/services/ui/actions.js");
/* harmony import */ var _services_ui_actions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../services/ui/actions */ "./src/js/services/ui/actions.js"); /* harmony import */ var _services_mopidy_actions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../services/mopidy/actions */ "./src/js/services/mopidy/actions.js");
/* harmony import */ var _services_mopidy_actions__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../services/mopidy/actions */ "./src/js/services/mopidy/actions.js"); /* harmony import */ var _services_genius_actions__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../services/genius/actions */ "./src/js/services/genius/actions.js");
/* harmony import */ var _services_genius_actions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../services/genius/actions */ "./src/js/services/genius/actions.js"); /* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js");
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js"); /* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../locale */ "./src/js/locale/index.js");
/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../locale */ "./src/js/locale/index.js"); /* harmony import */ var _util_selectors__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../util/selectors */ "./src/js/util/selectors.js");
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@ -194825,12 +194802,12 @@ var Lyrics = function Lyrics(_ref2) {
lyrics = _ref3.lyrics, lyrics = _ref3.lyrics,
duration = _ref3.duration; duration = _ref3.duration;
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_13__["isLoading"])(load_queue, ['genius_'])) { if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_12__["isLoading"])(load_queue, ['genius_'])) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "lyrics", className: "lyrics",
"data-qa-node": "div", "data-qa-node": "div",
"data-qa-file": "KioskMode" "data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_7__["default"], { }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_6__["default"], {
body: true, body: true,
loading: true, loading: true,
"data-qa-node": "Loader", "data-qa-node": "Loader",
@ -194851,343 +194828,260 @@ var Lyrics = function Lyrics(_ref2) {
return null; return null;
}; };
var KioskMode = /*#__PURE__*/function (_React$Component) { var KioskMode = function KioskMode() {
_inherits(KioskMode, _React$Component); var dispatch = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useDispatch"])();
var play_state = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.mopidy.play_state;
});
var time_position = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.mopidy.time_position;
});
var core_current_track = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.core.current_track;
});
var itemSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_14__["makeItemSelector"])(core_current_track === null || core_current_track === void 0 ? void 0 : core_current_track.uri);
var current_track = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(itemSelector);
var stream_title = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.core.stream_title;
});
var genius_available = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.genius.authorization;
});
var show_lyrics = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useSelector"])(function (state) {
return state.ui.show_lyrics;
});
var lyrics_enabled = show_lyrics && genius_available;
var _super = _createSuper(KioskMode); var _ref4 = current_track || {},
_ref4$images = _ref4.images,
images = _ref4$images === void 0 ? [] : _ref4$images;
function KioskMode() { var setWindowTitle = function setWindowTitle() {
var _this; if (stream_title) {
var stream = stream_title.split(' - ');
dispatch(_services_ui_actions__WEBPACK_IMPORTED_MODULE_9__["setWindowTitle"](Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('modal.kiosk.title_window', {
name: stream[1],
artist: stream[0]
})));
} else if (current_track) {
var artist = current_track.artists.map(function (artist) {
return artist.name;
}).join(', ');
dispatch(_services_ui_actions__WEBPACK_IMPORTED_MODULE_9__["setWindowTitle"](Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('modal.kiosk.title_window', {
name: current_track.name,
artist: artist
})));
} else {
dispatch(_services_ui_actions__WEBPACK_IMPORTED_MODULE_9__["setWindowTitle"](Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('modal.kiosk.title')));
}
};
_classCallCheck(this, KioskMode); var fetchLyrics = function fetchLyrics() {
var _current_track$artist;
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { if (!show_lyrics || !genius_available) return;
args[_key] = arguments[_key]; if (!current_track || !(current_track !== null && current_track !== void 0 && (_current_track$artist = current_track.artists) !== null && _current_track$artist !== void 0 && _current_track$artist.length)) return;
if (current_track.lyrics) return; // We got results, but failed to load the lyrics, so re-try
if (current_track.lyrics_results && current_track.lyrics === null) {
dispatch(_services_genius_actions__WEBPACK_IMPORTED_MODULE_11__["getTrackLyrics"](current_track.uri, current_track.path));
return;
} }
_this = _super.call.apply(_super, [this].concat(args)); dispatch(_services_genius_actions__WEBPACK_IMPORTED_MODULE_11__["findTrackLyrics"](current_track.uri));
};
_defineProperty(_assertThisInitialized(_this), "componentDidUpdate", function (_ref4) { Object(react__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(function () {
var prev_current_track = _ref4.current_track, setWindowTitle();
prev_stream_title = _ref4.stream_title; }, []);
var _this$props = _this.props, Object(react__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(function () {
current_track = _this$props.current_track, if (current_track) {
stream_title = _this$props.stream_title, setWindowTitle();
show_lyrics = _this$props.show_lyrics, fetchLyrics();
genius_authorized = _this$props.genius_authorized, }
findTrackLyrics = _this$props.geniusActions.findTrackLyrics; }, [current_track === null || current_track === void 0 ? void 0 : current_track.uri]);
Object(react__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(function () {
if (lyrics_enabled) {
fetchLyrics();
}
}, [lyrics_enabled]);
if (!prev_stream_title && stream_title) { var toggleLyrics = function toggleLyrics() {
_this.setWindowTitle(); if (!genius_available) {
} else if (!prev_current_track && current_track) { _services_ui_actions__WEBPACK_IMPORTED_MODULE_9__["createNotification"]({
_this.setWindowTitle(); level: 'warning',
content: "".concat(Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('track.want_lyrics'), " ").concat(Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('settings.title'))
if (show_lyrics && genius_authorized && current_track && current_track.artists && !current_track.lyrics_results) {
findTrackLyrics(current_track);
}
} else if (show_lyrics !== show_lyrics && show_lyrics && current_track) {
if (genius_authorized && current_track && current_track.artists && !current_track.lyrics_results) {
findTrackLyrics(current_track);
}
}
});
_defineProperty(_assertThisInitialized(_this), "setWindowTitle", function () {
var _this$props2 = _this.props,
current_track = _this$props2.current_track,
stream_title = _this$props2.stream_title,
setWindowTitle = _this$props2.uiActions.setWindowTitle;
if (stream_title) {
var stream = stream_title.split(' - ');
setWindowTitle(Object(_locale__WEBPACK_IMPORTED_MODULE_14__["i18n"])('modal.kiosk.title_window', {
name: stream[1],
artist: stream[0]
}));
} else if (current_track) {
var artist = current_track.artists.map(function (artist) {
return artist.name;
}).join(', ');
setWindowTitle(Object(_locale__WEBPACK_IMPORTED_MODULE_14__["i18n"])('modal.kiosk.title_window', {
name: current_track.name,
artist: artist
}));
} else {
setWindowTitle(Object(_locale__WEBPACK_IMPORTED_MODULE_14__["i18n"])('modal.kiosk.title'));
}
});
_defineProperty(_assertThisInitialized(_this), "toggleLyrics", function () {
var _this$props3 = _this.props,
show_lyrics = _this$props3.show_lyrics,
uiActions = _this$props3.uiActions,
genius_authorized = _this$props3.genius_authorized,
current_track = _this$props3.current_track;
if (!genius_authorized) {
uiActions.createNotification({
level: 'warning',
content: "".concat(Object(_locale__WEBPACK_IMPORTED_MODULE_14__["i18n"])('track.want_lyrics'), " ").concat(Object(_locale__WEBPACK_IMPORTED_MODULE_14__["i18n"])('settings.title'))
});
return;
}
uiActions.set({
show_lyrics: !show_lyrics
}); });
return;
}
if (!show_lyrics && _this.props.genius_authorized && current_track && current_track.artists && !current_track.lyrics_results) { dispatch(_services_ui_actions__WEBPACK_IMPORTED_MODULE_9__["set"]({
_this.props.geniusActions.findTrackLyrics(current_track); show_lyrics: !show_lyrics
} }));
}); fetchLyrics();
};
return _this; var extraControls = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "control",
onClick: toggleLyrics,
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, lyrics_enabled ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
name: "toggle_on",
className: "turquoise-text",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
}) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
name: "toggle_off",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
style: {
paddingLeft: '6px',
fontWeight: 'bold'
},
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_locale__WEBPACK_IMPORTED_MODULE_13__["I18n"], {
path: "modal.kiosk.lyrics",
"data-qa-node": "I18n",
"data-qa-file": "KioskMode"
})));
var playButton = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
className: "control play",
type: "button",
onClick: function onClick() {
return dispatch(_services_mopidy_actions__WEBPACK_IMPORTED_MODULE_10__["play"]());
},
"data-qa-node": "button",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
name: "play_circle_filled",
type: "material",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
}));
if (play_state === 'playing') {
playButton = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
className: "control play",
type: "button",
onClick: function onClick() {
return dispatch(_services_mopidy_actions__WEBPACK_IMPORTED_MODULE_10__["pause"]());
},
"data-qa-node": "button",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
name: "pause_circle_filled",
type: "material",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
}));
} }
_createClass(KioskMode, [{ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_Modal__WEBPACK_IMPORTED_MODULE_3__["default"], {
key: "componentDidMount", className: "modal--kiosk-mode",
value: function componentDidMount() { extraControls: extraControls,
var _this$props4 = this.props, "data-qa-node": "Modal",
current_track = _this$props4.current_track, "data-qa-file": "KioskMode"
genius_authorized = _this$props4.genius_authorized, }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Thumbnail__WEBPACK_IMPORTED_MODULE_4__["default"], {
show_lyrics = _this$props4.show_lyrics, className: "background",
geniusActions = _this$props4.geniusActions; images: images,
this.setWindowTitle(); placeholder: false,
"data-qa-node": "Thumbnail",
if (show_lyrics && genius_authorized && current_track && current_track.artists && !current_track.lyrics_results) { "data-qa-file": "KioskMode"
geniusActions.findTrackLyrics(current_track); }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
} className: "player player--".concat(lyrics_enabled ? 'with' : 'without', "-lyrics"),
} "data-qa-node": "div",
}, { "data-qa-file": "KioskMode"
key: "togglePlay", }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
value: function togglePlay(e) { className: "track",
if (this.props.play_state == 'playing') { "data-qa-node": "div",
this.props.mopidyActions.pause(); "data-qa-file": "KioskMode"
} else { }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
this.props.mopidyActions.play(); className: "track__artwork",
} "data-qa-node": "div",
} "data-qa-file": "KioskMode"
}, { }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Thumbnail__WEBPACK_IMPORTED_MODULE_4__["default"], {
key: "renderPlayButton", images: images,
value: function renderPlayButton() { useImageTag: true,
var _this2 = this; "data-qa-node": "Thumbnail",
"data-qa-file": "KioskMode"
var button = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "control play", className: "track__info",
onClick: function onClick() { "data-qa-node": "div",
return _this2.props.mopidyActions.play(); "data-qa-file": "KioskMode"
}, }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
"data-qa-node": "button", className: "title",
"data-qa-file": "KioskMode" "data-qa-node": "div",
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], { "data-qa-file": "KioskMode"
name: "play_circle_filled", }, stream_title && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
type: "material", "data-qa-node": "span",
"data-qa-node": "Icon", "data-qa-file": "KioskMode"
"data-qa-file": "KioskMode" }, stream_title), !stream_title && current_track && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
})); "data-qa-node": "span",
"data-qa-file": "KioskMode"
if (this.props.play_state == 'playing') { }, current_track.name), !stream_title && !current_track && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
button = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { "data-qa-node": "span",
className: "control play", "data-qa-file": "KioskMode"
onClick: function onClick() { }, "-")), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_LinksSentence__WEBPACK_IMPORTED_MODULE_5__["default"], {
return _this2.props.mopidyActions.pause(); items: current_track ? current_track.artists : null,
}, type: "artist",
"data-qa-node": "button", nolinks: true,
"data-qa-file": "KioskMode" "data-qa-node": "LinksSentence",
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], { "data-qa-file": "KioskMode"
name: "pause_circle_filled", }))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
type: "material", className: "playback",
"data-qa-node": "Icon", "data-qa-node": "div",
"data-qa-file": "KioskMode" "data-qa-file": "KioskMode"
})); }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
} className: "playback__controls",
"data-qa-node": "div",
return button; "data-qa-file": "KioskMode"
} }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
}, { className: "control previous",
key: "render", onClick: function onClick() {
value: function render() { return dispatch(_services_mopidy_actions__WEBPACK_IMPORTED_MODULE_10__["previous"]());
var _this3 = this; },
type: "button",
var _this$props5 = this.props, "data-qa-node": "button",
show_lyrics = _this$props5.show_lyrics, "data-qa-file": "KioskMode"
current_track = _this$props5.current_track, }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
stream_title = _this$props5.stream_title, name: "navigate_before",
load_queue = _this$props5.load_queue, type: "material",
genius_authorized = _this$props5.genius_authorized, "data-qa-node": "Icon",
time_position = _this$props5.time_position; "data-qa-file": "KioskMode"
var lyrics_enabled = show_lyrics && genius_authorized; })), playButton, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
className: "control next",
if (current_track && current_track.images) { onClick: function onClick() {
var images = current_track.images; return dispatch(_services_mopidy_actions__WEBPACK_IMPORTED_MODULE_10__["next"]());
} else { },
var images = []; type: "button",
} "data-qa-node": "button",
"data-qa-file": "KioskMode"
var extraControls = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_7__["default"], {
className: "control", name: "navigate_next",
onClick: this.toggleLyrics, type: "material",
"data-qa-node": "div", "data-qa-node": "Icon",
"data-qa-file": "KioskMode" "data-qa-file": "KioskMode"
}, lyrics_enabled ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], { }))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
name: "toggle_on", className: "playback__progress",
className: "turquoise-text", "data-qa-node": "div",
"data-qa-node": "Icon", "data-qa-file": "KioskMode"
"data-qa-file": "KioskMode" }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Fields_ProgressSlider__WEBPACK_IMPORTED_MODULE_8__["default"], {
}) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], { "data-qa-node": "ProgressSlider",
name: "toggle_off", "data-qa-file": "KioskMode"
"data-qa-node": "Icon", })))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(Lyrics, {
"data-qa-file": "KioskMode" show_lyrics: lyrics_enabled,
}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { genius_authorized: genius_available,
style: {
paddingLeft: '6px',
fontWeight: 'bold'
},
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_locale__WEBPACK_IMPORTED_MODULE_14__["I18n"], {
path: "modal.kiosk.lyrics",
"data-qa-node": "I18n",
"data-qa-file": "KioskMode"
})));
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_Modal__WEBPACK_IMPORTED_MODULE_4__["default"], {
className: "modal--kiosk-mode",
extraControls: extraControls,
"data-qa-node": "Modal",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Thumbnail__WEBPACK_IMPORTED_MODULE_5__["default"], {
className: "background",
images: images,
placeholder: false,
"data-qa-node": "Thumbnail",
"data-qa-file": "KioskMode"
}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "player player--".concat(lyrics_enabled ? 'with' : 'without', "-lyrics"),
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "track",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "track__artwork",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Thumbnail__WEBPACK_IMPORTED_MODULE_5__["default"], {
images: images,
useImageTag: true,
"data-qa-node": "Thumbnail",
"data-qa-file": "KioskMode"
})), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "track__info",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "title",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, stream_title && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
"data-qa-node": "span",
"data-qa-file": "KioskMode"
}, stream_title), !stream_title && current_track && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
"data-qa-node": "span",
"data-qa-file": "KioskMode"
}, current_track.name), !stream_title && !current_track && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
"data-qa-node": "span",
"data-qa-file": "KioskMode"
}, "-")), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_LinksSentence__WEBPACK_IMPORTED_MODULE_6__["default"], {
items: current_track ? current_track.artists : null,
type: "artist",
nolinks: true,
"data-qa-node": "LinksSentence",
"data-qa-file": "KioskMode"
}))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "playback",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "playback__controls",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
className: "control previous",
onClick: function onClick() {
return _this3.props.mopidyActions.previous();
},
"data-qa-node": "button",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], {
name: "navigate_before",
type: "material",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
})), this.renderPlayButton(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
className: "control next",
onClick: function onClick() {
return _this3.props.mopidyActions.next();
},
"data-qa-node": "button",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Icon__WEBPACK_IMPORTED_MODULE_8__["default"], {
name: "navigate_next",
type: "material",
"data-qa-node": "Icon",
"data-qa-file": "KioskMode"
}))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "playback__progress",
"data-qa-node": "div",
"data-qa-file": "KioskMode"
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Fields_ProgressSlider__WEBPACK_IMPORTED_MODULE_9__["default"], {
"data-qa-node": "ProgressSlider",
"data-qa-file": "KioskMode"
})))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(Lyrics, {
show_lyrics: lyrics_enabled,
load_queue: load_queue,
genius_authorized: genius_authorized,
time_position: time_position,
current_track: current_track,
"data-qa-node": "Lyrics",
"data-qa-file": "KioskMode"
}));
}
}]);
return KioskMode;
}(react__WEBPACK_IMPORTED_MODULE_0___default.a.Component);
var mapStateToProps = function mapStateToProps(state) {
var _state$core = state.core,
stream_title = _state$core.stream_title,
core_current_track = _state$core.current_track,
items = _state$core.items,
_state$mopidy = state.mopidy,
play_state = _state$mopidy.play_state,
time_position = _state$mopidy.time_position,
_state$ui = state.ui,
load_queue = _state$ui.load_queue,
show_lyrics = _state$ui.show_lyrics,
genius_authorized = state.genius.authorization;
var current_track = core_current_track && items[core_current_track.uri] !== undefined ? items[core_current_track.uri] : null;
return {
play_state: play_state,
current_track: current_track,
stream_title: stream_title,
time_position: time_position, time_position: time_position,
load_queue: load_queue, current_track: current_track,
show_lyrics: show_lyrics, "data-qa-node": "Lyrics",
genius_authorized: genius_authorized "data-qa-file": "KioskMode"
}; }));
}; };
var mapDispatchToProps = function mapDispatchToProps(dispatch) { /* harmony default export */ __webpack_exports__["default"] = (KioskMode);
return {
uiActions: Object(redux__WEBPACK_IMPORTED_MODULE_2__["bindActionCreators"])(_services_ui_actions__WEBPACK_IMPORTED_MODULE_10__, dispatch),
mopidyActions: Object(redux__WEBPACK_IMPORTED_MODULE_2__["bindActionCreators"])(_services_mopidy_actions__WEBPACK_IMPORTED_MODULE_11__, dispatch),
geniusActions: Object(redux__WEBPACK_IMPORTED_MODULE_2__["bindActionCreators"])(_services_genius_actions__WEBPACK_IMPORTED_MODULE_12__, dispatch)
};
};
/* harmony default export */ __webpack_exports__["default"] = (Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(mapStateToProps, mapDispatchToProps)(KioskMode));
/***/ }), /***/ }),

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -115,7 +115,7 @@
// Release details // Release details
// These are automatically injected to built HTML // These are automatically injected to built HTML
var build = "1620551127"; var build = "1620637434";
var version = "3.57.6"; var version = "3.57.6";
// Construct the script tag // Construct the script tag