From ec5459432d2697fd51d5d8522ee0a73792001e22 Mon Sep 17 00:00:00 2001
From: robban64 <carl@schonfelder.se>
Date: Fri, 16 Apr 2021 20:09:44 +0200
Subject: [PATCH] moved getTypes to admin
---
client/src/Main.tsx | 9 +--------
client/src/pages/admin/AdminPage.tsx | 2 ++
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/client/src/Main.tsx b/client/src/Main.tsx
index 45286d54..f32aad9f 100644
--- a/client/src/Main.tsx
+++ b/client/src/Main.tsx
@@ -1,7 +1,5 @@
-import React, { useEffect } from 'react'
+import React from 'react'
import { BrowserRouter, Route, Switch } from 'react-router-dom'
-import { getTypes } from './actions/typesAction'
-import { useAppDispatch } from './hooks'
import AdminPage from './pages/admin/AdminPage'
import LoginPage from './pages/login/LoginPage'
import PresentationEditorPage from './pages/presentationEditor/PresentationEditorPage'
@@ -13,11 +11,6 @@ import ViewSelectPage from './pages/views/ViewSelectPage'
import SecureRoute from './utils/SecureRoute'
const Main: React.FC = () => {
- const dispatch = useAppDispatch()
- useEffect(() => {
- dispatch(getTypes())
- }, [])
-
return (
<BrowserRouter>
<Switch>
diff --git a/client/src/pages/admin/AdminPage.tsx b/client/src/pages/admin/AdminPage.tsx
index 60c0fde2..8bbb68fa 100644
--- a/client/src/pages/admin/AdminPage.tsx
+++ b/client/src/pages/admin/AdminPage.tsx
@@ -20,6 +20,7 @@ import React, { useEffect } from 'react'
import { Link, Route, Switch, useRouteMatch } from 'react-router-dom'
import { getCities } from '../../actions/cities'
import { getRoles } from '../../actions/roles'
+import { getTypes } from '../../actions/typesAction'
import { logoutUser } from '../../actions/user'
import { useAppDispatch, useAppSelector } from '../../hooks'
import CompetitionManager from './competitions/CompetitionManager'
@@ -66,6 +67,7 @@ const AdminView: React.FC = () => {
useEffect(() => {
dispatch(getCities())
dispatch(getRoles())
+ dispatch(getTypes())
}, [])
const menuAdminItems = [
--
GitLab