diff --git a/frontend/src/App.css b/frontend/src/App.css index e70a402..eaac616 100644 --- a/frontend/src/App.css +++ b/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; } diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 4479c44..658d5e3 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -46,7 +46,9 @@ const App = () => { }/> - +
+ +
); } diff --git a/frontend/src/components/login.jsx b/frontend/src/components/login.jsx index 93ec4ca..b088523 100644 --- a/frontend/src/components/login.jsx +++ b/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(""); diff --git a/frontend/src/index.css b/frontend/src/index.css index 46e54b9..daa8633 100644 --- a/frontend/src/index.css +++ b/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; diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index 3b3dc61..af048e7 100644 --- a/frontend/src/main.jsx +++ b/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( - + ); \ No newline at end of file diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 321118d..b5867e2 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,6 +1,6 @@ /** @type {import('tailwindcss').Config} */ export default { - content: [], + content: ["./src/**/*.{js,jsx}"], theme: { colors: { 'blue': '#1fb6ff',