From 139fdb00f4671dc6f54dc7c47396a3d3a74a922e Mon Sep 17 00:00:00 2001
From: RolandoDrRobot <rolando.arguello.email@gmail.com>
Date: Sat, 31 May 2025 12:04:31 -0600
Subject: [PATCH 1/3] fix close and comment modal

---
 .../src/components/FlappyBeasts/flappyBeasts.tsx   | 12 +-----------
 client/src/components/FlappyBeasts/main.css        |  2 +-
 client/src/components/Header/index.tsx             |  4 ++--
 .../components/ui/ModalGameOver/ModalGameOver.tsx  | 12 +++++++++++-
 client/vite.config.ts                              | 14 +++++++-------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/client/src/components/FlappyBeasts/flappyBeasts.tsx b/client/src/components/FlappyBeasts/flappyBeasts.tsx
index 5a0215e8..9ec4fee0 100644
--- a/client/src/components/FlappyBeasts/flappyBeasts.tsx
+++ b/client/src/components/FlappyBeasts/flappyBeasts.tsx
@@ -833,17 +833,6 @@ const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
                 className="land animated"
                 style={{ backgroundImage: `url(${gameAssets.land})` }}
             />
-
-            {/* Exit button */}
-            {onExitGame && (
-                <button
-                    className="return-button"
-                    onClick={onExitGame}
-                >
-                    X
-                </button>
-            )}
-
             {/* Debug button to show colliders in UI for testing purposes */}
             {/* <button 
                     className="debug-button"
@@ -912,6 +901,7 @@ const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
                 selectedFood={selectedFood}
                 handlePlayAgain={handlePlayAgain}
                 restartIcon={Restart}
+                onExitGame={onExitGame}
             />
 
             {/* Energy Toast */}
diff --git a/client/src/components/FlappyBeasts/main.css b/client/src/components/FlappyBeasts/main.css
index 2dad511b..8313dbe4 100644
--- a/client/src/components/FlappyBeasts/main.css
+++ b/client/src/components/FlappyBeasts/main.css
@@ -171,7 +171,7 @@
   .flappy-bird-game .return-button {
     position: absolute;
     top: 10px;
-    right: 10px;
+    left: 10px;
     background-color: rgba(0, 0, 0, 0.5);
     color: var(--text-light);
     border: none;
diff --git a/client/src/components/Header/index.tsx b/client/src/components/Header/index.tsx
index bf8b0d22..db62680b 100644
--- a/client/src/components/Header/index.tsx
+++ b/client/src/components/Header/index.tsx
@@ -131,9 +131,9 @@ const Header: React.FC<HeaderProps> = ({ tamagotchiStats }) => {
           <img src={monster} alt="Logo" />
         </Link>
 
-        <div onClick={() => buttonSound()}>
+        {/* <div onClick={() => buttonSound()}>
           <Countdown />
-        </div>
+        </div> */}
 
         <div className="side-menu-container">
           <button
diff --git a/client/src/components/ui/ModalGameOver/ModalGameOver.tsx b/client/src/components/ui/ModalGameOver/ModalGameOver.tsx
index df7af9a9..074612a7 100644
--- a/client/src/components/ui/ModalGameOver/ModalGameOver.tsx
+++ b/client/src/components/ui/ModalGameOver/ModalGameOver.tsx
@@ -9,6 +9,7 @@ interface GameOverModalProps {
   selectedFood?: any;
   handlePlayAgain: () => void;
   restartIcon: string;
+  onExitGame: any;
 }
 
 const GameOverModal: React.FC<GameOverModalProps> = ({
@@ -18,12 +19,21 @@ const GameOverModal: React.FC<GameOverModalProps> = ({
   collectedFood,
   selectedFood,
   handlePlayAgain,
-  restartIcon
+  restartIcon,
+  onExitGame
 }) => {
   if (currentScreen !== 'gameover') return null;
 
   return (
     <div className="game-result-container">
+      {onExitGame && (
+          <button
+              className="return-button"
+              onClick={onExitGame}
+          >
+              X
+          </button>
+      )}
       <h2 className="game-result-title">Game over!</h2>
       
       <p className="game-result-score">
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 7bc4d95b..2936a810 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -3,15 +3,15 @@ import topLevelAwait from "vite-plugin-top-level-await";
 import { defineConfig } from "vite";
 import { VitePWA } from "vite-plugin-pwa";
 import wasm from "vite-plugin-wasm";
-//import fs from "fs";
+import fs from "fs";
 
 export default defineConfig({
-  //  server: {
-  //    https: {
-  //    key: fs.readFileSync("mkcert+1-key.pem"), // Path to private key file
-  //    cert: fs.readFileSync("mkcert+1.pem"),   // Path to certificate file
-  //    },
-  //  },
+   server: {
+     https: {
+     key: fs.readFileSync("mkcert+1-key.pem"), // Path to private key file
+     cert: fs.readFileSync("mkcert+1.pem"),   // Path to certificate file
+     },
+   },
   plugins: [
     react(),
     wasm(),

From 1ebee152bd8f5448b97664bcc544f90e24a4377a Mon Sep 17 00:00:00 2001
From: RolandoDrRobot <rolando.arguello.email@gmail.com>
Date: Sat, 31 May 2025 12:07:13 -0600
Subject: [PATCH 2/3] Fix aura

---
 client/src/components/Tamagotchi/Actions/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Tamagotchi/Actions/index.tsx b/client/src/components/Tamagotchi/Actions/index.tsx
index f45fa34d..4feef213 100644
--- a/client/src/components/Tamagotchi/Actions/index.tsx
+++ b/client/src/components/Tamagotchi/Actions/index.tsx
@@ -56,7 +56,7 @@ const Actions = ({
   const [buttonSound] = useSound(buttonClick, { volume: 0.6, preload: true });
 
   return (
-    <div className={`actions mb-0 ${isLoading ? 'loading-aura' : ''}`}>
+    <div className={`actions mb-0 ${isActionDisabled ? 'aura' : ''}`}>
       {
         actionButtons.map(({ label, img, action, pictureKey }) => (
           <Button

From c274a8958d8a939a64e9b628b27ededec16c069b Mon Sep 17 00:00:00 2001
From: RolandoDrRobot <rolando.arguello.email@gmail.com>
Date: Sat, 31 May 2025 12:07:42 -0600
Subject: [PATCH 3/3] fix server

---
 client/vite.config.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/vite.config.ts b/client/vite.config.ts
index 2936a810..7bc4d95b 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -3,15 +3,15 @@ import topLevelAwait from "vite-plugin-top-level-await";
 import { defineConfig } from "vite";
 import { VitePWA } from "vite-plugin-pwa";
 import wasm from "vite-plugin-wasm";
-import fs from "fs";
+//import fs from "fs";
 
 export default defineConfig({
-   server: {
-     https: {
-     key: fs.readFileSync("mkcert+1-key.pem"), // Path to private key file
-     cert: fs.readFileSync("mkcert+1.pem"),   // Path to certificate file
-     },
-   },
+  //  server: {
+  //    https: {
+  //    key: fs.readFileSync("mkcert+1-key.pem"), // Path to private key file
+  //    cert: fs.readFileSync("mkcert+1.pem"),   // Path to certificate file
+  //    },
+  //  },
   plugins: [
     react(),
     wasm(),