add housekeeping code to delete duplicated tags and videos

package.json

@@ -8,17 +8,17 @@
     "url": "https://heili.eu"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
+    "@fortawesome/free-regular-svg-icons": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
-    "@fortawesome/react-fontawesome": "^0.1.13",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "bootstrap": "^5.0.2",
-    "plyr-react": "^3.0.7",
+    "plyr-react": "^5.1.0",
-    "react": "^17.0.1",
+    "react": "^18.2.0",
-    "react-bootstrap": "^1.4.0",
+    "react-bootstrap": "^2.5.0",
-    "react-dom": "^17.0.1",
+    "react-dom": "^18.2.0",
-    "react-router": "^5.2.0",
+    "react-router": "^6.4.0",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^6.4.0",
     "typescript": "^4.3.5"
   },
   "scripts": {
@@ -54,31 +54,31 @@
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
+    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^26.0.24",
+    "@types/jest": "^29.0.3",
-    "@types/node": "^16.4.7",
+    "@types/node": "^18.7.18",
-    "@types/react": "^17.0.15",
+    "@types/react": "^18.0.20",
-    "@types/react-dom": "^17.0.9",
+    "@types/react-dom": "^18.0.6",
-    "@types/react-router": "5.1.16",
+    "@types/react-router": "5.1.19",
     "@types/react-router-dom": "^5.1.8",
-    "@typescript-eslint/eslint-plugin": "^4.28.5",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^4.28.5",
+    "@typescript-eslint/parser": "^5.38.0",
-    "apidoc": "^0.28.1",
+    "apidoc": "^0.53.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.5",
-    "eslint": "^7.31.0",
+    "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-formatter-gitlab": "^2.2.0",
+    "eslint-formatter-gitlab": "^3.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-jest": "^24.4.0",
+    "eslint-plugin-jest": "^27.0.4",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "jest-junit": "^12.0.0",
+    "jest-junit": "^14.0.1",
     "prettier": "^2.3.2",
     "prettier-config": "^1.0.0",
-    "react-scripts": "4.0.3"
+    "react-scripts": "5.0.1"
   },
   "apidoc": {
     "name": "OpenMediaCenter",

src/App.module.css

@@ -15,6 +15,10 @@
     text-decoration: none;
 }
 
+.navitem-active {
+    opacity: 0.85;
+}
+
 .navitem:hover {
     opacity: 1;
     text-decoration: none;

src/App.tsx

@@ -10,7 +10,7 @@ import style from './App.module.css';
 import SettingsPage from './pages/SettingsPage/SettingsPage';
 import CategoryPage from './pages/CategoryPage/CategoryPage';
 
-import {NavLink, Route, Switch, useRouteMatch} from 'react-router-dom';
+import {NavLink, Route, Routes} from 'react-router-dom';
 import Player from './pages/Player/Player';
 import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage';
 import ActorPage from './pages/ActorPage/ActorPage';
@@ -47,7 +47,7 @@ class App extends React.Component<{}, state> {
 
         return (
             <LoginContextProvider>
-                <Switch>
+                <Routes>
                     <Route path='/login'>
                         <AuthenticationPage />
                     </Route>
@@ -55,13 +55,19 @@ class App extends React.Component<{}, state> {
                         {this.navBar()}
                         <MyRouter />
                     </Route>
-                </Switch>
+                </Routes>
             </LoginContextProvider>
         );
     }
 
     static contextType = FeatureContext;
 
+    activeTab(history, path) {
+        if (history.location.pathname === path) {
+            return { color: "red" };
+        }
+    };
+
     /**
      * render the top navigation bar
      */
@@ -75,39 +81,34 @@ class App extends React.Component<{}, state> {
                     Home
                 </NavLink>
                 <NavLink
-                    className={[style.navitem, themeStyle.navitem].join(' ')}
                     to={'/media/random'}
-                    activeStyle={{opacity: '0.85'}}>
+                    className={({ isActive }) => [style.navitem, themeStyle.navitem, (isActive ? 'navitem-active' : '')].join(' ')}>
                     Random Video
                 </NavLink>
 
                 <NavLink
-                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    className={({ isActive }) => [style.navitem, themeStyle.navitem, (isActive ? 'navitem-active' : '')].join(' ')}
-                    to={'/media/categories'}
+                    to={'/media/categories'}>
-                    activeStyle={{opacity: '0.85'}}>
                     Categories
                 </NavLink>
 
                 <NavLink
-                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    className={({ isActive }) => [style.navitem, themeStyle.navitem, (isActive ? 'navitem-active' : '')].join(' ')}
-                    to={'/media/actors'}
+                    to={'/media/actors'}>
-                    activeStyle={{opacity: '0.85'}}>
                     Actors
                 </NavLink>
 
                 {this.context.TVShowEnabled ? (
                     <NavLink
-                        className={[style.navitem, themeStyle.navitem].join(' ')}
+                        className={({ isActive }) => [style.navitem, themeStyle.navitem, (isActive ? 'navitem-active' : '')].join(' ')}
-                        to={'/media/tvshows'}
+                        to={'/media/tvshows'}>
-                        activeStyle={{opacity: '0.85'}}>
                         TV Shows
                     </NavLink>
                 ) : null}
 
                 <NavLink
-                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    className={({ isActive }) => [style.navitem, themeStyle.navitem, (isActive ? 'navitem-active' : '')].join(' ')}
-                    to={'/media/settings'}
+                    to={'/media/settings'}>
-                    activeStyle={{opacity: '0.85'}}>
                     Settings
                 </NavLink>
             </div>

src/elements/SideBar/SideBar.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, {PropsWithChildren} from 'react';
 import style from './SideBar.module.css';
 import GlobalInfos from '../../utils/GlobalInfos';
 
-interface SideBarProps {
+interface SideBarProps extends  PropsWithChildren{
     hiddenFrame?: boolean;
     width?: string;
 }

src/pages/TVShowPage/TVPlayer.tsx

@@ -94,7 +94,7 @@ export class TVPlayer extends React.Component<Props, State> {
     }
 
     private closebtn(): void {
-        this.props.history.goBack();
+        this.props.goBack();
     }
 }
 

src/pages/TVShowPage/TVShowPage.tsx

@@ -3,10 +3,11 @@ import Preview from '../../elements/Preview/Preview';
 import {APINode, callAPI, callAPIPlain} from '../../utils/Api';
 import {TVShow} from '../../types/ApiTypes';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
-import {Route, Switch, useRouteMatch} from 'react-router-dom';
+import {Route, Routes, useMatch} from 'react-router-dom';
 import EpisodePage from './EpisodePage';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar';
+import {useLocation} from "react-router";
 
 interface State {
     loading: boolean;
@@ -55,7 +56,7 @@ export class TVShowPage extends React.Component<Props, State> {
                                         (result) => callback(result)
                                     );
                                 }}
-                                linkPath={'/tvshows/' + elem.Id}
+                                linkPath={'/media/tvshows/' + elem.Id}
                             />
                         )}
                         data={this.state.loading ? [] : this.data}
