Compare commits
32 Commits
wip-debug-
...
920b3e119b
Author | SHA1 | Date | |
---|---|---|---|
920b3e119b | |||
91d7474ce0 | |||
3a43428ad4 | |||
d6d487a727 | |||
65059b87d4 | |||
f8d7f82c50
|
|||
d33140ebaf
|
|||
ba88b08a57
|
|||
8c38f0e4ba | |||
648a7848fd
|
|||
f6a1af5d1e
|
|||
a19b6dcd0d
|
|||
9447ad7faf | |||
5eebd5d1cb | |||
7d41fbb519 | |||
ff2c84fb33
|
|||
b807e78ac3 | |||
d8f3c276c0 | |||
c2b4264f32 | |||
0e8514d906 | |||
86a6d2b9d3 | |||
18758ff2fe | |||
1f57b70cef | |||
83cee11e65 | |||
b1cafda669 | |||
d370a9b85d
|
|||
83b2f7358d
|
|||
8ef713ccf2
|
|||
4162e55b83 | |||
d9cedca335
|
|||
820d76d0f5
|
|||
6409e3eedf
|
27
.gitea/PULL_REQUEST_TEMPLATE.yaml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
name: Demande de fusion (Pull Request)
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Une demande de fusion (Pull Request) a pour objectif de
|
||||||
|
partager au reste de l'équipe un développement réalisé.
|
||||||
|
Décrire les modifications apportées, leur impact et le contexte
|
||||||
|
dans lequel elles ont été réalisées permettra aux relecteurices
|
||||||
|
de plus facilement comprendre et valider votre travail.
|
||||||
|
- type: textarea
|
||||||
|
id: details
|
||||||
|
attributes:
|
||||||
|
label: Détails
|
||||||
|
description: Décrivez le contenu de la PR, son impact concret
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: why
|
||||||
|
attributes:
|
||||||
|
label: Pourquoi ?
|
||||||
|
description: Pourquoi ces modifications sont elles nécessaires ? Dans quel contexte s'inscrivent-elles ?
|
||||||
|
- type: textarea
|
||||||
|
id: documentation
|
||||||
|
attributes:
|
||||||
|
label: Documentation
|
||||||
|
description: Précisez ici des références à des ressources que vous avez utilisées pour réaliser ces modifications
|
29
.gitea/issue_template/BUG_REPORT.yaml
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
name: Rapport de bug
|
||||||
|
about: Remplissez un rapport d'erreur
|
||||||
|
title: "[Bug]: "
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- bug
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: what-happened
|
||||||
|
attributes:
|
||||||
|
label: Que se passe-t-il ?
|
||||||
|
description: Décrivez la situation que vous rencontrez
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: environment-description
|
||||||
|
attributes:
|
||||||
|
label: Si le problème semble lié à votre environement, décrivez-le ici
|
||||||
|
placeholder: Windows 10, Firefox 89.0, etc.
|
||||||
|
- type: dropdown
|
||||||
|
id: module
|
||||||
|
attributes:
|
||||||
|
label: Ce problème est il relatif à un ou des modules en particulier ?
|
||||||
|
multiple: true
|
||||||
|
options:
|
||||||
|
- Clego
|
||||||
|
- Tauri
|
||||||
|
- Axum
|
13
.gitea/issue_template/FEATURE.yaml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
name: Proposez une fonctionnalité / amélioration
|
||||||
|
about: Proposez vos idées de fonctionnalités ou d'améliorations
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- feature
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: description
|
||||||
|
attributes:
|
||||||
|
label: Décrivez votre idée
|
||||||
|
validations:
|
||||||
|
required: true
|
20
.gitea/issue_template/QUESTION.yaml
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
name: Posez une question
|
||||||
|
about: Une interrogation, une difficulté ? Posez votre question
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- question
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: question
|
||||||
|
attributes:
|
||||||
|
label: Que se passe-t-il ?
|
||||||
|
description: Décrivez la situation que vous rencontrez, posez votre question
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: environment-description
|
||||||
|
attributes:
|
||||||
|
label: Précisez votre environnement
|
||||||
|
description: S'il vous semble pertinent de préciser votre environement, décrivez-le ici
|
||||||
|
placeholder: Windows 10, Firefox 89.0, etc.
|
15
.gitignore
vendored
@ -4,13 +4,20 @@
|
|||||||
debug/
|
debug/
|
||||||
target/
|
target/
|
||||||
|
|
||||||
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
|
|
||||||
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
|
|
||||||
Cargo.lock
|
|
||||||
|
|
||||||
# These are backup files generated by rustfmt
|
# These are backup files generated by rustfmt
|
||||||
**/*.rs.bk
|
**/*.rs.bk
|
||||||
|
|
||||||
# MSVC Windows builds of rustc generate these, which store debugging information
|
# MSVC Windows builds of rustc generate these, which store debugging information
|
||||||
*.pdb
|
*.pdb
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
|
|
||||||
|
4524
Cargo.lock
generated
Normal file
7
Cargo.toml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
[workspace]
|
||||||
|
resolver = "2"
|
||||||
|
members = [
|
||||||
|
"crates/app",
|
||||||
|
"crates/sesam-vitale",
|
||||||
|
"crates/desktop"
|
||||||
|
]
|
38
README.md
@ -1,3 +1,39 @@
|
|||||||
# Krys4lide
|
# Krys4lide
|
||||||
|
|
||||||
Logiciel de pharmacie
|
Logiciel de Pharmacie libre et open-source.
|
||||||
|
|
||||||
|
## Crates
|
||||||
|
|
||||||
|
- `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
|
||||||
|
|
||||||
|
La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être installée via Cargo :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo install tauri-cli
|
||||||
|
```
|
||||||
|
|
||||||
|
### Exécution de l'application cliente desktop
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo tauri dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Exécution du serveur web `app` en mode endpoint
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo run --bin app
|
||||||
|
```
|
||||||
|
|
||||||
|
## Build
|
||||||
|
|
||||||
|
Packager le client desktop
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo tauri build
|
||||||
|
```
|
||||||
|
1
crates/app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/target
|
12
crates/app/Cargo.toml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "app"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
askama = "0.12.1"
|
||||||
|
askama_axum = "0.4.0"
|
||||||
|
axum = "0.7.5"
|
||||||
|
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
||||||
|
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||||
|
|
1
crates/app/assets/js/htmx.min.js
vendored
Normal file
27
crates/app/src/lib.rs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
mod templates;
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use askama_axum::IntoResponse;
|
||||||
|
use templates::{hello::HelloResponse, index::GetIndexResponse};
|
||||||
|
use tower_http::services::ServeDir;
|
||||||
|
|
||||||
|
async fn root() -> impl IntoResponse {
|
||||||
|
return GetIndexResponse {}.into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn hello() -> impl IntoResponse {
|
||||||
|
return HelloResponse {
|
||||||
|
name: "Theo".to_string(),
|
||||||
|
}
|
||||||
|
.into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_router(assets_path: &Path) -> axum::Router {
|
||||||
|
let router = axum::Router::new()
|
||||||
|
.nest_service("/assets", ServeDir::new(assets_path))
|
||||||
|
.route("/", axum::routing::get(root))
|
||||||
|
.route("/hello", axum::routing::get(hello));
|
||||||
|
|
||||||
|
router
|
||||||
|
}
|
14
crates/app/src/main.rs
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
use ::app::get_router;
|
||||||
|
use std::env;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() {
|
||||||
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||||
|
let assets_path = Path::new(&manifest_dir).join("assets");
|
||||||
|
let router = get_router(assets_path.as_path());
|
||||||
|
|
||||||
|
// TODO: select port based on available port (or ask in CLI)
|
||||||
|
let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
|
||||||
|
axum::serve(listener, router).await.unwrap();
|
||||||
|
}
|
7
crates/app/src/templates/hello.rs
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
use askama::Template;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "hello.html")]
|
||||||
|
pub struct HelloResponse {
|
||||||
|
pub name: String,
|
||||||
|
}
|
5
crates/app/src/templates/index.rs
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
use askama::Template;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "index.html")]
|
||||||
|
pub struct GetIndexResponse;
|
2
crates/app/src/templates/mod.rs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
pub mod hello;
|
||||||
|
pub mod index;
|
13
crates/app/templates/base.html
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||||
|
|
||||||
|
<script src="/assets/js/htmx.min.js"></script>
|
||||||
|
|
||||||
|
{% block head %}{% endblock %}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
{% block body %}{% endblock %}
|
||||||
|
</body>
|
||||||
|
</html>
|
1
crates/app/templates/hello.html
Normal file
@ -0,0 +1 @@
|
|||||||
|
<div>Hello {{name}}!</div>
|
23
crates/app/templates/index.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}Pharma Libre{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<header>
|
||||||
|
<h1>Pharma Libre</h1>
|
||||||
|
</header>
|
||||||
|
<main>
|
||||||
|
<div
|
||||||
|
id="hello"
|
||||||
|
hx-get="/hello"
|
||||||
|
hx-target="this"
|
||||||
|
hx-trigger="load"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
>
|
||||||
|
Loading...
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
7
crates/desktop/.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# Generated by Cargo
|
||||||
|
# will have compiled files and executables
|
||||||
|
/target/
|
||||||
|
|
||||||
|
# Generated by Tauri
|
||||||
|
# will have schema files for capabilities auto-completion
|
||||||
|
/gen/schemas
|
24
crates/desktop/Cargo.toml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
[package]
|
||||||
|
name = "desktop"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = "Un logiciel de pharmacie libre et open-source."
|
||||||
|
authors = ["p4pillon"]
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "desktop_lib"
|
||||||
|
crate-type = ["lib", "cdylib", "staticlib"]
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
tauri-build = { version = "2.0.0-beta", features = [] }
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
axum = "0.7.5"
|
||||||
|
tauri = { version = "2.0.0-beta", features = [] }
|
||||||
|
tower = "0.4.13"
|
||||||
|
tokio = "1.39.1"
|
||||||
|
|
||||||
|
app = { path = "../app" }
|
||||||
|
http = "1.1.0"
|
||||||
|
bytes = "1.6.1"
|
||||||
|
|
3
crates/desktop/build.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
fn main() {
|
||||||
|
tauri_build::build()
|
||||||
|
}
|
BIN
crates/desktop/icons/128x128.png
Normal file
After Width: | Height: | Size: 3.4 KiB |
BIN
crates/desktop/icons/128x128@2x.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
crates/desktop/icons/32x32.png
Normal file
After Width: | Height: | Size: 974 B |
BIN
crates/desktop/icons/Square107x107Logo.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
crates/desktop/icons/Square142x142Logo.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
crates/desktop/icons/Square150x150Logo.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
crates/desktop/icons/Square284x284Logo.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
crates/desktop/icons/Square30x30Logo.png
Normal file
After Width: | Height: | Size: 903 B |
BIN
crates/desktop/icons/Square310x310Logo.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
crates/desktop/icons/Square44x44Logo.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
crates/desktop/icons/Square71x71Logo.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
crates/desktop/icons/Square89x89Logo.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
crates/desktop/icons/StoreLogo.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
crates/desktop/icons/icon.icns
Normal file
BIN
crates/desktop/icons/icon.ico
Normal file
After Width: | Height: | Size: 85 KiB |
BIN
crates/desktop/icons/icon.png
Normal file
After Width: | Height: | Size: 14 KiB |
69
crates/desktop/src/lib.rs
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
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()
|
||||||
|
.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");
|
||||||
|
}
|
6
crates/desktop/src/main.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
|
||||||
|
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
desktop_lib::run()
|
||||||
|
}
|
41
crates/desktop/tauri.conf.json
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
{
|
||||||
|
"productName": "Logiciel Pharma",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"identifier": "org.p4pillon.pharma.desktop",
|
||||||
|
"build": {
|
||||||
|
"beforeDevCommand": {
|
||||||
|
"cwd": "../app",
|
||||||
|
"script": "cargo run"
|
||||||
|
},
|
||||||
|
"devUrl": "http://localhost:3000",
|
||||||
|
"frontendDist": "axum://place.holder/"
|
||||||
|
},
|
||||||
|
"app": {
|
||||||
|
"withGlobalTauri": true,
|
||||||
|
"windows": [
|
||||||
|
{
|
||||||
|
"title": "Logiciel Pharma",
|
||||||
|
"width": 800,
|
||||||
|
"height": 600
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"security": {
|
||||||
|
"csp": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"bundle": {
|
||||||
|
"active": true,
|
||||||
|
"resources": {
|
||||||
|
"../app/assets/": "./assets/"
|
||||||
|
},
|
||||||
|
"targets": "all",
|
||||||
|
"icon": [
|
||||||
|
"icons/32x32.png",
|
||||||
|
"icons/128x128.png",
|
||||||
|
"icons/128x128@2x.png",
|
||||||
|
"icons/icon.icns",
|
||||||
|
"icons/icon.ico"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
6
crates/sesam-vitale/Cargo.toml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[package]
|
||||||
|
name = "sesam-vitale"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
14
crates/sesam-vitale/src/lib.rs
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
pub fn add(left: usize, right: usize) -> usize {
|
||||||
|
left + right
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn it_works() {
|
||||||
|
let result = add(2, 2);
|
||||||
|
assert_eq!(result, 4);
|
||||||
|
}
|
||||||
|
}
|