Compare commits
	
		
			50 Commits
		
	
	
		
			a3fef1c38c
			...
			creation-s
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						07eae87855
	
				 | 
					
					
						|||
| 
						
						
							
						
						080537fe6d
	
				 | 
					
					
						|||
| 
						
						
							
						
						ecd84bf242
	
				 | 
					
					
						|||
| 
						
						
							
						
						981a5d34c5
	
				 | 
					
					
						|||
| 
						
						
							
						
						681cc7cb83
	
				 | 
					
					
						|||
| 
						
						
							
						
						fbc3be564f
	
				 | 
					
					
						|||
| 
						
						
							
						
						4871187726
	
				 | 
					
					
						|||
| 
						
						
							
						
						67b482ff13
	
				 | 
					
					
						|||
| 
						
						
							
						
						34bdea2269
	
				 | 
					
					
						|||
| 
						
						
							
						
						20e16f6ae2
	
				 | 
					
					
						|||
| 
						
						
							
						
						f42e38228a
	
				 | 
					
					
						|||
| 
						
						
							
						
						3712667a04
	
				 | 
					
					
						|||
| 345190dfeb | |||
| 5712d898a5 | |||
| 3bd0a02b62 | |||
| 
						
						
							
						
						167a1fbbc2
	
				 | 
					
					
						|||
| 
						
						
							
						
						f11e2502dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						43bb2c40de
	
				 | 
					
					
						|||
| 
						
						
							
						
						54870b0d0f
	
				 | 
					
					
						|||
| 
						
						
							
						
						a50d951af7
	
				 | 
					
					
						|||
| 
						
						
							
						
						2e057eee01
	
				 | 
					
					
						|||
| 
						
						
							
						
						bc33bd48e8
	
				 | 
					
					
						|||
| 
						
						
							
						
						62decb3314
	
				 | 
					
					
						|||
| 
						
						
							
						
						339377b838
	
				 | 
					
					
						|||
| 
						
						
							
						
						71ea6423bc
	
				 | 
					
					
						|||
| 
						
						
							
						
						cad2390649
	
				 | 
					
					
						|||
| ca2a0ace71 | |||
| 
						
						
							
						
						f16986ce26
	
				 | 
					
					
						|||
| 
						
						
							
						
						f56439c9c5
	
				 | 
					
					
						|||
| 90ff593438 | |||
| 
						
						
							
						
						216eb73757
	
				 | 
					
					
						|||
| d4e565601a | |||
| c39ae44d74 | |||
| b7fcfe3792 | |||
| ab908f2664 | |||
| 7d4dc81df2 | |||
| 2236a7219b | |||
| 3e9e8ecacc | |||
| 8ce18e53d5 | |||
| 7487b34a17 | |||
| 217667253a | |||
| 6dbf5b5438 | |||
| 0e2e863bc0 | |||
| 
						
						
							
						
						307bdf8fa6
	
				 | 
					
					
						|||
| 32009e2f00 | |||
| 
						
						
							
						
						1561fd2a44
	
				 | 
					
					
						|||
| 
						
						
							
						
						4d9f6e2638
	
				 | 
					
					
						|||
| 
						
						
							
						
						760a9cd92c
	
				 | 
					
					
						|||
| 
						
						
							
						
						3f476c3114
	
				 | 
					
					
						|||
| 
						
						
							
						
						d44c561427
	
				 | 
					
					
						
@@ -24,6 +24,10 @@ body:
 | 
			
		||||
      label: Ce problème est il relatif à un ou des modules en particulier ?
 | 
			
		||||
      multiple: true
 | 
			
		||||
      options:
 | 
			
		||||
        - Clego
 | 
			
		||||
        - Tauri
 | 
			
		||||
        - Axum
 | 
			
		||||
        - Interface utilisateur⋅ice (crates/app)
 | 
			
		||||
        - Encapsulation Tauri (crates/desktop)
 | 
			
		||||
        - Moteur SESAM-Vitale (crates/sesam-vitale)
 | 
			
		||||
        - Librairie utilitaire (crates/utils)
 | 
			
		||||
        - Documentation (docs)
 | 
			
		||||
        - Scripts (scripts)
 | 
			
		||||
        - Autre
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -21,3 +21,5 @@ target/
 | 
			
		||||
*.sln
 | 
			
		||||
*.sw?
 | 
			
		||||
 | 
			
		||||
# Ignore .env files
 | 
			
		||||
.env
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										971
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										971
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1,7 +1,9 @@
 | 
			
		||||
[workspace]
 | 
			
		||||
resolver = "2"
 | 
			
		||||
members = [
 | 
			
		||||
    "crates/app",
 | 
			
		||||
    "crates/backend",
 | 
			
		||||
    "crates/desktop",
 | 
			
		||||
    "crates/sesam-vitale",
 | 
			
		||||
    "crates/desktop"
 | 
			
		||||
    "crates/services-sesam-vitale-sys",
 | 
			
		||||
    "crates/utils",
 | 
			
		||||
]
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										78
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										78
									
								
								README.md
									
									
									
									
									
								
							@@ -2,67 +2,75 @@
 | 
			
		||||
 | 
			
		||||
Logiciel de Pharmacie libre et open-source.
 | 
			
		||||
 | 
			
		||||
## Crates
 | 
			
		||||
## Modules applicatifs
 | 
			
		||||
 | 
			
		||||
- `app`: Interface du logiciel, servie par un serveur web propulsé par Axum. Utilisable en mode endpoint ou encapsulé dans le client `desktop`
 | 
			
		||||
- `desktop`: Client desktop propulsé par Tauri, encapsulant le serveur web `app`
 | 
			
		||||
- `sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
 | 
			
		||||
- `crates`: Dossier racine des modules Rust
 | 
			
		||||
    - `crates/backend`: Serveur backend propulsé par Axum, exposant une API REST
 | 
			
		||||
    - `crates/desktop`: Client desktop propulsé par Tauri, exposant le `frontend`
 | 
			
		||||
    - `crates/sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
 | 
			
		||||
    - `crates/utils`: Bibliothèque de fonctions utilitaires
 | 
			
		||||
- `frontend`: Interface web du logiciel, propulsée par Nuxt.js
 | 
			
		||||
 | 
			
		||||
## Installation
 | 
			
		||||
 | 
			
		||||
### Fichiers de configuration
 | 
			
		||||
 | 
			
		||||
Certaines librairies nécessitent de définir certaines paramètres de configuration pour fonctionner correctement, en particulier le moteur SESAM-Vitale.
 | 
			
		||||
 | 
			
		||||
Ces paramètres sont définis dans un fichier de configuration `.env` situé dans un des dossiers suivant (par ordre de priorité) :
 | 
			
		||||
- dans le dossier courant (`./.env`)
 | 
			
		||||
- dans le dossier du manifeste (par exemple `crates/sesam-vitale/.env`)
 | 
			
		||||
