fix: solve blank screen bug when creating trainings

lucasmsa · Dec 6, 2023 · d02e0d6 · d02e0d6
1 parent 6f89a47
commit d02e0d6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,22 +1,24 @@
 import React, { useEffect } from 'react';
 import Routes from './routes';
+import Modal from 'react-modal';
 import GlobalStyle from './styles/global';
 import toast, { Toaster, useToasterStore } from 'react-hot-toast';
 import { BrowserRouter } from 'react-router-dom';
 
-function App() {
+Modal.setAppElement('#root');
 
+function App() {
   const { toasts } = useToasterStore();
 
-  const TOAST_LIMIT = 1
+  const TOAST_LIMIT = 1;
 
   useEffect(() => {
     toasts
-    .filter(t => t.visible)
-    .filter((_, index) => index >= TOAST_LIMIT) 
-    .forEach((t) => {
-      toast.dismiss(t.id);
-    }); 
+      .filter((t) => t.visible)
+      .filter((_, index) => index >= TOAST_LIMIT)
+      .forEach((t) => {
+        toast.dismiss(t.id);
+      });
   }, [toasts]);
 
   return (

diff --git a/src/components/Desktop/Home/MidSection/index.tsx b/src/components/Desktop/Home/MidSection/index.tsx
@@ -23,11 +23,7 @@ import MountWorkout from '../MountWorkout';
 import { useDispatch, useSelector } from 'react-redux';
 import { Dispatch } from 'redux';
 import { addSet, removeSet, updateCurrentSet } from '../../../../store/training/actionCreators';
-import {
-  getCurrentSet,
-  getTrainingSetExercises,
-  getTrainSetLoops
-} from '../../../../store/training/selectors';
+import { getCurrentSet, getTrainSetLoops } from '../../../../store/training/selectors';
 import toast from 'react-hot-toast';
 import ErrorToast from '../../../../toasts/ErrorToast';
 import { AnimatePresence, motion } from 'framer-motion/dist/framer-motion';
@@ -36,7 +32,7 @@ const MidSection = () => {
   const dispatch: Dispatch<any> = useDispatch();
   const trainingSets = useSelector(getTrainSetLoops);
   const currentSet = useSelector(getCurrentSet);
-  const currentTrainingSetExercises = useSelector(getTrainingSetExercises);
+  const allTrainSetsContainExercises = trainingSets.every((set) => set.trainSet.exercises.length);
   const setsQuantity = trainingSets.length;
   const progressLineAnimation = {
     initial: { offsetDistance: '0%', scale: 1.5 },
@@ -97,14 +93,14 @@ const MidSection = () => {
           {trainingSets.length <= 4 && (
             <AddSetContainer
               onClick={() => {
-                if (currentTrainingSetExercises.length) {
+                if (allTrainSetsContainExercises) {
                   dispatch(addSet());
                   dispatch(updateCurrentSet(setsQuantity));
                 } else {
                   toast(
                     ErrorToast({
                       message:
-                        'You must have at least one exercise on the current set before you add new ones'
+                        'You must have at least one exercise on every set before you add new ones'
                     })
                   );
                 }

diff --git a/src/store/training/actionCreators.ts b/src/store/training/actionCreators.ts
@@ -8,8 +8,8 @@ import {
   UPDATE_CURRENT_SET,
   UPDATE_EXERCISE_REST_TIME,
   UPDATE_EXERCISE_TRAIN_TIME,
-  UPDATE_CURRENT_SET_LOOP_QUANTITY,
   UPDATE_SET_REST_TIME,
+  UPDATE_CURRENT_SET_LOOP_QUANTITY,
   UPDATE_DEFAULT_TRAINING_VALUES,
   RESET_TRAINING
 } from './actionTypes';