From e230c20c676fa7f8b0fdae60491e1e717b96e9a6 Mon Sep 17 00:00:00 2001
From: Infernalz <51412133+Infernalz92@users.noreply.github.com>
Date: Fri, 15 Dec 2023 21:01:46 +0100
Subject: [PATCH] Fix Closing Menu

Fixed closing menu on keypress and removed closemenu2
---
 html/src/App.jsx | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/html/src/App.jsx b/html/src/App.jsx
index 71b44aa0..20a1968a 100644
--- a/html/src/App.jsx
+++ b/html/src/App.jsx
@@ -26,7 +26,7 @@ export default function App() {
   const [outfitName, setOutfitName] = useState(null)
 
   const openingMenu = (e) => {
-    let data = e.data 
+    let data = e.data
     switch (data.type) {
       case 'newPlayer':
         setNew(true)
@@ -98,8 +98,6 @@ export default function App() {
 
     if(save) {
       fetch('https://qbr-clothing/closeMenu', {method: 'POST', body: JSON.stringify({})})
-    } else {
-      fetch('https://qbr-clothing/closeMenu2', {method: 'POST', body: JSON.stringify({})})
     }
 
   }
@@ -116,7 +114,7 @@ export default function App() {
         fetch('https://qbr-clothing/saveOutfit', {method: 'POST', body: JSON.stringify({
           outfitName: outfitName
         })})
-  
+
         closeMenu(true)
       }
     }
@@ -191,21 +189,21 @@ export default function App() {
             <div className="contentWrapper_inner">
               <div className="clothingSection">
 
-                { navSelect === 1 && 
+                { navSelect === 1 &&
                   <>
                     <p className="clothingMenu_header">Outfits</p>
-                    <Outfits data={outfits} /> 
+                    <Outfits data={outfits} />
                   </>
                 }
-                { navSelect === 2 && 
+                { navSelect === 2 &&
                   <>
                     <div className="clothingMenu_header">
                       <p>Skin Customization</p>
                     </div>
                     <Skins data={skins} />
-                  </> 
+                  </>
                 }
-                { navSelect === 3 &&  
+                { navSelect === 3 &&
                   <>
                     <p className="clothingMenu_header">Clothing Customization</p>
                     <Clothes data={clothes} />
@@ -216,8 +214,8 @@ export default function App() {
                 <button className='button button-solid' onClick={() => saveCharacter()}>
                   Save
                 </button>
-                
-                { (!newPlayer && menuType === 'outfits' || menuType === 'all') && 
+
+                { (!newPlayer && menuType === 'outfits' || menuType === 'all') &&
                   <button className={navSelect === 1 ? 'button button-solid active' : 'button button-solid'}  onClick={() => setMenu(1)} data-tip='Outfits'>
                     <FontAwesomeIcon icon="suitcase" />
                   </button>
@@ -235,7 +233,7 @@ export default function App() {
                   </button>
                 }
 
-                <button className='button button-solid' onClick={() => closeMenu(false)}>
+                <button className='button button-solid' onClick={() => closeMenu(true)}>
                   Close
                 </button>
               </div>
@@ -246,3 +244,4 @@ export default function App() {
     </main>
   )
 }
+