Merge branch 'develop'

ce-itcr · Nov 27, 2021 · f7d1097 · f7d1097
2 parents 2240107 + 6aaf91e
commit f7d1097
Show file tree

Hide file tree

Showing 110 changed files with 9,796 additions and 21,697 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 /.pnp
 .pnp.js
 
-yarn.lock
+package-lock.json
 
 # testing
 /coverage

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.15.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.15",
@@ -15,33 +16,40 @@
     "@testing-library/user-event": "^12.1.10",
     "axios": "^0.21.4",
     "bootstrap": "^5.1.0",
+    "chart.js": "2.9.4",
+    "devextreme": "^21.2.3",
     "devextreme-react": "^21.1.5",
     "md5": "^2.3.0",
+    "node-sass": "^6.0.1",
+    "pm2": "^5.1.2",
     "react": "^17.0.2",
     "react-bootstrap": "^2.0.0-beta.6",
     "react-bootstrap-dropdown-menu": "^1.1.23",
     "react-data-grid": "^7.0.0-beta.5",
     "react-dom": "^17.0.2",
     "react-dropdown": "^1.9.2",
+    "react-ga": "2.7.0",
     "react-hot-toast": "^2.1.1",
     "react-icons": "^4.2.0",
     "react-loading": "^2.0.3",
     "react-lrc": "^2.1.4",
     "react-modal": "^3.14.3",
+    "react-player": "^2.9.0",
     "react-router": "^3.2.6",
     "react-router-dom": "^5.3.0",
     "react-scripts": "4.0.3",
     "react-scroll": "^1.8.4",
     "react-simple-modal-provider": "^1.7.2",
+    "react-speech-recognition": "^3.9.0",
     "react-string": "^1.0.5",
     "react-toastify": "^8.0.2",
     "react-top-loading-bar": "^2.0.1",
+    "react-tunes-player": "^5.0.0",
     "reactjs-popup": "^2.0.5",
     "reactstrap": "^8.10.0",
     "styled-components": "^5.3.1",
     "universal-cookie": "^4.0.4",
-    "web-vitals": "^1.0.1",
-    "pm2": "^5.1.2"
+    "web-vitals": "^1.0.1"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/public/icon.png b/public/icon.png
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/icon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -24,9 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>karaoke!
-
-    </title>
+    <title>karaoke!</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/App.css b/src/App.css
diff --git a/src/App.js b/src/App.js