From dfd92b17300a7fcb62a555c42e814413422ce370 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 9 Apr 2021 12:59:28 +0200 Subject: [PATCH] new tvshowspage --- src/App.tsx | 71 +++++++++++++++-------------- src/pages/Player/Player.tsx | 6 +-- src/pages/TVShowPage/TVShowPage.tsx | 9 ++++ 3 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 src/pages/TVShowPage/TVShowPage.tsx diff --git a/src/App.tsx b/src/App.tsx index 8f7ff4a..91b9e4f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -17,6 +17,7 @@ import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage'; import ActorPage from './pages/ActorPage/ActorPage'; import {SettingsTypes} from './types/ApiTypes'; import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage'; +import TVShowPage from './pages/TVShowPage/TVShowPage'; interface state { password: boolean | null; // null if uninitialized - true if pwd needed false if not needed @@ -93,9 +94,8 @@ class App extends React.Component<{}, state> { } render(): JSX.Element { - const themeStyle = GlobalInfos.getThemeStyle(); // add the main theme to the page body - document.body.className = themeStyle.backgroundcolor; + document.body.className = GlobalInfos.getThemeStyle().backgroundcolor; if (this.state.password === true) { // render authentication page if auth is neccessary @@ -104,37 +104,7 @@ class App extends React.Component<{}, state> { return (
-
-
{this.state.mediacentername}
- - Home - - - Random Video - - - - Categories - - - Settings - -
+ {this.navBar()} {this.routing()}
@@ -144,6 +114,38 @@ class App extends React.Component<{}, state> { } } + /** + * render the top navigation bar + */ + navBar(): JSX.Element { + const themeStyle = GlobalInfos.getThemeStyle(); + + return ( +
+
{this.state.mediacentername}
+ + Home + + + Random Video + + + + Categories + + + TV Shows + + + Settings + +
+ ); + } + + /** + * render the react router elements + */ routing(): JSX.Element { return ( @@ -153,6 +155,9 @@ class App extends React.Component<{}, state> { + + + diff --git a/src/pages/Player/Player.tsx b/src/pages/Player/Player.tsx index dde90f9..4651f11 100644 --- a/src/pages/Player/Player.tsx +++ b/src/pages/Player/Player.tsx @@ -287,9 +287,9 @@ export class Player extends React.Component { sources: [ { src: - (process.env.REACT_APP_CUST_BACK_DOMAIN - ? process.env.REACT_APP_CUST_BACK_DOMAIN - : GlobalInfos.getVideoPath()) + result.MovieUrl, + (process.env.REACT_APP_CUST_BACK_DOMAIN ? process.env.REACT_APP_CUST_BACK_DOMAIN : '') + + GlobalInfos.getVideoPath() + + result.MovieUrl, type: 'video/mp4', size: 1080 } diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx new file mode 100644 index 0000000..49c2f9e --- /dev/null +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +class TVShowPage extends React.Component { + render(): JSX.Element { + return <>; + } +} + +export default TVShowPage;