Merge branch 'KelvinTegelaar:react' into react

.mega-linter.yml

@@ -4,6 +4,6 @@
 APPLY_FIXES: none
 SHOW_ELAPSED_TIME: true
 FILEIO_REPORTER: false
-ENABLE: [CSS, HTML, JSON, YAML, JSX, ACTION]
+ENABLE: [CSS, HTML, JSON, YAML, JSX, ACTION, CREDENTIALS]
 DISABLE_LINTERS: [CSS_SCSS_LINT, YAML_PRETTIER]
 SHOW_SKIPPED_LINTERS: false

.vscode/launch.json

@@ -2,7 +2,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location . http://localhost:3000 --api-location http://localhost:7071",
+      "command": "npm run start-api",
       "name": "Run emulator",
       "request": "launch",
       "type": "node-terminal"

package.json

@@ -21,7 +21,7 @@
     "test": "react-scripts test",
     "test:cov": "npm test -- --coverage --watchAll=false",
     "test:debug": "react-scripts --inspect-brk test --runInBand",
-    "start-api": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location . http://localhost:3000 --api-location http://localhost:7071",
+    "start-api": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location . http://localhost:3000 --api-location http://localhost:7071 --swa-config-location .vscode",
     "prepare": "husky install"
   },
   "config": {
@@ -61,6 +61,7 @@
     "react-dom": "^17.0.2",
     "react-final-form": "^6.5.7",
     "react-final-form-listeners": "^1.0.3",
+    "react-hotkeys-hook": "^3.4.4",
     "react-media-hook": "^0.4.9",
     "react-papaparse": "^3.18.2",
     "react-redux": "^7.2.5",

src/components/AppBreadcrumb.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { useLocation } from 'react-router-dom'
 
-import routes from '../routes'
+import routes from 'src/routes'
 
 import { CBreadcrumb, CBreadcrumbItem } from '@coreui/react'
 

src/components/AppHeader.js

@@ -11,11 +11,11 @@ import {
 } from '@coreui/react'
 import { faBars } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { AppBreadcrumb } from './index'
+import AppBreadcrumb from 'src/components/AppBreadcrumb'
 import AppHeaderDropdown from 'src/components/header/AppHeaderDropdown'
 import AppHeaderSearch from 'src/components/header/AppHeaderSearch'
 import cyberdrainlogo from 'src/assets/images/CIPP.png'
-import { toggleSidebarShow } from '../store/features/app'
+import { toggleSidebarShow } from 'src/store/features/app'
 
 const AppHeader = () => {
   const dispatch = useDispatch()