diff --git a/package.json b/package.json index 96b454b..86552a3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "groovebrew-mockup", "version": "0.1.0", "private": true, - "homepage": "https://test.kedaimaster.com", + "homepage": "https://dev.kedaimaster.com", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/src/App.js b/src/App.js index a5e857c..25ada1d 100644 --- a/src/App.js +++ b/src/App.js @@ -282,6 +282,7 @@ function App() { setDeviceType("guestDevice"); } else { console.log(data) + if(data.data.user.cafeId != null) navigate(`/${data.data.user.cafeIdentityName}`, { replace: true }); setUser(data.data.user); if (data.data.latestOpenBillTransaction != null) localStorage.setItem('lastTransaction', JSON.stringify(data.data.latestOpenBillTransaction)) if ( @@ -294,7 +295,6 @@ function App() { setGuestSides(connectedGuestSides.sessionDatas); console.log("getting guest side"); setDeviceType("clerk"); - checkNotifications(); } else { setDeviceType("guestDevice"); @@ -394,16 +394,16 @@ function App() { }; }, [socket, shopId, location]); // Ensure location is in the dependencies to respond to changes in the URL - useEffect(() => { - if (user.cafeId != null && user.cafeId !== shopId) { - // Preserve existing query parameters - const currentParams = new URLSearchParams(location.search).toString(); + // useEffect(() => { + // if (user.cafeId != null && user.cafeId !== shopId) { + // // Preserve existing query parameters + // const currentParams = new URLSearchParams(location.search).toString(); - // Navigate to the new cafeId while keeping existing params - navigate(`/${user.cafeId}?${currentParams}`, { replace: true }); - } + // // Navigate to the new cafeId while keeping existing params + // navigate(`/${user.cafeId}?${currentParams}`, { replace: true }); + // } - }, [user, shopId]); + // }, [user, shopId]); function handleMoveToTransaction(direction, from) { console.log(direction); diff --git a/src/components/ItemConfig.js b/src/components/ItemConfig.js index ef53eb5..d3c4c17 100644 --- a/src/components/ItemConfig.js +++ b/src/components/ItemConfig.js @@ -80,7 +80,8 @@ const ItemConfig = ({ }, [textareaRef.current]); const handleCreate = () => { - handleCreateItem(itemName, itemPrice, selectedImage, itemDescription, itemPromoPrice); + console.log(itemPromoPrice) + handleCreateItem(itemName, itemPrice, selectedImage, previewUrl, itemDescription, itemPromoPrice); }; const handleUpdate = () => { console.log(itemName, itemPrice, selectedImage, itemDescription, itemPromoPrice) diff --git a/src/components/ItemLister.js b/src/components/ItemLister.js index fe06229..d9294a6 100644 --- a/src/components/ItemLister.js +++ b/src/components/ItemLister.js @@ -167,8 +167,13 @@ const ItemLister = ({ console.log(previewUrl); setPreviewUrl(previewUrl); }; - - const onCreateItem = async (itemName, itemPrice, selectedImage, previewUrl, description) => { + const onEditItem = async (itemId, name, price, image, description, promoPrice) => { + await updateItemInCreate(itemId, name, price, image, description, promoPrice); + setRandomKey(randomKey + 1); + console.log(image) + editItem(0); + } + const onCreateItem = async (itemName, itemPrice, selectedImage, previewUrl, description, promoPrice) => { console.log(description) if (isEdit) setItemsToCreate((prevItems) => [ @@ -179,11 +184,12 @@ const ItemLister = ({ price: itemPrice, selectedImage, image: previewUrl, - availability: true + availability: true, + promoPrice: promoPrice }, ]); else { - const newItem = await handleCreateItem(itemTypeId, itemName, itemPrice, selectedImage, description); + const newItem = await handleCreateItem(itemTypeId, itemName, itemPrice, selectedImage, description, promoPrice); console.log(newItem) if (newItem) { @@ -270,6 +276,7 @@ const ItemLister = ({ name, price, description: description, + promoPrice: promoPrice, availability: item.availability, image: image ? newImage : item.image, selectedImage: image ? newImage : null @@ -866,7 +873,7 @@ const ItemLister = ({ imageUrl={item.image} imageFile={item.selectedImage} cancelEdit={() => editItem(0)} - handleUpdateItem={(name, price, image, description, promoPrice) => { updateItemInCreate(item.itemId, name, price, image, description, promoPrice); setRandomKey(randomKey + 1); console.log(image) } + handleUpdateItem={(name, price, image, description, promoPrice) => { onEditItem(item.itemId, name, price, image, description, promoPrice);} } /> )} @@ -957,24 +964,24 @@ const ItemLister = ({ // batal // editItem(0)} - handleCreateItem={onCreateItem} - handleUpdateItem={async (name, price, image, description, promoPrice) => { - try { - console.log(description); - await onUpdateItem(item.itemId, name, price, image, description, promoPrice); - } catch (error) { - console.error("Error updating item:", error); - } - }} -/> + isBeingEdit={true} + name={item.name} + price={item.price} + promoPrice={item.promoPrice} + description={item.description} + imageUrl={itemTypeId ? getImageUrl(item.image) : item.image} + imageFile={item.selectedImage} + cancelEdit={() => editItem(0)} + handleCreateItem={onCreateItem} + handleUpdateItem={async (name, price, image, description, promoPrice) => { + try { + console.log(description); + await onUpdateItem(item.itemId, name, price, image, description, promoPrice); + } catch (error) { + console.error("Error updating item:", error); + } + }} + /> )}
diff --git a/src/components/ItemTypeLister.js b/src/components/ItemTypeLister.js index d265723..24f50ff 100644 --- a/src/components/ItemTypeLister.js +++ b/src/components/ItemTypeLister.js @@ -23,7 +23,7 @@ const ItemTypeLister = ({ const [items, setItems] = useState([]); const [itemTypeName, setItemTypeName] = useState(""); - const handleCreateItem = (name, price, selectedImage, previewUrl) => { + const handleCreateItem = (name, price, selectedImage, previewUrl, description, promoPrice) => { console.log(previewUrl); const newItem = { itemId: items.length + 1, @@ -32,6 +32,8 @@ const ItemTypeLister = ({ selectedImage, image: previewUrl, availability: true, + description, + promoPrice }; // Update the items state with the new item @@ -120,7 +122,7 @@ const ItemTypeLister = ({ setShopItems={setShopItems} itemList={items} isEditMode={true} - handleCreateItem={(itemTypeId, name, price, selectedImage) => createItem(shopId, name, price, selectedImage,itemTypeId)} + handleCreateItem={(itemTypeId, name, price, selectedImage, description, promoPrice) => createItem(shopId, name, price, selectedImage, itemTypeId, description, promoPrice)} beingEditedType={beingEditedType} setBeingEditedType={setBeingEditedType} alwaysEdit={true} diff --git a/src/components/MusicPlayer.js b/src/components/MusicPlayer.js index 3b3c5db..84ac216 100644 --- a/src/components/MusicPlayer.js +++ b/src/components/MusicPlayer.js @@ -108,7 +108,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo // setSubtitleColor("white"); // setSubtitleBG("black"); // } - const proxiedUrl = `https://test.api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image + const proxiedUrl = `https://dev.api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image setBackgroundImage(proxiedUrl); } catch (error) { diff --git a/src/config.js b/src/config.js index ff08a5e..6cf67cc 100644 --- a/src/config.js +++ b/src/config.js @@ -1,5 +1,5 @@ // src/config.js -const API_BASE_URL = 'https://test.api.kedaimaster.com'; +const API_BASE_URL = 'https://dev.api.kedaimaster.com'; export default API_BASE_URL; diff --git a/src/helpers/itemHelper.js b/src/helpers/itemHelper.js index 227283a..77d4625 100644 --- a/src/helpers/itemHelper.js +++ b/src/helpers/itemHelper.js @@ -73,7 +73,8 @@ export async function createItem( price, selectedImage, itemTypeId, - description + description, + promoPrice ) { try { console.log(selectedImage); @@ -81,8 +82,9 @@ export async function createItem( formData.append("name", name); formData.append("price", price); formData.append("image", selectedImage); - formData.append("description", description); + if(description != null )formData.append("description", description); formData.append("itemTypeId", itemTypeId); + if(promoPrice != null )formData.append("promoPrice", promoPrice); const response = await fetch(`${API_BASE_URL}/item/create/${shopId}`, { method: "POST", diff --git a/src/pages/CafePage.js b/src/pages/CafePage.js index fd6c9e0..35b8434 100644 --- a/src/pages/CafePage.js +++ b/src/pages/CafePage.js @@ -213,7 +213,7 @@ function CafePage({ ) : ( */}
- {API_BASE_URL != 'https://api.kedaimaster.com' && + {API_BASE_URL != 'https://dev.api.kedaimaster.com' &&
}
@@ -289,7 +289,8 @@ function CafePage({ name, price, selectedImage, - description + description, + promoPrice, ) => createItem( shopId, @@ -297,7 +298,8 @@ function CafePage({ price, selectedImage, itemTypeID, - description + description, + promoPrice, ) } handleUpdateItem={(itemId, name, price, selectedImage, description, promoPrice) => diff --git a/src/pages/CreateCoupon.js b/src/pages/CreateCoupon.js index 974c921..0ed594a 100644 --- a/src/pages/CreateCoupon.js +++ b/src/pages/CreateCoupon.js @@ -46,7 +46,7 @@ const CreateCouponPage = () => { let encodedCouponCode = encodeURIComponent(encryptedCouponCode); // Construct the URL with the encoded coupon code as a query parameter - const urlWithCoupon = `https://test.coupon.kedaimaster.com/coupon?c=${encodedCouponCode}`; + const urlWithCoupon = `https://coupon.kedaimaster.com/coupon?c=${encodedCouponCode}`; // Optionally, set the URL to use with the coupon setCouponUrl(urlWithCoupon);