Merge pull request #19 from vc1530/frontend-rework

Frontend rework
vc1530 · Dec 3, 2022 · 6343e53 · 6343e53
2 parents 46a5a29 + 4aade35
commit 6343e53
Show file tree

Hide file tree

Showing 29 changed files with 1,146 additions and 550 deletions.
diff --git a/front-end/.env b/front-end/.env
@@ -1,3 +1,3 @@
 PORT=3000
-# REACT_APP_BACKEND=http://localhost:8888
-REACT_APP_BACKEND=https://fork-test.onrender.com
+REACT_APP_BACKEND=http://localhost:8888
+# REACT_APP_BACKEND=https://fork-test.onrender.com
diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -6,10 +6,15 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "animate.css": "^4.1.1",
+    "chart.js": "^4.0.1",
+    "faker": "^6.6.6",
     "jwt-decode": "^3.1.2",
     "mdb-react-ui-kit": "^5.0.0",
     "react": "^18.2.0",
+    "react-chartjs-2": "^5.0.1",
     "react-dom": "^18.2.0",
+    "react-icons": "^4.7.1",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"
   },
@@ -41,6 +46,7 @@
   "devDependencies": {
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
+    "@faker-js/faker": "^7.6.0",
     "@mui/icons-material": "^5.10.9",
     "@mui/material": "^5.10.11",
     "@mui/styled-engine": "^5.10.8",

diff --git a/front-end/public/index.html b/front-end/public/index.html
@@ -3,6 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@500&display=swap" rel="stylesheet">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta

diff --git a/front-end/src/App.css b/front-end/src/App.css
@@ -35,4 +35,4 @@
   to {
     transform: rotate(360deg);
   }
-}
+}
diff --git a/front-end/src/App.js b/front-end/src/App.js
@@ -1,14 +1,11 @@
 import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'
-import Home from './pages/Home'
-import Dashboard from './pages/Dashboard' 
+import Login from './pages/Login'
+import Dashboard from './dashboard/Dashboard' 
 import Profile from './pages/Profile' 
 import Song from './pages/Song'
 import './App.css';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { green, pink } from '@mui/material/colors';
-import axios from "axios"
-import { useEffect, useState } from 'react'
-import Papa from 'papaparse'
 import TestML from './pages/TestML'
 
 const theme = createTheme(
@@ -23,7 +20,7 @@ const theme = createTheme(
       },
       typography: {
           allVariants: {
-            fontFamily: 'Nunito',
+            fontFamily: 'Montserrat, sans-serif', 
             textTransform: 'none',
             fontSize: 16,
           },
@@ -39,12 +36,11 @@ function App() {
         <Router>
           <main className="App-main">
             <Routes>
-              <Route path="/" element={<Home />} />
-              <Route path="/dashboard" element={<Dashboard />} /> 
+              <Route path="/login" element={<Login />} />
+              <Route path="/" element={<Dashboard />} /> 
               <Route path="/profile" element={<Profile />} /> 
               <Route path="/:id" element={<Song />} /> 
               <Route path="/test" element={<TestML />} /> 
-
             </Routes> 
           </main>
         </Router>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ @@
       to {
         transform: rotate(360deg);
       }
-    }
+    }