diff --git a/index.html b/index.html index 5943e1e..9f6e486 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@
- + diff --git a/package.json b/package.json index 4b5ceea..185d4f2 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@firebase/firestore": "^4.7.4", "@formatjs/intl-pluralrules": "^5.3.4", "@formatjs/intl-relativetimeformat": "^11.4.4", + "@googlemaps/markerclusterer": "^2.6.2", "@mui/base": "5.0.0-beta.40", "@mui/icons-material": "^6.4.6", "@mui/material": "^6.1.6", @@ -59,6 +60,7 @@ "jspdf": "^3.0.1", "jspdf-autotable": "^5.0.2", "leaflet": "^1.9.4", + "leaflet.markercluster": "^1.5.3", "lucide-react": "^0.456.0", "metronic-tailwind-react": "file:", "mini-svg-data-uri": "^1.4.4", @@ -97,7 +99,9 @@ "devDependencies": { "@eslint/js": "^9.14.0", "@types/file-saver": "^2.0.7", - "@types/leaflet": "^1.9.14", + "@types/google.maps": "^3.65.2", + "@types/leaflet": "^1.9.21", + "@types/leaflet.markercluster": "^1.5.6", "@types/node": "^22.9.0", "@types/papaparse": "^5.3.16", "@types/react": "^18.3.12", diff --git a/public/media/app/logo-tt.jpeg b/public/media/app/logo-tt.jpeg new file mode 100644 index 0000000..8c5b1bb Binary files /dev/null and b/public/media/app/logo-tt.jpeg differ diff --git a/src/auth/pages/jwt/Login.tsx b/src/auth/pages/jwt/Login.tsx index fec6898..ebe2bac 100644 --- a/src/auth/pages/jwt/Login.tsx +++ b/src/auth/pages/jwt/Login.tsx @@ -23,12 +23,12 @@ const loginSchema = Yup.object().shape({ remember: Yup.boolean() }); -const initialValues = { - username: '', - password: '', - token: '', - remember: false -}; +// const initialValues = { +// username: '', +// password: '', +// token: '', +// remember: false +// }; const Login = () => { const [loading, setLoading] = useState(false); @@ -39,80 +39,80 @@ const Login = () => { const [showPassword, setShowPassword] = useState(false); const { currentLayout } = useLayout(); - const formik = useFormik({ - initialValues, - validationSchema: loginSchema, - onSubmit: async (values, { setStatus, setSubmitting }) => { - setLoading(true); + // const formik = useFormik({ + // initialValues, + // validationSchema: loginSchema, + // onSubmit: async (values, { setStatus, setSubmitting }) => { + // setLoading(true); - try { - if (!login) throw new Error('JWTProvider is required for this form.'); - await login(values.username, values.password, values.token); + // try { + // if (!login) throw new Error('JWTProvider is required for this form.'); + // await login(values.username, values.password, values.token); - if (values.remember) { - localStorage.setItem('username', values.username); - } else { - localStorage.removeItem('username'); - } + // if (values.remember) { + // localStorage.setItem('username', values.username); + // } else { + // localStorage.removeItem('username'); + // } - navigate(from, { replace: true }); - } catch (error: any) { - if (error.response && error.response.data) { - setStatus(error.response.data.message); - } else { - setStatus('The login details are incorrect'); - } + // navigate(from, { replace: true }); + // } catch (error: any) { + // if (error.response && error.response.data) { + // setStatus(error.response.data.message); + // } else { + // setStatus('The login details are incorrect'); + // } - setSubmitting(false); - } - setLoading(false); - } - }); + // setSubmitting(false); + // } + // setLoading(false); + // } + // }); - const togglePassword = (event: MouseEvent
{/*
{/*
@@ -66,7 +66,7 @@ const HeaderLogo = () => {