19 Commits

Author SHA1 Message Date
LathanDevers 8c1fa79126 Revert "Merge remote-tracking branches 'origin/dev' and 'origin' into feat/account-management"
This reverts commit e8896df0b3, reversing
changes made to b3d7e312c4.
2026-08-04 15:28:07 +02:00
LathanDevers e8896df0b3 Merge remote-tracking branches 'origin/dev' and 'origin' into feat/account-management 2026-08-04 15:21:20 +02:00
maximus 84d7b7e847 Merge pull request 'Feat/test' (#42) from feat/test into dev
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 26s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 27s
Reviewed-on: maximus/aegis#42
2026-08-04 15:06:44 +02:00
LathanDevers a0a77648ca fix err
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 27s
2026-08-04 15:05:06 +02:00
LathanDevers 6cb35e82fe fix err 2026-08-04 15:00:02 +02:00
maximus b43cf6f036 Merge pull request 'Refact/neumorphism' (#39) from refact/neumorphism into dev
Reviewed-on: maximus/aegis#39
2026-08-04 14:55:54 +02:00
LathanDevers b573d20aab fix: résolution des conflits de fusion sur les workflows 2026-08-04 14:54:17 +02:00
LathanDevers b3d7e312c4 add account management 2026-08-04 14:40:57 +02:00
paradox 063f3ecc75 add new deploy
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Failing after 20s
2026-08-04 14:40:52 +02:00
maximus 6e33a19d41 Merge pull request 'Acc' (#34) from acc into master
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
Reviewed-on: maximus/aegis#34
2026-08-03 23:41:27 +02:00
maximus 641f634dfa Merge pull request 'Test' (#33) from test into acc
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 23s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 26s
Reviewed-on: maximus/aegis#33
2026-08-03 23:40:35 +02:00
maximus 689c5105fe Merge pull request 'Dev' (#32) from dev into test
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 27s
Reviewed-on: maximus/aegis#32
2026-08-03 23:39:37 +02:00
maximus dffa4c5a77 Merge pull request 'Test' (#28) from test into acc
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 27s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 26s
Reviewed-on: maximus/aegis#28
2026-08-03 23:27:39 +02:00
maximus c040b9e62d Merge pull request 'Dev' (#27) from dev into test
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 27s
Reviewed-on: maximus/aegis#27
2026-08-03 23:24:42 +02:00
maximus 39bf84cd0e Merge pull request 'Test' (#16) from test into acc
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 27s
Reviewed-on: maximus/aegis#16
2026-08-03 22:34:02 +02:00
maximus b989b6e8e8 Merge pull request 'Feat/workflow git' (#15) from dev into test
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 27s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Successful in 26s
Reviewed-on: maximus/aegis#15
2026-08-03 22:31:10 +02:00
paradox 3db249f3e1 little changes to the ui 2026-08-03 20:08:22 +02:00
paradox fcc04895f3 resolution de conflits 2026-08-03 18:25:39 +02:00
paradox d037af11b6 redesign widgets 2026-08-03 18:15:21 +02:00
5 changed files with 107 additions and 27 deletions
+34 -4
View File
@@ -1,7 +1,33 @@
import { Card, CardContent, CardHeader } from '@/components/ui/Card'; 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"; 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 ( return (
<Card> <Card>
<CardHeader className="p-6 border-slate-100"> <CardHeader className="p-6 border-slate-100">
@@ -12,23 +38,27 @@ export function InformationWidget() {
</CardHeader> </CardHeader>
<CardContent> <CardContent>
{isLoading && !error && <Loader />}
{!isLoading && !error && (
<dl className="space-y-4 text-sm"> <dl className="space-y-4 text-sm">
<div> <div>
<dt className="text-slate-500 font-medium">Entité Légale</dt> <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>
<div> <div>
<dt className="text-slate-500 font-medium">Administrateur du compte</dt> <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>
<div> <div>
<dt className="text-slate-500 font-medium">Niveau d'Infogérance (SLA)</dt> <dt className="text-slate-500 font-medium">Niveau d'Infogérance (SLA)</dt>
<dd className="mt-1 flex items-center"> <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> <span className="text-slate-700 font-medium">Couverture 24/7 (99.99%)</span>
</dd> </dd>
</div> </div>
</dl> </dl>
)}
</CardContent> </CardContent>
</Card> </Card>
); );
+30
View File
@@ -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 };
};
+9 -9
View File
@@ -1,29 +1,29 @@
import PageHeader from "@/components/ui/PageHeader"; import PageHeader from "@/components/ui/PageHeader";
import AccessWidget from "@/components/widgets/AccessWidget"; import AccessWidget from "@/components/widgets/AccessWidget";
import InformationWidget from "@/components/widgets/InformationWidget"; import InformationWidget from "@/components/widgets/InformationWidget";
import { useUserInformations } from "@/hooks/useUserInformations";
export default function AccountSettings() { export default function AccountSettings() {
const { user, company, isLoading, error } = useUserInformations();
return ( return (
<div className="font-sans relative min-h-[calc(100vh-4rem)]"> <div className="font-sans relative min-h-[calc(100vh-4rem)]">
{/* Contenu Principal */} {/* Contenu Principal */}
<main className="max-w-7xl mx-auto px-8 sm:px-8 space-y-6 m-4"> <main className="max-w-7xl mx-auto px-8 sm:px-8 space-y-6 m-4">
{/* Header */} {/* Header */}
<PageHeader <PageHeader
title="Paramètres du compte" title="Paramètres du compte"
description="Gestion de la sécurité et informations contractuelles" /> description="Gestion de la sécurité et informations contractuelles" />
<div className="grid grid-cols-1 lg:grid-cols-2 gap-8"> <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
{/* Colonne 1 : Sécurité */} {/* Colonne 1 : Sécurité */}
<AccessWidget/> <AccessWidget />
{/* Colonne 2 : Organisation & Contrat */} {/* Colonne 2 : Organisation & Contrat */}
<InformationWidget/> <InformationWidget
user={user}
company={company}
isLoading={isLoading}
error={error}
/>
</div> </div>
</main> </main>
</div> </div>
); );
+8
View File
@@ -0,0 +1,8 @@
export interface Company {
id: string;
name: string;
no: string;
vip_level: string;
created: string;
updated: string
}
+12
View File
@@ -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
}