Merge remote-tracking branches 'origin/dev' and 'origin' into feat/account-management

Reviewed-on: maximus/aegis#42

.gitignore

@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+

src/components/ui/Card.tsx

@@ -43,7 +43,7 @@ export const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<
       ref={ref}
       className={cn(
         // Séparation discrète (bordure fine plutôt qu'ombre inset, pour rester léger)
-        "px-6 py-5 flex flex-col space-y-1.5 border-b border-black/5 dark:border-white/5 transition-all duration-300 ease-in-out",
+        "px-6 py-5 flex flex-col space-y-1.5 border-black/5 dark:border-white/5 transition-all duration-300",
         className
       )}
       {...props}

src/components/ui/Input.tsx

@@ -57,7 +57,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
               "bg-[#e8e8e8] dark:bg-[#1e293b]",
               "text-slate-800 dark:text-slate-100 font-medium placeholder:text-slate-400 dark:placeholder:text-slate-500",
               
-              // 🎯 Utilisation directe de tes constantes Neumorphic creusées
+              // Utilisation directe de tes constantes Neumorphic creusées
               NEUMORPHISM.insetLight,
               NEUMORPHISM.insetDark,
 

src/components/widgets/BackupWidget.tsx

@@ -17,8 +17,8 @@ export default function BackupWidget({ onClick }: BackupWidgetProps) {
         <Badge className="max-w-fit min-w-fit" name="PRA Immuable">
         </Badge>
       </CardHeader>
-      <CardContent className="p-6">
+      <CardContent className="p-6 flex flex-col h-full">
-        <Card variant='digged' className="bg-slate-50 rounded-lg p-4 border border-slate-100 mb-4">
+        <Card variant="flat" className="rounded-lg p-4 border border-slate-100 mb-4">
           <p className="text-sm text-slate-500 mb-1">Dernier snapshot système</p>
           <p className="text-slate-900 font-medium">Aujourd'hui à 03:00 AM</p>
         </Card>

src/components/widgets/InformationWidget.tsx

@@ -1,7 +1,33 @@
 import { Card, CardContent, CardHeader } from '@/components/ui/Card';
+import type { Company } from '@/types/Company';
+import type { User } from '@/types/user';
+import { Loader } from '@/components/ui/Loader';
 import { Building } from "lucide-react";
 
-export function InformationWidget() {
+interface InformationWidgetProps {
+    user: User;
+    company: Company;
+    isLoading: boolean;
+    error: string;
+}
+
+function setVipBadge(vip_level: string | undefined) {
+    switch (vip_level?.toLowerCase()) {
+        case "platinum":
+            return <span className="px-2 py-1 bg-amber-600 text-white text-xs font-bold rounded shadow-sm mr-2 tracking-wider">{vip_level?.toUpperCase()}</span>;
+        case "premium":
+            return <span className="px-2 py-1 bg-violet-600 text-white text-xs font-bold rounded shadow-sm mr-2 tracking-wider">{vip_level?.toUpperCase()}</span>;
+        default:
+            return <span className="px-2 py-1 bg-blue-600 text-white text-xs font-bold rounded shadow-sm mr-2 tracking-wider">{vip_level?.toUpperCase()}</span>;
+    }
+}
+
+export const InformationWidget: React.FC<InformationWidgetProps> = ({
+    user,
+    company,
+    isLoading,
+    error,
+}) => {
     return (
         <Card>
             <CardHeader className="p-6 border-slate-100">
@@ -12,23 +38,27 @@ export function InformationWidget() {
             </CardHeader>
 
             <CardContent>
-                <dl className="space-y-4 text-sm">
+                {isLoading && !error && <Loader />}
-                    <div>
+                {!isLoading && !error && (
-                        <dt className="text-slate-500 font-medium">Entité Légale</dt>
+                    <dl className="space-y-4 text-sm">
-                        <dd className="mt-1 font-semibold text-slate-900">Cabinet Juridique Example & Associés</dd>
+                        <div>
-                    </div>
+                            <dt className="text-slate-500 font-medium">Entité Légale</dt>
-                    <div>
+                            <dd className="mt-1 font-semibold text-slate-900">{company?.name}</dd>
-                        <dt className="text-slate-500 font-medium">Administrateur du compte</dt>
+                        </div>
-                        <dd className="mt-1 text-slate-900">Direction Générale (direction@example.com)</dd>
+                        <div>
-                    </div>
+                            <dt className="text-slate-500 font-medium">Administrateur du compte</dt>
-                    <div>
+                            <dd className="mt-1 text-slate-900">{user?.role} {user?.name}</dd>
-                        <dt className="text-slate-500 font-medium">Niveau d'Infogérance (SLA)</dt>
+                            <dd className="mt-1 text-slate-500">Email : {user?.emailVisibility && user?.email}{!user?.emailVisibility && "caché"}</dd>
-                        <dd className="mt-1 flex items-center">
+                        </div>
-                            <span className="px-2 py-1 bg-blue-900 text-white text-xs font-bold rounded shadow-sm mr-2 tracking-wider">VIP PLATINUM</span>
+                        <div>
-                            <span className="text-slate-700 font-medium">Couverture 24/7 (99.99%)</span>
+                            <dt className="text-slate-500 font-medium">Niveau d'Infogérance (SLA)</dt>
-                        </dd>
+                            <dd className="mt-1 flex items-center">
-                    </div>
+                                {setVipBadge(company?.vip_level)}
-                </dl>
+                                <span className="text-slate-700 font-medium">Couverture 24/7 (99.99%)</span>
+                            </dd>
+                        </div>
+                    </dl>
+                )}
             </CardContent>
         </Card>
     );

src/components/widgets/ServicesWidget.tsx

@@ -30,10 +30,10 @@ export default function ServicesWidget() {
           ))}
         </div>
 
-        <Button size="lg" onClick={() => navigate('/evolution-infrastructure')}>
+        <Button className ="text-green-600" size="lg" onClick={() => navigate('/evolution-infrastructure')}>
-          Demander une évolution du parc
+          Mise à niveau du Parc
         </Button>
-
+ 
       </CardContent>
     </Card>
   );

src/components/widgets/SupportCtaWidget.tsx

@@ -8,14 +8,14 @@ export const SupportCtaWidget: React.FC = () => {
 
   return (
     <Card>
-      <CardContent className="p-6">
+      <CardContent className="p-6 rounded-xl">
         <h3 className="text-lg font-semibold mb-2">Centre de Support</h3>
-        <p className="text-blue-900 text-sm mb-4 leading-relaxed">
+        <p className="text-sm mb-4 leading-relaxed">
           Déclarez un incident critique ou demandez une évolution de votre infrastructure.
         </p>
-        <Button 
+        <Button
           onClick={() => navigate('/support')}
-          className="w-full text-blue-900"
+          className= "text-rose-500 w-full"
         >
           Ouvrir un ticket sécurisé
         </Button>

src/components/widgets/SupportFooterWidget.tsx

@@ -16,7 +16,7 @@ export const SupportFooterWidget: React.FC<SupportFooterWidgetProps> = ({
   const navigate = useNavigate();
 
   return (
-    <div className="mt-12 bg-slate-900 text-slate-300 rounded-xl p-6 flex flex-col sm:flex-row items-center justify-between gap-4 shadow-sm">
+    <div className="mt-12 bg-slate-500 text-slate-300 rounded-xl p-6 flex flex-col sm:flex-row items-center justify-between gap-4 shadow-sm">
       <div>
         <h4 className="text-sm font-bold text-white">{title}</h4>
         <p className="text-xs text-slate-400 mt-0.5">

src/hooks/useTickets.ts

@@ -15,8 +15,7 @@ export const useTickets = () => {
         sort: '-created', // Du plus récent au plus ancien
       });
       setTickets(records);
-    } catch (err) {
+    } catch {
-      console.error("Erreur lors de la récupération des tickets :", err);
       setError("Impossible de charger l'historique de vos requêtes.");
     } finally {
       setIsLoading(false);

src/hooks/useUserInformations.ts

@@ -0,0 +1,30 @@
+import { pb } from "@/services/pocketbase";
+import type { Company } from "@/types/Company";
+import type { User } from "@/types/user";
+import { useEffect, useState } from "react";
+
+export const useUserInformations = () => {
+  const [user, setUser] = useState<User | null>(null);
+  const [company, setCompany] = useState<Company | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    const fetchInformations = async () => {
+        setIsLoading(true);
+      try {
+        const userRecords = await pb.collection('aegis_users').getFullList<User>();
+        setUser(userRecords[0]);
+        const companyRecords = await pb.collection('aegis_companies').getFullList<Company>();
+        setCompany(companyRecords[0])
+      } catch (err) {
+        setError("Erreur lors de la récupération des infos utilisateur :"+err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    fetchInformations();
+  }, []);
+
+  return { user, company, isLoading, error };
+};

src/pages/AccountSettings.tsx

@@ -1,29 +1,29 @@
 import PageHeader from "@/components/ui/PageHeader";
 import AccessWidget from "@/components/widgets/AccessWidget";
 import InformationWidget from "@/components/widgets/InformationWidget";
+import { useUserInformations } from "@/hooks/useUserInformations";
 
 export default function AccountSettings() {
+  const { user, company, isLoading, error } = useUserInformations();
   return (
     <div className="font-sans relative min-h-[calc(100vh-4rem)]">
-
-
       {/* Contenu Principal */}
       <main className="max-w-7xl mx-auto px-8 sm:px-8 space-y-6 m-4">
         {/* Header */}
         <PageHeader
           title="Paramètres du compte"
           description="Gestion de la sécurité et informations contractuelles" />
-
         <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
-
           {/* Colonne 1 : Sécurité */}
-          <AccessWidget/>
+          <AccessWidget />
-
           {/* Colonne 2 : Organisation & Contrat */}
-          <InformationWidget/>
+          <InformationWidget
-
+            user={user}
+            company={company}
+            isLoading={isLoading}
+            error={error}
+          />
         </div>
-
       </main>
     </div>
   );

src/pages/ServiceDesk.tsx

@@ -15,7 +15,7 @@ export default function ServiceDesk() {
           title="Centre de Support (Service Desk)"
           description="Canal de communication sécurisé avec vos experts GISE."
         >
-          <Button onClick={() => navigate('/support/new')}>
+          <Button className= "text-rose-500" onClick={() => navigate('/support/new')}>
             Ouvrir un ticket sécurisé
           </Button>
         </PageHeader>

src/types/Company.ts

@@ -0,0 +1,8 @@
+export interface Company {
+    id: string;
+    name: string;
+    no: string;
+    vip_level: string;
+    created: string;
+    updated: string
+}

src/types/User.ts

@@ -0,0 +1,12 @@
+export interface User {
+    id: string;
+    email: string;
+    emailVisibility: boolean;
+    verified: boolean;
+    name: string;
+    role: string;
+    company: string;
+    mfa_enabled: boolean;
+    created: string;
+    updated: string
+}