Merge pull request #102 from Arquisoft/sound

Sound added
Arquisoft · Apr 18, 2024 · 96fd810 · 96fd810
2 parents 13399cd + 2ec2f25
commit 96fd810
Show file tree

Hide file tree

Showing 15 changed files with 446 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,13 +8,15 @@
     "express": "^4.19.2",
     "i18n": "^0.15.1",
     "i18next": "^23.10.1",
+    "jquery": "^3.7.1",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.3.0",
     "react-countdown": "^2.3.5",
     "react-i18next": "^14.1.0",
     "react-router-dom": "^6.22.1"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "jest": "^29.7.0"
   }
 }
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -53,6 +53,7 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "axios-mock-adapter": "^1.22.0",
     "expect-puppeteer": "^9.0.2",
     "jest": "^29.3.1",

diff --git a/webapp/public/correct.mp3 b/webapp/public/correct.mp3
diff --git a/webapp/public/incorrect.mp3 b/webapp/public/incorrect.mp3
diff --git a/webapp/public/tictac.mp3 b/webapp/public/tictac.mp3
diff --git a/webapp/src/components/Instructions.js b/webapp/src/components/Instructions.js
@@ -4,12 +4,14 @@ import {useTranslation} from "react-i18next";
 
 
 
+
 function Instructions() {
 
   const[t] = useTranslation("global");
 
   return (
     <div className='instrucions_container'>
+
       <h1 className='instructions_title'>{t("instructions.title")}</h1>
      <section>   
       <article>
@@ -57,7 +59,9 @@ function Instructions() {
             </article>
 
       </section>
+
     </div>
+
   );
 }
 

diff --git a/webapp/src/components/fragments/NavBar.js b/webapp/src/components/fragments/NavBar.js
@@ -30,7 +30,9 @@ function Navbar() {
     <div className="navbar-container">
       <div className='left-nav'>
       <Profile />
-        <h1 className='navbar-text'>{t("navBar.title")}</h1>
+      <Link to="/home" className="home-button">
+      <h1 className='navbar-text'>{t("navBar.title")}</h1>
+      </Link>
       </div>
       <div className='right-nav'>
         <button className="language-button" onClick={handleLanguageMenuOpen}>{t("navBar.language")}</button>
@@ -53,7 +55,11 @@ function Navbar() {
 }
 
 function Profile() {
-  return <img src="/logo.jpg" alt="App logo" />;
+  return (
+    <Link to="/home" className="home-button">
+      <img src="/logo.jpg" alt="App logo" />    
+    </Link>
+  );
 }
 
 function Help() {

diff --git a/webapp/src/components/loginAndRegistration/AddUser.js b/webapp/src/components/loginAndRegistration/AddUser.js
@@ -148,6 +148,8 @@ const AddUser = () => {
           <button type="submit">{t("addUser.register_button")}</button>
 
           <LinkLogin />
+
+
       </form>
     </div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,8 @@ const AddUser = () => { @@
               <button type="submit">{t("addUser.register_button")}</button>
               <LinkLogin />
           </form>
         </div>
         </div>
@@ Expand Down @@