Merge pull request #168 from AldoAbdn/V1.4.0

V1.4.0
AldoAbdn · Oct 31, 2024 · fea5655 · fea5655
2 parents 5ec9c63 + f6028c5
commit fea5655
Show file tree

Hide file tree

Showing 32 changed files with 1,070 additions and 662 deletions.
diff --git a/README.md b/README.md
@@ -51,8 +51,9 @@ Runs npm install in both the client and server package after npm install is run
 You will need to setup two sets of environment variables, one for the client and one for the server. You can do this using .env files within 
 the client and server folders of this project. Refer to the readmes in the client and server folders to setup your environment variables
 
-Once you've done this, from the root directory run the following script
+Once you've done this, from the root directory run the following scripts
 
+    npm install
     npm run dev
 
 This will start both the client and server projects in dev mode on your machine

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -9,6 +9,7 @@
     "cwg": "^0.2.1",
     "feathers-redux": "^3.0.0",
     "file-saver": "^2.0.0",
+    "html2canvas": "^1.4.1",
     "jspdf": "^2.3.1",
     "prop-types": "^15.7.2",
     "random-words": "^1.1.0",
@@ -21,14 +22,15 @@
     "react-dnd-touch-backend": "^0.8.1",
     "react-dom": "^16.8.4",
     "react-google-recaptcha": "^2.0.1",
-    "react-lineto": "^3.1.3",
+    "react-keyboard-event-handler": "^1.5.4",
     "react-loading-overlay": "^1.0.1",
     "react-password-strength": "^2.4.0",
     "react-redux": "^6.0.0",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^4.0.8",
     "react-scripts": "^3.2.0",
+    "react-xarrows": "^2.0.2",
     "react-youtube-playlist": "^2.2.8",
     "reactstrap": "^7.1.0",
     "redux": "^4.0.1",

diff --git a/client/public/index.html b/client/public/index.html
@@ -27,8 +27,6 @@
   </head>
   <body>
     <div id="root">
-
     </div>
   </body>
-
 </html>
diff --git a/client/public/sounds/hint.wav b/client/public/sounds/hint.wav
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,8 +27,6 @@ @@
       </head>
       <body>
         <div id="root">
         </div>
       </body>
     </html>