mirror of
https://github.com/Stremio/stremio-web.git
synced 2026-03-11 17:15:48 +00:00
continuewatching route implemented with maximum code reuse
This commit is contained in:
parent
ce0d0082ef
commit
21e50d323a
4 changed files with 44 additions and 7 deletions
|
|
@ -21,6 +21,10 @@ const routerViewsConfig = [
|
|||
...routesRegexp.library,
|
||||
component: routes.Library
|
||||
},
|
||||
{
|
||||
...routesRegexp.continuewatching,
|
||||
component: routes.Library
|
||||
},
|
||||
{
|
||||
...routesRegexp.search,
|
||||
component: routes.Search
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ const routesRegexp = {
|
|||
regexp: /^\/library(?:\/([^/]*))?$/,
|
||||
urlParamsNames: ['type']
|
||||
},
|
||||
continuewatching: {
|
||||
regexp: /^\/continuewatching(?:\/([^/]*))?$/,
|
||||
urlParamsNames: ['type']
|
||||
},
|
||||
search: {
|
||||
regexp: /^\/search$/,
|
||||
urlParamsNames: []
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
const React = require('react');
|
||||
const PropTypes = require('prop-types');
|
||||
const classnames = require('classnames');
|
||||
const { Button, Multiselect, MainNavBars, LibItem, useProfile } = require('stremio/common');
|
||||
const NotFound = require('stremio/routes/NotFound');
|
||||
const { Button, Multiselect, MainNavBars, LibItem, useProfile, routesRegexp } = require('stremio/common');
|
||||
const useLibrary = require('./useLibrary');
|
||||
const useSelectableInputs = require('./useSelectableInputs');
|
||||
const styles = require('./styles');
|
||||
|
||||
const Library = ({ urlParams, queryParams }) => {
|
||||
const Library = ({ model, urlParams, queryParams }) => {
|
||||
const profile = useProfile();
|
||||
const library = useLibrary(urlParams, queryParams);
|
||||
const library = useLibrary(model, urlParams, queryParams);
|
||||
const [typeSelect, sortSelect] = useSelectableInputs(library);
|
||||
return (
|
||||
<MainNavBars className={styles['library-container']} route={'library'}>
|
||||
|
|
@ -58,10 +59,38 @@ const Library = ({ urlParams, queryParams }) => {
|
|||
};
|
||||
|
||||
Library.propTypes = {
|
||||
urlParams: PropTypes.exact({
|
||||
model: PropTypes.string,
|
||||
urlParams: PropTypes.shape({
|
||||
type: PropTypes.string
|
||||
}),
|
||||
queryParams: PropTypes.instanceOf(URLSearchParams)
|
||||
};
|
||||
|
||||
module.exports = Library;
|
||||
module.exports = ({ urlParams, queryParams }) => {
|
||||
const model = React.useMemo(() => {
|
||||
return typeof urlParams.path === 'string' ?
|
||||
urlParams.path.match(routesRegexp.library.regexp) ?
|
||||
'library'
|
||||
:
|
||||
urlParams.path.match(routesRegexp.continuewatching.regexp) ?
|
||||
'continue_watching'
|
||||
:
|
||||
null
|
||||
:
|
||||
null;
|
||||
}, [urlParams.path]);
|
||||
if (typeof model === 'string') {
|
||||
return (
|
||||
<Library
|
||||
key={model}
|
||||
model={model}
|
||||
urlParams={urlParams}
|
||||
queryParams={queryParams}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<NotFound />
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ const mapLibraryState = (library) => {
|
|||
return { selected, type_names, lib_items };
|
||||
};
|
||||
|
||||
const useLibrary = (urlParams, queryParams) => {
|
||||
const useLibrary = (libraryModel, urlParams, queryParams) => {
|
||||
const loadLibraryAction = React.useMemo(() => ({
|
||||
action: 'Load',
|
||||
args: {
|
||||
|
|
@ -38,7 +38,7 @@ const useLibrary = (urlParams, queryParams) => {
|
|||
}
|
||||
}), [urlParams, queryParams]);
|
||||
return useModelState({
|
||||
model: 'library',
|
||||
model: libraryModel,
|
||||
action: loadLibraryAction,
|
||||
map: mapLibraryState,
|
||||
init: initLibraryState
|
||||
|
|
|
|||
Loading…
Reference in a new issue