Compare commits
6 Commits
8b7c2d4a9b
...
LireCarteV
Author | SHA1 | Date | |
---|---|---|---|
b61634fea9 | |||
6b6658f56d | |||
d56f7a2249 | |||
2b45f5aa7e | |||
a3fef1c38c | |||
a64876cfa0 |
@ -24,10 +24,6 @@ body:
|
||||
label: Ce problème est il relatif à un ou des modules en particulier ?
|
||||
multiple: true
|
||||
options:
|
||||
- Interface utilisateur⋅ice (crates/app)
|
||||
- Encapsulation Tauri (crates/desktop)
|
||||
- Moteur SESAM-Vitale (crates/sesam-vitale)
|
||||
- Librairie utilitaire (crates/utils)
|
||||
- Documentation (docs)
|
||||
- Scripts (scripts)
|
||||
- Autre
|
||||
- Clego
|
||||
- Tauri
|
||||
- Axum
|
||||
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -21,8 +21,3 @@ target/
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
# Ignore .env files
|
||||
.env
|
||||
|
||||
# Development Database
|
||||
*.sqlite
|
||||
|
3057
Cargo.lock
generated
3057
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
16
Cargo.toml
16
Cargo.toml
@ -1,19 +1,7 @@
|
||||
[workspace]
|
||||
resolver = "2"
|
||||
members = [
|
||||
"crates/backend",
|
||||
"crates/desktop",
|
||||
"crates/app",
|
||||
"crates/sesam-vitale",
|
||||
"crates/utils",
|
||||
"migration",
|
||||
"entity",
|
||||
".",
|
||||
"crates/desktop"
|
||||
]
|
||||
|
||||
[workspace.dependencies]
|
||||
anyhow = "1.0"
|
||||
dotenv = "0.15"
|
||||
sea-orm-cli = "1.0.1"
|
||||
sea-orm = "1.0.1"
|
||||
serde = { version = "1.0.210", features = ["derive"] }
|
||||
thiserror = "1.0"
|
||||
|
108
README.md
108
README.md
@ -2,120 +2,68 @@
|
||||
|
||||
Logiciel de Pharmacie libre et open-source.
|
||||
|
||||
## Modules applicatifs
|
||||
## Crates
|
||||
|
||||
- `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`.
|
||||
- `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 ...)
|
||||
|
||||
## 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-rc"
|
||||
cargo install tauri-cli --version "^2.0.0-beta"
|
||||
```
|
||||
|
||||
#### SeaORM CLI
|
||||
#### Tailwindcss CLI
|
||||
|
||||
SeaORM est notre ORM. Le CLI SeaORM est nécessaire pour la génération des modèles de la base de données et des migrations associées. Elle peut être installée via Cargo :
|
||||
Le CLI Tailwindcss est nécessaire pour la génération du fichier `crates/app/assets/css/style.css`.
|
||||
|
||||
```bash
|
||||
cargo install sea-orm-cli
|
||||
```
|
||||
La documentation d'installation est disponible sur le site officiel de Tailwindcss : https://tailwindcss.com/blog/standalone-cli
|
||||
|
||||
L'applicatif va chercher les informations de connexion à la base de données dans la variable `DATABASE_URL` importée depuis les [fichiers de configuration](#fichiers-de-configuration).
|
||||
|
||||
```.env
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||
```
|
||||
|
||||
Toutefois, l'usage de la CLI de SeaORM nécessite de renseigner les informations de connexion à la base de données dans un fichier `.env` situé à la racine du projet.
|
||||
|
||||
> Astuce : utilisé un lien symbolique pour éviter de dupliquer le fichier `.env`.
|
||||
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
|
||||
|
||||
Pour lancer l'application en mode développement, il est nécessaire d'exécuter plusieurs composants simultanément :
|
||||
Le logiciel dans sa globalité peut être lancé via la commande suivante :
|
||||
|
||||
```bash
|
||||
# Lancement du serveur backend
|
||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||
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
|
||||
# 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 --no-watch
|
||||
cargo add cargo-watch --dev --package app
|
||||
```
|
||||
|
||||
> Pour circonscrire les hot-reloads intempestifs mais peu utiles :
|
||||
> - le `backend` n'est rechargé que si des modifications sont détectées dans le dossier précisé par `-w crates/backend`
|
||||
> - le rechargement du `desktop` est désactivé par l'option `--no-watch` ; en effet, le rechargement du `frontend` est déjà pris en charge par `bun` et ne nécessite pas de rechargement du `desktop`
|
||||
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
|
||||
|
||||
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 :
|
||||
Packager le client desktop
|
||||
|
||||
```bash
|
||||
cargo tauri build
|
||||
```
|
||||
|
||||
## Gestion de la base de données
|
||||
|
||||
### Création d'une migration
|
||||
|
||||
```bash
|
||||
sea-orm-cli migrate generate <nom_de_la_migration>
|
||||
```
|
||||
|
||||
Cette commande génère un fichier de migration à adapter dans le dossier `migration/src`.
|
||||
|
||||
### Appliquer les migrations
|
||||
|
||||
```bash
|
||||
sea-orm-cli migrate up
|
||||
```
|
||||
|
||||
### Génération des entitées
|
||||
|
||||
```bash
|
||||
sea-orm-cli generate entity -o entity/src/entities --with-serde both
|
||||
```
|
4
crates/app/.gitignore
vendored
Normal file
4
crates/app/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/target
|
||||
|
||||
# Tailwind CSS CLI
|
||||
tailwindcss
|
19
crates/app/Cargo.toml
Normal file
19
crates/app/Cargo.toml
Normal file
@ -0,0 +1,19 @@
|
||||
[package]
|
||||
name = "app"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
askama = "0.12.1"
|
||||
askama_axum = "0.4.0"
|
||||
axum = "0.7.5"
|
||||
listenfd = "1.0.1"
|
||||
notify = "6.1.1"
|
||||
serde = { version = "1.0.204", features = ["derive"] }
|
||||
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
||||
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||
tower-livereload = "0.9.3"
|
||||
|
||||
[dev-dependencies]
|
||||
cargo-watch = "8.5.1"
|
||||
systemfd = "0.4.0"
|
35
crates/app/README.md
Normal file
35
crates/app/README.md
Normal file
@ -0,0 +1,35 @@
|
||||
## Pré-requis
|
||||
|
||||
- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
|
||||
|
||||
## Exécution
|
||||
|
||||
- Lancer tailwindcss en mode watch dans un terminal :
|
||||
```bash
|
||||
./tailwindcss -i css/input.css -o assets/css/style.css --watch
|
||||
```
|
||||
|
||||
- Lancer le serveur web dans un autre terminal :
|
||||
```bash
|
||||
cargo run --bin app
|
||||
```
|
||||
|
||||
## Rechargement automatique (_auto-reload_)
|
||||
|
||||
Pour le projet `app`, nous utilisons en plus de `cargo-watch` ses librairies :
|
||||
- [`systemfd`](https://github.com/mitsuhiko/systemfd) permet de redémarrer un serveur sans interrompre les connexions en cours, il transmet le descripteur de fichier du socket à une nouvelle instance du serveur (exemple: `cargo watch -x run` --> `systemfd --no-pid -s http::3000 -- cargo watch -x run`). Si le port est déjà pris il en prendra un autre.
|
||||
- [`listenfd`](https://github.com/mitsuhiko/listenfd) permet, côté _Rust_, de démarrer un serveur en utilisant des connexions déjà ouvertes.
|
||||
|
||||
Pour notre application voici la commande à lancer :
|
||||
|
||||
```bash
|
||||
systemfd --no-pid -s http::3000 -- cargo watch -x 'run --bin app'
|
||||
```
|
||||
|
||||
## Chargement à chaud (_livereload_)
|
||||
|
||||
Pour que notre navigateur rafraîchisse automatique notre page lorsque le serveur a été recompilé, nous utilisons la librairie [`tower-livereload`](https://github.com/leotaku/tower-livereload).
|
||||
|
||||
A chaque changement, que ça soit sur du code en _Rust_, _HTML_, _CSS_ ou _JS_ alors le navigateur va recharger entièrement la page.
|
||||
|
||||
En Rust, il n'existe pas encore d'outil de _Hot Reload_ complet et intégré comme on en trouve dans d'autres environnements de développement web, comme pour _Node.js_.
|
1
crates/app/assets/css/flowbite@2.5.1.min.css
vendored
Normal file
1
crates/app/assets/css/flowbite@2.5.1.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1132
crates/app/assets/css/style.css
Normal file
1132
crates/app/assets/css/style.css
Normal file
File diff suppressed because it is too large
Load Diff
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
3
crates/app/css/input.css
Normal file
3
crates/app/css/input.css
Normal file
@ -0,0 +1,3 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
29
crates/app/src/lib.rs
Normal file
29
crates/app/src/lib.rs
Normal file
@ -0,0 +1,29 @@
|
||||
mod pages;
|
||||
mod templates;
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
use askama_axum::Template;
|
||||
use axum::http::{StatusCode, Uri};
|
||||
use tower_http::services::ServeDir;
|
||||
|
||||
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 {
|
||||
axum::Router::new()
|
||||
.nest_service("/assets", ServeDir::new(assets_path))
|
||||
.route("/", axum::routing::get(root))
|
||||
.nest("/pages", pages::get_routes())
|
||||
.merge(templates::get_routes())
|
||||
.fallback(fallback)
|
||||
}
|
63
crates/app/src/main.rs
Normal file
63
crates/app/src/main.rs
Normal file
@ -0,0 +1,63 @@
|
||||
use ::app::get_router;
|
||||
use axum::body::Body;
|
||||
use axum::http::Request;
|
||||
use listenfd::ListenFd;
|
||||
use notify::Watcher;
|
||||
use std::env;
|
||||
use std::path::Path;
|
||||
use tokio::net::TcpListener;
|
||||
use tower_livereload::predicate::Predicate;
|
||||
use tower_livereload::LiveReloadLayer;
|
||||
|
||||
/// 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)]
|
||||
struct NotHtmxPredicate;
|
||||
impl<T> Predicate<Request<T>> for NotHtmxPredicate {
|
||||
fn check(&mut self, req: &Request<T>) -> bool {
|
||||
!(req.headers().contains_key("hx-request"))
|
||||
}
|
||||
}
|
||||
|
||||
const DEFAULT_LISTENER: &str = "localhost:3000";
|
||||
async fn get_tcp_listener() -> TcpListener {
|
||||
let mut listenfd = ListenFd::from_env();
|
||||
|
||||
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(DEFAULT_LISTENER).await.unwrap(),
|
||||
}
|
||||
}
|
||||
|
||||
fn get_livereload_layer(templates_path: &Path) -> LiveReloadLayer<NotHtmxPredicate> {
|
||||
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)
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||
let assets_path = Path::new(&manifest_dir).join("assets");
|
||||
let templates_path = Path::new(&manifest_dir).join("templates");
|
||||
|
||||
let livereload_layer = get_livereload_layer(&templates_path);
|
||||
let router = get_router(assets_path.as_path()).layer(livereload_layer);
|
||||
|
||||
let listener: TcpListener = get_tcp_listener().await;
|
||||
println!("Listening on: http://{}", listener.local_addr().unwrap());
|
||||
|
||||
// Run the server with the router
|
||||
axum::serve(listener, router.into_make_service())
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
9
crates/app/src/pages/cps.rs
Normal file
9
crates/app/src/pages/cps.rs
Normal file
@ -0,0 +1,9 @@
|
||||
use askama_axum::Template;
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "pages/cps.html")]
|
||||
pub struct CpsTemplate;
|
||||
|
||||
pub async fn cps() -> CpsTemplate {
|
||||
CpsTemplate
|
||||
}
|
9
crates/app/src/pages/home.rs
Normal file
9
crates/app/src/pages/home.rs
Normal file
@ -0,0 +1,9 @@
|
||||
use askama_axum::Template;
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "pages/home.html")]
|
||||
pub struct HomeTemplate;
|
||||
|
||||
pub async fn home() -> HomeTemplate {
|
||||
HomeTemplate
|
||||
}
|
10
crates/app/src/pages/mod.rs
Normal file
10
crates/app/src/pages/mod.rs
Normal file
@ -0,0 +1,10 @@
|
||||
use axum::{routing, Router};
|
||||
|
||||
mod cps;
|
||||
mod home;
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new()
|
||||
.route("/home", routing::get(home::home))
|
||||
.route("/cps", routing::get(cps::cps))
|
||||
}
|
18
crates/app/src/templates/hello.rs
Normal file
18
crates/app/src/templates/hello.rs
Normal file
@ -0,0 +1,18 @@
|
||||
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))
|
||||
}
|
12
crates/app/src/templates/mod.rs
Normal file
12
crates/app/src/templates/mod.rs
Normal file
@ -0,0 +1,12 @@
|
||||
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())
|
||||
}
|
60
crates/app/src/templates/nav.rs
Normal file
60
crates/app/src/templates/nav.rs
Normal file
@ -0,0 +1,60 @@
|
||||
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))
|
||||
}
|
63
crates/app/src/templates/profile.rs
Normal file
63
crates/app/src/templates/profile.rs
Normal file
@ -0,0 +1,63 @@
|
||||
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))
|
||||
}
|
12
crates/app/tailwind.config.js
Normal file
12
crates/app/tailwind.config.js
Normal file
@ -0,0 +1,12 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
module.exports = {
|
||||
content: [
|
||||
'./templates/**/*.html',
|
||||
'./css/**/*.css',
|
||||
],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
|
23
crates/app/templates/base.html
Normal file
23
crates/app/templates/base.html
Normal file
@ -0,0 +1,23 @@
|
||||
<!doctype html>
|
||||
<html lang="fr" class="h-full">
|
||||
<head>
|
||||
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||
|
||||
<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>
|
||||
|
||||
{% 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>
|
1
crates/app/templates/hello.html
Normal file
1
crates/app/templates/hello.html
Normal file
@ -0,0 +1 @@
|
||||
<div>Hello {{name}}!</div>
|
34
crates/app/templates/index.html
Normal file
34
crates/app/templates/index.html
Normal file
@ -0,0 +1,34 @@
|
||||
{% 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 %}
|
41
crates/app/templates/layout/nav.html
Normal file
41
crates/app/templates/layout/nav.html
Normal file
@ -0,0 +1,41 @@
|
||||
<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>
|
9
crates/app/templates/layout/nav/desktop/menu-items.html
Normal file
9
crates/app/templates/layout/nav/desktop/menu-items.html
Normal file
@ -0,0 +1,9 @@
|
||||
<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>
|
@ -0,0 +1,6 @@
|
||||
<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>
|
@ -0,0 +1,22 @@
|
||||
<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>
|
27
crates/app/templates/layout/nav/desktop/profile.html
Normal file
27
crates/app/templates/layout/nav/desktop/profile.html
Normal file
@ -0,0 +1,27 @@
|
||||
<!-- 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>
|
4
crates/app/templates/layout/nav/logo.html
Normal file
4
crates/app/templates/layout/nav/logo.html
Normal file
@ -0,0 +1,4 @@
|
||||
<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>
|
43
crates/app/templates/layout/nav/mobile/menu-button.html
Normal file
43
crates/app/templates/layout/nav/mobile/menu-button.html
Normal file
@ -0,0 +1,43 @@
|
||||
<!-- 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>
|
9
crates/app/templates/layout/nav/mobile/menu-items.html
Normal file
9
crates/app/templates/layout/nav/mobile/menu-items.html
Normal file
@ -0,0 +1,9 @@
|
||||
<div
|
||||
id="nav-menu-mobile"
|
||||
hx-get="/nav/menu?mobile=true"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
Chargement ...
|
||||
</div>
|
@ -0,0 +1,6 @@
|
||||
<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>
|
@ -0,0 +1,9 @@
|
||||
<div
|
||||
id="profile-menu-mobile"
|
||||
hx-get="/profile/menu?mobile=true"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
Chargement ...
|
||||
</div>
|
11
crates/app/templates/layout/nav/mobile/profile.html
Normal file
11
crates/app/templates/layout/nav/mobile/profile.html
Normal file
@ -0,0 +1,11 @@
|
||||
<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>
|
13
crates/app/templates/layout/nav/nav-menu-items.html
Normal file
13
crates/app/templates/layout/nav/nav-menu-items.html
Normal file
@ -0,0 +1,13 @@
|
||||
{% 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 %}
|
16
crates/app/templates/layout/nav/notifications-icon.html
Normal file
16
crates/app/templates/layout/nav/notifications-icon.html
Normal file
@ -0,0 +1,16 @@
|
||||
<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>
|
11
crates/app/templates/layout/nav/profile-menu-items.html
Normal file
11
crates/app/templates/layout/nav/profile-menu-items.html
Normal file
@ -0,0 +1,11 @@
|
||||
{% 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 %}
|
52
crates/app/templates/pages/cps.html
Normal file
52
crates/app/templates/pages/cps.html
Normal file
@ -0,0 +1,52 @@
|
||||
<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>
|
52
crates/app/templates/pages/home.html
Normal file
52
crates/app/templates/pages/home.html
Normal file
@ -0,0 +1,52 @@
|
||||
<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>
|
22
crates/app/templates/skeletons/card.html
Normal file
22
crates/app/templates/skeletons/card.html
Normal file
@ -0,0 +1,22 @@
|
||||
<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
|
||||
<div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
|
||||
<svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
|
||||
<path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
|
||||
<path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
|
||||
</svg>
|
||||
</div>
|
||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
<div class="flex items-center mt-4">
|
||||
<svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
|
||||
<path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
|
||||
</svg>
|
||||
<div>
|
||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
|
||||
<div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
</div>
|
||||
</div>
|
||||
<span class="sr-only">Loading...</span>
|
||||
</div>
|
4
crates/app/templates/skeletons/menu-items.html
Normal file
4
crates/app/templates/skeletons/menu-items.html
Normal file
@ -0,0 +1,4 @@
|
||||
<div role="status" class="animate-pulse flex items-center justify-center h-full">
|
||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
|
||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
</div>
|
1
crates/app/templates/skeletons/page-title.html
Normal file
1
crates/app/templates/skeletons/page-title.html
Normal file
@ -0,0 +1 @@
|
||||
<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>
|
@ -1,29 +0,0 @@
|
||||
[package]
|
||||
name = "backend"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.89"
|
||||
axum = { version = "0.7.6", features = ["macros"] }
|
||||
listenfd = "1.0.1"
|
||||
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
||||
tower-http = { version = "0.6.1", features = ["cors"] }
|
||||
|
||||
sea-orm = { workspace = true, features = [
|
||||
# Same `ASYNC_RUNTIME` and `DATABASE_DRIVER` as in the migration crate
|
||||
"sqlx-sqlite",
|
||||
"runtime-tokio-rustls",
|
||||
"macros",
|
||||
] }
|
||||
serde.workspace = true
|
||||
thiserror.workspace = true
|
||||
|
||||
entity = { path = "../../entity" }
|
||||
migration = { path = "../../migration" }
|
||||
utils = { path = "../utils" }
|
||||
|
||||
[dev-dependencies]
|
||||
cargo-watch = "8.5.2"
|
||||
sea-orm-cli.workspace = true
|
||||
systemfd = "0.4.3"
|
@ -1,28 +0,0 @@
|
||||
# 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
|
||||
```
|
||||
|
||||
## Configuration
|
||||
|
||||
> Astuce : lorsqu'on exécute directement la crate `backend` à des fins de développement, le système de configuration n'utilisera pas l'éventuel fichier `.env` situé à la racine du workspace Rust. Pour éviter de dupliquer le fichier `.env`, il est possible de créer un lien symbolique vers le fichier `.env` de la crate `backend` :
|
||||
|
||||
```bash
|
||||
cd crates/backend
|
||||
ln -s ../../.env .env
|
||||
```
|
||||
|
||||
## Développement
|
||||
|
||||
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
||||
|
||||
```bash
|
||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||
```
|
@ -1,48 +0,0 @@
|
||||
use axum::{extract::State, routing, Json};
|
||||
use sea_orm::*;
|
||||
use serde::Serialize;
|
||||
|
||||
use ::entity::{debug, debug::Entity as DebugEntity};
|
||||
|
||||
use crate::{AppError, AppState};
|
||||
|
||||
// DATABASE DEBUG CONTROLLERS
|
||||
|
||||
async fn get_debug_entries(db: &DatabaseConnection) -> Result<Vec<debug::Model>, DbErr> {
|
||||
DebugEntity::find().all(db).await
|
||||
}
|
||||
|
||||
async fn add_random_debug_entry(State(AppState { db_connection }): State<AppState>) {
|
||||
let random_entry = debug::ActiveModel {
|
||||
title: Set("Random title".to_string()),
|
||||
text: Set("Random text".to_string()),
|
||||
..Default::default()
|
||||
};
|
||||
random_entry.insert(&db_connection).await.unwrap();
|
||||
}
|
||||
|
||||
// API HANDLER
|
||||
|
||||
#[derive(Serialize, Debug)]
|
||||
struct DebugResponse {
|
||||
db_ping_status: bool,
|
||||
entries: Vec<debug::Model>,
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
async fn debug(
|
||||
State(AppState { db_connection }): State<AppState>,
|
||||
) -> Result<Json<DebugResponse>, AppError> {
|
||||
let db_ping_status = db_connection.ping().await.is_ok();
|
||||
let debug_entries = get_debug_entries(&db_connection).await?;
|
||||
Ok(Json(DebugResponse {
|
||||
db_ping_status,
|
||||
entries: debug_entries,
|
||||
}))
|
||||
}
|
||||
|
||||
pub fn get_routes() -> axum::Router<crate::AppState> {
|
||||
axum::Router::new()
|
||||
.route("/", routing::get(debug))
|
||||
.route("/add_random", routing::post(add_random_debug_entry))
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
use axum::Router;
|
||||
|
||||
use crate::AppState;
|
||||
|
||||
mod debug;
|
||||
|
||||
pub fn get_routes() -> Router<AppState> {
|
||||
Router::new().nest("/debug", debug::get_routes())
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use sea_orm::{Database, DatabaseConnection, DbErr};
|
||||
use std::env;
|
||||
|
||||
pub async fn get_connection() -> Result<DatabaseConnection, DbErr> {
|
||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
|
||||
let db_connection = Database::connect(database_url).await?;
|
||||
Migrator::up(&db_connection, None).await?;
|
||||
Ok(db_connection)
|
||||
}
|
@ -1,72 +0,0 @@
|
||||
use anyhow::Error as AnyError;
|
||||
use axum::http::{header, StatusCode, Uri};
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use axum::{routing::get, Router};
|
||||
use sea_orm::{DatabaseConnection, DbErr};
|
||||
use thiserror::Error;
|
||||
use tower_http::cors::{Any, CorsLayer};
|
||||
|
||||
use ::utils::config::{load_config, ConfigError};
|
||||
|
||||
mod api;
|
||||
mod db;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum InitError {
|
||||
#[error(transparent)]
|
||||
ConfigError(#[from] ConfigError),
|
||||
}
|
||||
|
||||
pub fn init() -> Result<(), InitError> {
|
||||
load_config(None)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct AppState {
|
||||
db_connection: DatabaseConnection,
|
||||
}
|
||||
|
||||
pub async fn get_router() -> Result<Router, DbErr> {
|
||||
let db_connection = db::get_connection().await?;
|
||||
let state: AppState = AppState { db_connection };
|
||||
|
||||
let cors = CorsLayer::new()
|
||||
.allow_methods(Any)
|
||||
.allow_origin(Any)
|
||||
.allow_headers([header::CONTENT_TYPE]);
|
||||
|
||||
Ok(Router::new()
|
||||
.route("/", get(|| async { "Hello, world!" }))
|
||||
.merge(api::get_routes())
|
||||
.fallback(fallback)
|
||||
.with_state(state)
|
||||
.layer(cors))
|
||||
}
|
||||
|
||||
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())
|
||||
}
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
use listenfd::ListenFd;
|
||||
use thiserror::Error;
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
use backend::{get_router, init, InitError};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum BackendError {
|
||||
#[error("Error while setting up or serving the TCP listener")]
|
||||
ServeTCPListener(#[from] std::io::Error),
|
||||
#[error("Error while initialising the backend")]
|
||||
InitError(#[from] InitError),
|
||||
#[error("Error with the database connection")]
|
||||
DatabaseConnection(#[from] sea_orm::DbErr),
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), BackendError> {
|
||||
init()?;
|
||||
|
||||
let app = get_router().await?;
|
||||
|
||||
let mut listenfd = ListenFd::from_env();
|
||||
let listener = 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)?;
|
||||
TcpListener::from_std(listener)?
|
||||
}
|
||||
// otherwise fall back to local listening
|
||||
None => TcpListener::bind("0.0.0.0:8080").await?,
|
||||
};
|
||||
|
||||
let local_addr = listener.local_addr()?;
|
||||
println!("Listening on http://{}", local_addr);
|
||||
axum::serve(listener, app).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
@ -10,15 +10,15 @@ name = "desktop_lib"
|
||||
crate-type = ["lib", "cdylib", "staticlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0.0-rc", features = [] }
|
||||
tauri-build = { version = "2.0.0-beta", features = [] }
|
||||
|
||||
[dependencies]
|
||||
bytes = "1.6.1"
|
||||
http = "1.1.0"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
tauri = { version = "2.0.0-rc", features = [] }
|
||||
tauri-plugin-shell = "2.0.0-rc"
|
||||
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"
|
||||
|
||||
thiserror.workspace = true
|
||||
|
@ -1,10 +0,0 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "Capability for the main window",
|
||||
"windows": ["main"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"shell:allow-open"
|
||||
]
|
||||
}
|
@ -1,14 +1,69 @@
|
||||
// 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)
|
||||
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
|
||||
}
|
||||
|
||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||
pub fn run() {
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_shell::init())
|
||||
.invoke_handler(tauri::generate_handler![greet])
|
||||
.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);
|
||||
});
|
||||
})
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
|
@ -1,24 +1,20 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2.0.0-rc",
|
||||
"productName": "Chrys4lide LGO",
|
||||
"productName": "Logiciel Pharma",
|
||||
"version": "0.0.1",
|
||||
"identifier": "org.p4pillon.chrys4lide.lgo",
|
||||
"identifier": "org.p4pillon.pharma.desktop",
|
||||
"build": {
|
||||
"beforeDevCommand": {
|
||||
"cwd": "../../frontend",
|
||||
"script": "bun run dev"
|
||||
"cwd": "../app",
|
||||
"script": "cargo run"
|
||||
},
|
||||
"devUrl": "http://localhost:1420",
|
||||
"beforeBuildCommand": {
|
||||
"cwd": "../../frontend",
|
||||
"script": "bun run generate"
|
||||
},
|
||||
"frontendDist": "../../frontend/dist"
|
||||
"devUrl": "http://localhost:3000",
|
||||
"frontendDist": "axum://place.holder/"
|
||||
},
|
||||
"app": {
|
||||
"withGlobalTauri": true,
|
||||
"windows": [
|
||||
{
|
||||
"title": "Chrys4lide | LG0",
|
||||
"title": "Logiciel Pharma",
|
||||
"width": 800,
|
||||
"height": 600
|
||||
}
|
||||
@ -29,6 +25,9 @@
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"resources": {
|
||||
"../app/assets/": "./assets/"
|
||||
},
|
||||
"targets": "all",
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
@ -38,4 +37,5 @@
|
||||
"icons/icon.ico"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
3
crates/sesam-vitale/.env.build.win
Normal file
3
crates/sesam-vitale/.env.build.win
Normal file
@ -0,0 +1,3 @@
|
||||
SESAM_FSV_VERSION=1.40.14
|
||||
SESAM_FSV_LIB_PATH="C:/Program Files/santesocial/fsv/${SESAM_FSV_VERSION}/lib"
|
||||
SESAM_FSV_SSVLIB=ssvw64
|
@ -1,3 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.13
|
||||
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
2
crates/sesam-vitale/.env.win
Normal file
2
crates/sesam-vitale/.env.win
Normal file
@ -0,0 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.14
|
||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
@ -1,3 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.13
|
||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||
SESAM_FSV_VERSION=1.40.13
|
||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
@ -4,11 +4,8 @@ version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
dotenv = "0.15"
|
||||
libc = "0.2"
|
||||
thiserror.workspace = true
|
||||
|
||||
utils = { path = "../utils" }
|
||||
|
||||
[build-dependencies]
|
||||
dotenv.workspace = true
|
||||
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").expect("CARGO_MANIFEST_DIR must be set");
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||
let manifest_path = PathBuf::from(manifest_dir);
|
||||
from_path(manifest_path.join(".env.build")).ok();
|
||||
dotenv::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,13 +22,12 @@ 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").expect("SESAM_FSV_LIB_PATH must be set"));
|
||||
let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
|
||||
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_default();
|
||||
let path = env::var("PATH").unwrap_or(String::new());
|
||||
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());
|
||||
@ -37,7 +36,7 @@ fn main() {
|
||||
// Link the SESAM_FSV_SSVLIB dynamic library
|
||||
println!(
|
||||
"cargo::rustc-link-lib=dylib={}",
|
||||
env::var("SESAM_FSV_SSVLIB").expect("SESAM_FSV_SSVLIB must be set")
|
||||
env::var("SESAM_FSV_SSVLIB").unwrap()
|
||||
);
|
||||
// TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
|
||||
}
|
||||
|
Binary file not shown.
876
crates/sesam-vitale/src/cartevitale.rs
Normal file
876
crates/sesam-vitale/src/cartevitale.rs
Normal file
@ -0,0 +1,876 @@
|
||||
use libc::{c_void, size_t};
|
||||
use std::ffi::CString;
|
||||
use std::ptr;
|
||||
|
||||
use crate::libssv::SSV_LireDroitsVitale;
|
||||
|
||||
use crate::ssv_memory::{decode_ssv_memory, Block};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct CarteVitale {
|
||||
donneesAssure: DonneesAssure,
|
||||
serviceAMOFamille: ServiceAMOFamille,
|
||||
donneesAccidentTravail: DonneesAccidentTravail,
|
||||
donneesBeneficiaire: Vec<DonneesBeneficiaire>,
|
||||
}
|
||||
|
||||
// 1. CB = Caractères Binaires »
|
||||
// 2. CE = Caractères « Etendus » (ISO 8859-1)
|
||||
// 3. CA = Caractères Alphanumériques (ASCII?)
|
||||
// 4. CN = Caractères Numériques
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesAssure {
|
||||
type_de_carte_vitale: char, // CA
|
||||
numero_de_serie: String, // CN - 1 -> 20
|
||||
date_de_fin_de_validite: String, // CN - Format AAAAMMJJ0000
|
||||
donnees_administration_ruf1: char, // CN
|
||||
donnees_administration_ruf2: String, // CA - 24
|
||||
donnees_ruf_administration: String, // CE - 10
|
||||
type_d_identification_du_porteur: char, // CA
|
||||
numero_national_d_immatriculation: String, // CA - 13
|
||||
cle_du_nir: String, // CA - 2
|
||||
code_regime: String, // CN - 2
|
||||
caisse_gestionnaire: String, // CN - 3
|
||||
centre_gestionnaire: String, // CN - 4
|
||||
code_gestion: String, // CA - 2
|
||||
donnees_ruf_famille: String, // CE - 55
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct ServiceAMOFamille {
|
||||
code_service_amo_famille: String, // CN - 2
|
||||
date_de_debut_service_amo_famille: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_service_amo_famille: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesAccidentTravail {
|
||||
organisme_gestionnaire_risque_at: String, // CN - 9
|
||||
code_at: char, // CA - 2
|
||||
identifiant_at: String, // CN - 9
|
||||
organisme_gestionnaire_at1: String, // CN - 9
|
||||
code_at1: char, // CA - 2
|
||||
identifiant_at1: String, // CN - 9
|
||||
organisme_gestionnaire_at2: String, // CN - 9
|
||||
code_at2: char, // CA - 2
|
||||
identifiant_at2: String, // CN - 9
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesBeneficiaire {
|
||||
nom_usuel: String, // CE - 27
|
||||
nom_de_famille: String, // CE - 27
|
||||
prenom: String, // CE - 27
|
||||
adresse_ligne_1: String, // CE - 32
|
||||
adresse_ligne_2: String, // CE - 32
|
||||
adresse_ligne_3: String, // CE - 32
|
||||
adresse_ligne_4: String, // CE - 32
|
||||
adresse_ligne_5: String, // CE - 32
|
||||
nir_certifie: String, // CA - 13
|
||||
cle_du_nir_certifie: String, // CN - 2
|
||||
date_de_certification_du_nir: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_naissance: String, // CN - Format AAAAMMJJ0000
|
||||
rang_de_naissance: String, // CN - 1
|
||||
qualite: String, // CN - 2
|
||||
code_service_amo_beneficiaire: char, // CA - 2
|
||||
date_de_debut_service_amo: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_service_amo: String, // CN - Format AAAAMMJJ0000
|
||||
donnees_ruf_amo: String, // CE - 30
|
||||
periodeDroitsAMO: Vec<PeriodeDroitsAMO>,
|
||||
periodeCodeCouverture: Vec<PeriodeCodeCouverture>,
|
||||
donneesMutuelle: DonneesMutuelle,
|
||||
donneesComplementaire: DonneesComplementaire,
|
||||
donneesRUFBeneficiaireComplementaire: DonneesRUFBeneficiaireComplementaire,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeDroitsAMO {
|
||||
date_de_debut_droits_amo: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_droits_amo: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeCodeCouverture {
|
||||
date_de_debut_code_couverture: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_code_couverture: String, // CN - Format AAAAMMJJ0000
|
||||
code_ald: String, // CN - 1
|
||||
code_situation: String, // CN - 4
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesMutuelle {
|
||||
identification_mutuelle: String, // CN - 8
|
||||
garanties_effectives: String, // CA - 8
|
||||
indicateur_de_traitement_mutuelle: String, // CN - 2
|
||||
type_de_services_associes: char, // CA - 1
|
||||
services_associes_au_contrat: String, // CA - 17
|
||||
code_aiguillage_sts: char, // CA - 1
|
||||
periodeDroitsMutuelle: Vec<PeriodeDroitsMutuelle>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeDroitsMutuelle {
|
||||
date_de_debut_droits_mutuelle: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_droits_mutuelle: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesComplementaire {
|
||||
numero_complementaire_b2: String, // CA - 10
|
||||
numero_complementaire_edi: String, // CA - 19
|
||||
numero_adherent_amc: String, // CA - 8
|
||||
indicateur_de_traitement_amc: String, // CN - 2
|
||||
date_de_debut_validite_amc: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_validite_amc: String, // CN - Format AAAAMMJJ0000
|
||||
code_routage_flux_amc: String, // CA - 2
|
||||
identifiant_hote: String, // CA - 3
|
||||
nom_de_domaine_amc: String, // CE - 20
|
||||
code_aiguillage_sts: char, // CA - 1
|
||||
type_de_services_associes: char, // CA - 1
|
||||
services_associes_au_contrat: String, // CE - 17
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesRUFBeneficiaireComplementaire {
|
||||
donnees_ruf_beneficiaire_complementaire: String, // CE - 115
|
||||
}
|
||||
|
||||
pub fn LireDroitsVitale(
|
||||
lecteurPS: &str,
|
||||
lecteurVitale: &str,
|
||||
codePorteurPS: &str,
|
||||
dateConsultation: &str,
|
||||
) -> Result<CarteVitale, String> {
|
||||
let resource_ps = CString::new(lecteurPS).expect("CString::new failed");
|
||||
let resource_vitale = CString::new(lecteurVitale).expect("CString::new failed");
|
||||
let card_number = CString::new(codePorteurPS).expect("CString::new failed");
|
||||
let date_consultation = CString::new(dateConsultation).expect("CString::new failed");
|
||||
|
||||
let mut buffer: *mut c_void = ptr::null_mut();
|
||||
let mut size: size_t = 0;
|
||||
let mut hex_values: &[u8] = &[];
|
||||
unsafe {
|
||||
let result = SSV_LireDroitsVitale(
|
||||
resource_ps.as_ptr(),
|
||||
resource_vitale.as_ptr(),
|
||||
card_number.as_ptr(),
|
||||
date_consultation.as_ptr(),
|
||||
&mut buffer,
|
||||
&mut size,
|
||||
);
|
||||
println!("SSV_LireDroitsVitale result: {}", result);
|
||||
|
||||
if !buffer.is_null() {
|
||||
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
||||
}
|
||||
}
|
||||
|
||||
let groups = decode_ssv_memory(hex_values, hex_values.len());
|
||||
|
||||
let OUT = decode_carte_vitale(groups);
|
||||
|
||||
unsafe {
|
||||
if !buffer.is_null() {
|
||||
libc::free(buffer); // ??? si liberer avant decode_ssv_memory et decode_carte_vitale alors hex_values n'est plus correct ???
|
||||
}
|
||||
}
|
||||
OUT
|
||||
|
||||
}
|
||||
|
||||
fn decode_carte_vitale(groups: Vec<Block>) -> Result<CarteVitale, String> {
|
||||
let mut cartevitale = CarteVitale::default();
|
||||
|
||||
for group in groups {
|
||||
for field in group.content {
|
||||
match (group.id, field.id) {
|
||||
(104, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.push(DonneesBeneficiaire::default());
|
||||
}
|
||||
(105, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.push(PeriodeDroitsAMO::default());
|
||||
}
|
||||
(106, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.push(PeriodeCodeCouverture::default());
|
||||
}
|
||||
(108, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.push(PeriodeDroitsMutuelle::default());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if field.content.len() > 0 {
|
||||
match (group.id, field.id) {
|
||||
(101, 1) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.type_de_carte_vitale = byte as char;
|
||||
}
|
||||
(101, 2) => {
|
||||
cartevitale.donneesAssure.numero_de_serie = //bytes_to_decimal_string(&field.content);
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 3) => {
|
||||
cartevitale.donneesAssure.date_de_fin_de_validite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 4) => {
|
||||
println!("101.4 field.size: {:#?}", field.size);
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.donnees_administration_ruf1 = byte as char;
|
||||
}
|
||||
(101, 5) => {
|
||||
cartevitale.donneesAssure.donnees_administration_ruf2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 6) => {
|
||||
cartevitale.donneesAssure.donnees_ruf_administration =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 7) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.type_d_identification_du_porteur = byte as char;
|
||||
}
|
||||
(101, 8) => {
|
||||
cartevitale.donneesAssure.numero_national_d_immatriculation =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 9) => {
|
||||
cartevitale.donneesAssure.cle_du_nir =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 10) => {
|
||||
cartevitale.donneesAssure.code_regime =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 11) => {
|
||||
cartevitale.donneesAssure.caisse_gestionnaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 12) => {
|
||||
cartevitale.donneesAssure.centre_gestionnaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 13) => {
|
||||
cartevitale.donneesAssure.code_gestion =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 14) => {
|
||||
cartevitale.donneesAssure.donnees_ruf_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 1) => {
|
||||
cartevitale.serviceAMOFamille.code_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 2) => {
|
||||
cartevitale
|
||||
.serviceAMOFamille
|
||||
.date_de_debut_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 3) => {
|
||||
cartevitale
|
||||
.serviceAMOFamille
|
||||
.date_de_fin_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 1) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_risque_at =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 2) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at = byte as char;
|
||||
}
|
||||
(103, 3) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 4) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_at1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 5) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at1 = byte as char;
|
||||
}
|
||||
(103, 6) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 7) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_at2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 8) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at2 = byte as char;
|
||||
}
|
||||
(103, 9) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nom_usuel = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nom_de_famille = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 3) => {
|
||||
cartevitale.donneesBeneficiaire.last_mut().unwrap().prenom =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_1 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_2 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_3 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 7) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_4 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 8) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_5 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 9) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nir_certifie = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 10) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_nir_certifie =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 11) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_certification_du_nir =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 12) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_naissance = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 13) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.rang_de_naissance = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 14) => {
|
||||
cartevitale.donneesBeneficiaire.last_mut().unwrap().qualite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 15) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_service_amo_beneficiaire = field.content[0] as char;
|
||||
}
|
||||
(104, 16) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_service_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 17) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_service_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 18) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donnees_ruf_amo = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(105, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_droits_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(105, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_droits_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_code_couverture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_code_couverture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_ald = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_situation = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.identification_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.garanties_effectives =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.indicateur_de_traitement_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.type_de_services_associes = field.content[0] as char;
|
||||
}
|
||||
(107, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.services_associes_au_contrat =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.code_aiguillage_sts = field.content[0] as char;
|
||||
}
|
||||
(108, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_droits_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(108, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_droits_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_complementaire_b2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_complementaire_edi =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_adherent_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.indicateur_de_traitement_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.date_de_debut_validite_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.date_de_fin_validite_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 7) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.code_routage_flux_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 8) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.identifiant_hote = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 9) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.nom_de_domaine_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 10) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.code_aiguillage_sts = field.content[0] as char;
|
||||
}
|
||||
(109, 11) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.type_de_services_associes = field.content[0] as char;
|
||||
}
|
||||
(109, 12) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.services_associes_au_contrat =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(111, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesRUFBeneficiaireComplementaire
|
||||
.donnees_ruf_beneficiaire_complementaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
_ => {
|
||||
return Err(format!(
|
||||
"Unknown (group, field) pair: ({}, {})",
|
||||
group.id, field.id
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(cartevitale)
|
||||
}
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod test_decode_carte_ps {
|
||||
// use super::*;
|
||||
|
||||
// #[test]
|
||||
// fn test_francoise_pharmacien0052419() {
|
||||
// let bytes: &[u8] = &[
|
||||
// 0, 1, 51, // Block 01, Content size 51
|
||||
// 1, 48, // Field 01, Content size 1
|
||||
// 1, 56, // Field 02, Content size 1
|
||||
// 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // Field 03, Content size 11
|
||||
// 1, 52, // Field 04, Content size 1
|
||||
// 2, 50, 50, // Field 05, Content size 2
|
||||
// 17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49,
|
||||
// 57, // Field 06, Content size 17
|
||||
// 9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // Field 07, Content size 9
|
||||
// 1, 84, // Field 08, Content size 1
|
||||
// 0, 2, 83, // Block 02, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 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 carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
// assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
|
||||
// assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
|
||||
// assert_eq!(
|
||||
// carte_ps.titulaire.numero_d_identification_nationale,
|
||||
// "99700524194"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.titulaire.cle_du_numero_d_identification_nationale,
|
||||
// "4"
|
||||
// );
|
||||
// assert_eq!(carte_ps.titulaire.code_civilite, "22");
|
||||
// assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
|
||||
// assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
|
||||
// assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
|
||||
|
||||
// assert_eq!(carte_ps.situations.len(), 1);
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
|
||||
// 1
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
|
||||
// assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
|
||||
// assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
|
||||
// assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_structure,
|
||||
// "0B0221958"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_structure,
|
||||
// "8"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
|
||||
// "00202419"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
|
||||
// "8"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
|
||||
// ""
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
|
||||
// "0"
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
|
||||
// assert_eq!(carte_ps.situations[0].code_specialite, "50");
|
||||
// assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
|
||||
// assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].habilitation_à_signer_une_facture,
|
||||
// "1"
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// fn test_multiple_situations() {
|
||||
// let bytes: &[u8] = &[
|
||||
// 0, 1, 51, // Block 01, Content size 51
|
||||
// 1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17, 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, 0, 2, 83, // Block 02, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 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, 0, 3,
|
||||
// 83, // Block 03, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 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, 0, 4,
|
||||
// 83, // Block 04, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 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 carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
// assert_eq!(carte_ps.situations.len(), 3);
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[1].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[2].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_missing_field() {
|
||||
// todo!();
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_unknown_group_field_pair() {
|
||||
// todo!();
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_invalid_field_format() {
|
||||
// todo!();
|
||||
// }
|
||||
// }
|
@ -1,24 +1,9 @@
|
||||
use libc::{c_void, size_t};
|
||||
use std::ffi::CString;
|
||||
use std::ptr;
|
||||
use thiserror::Error;
|
||||
|
||||
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),
|
||||
}
|
||||
use crate::libssv::SSV_LireCartePS;
|
||||
use crate::ssv_memory::{decode_ssv_memory, Block};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct CartePS {
|
||||
@ -67,10 +52,10 @@ struct SituationPS {
|
||||
habilitation_à_signer_un_lot: String,
|
||||
}
|
||||
|
||||
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)?;
|
||||
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");
|
||||
|
||||
let mut buffer: *mut c_void = ptr::null_mut();
|
||||
let mut size: size_t = 0;
|
||||
@ -84,32 +69,17 @@ pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError
|
||||
&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()).map_err(CartePSError::SSVMemory)?;
|
||||
let groups = decode_ssv_memory(hex_values, hex_values.len());
|
||||
decode_carte_ps(groups)
|
||||
}
|
||||
|
||||
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> {
|
||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
|
||||
let mut carte_ps = CartePS::default();
|
||||
for group in groups {
|
||||
for field in group.content {
|
||||
@ -148,99 +118,137 @@ fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
|
||||
}
|
||||
(2..=16, 1) => {
|
||||
carte_ps.situations.push(SituationPS::default());
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
|
||||
}
|
||||
(2..=16, 2) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.mode_d_exercice =
|
||||
carte_ps.situations.last_mut().unwrap().mode_d_exercice =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 3) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.statut_d_exercice =
|
||||
carte_ps.situations.last_mut().unwrap().statut_d_exercice =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 4) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.secteur_d_activite =
|
||||
carte_ps.situations.last_mut().unwrap().secteur_d_activite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 5) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.type_d_identification_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.type_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 6) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.numero_d_identification_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 7) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 8) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.raison_sociale_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.raison_sociale_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 9) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_de_facturation_du_ps =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 10) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_de_facturation_du_ps =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 11) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_du_ps_remplaçant =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 12) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_du_ps_remplaçant =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 13) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_conventionnel =
|
||||
carte_ps.situations.last_mut().unwrap().code_conventionnel =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 14) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_specialite =
|
||||
carte_ps.situations.last_mut().unwrap().code_specialite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 15) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_zone_tarifaire =
|
||||
carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 16) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_zone_ik =
|
||||
carte_ps.situations.last_mut().unwrap().code_zone_ik =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 17) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_1 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 18) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_2 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 19) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_3 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_3 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 20) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_une_facture =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.habilitation_à_signer_une_facture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 21) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_un_lot =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.habilitation_à_signer_un_lot =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
_ => {
|
||||
return Err(CartePSError::UnknownGroupFieldPair {
|
||||
group: group.id,
|
||||
field: field.id,
|
||||
});
|
||||
return Err(format!(
|
||||
"Unknown (group, field) pair: ({}, {})",
|
||||
group.id, field.id
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -271,7 +279,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()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
|
||||
@ -362,7 +370,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()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
assert_eq!(carte_ps.situations.len(), 3);
|
||||
|
@ -1,4 +1,5 @@
|
||||
pub mod cps;
|
||||
pub mod cartevitale;
|
||||
pub mod libssv;
|
||||
pub mod ssv_memory;
|
||||
pub mod ssvlib_demo;
|
||||
|
@ -3,13 +3,6 @@
|
||||
/// 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"))]
|
||||
@ -26,5 +19,13 @@ extern "C" {
|
||||
ZDonneesSortie: *mut *mut c_void,
|
||||
TTailleDonneesSortie: *mut size_t,
|
||||
) -> c_ushort;
|
||||
pub fn SSV_LireDroitsVitale(
|
||||
NomRessourcePS: *const c_char,
|
||||
NomRessourceLecteur: *const c_char,
|
||||
CodePorteurPS: *const c_char,
|
||||
DateConsultation: *const c_char,
|
||||
ZDonneesSortie: *mut *mut c_void,
|
||||
TTailleDonneesSortie: *mut size_t,
|
||||
) -> c_ushort;
|
||||
}
|
||||
// TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs
|
||||
|
@ -1,10 +1,9 @@
|
||||
mod cps;
|
||||
mod cartevitale;
|
||||
mod libssv;
|
||||
mod ssv_memory;
|
||||
mod ssvlib_demo;
|
||||
|
||||
use anyhow::{Context, Result};
|
||||
|
||||
fn main() -> Result<()> {
|
||||
ssvlib_demo::demo().context("Error while running the SSV library demo")
|
||||
fn main() {
|
||||
ssvlib_demo::demo();
|
||||
}
|
||||
|
@ -1,33 +1,6 @@
|
||||
/// # 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 {
|
||||
@ -36,12 +9,13 @@ 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 = BytesReadingError;
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
||||
if bytes.is_empty() {
|
||||
return Err(BytesReadingError::EmptyBytes);
|
||||
return Err("Empty bytes input");
|
||||
}
|
||||
|
||||
let mut element_size = ElementSize { size: 0, pad: 1 };
|
||||
@ -56,15 +30,9 @@ 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(BytesReadingError::InvalidSize {
|
||||
expected: size_bytes_len,
|
||||
actual: bytes.len() - 1,
|
||||
});
|
||||
return Err("Invalid memory: not enough bytes to read the size");
|
||||
} else if size_bytes_len > 4 {
|
||||
return Err(BytesReadingError::SizeTooBig {
|
||||
expected: 4,
|
||||
actual: size_bytes_len,
|
||||
});
|
||||
return Err("Invalid memory: size is too big");
|
||||
}
|
||||
let size_bytes = &bytes[1..1 + size_bytes_len];
|
||||
|
||||
@ -86,21 +54,15 @@ pub struct Block<'a> {
|
||||
pub content: Vec<Field<'a>>,
|
||||
}
|
||||
|
||||
impl<'a> TryFrom<&'a [u8]> for Block<'a> {
|
||||
type Error = BytesReadingError;
|
||||
|
||||
fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
|
||||
impl<'a> From<&'a [u8]> for Block<'a> {
|
||||
fn from(bytes: &'a [u8]) -> Self {
|
||||
let mut offset = 0;
|
||||
let id = u16::from_be_bytes(
|
||||
bytes[..2]
|
||||
.try_into()
|
||||
.map_err(BytesReadingError::InvalidBlockId)?,
|
||||
);
|
||||
let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
|
||||
offset += 2;
|
||||
let ElementSize {
|
||||
size: block_size,
|
||||
pad,
|
||||
} = bytes[2..].try_into()?;
|
||||
} = bytes[2..].try_into().unwrap();
|
||||
offset += pad;
|
||||
let raw_content = &bytes[offset..];
|
||||
let mut field_offset = 0;
|
||||
@ -108,22 +70,19 @@ impl<'a> TryFrom<&'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..].try_into().map_err(|err| {
|
||||
BytesReadingError::InvalidField {
|
||||
source: Box::new(err),
|
||||
offset: field_offset,
|
||||
}
|
||||
})?;
|
||||
let mut field: Field<'a> = raw_content[field_offset..].into();
|
||||
|
||||
|
||||
field.id = field_id;
|
||||
field_offset += field.size;
|
||||
field_id += 1;
|
||||
content.push(field);
|
||||
}
|
||||
Ok(Block {
|
||||
Block {
|
||||
id,
|
||||
size: offset + block_size,
|
||||
content,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -134,41 +93,31 @@ pub struct Field<'a> {
|
||||
pub content: &'a [u8],
|
||||
}
|
||||
|
||||
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()?;
|
||||
impl<'a> From<&'a [u8]> for Field<'a> {
|
||||
fn from(bytes: &'a [u8]) -> Self {
|
||||
let ElementSize { size, pad } = bytes.try_into().unwrap();
|
||||
let contenu = &bytes[pad..pad + size];
|
||||
Ok(Field {
|
||||
Field {
|
||||
id: 0,
|
||||
size: pad + size,
|
||||
content: contenu,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Result<Vec<Block>, SSVMemoryError> {
|
||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
|
||||
let mut blocks: Vec<Block> = Vec::new();
|
||||
let mut offset = 0;
|
||||
while offset < size {
|
||||
let block: Block =
|
||||
bytes[offset..]
|
||||
.try_into()
|
||||
.map_err(|err| SSVMemoryError::BlockParsing {
|
||||
source: err,
|
||||
offset,
|
||||
})?;
|
||||
let block: Block = bytes[offset..].into();
|
||||
offset += block.size;
|
||||
blocks.push(block);
|
||||
}
|
||||
Ok(blocks)
|
||||
blocks
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test_element_size {
|
||||
use std::any::Any;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
@ -195,51 +144,29 @@ mod test_element_size {
|
||||
#[test]
|
||||
fn null_size() {
|
||||
let bytes: &[u8] = &[];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
assert_eq!(
|
||||
result.unwrap_err().type_id(),
|
||||
BytesReadingError::EmptyBytes.type_id()
|
||||
);
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(result, Err("Empty bytes input"),);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invalid_memory() {
|
||||
let bytes: &[u8] = &[0b_1000_0001_u8];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(
|
||||
result.unwrap_err().to_string(),
|
||||
BytesReadingError::InvalidSize {
|
||||
expected: 1,
|
||||
actual: 0
|
||||
}
|
||||
.to_string()
|
||||
result,
|
||||
Err("Invalid memory: not enough bytes to read the size"),
|
||||
);
|
||||
|
||||
let bytes: &[u8] = &[0b_1000_0010_u8, 1];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(
|
||||
result.unwrap_err().to_string(),
|
||||
BytesReadingError::InvalidSize {
|
||||
expected: 2,
|
||||
actual: 1
|
||||
}
|
||||
.to_string()
|
||||
result,
|
||||
Err("Invalid memory: not enough bytes to read the size"),
|
||||
);
|
||||
|
||||
let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
|
||||
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()
|
||||
);
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(result, Err("Invalid memory: size is too big"),);
|
||||
}
|
||||
}
|
||||
|
||||
@ -254,7 +181,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.try_into().unwrap();
|
||||
let element: Field = bytes.into();
|
||||
assert_eq!(element.size, 52);
|
||||
assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
|
||||
}
|
||||
@ -269,7 +196,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.try_into().unwrap();
|
||||
let element: Field = bytes.into();
|
||||
assert_eq!(element.size, 259);
|
||||
assert_eq!(element.content.len(), 256);
|
||||
}
|
||||
@ -283,15 +210,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.try_into().unwrap();
|
||||
let field1: Field = bytes.into();
|
||||
assert_eq!(field1.size, 2);
|
||||
assert_eq!(field1.content, &[48]);
|
||||
|
||||
let field2: Field = bytes[field1.size..].try_into().unwrap();
|
||||
let field2: Field = bytes[field1.size..].into();
|
||||
assert_eq!(field2.size, 2);
|
||||
assert_eq!(field2.content, &[56]);
|
||||
|
||||
let field3: Field = bytes[field1.size + field2.size..].try_into().unwrap();
|
||||
let field3: Field = bytes[field1.size + field2.size..].into();
|
||||
assert_eq!(field3.size, 12);
|
||||
assert_eq!(
|
||||
field3.content,
|
||||
@ -318,12 +245,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.try_into().unwrap();
|
||||
let first_block: Block = bytes.into();
|
||||
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..].try_into().unwrap();
|
||||
let second_block: Block = bytes[first_block.size..].into();
|
||||
assert_eq!(second_block.id, 2);
|
||||
assert_eq!(second_block.size, 86);
|
||||
assert_eq!(second_block.content.len(), 21);
|
||||
@ -352,7 +279,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()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
assert_eq!(blocks.len(), 2);
|
||||
}
|
||||
}
|
||||
|
@ -1,56 +1,33 @@
|
||||
/// 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::cartevitale::LireDroitsVitale;
|
||||
|
||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
||||
|
||||
use ::utils::config::{load_config, ConfigError};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum SSVDemoError {
|
||||
#[error(transparent)]
|
||||
CartePSReading(#[from] crate::cps::CartePSError),
|
||||
#[error(transparent)]
|
||||
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
||||
#[error(transparent)]
|
||||
Configuration(#[from] ConfigError),
|
||||
}
|
||||
|
||||
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
||||
fn ssv_init_lib_2() {
|
||||
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() -> Result<(), SSVDemoError> {
|
||||
fn ssv_lire_config() {
|
||||
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);
|
||||
@ -62,26 +39,30 @@ fn ssv_lire_config() -> Result<(), SSVDemoError> {
|
||||
libc::free(buffer);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn demo() -> Result<(), SSVDemoError> {
|
||||
pub fn demo() {
|
||||
// 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 --------");
|
||||
|
||||
load_config(None)?;
|
||||
|
||||
ssv_init_lib_2()?;
|
||||
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)?;
|
||||
let lecteurvitale = "HID Global OMNIKEY 3x21 Smart Card Reader 1";
|
||||
let dateconsultation ="20240813";
|
||||
let carte_ps = lire_carte(code_pin, lecteur).unwrap();
|
||||
println!("CartePS: {:#?}", carte_ps);
|
||||
|
||||
ssv_lire_config()?;
|
||||
ssv_lire_config();
|
||||
|
||||
let carte_vitale = LireDroitsVitale(lecteur, lecteurvitale, code_pin, dateconsultation).unwrap();
|
||||
println!("carte_vitale: {:#?}", carte_vitale);
|
||||
|
||||
println!("-----------------------------------------");
|
||||
Ok(())
|
||||
}
|
||||
|
@ -3,3 +3,4 @@ EXPORTS
|
||||
SSV_InitLIB2
|
||||
SSV_LireCartePS
|
||||
SSV_LireConfig
|
||||
SSV_LireDroitsVitale
|
@ -1,10 +0,0 @@
|
||||
[package]
|
||||
name = "utils"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
directories = "5.0"
|
||||
dotenv.workspace = true
|
||||
thiserror.workspace = true
|
@ -1,68 +0,0 @@
|
||||
use std::{env, path::PathBuf, sync::atomic::AtomicBool};
|
||||
|
||||
use directories::ProjectDirs;
|
||||
use dotenv::from_path;
|
||||
use thiserror::Error;
|
||||
|
||||
const CONFIG_FILE_NAME: &str = ".env";
|
||||
|
||||
static CONFIG_INITIALIZED: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum ConfigError {
|
||||
#[error("No config file {0} found in the following directories: {1:#?}")]
|
||||
ConfigFileNotFound(String, Vec<PathBuf>),
|
||||
#[error("Failed to load config file: {0}")]
|
||||
LoadConfigError(#[from] dotenv::Error),
|
||||
#[error("Environment variable error: {0}")]
|
||||
EnvVarError(#[from] std::env::VarError),
|
||||
}
|
||||
|
||||
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>, ConfigError> {
|
||||
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() {
|
||||
return Err(ConfigError::ConfigFileNotFound(
|
||||
CONFIG_FILE_NAME.to_string(),
|
||||
config_dirs,
|
||||
));
|
||||
}
|
||||
Ok(config_files)
|
||||
}
|
||||
|
||||
pub fn load_config(force: Option<bool>) -> Result<(), ConfigError> {
|
||||
let force = force.unwrap_or(false);
|
||||
if CONFIG_INITIALIZED.load(std::sync::atomic::Ordering::Relaxed) && force {
|
||||
println!("DEBUG: Config already initialized, skipping");
|
||||
return Ok(());
|
||||
}
|
||||
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()).map_err(ConfigError::LoadConfigError)?;
|
||||
CONFIG_INITIALIZED.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||
Ok(())
|
||||
}
|
@ -1 +0,0 @@
|
||||
pub mod config;
|
@ -1,85 +0,0 @@
|
||||
# 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)
|
@ -1,15 +0,0 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-orm.workspace = true
|
||||
serde.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
sea-orm-cli.workspace = true
|
@ -1,18 +0,0 @@
|
||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||
|
||||
use sea_orm::entity::prelude::*;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
|
||||
#[sea_orm(table_name = "debug")]
|
||||
pub struct Model {
|
||||
#[sea_orm(primary_key)]
|
||||
pub id: i32,
|
||||
pub title: String,
|
||||
pub text: String,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||
pub enum Relation {}
|
||||
|
||||
impl ActiveModelBehavior for ActiveModel {}
|
@ -1,5 +0,0 @@
|
||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||
|
||||
pub mod prelude;
|
||||
|
||||
pub mod debug;
|
@ -1,3 +0,0 @@
|
||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||
|
||||
pub use super::debug::Entity as Debug;
|
@ -1,2 +0,0 @@
|
||||
mod entities;
|
||||
pub use entities::*;
|
24
frontend/.gitignore
vendored
24
frontend/.gitignore
vendored
@ -1,24 +0,0 @@
|
||||
# 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
|
@ -1,77 +0,0 @@
|
||||
# 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.
|
@ -1,8 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<NuxtLoadingIndicator />
|
||||
<NuxtRouteAnnouncer />
|
||||
<NavBar />
|
||||
<NuxtPage />
|
||||
</div>
|
||||
</template>
|
@ -1,43 +0,0 @@
|
||||
<!--
|
||||
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>
|
Binary file not shown.
@ -1,22 +0,0 @@
|
||||
<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://i.pravatar.cc/150?u=' + user.name;
|
||||
};
|
||||
</script>
|
@ -1,71 +0,0 @@
|
||||
<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://i.pravatar.cc/150?u=JANEDOE728' },
|
||||
{ id: 3, name: 'Michel Moulin' },
|
||||
{ id: 4, name: 'Jean Paris' },
|
||||
{ id: 5, name: 'Marie Dupont' },
|
||||
{ id: 6, name: 'Émilie Fournier' },
|
||||
{ id: 7, name: 'Pierre Lefevre' },
|
||||
{ id: 8, name: 'Sophie Lemoine' },
|
||||
{ id: 9, name: 'Lucie Simon' },
|
||||
{ id: 10, name: 'Kevin Boucher' },
|
||||
];
|
||||
|
||||
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>
|
@ -1,17 +0,0 @@
|
||||
<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>
|
@ -1,36 +0,0 @@
|
||||
<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>
|
||||
<NuxtLink to="/debug" class="btn btn-ghost">Debug</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>
|
@ -1,3 +0,0 @@
|
||||
import type { User } from '@/types/user';
|
||||
|
||||
export const useCurrentUser = () => useState<User | null>('currentUser', () => null);
|
@ -1,39 +0,0 @@
|
||||
// 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: '',
|
||||
},
|
||||
})
|
@ -1,22 +0,0 @@
|
||||
{
|
||||
"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"
|
||||
}
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<h1 class="text-xl">Carte CPS</h1>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
</script>
|
@ -1,67 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<h1 class="text-3xl mb-8">Debug</h1>
|
||||
<div class="stats shadow mb-8">
|
||||
<div class="stat">
|
||||
<div class="stat-title">DB Ping Status</div>
|
||||
<div class="stat-value">{{ data?.db_ping_status || "?" }}</div>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<div class="stat-title">Entries Count</div>
|
||||
<div class="stat-value">{{ data?.entries.length || "?" }}</div>
|
||||
<div class="stat-actions">
|
||||
<button class="btn btn-sm" @click="addRandomEntry">Add entry</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<div class="stat-title">Network status</div>
|
||||
<div class="stat-value">{{ status }}</div>
|
||||
<div class="stat-description">{{ error }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<h2 class="text-2xl mb-4">Entries</h2>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Title</th>
|
||||
<th>Text</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="entry in data?.entries" :key="entry.id">
|
||||
<td>{{ entry.id }}</td>
|
||||
<td>{{ entry.title }}</td>
|
||||
<td>{{ entry.text }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
type Entry = {
|
||||
id: number;
|
||||
title: string;
|
||||
text: string;
|
||||
};
|
||||
type DebugResponse = {
|
||||
db_ping_status: string;
|
||||
entries: Entry[];
|
||||
};
|
||||
|
||||
|
||||
// TODO : handle a default backend URL by building a custom `$fetch` and `useFetch` functions with a `baseURL` option : https://nuxt.com/docs/guide/recipes/custom-usefetch#custom-fetch
|
||||
|
||||
const { data, refresh, error, status } = await useFetch<DebugResponse>('http://127.0.0.1:8080/debug');
|
||||
|
||||
async function addRandomEntry() {
|
||||
await $fetch('http://127.0.0.1:8080/debug/add_random', {
|
||||
method: 'POST',
|
||||
});
|
||||
refresh();
|
||||
}
|
||||
|
||||
</script>
|
@ -1,17 +0,0 @@
|
||||
<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>
|
Binary file not shown.
Before Width: | Height: | Size: 4.2 KiB |
@ -1 +0,0 @@
|
||||
|
@ -1,3 +0,0 @@
|
||||
{
|
||||
"extends": "../.nuxt/tsconfig.server.json"
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
import type { Config } from 'tailwindcss'
|
||||
|
||||
export default <Partial<Config>>{
|
||||
plugins: [
|
||||
require('daisyui'),
|
||||
],
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user