33 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 38284dabb6 Merge pull request 'correction' (#31) from feat/workflow into dev
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 27s
Reviewed-on: maximus/aegis#31
2026-08-03 23:38:20 +02:00
LathanDevers 74c6624317 correction
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
2026-08-03 23:36:35 +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 51078a68fc Merge pull request 'Feat/workflow' (#26) from feat/workflow into dev
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 28s
Reviewed-on: maximus/aegis#26
2026-08-03 23:23:18 +02:00
LathanDevers a4b2a870f3 quality
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-03 23:16:20 +02:00
LathanDevers c74e19d732 quality
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 1s
Contrôle Qualité & Sécurité / qa-s-check (pull_request) Successful in 27s
2026-08-03 23:15:18 +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
LathanDevers 8e74ca50be correct deploy
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
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
2026-08-03 22:26:11 +02:00
LathanDevers 5798881446 correct deploy
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 26s
2026-08-03 22:16:08 +02:00
LathanDevers f57e4d94f8 correct deploy
Déploiement AEGIS Portal / build-and-deploy (push) Successful in 25s
Contrôle Qualité & Sécurité (QA) / qa-s-check (push) Successful in 26s
2026-08-03 22:14:37 +02:00
maximus d543ba04ba Merge pull request 'Feat/workflow git' (#14) from feat/workflow-git into dev
Déploiement AEGIS Portal / build-and-deploy (push) Failing after 25s
Contrôle Qualité & Sécurité (QA) / qa-s-check (push) Successful in 26s
Reviewed-on: maximus/aegis#14
2026-08-03 22:05:43 +02:00
maximus 4c5ef84443 security: downgrade react-router vers v6.30.4 pour patcher CSRF
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 26s
2026-08-03 21:59:49 +02:00
maximus 5b0b2e1890 correct qa
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 22s
2026-08-03 21:50:59 +02:00
maximus c950249d15 correction qa
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Failing after 21s
2026-08-03 21:44:28 +02:00
LathanDevers 41433b4859 fix: correction des erreurs de linting pour le QA
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Failing after 20s
2026-08-03 15:57:11 +02:00
LathanDevers 3c4d9ec02a build: migration de la CI vers pnpm
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Successful in 0s
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Failing after 19s
2026-08-03 15:40:08 +02:00
LathanDevers 8d86ccea01 dev correction
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 4s
2026-08-03 14:28:07 +02:00
LathanDevers 011f572ef3 add
Contrôle Qualité & Sécurité (QA) / qa-s-check (pull_request) Failing after 4s
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Failing after 1s
2026-08-03 14:18:41 +02:00
LathanDevers 74588fbd5d feat: add workflow git
Sécurité - Architecture Git-Flow / validate-flow (pull_request) Failing after 0s
🔍 Contrôle Qualité & Sécurité (QA) / 🛡️ Quality Gate & Security Check (pull_request) Failing after 4s
2026-08-03 14:03:56 +02:00
33 changed files with 816 additions and 360 deletions
View File
+1
View File
@@ -0,0 +1 @@
VITE_PB_URL=
+88
View File
@@ -0,0 +1,88 @@
name: Déploiement AEGIS Portal
on:
push:
branches:
- dev
- test
- acc
- master
jobs:
build-and-deploy:
runs-on: ubuntu-latest
env:
GIT_SSL_NO_VERIFY: "true"
NODE_TLS_REJECT_UNAUTHORIZED: "0"
steps:
- name: Patch DNS local pour Gitea Runner
run: sudo echo "10.10.40.31 git.bunker.lan" | sudo tee -a /etc/hosts
- name: Configuration de Git pour SSL
run: git config --global http.sslVerify false
- name: Récupération du code
uses: actions/checkout@v4
- name: Configuration de Node.js
uses: actions/setup-node@v4
with:
node-version: 22
- name: Activation de pnpm
run: corepack enable pnpm
- name: Installation des dépendances
run: pnpm install --frozen-lockfile
- name: Compilation de la Build
env:
VITE_APP_ENV: ${{ github.ref_name }}
VITE_PB_URL: ${{ secrets.PB_URL }}
run: pnpm run build
- name: Installation de lftp
run: sudo apt-get update && sudo apt-get install -y lftp
- name: Routage et Déploiement FTP
env: # 1. On charge tous les secrets de manière sécurisée
SERVER: ${{ secrets.FTP_SERVER }}
DEV_U: ${{ secrets.DEV_FTP_USER }}
DEV_P: ${{ secrets.DEV_FTP_PASSWORD }}
TEST_U: ${{ secrets.TEST_FTP_USER }}
TEST_P: ${{ secrets.TEST_FTP_PASSWORD }}
ACC_U: ${{ secrets.ACC_FTP_USER }}
ACC_P: ${{ secrets.ACC_FTP_PASSWORD }}
PROD_U: ${{ secrets.PROD_FTP_USER }}
PROD_P: ${{ secrets.PROD_FTP_PASSWORD }}
BRANCH: ${{ github.ref_name }}
run: |
# 2. On attribue les bons identifiants selon la branche
if [ "$BRANCH" == "master" ]; then
TARGET_USER=$PROD_U; TARGET_PASS=$PROD_P;
elif [ "$BRANCH" == "acc" ]; then
TARGET_USER=$ACC_U; TARGET_PASS=$ACC_P;
elif [ "$BRANCH" == "test" ]; then
TARGET_USER=$TEST_U; TARGET_PASS=$TEST_P;
else
TARGET_USER=$DEV_U; TARGET_PASS=$DEV_P;
fi
echo "Déploiement de la branche [$BRANCH]"
# 3. Exécution du script FTP
cat << EOF > script.lftp
set ftp:passive-mode true
set ftp:ssl-allow no
set ssl:verify-certificate no
set net:timeout 5
set net:max-retries 2
set dns:fatal-timeout 2
open -u "${TARGET_USER}","${TARGET_PASS}" "${SERVER}"
cd home/${TARGET_USER}
mirror -R --delete --verbose dist/ ./
quit
EOF
lftp -f script.lftp
-61
View File
@@ -1,61 +0,0 @@
name: Deploy Aegis Portal
on:
push:
branches:
- master # Branche principale confirmée
jobs:
build-and-deploy:
runs-on: ubuntu-latest
# 1. On désactive la vérification SSL pour tout le conteneur du job (Node.js et Git)
env:
GIT_SSL_NO_VERIFY: "true"
NODE_TLS_REJECT_UNAUTHORIZED: "0"
steps:
- name: Patch DNS local pour Gitea Runner
run: sudo echo "10.10.40.31 git.bunker.lan" | sudo tee -a /etc/hosts
# 2. On force l'exécutable Git interne à ignorer la vérification de l'autorité locale
- name: Configuration de Git pour SSL
run: git config --global http.sslVerify false
- name: Récupération du code
uses: actions/checkout@v4
- name: Configuration de Node.js
uses: actions/setup-node@v4
with:
node-version: 22
- name: Installation des dépendances (React/Vite)
run: npm ci
- name: Compilation de la Build (Aegis)
run: npm run build
- name: Installation de lftp
run: sudo apt-get update && sudo apt-get install -y lftp
- name: Déploiement FTP (10.10.40.12)
env:
FTP_USER: ${{ secrets.FTP_USER }} # Le compte FTP enfermé dans aegis.gise.be
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
FTP_SERVER: ${{ secrets.FTP_SERVER }} # Doit contenir : 10.10.40.12
run: |
cat << EOF > script.lftp
set ftp:passive-mode true
set ftp:ssl-allow no
set ssl:verify-certificate no
set net:timeout 5
set net:max-retries 2
set dns:fatal-timeout 2
open -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_SERVER}"
cd home/${FTP_USER}
mirror -R --delete --verbose dist/ ./
quit
EOF
lftp -f script.lftp
+40
View File
@@ -0,0 +1,40 @@
name: Sécurité - Architecture Git-Flow
on:
pull_request:
branches:
- dev
- test
- acc
- master
jobs:
validate-flow:
runs-on: ubuntu-latest
steps:
- name: Vérification du flux de promotion
run: |
TARGET_BRANCH="${{ github.base_ref }}"
SOURCE_BRANCH="${{ github.head_ref }}"
echo "Tentative de promotion : $SOURCE_BRANCH ➔ $TARGET_BRANCH"
# Règle 1 : Vers TEST (Doit venir de DEV)
if [ "$TARGET_BRANCH" == "test" ] && [ "$SOURCE_BRANCH" != "dev" ]; then
echo "ERREUR : L'environnement TEST ne peut recevoir que du code de DEV."
exit 1
fi
# Règle 2 : Vers ACC (Doit venir de TEST)
if [ "$TARGET_BRANCH" == "acc" ] && [ "$SOURCE_BRANCH" != "test" ]; then
echo "ERREUR : L'environnement d'ACCEPTATION ne peut recevoir que du code de TEST."
exit 1
fi
# Règle 3 : Vers PROD (Doit venir de ACC)
if [ "$TARGET_BRANCH" == "master" ] && [ "$SOURCE_BRANCH" != "acc" ]; then
echo "ERREUR : La PRODUCTION ne peut recevoir que du code validé en ACCEPTATION (acc)."
exit 1
fi
echo "Flux réglementaire respecté ! Promotion autorisée."
+59
View File
@@ -0,0 +1,59 @@
name: Contrôle Qualité & Sécurité (QA)
on:
pull_request:
branches:
- dev
- test
- acc
- master
jobs:
quality-gate:
name: qa-s-check
runs-on: ubuntu-latest
env:
GIT_SSL_NO_VERIFY: "true"
NODE_TLS_REJECT_UNAUTHORIZED: "0"
steps:
- name: Patch DNS local pour Gitea Runner
run: sudo echo "10.10.40.31 git.bunker.lan" | sudo tee -a /etc/hosts
- name: Configuration de Git pour SSL
run: git config --global http.sslVerify false
- name: Récupération du code source
uses: actions/checkout@v4
- name: Configuration de Node.js (v22)
uses: actions/setup-node@v4
with:
node-version: 22
- name: Activation de pnpm
run: corepack enable pnpm
- name: Installation des dépendances
run: pnpm install --frozen-lockfile
# Étape 1 : ESLint (Syntaxe et conventions)
- name: Analyse Linter (ESLint)
run: pnpm run lint
# Étape 2 : Verification stricte des types TypeScript (sans émettre de fichiers)
- name: Verification des Types TypeScript
run: pnpm exec tsc --noEmit
# Étape 3 : Exécution des tests unitaires
- name: Tests Unitaires (Vitest)
run: pnpm run test -- --run
# Étape 4 : Audit des vulnérabilités npm (Niveau High/Critical)
- name: Audit de Sécurité des Dépendances
run: pnpm audit --audit-level=high
# Étape 5 : Validation de la compilation ViteJS
- name: Validation du Build de Production
run: pnpm run build
-1
View File
@@ -22,4 +22,3 @@ dist-ssr
*.njsproj *.njsproj
*.sln *.sln
*.sw? *.sw?
+7
View File
@@ -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);
});
});
+18 -16
View File
@@ -7,35 +7,37 @@
"dev": "vite", "dev": "vite",
"build": "tsc -b && vite build", "build": "tsc -b && vite build",
"lint": "eslint .", "lint": "eslint .",
"preview": "vite preview" "preview": "vite preview",
"test": "vitest"
}, },
"dependencies": { "dependencies": {
"@tailwindcss/vite": "^4.3.3", "@tailwindcss/vite": "^4.3.3",
"@zitadel/react-auth": "^1.2.1", "@zitadel/react-auth": "^1.2.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"lucide-react": "^1.27.0", "lucide-react": "^1.28.0",
"oidc-client-ts": "^3.5.0", "oidc-client-ts": "^3.5.0",
"otpauth": "^9.5.1", "otpauth": "^9.5.1",
"pocketbase": "^0.27.0", "pocketbase": "^0.27.1",
"qrcode.react": "^4.2.0", "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", "tailwind-merge": "^3.6.0",
"tailwindcss": "^4.3.3" "tailwindcss": "^4.3.3"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^10.0.1", "@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-hooks": "^7.1.1",
"eslint-plugin-react-refresh": "^0.5.3", "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"
} }
} }
+461 -227
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -0,0 +1,3 @@
overrides:
react-router: "^6.30.4"
react-router-dom: "^6.30.4"
+1 -1
View File
@@ -43,7 +43,7 @@ export const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<
ref={ref} ref={ref}
className={cn( className={cn(
// Séparation discrète (bordure fine plutôt qu'ombre inset, pour rester léger) // 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 className
)} )}
{...props} {...props}
+1 -1
View File
@@ -57,7 +57,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
"bg-[#e8e8e8] dark:bg-[#1e293b]", "bg-[#e8e8e8] dark:bg-[#1e293b]",
"text-slate-800 dark:text-slate-100 font-medium placeholder:text-slate-400 dark:placeholder:text-slate-500", "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.insetLight,
NEUMORPHISM.insetDark, NEUMORPHISM.insetDark,
+2 -2
View File
@@ -17,8 +17,8 @@ export default function BackupWidget({ onClick }: BackupWidgetProps) {
<Badge className="max-w-fit min-w-fit" name="PRA Immuable"> <Badge className="max-w-fit min-w-fit" name="PRA Immuable">
</Badge> </Badge>
</CardHeader> </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-sm text-slate-500 mb-1">Dernier snapshot système</p>
<p className="text-slate-900 font-medium">Aujourd'hui à 03:00 AM</p> <p className="text-slate-900 font-medium">Aujourd'hui à 03:00 AM</p>
</Card> </Card>
+48 -18
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>
<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> </CardContent>
</Card> </Card>
); );
+5 -3
View File
@@ -5,6 +5,8 @@ import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input'; import { Input } from '@/components/ui/Input';
import { Select } from '@/components/ui/Select'; import { Select } from '@/components/ui/Select';
import { Textarea } from '@/components/ui/Textarea'; import { Textarea } from '@/components/ui/Textarea';
import type { TicketCategory } from '@/types/Category';
import type { ButtonVariantStyle } from '@/styles/VariantStyle';
interface NewTicketWidgetProps { interface NewTicketWidgetProps {
onCancel: () => void; onCancel: () => void;
@@ -15,13 +17,13 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
const { createTicket, isSubmitting, error } = useCreateTicket(); const { createTicket, isSubmitting, error } = useCreateTicket();
// États locaux isolés dans le widget // É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 [ci, setCi] = useState('general');
const [subject, setSubject] = useState(''); const [subject, setSubject] = useState('');
const [affectedAsset, setAffectedAsset] = useState(''); const [affectedAsset, setAffectedAsset] = useState('');
const [incidentTime, setIncidentTime] = useState(''); const [incidentTime, setIncidentTime] = useState('');
const [description, setDescription] = useState(''); const [description, setDescription] = useState('');
const [buttonVariant, setButtonVariant]=useState('primary'); const [buttonVariant, setButtonVariant]=useState<ButtonVariantStyle>('primary');
const handleSubmit = async (e: React.FormEvent) => { const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
@@ -62,7 +64,7 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
<Select <Select
label="Type de demande" label="Type de demande"
value={category} 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={[ options={[
{ value: 'Incident Critique', label: 'Incident Critique (Panne, Dégradation)' }, { value: 'Incident Critique', label: 'Incident Critique (Panne, Dégradation)' },
{ value: 'Évolution', label: 'Évolution (Ajout de ressources, Modification)' }, { value: 'Évolution', label: 'Évolution (Ajout de ressources, Modification)' },
+3 -3
View File
@@ -30,10 +30,10 @@ export default function ServicesWidget() {
))} ))}
</div> </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> </Button>
</CardContent> </CardContent>
</Card> </Card>
); );
+4 -4
View File
@@ -8,14 +8,14 @@ export const SupportCtaWidget: React.FC = () => {
return ( return (
<Card> <Card>
<CardContent className="p-6 rounded-xl"> <CardContent className="p-6">
<h3 className="text-lg font-semibold mb-2">Centre de Support</h3> <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. Déclarez un incident critique ou demandez une évolution de votre infrastructure.
</p> </p>
<Button <Button
onClick={() => navigate('/support')} onClick={() => navigate('/support')}
className= "text-rose-500 w-full" className="w-full text-blue-900"
> >
Ouvrir un ticket sécurisé Ouvrir un ticket sécurisé
</Button> </Button>
@@ -16,7 +16,7 @@ export const SupportFooterWidget: React.FC<SupportFooterWidgetProps> = ({
const navigate = useNavigate(); const navigate = useNavigate();
return ( 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> <div>
<h4 className="text-sm font-bold text-white">{title}</h4> <h4 className="text-sm font-bold text-white">{title}</h4>
<p className="text-xs text-slate-400 mt-0.5"> <p className="text-xs text-slate-400 mt-0.5">
+1 -1
View File
@@ -28,7 +28,7 @@ export const TicketChatWidget: React.FC<TicketChatWidgetProps> = ({
try { try {
await onSendMessage(newMessage); await onSendMessage(newMessage);
setNewMessage(''); // Vide l'input uniquement si l'envoi réussit setNewMessage(''); // Vide l'input uniquement si l'envoi réussit
} catch (err) { } catch {
alert("Erreur lors de l'envoi."); alert("Erreur lors de l'envoi.");
} }
}; };
+1
View File
@@ -24,6 +24,7 @@ export const useDocuments = () => {
}, []); }, []);
useEffect(() => { useEffect(() => {
// eslint-disable-next-line react-hooks/set-state-in-effect
fetchDocuments(); fetchDocuments();
}, [fetchDocuments]); }, [fetchDocuments]);
+1 -1
View File
@@ -15,7 +15,7 @@ export const useInfrastructureNodes = () => {
sort: 'created', sort: 'created',
}); });
setNodes(records); setNodes(records);
} catch (err) { } catch {
setError("Impossible de charger l'infrastructure."); setError("Impossible de charger l'infrastructure.");
} finally { } finally {
setIsLoading(false); setIsLoading(false);
+3 -4
View File
@@ -23,8 +23,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
try { try {
const authData = await pb.collection('aegis_users').authWithOAuth2({ provider: 'oidc' }); const authData = await pb.collection('aegis_users').authWithOAuth2({ provider: 'oidc' });
if (authData) onLoginSuccess(); if (authData) onLoginSuccess();
} catch (err) { } catch {
console.error(err);
setError("Échec de la connexion via GISE Identity."); setError("Échec de la connexion via GISE Identity.");
pb.authStore.clear(); pb.authStore.clear();
} finally { } finally {
@@ -64,7 +63,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
} else { } else {
onLoginSuccess(); onLoginSuccess();
} }
} catch (err) { } catch {
setError("Identifiants incorrects ou accès révoqué."); setError("Identifiants incorrects ou accès révoqué.");
pb.authStore.clear(); pb.authStore.clear();
} finally { } finally {
@@ -98,7 +97,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
} else { } else {
setError("Code de sécurité invalide ou expiré."); setError("Code de sécurité invalide ou expiré.");
} }
} catch (err) { } catch {
setError("Erreur critique lors de la vérification."); setError("Erreur critique lors de la vérification.");
} finally { } finally {
setIsLoading(false); setIsLoading(false);
+5 -5
View File
@@ -15,7 +15,7 @@ export const useTicketDetail = (ticketId?: string) => {
const fetchTicketData = useCallback(async () => { const fetchTicketData = useCallback(async () => {
if (!ticketId) return; if (!ticketId) return;
setError(null); setError(null);
try { try {
// 1. Récupération du ticket // 1. Récupération du ticket
const ticketData = await pb.collection('aegis_tickets').getOne<Ticket>(ticketId); const ticketData = await pb.collection('aegis_tickets').getOne<Ticket>(ticketId);
@@ -37,12 +37,13 @@ export const useTicketDetail = (ticketId?: string) => {
}, [ticketId]); }, [ticketId]);
useEffect(() => { useEffect(() => {
// eslint-disable-next-line react-hooks/set-state-in-effect
fetchTicketData(); fetchTicketData();
}, [fetchTicketData]); }, [fetchTicketData]);
const sendMessage = async (content: string) => { const sendMessage = async (content: string) => {
if (!content.trim() || !currentUser || !ticketId) return; if (!content.trim() || !currentUser || !ticketId) return;
setIsSending(true); setIsSending(true);
try { try {
await pb.collection('aegis_ticket_messages').create({ await pb.collection('aegis_ticket_messages').create({
@@ -51,9 +52,8 @@ export const useTicketDetail = (ticketId?: string) => {
content: content.trim(), content: content.trim(),
}); });
await fetchTicketData(); // On recharge les messages après l'envoi 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 { } finally {
setIsSending(false); setIsSending(false);
} }
+1
View File
@@ -24,6 +24,7 @@ export const useTickets = () => {
}, []); }, []);
useEffect(() => { useEffect(() => {
// eslint-disable-next-line react-hooks/set-state-in-effect
fetchTickets(); fetchTickets();
}, [fetchTickets]); }, [fetchTickets]);
+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>
); );
+1 -1
View File
@@ -15,7 +15,7 @@ export default function ServiceDesk() {
title="Centre de Support (Service Desk)" title="Centre de Support (Service Desk)"
description="Canal de communication sécurisé avec vos experts GISE." 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é Ouvrir un ticket sécurisé
</Button> </Button>
</PageHeader> </PageHeader>
@@ -6,7 +6,6 @@ import { useEvolutionRequest } from '@/hooks/useEvolutionRequest';
import { BackButton } from '@/components/ui/BackButton'; import { BackButton } from '@/components/ui/BackButton';
import { EmptyState } from '@/components/ui/EmptyState'; import { EmptyState } from '@/components/ui/EmptyState';
import { Button } from '@/components/ui/Button';
// Nos nouveaux composants // Nos nouveaux composants
import { EvolutionOptionCard } from '@/components/widgets/EvolutionOptionCard'; import { EvolutionOptionCard } from '@/components/widgets/EvolutionOptionCard';
+1
View File
@@ -0,0 +1 @@
export type ButtonVariantStyle = "primary" | "danger" | "secondary" | "success" | "outline" | "ghost";
+1
View File
@@ -0,0 +1 @@
export type TicketCategory = "Incident Critique" | "Évolution" | "Administratif";
+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
}