merged with review (redux branch)

Author: qvalentin

webapp_frontend/package-lock.json

@@ -12,19 +12,20 @@
     "@types/react": "^16.9.51",
     "@types/react-bootstrap": "^0.32.24",
     "@types/react-dom": "^16.9.8",
-    "@types/react-router-dom": "^5.1.6",
     "@types/react-redux": "^7.1.11",
+    "@types/react-router-dom": "^5.1.6",
     "axios": "^0.20.0",
     "bootstrap": "^4.5.3",
     "node-sass": "^4.14.1",
     "react": "^16.13.1",
     "react-bootstrap": "^1.4.0",
     "react-dom": "^16.13.1",
-    "react-router-dom": "^5.2.0",
     "react-redux": "^7.2.2",
+    "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.3",
     "react-toastify": "^6.1.0",
     "redux": "^4.0.5",
+    "redux-types": "^2.0.3",
     "typescript": "^3.8.3"
   },
   "scripts": {

webapp_frontend/package.json

@@ -1,4 +1,4 @@
-import React, {ReactElement} from 'react';
+import React, {ReactElement, useEffect, useState} from 'react';
 import './App.css';
 import {Container} from 'react-bootstrap';
 import Header from "./basicElements/Header";
@@ -7,8 +7,7 @@ import {BrowserRouter} from "react-router-dom";
 import Router from "./Router/Router";
 import PermanentAssets from "./basicElements/PermanentAssets";
 
-function App(): ReactElement {
-import React, {ReactElement, useEffect, useState} from 'react';
+
 import {connect, ConnectedProps} from 'react-redux'
 import {addAccessToken, addRefreshToken} from "../background/redux/actions/tokens";
 import {SystemState} from "../background/redux/actions/sytemState";