Merge pull request #31 from weaponsforge/dev

v1.0.2
weaponsforge · Aug 25, 2022 · 3e9f8d5 · 3e9f8d5
2 parents e79abcd + 905c4d3
commit 3e9f8d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/client/components/todo/view.js b/client/components/todo/view.js
@@ -26,21 +26,23 @@ function ViewTodo () {
       <AppCard>
         <h1>Todo Item</h1>
 
-        <Box sx={{ height: 400, width: '100%', textAlign: 'left' }}>
+        <Box sx={{ minHeight: 400, width: '100%', textAlign: 'left' }}>
           {(loading === 'pending')
             ? <AppLoading />
             : (error !== '')
               ? <Typography variant='caption' sx={{ color: 'red' }}>
                 {error}
               </Typography>
               : <Box>
-                {Object.keys(titles).map((key, index) => (
+                {Object.keys(titles).map((field, index) => (
                   <Box sx={{ display: 'flex' }} key={index}>
-                    <Typography variant='subtitle2'>{titles[key]}: &nbsp;</Typography>
+                    <Typography variant='subtitle2'>
+                      {titles[field]}: &nbsp;
+                    </Typography>
                     <span>
-                      {['createdAt', 'updatedAt'].includes(key)
-                        ? new Date(todo[key]).toDateString()
-                        : todo[key]
+                      {['createdAt', 'updatedAt'].includes(field)
+                        ? new Date(todo[field]).toDateString()
+                        : todo[field]
                       }
                     </span>
                   </Box>

diff --git a/client/store/todo/todoSlice.js b/client/store/todo/todoSlice.js
@@ -44,7 +44,7 @@ const todoSlice = createSlice({
     loading: 'idle',
     currentRequestId: null,
     error: '',
-    todo: null
+    todo: {}
   }),
   reducers: {
     todosLoading (state, action) {
@@ -81,7 +81,7 @@ const todoSlice = createSlice({
         state.loading = 'pending'
         state.currentRequestId = action.meta.requestId
         state.error = ''
-        state.todo = null
+        state.todo = {}
       }
     })