feat: add BJRepas credentials
All checks were successful
Deploy to Netlify / Deploy to Netlify (push) Successful in 1m31s
All checks were successful
Deploy to Netlify / Deploy to Netlify (push) Successful in 1m31s
This commit is contained in:
parent
052e59f1ac
commit
81d73fd99d
6 changed files with 274 additions and 52 deletions
148
app/components/repas/credentials.tsx
Normal file
148
app/components/repas/credentials.tsx
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
import { Github, Loader2, Save } from "lucide-react";
|
||||
import { Button } from "../ui/button";
|
||||
import { Card } from "../ui/card";
|
||||
import { Input } from "../ui/input";
|
||||
import { Label } from "../ui/label";
|
||||
import { Link } from "react-router";
|
||||
import { getCredentialsStatus, testCredentials } from "~/lib/api";
|
||||
import { useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
|
||||
export default function BJRepas() {
|
||||
const credentials = getSavedCredentials();
|
||||
const [username, setUsername] = useState(credentials?.username || "");
|
||||
const [password, setPassword] = useState(credentials?.password || "");
|
||||
|
||||
let intervalId: NodeJS.Timeout | null = null;
|
||||
const [isLoading, setLoading] = useState(false);
|
||||
|
||||
const handleSaveCredentials = async () => {
|
||||
try {
|
||||
if (!username || !password) {
|
||||
toast.error(
|
||||
"Veuillez renseigner vos identifiants BJColle avant de continuer."
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
await testCredentials(username, password);
|
||||
setLoading(true);
|
||||
|
||||
// Try every second to check if the credentials are valid
|
||||
intervalId = setInterval(async () => {
|
||||
try {
|
||||
const res = await getCredentialsStatus();
|
||||
|
||||
// Credentials are valid
|
||||
if (res.authenticated === "SUCCESS") {
|
||||
saveCredentials(username, password);
|
||||
toast.success("Vos identifiants ont été enregistrés avec succès.");
|
||||
setLoading(false);
|
||||
if (intervalId) clearInterval(intervalId);
|
||||
}
|
||||
// Credentials are invalid
|
||||
if (res.authenticated === "ERROR") {
|
||||
toast.error(
|
||||
"Identifiants invalides. Veuillez vérifier votre nom d'utilisateur et mot de passe."
|
||||
);
|
||||
setUsername("");
|
||||
setPassword("");
|
||||
setLoading(false);
|
||||
if (intervalId) clearInterval(intervalId);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error testing credentials:", error);
|
||||
}
|
||||
}, 1000);
|
||||
} catch (error) {
|
||||
console.error("Error testing credentials:", error);
|
||||
toast.error(
|
||||
"Une erreur est survenue lors de la validation des identifiants. Veuillez réessayer plus tard."
|
||||
);
|
||||
}
|
||||
};
|
||||
return (
|
||||
<div className="space-y-4 px-2">
|
||||
<h2 className="text-2xl font-bold">Inscription aux repas</h2>
|
||||
|
||||
<p className="text-muted-foreground text-sm">
|
||||
Pour vous inscrire aux repas (via BJ Repas), veuillez renseigner vos
|
||||
identifiants BJColle ci-dessous.
|
||||
</p>
|
||||
<p className="text-muted-foreground text-xs">
|
||||
Vos identifiants sont enregistrés localement sur votre appareil et ne
|
||||
sont jamais stockés sur nos serveurs.
|
||||
</p>
|
||||
|
||||
<Card className="space-y-4 p-4 my-6">
|
||||
<div className="space-y-4">
|
||||
<h4 className="text-lg font-semibold">Vos identifiants BJColle</h4>
|
||||
<div>
|
||||
<Label htmlFor="username">Nom d'utilisateur</Label>
|
||||
<Input
|
||||
type="text"
|
||||
id="username"
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
placeholder="Entrez votre nom d'utilisateur"
|
||||
className="mt-1"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="password">Mot de passe</Label>
|
||||
<Input
|
||||
type="password"
|
||||
id="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="Entrez votre mot de passe"
|
||||
className="mt-1"
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
className="w-full"
|
||||
onClick={handleSaveCredentials}
|
||||
disabled={isLoading}
|
||||
>
|
||||
{isLoading ? (
|
||||
<>
|
||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||
Vérification en cours...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Save className="mr-2 h-4 w-4" />
|
||||
Enregistrer mes identifiants
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</Card>
|
||||
<div className="flex justify-center items-center flex-col space-y-1">
|
||||
<p className="text-sm text-muted-foreground text-center">
|
||||
Pour en savoir plus sur la sécurité et la confidentialité, consultez
|
||||
le code source du projet.{" "}
|
||||
</p>
|
||||
<Link to={import.meta.env.VITE_GITHUB_URL} target="_blank">
|
||||
<Button variant="link" size="sm" className="p-0">
|
||||
<Github className="h-4 w-4" />
|
||||
Khollisé sur GitHub
|
||||
</Button>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const saveCredentials = (username: string, password: string) => {
|
||||
localStorage.setItem("bj_username", username);
|
||||
localStorage.setItem("bj_password", password);
|
||||
};
|
||||
export const getSavedCredentials = () => {
|
||||
const username = localStorage.getItem("bj_username");
|
||||
const password = localStorage.getItem("bj_password");
|
||||
if (username && password) {
|
||||
return { username, password };
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
|
@ -2,8 +2,8 @@ import { useState } from "react";
|
|||
import { Tabs, TabsList, tabsStyle, TabsTrigger } from "~/components/ui/tabs";
|
||||
import BottomNavigation from "~/components/bottom-nav";
|
||||
import { CalendarCheck, ChefHat } from "lucide-react";
|
||||
import WIP from "./wip";
|
||||
import Menus from "./menus";
|
||||
import BJRepas from "./credentials";
|
||||
|
||||
const tabs = [
|
||||
{
|
||||
|
|
@ -16,7 +16,7 @@ const tabs = [
|
|||
value: "bjrepas",
|
||||
label: "BJ Repas",
|
||||
icon: <CalendarCheck className="h-4 w-4" />,
|
||||
content: <WIP />,
|
||||
content: <BJRepas />,
|
||||
},
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,23 @@
|
|||
import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
|
||||
import { Utensils, Salad, Cake, CookingPot, Icon, Carrot } from "lucide-react";
|
||||
import {
|
||||
Utensils,
|
||||
Salad,
|
||||
Cake,
|
||||
CookingPot,
|
||||
Icon,
|
||||
Carrot,
|
||||
LogIn,
|
||||
CalendarCheck,
|
||||
Check,
|
||||
CheckCheck,
|
||||
Loader2,
|
||||
} from "lucide-react";
|
||||
import { cheese } from "@lucide/lab";
|
||||
|
||||
interface Course {
|
||||
name: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
interface Meal {
|
||||
name: string;
|
||||
courses: Course[];
|
||||
}
|
||||
import { registerForMeal, type Meal } from "~/lib/api";
|
||||
import { Button } from "../ui/button";
|
||||
import { toast } from "sonner";
|
||||
import { useState } from "react";
|
||||
import { getSavedCredentials } from "./credentials";
|
||||
|
||||
const getCourseIcon = (courseName: string) => {
|
||||
const name = courseName.toLowerCase();
|
||||
|
|
@ -23,7 +30,7 @@ const getCourseIcon = (courseName: string) => {
|
|||
return <Utensils className="h-6 w-6" />;
|
||||
};
|
||||
|
||||
export function DailyMenu({ meals }: { meals: Meal[] }) {
|
||||
export function DailyMenu({ meals, refetchMeals }: { meals: Meal[]; refetchMeals: () => Promise<any> }) {
|
||||
if (meals.length === 0) {
|
||||
return (
|
||||
<div className="flex items-center justify-center p-4">
|
||||
|
|
@ -34,6 +41,28 @@ export function DailyMenu({ meals }: { meals: Meal[] }) {
|
|||
);
|
||||
}
|
||||
|
||||
const [isLoading, setLoading] = useState(false);
|
||||
const credentials = getSavedCredentials();
|
||||
|
||||
const handleRegister = async (id: number) => {
|
||||
try {
|
||||
if (!credentials) {
|
||||
toast.error(
|
||||
"Veuillez d'abord enregistrer vos identifiants dans l'onglet BJRepas."
|
||||
);
|
||||
return;
|
||||
}
|
||||
await registerForMeal(id, credentials.username, credentials.password);
|
||||
await refetchMeals();
|
||||
setLoading(false);
|
||||
} catch (error) {
|
||||
console.error("Error registering for meal:", error);
|
||||
toast.error(
|
||||
"Une erreur est survenue lors de l'inscription au repas. Veuillez réessayer."
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="px-4 py-2">
|
||||
<h2 className="text-2xl font-bold mb-4">
|
||||
|
|
@ -73,6 +102,33 @@ export function DailyMenu({ meals }: { meals: Meal[] }) {
|
|||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{meal.submittable &&
|
||||
(meal.isRegistered ? (
|
||||
<Button
|
||||
variant="outline"
|
||||
className="w-full bg-green-600 hover:bg-green-700 text-white mt-4 mb-1"
|
||||
// onClick={handleUnregister}
|
||||
disabled
|
||||
>
|
||||
<CheckCheck className="h-5 w-5 mr-2" />
|
||||
Vous êtes inscrit(e) à ce repas
|
||||
</Button>
|
||||
) : isLoading ? (
|
||||
<Button variant="default" className="w-full mt-4 mb-1" disabled>
|
||||
<Loader2 className="h-5 w-5 mr-2 animate-spin" />
|
||||
Inscription en cours...
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
variant="default"
|
||||
className="w-full mt-4 mb-1"
|
||||
onClick={() => handleRegister(meal.id)}
|
||||
>
|
||||
<CalendarCheck className="h-5 w-5 mr-2" />
|
||||
S'inscrire à ce repas
|
||||
</Button>
|
||||
))}
|
||||
</CardContent>
|
||||
</Card>
|
||||
))}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,34 @@
|
|||
import { useMenus } from "~/lib/api";
|
||||
import { useMeals, type Meal } from "~/lib/api";
|
||||
import { DailyMenu } from "./menu-card";
|
||||
import { DateTime } from "luxon";
|
||||
import { useState } from "react";
|
||||
import DayNavigation from "./day-navigation";
|
||||
|
||||
export default function Menus() {
|
||||
const { isLoading, error, menus } = useMenus();
|
||||
const { isLoading, error, meals, refetch } = useMeals();
|
||||
const [date, setDate] = useState(DateTime.now().startOf("day"));
|
||||
|
||||
const findMenuForDate = (date: DateTime) => {
|
||||
return menus?.find((menu: any) => {
|
||||
const menuDate = DateTime.fromISO(menu.date).startOf("day");
|
||||
return menuDate.equals(date);
|
||||
return meals?.filter((meal) => {
|
||||
const mealDate = DateTime.fromISO(meal.date).startOf("day");
|
||||
return mealDate.equals(date);
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
{isLoading && <p>Chargement des menus...</p>}
|
||||
{isLoading && <p>Chargement du menu...</p>}
|
||||
{error && (
|
||||
<p className="text-red-500">Erreur lors du chargement des menus.</p>
|
||||
)}
|
||||
{menus && menus.length === 0 && <p>Aucun menu disponible.</p>}
|
||||
{meals && meals.length === 0 && <p>Aucun menu disponible.</p>}
|
||||
|
||||
{/* Menus */}
|
||||
<DayNavigation startDate={date} setStartDate={setDate} />
|
||||
<DailyMenu meals={findMenuForDate(date)?.meals || []} />
|
||||
<DailyMenu
|
||||
meals={findMenuForDate(date) || ([] as Meal[])}
|
||||
refetchMeals={refetch}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
import { Github } from "lucide-react";
|
||||
import { Button } from "../ui/button";
|
||||
|
||||
export default function WIP() {
|
||||
return (
|
||||
<div className="text-center mt-10">
|
||||
<h2 className="text-xl font-semibold">
|
||||
⚠️ Cette fonctionnalité n’est pas encore implémentée.
|
||||
</h2>
|
||||
<p className="mt-4">
|
||||
Vous pouvez contribuer au développement du projet ici :
|
||||
</p>
|
||||
<Button
|
||||
className="mt-4"
|
||||
variant="default"
|
||||
onClick={() => window.open(import.meta.env.VITE_GITHUB_URL, "_blank")}
|
||||
>
|
||||
<Github />
|
||||
Contribuer sur GitHub
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -461,22 +461,60 @@ export const useAverages = (period: string) => {
|
|||
/**
|
||||
* === REPAS API ===
|
||||
*/
|
||||
const fetchMenus = async () => {
|
||||
return makeRequest(`/menus`, "Échec de la récupération des menus");
|
||||
const fetchMeals = async () => {
|
||||
return makeRequest(`/meals`, "Échec de la récupération des menus");
|
||||
};
|
||||
export const useMenus = () => {
|
||||
export const useMeals = () => {
|
||||
const { data, ...props } = useQuery({
|
||||
queryKey: ["menus"],
|
||||
queryFn: fetchMenus,
|
||||
queryKey: ["meals"],
|
||||
queryFn: fetchMeals,
|
||||
staleTime: Duration.fromObject({
|
||||
hours: 6, // 6 hours
|
||||
hours: 0, // 6 hours
|
||||
}).toMillis(),
|
||||
gcTime: Duration.fromObject({
|
||||
days: 1, // 1 day
|
||||
}).toMillis(),
|
||||
});
|
||||
return {
|
||||
menus: data || [],
|
||||
meals: (data as Meal[]) || [],
|
||||
...props,
|
||||
};
|
||||
};
|
||||
|
||||
export interface Meal {
|
||||
id: number;
|
||||
date: string;
|
||||
name: string;
|
||||
courses: { name: string; description: string }[];
|
||||
submittable: boolean;
|
||||
isRegistered?: boolean; // Optional field to indicate if the user is registered for this meal
|
||||
}
|
||||
|
||||
export const registerForMeal = async (
|
||||
mealId: number,
|
||||
username: string,
|
||||
password: string
|
||||
) => {
|
||||
return makePostRequest(
|
||||
`/meals/${mealId}`,
|
||||
{ username, password },
|
||||
"Échec de l'inscription au repas",
|
||||
"POST"
|
||||
);
|
||||
};
|
||||
|
||||
export const testCredentials = async (username: string, password: string) => {
|
||||
return makePostRequest(
|
||||
`/auth/test`,
|
||||
{ username, password },
|
||||
"Échec de la vérification des identifiants",
|
||||
"POST"
|
||||
);
|
||||
};
|
||||
|
||||
export const getCredentialsStatus = async () => {
|
||||
return makeRequest(
|
||||
`/auth/status`,
|
||||
"Échec de la récupération du statut des identifiants"
|
||||
);
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue