diff --git a/src/components/admin/questions/Question.tsx b/src/components/admin/questions/Question.tsx index ab0f0da6424d1e5ab61cb31e487709a8747db732..215c1ba88d56eca278227d03979114d95af23bfe 100644 --- a/src/components/admin/questions/Question.tsx +++ b/src/components/admin/questions/Question.tsx @@ -101,11 +101,8 @@ export const Question: React.FC<QuestionProp> = ({ > {categories.map((categorie) => { return ( - <option - value={categorie.categorieId} - key={categorie.categorieId} - > - {categorie.categorie} + <option value={categorie} key={categorie}> + {categorie} </option> ) })} diff --git a/src/components/admin/shared/sharedMockData.ts b/src/components/admin/shared/sharedMockData.ts index 0df36ebb7d0183ce491a1181afd2b4868f37e837..993dd77890fb0d46a0044ac24ade13022a1acdf2 100644 --- a/src/components/admin/shared/sharedMockData.ts +++ b/src/components/admin/shared/sharedMockData.ts @@ -1,13 +1 @@ -export interface ICategorie { - categorieId: string - categorie: string -} - -export const mockCategorieData: ICategorie[] = [ - { categorieId: '0', categorie: 'Wassersport' }, - { categorieId: '1', categorie: 'Ballsport' }, - { categorieId: '2', categorie: 'Wettkampf' }, - { categorieId: '3', categorie: 'Kampfsport' }, - { categorieId: '4', categorie: 'Fitness' }, - { categorieId: '5', categorie: 'Gesundheit' } -] +export type ICategorie = string diff --git a/src/components/admin/useFetchData.ts b/src/components/admin/useFetchData.ts index 0077f6573e8dab373e5636675cde5e8f514547dd..8fd39627043ac27d20f693c00473a2a9797ea4aa 100644 --- a/src/components/admin/useFetchData.ts +++ b/src/components/admin/useFetchData.ts @@ -4,18 +4,12 @@ import { updateOrderedPages } from '../../redux/Slices/orderedPagesSlice' import { updateQuestions } from '../../redux/Slices/questionsSlice' import { updateSnacks } from '../../redux/Slices/snacksSlice' import { updateActivities } from '../../redux/Slices/activitiesSlice' +import { updateCategoriesFromSport } from '../../redux/Slices/categoriesSlice' import { useEffect, useState } from 'react' import { useLocation } from 'react-router-dom' export const useFetchData = async () => { - /*const sportsData = useAppSelector((state) => state.sportsData.value) - const activitiesData = useAppSelector((state) => state.sportsData.value) - const questionsData = useAppSelector((state) => state.sportsData.value) - const snacksData = useAppSelector((state) => state.sportsData.value) - const orderedPagesData = useAppSelector((state) => state.sportsData.value)*/ - const location = useLocation() - const [startedLoading, setStartedLoading] = useState(false) const dispatch = useAppDispatch() @@ -56,6 +50,7 @@ export const useFetchData = async () => { dispatch(updateQuestions(questions)) dispatch(updateSnacks(snacks)) dispatch(updateActivities(activities)) + dispatch(updateCategoriesFromSport(sports[0])) console.log(sports, orderedPages, questions, snacks, activities) } catch (error) { diff --git a/src/redux/Slices/categoriesSlice.ts b/src/redux/Slices/categoriesSlice.ts index cc6f5c2e70523f1b4ad46a9fd6cffb3510ad6719..24371a3a0656e587b79009f5dab03f57c5523edd 100644 --- a/src/redux/Slices/categoriesSlice.ts +++ b/src/redux/Slices/categoriesSlice.ts @@ -1,5 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { ICategorie } from '../../components/admin/shared/sharedMockData' +import { ISports } from '../../types/ApiTypes' interface categoriesState { value: ICategorie[] @@ -15,9 +16,15 @@ export const categoriesSlice = createSlice({ reducers: { updateCategories: (state, action: PayloadAction<ICategorie[]>) => { state.value = action.payload + }, + updateCategoriesFromSport: (state, action: PayloadAction<ISports>) => { + state.value = Object.keys(action.payload.categoryWeights) } } }) -export const { updateCategories } = categoriesSlice.actions +export const { + updateCategories, + updateCategoriesFromSport +} = categoriesSlice.actions export default categoriesSlice.reducer