Skip to content
Snippets Groups Projects
Commit 8e0eb6dc authored by robban64's avatar robban64
Browse files

fix: everything with stuff

parent c30b1a75
No related branches found
No related tags found
No related merge requests found
Pipeline #41346 failed
import axios from 'axios'
import { Slide } from '../interfaces/ApiModels'
import { AppDispatch } from './../store'
import { Timer } from '../interfaces/Timer'
import store, { AppDispatch } from './../store'
import Types from './types'
export const getPresentationCompetition = (id: string) => async (dispatch: AppDispatch) => {
......
......@@ -59,7 +59,9 @@ const AdminView: React.FC = () => {
const [openIndex, setOpenIndex] = React.useState(0)
const { path, url } = useRouteMatch()
const currentUser = useAppSelector((state) => state.user.userInfo)
const isAdmin = useAppSelector((state) => Boolean(state.roles.roles.find((x) => x.id === currentUser?.role_id)))
const isAdmin = useAppSelector(
(state) => state.roles.roles.find((x) => x.id === currentUser?.role_id)?.name === 'Admin'
)
const dispatch = useAppDispatch()
const handleLogout = () => {
dispatch(logoutUser())
......
......@@ -36,6 +36,7 @@ const CompetitionManager: React.FC = (props: any) => {
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null)
const [activeId, setActiveId] = React.useState<number | undefined>(undefined)
const [timerHandle, setTimerHandle] = React.useState<number | undefined>(undefined)
const loading = useAppSelector((state) => state.user.userInfo === null)
const competitions = useAppSelector((state) => state.competitions.competitions)
const filterParams = useAppSelector((state) => state.competitions.filterParams)
const competitionTotal = useAppSelector((state) => state.competitions.total)
......@@ -125,12 +126,12 @@ const CompetitionManager: React.FC = (props: any) => {
label="År"
name="model.year"
type="number"
value={filterParams.year || new Date().getFullYear()}
value={filterParams.year || ''}
onChange={(event) => handleFilterChange({ ...filterParams, year: +event.target.value })}
margin="normal"
/>
</FilterContainer>
<AddCompetition />
{!loading && <AddCompetition />}
</TopBar>
<TableContainer component={Paper}>
<Table className={classes.table} aria-label="simple table">
......
......@@ -8,7 +8,7 @@ import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import React, { useEffect } from 'react'
import { useParams } from 'react-router-dom'
import { getCities } from '../../actions/cities'
import { getEditorCompetition } from '../../actions/editor'
import { getEditorCompetition, setEditorSlideId } from '../../actions/editor'
import { getTypes } from '../../actions/typesAction'
import { useAppDispatch, useAppSelector } from '../../hooks'
import { Content } from '../views/styled'
......
import { AnyAction } from 'redux'
import Types from '../actions/types'
import { Slide, Team } from '../interfaces/ApiModels'
import { Timer } from '../interfaces/Timer'
import { RichCompetition } from './../interfaces/ApiRichModels'
interface PresentationState {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment