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

This reverts commit e8896df0b3, reversing
changes made to b3d7e312c4.

.env.example

@@ -0,0 +1 @@
+VITE_PB_URL=

.gitignore

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

App.test.ts

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest';
+
+describe('AEGIS Initial Test', () => {
+  it('devrait valider que 1 + 1 font 2', () => {
+    expect(1 + 1).toBe(2);
+  });
+});

package.json

@@ -7,35 +7,37 @@
     "dev": "vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest"
   },
   "dependencies": {
     "@tailwindcss/vite": "^4.3.3",
     "@zitadel/react-auth": "^1.2.1",
     "clsx": "^2.1.1",
-    "lucide-react": "^1.27.0",
+    "lucide-react": "^1.28.0",
     "oidc-client-ts": "^3.5.0",
     "otpauth": "^9.5.1",
-    "pocketbase": "^0.27.0",
+    "pocketbase": "^0.27.1",
     "qrcode.react": "^4.2.0",
-    "react": "^19.2.7",
+    "react": "^19.2.8",
-    "react-dom": "^19.2.7",
+    "react-dom": "^19.2.8",
-    "react-router-dom": "^7.18.1",
+    "react-router-dom": "^7.18.2",
     "tailwind-merge": "^3.6.0",
     "tailwindcss": "^4.3.3"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
-    "@types/react": "^19.2.17",
+    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.3",
+    "@types/react-dom": "^19.2.4",
-    "@vitejs/plugin-react": "^6.0.3",
+    "@vitejs/plugin-react": "^6.0.5",
-    "eslint": "^10.6.0",
+    "eslint": "^10.8.0",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.3",
-    "globals": "^17.7.0",
+    "globals": "^17.9.0",
-    "typescript": "~6.0.2",
+    "typescript": "~6.0.3",
-    "typescript-eslint": "^8.62.0",
+    "typescript-eslint": "^8.65.0",
-    "vite": "^8.1.1"
+    "vite": "^8.2.0",
+    "vitest": "^4.1.10"
   }
 }

pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+overrides:
+  react-router: "^6.30.4"
+  react-router-dom: "^6.30.4"

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-black/5 dark:border-white/5 transition-all duration-300",
+        "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",
         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 flex flex-col h-full">
+      <CardContent className="p-6">
-        <Card variant="flat" className="rounded-lg p-4 border border-slate-100 mb-4">
+        <Card variant='digged' className="bg-slate-50 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>
+                {isLoading && !error && <Loader />}
+                {!isLoading && !error && (
                     <dl className="space-y-4 text-sm">
                         <div>
                             <dt className="text-slate-500 font-medium">Entité Légale</dt>
-                        <dd className="mt-1 font-semibold text-slate-900">Cabinet Juridique Example & Associés</dd>
+                            <dd className="mt-1 font-semibold text-slate-900">{company?.name}</dd>
                         </div>
                         <div>
                             <dt className="text-slate-500 font-medium">Administrateur du compte</dt>
-                        <dd className="mt-1 text-slate-900">Direction Générale (direction@example.com)</dd>
+                            <dd className="mt-1 text-slate-900">{user?.role} {user?.name}</dd>
+                            <dd className="mt-1 text-slate-500">Email : {user?.emailVisibility && user?.email}{!user?.emailVisibility && "caché"}</dd>
                         </div>
                         <div>
                             <dt className="text-slate-500 font-medium">Niveau d'Infogérance (SLA)</dt>
                             <dd className="mt-1 flex items-center">
-                            <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>
+                                {setVipBadge(company?.vip_level)}
                                 <span className="text-slate-700 font-medium">Couverture 24/7 (99.99%)</span>
                             </dd>
                         </div>
                     </dl>
+                )}
             </CardContent>
         </Card>
     );

src/components/widgets/NewTicketWidget.tsx

@@ -5,6 +5,8 @@ import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { Select } from '@/components/ui/Select';
 import { Textarea } from '@/components/ui/Textarea';
