diff --git a/resources/css/app.css b/resources/css/app.css index b5c61c9..a6697d6 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,3 +1,11 @@ @tailwind base; @tailwind components; @tailwind utilities; + +.btn { + @apply text-center text-white px-2 py-1 focus:outline-1 border border-white transition duration-300 ease-in-out shadow hover:shadow-lg rounded cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed; +} + +.btn-primary { + @apply btn bg-blue-700 border-blue-700 hover:bg-blue-800 focus:bg-blue-800; +} diff --git a/resources/js/components/rainfall/AddRainfall.tsx b/resources/js/components/rainfall/AddRainfall.tsx index 796d776..24afdc1 100644 --- a/resources/js/components/rainfall/AddRainfall.tsx +++ b/resources/js/components/rainfall/AddRainfall.tsx @@ -5,7 +5,7 @@ import Card from "../Card"; const AddRainfall: FC = ({reload}) => { - const {axiosPost} = useAxiosTools() + const {errorCatch, errorLabel, axiosPost} = useAxiosTools() const [date, setDate] = useState((new Date()).toSQLDate()) const [value, setValue] = useState(0) @@ -16,15 +16,16 @@ const AddRainfall: FC = ({reload}) => { setDate((new Date()).toSQLDate()) setValue(0) reload(new Date()) - } catch (e) { - console.error(e) + } catch (error) { + errorCatch(error) } } - return + return

Ajout d'une mesure

+ {errorLabel()}
= ({reload}) => { value={value} onChange={event => setValue(Number(event.target.value))}>Mesure - +
} diff --git a/resources/js/components/rainfall/LastFiveMesure.tsx b/resources/js/components/rainfall/LastFiveMesure.tsx index c43b544..2fcc3ac 100644 --- a/resources/js/components/rainfall/LastFiveMesure.tsx +++ b/resources/js/components/rainfall/LastFiveMesure.tsx @@ -7,7 +7,7 @@ import {Link} from "react-router-dom"; const LastFiveMesure: FC = ({loadedAt}) => { - const {error, setError, axiosGet} = useAxiosTools() + const {errorCatch, errorLabel, setError, axiosGet} = useAxiosTools() const [data, setData] = useState([]) useEffect(() => { @@ -22,14 +22,14 @@ const LastFiveMesure: FC = ({loadedAt}) => { if (e instanceof AxiosError) { setError(e.message) } else { - console.error(e) + errorCatch(e) } } } - return <> + return

5 dernières mesures

- {error &&
{error}
} + {errorLabel()} {data.map(line => @@ -38,9 +38,8 @@ const LastFiveMesure: FC = ({loadedAt}) => { )}
-
Tous les mesures - +
} export default LastFiveMesure diff --git a/resources/js/pages/Auth/ForgotPassword.tsx b/resources/js/pages/Auth/ForgotPassword.tsx index fa2c15e..518c56f 100644 --- a/resources/js/pages/Auth/ForgotPassword.tsx +++ b/resources/js/pages/Auth/ForgotPassword.tsx @@ -32,7 +32,7 @@ const ForgotPassword = () => { value={email} onChange={event => setEmail(event.target.value)} autoFocus>Email - + } diff --git a/resources/js/pages/Auth/Login.tsx b/resources/js/pages/Auth/Login.tsx index 56f975a..d03100a 100644 --- a/resources/js/pages/Auth/Login.tsx +++ b/resources/js/pages/Auth/Login.tsx @@ -42,7 +42,7 @@ const Login = () => { placeholder="******" value={password} onChange={event => setPassword(event.target.value)}>Mot de passe - + Mot de passe oublié ?
diff --git a/resources/js/pages/Auth/Profile.tsx b/resources/js/pages/Auth/Profile.tsx index 64e1e62..ac58405 100644 --- a/resources/js/pages/Auth/Profile.tsx +++ b/resources/js/pages/Auth/Profile.tsx @@ -7,14 +7,16 @@ const Profile = () => { const {authUser, logout} = useAuthUser() return -

Profile de l'utilisateur

+
+

Profile de l'utilisateur

+
+ +
+
Nom: {authUser?.name}
Email: {authUser?.email}
-
- -
{/*
Update name & email
*/} {/*
Change password
*/} {/*
Delete Account
*/} diff --git a/resources/js/pages/Auth/Register.tsx b/resources/js/pages/Auth/Register.tsx index d651b4c..87aaca7 100644 --- a/resources/js/pages/Auth/Register.tsx +++ b/resources/js/pages/Auth/Register.tsx @@ -47,7 +47,7 @@ const Register = () => { value={password} onChange={event => setPassword(event.target.value)} autoFocus>Mot de passe - + diff --git a/resources/js/pages/Auth/Reset.tsx b/resources/js/pages/Auth/Reset.tsx index de6d6c3..88e3532 100644 --- a/resources/js/pages/Auth/Reset.tsx +++ b/resources/js/pages/Auth/Reset.tsx @@ -46,7 +46,7 @@ const Reset = () => { placeholder="******" value={samePassword} onChange={event => setSamePassword(event.target.value)}>Confirmation du mot de passe - + } diff --git a/resources/js/pages/Rainfall.tsx b/resources/js/pages/Rainfall.tsx index ca63931..9767e62 100644 --- a/resources/js/pages/Rainfall.tsx +++ b/resources/js/pages/Rainfall.tsx @@ -16,24 +16,20 @@ const Rainfall = () => { start_date: (new Date((new Date()).setMonth((new Date).getMonth() - 1))).toSQLDate(), end_date: (new Date()).toSQLDate(), }) - const {axiosGet} = useAxiosTools() + const {errorCatch, errorLabel, axiosGet} = useAxiosTools() const {targetRef, dimensions} = useDimension() useEffect(() => { fetchGraphData() - }, [loadedAt]) - - useEffect(() => { - fetchGraphData() - }, [graphDetails]) + }, [loadedAt, graphDetails]) const fetchGraphData = async () => { try { const params = `start=${graphDetails.start_date}&end=${graphDetails.end_date}` const res = await axiosGet(`/api/rainfalls/graph?${params}`) setGraphData(res.data) - } catch (e) { - console.error(e) + } catch (error) { + errorCatch(error) } } @@ -43,7 +39,8 @@ const Rainfall = () => { -
+ {errorLabel()} +