- dans le dossier de configuration standard de l'OS (par exemple, sur linux, `~/.config/krys4lide/.env` - [plus d'info](https://github.com/dirs-dev/directories-rs?tab=readme-ov-file#projectdirs))
 | 
			
		||||
 | 
			
		||||
Des exemples de fichiers de configuration sont disponibles à la racine du projet : `.env.linux.example` et `.env.win.example`.
 | 
			
		||||
 | 
			
		||||
## Development
 | 
			
		||||
 | 
			
		||||
### Pré-requis
 | 
			
		||||
 | 
			
		||||
#### Frontend (Nuxt + Typescript)
 | 
			
		||||
 | 
			
		||||
Le frontend est propulsé par Nuxt.js, un framework TypeScript pour Vue.js. Pour le développement, il est nécessaire d'installer les dépendances suivantes :
 | 
			
		||||
- [Bun](https://bun.sh/docs/installation), un gestionnaire de paquets, équivalent à `npm` en plus performant
 | 
			
		||||
 | 
			
		||||
#### Tauri CLI
 | 
			
		||||
 | 
			
		||||
TODO: Tauri CLI, réellement nécessaire ?
 | 
			
		||||
 | 
			
		||||
La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être installée via Cargo :
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
cargo install tauri-cli --version "^2.0.0-beta"
 | 
			
		||||
cargo install tauri-cli --version "^2.0.0-rc"
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
#### Tailwindcss CLI
 | 
			
		||||
 | 
			
		||||
Le CLI Tailwindcss est nécessaire pour la génération du fichier `crates/app/assets/css/style.css`.
 | 
			
		||||
 | 
			
		||||
La documentation d'installation est disponible sur le site officiel de Tailwindcss : https://tailwindcss.com/blog/standalone-cli
 | 
			
		||||
 | 
			
		||||
La version actuellement utilisée est la [`v3.4.7`](https://github.com/tailwindlabs/tailwindcss/releases/tag/v3.4.7)
 | 
			
		||||
 | 
			
		||||
#### SESAM-Vitale
 | 
			
		||||
 | 
			
		||||
La crate `sesam-vitale` nécessite la présence des librairies dynamiques fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `sesam-vitale`.
 | 
			
		||||
 | 
			
		||||
#### Backend Hot-reload
 | 
			
		||||
 | 
			
		||||
Voir le [README](crates/backend/README.md) de la crate `backend` pour les prérequis de développement du serveur backend.
 | 
			
		||||
 | 
			
		||||
### Lancement
 | 
			
		||||
 | 
			
		||||
Le logiciel dans sa globalité peut être lancé via la commande suivante :
 | 
			
		||||
Pour lancer l'application en mode développement, il est nécessaire d'exécuter plusieurs composants simultanément :
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# Lancement du serveur backend
 | 
			
		||||
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# Lancement de l'interface utilisateur (frontend ou desktop)
 | 
			
		||||
# - frontend (serveur web, accessible via navigateur)
 | 
			
		||||
bun run --cwd frontend/ dev
 | 
			
		||||
# - desktop (client desktop, basé sur Tauri)
 | 
			
		||||
cargo tauri dev
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
/!\ Attention, le lancement du client `desktop` ne génère pas le fichier `crates/app/assets/css/style.css` automatiquement pour le moment. En cas de modification des interfaces web, il est donc nécessaire de procéder à sa génération comme indiqué dans le [README](crates/app/README.md) de la crate `app`.
 | 
			
		||||
 | 
			
		||||
Si vous souhaitez lancer les composants séparément, les indications de lancement sont disponibles dans les README des différents crates.
 | 
			
		||||
 | 
			
		||||
- [app](crates/app/README.md)
 | 
			
		||||
- [sesam-vitale](crates/sesam-vitale/README.md)
 | 
			
		||||
 | 
			
		||||
## Rechargement automatique
 | 
			
		||||
 | 
			
		||||
Pour permettre de développer plus rapidement, il existe une librairie qui recompile automatiquement nos modifications en cours : [`cargo-watch`](https://github.com/watchexec/cargo-watch) permet de relancer une commande `cargo` lorsqu'un fichier est modifié (example: `cargo run` --> `cargo watch -x run`).
 | 
			
		||||
 | 
			
		||||
Voici la commande pour l'installer dans un _package_ :
 | 
			
		||||
```bash
 | 
			
		||||
cargo add cargo-watch --dev --package app
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Le fichier [`.ignore`](./ignore) permet d'ignorer certains fichiers pour éviter de relancer la recompilation inutilement.
 | 
			
		||||
 | 
			
		||||
⚠️ La librairie n'est pas compatible avec _Windows 7_ et les versions antérieurs de _Windows_.
 | 
			
		||||
 | 
			
		||||
## Build
 | 
			
		||||
 | 
			
		||||
Packager le client desktop
 | 
			
		||||
Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI Tauri, qui se charge de gérer le build du `frontend` et son intégration au bundle :
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
cargo tauri build
 | 
			
		||||
 
 | 
			
		||||
@@ -7,9 +7,11 @@ edition = "2021"
 | 
			
		||||
askama = "0.12.1"
 | 
			
		||||
askama_axum = "0.4.0"
 | 
			
		||||
axum = "0.7.5"
 | 
			
		||||
axum-htmx = { version = "0.6", features = ["auto-vary"] }
 | 
			
		||||
listenfd = "1.0.1"
 | 
			
		||||
notify = "6.1.1"
 | 
			
		||||
serde = { version = "1.0.204", features = ["derive"] }
 | 
			
		||||
thiserror = "1.0.63"
 | 
			
		||||
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
 | 
			
		||||
tower-http = { version = "0.5.2", features = ["fs"] }
 | 
			
		||||
tower-livereload = "0.9.3"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								crates/app/askama.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								crates/app/askama.toml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
[general]
 | 
			
		||||
# Directories to search for templates, relative to the crate root.
 | 
			
		||||
dirs = [
 | 
			
		||||
    "src/pages",
 | 
			
		||||
    "src/components",
 | 
			
		||||
]
 | 
			
		||||
							
								
								
									
										1
									
								
								crates/app/assets/css/flowbite@2.5.1.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								crates/app/assets/css/flowbite@2.5.1.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -566,28 +566,8 @@ video {
 | 
			
		||||
  border-width: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.absolute {
 | 
			
		||||
  position: absolute;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.relative {
 | 
			
		||||
  position: relative;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.-inset-0\.5 {
 | 
			
		||||
  inset: -0.125rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.-inset-1\.5 {
 | 
			
		||||
  inset: -0.375rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.right-0 {
 | 
			
		||||
  right: 0px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.z-10 {
 | 
			
		||||
  z-index: 10;
 | 
			
		||||
.z-50 {
 | 
			
		||||
  z-index: 50;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mx-auto {
 | 
			
		||||
@@ -595,36 +575,9 @@ video {
 | 
			
		||||
  margin-right: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.-mr-2 {
 | 
			
		||||
  margin-right: -0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ml-3 {
 | 
			
		||||
  margin-left: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ml-auto {
 | 
			
		||||
  margin-left: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-2 {
 | 
			
		||||
  margin-top: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-3 {
 | 
			
		||||
  margin-top: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mb-4 {
 | 
			
		||||
  margin-bottom: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-4 {
 | 
			
		||||
.my-4 {
 | 
			
		||||
  margin-top: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-6 {
 | 
			
		||||
  margin-top: 1.5rem;
 | 
			
		||||
  margin-bottom: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mb-2 {
 | 
			
		||||
@@ -635,10 +588,22 @@ video {
 | 
			
		||||
  margin-bottom: 0.625rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mb-4 {
 | 
			
		||||
  margin-bottom: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.me-3 {
 | 
			
		||||
  margin-inline-end: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-3 {
 | 
			
		||||
  margin-top: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mt-4 {
 | 
			
		||||
  margin-top: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.block {
 | 
			
		||||
  display: block;
 | 
			
		||||
}
 | 
			
		||||
@@ -663,52 +628,44 @@ video {
 | 
			
		||||
  height: 2.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-16 {
 | 
			
		||||
  height: 4rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-6 {
 | 
			
		||||
  height: 1.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-8 {
 | 
			
		||||
  height: 2rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-full {
 | 
			
		||||
  height: 100%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-32 {
 | 
			
		||||
  height: 8rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-48 {
 | 
			
		||||
  height: 12rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-96 {
 | 
			
		||||
  height: 24rem;
 | 
			
		||||
.h-2 {
 | 
			
		||||
  height: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-2\.5 {
 | 
			
		||||
  height: 0.625rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-9 {
 | 
			
		||||
  height: 2.25rem;
 | 
			
		||||
.h-32 {
 | 
			
		||||
  height: 8rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-4 {
 | 
			
		||||
  height: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-48 {
 | 
			
		||||
  height: 12rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-5 {
 | 
			
		||||
  height: 1.25rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-7 {
 | 
			
		||||
  height: 1.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-2 {
 | 
			
		||||
  height: 0.5rem;
 | 
			
		||||
.h-8 {
 | 
			
		||||
  height: 2rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-4 {
 | 
			
		||||
  height: 1rem;
 | 
			
		||||
.h-96 {
 | 
			
		||||
  height: 24rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.h-full {
 | 
			
		||||
  height: 100%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.min-h-full {
 | 
			
		||||
@@ -719,58 +676,38 @@ video {
 | 
			
		||||
  width: 2.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-32 {
 | 
			
		||||
  width: 8rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-48 {
 | 
			
		||||
  width: 12rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-6 {
 | 
			
		||||
  width: 1.5rem;
 | 
			
		||||
.w-5 {
 | 
			
		||||
  width: 1.25rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-8 {
 | 
			
		||||
  width: 2rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-auto {
 | 
			
		||||
  width: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-32 {
 | 
			
		||||
  width: 8rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-20 {
 | 
			
		||||
  width: 5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-24 {
 | 
			
		||||
  width: 6rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.w-28 {
 | 
			
		||||
  width: 7rem;
 | 
			
		||||
.w-full {
 | 
			
		||||
  width: 100%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.max-w-7xl {
 | 
			
		||||
  max-width: 80rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.max-w-xs {
 | 
			
		||||
  max-width: 20rem;
 | 
			
		||||
.max-w-screen-xl {
 | 
			
		||||
  max-width: 1280px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.max-w-sm {
 | 
			
		||||
  max-width: 24rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.flex-shrink-0 {
 | 
			
		||||
  flex-shrink: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.origin-top-right {
 | 
			
		||||
  transform-origin: top right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@keyframes pulse {
 | 
			
		||||
  50% {
 | 
			
		||||
    opacity: .5;
 | 
			
		||||
@@ -781,12 +718,20 @@ video {
 | 
			
		||||
  animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.list-none {
 | 
			
		||||
  list-style-type: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.grid-cols-1 {
 | 
			
		||||
  grid-template-columns: repeat(1, minmax(0, 1fr));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.grid-cols-2 {
 | 
			
		||||
  grid-template-columns: repeat(2, minmax(0, 1fr));
 | 
			
		||||
.flex-col {
 | 
			
		||||
  flex-direction: column;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.flex-wrap {
 | 
			
		||||
  flex-wrap: wrap;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.items-center {
 | 
			
		||||
@@ -805,48 +750,66 @@ video {
 | 
			
		||||
  gap: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.space-y-1 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
  --tw-space-y-reverse: 0;
 | 
			
		||||
  margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse)));
 | 
			
		||||
  margin-bottom: calc(0.25rem * var(--tw-space-y-reverse));
 | 
			
		||||
.space-x-3 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
  --tw-space-x-reverse: 0;
 | 
			
		||||
  margin-right: calc(0.75rem * var(--tw-space-x-reverse));
 | 
			
		||||
  margin-left: calc(0.75rem * calc(1 - var(--tw-space-x-reverse)));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rounded-full {
 | 
			
		||||
  border-radius: 9999px;
 | 
			
		||||
.divide-y > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
  --tw-divide-y-reverse: 0;
 | 
			
		||||
  border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
 | 
			
		||||
  border-bottom-width: calc(1px * var(--tw-divide-y-reverse));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rounded-md {
 | 
			
		||||
  border-radius: 0.375rem;
 | 
			
		||||
.divide-gray-100 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
  --tw-divide-opacity: 1;
 | 
			
		||||
  border-color: rgb(243 244 246 / var(--tw-divide-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rounded-lg {
 | 
			
		||||
  border-radius: 0.5rem;
 | 
			
		||||
.self-center {
 | 
			
		||||
  align-self: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.truncate {
 | 
			
		||||
  overflow: hidden;
 | 
			
		||||
  text-overflow: ellipsis;
 | 
			
		||||
  white-space: nowrap;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.whitespace-nowrap {
 | 
			
		||||
  white-space: nowrap;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rounded {
 | 
			
		||||
  border-radius: 0.25rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-2 {
 | 
			
		||||
  border-width: 2px;
 | 
			
		||||
.rounded-full {
 | 
			
		||||
  border-radius: 9999px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rounded-lg {
 | 
			
		||||
  border-radius: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border {
 | 
			
		||||
  border-width: 1px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-b {
 | 
			
		||||
  border-bottom-width: 1px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-t {
 | 
			
		||||
  border-top-width: 1px;
 | 
			
		||||
.border-2 {
 | 
			
		||||
  border-width: 2px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-dashed {
 | 
			
		||||
  border-style: dashed;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-gray-100 {
 | 
			
		||||
  --tw-border-opacity: 1;
 | 
			
		||||
  border-color: rgb(243 244 246 / var(--tw-border-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.border-gray-200 {
 | 
			
		||||
  --tw-border-opacity: 1;
 | 
			
		||||
  border-color: rgb(229 231 235 / var(--tw-border-opacity));
 | 
			
		||||
@@ -857,9 +820,9 @@ video {
 | 
			
		||||
  border-color: rgb(209 213 219 / var(--tw-border-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bg-white {
 | 
			
		||||
.bg-blue-700 {
 | 
			
		||||
  --tw-bg-opacity: 1;
 | 
			
		||||
  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 | 
			
		||||
  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bg-gray-200 {
 | 
			
		||||
@@ -872,8 +835,19 @@ video {
 | 
			
		||||
  background-color: rgb(209 213 219 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.p-1 {
 | 
			
		||||
  padding: 0.25rem;
 | 
			
		||||
.bg-gray-50 {
 | 
			
		||||
  --tw-bg-opacity: 1;
 | 
			
		||||
  background-color: rgb(249 250 251 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bg-gray-800 {
 | 
			
		||||
  --tw-bg-opacity: 1;
 | 
			
		||||
  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bg-white {
 | 
			
		||||
  --tw-bg-opacity: 1;
 | 
			
		||||
  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.p-2 {
 | 
			
		||||
@@ -884,36 +858,39 @@ video {
 | 
			
		||||
  padding: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.px-3 {
 | 
			
		||||
  padding-left: 0.75rem;
 | 
			
		||||
  padding-right: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.px-4 {
 | 
			
		||||
  padding-left: 1rem;
 | 
			
		||||
  padding-right: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.py-1 {
 | 
			
		||||
  padding-top: 0.25rem;
 | 
			
		||||
  padding-bottom: 0.25rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.py-10 {
 | 
			
		||||
  padding-top: 2.5rem;
 | 
			
		||||
  padding-bottom: 2.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.py-2 {
 | 
			
		||||
  padding-top: 0.5rem;
 | 
			
		||||
  padding-bottom: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.py-3 {
 | 
			
		||||
  padding-top: 0.75rem;
 | 
			
		||||
  padding-bottom: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.py-8 {
 | 
			
		||||
  padding-top: 2rem;
 | 
			
		||||
  padding-bottom: 2rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pb-3 {
 | 
			
		||||
  padding-bottom: 0.75rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pt-2 {
 | 
			
		||||
  padding-top: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pt-4 {
 | 
			
		||||
  padding-top: 1rem;
 | 
			
		||||
.text-2xl {
 | 
			
		||||
  font-size: 1.5rem;
 | 
			
		||||
  line-height: 2rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-3xl {
 | 
			
		||||
@@ -939,6 +916,10 @@ video {
 | 
			
		||||
  font-weight: 500;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.font-semibold {
 | 
			
		||||
  font-weight: 600;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.leading-tight {
 | 
			
		||||
  line-height: 1.25;
 | 
			
		||||
}
 | 
			
		||||
@@ -947,9 +928,9 @@ video {
 | 
			
		||||
  letter-spacing: -0.025em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-gray-400 {
 | 
			
		||||
.text-gray-200 {
 | 
			
		||||
  --tw-text-opacity: 1;
 | 
			
		||||
  color: rgb(156 163 175 / var(--tw-text-opacity));
 | 
			
		||||
  color: rgb(229 231 235 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-gray-500 {
 | 
			
		||||
@@ -957,9 +938,9 @@ video {
 | 
			
		||||
  color: rgb(107 114 128 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-gray-800 {
 | 
			
		||||
.text-gray-700 {
 | 
			
		||||
  --tw-text-opacity: 1;
 | 
			
		||||
  color: rgb(31 41 55 / var(--tw-text-opacity));
 | 
			
		||||
  color: rgb(55 65 81 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-gray-900 {
 | 
			
		||||
@@ -967,19 +948,9 @@ video {
 | 
			
		||||
  color: rgb(17 24 39 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text-gray-200 {
 | 
			
		||||
.text-white {
 | 
			
		||||
  --tw-text-opacity: 1;
 | 
			
		||||
  color: rgb(229 231 235 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.opacity-0 {
 | 
			
		||||
  opacity: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.shadow-lg {
 | 
			
		||||
  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
 | 
			
		||||
  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
 | 
			
		||||
  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 | 
			
		||||
  color: rgb(255 255 255 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.shadow {
 | 
			
		||||
@@ -988,31 +959,11 @@ video {
 | 
			
		||||
  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ring-1 {
 | 
			
		||||
  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
 | 
			
		||||
  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
 | 
			
		||||
  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ring-black {
 | 
			
		||||
  --tw-ring-opacity: 1;
 | 
			
		||||
  --tw-ring-color: rgb(0 0 0 / var(--tw-ring-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ring-opacity-5 {
 | 
			
		||||
  --tw-ring-opacity: 0.05;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.hover\:bg-gray-100:hover {
 | 
			
		||||
  --tw-bg-opacity: 1;
 | 
			
		||||
  background-color: rgb(243 244 246 / var(--tw-bg-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.hover\:text-gray-500:hover {
 | 
			
		||||
  --tw-text-opacity: 1;
 | 
			
		||||
  color: rgb(107 114 128 / var(--tw-text-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.focus\:outline-none:focus {
 | 
			
		||||
  outline: 2px solid transparent;
 | 
			
		||||
  outline-offset: 2px;
 | 
			
		||||
@@ -1024,47 +975,27 @@ video {
 | 
			
		||||
  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.focus\:ring-indigo-500:focus {
 | 
			
		||||
  --tw-ring-opacity: 1;
 | 
			
		||||
  --tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity));
 | 
			
		||||
.focus\:ring-4:focus {
 | 
			
		||||
  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
 | 
			
		||||
  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);
 | 
			
		||||
  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.focus\:ring-offset-2:focus {
 | 
			
		||||
  --tw-ring-offset-width: 2px;
 | 
			
		||||
.focus\:ring-gray-200:focus {
 | 
			
		||||
  --tw-ring-opacity: 1;
 | 
			
		||||
  --tw-ring-color: rgb(229 231 235 / var(--tw-ring-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.focus\:ring-gray-300:focus {
 | 
			
		||||
  --tw-ring-opacity: 1;
 | 
			
		||||
  --tw-ring-color: rgb(209 213 219 / var(--tw-ring-opacity));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (min-width: 640px) {
 | 
			
		||||
  .sm\:-my-px {
 | 
			
		||||
    margin-top: -1px;
 | 
			
		||||
    margin-bottom: -1px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:ml-6 {
 | 
			
		||||
    margin-left: 1.5rem;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:flex {
 | 
			
		||||
    display: flex;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:hidden {
 | 
			
		||||
    display: none;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:grid-cols-2 {
 | 
			
		||||
    grid-template-columns: repeat(2, minmax(0, 1fr));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:items-center {
 | 
			
		||||
    align-items: center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
    --tw-space-x-reverse: 0;
 | 
			
		||||
    margin-right: calc(2rem * var(--tw-space-x-reverse));
 | 
			
		||||
    margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .sm\:px-6 {
 | 
			
		||||
    padding-left: 1.5rem;
 | 
			
		||||
    padding-right: 1.5rem;
 | 
			
		||||
@@ -1072,28 +1003,91 @@ video {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (min-width: 768px) {
 | 
			
		||||
  .md\:order-1 {
 | 
			
		||||
    order: 1;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:order-2 {
 | 
			
		||||
    order: 2;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:me-0 {
 | 
			
		||||
    margin-inline-end: 0px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:mt-0 {
 | 
			
		||||
    margin-top: 0px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:flex {
 | 
			
		||||
    display: flex;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:hidden {
 | 
			
		||||
    display: none;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:h-64 {
 | 
			
		||||
    height: 16rem;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:h-72 {
 | 
			
		||||
    height: 18rem;
 | 
			
		||||
  .md\:w-auto {
 | 
			
		||||
    width: auto;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:flex-row {
 | 
			
		||||
    flex-direction: row;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:space-x-0 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
    --tw-space-x-reverse: 0;
 | 
			
		||||
    margin-right: calc(0px * var(--tw-space-x-reverse));
 | 
			
		||||
    margin-left: calc(0px * calc(1 - var(--tw-space-x-reverse)));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:space-x-8 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
    --tw-space-x-reverse: 0;
 | 
			
		||||
    margin-right: calc(2rem * var(--tw-space-x-reverse));
 | 
			
		||||
    margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:border-0 {
 | 
			
		||||
    border-width: 0px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:bg-transparent {
 | 
			
		||||
    background-color: transparent;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:bg-white {
 | 
			
		||||
    --tw-bg-opacity: 1;
 | 
			
		||||
    background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:p-0 {
 | 
			
		||||
    padding: 0px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:p-6 {
 | 
			
		||||
    padding: 1.5rem;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:text-blue-700 {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(29 78 216 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:hover\:bg-transparent:hover {
 | 
			
		||||
    background-color: transparent;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .md\:hover\:text-blue-700:hover {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(29 78 216 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (min-width: 1024px) {
 | 
			
		||||
  .lg\:block {
 | 
			
		||||
    display: block;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .lg\:hidden {
 | 
			
		||||
    display: none;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .lg\:grid-cols-4 {
 | 
			
		||||
    grid-template-columns: repeat(4, minmax(0, 1fr));
 | 
			
		||||
  }
 | 
			
		||||
@@ -1104,7 +1098,16 @@ video {
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.rtl\:space-x-reverse:where([dir="rtl"], [dir="rtl"] *) > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
  --tw-space-x-reverse: 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (prefers-color-scheme: dark) {
 | 
			
		||||
  .dark\:divide-gray-600 > :not([hidden]) ~ :not([hidden]) {
 | 
			
		||||
    --tw-divide-opacity: 1;
 | 
			
		||||
    border-color: rgb(75 85 99 / var(--tw-divide-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:border-gray-600 {
 | 
			
		||||
    --tw-border-opacity: 1;
 | 
			
		||||
    border-color: rgb(75 85 99 / var(--tw-border-opacity));
 | 
			
		||||
@@ -1120,6 +1123,26 @@ video {
 | 
			
		||||
    background-color: rgb(55 65 81 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:bg-gray-800 {
 | 
			
		||||
    --tw-bg-opacity: 1;
 | 
			
		||||
    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:bg-gray-900 {
 | 
			
		||||
    --tw-bg-opacity: 1;
 | 
			
		||||
    background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:text-gray-200 {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(229 231 235 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:text-gray-400 {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(156 163 175 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:text-gray-600 {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(75 85 99 / var(--tw-text-opacity));
 | 
			
		||||
@@ -1129,4 +1152,52 @@ video {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(55 65 81 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:text-white {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(255 255 255 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:hover\:bg-gray-600:hover {
 | 
			
		||||
    --tw-bg-opacity: 1;
 | 
			
		||||
    background-color: rgb(75 85 99 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:hover\:bg-gray-700:hover {
 | 
			
		||||
    --tw-bg-opacity: 1;
 | 
			
		||||
    background-color: rgb(55 65 81 / var(--tw-bg-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:hover\:text-white:hover {
 | 
			
		||||
    --tw-text-opacity: 1;
 | 
			
		||||
    color: rgb(255 255 255 / var(--tw-text-opacity));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .dark\:focus\:ring-gray-600:focus {
 | 
			
		||||
    --tw-ring-opacity: 1;
 | 
			
		||||
    --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (min-width: 768px) {
 | 
			
		||||
  @media (prefers-color-scheme: dark) {
 | 
			
		||||
    .md\:dark\:bg-gray-900 {
 | 
			
		||||
      --tw-bg-opacity: 1;
 | 
			
		||||
      background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .md\:dark\:text-blue-500 {
 | 
			
		||||
      --tw-text-opacity: 1;
 | 
			
		||||
      color: rgb(59 130 246 / var(--tw-text-opacity));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .md\:dark\:hover\:bg-transparent:hover {
 | 
			
		||||
      background-color: transparent;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .md\:dark\:hover\:text-blue-500:hover {
 | 
			
		||||
      --tw-text-opacity: 1;
 | 
			
		||||
      color: rgb(59 130 246 / var(--tw-text-opacity));
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,7 @@
 | 
			
		||||
{% if hx_request %}
 | 
			
		||||
  <title>{% block title %}{{ title }}{% endblock %}</title>
 | 
			
		||||
  {% block body %}{% endblock %}
 | 
			
		||||
{% else %}
 | 
			
		||||
<!doctype html>
 | 
			
		||||
<html lang="fr" class="h-full">
 | 
			
		||||
  <head>
 | 
			
		||||
@@ -5,19 +9,15 @@
 | 
			
		||||
 | 
			
		||||
    <script src="/assets/js/htmx@2.0.1.min.js"></script>
 | 
			
		||||
    <script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
 | 
			
		||||
    <link href="/assets/css/style.css" rel="stylesheet">
 | 
			
		||||
    <link href="/assets/css/flowbite@2.5.1.min.css" rel="stylesheet" />
 | 
			
		||||
    <script src="/assets/js/flowbite@2.5.1.min.js"></script>
 | 
			
		||||
    <link href="/assets/css/style.css" rel="stylesheet">
 | 
			
		||||
 | 
			
		||||
    {% block head %}{% endblock %}
 | 
			
		||||
  </head>
 | 
			
		||||
  <body class="h-full">
 | 
			
		||||
    <div class="min-h-full">
 | 
			
		||||
      {% block nav %}
 | 
			
		||||
        {% include "layout/nav.html" %}
 | 
			
		||||
      {% endblock %}
 | 
			
		||||
 | 
			
		||||
      {% block body %}{% endblock %}
 | 
			
		||||
    </div>
 | 
			
		||||
  </body>
 | 
			
		||||
</html>
 | 
			
		||||
{% endif %}
 | 
			
		||||
							
								
								
									
										18
									
								
								crates/app/src/components/navbar/menu-item.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								crates/app/src/components/navbar/menu-item.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
			
		||||
{% set selected = item.id == current %}
 | 
			
		||||
<li>
 | 
			
		||||
    <a
 | 
			
		||||
        href="{{ item.href }}"
 | 
			
		||||
        {% if selected -%}
 | 
			
		||||
            class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
 | 
			
		||||
            aria-current="page"
 | 
			
		||||
        {% else -%}
 | 
			
		||||
            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
 | 
			
		||||
        {% endif -%}
 | 
			
		||||
        hx-get="{{ item.href }}"
 | 
			
		||||
        hx-push-url="true"
 | 
			
		||||
        hx-swap="outerHTML"
 | 
			
		||||
        hx-select-oob="#menu-items,#page-header,#page-main"
 | 
			
		||||
    >
 | 
			
		||||
        {{ item.label }}
 | 
			
		||||
    </a>
 | 
			
		||||
</li>
 | 
			
		||||
							
								
								
									
										50
									
								
								crates/app/src/components/navbar/navbar.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								crates/app/src/components/navbar/navbar.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
			
		||||
{% macro navbar(current) %}
 | 
			
		||||
 | 
			
		||||
{% let items=crate::menu::get_menu_items() %}
 | 
			
		||||
 | 
			
		||||
<nav class="bg-white border-gray-200 dark:bg-gray-900">
 | 
			
		||||
  <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
 | 
			
		||||
  <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
 | 
			
		||||
      <img src="https://flowbite.com/docs/images/logo.svg" class="h-8" alt="Flowbite Logo" />
 | 
			
		||||
      <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Krys4lide</span>
 | 
			
		||||
  </a>
 | 
			
		||||
  <div class="flex items-center md:order-2 space-x-3 md:space-x-0 rtl:space-x-reverse">
 | 
			
		||||
      <button type="button" class="flex text-sm bg-gray-800 rounded-full md:me-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown" data-dropdown-placement="bottom">
 | 
			
		||||
        <span class="sr-only">Ouvrir le menu de profil</span>
 | 
			
		||||
        <img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-3.jpg" alt="user photo">
 | 
			
		||||
      </button>
 | 
			
		||||
      <!-- Dropdown menu -->
 | 
			
		||||
      <div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-dropdown">
 | 
			
		||||
        <div class="px-4 py-3">
 | 
			
		||||
          <span class="block text-sm text-gray-900 dark:text-white">Bonnie Green</span>
 | 
			
		||||
          <span class="block text-sm  text-gray-500 truncate dark:text-gray-400">name@flowbite.com</span>
 | 
			
		||||
        </div>
 | 
			
		||||
        <ul class="py-2" aria-labelledby="user-menu-button">
 | 
			
		||||
          <li>
 | 
			
		||||
            <a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Profile</a>
 | 
			
		||||
          </li>
 | 
			
		||||
          <li>
 | 
			
		||||
            <a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Settings</a>
 | 
			
		||||
          </li>
 | 
			
		||||
          <li>
 | 
			
		||||
            <a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign out</a>
 | 
			
		||||
          </li>
 | 
			
		||||
        </ul>
 | 
			
		||||
      </div>
 | 
			
		||||
      <button data-collapse-toggle="navbar-user" type="button" class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="navbar-user" aria-expanded="false">
 | 
			
		||||
        <span class="sr-only">Ouvrir le menu de navigation</span>
 | 
			
		||||
        <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
 | 
			
		||||
            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
 | 
			
		||||
        </svg>
 | 
			
		||||
    </button>
 | 
			
		||||
  </div>
 | 
			
		||||
  <div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
 | 
			
		||||
    <ul id="menu-items" class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
 | 
			
		||||
      {% for item in items %}
 | 
			
		||||
        {% include "navbar/menu-item.html" %}
 | 
			
		||||
      {% endfor %}
 | 
			
		||||
    </ul>
 | 
			
		||||
  </div>
 | 
			
		||||
  </div>
 | 
			
		||||
</nav>
 | 
			
		||||
{% endmacro %}
 | 
			
		||||
@@ -1,29 +1,21 @@
 | 
			
		||||
mod pages;
 | 
			
		||||
mod templates;
 | 
			
		||||
use std::path::PathBuf;
 | 
			
		||||
 | 
			
		||||
use std::path::Path;
 | 
			
		||||
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum::http::{StatusCode, Uri};
 | 
			
		||||
use axum_htmx::AutoVaryLayer;
 | 
			
		||||
use tower_http::services::ServeDir;
 | 
			
		||||
 | 
			
		||||
mod menu;
 | 
			
		||||
mod pages;
 | 
			
		||||
 | 
			
		||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
 | 
			
		||||
    (StatusCode::NOT_FOUND, format!("No route for {uri}"))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "index.html")]
 | 
			
		||||
pub struct GetIndexTemplate;
 | 
			
		||||
 | 
			
		||||
async fn root() -> GetIndexTemplate {
 | 
			
		||||
    GetIndexTemplate {}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn get_router(assets_path: &Path) -> axum::Router {
 | 
			
		||||
pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> {
 | 
			
		||||
    axum::Router::new()
 | 
			
		||||
        .nest_service("/assets", ServeDir::new(assets_path))
 | 
			
		||||
        .route("/", axum::routing::get(root))
 | 
			
		||||
        .nest("/pages", pages::get_routes())
 | 
			
		||||
        .merge(templates::get_routes())
 | 
			
		||||
        .merge(pages::get_routes())
 | 
			
		||||
        .fallback(fallback)
 | 
			
		||||
        // The AutoVaryLayer is used to avoid cache issues with htmx (cf: https://github.com/robertwayne/axum-htmx?tab=readme-ov-file#auto-caching-management)
 | 
			
		||||
        .layer(AutoVaryLayer)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +1,27 @@
 | 
			
		||||
use ::app::get_router;
 | 
			
		||||
use std::path::{Path, PathBuf};
 | 
			
		||||
use std::{env, io};
 | 
			
		||||
 | 
			
		||||
use axum::body::Body;
 | 
			
		||||
use axum::http::Request;
 | 
			
		||||
use listenfd::ListenFd;
 | 
			
		||||
use notify::Watcher;
 | 
			
		||||
use std::env;
 | 
			
		||||
use std::path::Path;
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
use tokio::net::TcpListener;
 | 
			
		||||
use tower_livereload::predicate::Predicate;
 | 
			
		||||
use tower_livereload::LiveReloadLayer;
 | 
			
		||||
 | 
			
		||||
use ::app::get_router;
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
pub enum AppError {
 | 
			
		||||
    #[error("Unable to bind to TCP listener")]
 | 
			
		||||
    TCPListener(#[from] std::io::Error),
 | 
			
		||||
    #[error("Error with the notify watcher")]
 | 
			
		||||
    NotifyWatcher(#[from] notify::Error),
 | 
			
		||||
    #[error("Missing environment variable {var}")]
 | 
			
		||||
    MissingEnvVar { var: &'static str },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
 | 
			
		||||
/// Voir https://github.com/leotaku/tower-livereload/pull/3
 | 
			
		||||
#[derive(Copy, Clone)]
 | 
			
		||||
@@ -20,44 +33,52 @@ impl<T> Predicate<Request<T>> for NotHtmxPredicate {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const DEFAULT_LISTENER: &str = "localhost:3000";
 | 
			
		||||
async fn get_tcp_listener() -> TcpListener {
 | 
			
		||||
async fn get_tcp_listener() -> Result<TcpListener, io::Error> {
 | 
			
		||||
    let mut listenfd = ListenFd::from_env();
 | 
			
		||||
 | 
			
		||||
    match listenfd.take_tcp_listener(0).unwrap() {
 | 
			
		||||
    match listenfd.take_tcp_listener(0)? {
 | 
			
		||||
        // if we are given a tcp listener on listen fd 0, we use that one
 | 
			
		||||
        Some(listener) => {
 | 
			
		||||
            listener.set_nonblocking(true).unwrap();
 | 
			
		||||
            TcpListener::from_std(listener).unwrap()
 | 
			
		||||
            listener.set_nonblocking(true)?;
 | 
			
		||||
            Ok(TcpListener::from_std(listener)?)
 | 
			
		||||
        }
 | 
			
		||||
        // otherwise fall back to local listening
 | 
			
		||||
        None => TcpListener::bind(DEFAULT_LISTENER).await.unwrap(),
 | 
			
		||||
        None => Ok(TcpListener::bind(DEFAULT_LISTENER).await?),
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn get_livereload_layer(templates_path: &Path) -> LiveReloadLayer<NotHtmxPredicate> {
 | 
			
		||||
fn get_livereload_layer(
 | 
			
		||||
    templates_paths: Vec<PathBuf>,
 | 
			
		||||
) -> Result<LiveReloadLayer<NotHtmxPredicate>, notify::Error> {
 | 
			
		||||
    let livereload = LiveReloadLayer::new();
 | 
			
		||||
    let reloader = livereload.reloader();
 | 
			
		||||
    let mut watcher = notify::recommended_watcher(move |_| reloader.reload()).unwrap();
 | 
			
		||||
    watcher
 | 
			
		||||
        .watch(templates_path, notify::RecursiveMode::Recursive)
 | 
			
		||||
        .unwrap();
 | 
			
		||||
    livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate)
 | 
			
		||||
    let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?;
 | 
			
		||||
    for templates_path in templates_paths {
 | 
			
		||||
        watcher.watch(templates_path.as_path(), notify::RecursiveMode::Recursive)?;
 | 
			
		||||
    }
 | 
			
		||||
    Ok(livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[tokio::main]
 | 
			
		||||
async fn main() {
 | 
			
		||||
    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 | 
			
		||||
async fn main() -> Result<(), AppError> {
 | 
			
		||||
    let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
 | 
			
		||||
        var: "CARGO_MANIFEST_DIR",
 | 
			
		||||
    })?;
 | 
			
		||||
    let assets_path = Path::new(&manifest_dir).join("assets");
 | 
			
		||||
    let templates_path = Path::new(&manifest_dir).join("templates");
 | 
			
		||||
    let templates_paths = vec![
 | 
			
		||||
        Path::new(&manifest_dir).join("src/pages"),
 | 
			
		||||
        Path::new(&manifest_dir).join("src/components"),
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    let livereload_layer = get_livereload_layer(&templates_path);
 | 
			
		||||
    let router = get_router(assets_path.as_path()).layer(livereload_layer);
 | 
			
		||||
    let livereload_layer =
 | 
			
		||||
        get_livereload_layer(templates_paths).map_err(AppError::NotifyWatcher)?;
 | 
			
		||||
    let router = get_router(assets_path).await.layer(livereload_layer);
 | 
			
		||||
 | 
			
		||||
    let listener: TcpListener = get_tcp_listener().await;
 | 
			
		||||
    println!("Listening on: http://{}", listener.local_addr().unwrap());
 | 
			
		||||
    let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?;
 | 
			
		||||
    let local_addr = listener.local_addr().map_err(AppError::TCPListener)?;
 | 
			
		||||
    println!("Listening on: http://{}", local_addr);
 | 
			
		||||
 | 
			
		||||
    // Run the server with the router
 | 
			
		||||
    axum::serve(listener, router.into_make_service())
 | 
			
		||||
        .await
 | 
			
		||||
        .unwrap();
 | 
			
		||||
    axum::serve(listener, router.into_make_service()).await?;
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										23
									
								
								crates/app/src/menu.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								crates/app/src/menu.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,23 @@
 | 
			
		||||
pub struct MenuItem {
 | 
			
		||||
    pub id: String,
 | 
			
		||||
    pub label: String,
 | 
			
		||||
    pub href: String,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// Get the menu items
 | 
			
		||||
/// This function is the central place to define the menu items
 | 
			
		||||
/// It can be used directly in templates, for example in the `navbar` component to render the menu
 | 
			
		||||
pub fn get_menu_items() -> Vec<MenuItem> {
 | 
			
		||||
    vec![
 | 
			
		||||
        MenuItem {
 | 
			
		||||
            id: "home".to_string(),
 | 
			
		||||
            label: "Accueil".to_string(),
 | 
			
		||||
            href: "/".to_string(),
 | 
			
		||||
        },
 | 
			
		||||
        MenuItem {
 | 
			
		||||
            id: "cps".to_string(),
 | 
			
		||||
            label: "CPS".to_string(),
 | 
			
		||||
            href: "/cps".to_string(),
 | 
			
		||||
        },
 | 
			
		||||
    ]
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										43
									
								
								crates/app/src/pages/cps.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								crates/app/src/pages/cps.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,43 @@
 | 
			
		||||
{% extends "base.html" %}
 | 
			
		||||
{% import "navbar/navbar.html" as navbar -%}
 | 
			
		||||
 | 
			
		||||
{% block title %}Pharma Libre - CPS{% endblock %}
 | 
			
		||||
 | 
			
		||||
{% block body %}
 | 
			
		||||
{% call navbar::navbar(current="cps") %}
 | 
			
		||||
<div class="py-10">
 | 
			
		||||
  <header id="page-header">
 | 
			
		||||
    <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
 | 
			
		||||
      <h1
 | 
			
		||||
        id="page-title"
 | 
			
		||||
        class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
 | 
			
		||||
      >
 | 
			
		||||
        CPS
 | 
			
		||||
      </h1>
 | 
			
		||||
    </div>
 | 
			
		||||
  </header>
 | 
			
		||||
  <main id="page-main">
 | 
			
		||||
    <div
 | 
			
		||||
      class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
 | 
			
		||||
    >
 | 
			
		||||
      <div
 | 
			
		||||
        class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
      >A</div>
 | 
			
		||||
      <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >B</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >C</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >D</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >E</div>
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </main>
 | 
			
		||||
</div>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
@@ -1,9 +1,12 @@
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum_htmx::HxRequest;
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "pages/cps.html")]
 | 
			
		||||
pub struct CpsTemplate;
 | 
			
		||||
 | 
			
		||||
pub async fn cps() -> CpsTemplate {
 | 
			
		||||
    CpsTemplate
 | 
			
		||||
#[template(path = "cps.html")]
 | 
			
		||||
pub struct CpsTemplate {
 | 
			
		||||
    hx_request: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub async fn cps(HxRequest(hx_request): HxRequest) -> CpsTemplate {
 | 
			
		||||
    CpsTemplate { hx_request }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										43
									
								
								crates/app/src/pages/home.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								crates/app/src/pages/home.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,43 @@
 | 
			
		||||
{% extends "base.html" %}
 | 
			
		||||
{% import "navbar/navbar.html" as navbar -%}
 | 
			
		||||
 | 
			
		||||
{% block title %}Pharma Libre - Accueil{% endblock %}
 | 
			
		||||
 | 
			
		||||
{% block body %}
 | 
			
		||||
{% call navbar::navbar(current="home") %}
 | 
			
		||||
<div class="py-10">
 | 
			
		||||
  <header id="page-header">
 | 
			
		||||
    <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
 | 
			
		||||
      <h1
 | 
			
		||||
        id="page-title"
 | 
			
		||||
        class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
 | 
			
		||||
      >
 | 
			
		||||
        Accueil
 | 
			
		||||
      </h1>
 | 
			
		||||
    </div>
 | 
			
		||||
  </header>
 | 
			
		||||
  <main id="page-main">
 | 
			
		||||
    <div
 | 
			
		||||
      class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
 | 
			
		||||
    >
 | 
			
		||||
      <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >A</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >B</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >C</div>
 | 
			
		||||
        <div
 | 
			
		||||
          class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
        >D</div>
 | 
			
		||||
      </div>
 | 
			
		||||
      <div
 | 
			
		||||
        class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
      >E</div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </main>
 | 
			
		||||
</div>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
@@ -1,9 +1,12 @@
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum_htmx::HxRequest;
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "pages/home.html")]
 | 
			
		||||
pub struct HomeTemplate;
 | 
			
		||||
 | 
			
		||||
pub async fn home() -> HomeTemplate {
 | 
			
		||||
    HomeTemplate
 | 
			
		||||
#[template(path = "home.html")]
 | 
			
		||||
pub struct GetHomeTemplate {
 | 
			
		||||
    hx_request: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub async fn home(HxRequest(hx_request): HxRequest) -> GetHomeTemplate {
 | 
			
		||||
    GetHomeTemplate { hx_request }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,6 @@ mod home;
 | 
			
		||||
 | 
			
		||||
pub fn get_routes() -> Router {
 | 
			
		||||
    Router::new()
 | 
			
		||||
        .route("/home", routing::get(home::home))
 | 
			
		||||
        .route("/", routing::get(home::home))
 | 
			
		||||
        .route("/cps", routing::get(cps::cps))
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,18 +0,0 @@
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum::{routing, Router};
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "hello.html")]
 | 
			
		||||
struct HelloTemplate {
 | 
			
		||||
    pub name: String,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async fn hello() -> HelloTemplate {
 | 
			
		||||
    HelloTemplate {
 | 
			
		||||
        name: "Theo".to_string(),
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn get_routes() -> Router {
 | 
			
		||||
    Router::new().route("/", routing::get(hello))
 | 
			
		||||
}
 | 
			
		||||
@@ -1,12 +0,0 @@
 | 
			
		||||
use axum::Router;
 | 
			
		||||
 | 
			
		||||
mod hello;
 | 
			
		||||
mod nav;
 | 
			
		||||
mod profile;
 | 
			
		||||
 | 
			
		||||
pub fn get_routes() -> Router {
 | 
			
		||||
    Router::new()
 | 
			
		||||
        .nest("/hello", hello::get_routes())
 | 
			
		||||
        .nest("/nav", nav::get_routes())
 | 
			
		||||
        .nest("/profile", profile::get_routes())
 | 
			
		||||
}
 | 
			
		||||
@@ -1,60 +0,0 @@
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum::{extract::Query, routing, Router};
 | 
			
		||||
use serde::Deserialize;
 | 
			
		||||
 | 
			
		||||
struct MenuItem {
 | 
			
		||||
    label: String,
 | 
			
		||||
    href: String,
 | 
			
		||||
    current: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Deserialize)]
 | 
			
		||||
struct MenuParameters {
 | 
			
		||||
    mobile: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "layout/nav/nav-menu-items.html")]
 | 
			
		||||
struct MenuTemplate {
 | 
			
		||||
    mobile: bool,
 | 
			
		||||
    items: Vec<MenuItem>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl MenuTemplate {
 | 
			
		||||
    fn get_classes(&self, is_current_item: &bool) -> String {
 | 
			
		||||
        let common_classes = match self.mobile {
 | 
			
		||||
            true => "block border-l-4 py-2 pl-3 pr-4 text-base font-medium".to_string(),
 | 
			
		||||
            false => {
 | 
			
		||||
                "inline-flex items-center border-b-2 px-1 pt-1 text-sm font-medium".to_string()
 | 
			
		||||
            }
 | 
			
		||||
        };
 | 
			
		||||
        match (self.mobile, is_current_item) {
 | 
			
		||||
            (true, true) => common_classes + " border-indigo-500 bg-indigo-50 text-indigo-700",
 | 
			
		||||
            (true, false) => common_classes + " border-transparent text-gray-600 hover:border-gray-300 hover:bg-gray-50 hover:text-gray-800",
 | 
			
		||||
            (false, true) => common_classes + " border-indigo-500 text-gray-900",
 | 
			
		||||
            (false, false) => common_classes + " border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
 | 
			
		||||
    MenuTemplate {
 | 
			
		||||
        mobile: params.mobile,
 | 
			
		||||
        items: vec![
 | 
			
		||||
            MenuItem {
 | 
			
		||||
                label: "Accueil".to_string(),
 | 
			
		||||
                href: "/pages/home".to_string(),
 | 
			
		||||
                current: true,
 | 
			
		||||
            },
 | 
			
		||||
            MenuItem {
 | 
			
		||||
                label: "CPS".to_string(),
 | 
			
		||||
                href: "/pages/cps".to_string(),
 | 
			
		||||
                current: false,
 | 
			
		||||
            },
 | 
			
		||||
        ],
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn get_routes() -> Router {
 | 
			
		||||
    Router::new().route("/menu", routing::get(menu))
 | 
			
		||||
}
 | 
			
		||||
@@ -1,63 +0,0 @@
 | 
			
		||||
use askama_axum::Template;
 | 
			
		||||
use axum::{extract::Query, routing, Router};
 | 
			
		||||
use serde::Deserialize;
 | 
			
		||||
 | 
			
		||||
struct MenuItem {
 | 
			
		||||
    label: String,
 | 
			
		||||
    id: String,
 | 
			
		||||
    current: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Deserialize)]
 | 
			
		||||
struct MenuParameters {
 | 
			
		||||
    mobile: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Template)]
 | 
			
		||||
#[template(path = "layout/nav/profile-menu-items.html")]
 | 
			
		||||
struct MenuTemplate {
 | 
			
		||||
    mobile: bool,
 | 
			
		||||
    items: Vec<MenuItem>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl MenuTemplate {
 | 
			
		||||
    fn get_classes(&self, is_current_item: &bool) -> String {
 | 
			
		||||
        let common_classes = match self.mobile {
 | 
			
		||||
            true => "block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800".to_string(),
 | 
			
		||||
            false => "block px-4 py-2 text-sm text-gray-700".to_string(),
 | 
			
		||||
        };
 | 
			
		||||
        match (self.mobile, is_current_item) {
 | 
			
		||||
            (true, true) => common_classes + "", // ???
 | 
			
		||||
            (true, false) => common_classes + "",
 | 
			
		||||
            (false, true) => common_classes + " bg-gray-100",
 | 
			
		||||
            (false, false) => common_classes + "",
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
 | 
			
		||||
    MenuTemplate {
 | 
			
		||||
        mobile: params.mobile,
 | 
			
		||||
        items: vec![
 | 
			
		||||
            MenuItem {
 | 
			
		||||
                label: "Votre profil".to_string(),
 | 
			
		||||
                id: "profile".to_string(),
 | 
			
		||||
                current: false,
 | 
			
		||||
            },
 | 
			
		||||
            MenuItem {
 | 
			
		||||
                label: "Paramètres".to_string(),
 | 
			
		||||
                id: "settings".to_string(),
 | 
			
		||||
                current: false,
 | 
			
		||||
            },
 | 
			
		||||
            MenuItem {
 | 
			
		||||
                label: "Déconnexion".to_string(),
 | 
			
		||||
                id: "logout".to_string(),
 | 
			
		||||
                current: false,
 | 
			
		||||
            },
 | 
			
		||||
        ],
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn get_routes() -> Router {
 | 
			
		||||
    Router::new().route("/menu", routing::get(menu))
 | 
			
		||||
}
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
/** @type {import('tailwindcss').Config} */
 | 
			
		||||
module.exports = {
 | 
			
		||||
  content: [
 | 
			
		||||
    './templates/**/*.html',
 | 
			
		||||
    './src/**/*.html',
 | 
			
		||||
    './css/**/*.css',
 | 
			
		||||
  ],
 | 
			
		||||
  theme: {
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +0,0 @@
 | 
			
		||||
<div>Hello {{name}}!</div>
 | 
			
		||||
@@ -1,34 +0,0 @@
 | 
			
		||||
{% extends "base.html" %}
 | 
			
		||||
 | 
			
		||||
{% block title %}Pharma Libre{% endblock %}
 | 
			
		||||
 | 
			
		||||
{% block body %}
 | 
			
		||||
<div class="py-10">
 | 
			
		||||
  <header>
 | 
			
		||||
    <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
 | 
			
		||||
      <h1
 | 
			
		||||
        id="page-title"
 | 
			
		||||
        class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
 | 
			
		||||
      >
 | 
			
		||||
        {% include "skeletons/page-title.html" %}
 | 
			
		||||
      </h1>
 | 
			
		||||
    </div>
 | 
			
		||||
  </header>
 | 
			
		||||
  <main>
 | 
			
		||||
    <div
 | 
			
		||||
      id="main-container"
 | 
			
		||||
      class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
 | 
			
		||||
    >
 | 
			
		||||
      <!-- Your content -->
 | 
			
		||||
      <div
 | 
			
		||||
        hx-get="/pages/home"
 | 
			
		||||
        hx-target="this"
 | 
			
		||||
        hx-trigger="load"
 | 
			
		||||
        hx-swap="outerHTML"
 | 
			
		||||
      >
 | 
			
		||||
        {% include "skeletons/card.html" %}
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </main>
 | 
			
		||||
</div>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
@@ -1,41 +0,0 @@
 | 
			
		||||
<nav
 | 
			
		||||
  class="border-b border-gray-200 bg-white"
 | 
			
		||||
  x-data="{ menuOpen: false }"
 | 
			
		||||
>
 | 
			
		||||
  <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
 | 
			
		||||
    <div class="flex h-16 justify-between">
 | 
			
		||||
      <div class="flex">
 | 
			
		||||
        {% include "layout/nav/logo.html" %}
 | 
			
		||||
        <div class="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">
 | 
			
		||||
          {% include "layout/nav/desktop/menu-items.html" %}
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
      <div class="hidden sm:ml-6 sm:flex sm:items-center">
 | 
			
		||||
        {% include "layout/nav/desktop/notifications-button.html" %}
 | 
			
		||||
        {% include "layout/nav/desktop/profile.html" %}
 | 
			
		||||
      </div>
 | 
			
		||||
      <div class="-mr-2 flex items-center sm:hidden">
 | 
			
		||||
        {% include "layout/nav/mobile/menu-button.html" %}
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
  <!-- Mobile menu, show/hide based on menu state. -->
 | 
			
		||||
  <div
 | 
			
		||||
    class="sm:hidden" id="mobile-menu"
 | 
			
		||||
    x-show="menuOpen"
 | 
			
		||||
    x-cloak
 | 
			
		||||
  >
 | 
			
		||||
    <div class="space-y-1 pb-3 pt-2">
 | 
			
		||||
      {% include "layout/nav/mobile/menu-items.html" %}
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="border-t border-gray-200 pb-3 pt-4">
 | 
			
		||||
      <div class="flex items-center px-4">
 | 
			
		||||
        {% include "layout/nav/mobile/profile.html" %}
 | 
			
		||||
        {% include "layout/nav/mobile/notifications-button.html" %}
 | 
			
		||||
      </div>
 | 
			
		||||
      <div class="mt-3 space-y-1">
 | 
			
		||||
        {% include "layout/nav/mobile/profile-items.html" %}
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
</nav>
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
<div
 | 
			
		||||
  id="nav-menu-desktop"
 | 
			
		||||
  hx-get="/nav/menu?mobile=false"
 | 
			
		||||
  hx-target="this"
 | 
			
		||||
  hx-trigger="load"
 | 
			
		||||
  hx-swap="outerHTML"
 | 
			
		||||
>
 | 
			
		||||
  {% include "skeletons/menu-items.html" %}
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,6 +0,0 @@
 | 
			
		||||
<button
 | 
			
		||||
  type="button"
 | 
			
		||||
  class="relative rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
 | 
			
		||||
>
 | 
			
		||||
  {% include "layout/nav/notifications-icon.html" %}
 | 
			
		||||
</button>
 | 
			
		||||
@@ -1,22 +0,0 @@
 | 
			
		||||
<div
 | 
			
		||||
  class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
 | 
			
		||||
  role="menu"
 | 
			
		||||
  id="profile-dropdown"
 | 
			
		||||
  aria-orientation="vertical"
 | 
			
		||||
  aria-labelledby="user-menu-button"
 | 
			
		||||
  tabindex="-1"
 | 
			
		||||
  x-show="profileOpen"
 | 
			
		||||
  x-on:click.outside="profileOpen = false"
 | 
			
		||||
  x-cloak
 | 
			
		||||
  x-transition
 | 
			
		||||
>
 | 
			
		||||
  <div
 | 
			
		||||
    id="profile-menu-desktop"
 | 
			
		||||
    hx-get="/profile/menu?mobile=false"
 | 
			
		||||
    hx-target="this"
 | 
			
		||||
    hx-trigger="load"
 | 
			
		||||
    hx-swap="outerHTML"
 | 
			
		||||
  >
 | 
			
		||||
    Chargement ...
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,27 +0,0 @@
 | 
			
		||||
<!-- Profile dropdown -->
 | 
			
		||||
<div
 | 
			
		||||
  class="relative ml-3"
 | 
			
		||||
  x-data="{ profileOpen: false }"
 | 
			
		||||
>
 | 
			
		||||
  <div>
 | 
			
		||||
    <button
 | 
			
		||||
      type="button"
 | 
			
		||||
      class="relative flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
 | 
			
		||||
      id="user-menu-button"
 | 
			
		||||
      aria-controls="profile-dropdown"
 | 
			
		||||
      aria-expanded="false"
 | 
			
		||||
      aria-haspopup="menu"
 | 
			
		||||
      x-on:click="profileOpen = ! profileOpen"
 | 
			
		||||
    >
 | 
			
		||||
      <span class="absolute -inset-1.5"></span>
 | 
			
		||||
      <span class="sr-only">Open user menu</span>
 | 
			
		||||
      <img
 | 
			
		||||
        class="h-8 w-8 rounded-full"
 | 
			
		||||
        src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
 | 
			
		||||
        alt=""
 | 
			
		||||
      />
 | 
			
		||||
    </button>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  {% include "layout/nav/desktop/profile-dropdown.html" %}
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,4 +0,0 @@
 | 
			
		||||
<div class="flex flex-shrink-0 items-center">
 | 
			
		||||
  <img class="block h-8 w-auto lg:hidden" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
 | 
			
		||||
  <img class="hidden h-8 w-auto lg:block" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,43 +0,0 @@
 | 
			
		||||
<!-- Mobile menu button -->
 | 
			
		||||
<button
 | 
			
		||||
  type="button"
 | 
			
		||||
  class="relative inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
 | 
			
		||||
  aria-controls="mobile-menu"
 | 
			
		||||
  x-on:click="menuOpen = ! menuOpen"
 | 
			
		||||
  x-bind:aria-expanded="menuOpen"
 | 
			
		||||
>
 | 
			
		||||
  <span class="absolute -inset-0.5"></span>
 | 
			
		||||
  <span class="sr-only">Open main menu</span>
 | 
			
		||||
  <!-- Menu open: "hidden", Menu closed: "block" -->
 | 
			
		||||
  <svg
 | 
			
		||||
    class="h-6 w-6"
 | 
			
		||||
    fill="none"
 | 
			
		||||
    viewBox="0 0 24 24"
 | 
			
		||||
    stroke-width="1.5"
 | 
			
		||||
    stroke="currentColor"
 | 
			
		||||
    x-bind:class="menuOpen ? 'hidden' : 'block'"
 | 
			
		||||
    x-bind:aria-hidden="menuOpen"
 | 
			
		||||
  >
 | 
			
		||||
    <path
 | 
			
		||||
      stroke-linecap="round"
 | 
			
		||||
      stroke-linejoin="round"
 | 
			
		||||
      d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
 | 
			
		||||
    />
 | 
			
		||||
  </svg>
 | 
			
		||||
  <!-- Menu open: "block", Menu closed: "hidden" -->
 | 
			
		||||
  <svg
 | 
			
		||||
    class="h-6 w-6"
 | 
			
		||||
    fill="none"
 | 
			
		||||
    viewBox="0 0 24 24"
 | 
			
		||||
    stroke-width="1.5"
 | 
			
		||||
    stroke="currentColor"
 | 
			
		||||
    x-bind:class="menuOpen ? 'block' : 'hidden'"
 | 
			
		||||
    x-bind:aria-hidden="! menuOpen"
 | 
			
		||||
  >
 | 
			
		||||
    <path
 | 
			
		||||
      stroke-linecap="round"
 | 
			
		||||
      stroke-linejoin="round"
 | 
			
		||||
      d="M6 18L18 6M6 6l12 12"
 | 
			
		||||
    />
 | 
			
		||||
  </svg>
 | 
			
		||||
</button>
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
<div
 | 
			
		||||
  id="nav-menu-mobile"
 | 
			
		||||
  hx-get="/nav/menu?mobile=true"
 | 
			
		||||
  hx-target="this"
 | 
			
		||||
  hx-trigger="load"
 | 
			
		||||
  hx-swap="outerHTML"
 | 
			
		||||
>
 | 
			
		||||
  Chargement ...
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,6 +0,0 @@
 | 
			
		||||
<button
 | 
			
		||||
  type="button"
 | 
			
		||||
  class="relative ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
 | 
			
		||||
>
 | 
			
		||||
  {% include "layout/nav/notifications-icon.html" %}
 | 
			
		||||
</button>
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
<div
 | 
			
		||||
  id="profile-menu-mobile"
 | 
			
		||||
  hx-get="/profile/menu?mobile=true"
 | 
			
		||||
  hx-target="this"
 | 
			
		||||
  hx-trigger="load"
 | 
			
		||||
  hx-swap="outerHTML"
 | 
			
		||||
>
 | 
			
		||||
  Chargement ...
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,11 +0,0 @@
 | 
			
		||||
<div class="flex-shrink-0">
 | 
			
		||||
  <img
 | 
			
		||||
    class="h-10 w-10 rounded-full"
 | 
			
		||||
    src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
 | 
			
		||||
    alt=""
 | 
			
		||||
  />
 | 
			
		||||
</div>
 | 
			
		||||
<div class="ml-3">
 | 
			
		||||
  <div class="text-base font-medium text-gray-800">Tom Cook</div>
 | 
			
		||||
  <div class="text-sm font-medium text-gray-500">tom@example.com</div>
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,13 +0,0 @@
 | 
			
		||||
{% for item in items %}
 | 
			
		||||
  <a
 | 
			
		||||
    href=""
 | 
			
		||||
    hx-get="{{ item.href }}"
 | 
			
		||||
    hx-trigger="click"
 | 
			
		||||
    hx-target="#main-container"
 | 
			
		||||
    hx-swap="innerHTML"
 | 
			
		||||
    class="{{ Self::get_classes(self, item.current) }}"
 | 
			
		||||
    aria-current="{% if item.current %}page{% endif %}"
 | 
			
		||||
  >
 | 
			
		||||
    {{ item.label }}
 | 
			
		||||
  </a>
 | 
			
		||||
{% endfor %}
 | 
			
		||||
@@ -1,16 +0,0 @@
 | 
			
		||||
<span class="absolute -inset-1.5"></span>
 | 
			
		||||
<span class="sr-only">View notifications</span>
 | 
			
		||||
<svg
 | 
			
		||||
  class="h-6 w-6"
 | 
			
		||||
  fill="none"
 | 
			
		||||
  viewBox="0 0 24 24"
 | 
			
		||||
  stroke-width="1.5"
 | 
			
		||||
  stroke="currentColor"
 | 
			
		||||
  aria-hidden="true"
 | 
			
		||||
>
 | 
			
		||||
  <path
 | 
			
		||||
    stroke-linecap="round"
 | 
			
		||||
    stroke-linejoin="round"
 | 
			
		||||
    d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0"
 | 
			
		||||
  />
 | 
			
		||||
</svg>
 | 
			
		||||
@@ -1,11 +0,0 @@
 | 
			
		||||
{% for item in items %}
 | 
			
		||||
  <a
 | 
			
		||||
    href="#{{ item.id }}"
 | 
			
		||||
    class="{{ Self::get_classes(self, item.current) }}"
 | 
			
		||||
    role="menuitem"
 | 
			
		||||
    tabindex="-1"
 | 
			
		||||
    id="{{ item.id }}"
 | 
			
		||||
  >
 | 
			
		||||
    {{ item.label }}
 | 
			
		||||
  </a>
 | 
			
		||||
{% endfor %}
 | 
			
		||||
@@ -1,52 +0,0 @@
 | 
			
		||||
<h3 id="page-title" hx-swap-oob="textContent">
 | 
			
		||||
    CPS
 | 
			
		||||
</h3>
 | 
			
		||||
 | 
			
		||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
<div
 | 
			
		||||
  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
></div>
 | 
			
		||||
<div class="grid grid-cols-2 gap-4 mb-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
<div
 | 
			
		||||
  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
></div>
 | 
			
		||||
<div class="grid grid-cols-2 gap-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
@@ -1,52 +0,0 @@
 | 
			
		||||
<h3 id="page-title" hx-swap-oob="textContent">
 | 
			
		||||
    Accueil
 | 
			
		||||
</h3>
 | 
			
		||||
 | 
			
		||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
<div
 | 
			
		||||
  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
></div>
 | 
			
		||||
<div class="grid grid-cols-2 gap-4 mb-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
<div
 | 
			
		||||
  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
 | 
			
		||||
></div>
 | 
			
		||||
<div class="grid grid-cols-2 gap-4">
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
  <div
 | 
			
		||||
    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
 | 
			
		||||
  ></div>
 | 
			
		||||
</div>
 | 
			
		||||
							
								
								
									
										14
									
								
								crates/backend/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								crates/backend/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "backend"
 | 
			
		||||
version = "0.1.0"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
anyhow = "1.0.89"
 | 
			
		||||
axum = "0.7.6"
 | 
			
		||||
listenfd = "1.0.1"
 | 
			
		||||
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
 | 
			
		||||
 | 
			
		||||
[dev-dependencies]
 | 
			
		||||
cargo-watch = "8.5.2"
 | 
			
		||||
systemfd = "0.4.3"
 | 
			
		||||
							
								
								
									
										19
									
								
								crates/backend/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								crates/backend/README.md
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,19 @@
 | 
			
		||||
# Backend
 | 
			
		||||
 | 
			
		||||
Ceci est un serveur backend, basé sur axum, et permettant d'offrir une gestion centralisée des accès aux données.
 | 
			
		||||
 | 
			
		||||
## Prérequis
 | 
			
		||||
 | 
			
		||||
En développement, le mécanisme de hot-reload nécessite de disposer de `cargo-watch` et `systemfd`. Pour les installer, exécutez la commande suivante :
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
cargo install cargo-watch systemfd
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Développement
 | 
			
		||||
 | 
			
		||||
Pour lancer le serveur en mode développement, exécutez la commande suivante :
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
 | 
			
		||||
```
 | 
			
		||||
							
								
								
									
										37
									
								
								crates/backend/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								crates/backend/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,37 @@
 | 
			
		||||
use anyhow::Error as AnyError;
 | 
			
		||||
use axum::http::{StatusCode, Uri};
 | 
			
		||||
use axum::response::{IntoResponse, Response};
 | 
			
		||||
use axum::{routing::get, Router};
 | 
			
		||||
 | 
			
		||||
pub fn get_router() -> Router {
 | 
			
		||||
    Router::new()
 | 
			
		||||
        .route("/", get(|| async { "Hello, world!" }))
 | 
			
		||||
        .fallback(fallback)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
 | 
			
		||||
    (StatusCode::NOT_FOUND, format!("No route for {uri}"))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
struct AppError(AnyError);
 | 
			
		||||
 | 
			
		||||
// To automatically convert `AppError` into a response
 | 
			
		||||
impl IntoResponse for AppError {
 | 
			
		||||
    fn into_response(self) -> Response {
 | 
			
		||||
        (
 | 
			
		||||
            StatusCode::INTERNAL_SERVER_ERROR,
 | 
			
		||||
            format!("Internal Server Error: {}", self.0),
 | 
			
		||||
        )
 | 
			
		||||
            .into_response()
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// To automatically convert `AnyError` into `AppError`
 | 
			
		||||
impl<E> From<E> for AppError
 | 
			
		||||
where
 | 
			
		||||
    E: Into<AnyError>,
 | 
			
		||||
{
 | 
			
		||||
    fn from(err: E) -> Self {
 | 
			
		||||
        Self(err.into())
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										24
									
								
								crates/backend/src/main.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								crates/backend/src/main.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,24 @@
 | 
			
		||||
use listenfd::ListenFd;
 | 
			
		||||
use tokio::net::TcpListener;
 | 
			
		||||
 | 
			
		||||
use backend::get_router;
 | 
			
		||||
 | 
			
		||||
#[tokio::main]
 | 
			
		||||
async fn main() {
 | 
			
		||||
    let app = get_router();
 | 
			
		||||
 | 
			
		||||
    let mut listenfd = ListenFd::from_env();
 | 
			
		||||
 | 
			
		||||
    let listener = match listenfd.take_tcp_listener(0).unwrap() {
 | 
			
		||||
        // if we are given a tcp listener on listen fd 0, we use that one
 | 
			
		||||
        Some(listener) => {
 | 
			
		||||
            listener.set_nonblocking(true).unwrap();
 | 
			
		||||
            TcpListener::from_std(listener).unwrap()
 | 
			
		||||
        }
 | 
			
		||||
        // otherwise fall back to local listening
 | 
			
		||||
        None => TcpListener::bind("0.0.0.0:8080").await.unwrap(),
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    println!("Listening on {}", listener.local_addr().unwrap());
 | 
			
		||||
    axum::serve(listener, app).await.unwrap();
 | 
			
		||||
}
 | 
			
		||||
@@ -10,15 +10,11 @@ name = "desktop_lib"
 | 
			
		||||
crate-type = ["lib", "cdylib", "staticlib"]
 | 
			
		||||
 | 
			
		||||
[build-dependencies]
 | 
			
		||||
tauri-build = { version = "2.0.0-beta", features = [] }
 | 
			
		||||
tauri-build = { version = "2.0.0-rc", features = [] }
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
axum = "0.7.5"
 | 
			
		||||
tauri = { version = "2.0.0-beta", features = [] }
 | 
			
		||||
tower = "0.4.13"
 | 
			
		||||
tokio = "1.39.1"
 | 
			
		||||
 | 
			
		||||
app = { path = "../app" }
 | 
			
		||||
http = "1.1.0"
 | 
			
		||||
bytes = "1.6.1"
 | 
			
		||||
tauri = { version = "2.0.0-rc", features = [] }
 | 
			
		||||
tauri-plugin-shell = "2.0.0-rc"
 | 
			
		||||
serde = { version = "1", features = ["derive"] }
 | 
			
		||||
serde_json = "1"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								crates/desktop/capabilities/default.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								crates/desktop/capabilities/default.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,10 @@
 | 
			
		||||
{
 | 
			
		||||
  "$schema": "../gen/schemas/desktop-schema.json",
 | 
			
		||||
  "identifier": "default",
 | 
			
		||||
  "description": "Capability for the main window",
 | 
			
		||||
  "windows": ["main"],
 | 
			
		||||
  "permissions": [
 | 
			
		||||
    "core:default",
 | 
			
		||||
    "shell:allow-open"
 | 
			
		||||
  ]
 | 
			
		||||
}
 | 
			
		||||
@@ -1,69 +1,14 @@
 | 
			
		||||
use bytes::Bytes;
 | 
			
		||||
use http::{request, response, Request, Response};
 | 
			
		||||
use std::path::PathBuf;
 | 
			
		||||
use std::sync::Arc;
 | 
			
		||||
 | 
			
		||||
use axum::body::{to_bytes, Body};
 | 
			
		||||
 | 
			
		||||
use axum::Router;
 | 
			
		||||
 | 
			
		||||
use tauri::path::BaseDirectory;
 | 
			
		||||
use tauri::Manager;
 | 
			
		||||
use tokio::sync::{Mutex, MutexGuard};
 | 
			
		||||
use tower::{Service, ServiceExt};
 | 
			
		||||
 | 
			
		||||
async fn process_tauri_request(
 | 
			
		||||
    tauri_request: Request<Vec<u8>>,
 | 
			
		||||
    mut router: MutexGuard<'_, Router>,
 | 
			
		||||
) -> Response<Vec<u8>> {
 | 
			
		||||
    let (parts, body): (request::Parts, Vec<u8>) = tauri_request.into_parts();
 | 
			
		||||
    let axum_request: Request<Body> = Request::from_parts(parts, body.into());
 | 
			
		||||
 | 
			
		||||
    let axum_response: Response<Body> = router
 | 
			
		||||
        .as_service()
 | 
			
		||||
        .ready()
 | 
			
		||||
        .await
 | 
			
		||||
        .expect("Failed to get ready service from router")
 | 
			
		||||
        .call(axum_request)
 | 
			
		||||
        .await
 | 
			
		||||
        .expect("Could not get response from router");
 | 
			
		||||
 | 
			
		||||
    let (parts, body): (response::Parts, Body) = axum_response.into_parts();
 | 
			
		||||
    let body: Bytes = to_bytes(body, usize::MAX).await.unwrap_or_default();
 | 
			
		||||
 | 
			
		||||
    let tauri_response: Response<Vec<u8>> = Response::from_parts(parts, body.into());
 | 
			
		||||
 | 
			
		||||
    tauri_response
 | 
			
		||||
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 | 
			
		||||
#[tauri::command]
 | 
			
		||||
fn greet(name: &str) -> String {
 | 
			
		||||
    format!("Hello, {}! You've been greeted from Rust!", name)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
 | 
			
		||||
pub fn run() {
 | 
			
		||||
    tauri::Builder::default()
 | 
			
		||||
        .setup(|app| {
 | 
			
		||||
            let assets_path: PathBuf = app
 | 
			
		||||
                .path()
 | 
			
		||||
                .resolve("assets", BaseDirectory::Resource)
 | 
			
		||||
                .expect("Path should be resolvable");
 | 
			
		||||
 | 
			
		||||
            // Adds Axum router to application state
 | 
			
		||||
            // This makes it so we can retrieve it from any app instance (see bellow)
 | 
			
		||||
            let router = Arc::new(Mutex::new(app::get_router(&assets_path)));
 | 
			
		||||
 | 
			
		||||
            app.manage(router);
 | 
			
		||||
 | 
			
		||||
            Ok(())
 | 
			
		||||
        })
 | 
			
		||||
        .register_asynchronous_uri_scheme_protocol("axum", move |app, request, responder| {
 | 
			
		||||
            // Retrieve the router from the application state and clone it for the async block
 | 
			
		||||
            let router = Arc::clone(&app.state::<Arc<Mutex<axum::Router>>>());
 | 
			
		||||
 | 
			
		||||
            // Spawn a new async task to process the request
 | 
			
		||||
            tauri::async_runtime::spawn(async move {
 | 
			
		||||
                let router = router.lock().await;
 | 
			
		||||
                let response = process_tauri_request(request, router).await;
 | 
			
		||||
                responder.respond(response);
 | 
			
		||||
            });
 | 
			
		||||
        })
 | 
			
		||||
        .plugin(tauri_plugin_shell::init())
 | 
			
		||||
        .invoke_handler(tauri::generate_handler![greet])
 | 
			
		||||
        .run(tauri::generate_context!())
 | 
			
		||||
        .expect("error while running tauri application");
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,20 +1,24 @@
 | 
			
		||||
{
 | 
			
		||||
  "productName": "Logiciel Pharma",
 | 
			
		||||
  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
 | 
			
		||||
  "productName": "Chrys4lide LGO",
 | 
			
		||||
  "version": "0.0.1",
 | 
			
		||||
  "identifier": "org.p4pillon.pharma.desktop",
 | 
			
		||||
  "identifier": "org.p4pillon.chrys4lide.lgo",
 | 
			
		||||
  "build": {
 | 
			
		||||
    "beforeDevCommand": {
 | 
			
		||||
        "cwd": "../app",
 | 
			
		||||
        "script": "cargo run"
 | 
			
		||||
      "cwd": "../../frontend",
 | 
			
		||||
      "script": "bun run dev"
 | 
			
		||||
    },
 | 
			
		||||
    "devUrl": "http://localhost:3000",
 | 
			
		||||
    "frontendDist": "axum://place.holder/"
 | 
			
		||||
    "devUrl": "http://localhost:1420",
 | 
			
		||||
    "beforeBuildCommand": {
 | 
			
		||||
      "cwd": "../../frontend",
 | 
			
		||||
      "script": "bun run generate"
 | 
			
		||||
    },
 | 
			
		||||
    "frontendDist": "../../frontend/dist"
 | 
			
		||||
  },
 | 
			
		||||
  "app": {
 | 
			
		||||
    "withGlobalTauri": true,
 | 
			
		||||
    "windows": [
 | 
			
		||||
      {
 | 
			
		||||
        "title": "Logiciel Pharma",
 | 
			
		||||
        "title": "Chrys4lide | LG0",
 | 
			
		||||
        "width": 800,
 | 
			
		||||
        "height": 600
 | 
			
		||||
      }
 | 
			
		||||
@@ -25,9 +29,6 @@
 | 
			
		||||
  },
 | 
			
		||||
  "bundle": {
 | 
			
		||||
    "active": true,
 | 
			
		||||
    "resources": {
 | 
			
		||||
        "../app/assets/": "./assets/"
 | 
			
		||||
    },
 | 
			
		||||
    "targets": "all",
 | 
			
		||||
    "icon": [
 | 
			
		||||
      "icons/32x32.png",
 | 
			
		||||
@@ -37,5 +38,4 @@
 | 
			
		||||
      "icons/icon.ico"
 | 
			
		||||
    ]
 | 
			
		||||
  }
 | 
			
		||||
                
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										12
									
								
								crates/services-sesam-vitale-sys/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								crates/services-sesam-vitale-sys/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,12 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "services-sesam-vitale-sys"
 | 
			
		||||
version = "0.1.0"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
#links= "ssvlux64"
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
bitvec = "1.0.1"
 | 
			
		||||
deku = "0.17.0"
 | 
			
		||||
libc = "0.2.155"
 | 
			
		||||
num_enum = { version = "0.7.3", features = ["complex-expressions"] }
 | 
			
		||||
thiserror = "1.0.63"
 | 
			
		||||
							
								
								
									
										104
									
								
								crates/services-sesam-vitale-sys/src/api.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								crates/services-sesam-vitale-sys/src/api.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,104 @@
 | 
			
		||||
use deku::{deku_derive, DekuContainerRead, DekuError, DekuReader};
 | 
			
		||||
use std::{ffi::CString, fmt, path::Path, ptr};
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
use crate::{
 | 
			
		||||
    bindings::{SSV_InitLIB2, SSV_LireConfig, SSV_TermLIB},
 | 
			
		||||
    types::{common::read_from_buffer, configuration::Configuration},
 | 
			
		||||
};
 | 
			
		||||
use num_enum::FromPrimitive;
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
pub struct SesamVitaleError {
 | 
			
		||||
    code: u16,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Eq, PartialEq, FromPrimitive)]
 | 
			
		||||
#[repr(u16)]
 | 
			
		||||
enum SSVIntError {
 | 
			
		||||
    CPSNotInserted = 61441,
 | 
			
		||||
 | 
			
		||||
    #[num_enum(catch_all)]
 | 
			
		||||
    NotImplemented(u16),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[cfg(test)]
 | 
			
		||||
mod tests {
 | 
			
		||||
    use super::*;
 | 
			
		||||
 | 
			
		||||
    #[test]
 | 
			
		||||
    fn test_sesam_vitale_error() {
 | 
			
		||||
        let int_error = SSVIntError::from(61441);
 | 
			
		||||
        assert_eq!(int_error, SSVIntError::CPSNotInserted);
 | 
			
		||||
 | 
			
		||||
        let int_error = SSVIntError::from(123);
 | 
			
		||||
        assert_eq!(int_error, SSVIntError::NotImplemented(123));
 | 
			
		||||
        println!("{:?}", int_error);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
enum SSVError {
 | 
			
		||||
    #[error("Erreur standard de la librairie SSV")]
 | 
			
		||||
    SSVStandard,
 | 
			
		||||
    // #[error("Erreur de parsing")]
 | 
			
		||||
    // Parsing(#[from] ParsingError),
 | 
			
		||||
    #[error("Erreur inattendue de la librairie SSV (TMP)")]
 | 
			
		||||
    SSVUnknownTmp,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl fmt::Display for SesamVitaleError {
 | 
			
		||||
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 | 
			
		||||
        write!(f, "Got error code {} from SSV_LireConfig", self.code)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn init_library(sesam_ini_path: &Path) -> Result<(), SesamVitaleError> {
 | 
			
		||||
    // TODO: better error handling
 | 
			
		||||
    let path_str = sesam_ini_path.to_str().unwrap();
 | 
			
		||||
    let path_ptr = CString::new(path_str).expect("failed to create cstring");
 | 
			
		||||
 | 
			
		||||
    let exit_code: u16 = unsafe { SSV_InitLIB2(path_ptr.as_ptr()) };
 | 
			
		||||
    if exit_code != 0 {
 | 
			
		||||
        let error = SesamVitaleError { code: exit_code };
 | 
			
		||||
        return Err(error);
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
pub fn close_library() -> Result<(), SesamVitaleError> {
 | 
			
		||||
    let exit_code: u16 = unsafe { SSV_TermLIB() };
 | 
			
		||||
    if exit_code != 0 {
 | 
			
		||||
        let error = SesamVitaleError { code: exit_code };
 | 
			
		||||
        return Err(error);
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn read_config() -> Result<Configuration, SesamVitaleError> {
 | 
			
		||||
    let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
 | 
			
		||||
    let mut size: libc::size_t = 0;
 | 
			
		||||
 | 
			
		||||
    let buffer_ptr_ptr: *mut *mut libc::c_void = &mut buffer_ptr;
 | 
			
		||||
    let size_ptr: *mut libc::size_t = &mut size;
 | 
			
		||||
 | 
			
		||||
    // Need to add proper error handling -> return a result with error code pointing to an error
 | 
			
		||||
    // enum
 | 
			
		||||
    let exit_code: u16 = unsafe { SSV_LireConfig(buffer_ptr_ptr, size_ptr) };
 | 
			
		||||
 | 
			
		||||
    if exit_code != 0 {
 | 
			
		||||
        let error = SesamVitaleError { code: exit_code };
 | 
			
		||||
        return Err(error);
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    let buffer: &[u8] = unsafe { std::slice::from_raw_parts(buffer_ptr as *const u8, size) };
 | 
			
		||||
 | 
			
		||||
    // TODO: Improve error handling
 | 
			
		||||
    let configuration: Configuration = read_from_buffer(buffer).unwrap();
 | 
			
		||||
 | 
			
		||||
    // TODO: Call library function for memory delocating
 | 
			
		||||
    unsafe { libc::free(buffer_ptr) };
 | 
			
		||||
 | 
			
		||||
    Ok(configuration)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										288
									
								
								crates/services-sesam-vitale-sys/src/bindings.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										288
									
								
								crates/services-sesam-vitale-sys/src/bindings.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,288 @@
 | 
			
		||||
#![allow(non_upper_case_globals)]
 | 
			
		||||
#![allow(non_camel_case_types)]
 | 
			
		||||
#![allow(non_snake_case)]
 | 
			
		||||
#![allow(dead_code)]
 | 
			
		||||
 | 
			
		||||
// Generated using bindgen
 | 
			
		||||
 | 
			
		||||
extern "C" {
 | 
			
		||||
    // Fonctions de gestion des données
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_LireCartePS(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_LireDroitsVitale(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        DateConsultation: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_FormaterFactures(
 | 
			
		||||
        cFactureACreer: ::std::os::raw::c_char,
 | 
			
		||||
        cModeSecur: ::std::os::raw::c_char,
 | 
			
		||||
        cTypeFlux: ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        TailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_ChiffrerFacture(
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        TailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_SignerFactureVitale(
 | 
			
		||||
        pcNomRessourceVitale: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_CalculerHashFactureAssure(
 | 
			
		||||
        pcNumSerie: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_AjouterSignatureAssureDansFacture(
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_SignerFactureCPS(
 | 
			
		||||
        pcNomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcCodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        cNologSituation: ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_FormaterLot(
 | 
			
		||||
        NBZDataIn: ::std::os::raw::c_short,
 | 
			
		||||
        TZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneIn: *mut usize,
 | 
			
		||||
        pNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        TZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_SignerLotCPS(
 | 
			
		||||
        pcNomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcCodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        cNologSituation: ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_FormaterFichier(
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        TailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_TraduireARL(
 | 
			
		||||
        NbZDonneesEntree: ::std::os::raw::c_short,
 | 
			
		||||
        TZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneIn: *mut usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_LireNumSerieCarteVitale(
 | 
			
		||||
        pcNomRessource: *mut ::std::os::raw::c_char,
 | 
			
		||||
        numeroSerie: *mut ::std::os::raw::c_uchar,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_CalculerHashFacturePS(
 | 
			
		||||
        pcNumSerieCPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        usTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pusTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_AjouterSignaturePSFacture(
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_DechargerFacturesPdT(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNumFact: *const ::std::os::raw::c_char,
 | 
			
		||||
        sNbZDataIn: ::std::os::raw::c_short,
 | 
			
		||||
        pvTZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        psTTailleDataIn: *mut usize,
 | 
			
		||||
        pNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        TZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_TraduireFSE(
 | 
			
		||||
        pZDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        TailleDataIn: usize,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pTailleZone: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    // Fonctions TLA
 | 
			
		||||
    // TLA (Terminal Lecteur Applicatif) -> lecteur autre que PC-SC, on ne prend pas en compte cela
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_IdentifierTLA(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        NumVersionCDC: *const ::std::os::raw::c_char,
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        tailleDataOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_ChargerDonneesTLA(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        sNbZDataIn: ::std::os::raw::c_short,
 | 
			
		||||
        pvTZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        psTTailleDataIn: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_ChargerFacturesPdT(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNumFacturation: *const ::std::os::raw::c_char,
 | 
			
		||||
        sNbZDataIn: ::std::os::raw::c_short,
 | 
			
		||||
        pvTZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        psTTailleDataIn: *mut usize,
 | 
			
		||||
        pNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        TZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_DechargerFSETLA(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNumFact: *const ::std::os::raw::c_char,
 | 
			
		||||
        pNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        TZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_DechargerFSETLANC(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNumFact: *const ::std::os::raw::c_char,
 | 
			
		||||
        pNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        TZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        TTailleZoneOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_DechargerBeneficiaires(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        cNumFacturation: *const ::std::os::raw::c_char,
 | 
			
		||||
        sNbZDataOut: *mut ::std::os::raw::c_short,
 | 
			
		||||
        pTZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        sTTailleDataOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_EffacerTLA(
 | 
			
		||||
        NomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        NomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        CodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        cNumFacturation: *const ::std::os::raw::c_char,
 | 
			
		||||
        cTypeDonnee: *const ::std::os::raw::c_char,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
    pub fn SSV_SecuriserFacture(
 | 
			
		||||
        pcNomRessourcePS: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcCodePorteurPS: *const ::std::os::raw::c_char,
 | 
			
		||||
        cNologSituation: ::std::os::raw::c_char,
 | 
			
		||||
        pcNumFact: *const ::std::os::raw::c_char,
 | 
			
		||||
        pvDataIn: *mut ::std::os::raw::c_void,
 | 
			
		||||
        szTailleDataIn: usize,
 | 
			
		||||
        pvDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        pszTailleDataOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    // Fonctions de gestion de configuration (GALSS)
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_LireConfig(
 | 
			
		||||
        pZDataOut: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        psTailleDataOut: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_LireDateLecteur(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcDateHeure: *mut ::std::os::raw::c_char,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_MajDateLecteur(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        pcDateHeure: *const ::std::os::raw::c_char,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    pub fn SSV_ChargerAppli(
 | 
			
		||||
        pcNomRessourceLecteur: *const ::std::os::raw::c_char,
 | 
			
		||||
        sNbZDataIn: ::std::os::raw::c_short,
 | 
			
		||||
        pvTZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        psTTailleDataIn: *mut usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    // Fonctions techniques
 | 
			
		||||
 | 
			
		||||
    // La fonction Initialiser Librairie a pour objet de charger et d’initialiser dans la mémoire du système :
 | 
			
		||||
    // - dans le cas où le GALSS est installé sur le poste :
 | 
			
		||||
    //      - la bibliothèque du Gestionnaire d’Accès au Lecteur Santé Social (GALSS),
 | 
			
		||||
    //      - qui charge la bibliothèque du Protocole Santé Social (PSS),
 | 
			
		||||
    //      - la configuration du poste de travail à l’aide du fichier galssinf,
 | 
			
		||||
    //  - les variables globales communes aux différents Services SESAM-Vitale,
 | 
			
		||||
    //  - les fichiers de tables et scripts des répertoires par défaut.
 | 
			
		||||
    // Cette fonction accède au référentiel électronique en utilisant le chemin complet indiqué dans le fichier sesam.ini.
 | 
			
		||||
    pub fn SSV_InitLIB2(pcFichierSesam: *const ::std::os::raw::c_char) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    // La fonction Terminer a pour objet de décharger de la mémoire du système les éléments
 | 
			
		||||
    // chargés par la fonction Initialiser Librairie, qui ne sont plus utiles.
 | 
			
		||||
    pub fn SSV_TermLIB() -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    /// Fonctions de Tracage
 | 
			
		||||
    //La fonction Allouer Zone Mémoire a un rôle purement technique : elle permet d’allouer, autrement dit de réserver une zone ou partie de la mémoire du poste de travail pour y écrire les données à passer en entrée d’un Service SESAM-Vitale.
 | 
			
		||||
    // Cette fonction doit être utilisée pour allouer toutes les zones de mémoire requises en entrée des Services SESAM-Vitale de manière à permettre un diagnostic fiable par le « mode trace » en cas de dysfonctionnement. En effet, son mode d’exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
 | 
			
		||||
    pub fn SSV_AllouerZoneMem(
 | 
			
		||||
        pZDataIn: *mut *mut ::std::os::raw::c_void,
 | 
			
		||||
        taille: usize,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
    // La fonction Libérer Zone Mémoire a un rôle purement technique : elle permet de libérer une zone de mémoire du poste de travail précédemment allouée après exploitation des données qu’elle contient.
 | 
			
		||||
    // Cette fonction doit être utilisée pour libérer toutes les zones de mémoire :
 | 
			
		||||
    // - celles qui ont été allouées par le progiciel de santé pour fournir les données nécessaires à l’entrée des Services SESAM-Vitale, avant leur appel, celles qui ont été allouées par les Services SESAM-Vitale pour fournir en sortie les données utiles au progiciel de santé qui a fait appel à ces services,
 | 
			
		||||
    // - de façon à permettre un diagnostic fiable par le mode trace en cas de dysfonctionnement
 | 
			
		||||
    //En effet, son exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
 | 
			
		||||
    pub fn SSV_LibererZoneMem(pZone: *mut ::std::os::raw::c_void);
 | 
			
		||||
 | 
			
		||||
    // La fonction Initialiser Trace a pour objet de permettre l’activation du « mode trace ».
 | 
			
		||||
    // Ce mode de fonctionnement est prévu pour permettre à l’assistance technique du GIE
 | 
			
		||||
    // SESAM-Vitale d’analyser les problèmes de mise en œuvre des Services SESAM-Vitale,
 | 
			
		||||
    // notamment lorsque une fonction retourne un code d’erreur de valeur hexadécimale supérieure à FF00.
 | 
			
		||||
    pub fn SSV_InitTrace(
 | 
			
		||||
        pathConf: *mut ::std::os::raw::c_char,
 | 
			
		||||
        ModeOuvertureFicherLog: *mut ::std::os::raw::c_char,
 | 
			
		||||
        ModuleLog: ::std::os::raw::c_ushort,
 | 
			
		||||
        NiveauLog: ::std::os::raw::c_uchar,
 | 
			
		||||
    ) -> ::std::os::raw::c_ushort;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								crates/services-sesam-vitale-sys/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								crates/services-sesam-vitale-sys/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
pub mod api;
 | 
			
		||||
mod bindings;
 | 
			
		||||
pub mod types;
 | 
			
		||||
 | 
			
		||||
#[cfg(test)]
 | 
			
		||||
mod tests {}
 | 
			
		||||
							
								
								
									
										144
									
								
								crates/services-sesam-vitale-sys/src/types/common.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										144
									
								
								crates/services-sesam-vitale-sys/src/types/common.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,144 @@
 | 
			
		||||
use crate::types::configuration::{
 | 
			
		||||
    ConfigurationHeader, PCSCReader, ReaderConfiguration, SESAMVitaleComponent,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
use std::{error::Error, str::FromStr};
 | 
			
		||||
 | 
			
		||||
use bitvec::index::BitIdx;
 | 
			
		||||
use deku::{
 | 
			
		||||
    bitvec::{BitStore, Msb0},
 | 
			
		||||
    ctx::ByteSize,
 | 
			
		||||
    deku_derive,
 | 
			
		||||
    reader::{Reader, ReaderRet},
 | 
			
		||||
    DekuContainerRead, DekuError, DekuReader,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, Clone, PartialEq)]
 | 
			
		||||
pub(crate) struct NumericString(#[deku(map = "convert_from_data_field")] String);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, Clone, PartialEq)]
 | 
			
		||||
pub(crate) struct AlphaNumericString(#[deku(map = "convert_from_data_field")] String);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, Clone, PartialEq)]
 | 
			
		||||
pub(crate) struct BinaryData(#[deku(map = "extract_from_data_field")] Vec<u8>);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, Clone, Copy, PartialEq)]
 | 
			
		||||
#[deku(endian = "big")]
 | 
			
		||||
pub(crate) struct GroupId(u16);
 | 
			
		||||
 | 
			
		||||
trait MapToDekuParseError<T> {
 | 
			
		||||
    fn map_to_deku_parse_error(self) -> Result<T, DekuError>;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl<T, E: Error> MapToDekuParseError<T> for Result<T, E> {
 | 
			
		||||
    fn map_to_deku_parse_error(self) -> Result<T, DekuError> {
 | 
			
		||||
        self.map_err(|e| DekuError::Parse(e.to_string().into()))
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn read_size<R: std::io::Read>(reader: &mut Reader<R>) -> Result<ByteSize, DekuError> {
 | 
			
		||||
    let first_byte: u8 = u8::from_reader_with_ctx(reader, ())?;
 | 
			
		||||
 | 
			
		||||
    let is_length_expanded = first_byte.get_bit::<Msb0>(BitIdx::new(0).map_to_deku_parse_error()?);
 | 
			
		||||
 | 
			
		||||
    match is_length_expanded {
 | 
			
		||||
        true => {
 | 
			
		||||
            let size_of_data_size: ByteSize = ByteSize((first_byte & 0b0111_1111) as usize);
 | 
			
		||||
 | 
			
		||||
            if size_of_data_size.0 > 4 {
 | 
			
		||||
                return Err(DekuError::Parse("Size of the length encoding is > 4, this is not normal. Probable parsing error".to_string().into()));
 | 
			
		||||
            };
 | 
			
		||||
 | 
			
		||||
            // maximum size of the buffer is 4, we use the offset to read values less than 4 bytes
 | 
			
		||||
            let buffer: &mut [u8; 4] = &mut [0; 4];
 | 
			
		||||
            let write_offset = 4 - size_of_data_size.0;
 | 
			
		||||
 | 
			
		||||
            match reader.read_bytes(size_of_data_size.0, &mut buffer[write_offset..])? {
 | 
			
		||||
                ReaderRet::Bits(_bit_vec) => Err(DekuError::Parse("Got bits when trying to read bytes -> reader is unaligned, this is not normal.".to_string().into())),
 | 
			
		||||
                ReaderRet::Bytes => Ok(ByteSize(u32::from_be_bytes(*buffer) as usize)),
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        false => Ok(ByteSize(first_byte as usize)),
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Using this as the map function asks deku to parse a datafield
 | 
			
		||||
// We then use the datafield and convert it to the corresponding value
 | 
			
		||||
pub(super) fn convert_from_data_field<T>(data_field: DataField) -> Result<T, DekuError>
 | 
			
		||||
where
 | 
			
		||||
    T: FromStr,
 | 
			
		||||
    T::Err: Error,
 | 
			
		||||
{
 | 
			
		||||
    let text = String::from_utf8(data_field.data).map_to_deku_parse_error()?;
 | 
			
		||||
    T::from_str(&text).map_to_deku_parse_error()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub(crate) fn extract_from_data_field(data_field: DataField) -> Result<Vec<u8>, DekuError> {
 | 
			
		||||
    Ok(data_field.data)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub(crate) struct DataField {
 | 
			
		||||
    #[deku(reader = "read_size(deku::reader)")]
 | 
			
		||||
    pub(crate) data_size: ByteSize,
 | 
			
		||||
 | 
			
		||||
    #[deku(bytes_read = "data_size.0")]
 | 
			
		||||
    pub(crate) data: Vec<u8>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub(crate) struct BlockHeader {
 | 
			
		||||
    pub(crate) group_id: GroupId,
 | 
			
		||||
 | 
			
		||||
    #[deku(reader = "read_size(deku::reader)")]
 | 
			
		||||
    pub(crate) data_size: ByteSize,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub(crate) struct DataBlock {
 | 
			
		||||
    pub(crate) header: BlockHeader,
 | 
			
		||||
 | 
			
		||||
    #[deku(ctx = "header.group_id")]
 | 
			
		||||
    pub(crate) inner: DataGroup,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
#[deku(ctx = "group_id: GroupId", id = "group_id.0")]
 | 
			
		||||
pub enum DataGroup {
 | 
			
		||||
    #[deku(id = 60)]
 | 
			
		||||
    ConfigurationHeader(ConfigurationHeader),
 | 
			
		||||
    #[deku(id = 61)]
 | 
			
		||||
    ReaderConfiguration(ReaderConfiguration),
 | 
			
		||||
    #[deku(id = 64)]
 | 
			
		||||
    SESAMVitaleComponent(SESAMVitaleComponent),
 | 
			
		||||
    #[deku(id = 67)]
 | 
			
		||||
    PCSCReader(PCSCReader),
 | 
			
		||||
}
 | 
			
		||||
pub(crate) fn read_from_buffer<T>(buffer: &[u8]) -> Result<T, T::Error>
 | 
			
		||||
where
 | 
			
		||||
    T: TryFrom<Vec<DataBlock>>,
 | 
			
		||||
{
 | 
			
		||||
    let mut data_blocks: Vec<DataBlock> = Vec::new();
 | 
			
		||||
    let mut offset = 0;
 | 
			
		||||
 | 
			
		||||
    let mut remaining_buffer = buffer;
 | 
			
		||||
 | 
			
		||||
    while !remaining_buffer.is_empty() {
 | 
			
		||||
        // TODO: properly handle errors
 | 
			
		||||
        let (rest, data_block) = DataBlock::from_bytes((remaining_buffer, offset)).unwrap();
 | 
			
		||||
 | 
			
		||||
        data_blocks.push(data_block);
 | 
			
		||||
 | 
			
		||||
        (remaining_buffer, offset) = rest;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    T::try_from(data_blocks)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										137
									
								
								crates/services-sesam-vitale-sys/src/types/configuration.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										137
									
								
								crates/services-sesam-vitale-sys/src/types/configuration.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,137 @@
 | 
			
		||||
use crate::types::common::DataBlock;
 | 
			
		||||
use std::{error::Error, fmt, vec::Vec};
 | 
			
		||||
 | 
			
		||||
use crate::types::common::convert_from_data_field;
 | 
			
		||||
use deku::{deku_derive, DekuReader};
 | 
			
		||||
 | 
			
		||||
use super::common::{AlphaNumericString, DataGroup};
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct SSVVersionNumber(#[deku(map = "convert_from_data_field")] u16);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct GALSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct PSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct ConfigurationHeader {
 | 
			
		||||
    pub ssv_version: SSVVersionNumber,
 | 
			
		||||
    pub galss_version: GALSSVersionNumber,
 | 
			
		||||
    pub pss_version: PSSVersionNumber,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct PCSCReaderName(AlphaNumericString);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct CardType(#[deku(map = "convert_from_data_field")] u8);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct PCSCReader {
 | 
			
		||||
    pub name: PCSCReaderName,
 | 
			
		||||
    pub card_type: CardType,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct SESAMVitaleComponentID(#[deku(map = "convert_from_data_field")] u16);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct SESAMVitaleComponentDescription(AlphaNumericString);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct SESAMVitaleComponentVersion(AlphaNumericString);
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct SESAMVitaleComponent {
 | 
			
		||||
    pub id: SESAMVitaleComponentID,
 | 
			
		||||
    pub description: SESAMVitaleComponentDescription,
 | 
			
		||||
    pub version: SESAMVitaleComponentVersion,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[deku_derive(DekuRead)]
 | 
			
		||||
#[derive(Debug, PartialEq)]
 | 
			
		||||
pub struct ReaderConfiguration {}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug)]
 | 
			
		||||
pub enum ConfigurationError {
 | 
			
		||||
    MultipleConfigurationHeaders,
 | 
			
		||||
    MissingConfigurationHeader,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl fmt::Display for ConfigurationError {
 | 
			
		||||
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 | 
			
		||||
        match self {
 | 
			
		||||
            ConfigurationError::MultipleConfigurationHeaders => {
 | 
			
		||||
                write!(f, "Multiple ConfigurationHeader blocks found")
 | 
			
		||||
            }
 | 
			
		||||
            ConfigurationError::MissingConfigurationHeader => {
 | 
			
		||||
                write!(f, "Missing ConfigurationHeader block")
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Error for ConfigurationError {}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug)]
 | 
			
		||||
pub struct Configuration {
 | 
			
		||||
    pub configuration_header: ConfigurationHeader,
 | 
			
		||||
    pub reader_configurations: Vec<ReaderConfiguration>,
 | 
			
		||||
    pub sesam_vitale_components: Vec<SESAMVitaleComponent>,
 | 
			
		||||
    pub pcsc_readers: Vec<PCSCReader>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl TryFrom<Vec<DataBlock>> for Configuration {
 | 
			
		||||
    type Error = ConfigurationError;
 | 
			
		||||
 | 
			
		||||
    fn try_from(data_blocks: Vec<DataBlock>) -> Result<Self, Self::Error> {
 | 
			
		||||
        let mut configuration_header: Option<ConfigurationHeader> = None;
 | 
			
		||||
        let mut reader_configurations: Vec<ReaderConfiguration> = Vec::new();
 | 
			
		||||
        let mut sesam_vitale_components: Vec<SESAMVitaleComponent> = Vec::new();
 | 
			
		||||
        let mut pcsc_readers: Vec<PCSCReader> = Vec::new();
 | 
			
		||||
 | 
			
		||||
        for block in data_blocks {
 | 
			
		||||
            match block.inner {
 | 
			
		||||
                DataGroup::ConfigurationHeader(header) => {
 | 
			
		||||
                    if configuration_header.is_some() {
 | 
			
		||||
                        return Err(ConfigurationError::MultipleConfigurationHeaders);
 | 
			
		||||
                    }
 | 
			
		||||
                    configuration_header = Some(header);
 | 
			
		||||
                }
 | 
			
		||||
                DataGroup::ReaderConfiguration(configuration) => {
 | 
			
		||||
                    reader_configurations.push(configuration)
 | 
			
		||||
                }
 | 
			
		||||
                DataGroup::SESAMVitaleComponent(component) => {
 | 
			
		||||
                    sesam_vitale_components.push(component);
 | 
			
		||||
                }
 | 
			
		||||
                DataGroup::PCSCReader(reader) => {
 | 
			
		||||
                    pcsc_readers.push(reader);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        let configuration_header = match configuration_header {
 | 
			
		||||
            Some(header) => header,
 | 
			
		||||
            None => return Err(ConfigurationError::MissingConfigurationHeader),
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        Ok(Self {
 | 
			
		||||
            configuration_header,
 | 
			
		||||
            reader_configurations,
 | 
			
		||||
            sesam_vitale_components,
 | 
			
		||||
            pcsc_readers,
 | 
			
		||||
        })
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										3
									
								
								crates/services-sesam-vitale-sys/src/types/mod.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								crates/services-sesam-vitale-sys/src/types/mod.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
pub mod common;
 | 
			
		||||
pub mod configuration;
 | 
			
		||||
// pub mod droits_vitale;
 | 
			
		||||
@@ -4,8 +4,10 @@ version = "0.1.0"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
dotenv = "0.15"
 | 
			
		||||
anyhow = "1.0"
 | 
			
		||||
libc = "0.2"
 | 
			
		||||
thiserror = "1.0"
 | 
			
		||||
utils = { path = "../utils" }
 | 
			
		||||
 | 
			
		||||
[build-dependencies]
 | 
			
		||||
dotenv = "0.15"
 | 
			
		||||
 
 | 
			
		||||
@@ -1,13 +1,13 @@
 | 
			
		||||
extern crate dotenv;
 | 
			
		||||
 | 
			
		||||
use std::env;
 | 
			
		||||
use std::path::PathBuf;
 | 
			
		||||
 | 
			
		||||
use dotenv::from_path;
 | 
			
		||||
 | 
			
		||||
fn main() {
 | 
			
		||||
    // Load the .env.build file for build-time environment variables
 | 
			
		||||
    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 | 
			
		||||
    let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set");
 | 
			
		||||
    let manifest_path = PathBuf::from(manifest_dir);
 | 
			
		||||
    dotenv::from_path(manifest_path.join(".env.build")).ok();
 | 
			
		||||
    from_path(manifest_path.join(".env.build")).ok();
 | 
			
		||||
 | 
			
		||||
    println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
 | 
			
		||||
    println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
 | 
			
		||||
@@ -22,12 +22,13 @@ fn main() {
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    // Add the SESAM_FSV_LIB_PATH to the linker search path
 | 
			
		||||
    let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
 | 
			
		||||
    let fsv_lib_path =
 | 
			
		||||
        PathBuf::from(env::var("SESAM_FSV_LIB_PATH").expect("SESAM_FSV_LIB_PATH must be set"));
 | 
			
		||||
    println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
 | 
			
		||||
 | 
			
		||||
    // Add the SESAM_FSV_LIB_PATH to the PATH environment variable
 | 
			
		||||
    if cfg!(target_os = "windows") {
 | 
			
		||||
        let path = env::var("PATH").unwrap_or(String::new());
 | 
			
		||||
        let path = env::var("PATH").unwrap_or_default();
 | 
			
		||||
        println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
 | 
			
		||||
    } else if cfg!(target_os = "linux") {
 | 
			
		||||
        println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
 | 
			
		||||
@@ -36,7 +37,7 @@ fn main() {
 | 
			
		||||
    // Link the SESAM_FSV_SSVLIB dynamic library
 | 
			
		||||
    println!(
 | 
			
		||||
        "cargo::rustc-link-lib=dylib={}",
 | 
			
		||||
        env::var("SESAM_FSV_SSVLIB").unwrap()
 | 
			
		||||
        env::var("SESAM_FSV_SSVLIB").expect("SESAM_FSV_SSVLIB must be set")
 | 
			
		||||
    );
 | 
			
		||||
    // TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,24 @@
 | 
			
		||||
use libc::{c_void, size_t};
 | 
			
		||||
use std::ffi::CString;
 | 
			
		||||
use std::ptr;
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
use crate::libssv::SSV_LireCartePS;
 | 
			
		||||
use crate::ssv_memory::{decode_ssv_memory, Block};
 | 
			
		||||
use crate::libssv::{self, SSV_LireCartePS};
 | 
			
		||||
use crate::ssv_memory::{decode_ssv_memory, Block, SSVMemoryError};
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
pub enum CartePSError {
 | 
			
		||||
    #[error("Unknown (group, field) pair: ({group}, {field})")]
 | 
			
		||||
    UnknownGroupFieldPair { group: u16, field: u16 },
 | 
			
		||||
    #[error("CString creation error: {0}")]
 | 
			
		||||
    CString(#[from] std::ffi::NulError),
 | 
			
		||||
    #[error("Unable to get the last situation while parsing a CartePS")]
 | 
			
		||||
    InvalidLastSituation,
 | 
			
		||||
    #[error(transparent)]
 | 
			
		||||
    SSVMemory(#[from] SSVMemoryError),
 | 
			
		||||
    #[error(transparent)]
 | 
			
		||||
    SSVLibErrorCode(#[from] libssv::LibSSVError),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Default)]
 | 
			
		||||
pub struct CartePS {
 | 
			
		||||
@@ -52,10 +67,10 @@ struct SituationPS {
 | 
			
		||||
    habilitation_à_signer_un_lot: String,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
 | 
			
		||||
    let resource_ps = CString::new(lecteur).expect("CString::new failed");
 | 
			
		||||
    let resource_reader = CString::new("").expect("CString::new failed");
 | 
			
		||||
    let card_number = CString::new(code_pin).expect("CString::new failed");
 | 
			
		||||
pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError> {
 | 
			
		||||
    let resource_ps = CString::new(lecteur)?;
 | 
			
		||||
    let resource_reader = CString::new("")?;
 | 
			
		||||
    let card_number = CString::new(code_pin)?;
 | 
			
		||||
 | 
			
		||||
    let mut buffer: *mut c_void = ptr::null_mut();
 | 
			
		||||
    let mut size: size_t = 0;
 | 
			
		||||
@@ -69,17 +84,32 @@ pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
 | 
			
		||||
            &mut size,
 | 
			
		||||
        );
 | 
			
		||||
        println!("SSV_LireCartePS result: {}", result);
 | 
			
		||||
        if result != 0 {
 | 
			
		||||
            return Err(libssv::LibSSVError::StandardErrorCode {
 | 
			
		||||
                code: result,
 | 
			
		||||
                function: "SSV_LireCartePS",
 | 
			
		||||
            }
 | 
			
		||||
            .into());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if !buffer.is_null() {
 | 
			
		||||
            hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
 | 
			
		||||
            libc::free(buffer);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    let groups = decode_ssv_memory(hex_values, hex_values.len());
 | 
			
		||||
    let groups =
 | 
			
		||||
        decode_ssv_memory(hex_values, hex_values.len()).map_err(CartePSError::SSVMemory)?;
 | 
			
		||||
    decode_carte_ps(groups)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
 | 
			
		||||
fn get_last_mut_situation(carte_ps: &mut CartePS) -> Result<&mut SituationPS, CartePSError> {
 | 
			
		||||
    carte_ps
 | 
			
		||||
        .situations
 | 
			
		||||
        .last_mut()
 | 
			
		||||
        .ok_or(CartePSError::InvalidLastSituation)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
 | 
			
		||||
    let mut carte_ps = CartePS::default();
 | 
			
		||||
    for group in groups {
 | 
			
		||||
        for field in group.content {
 | 
			
		||||
@@ -118,137 +148,99 @@ fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 1) => {
 | 
			
		||||
                    carte_ps.situations.push(SituationPS::default());
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 2) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().mode_d_exercice =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.mode_d_exercice =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 3) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().statut_d_exercice =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.statut_d_exercice =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 4) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().secteur_d_activite =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.secteur_d_activite =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 5) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                        .type_d_identification_structure =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.type_d_identification_structure =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 6) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                        .numero_d_identification_structure =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.numero_d_identification_structure =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 7) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .cle_du_numero_d_identification_structure =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 8) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                        .raison_sociale_structure =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.raison_sociale_structure =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 9) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .numero_d_identification_de_facturation_du_ps =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 10) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .cle_du_numero_d_identification_de_facturation_du_ps =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 11) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .numero_d_identification_du_ps_remplaçant =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 12) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?
 | 
			
		||||
                        .cle_du_numero_d_identification_du_ps_remplaçant =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 13) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_conventionnel =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_conventionnel =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 14) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_specialite =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_specialite =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 15) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_zone_tarifaire =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 16) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_zone_ik =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_zone_ik =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 17) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_agrement_1 =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_agrement_1 =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 18) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_agrement_2 =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_agrement_2 =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 19) => {
 | 
			
		||||
                    carte_ps.situations.last_mut().unwrap().code_agrement_3 =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.code_agrement_3 =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 20) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                        .habilitation_à_signer_une_facture =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_une_facture =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                (2..=16, 21) => {
 | 
			
		||||
                    carte_ps
 | 
			
		||||
                        .situations
 | 
			
		||||
                        .last_mut()
 | 
			
		||||
                        .unwrap()
 | 
			
		||||
                        .habilitation_à_signer_un_lot =
 | 
			
		||||
                    get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_un_lot =
 | 
			
		||||
                        String::from_utf8_lossy(field.content).to_string();
 | 
			
		||||
                }
 | 
			
		||||
                _ => {
 | 
			
		||||
                    return Err(format!(
 | 
			
		||||
                        "Unknown (group, field) pair: ({}, {})",
 | 
			
		||||
                        group.id, field.id
 | 
			
		||||
                    ))
 | 
			
		||||
                    return Err(CartePSError::UnknownGroupFieldPair {
 | 
			
		||||
                        group: group.id,
 | 
			
		||||
                        field: field.id,
 | 
			
		||||
                    });
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
@@ -279,7 +271,7 @@ mod test_decode_carte_ps {
 | 
			
		||||
            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
 | 
			
		||||
            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
 | 
			
		||||
        ];
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len());
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
 | 
			
		||||
        let carte_ps = decode_carte_ps(blocks).unwrap();
 | 
			
		||||
 | 
			
		||||
        assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
 | 
			
		||||
@@ -370,7 +362,7 @@ mod test_decode_carte_ps {
 | 
			
		||||
            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
 | 
			
		||||
            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
 | 
			
		||||
        ];
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len());
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
 | 
			
		||||
        let carte_ps = decode_carte_ps(blocks).unwrap();
 | 
			
		||||
 | 
			
		||||
        assert_eq!(carte_ps.situations.len(), 3);
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,13 @@
 | 
			
		||||
/// Low level bindings to the SSVLIB dynamic library.
 | 
			
		||||
// TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
 | 
			
		||||
use libc::{c_char, c_ushort, c_void, size_t};
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Error)]
 | 
			
		||||
pub enum LibSSVError {
 | 
			
		||||
    #[error("SSV library error in {function}: {code}")]
 | 
			
		||||
    StandardErrorCode { code: u16, function: &'static str },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
 | 
			
		||||
#[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,8 @@ mod libssv;
 | 
			
		||||
mod ssv_memory;
 | 
			
		||||
mod ssvlib_demo;
 | 
			
		||||
 | 
			
		||||
fn main() {
 | 
			
		||||
    ssvlib_demo::demo();
 | 
			
		||||
use anyhow::{Context, Result};
 | 
			
		||||
 | 
			
		||||
fn main() -> Result<()> {
 | 
			
		||||
    ssvlib_demo::demo().context("Error while running the SSV library demo")
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,33 @@
 | 
			
		||||
/// # SSV Memory
 | 
			
		||||
/// Provide functions to manipulate raw memory from SSV library.
 | 
			
		||||
use std::convert::TryFrom;
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Error)]
 | 
			
		||||
pub enum BytesReadingError {
 | 
			
		||||
    #[error("Empty bytes input")]
 | 
			
		||||
    EmptyBytes,
 | 
			
		||||
    #[error("Invalid memory: not enough bytes ({actual}) to read the expected size ({expected})")]
 | 
			
		||||
    InvalidSize { expected: usize, actual: usize },
 | 
			
		||||
    #[error("Invalid memory: size ({actual}) is expected to be less than {expected} bytes")]
 | 
			
		||||
    SizeTooBig { expected: usize, actual: usize },
 | 
			
		||||
    #[error("Invalid memory: not enough bytes to read the block id")]
 | 
			
		||||
    InvalidBlockId(#[from] std::array::TryFromSliceError),
 | 
			
		||||
    #[error("Error while reading field at offset {offset}")]
 | 
			
		||||
    InvalidField {
 | 
			
		||||
        source: Box<BytesReadingError>,
 | 
			
		||||
        offset: usize,
 | 
			
		||||
    },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Error)]
 | 
			
		||||
pub enum SSVMemoryError {
 | 
			
		||||
    #[error("Error while parsing block at offset {offset}")]
 | 
			
		||||
    BlockParsing {
 | 
			
		||||
        source: BytesReadingError,
 | 
			
		||||
        offset: usize,
 | 
			
		||||
    },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(PartialEq, Debug)]
 | 
			
		||||
struct ElementSize {
 | 
			
		||||
@@ -9,13 +36,12 @@ struct ElementSize {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
 | 
			
		||||
 | 
			
		||||
impl TryFrom<&[u8]> for ElementSize {
 | 
			
		||||
    type Error = &'static str;
 | 
			
		||||
    type Error = BytesReadingError;
 | 
			
		||||
 | 
			
		||||
    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
 | 
			
		||||
        if bytes.is_empty() {
 | 
			
		||||
            return Err("Empty bytes input");
 | 
			
		||||
            return Err(BytesReadingError::EmptyBytes);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        let mut element_size = ElementSize { size: 0, pad: 1 };
 | 
			
		||||
@@ -30,9 +56,15 @@ impl TryFrom<&[u8]> for ElementSize {
 | 
			
		||||
            // N are the 7 lower bits of the first byte
 | 
			
		||||
            let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
 | 
			
		||||
            if size_bytes_len > bytes.len() - 1 {
 | 
			
		||||
                return Err("Invalid memory: not enough bytes to read the size");
 | 
			
		||||
                return Err(BytesReadingError::InvalidSize {
 | 
			
		||||
                    expected: size_bytes_len,
 | 
			
		||||
                    actual: bytes.len() - 1,
 | 
			
		||||
                });
 | 
			
		||||
            } else if size_bytes_len > 4 {
 | 
			
		||||
                return Err("Invalid memory: size is too big");
 | 
			
		||||
                return Err(BytesReadingError::SizeTooBig {
 | 
			
		||||
                    expected: 4,
 | 
			
		||||
                    actual: size_bytes_len,
 | 
			
		||||
                });
 | 
			
		||||
            }
 | 
			
		||||
            let size_bytes = &bytes[1..1 + size_bytes_len];
 | 
			
		||||
 | 
			
		||||
@@ -54,15 +86,21 @@ pub struct Block<'a> {
 | 
			
		||||
    pub content: Vec<Field<'a>>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl<'a> From<&'a [u8]> for Block<'a> {
 | 
			
		||||
    fn from(bytes: &'a [u8]) -> Self {
 | 
			
		||||
impl<'a> TryFrom<&'a [u8]> for Block<'a> {
 | 
			
		||||
    type Error = BytesReadingError;
 | 
			
		||||
 | 
			
		||||
    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
 | 
			
		||||
        let mut offset = 0;
 | 
			
		||||
        let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
 | 
			
		||||
        let id = u16::from_be_bytes(
 | 
			
		||||
            bytes[..2]
 | 
			
		||||
                .try_into()
 | 
			
		||||
                .map_err(BytesReadingError::InvalidBlockId)?,
 | 
			
		||||
        );
 | 
			
		||||
        offset += 2;
 | 
			
		||||
        let ElementSize {
 | 
			
		||||
            size: block_size,
 | 
			
		||||
            pad,
 | 
			
		||||
        } = bytes[2..].try_into().unwrap();
 | 
			
		||||
        } = bytes[2..].try_into()?;
 | 
			
		||||
        offset += pad;
 | 
			
		||||
        let raw_content = &bytes[offset..];
 | 
			
		||||
        let mut field_offset = 0;
 | 
			
		||||
@@ -70,17 +108,22 @@ impl<'a> From<&'a [u8]> for Block<'a> {
 | 
			
		||||
        let mut content = Vec::new();
 | 
			
		||||
        let mut field_id = 1;
 | 
			
		||||
        while field_offset < block_size {
 | 
			
		||||
            let mut field: Field<'a> = raw_content[field_offset..].into();
 | 
			
		||||
            let mut field: Field<'a> = raw_content[field_offset..].try_into().map_err(|err| {
 | 
			
		||||
                BytesReadingError::InvalidField {
 | 
			
		||||
                    source: Box::new(err),
 | 
			
		||||
                    offset: field_offset,
 | 
			
		||||
                }
 | 
			
		||||
            })?;
 | 
			
		||||
            field.id = field_id;
 | 
			
		||||
            field_offset += field.size;
 | 
			
		||||
            field_id += 1;
 | 
			
		||||
            content.push(field);
 | 
			
		||||
        }
 | 
			
		||||
        Block {
 | 
			
		||||
        Ok(Block {
 | 
			
		||||
            id,
 | 
			
		||||
            size: offset + block_size,
 | 
			
		||||
            content,
 | 
			
		||||
        }
 | 
			
		||||
        })
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -91,31 +134,41 @@ pub struct Field<'a> {
 | 
			
		||||
    pub content: &'a [u8],
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl<'a> From<&'a [u8]> for Field<'a> {
 | 
			
		||||
    fn from(bytes: &'a [u8]) -> Self {
 | 
			
		||||
        let ElementSize { size, pad } = bytes.try_into().unwrap();
 | 
			
		||||
impl<'a> TryFrom<&'a [u8]> for Field<'a> {
 | 
			
		||||
    type Error = BytesReadingError;
 | 
			
		||||
 | 
			
		||||
    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
 | 
			
		||||
        let ElementSize { size, pad } = bytes.try_into()?;
 | 
			
		||||
        let contenu = &bytes[pad..pad + size];
 | 
			
		||||
        Field {
 | 
			
		||||
        Ok(Field {
 | 
			
		||||
            id: 0,
 | 
			
		||||
            size: pad + size,
 | 
			
		||||
            content: contenu,
 | 
			
		||||
        }
 | 
			
		||||
        })
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
 | 
			
		||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Result<Vec<Block>, SSVMemoryError> {
 | 
			
		||||
    let mut blocks: Vec<Block> = Vec::new();
 | 
			
		||||
    let mut offset = 0;
 | 
			
		||||
    while offset < size {
 | 
			
		||||
        let block: Block = bytes[offset..].into();
 | 
			
		||||
        let block: Block =
 | 
			
		||||
            bytes[offset..]
 | 
			
		||||
                .try_into()
 | 
			
		||||
                .map_err(|err| SSVMemoryError::BlockParsing {
 | 
			
		||||
                    source: err,
 | 
			
		||||
                    offset,
 | 
			
		||||
                })?;
 | 
			
		||||
        offset += block.size;
 | 
			
		||||
        blocks.push(block);
 | 
			
		||||
    }
 | 
			
		||||
    blocks
 | 
			
		||||
    Ok(blocks)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[cfg(test)]
 | 
			
		||||
mod test_element_size {
 | 
			
		||||
    use std::any::Any;
 | 
			
		||||
 | 
			
		||||
    use super::*;
 | 
			
		||||
 | 
			
		||||
    #[test]
 | 
			
		||||
@@ -142,29 +195,51 @@ mod test_element_size {
 | 
			
		||||
    #[test]
 | 
			
		||||
    fn null_size() {
 | 
			
		||||
        let bytes: &[u8] = &[];
 | 
			
		||||
        let result: Result<ElementSize, &str> = bytes.try_into();
 | 
			
		||||
        assert_eq!(result, Err("Empty bytes input"),);
 | 
			
		||||
        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
 | 
			
		||||
        assert!(result.is_err());
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            result.unwrap_err().type_id(),
 | 
			
		||||
            BytesReadingError::EmptyBytes.type_id()
 | 
			
		||||
        );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    #[test]
 | 
			
		||||
    fn invalid_memory() {
 | 
			
		||||
        let bytes: &[u8] = &[0b_1000_0001_u8];
 | 
			
		||||
        let result: Result<ElementSize, &str> = bytes.try_into();
 | 
			
		||||
        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
 | 
			
		||||
        assert!(result.is_err());
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            result,
 | 
			
		||||
            Err("Invalid memory: not enough bytes to read the size"),
 | 
			
		||||
            result.unwrap_err().to_string(),
 | 
			
		||||
            BytesReadingError::InvalidSize {
 | 
			
		||||
                expected: 1,
 | 
			
		||||
                actual: 0
 | 
			
		||||
            }
 | 
			
		||||
            .to_string()
 | 
			
		||||
        );
 | 
			
		||||
 | 
			
		||||
        let bytes: &[u8] = &[0b_1000_0010_u8, 1];
 | 
			
		||||
        let result: Result<ElementSize, &str> = bytes.try_into();
 | 
			
		||||
        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
 | 
			
		||||
        assert!(result.is_err());
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            result,
 | 
			
		||||
            Err("Invalid memory: not enough bytes to read the size"),
 | 
			
		||||
            result.unwrap_err().to_string(),
 | 
			
		||||
            BytesReadingError::InvalidSize {
 | 
			
		||||
                expected: 2,
 | 
			
		||||
                actual: 1
 | 
			
		||||
            }
 | 
			
		||||
            .to_string()
 | 
			
		||||
        );
 | 
			
		||||
 | 
			
		||||
        let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
 | 
			
		||||
        let result: Result<ElementSize, &str> = bytes.try_into();
 | 
			
		||||
        assert_eq!(result, Err("Invalid memory: size is too big"),);
 | 
			
		||||
        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
 | 
			
		||||
        assert!(result.is_err());
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            result.unwrap_err().to_string(),
 | 
			
		||||
            BytesReadingError::SizeTooBig {
 | 
			
		||||
                expected: 4,
 | 
			
		||||
                actual: 5
 | 
			
		||||
            }
 | 
			
		||||
            .to_string()
 | 
			
		||||
        );
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -179,7 +254,7 @@ mod test_field {
 | 
			
		||||
            80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
 | 
			
		||||
            67, 79, 73, 83, 69, 1, 84,
 | 
			
		||||
        ];
 | 
			
		||||
        let element: Field = bytes.into();
 | 
			
		||||
        let element: Field = bytes.try_into().unwrap();
 | 
			
		||||
        assert_eq!(element.size, 52);
 | 
			
		||||
        assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
 | 
			
		||||
    }
 | 
			
		||||
@@ -194,7 +269,7 @@ mod test_field {
 | 
			
		||||
        // Add 256 bytes to the content
 | 
			
		||||
        bytes_vec.append(&mut vec![1; 256]);
 | 
			
		||||
        let bytes: &[u8] = &bytes_vec;
 | 
			
		||||
        let element: Field = bytes.into();
 | 
			
		||||
        let element: Field = bytes.try_into().unwrap();
 | 
			
		||||
        assert_eq!(element.size, 259);
 | 
			
		||||
        assert_eq!(element.content.len(), 256);
 | 
			
		||||
    }
 | 
			
		||||
@@ -208,15 +283,15 @@ mod test_block {
 | 
			
		||||
    fn test_francoise_pharmacien0052419_partial_block_1() {
 | 
			
		||||
        let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
 | 
			
		||||
 | 
			
		||||
        let field1: Field = bytes.into();
 | 
			
		||||
        let field1: Field = bytes.try_into().unwrap();
 | 
			
		||||
        assert_eq!(field1.size, 2);
 | 
			
		||||
        assert_eq!(field1.content, &[48]);
 | 
			
		||||
 | 
			
		||||
        let field2: Field = bytes[field1.size..].into();
 | 
			
		||||
        let field2: Field = bytes[field1.size..].try_into().unwrap();
 | 
			
		||||
        assert_eq!(field2.size, 2);
 | 
			
		||||
        assert_eq!(field2.content, &[56]);
 | 
			
		||||
 | 
			
		||||
        let field3: Field = bytes[field1.size + field2.size..].into();
 | 
			
		||||
        let field3: Field = bytes[field1.size + field2.size..].try_into().unwrap();
 | 
			
		||||
        assert_eq!(field3.size, 12);
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            field3.content,
 | 
			
		||||
@@ -243,12 +318,12 @@ mod test_block {
 | 
			
		||||
            48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
 | 
			
		||||
        ];
 | 
			
		||||
 | 
			
		||||
        let first_block: Block = bytes.into();
 | 
			
		||||
        let first_block: Block = bytes.try_into().unwrap();
 | 
			
		||||
        assert_eq!(first_block.id, 1);
 | 
			
		||||
        assert_eq!(first_block.size, 54);
 | 
			
		||||
        assert_eq!(first_block.content.len(), 8);
 | 
			
		||||
 | 
			
		||||
        let second_block: Block = bytes[first_block.size..].into();
 | 
			
		||||
        let second_block: Block = bytes[first_block.size..].try_into().unwrap();
 | 
			
		||||
        assert_eq!(second_block.id, 2);
 | 
			
		||||
        assert_eq!(second_block.size, 86);
 | 
			
		||||
        assert_eq!(second_block.content.len(), 21);
 | 
			
		||||
@@ -277,7 +352,7 @@ mod test_decode_ssv_memory {
 | 
			
		||||
            50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
 | 
			
		||||
            48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
 | 
			
		||||
        ];
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len());
 | 
			
		||||
        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
 | 
			
		||||
        assert_eq!(blocks.len(), 2);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,30 +1,56 @@
 | 
			
		||||
/// High level API for the SSV library,
 | 
			
		||||
/// based on the low level bindings in libssv.rs.
 | 
			
		||||
extern crate dotenv;
 | 
			
		||||
use libc::{c_void, size_t};
 | 
			
		||||
use std::env;
 | 
			
		||||
use std::ffi::CString;
 | 
			
		||||
use std::path::PathBuf;
 | 
			
		||||
use std::ptr;
 | 
			
		||||
use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
use crate::cps::lire_carte;
 | 
			
		||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
 | 
			
		||||
 | 
			
		||||
fn ssv_init_lib_2() {
 | 
			
		||||
use ::utils::config::load_config;
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
pub enum SSVDemoError {
 | 
			
		||||
    #[error(transparent)]
 | 
			
		||||
    CartePSReading(#[from] crate::cps::CartePSError),
 | 
			
		||||
    #[error(transparent)]
 | 
			
		||||
    SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
 | 
			
		||||
    #[error(transparent)]
 | 
			
		||||
    Anyhow(#[from] anyhow::Error),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
 | 
			
		||||
    let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
 | 
			
		||||
    let ini = CString::new(ini_str).expect("CString::new failed");
 | 
			
		||||
    unsafe {
 | 
			
		||||
        let result = SSV_InitLIB2(ini.as_ptr());
 | 
			
		||||
        println!("SSV_InitLIB2 result: {}", result);
 | 
			
		||||
        if result != 0 {
 | 
			
		||||
            return Err(crate::libssv::LibSSVError::StandardErrorCode {
 | 
			
		||||
                code: result,
 | 
			
		||||
                function: "SSV_InitLIB2",
 | 
			
		||||
            }
 | 
			
		||||
            .into());
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn ssv_lire_config() {
 | 
			
		||||
fn ssv_lire_config() -> Result<(), SSVDemoError> {
 | 
			
		||||
    let mut buffer: *mut c_void = ptr::null_mut();
 | 
			
		||||
    let mut size: size_t = 0;
 | 
			
		||||
    unsafe {
 | 
			
		||||
        let result = SSV_LireConfig(&mut buffer, &mut size);
 | 
			
		||||
        println!("SSV_LireConfig result: {}", result);
 | 
			
		||||
        if result != 0 {
 | 
			
		||||
            return Err(crate::libssv::LibSSVError::StandardErrorCode {
 | 
			
		||||
                code: result,
 | 
			
		||||
                function: "SSV_LireConfig",
 | 
			
		||||
            }
 | 
			
		||||
            .into());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if !buffer.is_null() {
 | 
			
		||||
            let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
 | 
			
		||||
@@ -36,25 +62,26 @@ fn ssv_lire_config() {
 | 
			
		||||
            libc::free(buffer);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn demo() {
 | 
			
		||||
pub fn demo() -> Result<(), SSVDemoError> {
 | 
			
		||||
    // TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
 | 
			
		||||
    // Maybe we could use a system standard config path to store a config file
 | 
			
		||||
    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 | 
			
		||||
    let manifest_path = PathBuf::from(manifest_dir);
 | 
			
		||||
    dotenv::from_path(manifest_path.join(".env")).ok();
 | 
			
		||||
 | 
			
		||||
    println!("------- Demo for the SSV library --------");
 | 
			
		||||
 | 
			
		||||
    ssv_init_lib_2();
 | 
			
		||||
    load_config()?;
 | 
			
		||||
 | 
			
		||||
    ssv_init_lib_2()?;
 | 
			
		||||
 | 
			
		||||
    let code_pin = "1234";
 | 
			
		||||
    let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
 | 
			
		||||
    let carte_ps = lire_carte(code_pin, lecteur).unwrap();
 | 
			
		||||
    let carte_ps = lire_carte(code_pin, lecteur)?;
 | 
			
		||||
    println!("CartePS: {:#?}", carte_ps);
 | 
			
		||||
 | 
			
		||||
    ssv_lire_config();
 | 
			
		||||
    ssv_lire_config()?;
 | 
			
		||||
 | 
			
		||||
    println!("-----------------------------------------");
 | 
			
		||||
    Ok(())
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								crates/utils/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								crates/utils/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "utils"
 | 
			
		||||
version = "0.1.0"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
anyhow = "1.0"
 | 
			
		||||
directories = "5.0"
 | 
			
		||||
dotenv = "0.15"
 | 
			
		||||
							
								
								
									
										48
									
								
								crates/utils/src/config.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								crates/utils/src/config.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,48 @@
 | 
			
		||||
use std::{env, path::PathBuf};
 | 
			
		||||
 | 
			
		||||
use anyhow::{bail, Context, Result};
 | 
			
		||||
use directories::ProjectDirs;
 | 
			
		||||
use dotenv::from_path;
 | 
			
		||||
 | 
			
		||||
const CONFIG_FILE_NAME: &str = ".env";
 | 
			
		||||
 | 
			
		||||
pub fn get_config_dirs() -> Vec<PathBuf> {
 | 
			
		||||
    let mut config_dirs = vec![
 | 
			
		||||
        PathBuf::from(""), // Current directory
 | 
			
		||||
    ];
 | 
			
		||||
    if let Ok(manifest_dir) = env::var("CARGO_MANIFEST_DIR") {
 | 
			
		||||
        config_dirs.push(PathBuf::from(manifest_dir));
 | 
			
		||||
    }
 | 
			
		||||
    if let Some(proj_dirs) = ProjectDirs::from("org", "P4pillon", "Krys4lide") {
 | 
			
		||||
        config_dirs.push(proj_dirs.config_dir().to_path_buf());
 | 
			
		||||
    }
 | 
			
		||||
    config_dirs
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn get_config_files() -> Result<Vec<PathBuf>> {
 | 
			
		||||
    let config_dirs = get_config_dirs();
 | 
			
		||||
    let mut config_files = Vec::new();
 | 
			
		||||
    for config_dir in config_dirs.iter() {
 | 
			
		||||
        let config_file = config_dir.join(CONFIG_FILE_NAME);
 | 
			
		||||
        if config_file.exists() {
 | 
			
		||||
            config_files.push(config_file);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    if config_files.is_empty() {
 | 
			
		||||
        bail!(
 | 
			
		||||
            "No config file {CONFIG_FILE_NAME} found in the following directories: {config_dirs:#?}"
 | 
			
		||||
        );
 | 
			
		||||
    }
 | 
			
		||||
    Ok(config_files)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn load_config() -> Result<()> {
 | 
			
		||||
    let config_files = get_config_files()?;
 | 
			
		||||
    // Load the first config file found
 | 
			
		||||
    // TODO: add a verbose log to list all config files found
 | 
			
		||||
    println!(
 | 
			
		||||
        "DEBUG: Config files found (1st loaded): {:#?}",
 | 
			
		||||
        config_files
 | 
			
		||||
    );
 | 
			
		||||
    from_path(config_files[0].as_path()).context("Failed to load config file")
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								crates/utils/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								crates/utils/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
pub mod config;
 | 
			
		||||
							
								
								
									
										85
									
								
								docs/errors.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								docs/errors.md
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,85 @@
 | 
			
		||||
# Gestion des erreurs
 | 
			
		||||
 | 
			
		||||
Ce document décrit comment les erreurs sont gérées dans le projet.
 | 
			
		||||
 | 
			
		||||
## Gestion native
 | 
			
		||||
 | 
			
		||||
Par principe, en Rust, on évite au maximum la gestion par exception, ne la réservant qu'aux situations où un crash du programme est la meilleure solution.
 | 
			
		||||
En temps normal, on renvoie des `Result<Valeur, Erreur>` (pour les situations réussite/erreur) ou des `Option<Valeur>` (pour les situations valeur non-nulle/nulle).
 | 
			
		||||
 | 
			
		||||
Quand on fait face à une situation d'erreur, on cherchera à la gérer de manière explicite (voir [Récupération des erreurs](#récupération-des-erreurs)) ou à la remonter à un niveau supérieur, généralement à l'aide de l'opérateur `?`.
 | 
			
		||||
 | 
			
		||||
On évitera, par contre, au maximum de générer des exceptions (appelées "panics" en Rust), que ce soit par l'usage de `panic!` ou par des appels à des fonctions qui paniquent en cas d'erreur (comme `unwrap` ou `expect`).
 | 
			
		||||
 | 
			
		||||
De nombreux exemples des idiomes natifs de gestion des erreurs en Rust sont disponibles dans la documentation [Rust by example](https://doc.rust-lang.org/rust-by-example/error.html).
 | 
			
		||||
 | 
			
		||||
## Librairies de gestion des erreurs
 | 
			
		||||
 | 
			
		||||
Deux librairies sont utilisées pour gérer les erreurs dans le projet :
 | 
			
		||||
- [`anyhow`](https://docs.rs/anyhow/latest/anyhow/) : qui permet de renvoyer des erreurs faiblement typées, mais très facile à enrichir avec des messages d'explication. On l'utilise pour communiquer facilement des erreurs de haut niveau avec un utilisateur final.
 | 
			
		||||
    ```rust
 | 
			
		||||
    use anyhow::{anyhow, Result};
 | 
			
		||||
 | 
			
		||||
    fn get_cluster_info() -> Result<ClusterInfo> {
 | 
			
		||||
        let data = fs::read_to_string("cluster.json")
 | 
			
		||||
            .with_context(|| "failed to read cluster config")?;
 | 
			
		||||
        let info: ClusterInfo = serde_json::from_str(&data)
 | 
			
		||||
            .with_context(|| "failed to parse cluster config")?;
 | 
			
		||||
        Ok(info)
 | 
			
		||||
    }
 | 
			
		||||
    ```
 | 
			
		||||
- [`thiserror`](https://docs.rs/thiserror/latest/thiserror/) : qui fournit des macros pour définir des erreurs fortement typées. On l'utilise pour définir des erreurs spécifiques à une partie du code, contextualisées avec des données structurées plutôt que de simples messages d'erreurs, afin de favoriser la "récupération" face aux erreurs.
 | 
			
		||||
    ```rust
 | 
			
		||||
    use thiserror::Error;
 | 
			
		||||
 | 
			
		||||
    #[derive(Error, Debug)]
 | 
			
		||||
    pub enum DataStoreError {
 | 
			
		||||
        #[error("data store disconnected")]
 | 
			
		||||
        Disconnect(#[from] io::Error),
 | 
			
		||||
        #[error("the data for key `{0}` is not available")]
 | 
			
		||||
        Redaction(String),
 | 
			
		||||
        #[error("invalid header (expected {expected:?}, found {found:?})")]
 | 
			
		||||
        InvalidHeader {
 | 
			
		||||
            expected: String,
 | 
			
		||||
            found: String,
 | 
			
		||||
        },
 | 
			
		||||
        #[error("unknown data store error")]
 | 
			
		||||
        Unknown,
 | 
			
		||||
    }
 | 
			
		||||
    ```
 | 
			
		||||
 | 
			
		||||
## Récupération des erreurs
 | 
			
		||||
 | 
			
		||||
Dans la mesure du possible, on essaie de privilégier la "récupération" face à une erreur plutôt que le "crash". Les stratégies de récupération sont :
 | 
			
		||||
- Réessayer l'opération, tel quel ou avec des paramètres différents
 | 
			
		||||
- Contourner l'opération, en la remplaçant par une autre
 | 
			
		||||
- À défaut, informer l'utilisateur de l'erreur et :
 | 
			
		||||
    - arrêter / annuler l'opération en cours
 | 
			
		||||
    - ignorer l'erreur et continuer l'exécution
 | 
			
		||||
 | 
			
		||||
Quand on ne peut pas récupérer une erreur, on la remonte à un niveau supérieur, si besoin en la convertissant dans un type d'erreur plus générique et approprié au niveau considéré.
 | 
			
		||||
 | 
			
		||||
## Conversion des erreurs
 | 
			
		||||
 | 
			
		||||
Quand on remonte une erreur à un niveau supérieur, on peut être amené à la convertir dans un type d'erreur plus générique et approprié au niveau considéré. Pour faciliter cette conversion, on implémente le trait `From`. Avec `thiserror`, on peut utiliser l'attribut `#[from]` ou le paramètre `source` pour automatiser l'implémentation de telles conversions.
 | 
			
		||||
 | 
			
		||||
On peut ensuite, lors de la gestion d'une erreur, on pourra :
 | 
			
		||||
- soit directement renvoyer l'erreur à l'aide de l'opérateur `?`, qui se chargera de la conversion ;
 | 
			
		||||
- soit convertir l'erreur explicitement, par exemple en utilisant la méthode `map_err` sur un `Result`, en particulier quand on veut enrichir l'erreur avec des informations supplémentaires.
 | 
			
		||||
 | 
			
		||||
## Usages exceptionnels de `unwrap` et `expect`
 | 
			
		||||
 | 
			
		||||
Provoquant des "panics" en cas d'erreur, les fonctions `unwrap` et `expect` ne doivent être utilisées que dans des cas exceptionnels :
 | 
			
		||||
- Dans les tests, pour signaler une erreur de test
 | 
			
		||||
- Au plus haut niveau de l'application, pour signaler une erreur fatale qui ne peut pas être récupérée
 | 
			
		||||
- Dans des situations où l'erreur ne peut pas se produire, par exemple après une vérification de préconditions
 | 
			
		||||
 | 
			
		||||
Dans l'idéal, on préférera l'usage de `expect` à `unwrap`, car il permet de donner un message d'erreur explicite.
 | 
			
		||||
 | 
			
		||||
## Ressources
 | 
			
		||||
 | 
			
		||||
- [The Rust Programming Language - Ch. 9: Error Handling](https://doc.rust-lang.org/book/ch09-00-error-handling.html)
 | 
			
		||||
- [The NRC Book - Error Handling in Rust](https://nrc.github.io/error-docs/intro.html)
 | 
			
		||||
- [The Error Design Patterns Book - by Project Error Handling WG](https://github.com/rust-lang/project-error-handling/blob/master/error-design-patterns-book/src/SUMMARY.md)
 | 
			
		||||
- [The Rust Cookbook - Error Handling](https://rust-lang-nursery.github.io/rust-cookbook/error-handling.html)
 | 
			
		||||
- [Le ticket initial de l'intégration de la gestion des erreurs dans le projet](https://forge.p4pillon.org/P4Pillon/Krys4lide/issues/34)
 | 
			
		||||
							
								
								
									
										24
									
								
								frontend/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								frontend/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,24 @@
 | 
			
		||||
# Nuxt dev/build outputs
 | 
			
		||||
.output
 | 
			
		||||
.data
 | 
			
		||||
.nuxt
 | 
			
		||||
.nitro
 | 
			
		||||
.cache
 | 
			
		||||
dist
 | 
			
		||||
 | 
			
		||||
# Node dependencies
 | 
			
		||||
node_modules
 | 
			
		||||
 | 
			
		||||
# Logs
 | 
			
		||||
logs
 | 
			
		||||
*.log
 | 
			
		||||
 | 
			
		||||
# Misc
 | 
			
		||||
.DS_Store
 | 
			
		||||
.fleet
 | 
			
		||||
.idea
 | 
			
		||||
 | 
			
		||||
# Local env files
 | 
			
		||||
.env
 | 
			
		||||
.env.*
 | 
			
		||||
!.env.example
 | 
			
		||||
							
								
								
									
										77
									
								
								frontend/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										77
									
								
								frontend/README.md
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,77 @@
 | 
			
		||||
# Nuxt 3 Minimal Starter
 | 
			
		||||
 | 
			
		||||
TODO : Faire un vrai README pour `frontend` (Nuxt 3)
 | 
			
		||||
 | 
			
		||||
Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
 | 
			
		||||
 | 
			
		||||
## Setup
 | 
			
		||||
 | 
			
		||||
Make sure to install the dependencies:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# npm
 | 
			
		||||
npm install
 | 
			
		||||
 | 
			
		||||
# pnpm
 | 
			
		||||
pnpm install
 | 
			
		||||
 | 
			
		||||
# yarn
 | 
			
		||||
yarn install
 | 
			
		||||
 | 
			
		||||
# bun
 | 
			
		||||
bun install
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Development Server
 | 
			
		||||
 | 
			
		||||
Start the development server on `http://localhost:3000`:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# npm
 | 
			
		||||
npm run dev
 | 
			
		||||
 | 
			
		||||
# pnpm
 | 
			
		||||
pnpm run dev
 | 
			
		||||
 | 
			
		||||
# yarn
 | 
			
		||||
yarn dev
 | 
			
		||||
 | 
			
		||||
# bun
 | 
			
		||||
bun run dev
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Production
 | 
			
		||||
 | 
			
		||||
Build the application for production:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# npm
 | 
			
		||||
npm run build
 | 
			
		||||
 | 
			
		||||
# pnpm
 | 
			
		||||
pnpm run build
 | 
			
		||||
 | 
			
		||||
# yarn
 | 
			
		||||
yarn build
 | 
			
		||||
 | 
			
		||||
# bun
 | 
			
		||||
bun run build
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Locally preview production build:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
# npm
 | 
			
		||||
npm run preview
 | 
			
		||||
 | 
			
		||||
# pnpm
 | 
			
		||||
pnpm run preview
 | 
			
		||||
 | 
			
		||||
# yarn
 | 
			
		||||
yarn preview
 | 
			
		||||
 | 
			
		||||
# bun
 | 
			
		||||
bun run preview
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information.
 | 
			
		||||
							
								
								
									
										7
									
								
								frontend/app.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								frontend/app.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <div>
 | 
			
		||||
    <NuxtRouteAnnouncer />
 | 
			
		||||
    <NavBar />
 | 
			
		||||
    <NuxtPage />
 | 
			
		||||
  </div>
 | 
			
		||||
</template>
 | 
			
		||||
							
								
								
									
										43
									
								
								frontend/app/spa-loading-template.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								frontend/app/spa-loading-template.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,43 @@
 | 
			
		||||
<!-- 
 | 
			
		||||
    This component is used to show a loading spinner when the SPA is loading.
 | 
			
		||||
    Source: https://github.com/barelyhuman/snips/blob/dev/pages/css-loader.md
 | 
			
		||||
-->
 | 
			
		||||
<div class="loader"></div>
 | 
			
		||||
<style>
 | 
			
		||||
.loader {
 | 
			
		||||
  display: block;
 | 
			
		||||
  position: fixed;
 | 
			
		||||
  z-index: 1031;
 | 
			
		||||
  top: 50%;
 | 
			
		||||
  left: 50%;
 | 
			
		||||
  transform: translate(-50%, -50%);
 | 
			
		||||
  width: 18px;
 | 
			
		||||
  height: 18px;
 | 
			
		||||
  box-sizing: border-box;
 | 
			
		||||
  border: solid 2px transparent;
 | 
			
		||||
  border-top-color: #000;
 | 
			
		||||
  border-left-color: #000;
 | 
			
		||||
  border-bottom-color: #efefef;
 | 
			
		||||
  border-right-color: #efefef;
 | 
			
		||||
  border-radius: 50%;
 | 
			
		||||
  -webkit-animation: loader 400ms linear infinite;
 | 
			
		||||
  animation: loader 400ms linear infinite;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
\@-webkit-keyframes loader {
 | 
			
		||||
  0% {
 | 
			
		||||
    -webkit-transform: translate(-50%, -50%) rotate(0deg);
 | 
			
		||||
  }
 | 
			
		||||
  100% {
 | 
			
		||||
    -webkit-transform: translate(-50%, -50%) rotate(360deg);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
\@keyframes loader {
 | 
			
		||||
  0% {
 | 
			
		||||
    transform: translate(-50%, -50%) rotate(0deg);
 | 
			
		||||
  }
 | 
			
		||||
  100% {
 | 
			
		||||
    transform: translate(-50%, -50%) rotate(360deg);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
</style>
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								frontend/bun.lockb
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								frontend/bun.lockb
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										22
									
								
								frontend/components/Avatar.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								frontend/components/Avatar.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <div class="avatar">
 | 
			
		||||
        <div class="rounded-full">
 | 
			
		||||
            <img :src="getAvatarUrl(user)" />
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
    import type { User } from '~/types/user';
 | 
			
		||||
 | 
			
		||||
    const props = defineProps<{
 | 
			
		||||
        user: User,
 | 
			
		||||
    }>();
 | 
			
		||||
 | 
			
		||||
    const getAvatarUrl = (user: User) => {
 | 
			
		||||
        if (user.avatar) {
 | 
			
		||||
            return user.avatar;
 | 
			
		||||
        }
 | 
			
		||||
        return 'https://avatar.iran.liara.run/username?username=' + user.name;
 | 
			
		||||
    };
 | 
			
		||||
</script>
 | 
			
		||||
							
								
								
									
										71
									
								
								frontend/components/LoginModal.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								frontend/components/LoginModal.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <dialog
 | 
			
		||||
        id="login_modal"
 | 
			
		||||
        ref="login_modal"
 | 
			
		||||
        @cancel.prevent=""
 | 
			
		||||
        @keyup="handleKeyPress"
 | 
			
		||||
        class="modal"
 | 
			
		||||
    >
 | 
			
		||||
        <div class="modal-box">
 | 
			
		||||
            <h3 class="text-3xl text-center mb-6">Connexion</h3>
 | 
			
		||||
            <div class="flex flex-wrap gap-5 justify-center">
 | 
			
		||||
                <template v-for="(user, index) in users" :key="user.id">
 | 
			
		||||
                    <LoginModalAvatar
 | 
			
		||||
                        :user="user"
 | 
			
		||||
                        :rank="index+1"
 | 
			
		||||
                        @selectUser="login"
 | 
			
		||||
                    />
 | 
			
		||||
                </template>
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
        <form method="dialog" class="modal-backdrop">
 | 
			
		||||
            <button class="cursor-default">close</button>
 | 
			
		||||
        </form>
 | 
			
		||||
    </dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
    import type { User } from '~/types/user';
 | 
			
		||||
 | 
			
		||||
    const users: User[] = [
 | 
			
		||||
        { id: 1, name: 'John Doe', avatar: 'https://img.daisyui.com/images/stock/photo-1534528741775-53994a69daeb.webp' },
 | 
			
		||||
        { id: 2, name: 'Jane Doe', avatar: 'https://avatar.iran.liara.run/public' },
 | 
			
		||||
        { id: 3, name: 'Michel Moulin', avatar: '' },
 | 
			
		||||
        { id: 4, name: 'Jean Paris', avatar: '' },
 | 
			
		||||
        { id: 5, name: 'Marie Dupont', avatar: '' },
 | 
			
		||||
        { id: 6, name: 'Émilie Fournier', avatar: '' },
 | 
			
		||||
        { id: 7, name: 'Pierre Lefevre', avatar: '' },
 | 
			
		||||
        { id: 8, name: 'Sophie Lemoine', avatar: '' },
 | 
			
		||||
        { id: 9, name: 'Lucie Simon', avatar: '' },
 | 
			
		||||
        { id: 10, name: 'Kevin Boucher', avatar: '' },
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    const loginModal = useTemplateRef('login_modal');
 | 
			
		||||
 | 
			
		||||
    const current_user = useCurrentUser();
 | 
			
		||||
 | 
			
		||||
    const login = (user: User) => {
 | 
			
		||||
        console.log('login', user);
 | 
			
		||||
        current_user.value = user;
 | 
			
		||||
        loginModal.value?.close();
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    const handleKeyPress = (event: KeyboardEvent) => {
 | 
			
		||||
        // Extract the rank from the event.code : Digit7 -> 7
 | 
			
		||||
        const rank = event.code.match(/\d/);
 | 
			
		||||
        if (!rank) {
 | 
			
		||||
            console.debug('Not handled key event', { event });
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
        const user = getUserByRank(parseInt(rank[0]));
 | 
			
		||||
        if (user) {
 | 
			
		||||
            login(user);
 | 
			
		||||
        } else {
 | 
			
		||||
            console.debug('Not handled key event', { event });
 | 
			
		||||
        }
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    const getUserByRank = (rank: number): User => {
 | 
			
		||||
        return users[rank - 1];
 | 
			
		||||
    };
 | 
			
		||||
</script>
 | 
			
		||||
							
								
								
									
										17
									
								
								frontend/components/LoginModalAvatar.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								frontend/components/LoginModalAvatar.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <button class="relative" @click="$emit('selectUser', user)">
 | 
			
		||||
        <Avatar class="w-24" :user="user" />
 | 
			
		||||
        <div class="absolute w-fit mx-auto bottom-0 inset-x-0">
 | 
			
		||||
            <kbd class="kbd kbd-sm">{{ rank }}</kbd>
 | 
			
		||||
        </div>
 | 
			
		||||
    </button>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
    import type { User } from '~/types/user';
 | 
			
		||||
 | 
			
		||||
    const props = defineProps<{
 | 
			
		||||
        user: User,
 | 
			
		||||
        rank: Number,
 | 
			
		||||
    }>();
 | 
			
		||||
</script>
 | 
			
		||||
							
								
								
									
										35
									
								
								frontend/components/NavBar.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								frontend/components/NavBar.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,35 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <div class="navbar">
 | 
			
		||||
        <div class="navbar-start">
 | 
			
		||||
            <a class="btn btn-ghost text-xl" href="/">Chrys4lide</a>
 | 
			
		||||
        </div>
 | 
			
		||||
        <nav class="navbar-center">
 | 
			
		||||
            <NuxtLink to="/" class="btn btn-ghost">Accueil</NuxtLink>
 | 
			
		||||
            <NuxtLink to="/CPS" class="btn btn-ghost">Carte CPS</NuxtLink>
 | 
			
		||||
        </nav>
 | 
			
		||||
        <div class="navbar-end">
 | 
			
		||||
            <template v-if="!current_user">
 | 
			
		||||
                <button class="btn btn-ghost" type="button" onclick="login_modal.showModal()">
 | 
			
		||||
                    Connexion
 | 
			
		||||
                </button>
 | 
			
		||||
            </template>
 | 
			
		||||
            <template v-else>
 | 
			
		||||
                <details class="dropdown dropdown-end">
 | 
			
		||||
                    <summary class="block"><Avatar :user="current_user" class="w-12" role="button" /></summary>
 | 
			
		||||
                    <ul class="menu dropdown-content bg-base-100 rounded-box z-[1] w-52 p-2 shadow">
 | 
			
		||||
                        <li><a @click="logout">Déconnexion</a></li>
 | 
			
		||||
                    </ul>
 | 
			
		||||
                </details>
 | 
			
		||||
            </template>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
    <LoginModal />
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
    const current_user = useCurrentUser();
 | 
			
		||||
 | 
			
		||||
    const logout = () => {
 | 
			
		||||
        current_user.value = null;
 | 
			
		||||
    };
 | 
			
		||||
</script>
 | 
			
		||||
							
								
								
									
										3
									
								
								frontend/composables/currentUser.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								frontend/composables/currentUser.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
import type { User } from '@/types/user';
 | 
			
		||||
 | 
			
		||||
export const useCurrentUser = () => useState<User | null>('currentUser', () => null);
 | 
			
		||||
							
								
								
									
										39
									
								
								frontend/nuxt.config.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								frontend/nuxt.config.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,39 @@
 | 
			
		||||
// https://nuxt.com/docs/api/configuration/nuxt-config
 | 
			
		||||
export default defineNuxtConfig({
 | 
			
		||||
  compatibilityDate: '2024-04-03',
 | 
			
		||||
  // Enables the development server to be discoverable by other devices for mobile development
 | 
			
		||||
  devServer: { host: '0.0.0.0', port: 1420 },
 | 
			
		||||
  devtools: { enabled: true },
 | 
			
		||||
  modules: [
 | 
			
		||||
    '@nuxtjs/tailwindcss',
 | 
			
		||||
    '@nuxtjs/color-mode',
 | 
			
		||||
  ],
 | 
			
		||||
  // Disable SSR for Tauri
 | 
			
		||||
  ssr: false,
 | 
			
		||||
  vite: {
 | 
			
		||||
    // Better support for Tauri CLI output
 | 
			
		||||
    clearScreen: false,
 | 
			
		||||
    // Enable environment variables
 | 
			
		||||
    // Additional environment variables can be found at
 | 
			
		||||
    // https://v2.tauri.app/reference/environment-variables/
 | 
			
		||||
    envPrefix: ['VITE_', 'TAURI_'],
 | 
			
		||||
    server: {
 | 
			
		||||
      // Tauri requires a consistent port
 | 
			
		||||
      strictPort: true,
 | 
			
		||||
      hmr: {
 | 
			
		||||
        // Use websocket for mobile hot reloading
 | 
			
		||||
        protocol: 'ws',
 | 
			
		||||
        // Make sure it's available on the network
 | 
			
		||||
        host: '0.0.0.0',
 | 
			
		||||
        // Use a specific port for hmr
 | 
			
		||||
        port: 5183,
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  colorMode: {
 | 
			
		||||
    // Add `data-theme` attribute to the `html` tag, allowing DaisyUI to handle dark mode automatically
 | 
			
		||||
    dataValue: 'theme',
 | 
			
		||||
    // Remove the default `-mode` suffix from the class name, letting have `dark` and `light` as class names, for DaisyUI compatibility
 | 
			
		||||
    classSuffix: '',
 | 
			
		||||
  },
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										22
									
								
								frontend/package.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								frontend/package.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "nuxt-app",
 | 
			
		||||
  "private": true,
 | 
			
		||||
  "type": "module",
 | 
			
		||||
  "scripts": {
 | 
			
		||||
    "build": "nuxi build",
 | 
			
		||||
    "dev": "nuxi dev",
 | 
			
		||||
    "generate": "nuxi generate",
 | 
			
		||||
    "preview": "nuxi preview",
 | 
			
		||||
    "postinstall": "nuxi prepare"
 | 
			
		||||
  },
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@nuxtjs/color-mode": "^3.5.1",
 | 
			
		||||
    "daisyui": "^4.12.10",
 | 
			
		||||
    "nuxt": "^3.13.0",
 | 
			
		||||
    "vue": "latest",
 | 
			
		||||
    "vue-router": "latest"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@nuxtjs/tailwindcss": "^6.12.1"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										8
									
								
								frontend/pages/CPS.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								frontend/pages/CPS.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <div>
 | 
			
		||||
        <h1 class="text-xl">Carte CPS</h1>
 | 
			
		||||
    </div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup>
 | 
			
		||||
</script>
 | 
			
		||||
							
								
								
									
										17
									
								
								frontend/pages/index.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								frontend/pages/index.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
			
		||||
<template>
 | 
			
		||||
    <div>
 | 
			
		||||
        <h1 class="text-xl">Welcome to your {{ appName }}!</h1>
 | 
			
		||||
        <p v-if="current_user">Logged in as {{ current_user.name }}</p>
 | 
			
		||||
    </div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
    const current_user = useCurrentUser();
 | 
			
		||||
    const appName = 'Nuxt App';
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<style scoped>
 | 
			
		||||
h1 {
 | 
			
		||||
    color: #42b983;
 | 
			
		||||
}
 | 
			
		||||
</style>
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								frontend/public/favicon.ico
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								frontend/public/favicon.ico
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 4.2 KiB  | 
							
								
								
									
										1
									
								
								frontend/public/robots.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								frontend/public/robots.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										3
									
								
								frontend/server/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								frontend/server/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
{
 | 
			
		||||
  "extends": "../.nuxt/tsconfig.server.json"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										7
									
								
								frontend/tailwind.config.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								frontend/tailwind.config.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
import type { Config } from 'tailwindcss'
 | 
			
		||||
 | 
			
		||||
export default <Partial<Config>>{
 | 
			
		||||
    plugins: [
 | 
			
		||||
        require('daisyui'),
 | 
			
		||||
    ],
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										4
									
								
								frontend/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								frontend/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
			
		||||
{
 | 
			
		||||
  // https://nuxt.com/docs/guide/concepts/typescript
 | 
			
		||||
  "extends": "./.nuxt/tsconfig.json"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								frontend/types/user.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								frontend/types/user.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
export declare interface User {
 | 
			
		||||
    id: number;
 | 
			
		||||
    name: string;
 | 
			
		||||
    email?: string;
 | 
			
		||||
    avatar?: string;
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user