Merge pull request #9 from TurTaskProject/fix-iconsidebar

Fix Tailwindcss don't load

frontend/src/App.css

@@ -1,3 +1,11 @@
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";
+
+/* @tailwind base;
+@tailwind components;
+@tailwind utilities; */
+
 .App {
   text-align: center;
 }

frontend/src/App.jsx

@@ -46,7 +46,9 @@ const App = () => {
                         <Route path="/testAuth" element={<TestAuth/>}/>
                     </Routes>
         </div>
-        <IconSideNav />
+        <div>
+            <IconSideNav />
+        </div>
         </BrowserRouter>
     );
 }

frontend/src/components/login.jsx

@@ -9,7 +9,6 @@ import Container from '@material-ui/core/Container';
 import axiosapi from '../api/axiosapi';
 import { useNavigate } from 'react-router-dom';
 import { useGoogleLogin } from '@react-oauth/google';
-import { useHistory } from 'react-router-dom';
 
 const useStyles = makeStyles((theme) => ({
     // Styles for various elements
@@ -33,7 +32,7 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 export default function Login() {
-    const history = useHistory();
+    const history = useNavigate();
     const classes = useStyles();
 
     const [email, setEmail] = useState("");

frontend/src/index.css

@@ -1,6 +1,10 @@
-@tailwind base;
+/* @tailwind base;
 @tailwind components;
-@tailwind utilities;
+@tailwind utilities; */
+
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";
 
 body {
   margin: 0;

frontend/src/main.jsx

@@ -8,6 +8,6 @@ const GOOGLE_CLIENT_ID = import.meta.env.VITE_GOOGLE_CLIENT_ID
 
 ReactDOM.createRoot(document.getElementById("root")).render(
   <GoogleOAuthProvider clientId={GOOGLE_CLIENT_ID}>
-  <App />
+    <App />
   </GoogleOAuthProvider>
 );

frontend/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: [],
+  content: ["./src/**/*.{js,jsx}"],
   theme: {
     colors: {
       'blue': '#1fb6ff',