+import type { TicketCategory } from '@/types/Category';
+import type { ButtonVariantStyle } from '@/styles/VariantStyle';
 
 interface NewTicketWidgetProps {
   onCancel: () => void;
@@ -15,13 +17,13 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
   const { createTicket, isSubmitting, error } = useCreateTicket();
 
   // États locaux isolés dans le widget
-  const [category, setCategory] = useState<'Incident Critique' | 'Évolution' | 'Administratif'>('Incident Critique');
+  const [category, setCategory] = useState<TicketCategory>('Incident Critique');
   const [ci, setCi] = useState('general');
   const [subject, setSubject] = useState('');
   const [affectedAsset, setAffectedAsset] = useState('');
   const [incidentTime, setIncidentTime] = useState('');
   const [description, setDescription] = useState('');
-  const [buttonVariant, setButtonVariant]=useState('primary');
+  const [buttonVariant, setButtonVariant]=useState<ButtonVariantStyle>('primary');
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
@@ -62,7 +64,7 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
               <Select
                 label="Type de demande"
                 value={category}
-                onChange={(e) => {setCategory(e.target.value as any); setButtonVariant(e.target.value==="Incident Critique"?"danger":"primary")}}
+                onChange={(e) => {setCategory(e.target.value as TicketCategory); setButtonVariant(e.target.value==="Incident Critique"?"danger":"primary")}}
                 options={[
                   { value: 'Incident Critique', label: 'Incident Critique (Panne, Dégradation)' },
                   { value: 'Évolution', label: 'Évolution (Ajout de ressources, Modification)' },

src/components/widgets/ServicesWidget.tsx

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

src/components/widgets/SupportCtaWidget.tsx

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

@@ -28,7 +28,7 @@ export const TicketChatWidget: React.FC<TicketChatWidgetProps> = ({
     try {
       await onSendMessage(newMessage);
       setNewMessage(''); // Vide l'input uniquement si l'envoi réussit
-    } catch (err) {
+    } catch {
       alert("Erreur lors de l'envoi.");
     }
   };

src/hooks/useDocuments.ts

@@ -24,6 +24,7 @@ export const useDocuments = () => {
   }, []);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchDocuments();
   }, [fetchDocuments]);
 

src/hooks/useInfrastructureNodes.ts

@@ -15,7 +15,7 @@ export const useInfrastructureNodes = () => {
           sort: 'created',
         });
         setNodes(records);
-      } catch (err) {
+      } catch {
         setError("Impossible de charger l'infrastructure.");
       } finally {
         setIsLoading(false);

src/hooks/useLoginFlow.ts

@@ -23,8 +23,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
     try {
       const authData = await pb.collection('aegis_users').authWithOAuth2({ provider: 'oidc' });
       if (authData) onLoginSuccess();
-    } catch (err) {
+    } catch {
-      console.error(err);
       setError("Échec de la connexion via GISE Identity.");
       pb.authStore.clear();
     } finally {
@@ -64,7 +63,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
       } else {
         onLoginSuccess();
       }
-    } catch (err) {
+    } catch {
       setError("Identifiants incorrects ou accès révoqué.");
       pb.authStore.clear();
     } finally {
@@ -98,7 +97,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
       } else {
         setError("Code de sécurité invalide ou expiré.");
       }
-    } catch (err) {
+    } catch {
       setError("Erreur critique lors de la vérification.");
     } finally {
       setIsLoading(false);

src/hooks/useTicketDetail.ts

@@ -37,6 +37,7 @@ export const useTicketDetail = (ticketId?: string) => {
   }, [ticketId]);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchTicketData();
   }, [fetchTicketData]);
 
@@ -51,9 +52,8 @@ export const useTicketDetail = (ticketId?: string) => {
         content: content.trim(),
       });
       await fetchTicketData(); // On recharge les messages après l'envoi
-    } catch (err) {
+    } catch (error) {
-      console.error("Erreur lors de l'envoi du message :", err);
+      throw new Error("Impossible de charger le ticket", { cause: error });
-      throw new Error("Impossible d'envoyer le message.");
     } finally {
       setIsSending(false);
     }

src/hooks/useTickets.ts

@@ -24,6 +24,7 @@ export const useTickets = () => {
   }, []);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchTickets();
   }, [fetchTickets]);
 

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 className= "text-rose-500" onClick={() => navigate('/support/new')}>
+          <Button onClick={() => navigate('/support/new')}>
             Ouvrir un ticket sécurisé
           </Button>
         </PageHeader>

src/pages/trustcenter/InfrastructureEvolution.tsx

@@ -6,7 +6,6 @@ import { useEvolutionRequest } from '@/hooks/useEvolutionRequest';
 
 import { BackButton } from '@/components/ui/BackButton';
 import { EmptyState } from '@/components/ui/EmptyState';
-import { Button } from '@/components/ui/Button';
 
 // Nos nouveaux composants
 import { EvolutionOptionCard } from '@/components/widgets/EvolutionOptionCard';

src/styles/VariantStyle.ts

@@ -0,0 +1 @@
+export type ButtonVariantStyle = "primary" | "danger" | "secondary" | "success" | "outline" | "ghost";

src/types/Category.ts

@@ -0,0 +1 @@
+export type TicketCategory = "Incident Critique" | "Évolution" | "Administratif";

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
+}