@@ -68,16 +69,16 @@ export class TVShowPage extends React.Component<Props, State> {
 }
 
 export default function (): JSX.Element {
-    let match = useRouteMatch();
+    const { pathname } = useLocation();
 
     return (
-        <Switch>
+        <Routes>
-            <Route exact path={`${match.path}/:id`}>
+            <Route path={`${pathname}/:id`}>
                 <EpisodePage />
             </Route>
-            <Route path={match.path}>
+            <Route path={pathname}>
                 <TVShowPage />
             </Route>
-        </Switch>
+        </Routes>
     );
 }

src/utils/Api.ts

@@ -78,8 +78,8 @@ function generalAPICall<T>(
                 // decode json or text
                 const data = json ? await response.json() : await response.text();
                 callback(data);
-            } catch (e) {
+            } catch (e: any) {
-                errorcallback(e);
+                errorcallback(e.toString());
             }
         } else if (response.status === 400) {
             // Bad Request --> invalid token

src/utils/context/FeatureContext.tsx

@@ -1,4 +1,4 @@
-import React, {FunctionComponent, useState} from 'react';
+import React, {FunctionComponent, PropsWithChildren, useState} from 'react';
 
 export interface FeatureContextType {
     setTVShowEnabled: (enabled: boolean) => void;
@@ -17,7 +17,7 @@ export const FeatureContext = React.createContext<FeatureContextType>({
     VideosFullyDeleteable: false
 });
 
-export const FeatureContextProvider: FunctionComponent = (props): JSX.Element => {
+export const FeatureContextProvider: FunctionComponent<PropsWithChildren> = (props): JSX.Element => {
     const [tvshowenabled, settvshowenabled] = useState(false);
     const [fullydeletablevids, setfullydeleteable] = useState(false);
 

src/utils/context/LoginContextProvider.tsx

@@ -1,13 +1,13 @@
 import {LoginContext, LoginPerm, LoginState} from './LoginContext';
-import React, {FunctionComponent, useContext, useEffect, useState} from 'react';
+import React, {FunctionComponent, PropsWithChildren, useContext, useEffect, useState} from 'react';
-import {useHistory, useLocation} from 'react-router';
+import {useLocation, useNavigate} from 'react-router';
 import {cookie} from './Cookie';
 import {APINode, callAPI} from '../Api';
 import {SettingsTypes} from '../../types/ApiTypes';
 import GlobalInfos from '../GlobalInfos';
 import {FeatureContext} from './FeatureContext';
 
-export const LoginContextProvider: FunctionComponent = (props): JSX.Element => {
+export const LoginContextProvider: FunctionComponent<PropsWithChildren> = (props): JSX.Element => {
     let initialLoginState = LoginState.LoggedIn;
     let initialUserPerm = LoginPerm.User;
 
@@ -50,7 +50,7 @@ export const LoginContextProvider: FunctionComponent = (props): JSX.Element => {
         );
     }, [features, loginState]);
 
-    const hist = useHistory();
+    const navigate = useNavigate();
     const loc = useLocation();
 
     // trigger redirect on loginstate change
@@ -59,14 +59,14 @@ export const LoginContextProvider: FunctionComponent = (props): JSX.Element => {
             // if we arent already in dashboard tree we want to redirect to default dashboard page
             console.log('redirecting to dashboard' + loc.pathname);
             if (!loc.pathname.startsWith('/media')) {
-                hist.replace('/media');
+                navigate('/media');
             }
         } else {
             if (!loc.pathname.startsWith('/login')) {
-                hist.replace('/login');
+                navigate('/login');
             }
         }
-    }, [hist, loc.pathname, loginState]);
+    }, [navigate, loc.pathname, loginState]);
 
     const value = {
         logout: (): void => {
@@ -86,7 +86,7 @@ export const LoginContextProvider: FunctionComponent = (props): JSX.Element => {
     return <LoginContext.Provider value={value}>{props.children}</LoginContext.Provider>;
 };
 
-interface Props {
+interface Props extends PropsWithChildren{
     perm: LoginPerm;
 }