From 1da45c528d816f8acedc2ad83e310217a74fb2f7 Mon Sep 17 00:00:00 2001
From: frontend perkafean
 <165241731+frontendperkafean@users.noreply.github.com>
Date: Tue, 8 Oct 2024 05:43:06 +0000
Subject: [PATCH] ok

---
 src/components/Footer.module.css   |  2 +-
 src/components/Header.js           |  6 +++---
 src/components/ItemLister.js       |  9 ++++++++-
 src/components/ItemType.js         | 24 +++++++++++++-----------
 src/components/ItemType.module.css |  1 +
 src/components/ItemTypeLister.css  | 10 ++++++++++
 src/components/ItemTypeLister.js   | 29 +++++++++++++++++++----------
 src/pages/CafePage.js              |  4 ++++
 8 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/src/components/Footer.module.css b/src/components/Footer.module.css
index f8652ce..d4e17a6 100644
--- a/src/components/Footer.module.css
+++ b/src/components/Footer.module.css
@@ -68,7 +68,7 @@
   align-items: center;
   justify-content: center;
   transition: height 0.3s ease;
-  z-index: 200;
+  z-index: 197;
 }
 
 .scanMeja.stretched {
diff --git a/src/components/Header.js b/src/components/Header.js
index ac2c725..3f793eb 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -30,7 +30,7 @@ const ProfileName = styled.h2`
   font-weight: 500;
   font-style: normal;
   font-size: 30px;
-  z-index: 11;
+  z-index: 199;
   overflow: hidden;
   white-space: nowrap;
   animation: ${(props) => {
@@ -92,7 +92,7 @@ const ProfileImage = styled.img`
   height: 60px;
   border-radius: 50%;
   cursor: pointer;
-  z-index: 12;
+  z-index: 199;
   animation: ${(props) => {
       if (props.animate === "grow") return g;
       if (props.animate === "shrink") return s;
@@ -165,7 +165,7 @@ const Rectangle = styled.div`
   width: 200px;
   max-height: 87vh; /* or another appropriate value */
   background-color: white;
-  z-index: 10;
+  z-index: 198;
   box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
   animation: ${(props) => (props.animate === "grow" ? grow : shrink)} 0.5s
     forwards;
diff --git a/src/components/ItemLister.js b/src/components/ItemLister.js
index e121395..e371519 100644
--- a/src/components/ItemLister.js
+++ b/src/components/ItemLister.js
@@ -28,6 +28,8 @@ const ItemLister = ({
   raw,
   handleCreateItem,
   handleUpdateItem,
+  beingEditedType,
+  setBeingEditedType,
 }) => {
   const [items, setItems] = useState(
     itemList.map((item) => ({
@@ -125,10 +127,12 @@ const ItemLister = ({
   const toggleAddNewItem = () => {
     setIsAddingNewItem((prev) => !prev);
     setOnEditItem(0);
+    setBeingEditedType(itemTypeId);
   };
   const editItem = (itemId) => {
     setIsAddingNewItem(false);
     setOnEditItem(itemId);
+    setBeingEditedType(itemTypeId);
   };
   const handleChange = async (itemId) => {
     // Find the item in the current items array
@@ -297,7 +301,10 @@ const ItemLister = ({
                       onPlusClick={() => handlePlusClick(item.itemId)}
                       onNegativeClick={() => handleNegativeClick(item.itemId)}
                       onRemoveClick={() => handleRemoveClick(item.itemId)}
-                      isBeingEdit={onEditItem == item.itemId}
+                      isBeingEdit={
+                        onEditItem == item.itemId &&
+                        beingEditedType == itemTypeId
+                      }
                       isAvailable={item.availability}
                       handleUpdateItem={(name, price, image) =>
                         handleUpdateItem(item.itemId, name, price, image)
diff --git a/src/components/ItemType.js b/src/components/ItemType.js
index d0d3241..37ad127 100644
--- a/src/components/ItemType.js
+++ b/src/components/ItemType.js
@@ -91,17 +91,19 @@ export default function ItemType({
           </div>
         )}
       </div>
-      <input
-        ref={inputRef}
-        className={`${styles["item-type-name"]} ${styles.noborder}`}
-        value={name}
-        onChange={handleNameChange}
-        disabled={true}
-        style={{
-          top: selected ? "-5px" : "initial",
-          borderBottom: selected ? "1px solid #000" : "none",
-        }}
-      />
+      {(rectangular || !blank) && (
+        <input
+          ref={inputRef}
+          className={`${styles["item-type-name"]} ${styles.noborder}`}
+          value={name}
+          onChange={handleNameChange}
+          disabled={true}
+          style={{
+            top: selected ? "-5px" : "initial",
+            borderBottom: selected ? "1px solid #000" : "none",
+          }}
+        />
+      )}
       {/* {blank && (
         <button className={styles["item-type-create"]} onClick={handleCreate}>
           create
diff --git a/src/components/ItemType.module.css b/src/components/ItemType.module.css
index 2d8ff08..fbbbf63 100644
--- a/src/components/ItemType.module.css
+++ b/src/components/ItemType.module.css
@@ -73,6 +73,7 @@
   opacity: 0;
   position: absolute;
   top: 0;
+  right: 0;
   width: 100%;
   height: 100%;
 }
diff --git a/src/components/ItemTypeLister.css b/src/components/ItemTypeLister.css
index ab16356..239572b 100644
--- a/src/components/ItemTypeLister.css
+++ b/src/components/ItemTypeLister.css
@@ -52,3 +52,13 @@
   bottom: 0;
   align-self: center; /* Center the button horizontally */
 }
+.item-type-name {
+  font-family: "Poppins", sans-serif;
+  font-style: normal;
+  height: 20vw;
+  font-size: 1.5rem;
+  font-weight: 500;
+  color: black;
+  text-transform: capitalize;
+  z-index: 301;
+}
diff --git a/src/components/ItemTypeLister.js b/src/components/ItemTypeLister.js
index 8a78d91..bde3b5c 100644
--- a/src/components/ItemTypeLister.js
+++ b/src/components/ItemTypeLister.js
@@ -5,7 +5,6 @@ import ItemType from "./ItemType";
 import { createItemType } from "../helpers/itemHelper.js";
 import { getImageUrl } from "../helpers/itemHelper";
 import ItemLister from "./ItemLister";
-
 const ItemTypeLister = ({
   shopId,
   shopOwnerId,
@@ -18,6 +17,8 @@ const ItemTypeLister = ({
   const [isAddingNewItem, setIsAddingNewItem] = useState(false);
   const newItemDivRef = useRef(null);
   const [items, setItems] = useState([]);
+  
+  const [itemTypeName, setItemTypeName] = useState('');
   const handleCreateItem = (name, price, selectedImage, previewUrl) => {
     console.log(previewUrl);
     const newItem = {
@@ -91,7 +92,7 @@ const ItemTypeLister = ({
       <div
         ref={newItemDivRef}
         className="item-type-list"
-        style={{ display: isAddingNewItem ? "block" : "inline-flex" }}
+        style={{ display: isAddingNewItem ? "inline-flex" : "inline-flex" }}
       >
         {isEditMode &&
           !isAddingNewItem &&
@@ -109,22 +110,30 @@ const ItemTypeLister = ({
           user.userId === shopOwnerId &&
           isAddingNewItem && (
             <>
-              <ItemType
-                blank={true}
-                imageUrl={previewUrl}
-                name={"‎ "}
-                onCreate={handleCreate}
-              />
+              <div style={{ display: "flex", alignItems: "center" }}>
+                <ItemType
+                  blank={true}
+                  imageUrl={previewUrl}
+                  name={"‎ "}
+                  onCreate={handleCreate}
+                />
+                <input
+                  className="item-type-name"
+                  value={itemTypeName}
+                  onChange={(e)=>setItemTypeName(e.target.value)}
+                  placeholder="type name"
+                  style={{ marginLeft: "10px" }} // Adjust spacing as needed
+                />
+              </div>
               <div className="rect-creator">
                 <div
                   className="inline-container"
-                  style={{ visibility: "hidden" }}
+                  style={{ overflowX: "hidden", visibility: "hidden" }}
                 >
                   <ItemType
                     onClick={() => onFilterChange(0)}
                     imageUrl={getImageUrl("uploads/1718732420960.png")}
                   />
-                  <input></input>
                   {/* <ItemType
                     onClick={() => onFilterChange(0)}
                     imageUrl={getImageUrl("uploads/1718732420960.png")}
diff --git a/src/pages/CafePage.js b/src/pages/CafePage.js
index 6d8c7d0..04ff87d 100644
--- a/src/pages/CafePage.js
+++ b/src/pages/CafePage.js
@@ -59,6 +59,8 @@ function CafePage({
 
   const [config, setConfig] = useState({});
 
+  const [beingEditedType, setBeingEditedType] = useState(0);
+
   const checkWelcomePageConfig = () => {
     const parsedConfig = JSON.parse(welcomePageConfig);
     if (parsedConfig.isWelcomePageActive == "true") {
@@ -213,6 +215,8 @@ function CafePage({
                       typeName={itemType.name}
                       itemList={itemType.itemList}
                       isEditMode={isEditMode}
+                      beingEditedType={beingEditedType}
+                      setBeingEditedType={setBeingEditedType}
                       raw={isEditMode || filterId == 0 ? false : true}
                       handleCreateItem={(name, price, selectedImage) =>
                         createItem(