FINISHED all logic :)

yulev5 · Apr 30, 2021 · 2831d80 · 2831d80 · vercel · Apr 30, 2021
1 parent 6a1e282
commit 2831d80
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/AppBarComponents/MyLocationsAppBar.js b/src/AppBarComponents/MyLocationsAppBar.js
@@ -12,7 +12,6 @@ const useStyles = makeStyles((theme) => ({
 function MyLocationsAppBar({ categories, currentSelectedCategory }) {
     const classes = useStyles();
 
-    debugger;
     let appBarTitle = "Categories";
     if (currentSelectedCategory) {
         appBarTitle = categories.find(cat => cat.id == currentSelectedCategory).name;

diff --git a/src/Categories/CategoriesListView.js b/src/Categories/CategoriesListView.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { List, ListItemText, makeStyles } from '@material-ui/core';
 import ListItem from '@material-ui/core/ListItem';
 import { connect } from "react-redux"
@@ -22,10 +22,11 @@ const useStyles = makeStyles((theme) => ({
     },
 }));
 
-function Categories({ categories, setContext, saveSelectedCategory }) {
+function Categories({ categories, currentSelectedCategory, setContext, saveSelectedCategory }) {
     const classes = useStyles();
     const [boldListItem, setBoldListItem] = React.useState();
 
+    debugger;
     const handleListItemClick = (index, cat) => {
         if (index === boldListItem) {
             handleClearSelection();
@@ -59,6 +60,11 @@ function Categories({ categories, setContext, saveSelectedCategory }) {
             </ListItem>
     }
 
+    useEffect(() => {
+        if(!currentSelectedCategory){
+            setBoldListItem();
+        }
+    }, [currentSelectedCategory]);
 
     return (
         <div className={classes.categoriesListContainer}>
@@ -82,7 +88,6 @@ const mapStateToProps = state => {
     return {
         categories: state.categoriesReducer.categories,
         currentSelectedCategory: state.selectedCategoryReducer.currentSelectedCategory,
-        currentContext: state.contextReducer.currentContext,
     }
 }
 

diff --git a/src/Content/Delete.js b/src/Content/Delete.js
@@ -27,7 +27,7 @@ const useStyles = makeStyles((theme) => ({
     }
 }));
 
-function Delete({ categories, currentSelectedCategory, currentContext, setContext, deleteCategory }) {
+function Delete({ categories, currentSelectedCategory, currentContext, setContext, deleteCategory, saveSelectedCategory }) {
     const classes = useStyles();
 
     let currentEditingCategory = categories.find(cat => cat.id == currentSelectedCategory)

diff --git a/src/Content/ViewCategoryDetails.js b/src/Content/ViewCategoryDetails.js
@@ -1,7 +1,7 @@
-import { Button, makeStyles, TextField, Typography } from '@material-ui/core';
+import { Button, makeStyles, Typography } from '@material-ui/core';
 import React, { useRef } from 'react';
 import { connect } from "react-redux"
-import { INITIAL_CONTEXT, VIEW_CATEGORY_DETAILS } from '../../redux/contextTypes';
+import { CATEGORY_SELECTED, INITIAL_CONTEXT, VIEW_CATEGORY_DETAILS } from '../../redux/contextTypes';
 import { setContext } from "../../redux/actions/main"
 
 const useStyles = makeStyles((theme) => ({
@@ -28,31 +28,25 @@ const useStyles = makeStyles((theme) => ({
     }
 }));
 
-function ViewCategoryDetails(props) {
+function ViewCategoryDetails({ categories, currentSelectedCategory, currentContext, setContext }) {
     const classes = useStyles();
-    const { categories, currentSelectedCategory, currentContext, setContext, addCategory } = props
     const catNewNameRef = useRef();
 
     let currentEditingCategory = categories.find(cat => cat.id == currentSelectedCategory)
 
     function handleSubmit(event) {
         event.preventDefault();
-        addCategory({ name: catNewNameRef.current.value, id: currentEditingCategory.id });
-        setContext(INITIAL_CONTEXT);
+        setContext(CATEGORY_SELECTED);
     }
-
-    function cancelAddingNewCat() {
-        setContext(INITIAL_CONTEXT);
-    }
-
+
     return (
         <>
             {currentContext === VIEW_CATEGORY_DETAILS &&
                 (
                     <form className={classes.formContainer} onSubmit={handleSubmit}>
                         <Typography variant="h6" className={classes.header}>Category {currentEditingCategory.name} Details:</Typography>
                         <Typography style={{ marginTop: '30px' }}>Name: {currentEditingCategory.name}</Typography>
-                        <Button className={classes.button} variant="contained" onClick={() => cancelAddingNewCat()}>Close</Button>
+                        <Button className={classes.button} variant="contained" type="submit">Close</Button>
                     </form>
                 )
             }