Merge pull request #141 from simplitrac/remove-achievements-button-fr…

…om-homepage Remove achievements button from homepage
simplitrac · Sep 9, 2024 · d6f4344 · d6f4344
2 parents e0a0629 + 7f8f05b
commit d6f4344
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -29,7 +29,7 @@
         "mui": "^0.0.1",
         "path": "^0.12.7",
         "react": "^18.2.0",
-        "react-achievements": "^1.3.1",
+        "react-achievements": "^1.3.3",
         "react-bootstrap": "^2.10.2",
         "react-burger-menu": "^3.0.9",
         "react-confetti": "^6.1.0",

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -10,6 +10,8 @@ import { AppContext } from './context/AppContext.jsx';
 import Chart from "./components/Chart.jsx";
 import EditTransactionsPage from './components/EditTransactionsPage';
 import UserGuide from './components/UserGuide.jsx';
+import {AchievementProvider} from "react-achievements";
+import achievementConfig from "./config/achievementConfig.js";
 
 
 function App() {
@@ -25,7 +27,11 @@ function App() {
     const renderComponent = () => {
         switch(screen) {
             case "landing":
-                return <LandingComponent />
+                return (
+                        <AchievementProvider config={achievementConfig} initialState={{}} badgesButtonPosition={'top-right'}>
+                            <LandingComponent />
+                        </AchievementProvider>
+                )
             case "chart":
                 return <Chart />
             case "camera":

diff --git a/client/src/components/Camera.jsx b/client/src/components/Camera.jsx
@@ -173,9 +173,9 @@ const Camera = () => {
                     </div>
                     <Button className="custom-button" onClick={submitPhoto} style={styles.button}>Submit</Button>
                     <Button className="custom-button" onClick={activateDesktopCamera} style={styles.button}>Retake</Button>
+                    <BackButton />
                 </div>
-            )}
-            <BackButton />
+                )}
 
             <canvas ref={canvasRef} style={styles.hiddenCanvas}></canvas>
         </div>

diff --git a/client/src/main.jsx b/client/src/main.jsx
@@ -9,11 +9,11 @@ import {AchievementProvider} from "react-achievements";
 import achievementConfig from "./config/achievementConfig.js";
 
 ReactDOM.createRoot(document.getElementById('root')).render(
-    <AchievementProvider config={achievementConfig} initialState={{}} badgesButtonPosition={'top-right'}>
+    // <AchievementProvider config={achievementConfig} initialState={{}} badgesButtonPosition={'top-right'}>
     <AppProvider>
             <ChakraProvider theme={theme}>
                 <App />
             </ChakraProvider>
         </AppProvider>
-    </AchievementProvider>
+    // </AchievementProvider>
 );