Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63ddfd39d9 | ||
|
|
9e136bd208 | ||
|
|
0c9b9c5823 | ||
|
|
aa4f5aeb0a | ||
|
|
b4702fdf71 | ||
|
|
d2d8e94aba | ||
|
|
80d22caea8 | ||
|
|
a3902c9662 | ||
|
|
467293a6bc | ||
|
|
6307be4f79 | ||
|
|
f4c94f9b5b | ||
|
|
fdba078b51 |
No files matched your search
Generated
+15
@@ -1697,6 +1697,7 @@ dependencies = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
"tower",
|
"tower",
|
||||||
"tower-http",
|
"tower-http",
|
||||||
|
"tower-livereload",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
@@ -1824,6 +1825,20 @@ version = "0.3.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
|
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tower-livereload"
|
||||||
|
version = "0.10.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7df210bd982165dee3c20e31deed79a3585ee6b255c070d9c73ae015cc40d2f3"
|
||||||
|
dependencies = [
|
||||||
|
"bytes",
|
||||||
|
"http",
|
||||||
|
"http-body",
|
||||||
|
"pin-project-lite",
|
||||||
|
"tokio",
|
||||||
|
"tower",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-service"
|
name = "tower-service"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
|
|||||||
@@ -15,9 +15,14 @@ sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio",
|
|||||||
thiserror = "2.0.21"
|
thiserror = "2.0.21"
|
||||||
tokio = { version = "1.54.1", features = ["full"] }
|
tokio = { version = "1.54.1", features = ["full"] }
|
||||||
tower-http = { version = "0.7.1", features = ["trace"] }
|
tower-http = { version = "0.7.1", features = ["trace"] }
|
||||||
|
tower-livereload = { version = "0.10.3", optional = true }
|
||||||
tracing = "0.1.44"
|
tracing = "0.1.44"
|
||||||
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
|
||||||
|
|
||||||
|
[features]
|
||||||
|
# Recharge le navigateur au redémarrage du serveur (dev uniquement).
|
||||||
|
livereload = ["dep:tower-livereload"]
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
http-body-util = "0.1.5"
|
http-body-util = "0.1.5"
|
||||||
tower = { version = "0.5.3", features = ["util"] }
|
tower = { version = "0.5.3", features = ["util"] }
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
DEPLOY_DIR ?= /var/www/tempus
|
||||||
|
SERVICE ?= tempus
|
||||||
|
HOST ?= tempus.loc
|
||||||
|
ADDR ?= 127.0.0.1:3110
|
||||||
|
UNIT := $(HOME)/.config/systemd/user/$(SERVICE).service
|
||||||
|
SUBST := sed -e 's|@HOST@|$(HOST)|g' -e 's|@ADDR@|$(ADDR)|g' -e 's|@DEPLOY_DIR@|$(DEPLOY_DIR)|g'
|
||||||
|
|
||||||
|
.PHONY: build setup deploy backup status logs dev
|
||||||
|
|
||||||
|
## Compile le binaire (templates, CSS/JS et migrations sont embarqués).
|
||||||
|
build:
|
||||||
|
cargo build --release
|
||||||
|
|
||||||
|
## Une seule fois : dossier, vhost Apache et /etc/hosts (sudo), service systemd utilisateur.
|
||||||
|
setup:
|
||||||
|
sudo install -d -o $(USER) -g www-data -m 755 $(DEPLOY_DIR)
|
||||||
|
$(SUBST) deploy/vh_tempus.conf | sudo tee /etc/apache2/sites-available/vh_tempus.conf >/dev/null
|
||||||
|
sudo a2ensite -q vh_tempus
|
||||||
|
sudo systemctl reload apache2
|
||||||
|
grep -qw '$(HOST)' /etc/hosts || printf '127.0.0.1\t$(HOST)\n' | sudo tee -a /etc/hosts >/dev/null
|
||||||
|
install -d $(dir $(UNIT))
|
||||||
|
$(SUBST) deploy/tempus.service > $(UNIT)
|
||||||
|
systemctl --user daemon-reload
|
||||||
|
systemctl --user enable $(SERVICE)
|
||||||
|
|
||||||
|
## Sauvegarde la base, installe le nouveau binaire et redémarre le service.
|
||||||
|
deploy: build
|
||||||
|
systemctl --user stop $(SERVICE)
|
||||||
|
$(MAKE) --no-print-directory backup
|
||||||
|
install -m 755 target/release/tempus $(DEPLOY_DIR)/tempus
|
||||||
|
systemctl --user start $(SERVICE)
|
||||||
|
@for i in $$(seq 1 50); do \
|
||||||
|
curl -sf -o /dev/null http://$(ADDR)/health && echo "Déployé : http://$(HOST)" && exit 0; \
|
||||||
|
sleep 0.1; \
|
||||||
|
done; echo "Le service ne répond pas : make logs" >&2; exit 1
|
||||||
|
|
||||||
|
## Copie la base (service arrêté) dans $(DEPLOY_DIR)/backups, garde les 10 dernières.
|
||||||
|
backup:
|
||||||
|
@if [ -f $(DEPLOY_DIR)/tempus.db ]; then \
|
||||||
|
d=$(DEPLOY_DIR)/backups/$$(date +%Y%m%d-%H%M%S); mkdir -p $$d; \
|
||||||
|
cp $(DEPLOY_DIR)/tempus.db* $$d/ && echo "Sauvegarde : $$d"; \
|
||||||
|
ls -1dt $(DEPLOY_DIR)/backups/*/ | tail -n +11 | xargs -r rm -r; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
status:
|
||||||
|
systemctl --user status $(SERVICE) --no-pager
|
||||||
|
|
||||||
|
logs:
|
||||||
|
journalctl --user -u $(SERVICE) -f
|
||||||
|
|
||||||
|
## Dev : recompile, redémarre et recharge le navigateur à chaque modif.
|
||||||
|
dev:
|
||||||
|
watchexec -r -e rs,html,css,js,sql -- cargo run --features livereload
|
||||||
@@ -31,8 +31,8 @@ Aucune authentification : le service est prévu pour tourner en local.
|
|||||||
|--------------|----------------------------------------------------|
|
|--------------|----------------------------------------------------|
|
||||||
| GET, POST | `/clients` (`?archived=true` pour inclure les archivés) — `{"name", "color"?}` |
|
| GET, POST | `/clients` (`?archived=true` pour inclure les archivés) — `{"name", "color"?}` |
|
||||||
| PATCH, DELETE| `/clients/{id}` — `{"name"?, "archived"?, "color"?}` |
|
| PATCH, DELETE| `/clients/{id}` — `{"name"?, "archived"?, "color"?}` |
|
||||||
| GET, POST | `/clients/{id}/projects` — `{"name", "color"?}` |
|
| GET, POST | `/clients/{id}/projects` — `{"name", "color"?, "repo_url"?}` |
|
||||||
| PATCH, DELETE| `/projects/{id}` — `"color": null` pour reprendre celle du client |
|
| PATCH, DELETE| `/projects/{id}` — `"color": null` pour reprendre celle du client, `"repo_url": ""` pour l'effacer |
|
||||||
| GET | `/timer` — entrée en cours ou `null` |
|
| GET | `/timer` — entrée en cours ou `null` |
|
||||||
| POST | `/timer/start` `{"project_id", "note"?}` · `/timer/stop` |
|
| POST | `/timer/start` `{"project_id", "note"?}` · `/timer/stop` |
|
||||||
| GET, POST | `/entries` (`?from&to&client_id&project_id`) |
|
| GET, POST | `/entries` (`?from&to&client_id&project_id`) |
|
||||||
@@ -51,8 +51,33 @@ curl -XPOST localhost:7878/api/clients -H 'content-type: application/json' -d '{
|
|||||||
curl -XPOST localhost:7878/api/timer/start -H 'content-type: application/json' -d '{"project_id":1}'
|
curl -XPOST localhost:7878/api/timer/start -H 'content-type: application/json' -d '{"project_id":1}'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Production locale
|
||||||
|
|
||||||
|
Binaire dans `/var/www/tempus`, service systemd utilisateur, vhost Apache
|
||||||
|
(reverse proxy) sur http://tempus.loc → `127.0.0.1:3110`.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
make setup # une fois (sudo) : dossier, vhost, /etc/hosts, service
|
||||||
|
make deploy # compile, sauvegarde la base, installe, redémarre
|
||||||
|
make status # / make logs
|
||||||
|
```
|
||||||
|
|
||||||
|
La base de prod est `/var/www/tempus/tempus.db` ; chaque `make deploy` la copie
|
||||||
|
dans `/var/www/tempus/backups/` (10 dernières conservées). Variables
|
||||||
|
surchargeables : `DEPLOY_DIR`, `HOST`, `ADDR`, `SERVICE`.
|
||||||
|
|
||||||
## Développement
|
## Développement
|
||||||
|
|
||||||
|
Rechargement automatique (recompile, redémarre et rafraîchit le navigateur) :
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cargo install watchexec-cli # une fois
|
||||||
|
make dev
|
||||||
|
```
|
||||||
|
|
||||||
|
La feature `livereload` injecte un script dans les pages (pas dans les fragments
|
||||||
|
htmx) et désactive le cache des assets ; elle n'est jamais active par défaut.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cargo test
|
cargo test
|
||||||
cargo clippy --all-targets -- -D warnings
|
cargo clippy --all-targets -- -D warnings
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Tempus (suivi du temps)
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
WorkingDirectory=@DEPLOY_DIR@
|
||||||
|
Environment=TEMPUS_DB=@DEPLOY_DIR@/tempus.db
|
||||||
|
Environment=TEMPUS_ADDR=@ADDR@
|
||||||
|
ExecStart=@DEPLOY_DIR@/tempus
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=3
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<VirtualHost *:80>
|
||||||
|
ServerName @HOST@
|
||||||
|
ProxyPreserveHost On
|
||||||
|
ProxyPass / http://@ADDR@/
|
||||||
|
ProxyPassReverse / http://@ADDR@/
|
||||||
|
ErrorLog /var/log/apache2/error.@HOST@.log
|
||||||
|
CustomLog /var/log/apache2/access.@HOST@.log combined
|
||||||
|
</VirtualHost>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
-- Optional link to the project's source repository (http(s) URL).
|
||||||
|
ALTER TABLE projects ADD COLUMN repo_url TEXT;
|
||||||
+9
-1
@@ -20,7 +20,15 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
.await
|
.await
|
||||||
.with_context(|| format!("cannot listen on {}", config.addr))?;
|
.with_context(|| format!("cannot listen on {}", config.addr))?;
|
||||||
tracing::info!(db = %config.database_url, "Tempus disponible sur http://{}", config.addr);
|
tracing::info!(db = %config.database_url, "Tempus disponible sur http://{}", config.addr);
|
||||||
axum::serve(listener, routes::app(pool))
|
let app = routes::app(pool);
|
||||||
|
#[cfg(feature = "livereload")]
|
||||||
|
let app = app.layer(
|
||||||
|
// Les fragments htmx ne doivent pas recevoir le script injecté.
|
||||||
|
tower_livereload::LiveReloadLayer::new().request_predicate(
|
||||||
|
|req: &axum::http::Request<axum::body::Body>| !req.headers().contains_key("hx-request"),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
axum::serve(listener, app)
|
||||||
.with_graceful_shutdown(async {
|
.with_graceful_shutdown(async {
|
||||||
let _ = tokio::signal::ctrl_c().await;
|
let _ = tokio::signal::ctrl_c().await;
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ pub struct Project {
|
|||||||
pub color: Option<String>,
|
pub color: Option<String>,
|
||||||
/// `color`, or the client's color.
|
/// `color`, or the client's color.
|
||||||
pub effective_color: String,
|
pub effective_color: String,
|
||||||
|
/// Link to the source repository.
|
||||||
|
pub repo_url: Option<String>,
|
||||||
pub archived: bool,
|
pub archived: bool,
|
||||||
pub created_at: DateTime<Utc>,
|
pub created_at: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
@@ -97,6 +99,9 @@ pub struct NameInput {
|
|||||||
/// `#rrggbb`. Clients get one from the palette, projects inherit their client's.
|
/// `#rrggbb`. Clients get one from the palette, projects inherit their client's.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub color: Option<String>,
|
pub color: Option<String>,
|
||||||
|
/// Projects only: `http(s)://` link to the source repository.
|
||||||
|
#[serde(default)]
|
||||||
|
pub repo_url: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default, Deserialize)]
|
#[derive(Debug, Default, Deserialize)]
|
||||||
@@ -106,6 +111,9 @@ pub struct UpdateInput {
|
|||||||
/// Absent: unchanged. `null`: reset to the client's color (projects only).
|
/// Absent: unchanged. `null`: reset to the client's color (projects only).
|
||||||
#[serde(default, deserialize_with = "present")]
|
#[serde(default, deserialize_with = "present")]
|
||||||
pub color: Option<Option<String>>,
|
pub color: Option<Option<String>>,
|
||||||
|
/// Projects only. Absent: unchanged. `null` or `""`: removed.
|
||||||
|
#[serde(default, deserialize_with = "present")]
|
||||||
|
pub repo_url: Option<Option<String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
|
|||||||
@@ -33,6 +33,22 @@ fn clean_color(color: &str) -> AppResult<String> {
|
|||||||
Ok(color.to_ascii_lowercase())
|
Ok(color.to_ascii_lowercase())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Validates an optional repository URL; blank means none.
|
||||||
|
fn clean_repo_url(url: &str) -> AppResult<Option<String>> {
|
||||||
|
let url = url.trim();
|
||||||
|
if url.is_empty() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
let valid = (url.starts_with("https://") || url.starts_with("http://"))
|
||||||
|
&& !url.contains(char::is_whitespace);
|
||||||
|
if !valid {
|
||||||
|
return Err(AppError::Validation(format!(
|
||||||
|
"URL du repo invalide « {url} » (doit commencer par http:// ou https://)"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
Ok(Some(url.to_owned()))
|
||||||
|
}
|
||||||
|
|
||||||
/// Maps "zero rows affected" to `NotFound`.
|
/// Maps "zero rows affected" to `NotFound`.
|
||||||
fn affected(result: sqlx::sqlite::SqliteQueryResult) -> AppResult<()> {
|
fn affected(result: sqlx::sqlite::SqliteQueryResult) -> AppResult<()> {
|
||||||
if result.rows_affected() == 0 {
|
if result.rows_affected() == 0 {
|
||||||
|
|||||||
+16
-4
@@ -1,12 +1,13 @@
|
|||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
|
|
||||||
use super::{affected, clean_color, clean_name};
|
use super::{affected, clean_color, clean_name, clean_repo_url};
|
||||||
use crate::clock;
|
use crate::clock;
|
||||||
use crate::error::{AppError, AppResult};
|
use crate::error::{AppError, AppResult};
|
||||||
use crate::models::{Project, UpdateInput};
|
use crate::models::{Project, UpdateInput};
|
||||||
|
|
||||||
const SELECT: &str = "SELECT p.id, p.client_id, c.name AS client_name, p.name,
|
const SELECT: &str = "SELECT p.id, p.client_id, c.name AS client_name, p.name,
|
||||||
p.color, COALESCE(p.color, c.color) AS effective_color, p.archived, p.created_at
|
p.color, COALESCE(p.color, c.color) AS effective_color, p.repo_url, p.archived,
|
||||||
|
p.created_at
|
||||||
FROM projects p JOIN clients c ON c.id = p.client_id";
|
FROM projects p JOIN clients c ON c.id = p.client_id";
|
||||||
|
|
||||||
/// Lists projects, optionally for one client. Archived projects (or projects of
|
/// Lists projects, optionally for one client. Archived projects (or projects of
|
||||||
@@ -40,17 +41,21 @@ pub async fn create(
|
|||||||
client_id: i64,
|
client_id: i64,
|
||||||
name: &str,
|
name: &str,
|
||||||
color: Option<&str>,
|
color: Option<&str>,
|
||||||
|
repo_url: Option<&str>,
|
||||||
) -> AppResult<Project> {
|
) -> AppResult<Project> {
|
||||||
let name = clean_name(name)?;
|
let name = clean_name(name)?;
|
||||||
let color = color.map(clean_color).transpose()?;
|
let color = color.map(clean_color).transpose()?;
|
||||||
|
let repo_url = repo_url.map(clean_repo_url).transpose()?.flatten();
|
||||||
// Surface a missing client as 404 rather than a foreign key error.
|
// Surface a missing client as 404 rather than a foreign key error.
|
||||||
super::clients::get(pool, client_id).await?;
|
super::clients::get(pool, client_id).await?;
|
||||||
let id = sqlx::query(
|
let id = sqlx::query(
|
||||||
"INSERT INTO projects (client_id, name, color, created_at) VALUES (?1, ?2, ?3, ?4)",
|
"INSERT INTO projects (client_id, name, color, repo_url, created_at)
|
||||||
|
VALUES (?1, ?2, ?3, ?4, ?5)",
|
||||||
)
|
)
|
||||||
.bind(client_id)
|
.bind(client_id)
|
||||||
.bind(name)
|
.bind(name)
|
||||||
.bind(color)
|
.bind(color)
|
||||||
|
.bind(repo_url)
|
||||||
.bind(clock::ts(&clock::now()))
|
.bind(clock::ts(&clock::now()))
|
||||||
.execute(pool)
|
.execute(pool)
|
||||||
.await?
|
.await?
|
||||||
@@ -64,10 +69,15 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
|||||||
Some(Some(c)) => Some(clean_color(c)?),
|
Some(Some(c)) => Some(clean_color(c)?),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
|
let repo_url = match &input.repo_url {
|
||||||
|
Some(Some(u)) => clean_repo_url(u)?,
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
affected(
|
affected(
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE projects SET name = COALESCE(?2, name), archived = COALESCE(?3, archived),
|
"UPDATE projects SET name = COALESCE(?2, name), archived = COALESCE(?3, archived),
|
||||||
color = CASE WHEN ?4 THEN ?5 ELSE color END
|
color = CASE WHEN ?4 THEN ?5 ELSE color END,
|
||||||
|
repo_url = CASE WHEN ?6 THEN ?7 ELSE repo_url END
|
||||||
WHERE id = ?1",
|
WHERE id = ?1",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
@@ -75,6 +85,8 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
|||||||
.bind(input.archived)
|
.bind(input.archived)
|
||||||
.bind(input.color.is_some())
|
.bind(input.color.is_some())
|
||||||
.bind(color)
|
.bind(color)
|
||||||
|
.bind(input.repo_url.is_some())
|
||||||
|
.bind(repo_url)
|
||||||
.execute(pool)
|
.execute(pool)
|
||||||
.await?,
|
.await?,
|
||||||
)?;
|
)?;
|
||||||
|
|||||||
+10
-1
@@ -90,7 +90,16 @@ async fn create_project(
|
|||||||
) -> AppResult<(StatusCode, Json<Project>)> {
|
) -> AppResult<(StatusCode, Json<Project>)> {
|
||||||
Ok((
|
Ok((
|
||||||
StatusCode::CREATED,
|
StatusCode::CREATED,
|
||||||
Json(projects::create(&pool, client_id, &input.name, input.color.as_deref()).await?),
|
Json(
|
||||||
|
projects::create(
|
||||||
|
&pool,
|
||||||
|
client_id,
|
||||||
|
&input.name,
|
||||||
|
input.color.as_deref(),
|
||||||
|
input.repo_url.as_deref(),
|
||||||
|
)
|
||||||
|
.await?,
|
||||||
|
),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+27
-7
@@ -44,23 +44,43 @@ pub fn app(pool: SqlitePool) -> Router {
|
|||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
.route("/static/app.js", get(|| asset("text/javascript", APP_JS)))
|
||||||
|
.route("/static/app.css", get(|| asset("text/css", APP_CSS)))
|
||||||
.route(
|
.route(
|
||||||
"/static/app.js",
|
"/static/favicon.svg",
|
||||||
get(|| asset("text/javascript", include_str!("../../static/app.js"))),
|
get(|| asset("image/svg+xml", include_str!("../../static/favicon.svg"))),
|
||||||
)
|
|
||||||
.route(
|
|
||||||
"/static/app.css",
|
|
||||||
get(|| asset("text/css", include_str!("../../static/app.css"))),
|
|
||||||
)
|
)
|
||||||
.layer(TraceLayer::new_for_http())
|
.layer(TraceLayer::new_for_http())
|
||||||
.with_state(pool)
|
.with_state(pool)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const APP_CSS: &str = include_str!("../../static/app.css");
|
||||||
|
const APP_JS: &str = include_str!("../../static/app.js");
|
||||||
|
|
||||||
|
/// Hash of app.css + app.js, appended as `?v=` to their URLs so a deploy
|
||||||
|
/// bypasses the browser cache.
|
||||||
|
pub fn asset_version() -> &'static str {
|
||||||
|
static VERSION: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| {
|
||||||
|
use std::hash::{Hash, Hasher};
|
||||||
|
let mut h = std::collections::hash_map::DefaultHasher::new();
|
||||||
|
(APP_CSS, APP_JS).hash(&mut h);
|
||||||
|
format!("{:x}", h.finish())
|
||||||
|
});
|
||||||
|
&VERSION
|
||||||
|
}
|
||||||
|
|
||||||
|
// En livereload, le CSS/JS doit être relu à chaque rechargement.
|
||||||
|
const CACHE_CONTROL: &str = if cfg!(feature = "livereload") {
|
||||||
|
"no-cache"
|
||||||
|
} else {
|
||||||
|
"public, max-age=3600"
|
||||||
|
};
|
||||||
|
|
||||||
async fn asset(content_type: &'static str, body: &'static str) -> impl IntoResponse {
|
async fn asset(content_type: &'static str, body: &'static str) -> impl IntoResponse {
|
||||||
(
|
(
|
||||||
[
|
[
|
||||||
(header::CONTENT_TYPE, content_type),
|
(header::CONTENT_TYPE, content_type),
|
||||||
(header::CACHE_CONTROL, "public, max-age=3600"),
|
(header::CACHE_CONTROL, CACHE_CONTROL),
|
||||||
],
|
],
|
||||||
body,
|
body,
|
||||||
)
|
)
|
||||||
|
|||||||
+51
-9
@@ -212,7 +212,7 @@ struct DashboardTpl {
|
|||||||
groups: Vec<ProjectGroup>,
|
groups: Vec<ProjectGroup>,
|
||||||
today_entries: Vec<Entry>,
|
today_entries: Vec<Entry>,
|
||||||
today_total: String,
|
today_total: String,
|
||||||
recent_entries: Vec<Entry>,
|
recent_days: Vec<DayGroup>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Template)]
|
#[derive(Template)]
|
||||||
@@ -232,7 +232,36 @@ struct TodayTpl {
|
|||||||
#[derive(Template)]
|
#[derive(Template)]
|
||||||
#[template(path = "_recent.html")]
|
#[template(path = "_recent.html")]
|
||||||
struct RecentTpl {
|
struct RecentTpl {
|
||||||
recent_entries: Vec<Entry>,
|
recent_days: Vec<DayGroup>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Entries started on the same local day, with their total.
|
||||||
|
struct DayGroup {
|
||||||
|
day: String,
|
||||||
|
total: String,
|
||||||
|
entries: Vec<Entry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Groups a list sorted by start time into consecutive days.
|
||||||
|
fn group_by_day(list: Vec<Entry>) -> Vec<DayGroup> {
|
||||||
|
let mut days: Vec<(NaiveDate, i64, Vec<Entry>)> = Vec::new();
|
||||||
|
for e in list {
|
||||||
|
let date = clock::local_date(&e.started_at);
|
||||||
|
match days.last_mut() {
|
||||||
|
Some((d, secs, entries)) if *d == date => {
|
||||||
|
*secs += e.seconds;
|
||||||
|
entries.push(e);
|
||||||
|
}
|
||||||
|
_ => days.push((date, e.seconds, vec![e])),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
days.into_iter()
|
||||||
|
.map(|(date, secs, entries)| DayGroup {
|
||||||
|
day: clock::fmt_day(date),
|
||||||
|
total: clock::hhmm(secs),
|
||||||
|
entries,
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// How many entries the dashboard lists under "Dernières entrées".
|
/// How many entries the dashboard lists under "Dernières entrées".
|
||||||
@@ -266,8 +295,10 @@ async fn today_state(pool: &SqlitePool) -> PageResult<TodayTpl> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn recent_state(pool: &SqlitePool) -> PageResult<RecentTpl> {
|
async fn recent_state(pool: &SqlitePool) -> PageResult<RecentTpl> {
|
||||||
let recent_entries = entries::recent(pool, RECENT_LIMIT, clock::now()).await?;
|
let recent = entries::recent(pool, RECENT_LIMIT, clock::now()).await?;
|
||||||
Ok(RecentTpl { recent_entries })
|
Ok(RecentTpl {
|
||||||
|
recent_days: group_by_day(recent),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
|
async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
|
||||||
@@ -276,14 +307,14 @@ async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
|
|||||||
today_entries,
|
today_entries,
|
||||||
today_total,
|
today_total,
|
||||||
} = today_state(&pool).await?;
|
} = today_state(&pool).await?;
|
||||||
let RecentTpl { recent_entries } = recent_state(&pool).await?;
|
let RecentTpl { recent_days } = recent_state(&pool).await?;
|
||||||
render(DashboardTpl {
|
render(DashboardTpl {
|
||||||
nav: "dashboard",
|
nav: "dashboard",
|
||||||
running,
|
running,
|
||||||
groups,
|
groups,
|
||||||
today_entries,
|
today_entries,
|
||||||
today_total,
|
today_total,
|
||||||
recent_entries,
|
recent_days,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -386,6 +417,9 @@ struct ItemForm {
|
|||||||
/// Projects only: go back to the client's color.
|
/// Projects only: go back to the client's color.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
inherit: bool,
|
inherit: bool,
|
||||||
|
/// Projects only; blank removes it.
|
||||||
|
#[serde(default)]
|
||||||
|
repo_url: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@@ -445,7 +479,14 @@ async fn create_project(
|
|||||||
// The color picker is prefilled with the client's color: keeping it means inheriting.
|
// The color picker is prefilled with the client's color: keeping it means inheriting.
|
||||||
let client = clients::get(&pool, client_id).await?;
|
let client = clients::get(&pool, client_id).await?;
|
||||||
let color = f.color.filter(|c| !c.eq_ignore_ascii_case(&client.color));
|
let color = f.color.filter(|c| !c.eq_ignore_ascii_case(&client.color));
|
||||||
projects::create(&pool, client_id, &f.name, color.as_deref()).await?;
|
projects::create(
|
||||||
|
&pool,
|
||||||
|
client_id,
|
||||||
|
&f.name,
|
||||||
|
color.as_deref(),
|
||||||
|
f.repo_url.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
back_to_clients()
|
back_to_clients()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -466,6 +507,7 @@ async fn save_project(
|
|||||||
let input = UpdateInput {
|
let input = UpdateInput {
|
||||||
name: Some(f.name),
|
name: Some(f.name),
|
||||||
color,
|
color,
|
||||||
|
repo_url: f.repo_url.map(Some),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
projects::update(&pool, id, &input).await?;
|
projects::update(&pool, id, &input).await?;
|
||||||
@@ -499,7 +541,7 @@ struct EntriesTpl {
|
|||||||
clients: Vec<ClientOption>,
|
clients: Vec<ClientOption>,
|
||||||
filter_groups: Vec<ProjectGroup>,
|
filter_groups: Vec<ProjectGroup>,
|
||||||
groups: Vec<ProjectGroup>,
|
groups: Vec<ProjectGroup>,
|
||||||
entries: Vec<Entry>,
|
days: Vec<DayGroup>,
|
||||||
total: String,
|
total: String,
|
||||||
default_start: String,
|
default_start: String,
|
||||||
default_end: String,
|
default_end: String,
|
||||||
@@ -552,7 +594,7 @@ async fn entries_page(
|
|||||||
clients: client_options(clients::list(&pool, true).await?, filter.client_id),
|
clients: client_options(clients::list(&pool, true).await?, filter.client_id),
|
||||||
filter_groups: group_projects(projects::list(&pool, None, true).await?, filter.project_id),
|
filter_groups: group_projects(projects::list(&pool, None, true).await?, filter.project_id),
|
||||||
groups: group_projects(projects::list(&pool, None, false).await?, last_project),
|
groups: group_projects(projects::list(&pool, None, false).await?, last_project),
|
||||||
entries: list,
|
days: group_by_day(list),
|
||||||
total,
|
total,
|
||||||
default_start: format!("{today}T09:00"),
|
default_start: format!("{today}T09:00"),
|
||||||
default_end: format!("{today}T10:00"),
|
default_end: format!("{today}T10:00"),
|
||||||
|
|||||||
+25
-3
@@ -1,4 +1,7 @@
|
|||||||
:root {
|
:root {
|
||||||
|
/* Hauteur commune des champs, pastilles de couleur et boutons-icônes. */
|
||||||
|
--control: 2.5rem;
|
||||||
|
--control-sm: 1.9rem;
|
||||||
--bg: #f6f5f2;
|
--bg: #f6f5f2;
|
||||||
--surface: #ffffff;
|
--surface: #ffffff;
|
||||||
--text: #1d1d1f;
|
--text: #1d1d1f;
|
||||||
@@ -64,7 +67,8 @@ main { max-width: 960px; margin: 1.5rem auto; padding: 0 16px; display: grid; ga
|
|||||||
.row { display: flex; gap: .5rem; align-items: center; }
|
.row { display: flex; gap: .5rem; align-items: center; }
|
||||||
.row.wrap { flex-wrap: wrap; }
|
.row.wrap { flex-wrap: wrap; }
|
||||||
.grow { flex: 1; min-width: 0; }
|
.grow { flex: 1; min-width: 0; }
|
||||||
.row.grow input { flex: 1; min-width: 0; }
|
.row.grow input:not([type="color"]) { flex: 1; min-width: 0; }
|
||||||
|
.row input, .row select { height: var(--control); }
|
||||||
.stack { display: grid; gap: .35rem; }
|
.stack { display: grid; gap: .35rem; }
|
||||||
.muted, .empty { color: var(--muted); }
|
.muted, .empty { color: var(--muted); }
|
||||||
.empty { margin: .25rem 0; }
|
.empty { margin: .25rem 0; }
|
||||||
@@ -83,10 +87,23 @@ label { display: flex; align-items: center; gap: .35rem; color: var(--muted); }
|
|||||||
border: 1px solid var(--border); background: var(--surface); border-radius: 8px;
|
border: 1px solid var(--border); background: var(--surface); border-radius: 8px;
|
||||||
padding: .45rem .9rem; cursor: pointer; white-space: nowrap;
|
padding: .45rem .9rem; cursor: pointer; white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
a.btn { color: var(--text); text-decoration: none; }
|
||||||
.btn:hover { border-color: var(--muted); }
|
.btn:hover { border-color: var(--muted); }
|
||||||
.btn.primary { background: var(--accent); border-color: var(--accent); color: var(--accent-text); font-weight: 600; }
|
.btn.primary { background: var(--accent); border-color: var(--accent); color: var(--accent-text); font-weight: 600; }
|
||||||
.btn.danger { color: var(--danger); }
|
.btn.danger { color: var(--danger); }
|
||||||
.btn.small { padding: .2rem .55rem; font-size: .85rem; }
|
.btn.small { padding: .2rem .55rem; font-size: .85rem; }
|
||||||
|
.btn.icon {
|
||||||
|
display: inline-flex; align-items: center; justify-content: center; flex: none;
|
||||||
|
width: var(--control); height: var(--control); padding: 0; line-height: 0;
|
||||||
|
}
|
||||||
|
.btn.small.icon { width: var(--control-sm); height: var(--control-sm); }
|
||||||
|
.btn.icon svg { display: block; }
|
||||||
|
.btn-group { display: inline-flex; }
|
||||||
|
.btn-group > .btn { border-radius: 0; }
|
||||||
|
.btn-group > .btn + .btn { margin-left: -1px; }
|
||||||
|
.btn-group > .btn:first-child { border-top-left-radius: 8px; border-bottom-left-radius: 8px; }
|
||||||
|
.btn-group > .btn:last-child { border-top-right-radius: 8px; border-bottom-right-radius: 8px; }
|
||||||
|
.btn-group > .btn:hover { position: relative; z-index: 1; }
|
||||||
.htmx-request .btn, .btn.htmx-request { opacity: .6; }
|
.htmx-request .btn, .btn.htmx-request { opacity: .6; }
|
||||||
|
|
||||||
.badge { font-size: .75rem; padding: .1rem .5rem; border-radius: 999px; background: var(--bg); color: var(--muted); }
|
.badge { font-size: .75rem; padding: .1rem .5rem; border-radius: 999px; background: var(--bg); color: var(--muted); }
|
||||||
@@ -111,6 +128,8 @@ tr:last-child td { border-bottom: 0; }
|
|||||||
.time { white-space: nowrap; font-variant-numeric: tabular-nums; color: var(--muted); }
|
.time { white-space: nowrap; font-variant-numeric: tabular-nums; color: var(--muted); }
|
||||||
.client { color: var(--muted); }
|
.client { color: var(--muted); }
|
||||||
tr.running { background: var(--running); }
|
tr.running { background: var(--running); }
|
||||||
|
tr.day-head th { color: var(--text); font-weight: 600; font-size: .9rem; padding-top: 1.1rem; }
|
||||||
|
tbody:first-of-type tr.day-head th { padding-top: .6rem; }
|
||||||
tr.editing td { background: var(--bg); }
|
tr.editing td { background: var(--bg); }
|
||||||
tr.editing input, tr.editing select { width: 100%; }
|
tr.editing input, tr.editing select { width: 100%; }
|
||||||
td.actions { text-align: right; white-space: nowrap; }
|
td.actions { text-align: right; white-space: nowrap; }
|
||||||
@@ -123,9 +142,10 @@ td.actions { text-align: right; white-space: nowrap; }
|
|||||||
}
|
}
|
||||||
.client-card { border-left: 6px solid var(--color); }
|
.client-card { border-left: 6px solid var(--color); }
|
||||||
input[type="color"] {
|
input[type="color"] {
|
||||||
width: 2.2rem; height: 2.2rem; padding: .15rem; flex: none; cursor: pointer;
|
width: var(--control); height: var(--control); padding: .15rem; flex: none; cursor: pointer;
|
||||||
}
|
}
|
||||||
.projects input[type="color"] { width: 1.8rem; height: 1.8rem; }
|
.projects input { height: var(--control-sm); padding-block: 0; }
|
||||||
|
.projects input[type="color"] { width: var(--control-sm); padding: .1rem; }
|
||||||
|
|
||||||
/* Projects list */
|
/* Projects list */
|
||||||
.projects { list-style: none; margin: 0 0 1rem; padding: 0; }
|
.projects { list-style: none; margin: 0 0 1rem; padding: 0; }
|
||||||
@@ -134,6 +154,8 @@ input[type="color"] {
|
|||||||
padding: .4rem 0; border-bottom: 1px solid var(--border);
|
padding: .4rem 0; border-bottom: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
.projects li.archived { opacity: .6; }
|
.projects li.archived { opacity: .6; }
|
||||||
|
.row.grow input.repo-url { flex: 1.3; }
|
||||||
|
.projects li > form::before { content: "-"; color: var(--muted); flex: none; }
|
||||||
|
|
||||||
/* Periods & reports */
|
/* Periods & reports */
|
||||||
.presets { display: flex; gap: .35rem; flex-wrap: wrap; margin-bottom: .75rem; }
|
.presets { display: flex; gap: .35rem; flex-wrap: wrap; margin-bottom: .75rem; }
|
||||||
|
|||||||
@@ -61,3 +61,44 @@ function removeRow(button) {
|
|||||||
for (const input of row.querySelectorAll("input")) input._flatpickr?.destroy();
|
for (const input of row.querySelectorAll("input")) input._flatpickr?.destroy();
|
||||||
row.remove();
|
row.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Favicon : point rouge clignotant tant qu'un enregistrement est en cours,
|
||||||
|
// sur toutes les pages (état lu sur /api/timer).
|
||||||
|
const favicon = document.getElementById("favicon");
|
||||||
|
const IDLE_ICON = favicon.href;
|
||||||
|
const recIcon = (opacity) =>
|
||||||
|
"data:image/svg+xml," +
|
||||||
|
encodeURIComponent(
|
||||||
|
`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><circle cx="16" cy="16" r="13" fill="#e5322d" fill-opacity="${opacity}"/></svg>`,
|
||||||
|
);
|
||||||
|
const REC_ON = recIcon(1);
|
||||||
|
const REC_OFF = recIcon(0.2);
|
||||||
|
let recording = false;
|
||||||
|
let blinkOn = false;
|
||||||
|
|
||||||
|
function setRecording(value) {
|
||||||
|
if (value === recording) return;
|
||||||
|
recording = value;
|
||||||
|
blinkOn = true;
|
||||||
|
favicon.href = recording ? REC_ON : IDLE_ICON;
|
||||||
|
}
|
||||||
|
setInterval(() => {
|
||||||
|
if (!recording) return;
|
||||||
|
blinkOn = !blinkOn;
|
||||||
|
favicon.href = blinkOn ? REC_ON : REC_OFF;
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
async function refreshRecording() {
|
||||||
|
try {
|
||||||
|
const res = await fetch("/api/timer", { headers: { accept: "application/json" } });
|
||||||
|
if (res.ok) setRecording((await res.json()) !== null);
|
||||||
|
} catch {
|
||||||
|
// Serveur injoignable : on garde l'état connu.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
refreshRecording();
|
||||||
|
setInterval(refreshRecording, 20000);
|
||||||
|
document.addEventListener("visibilitychange", () => {
|
||||||
|
if (!document.hidden) refreshRecording();
|
||||||
|
});
|
||||||
|
document.body.addEventListener("htmx:afterRequest", refreshRecording);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12" fill="none" stroke="#2f6f5e" stroke-width="4"/><path d="M16 9v7l4 3" fill="none" stroke="#2f6f5e" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/></svg>
|
||||||
|
After Width: | Height: | Size: 261 B |
@@ -0,0 +1,6 @@
|
|||||||
|
{% for d in days %}
|
||||||
|
<tbody>
|
||||||
|
<tr class="day-head"><th colspan="3">{{ d.day }}</th><th class="num">{{ d.total }}</th><th></th></tr>
|
||||||
|
{% for e in d.entries %}{% include "_entry_row.html" %}{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
{% endfor %}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<tr class="editing">
|
<tr class="editing">
|
||||||
<td colspan="2">
|
<td>
|
||||||
<div class="stack">
|
<div class="stack">
|
||||||
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
|
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
|
||||||
<input type="datetime-local" name="ended_at" value="{{ end }}" required aria-label="Fin">
|
<input type="datetime-local" name="ended_at" value="{{ end }}" required aria-label="Fin">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<tr id="entry-{{ e.id }}" class="editing">
|
<tr id="entry-{{ e.id }}" class="editing">
|
||||||
<td colspan="2">
|
<td>
|
||||||
<div class="stack">
|
<div class="stack">
|
||||||
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
|
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
|
||||||
{% if e.running() %}
|
{% if e.running() %}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
{% import "_icons.html" as icons %}
|
||||||
<tr id="entry-{{ e.id }}"{% if e.running() %} class="running"{% endif %}>
|
<tr id="entry-{{ e.id }}"{% if e.running() %} class="running"{% endif %}>
|
||||||
<td class="nowrap">{{ e.day() }}</td>
|
|
||||||
<td class="time">
|
<td class="time">
|
||||||
{{ e.start_time() }} – {{ e.end_time() }}
|
{{ e.start_time() }} – {{ e.end_time() }}
|
||||||
{% if e.overlaps %}<span class="warn" title="Chevauche une autre entrée">⚠</span>{% endif %}
|
{% if e.overlaps %}<span class="warn" title="Chevauche une autre entrée">⚠</span>{% endif %}
|
||||||
@@ -8,8 +8,10 @@
|
|||||||
<td class="note">{{ e.note }}</td>
|
<td class="note">{{ e.note }}</td>
|
||||||
<td class="num">{{ e.duration() }}</td>
|
<td class="num">{{ e.duration() }}</td>
|
||||||
<td class="actions">
|
<td class="actions">
|
||||||
<button class="btn small" hx-get="/ui/entries/{{ e.id }}/edit" hx-target="closest tr" hx-swap="outerHTML">Modifier</button>
|
<div class="btn-group">
|
||||||
<button class="btn small" hx-get="/ui/entries/{{ e.id }}/dupliquer" hx-target="closest tr" hx-swap="afterend">Dupliquer</button>
|
<button class="btn small icon primary" title="Modifier" aria-label="Modifier" hx-get="/ui/entries/{{ e.id }}/edit" hx-target="closest tr" hx-swap="outerHTML">{% call icons::icon("edit") %}{% endcall %}</button>
|
||||||
<button class="btn small danger" hx-delete="/ui/entries/{{ e.id }}" hx-target="closest tr" hx-swap="outerHTML" hx-confirm="Supprimer cette entrée ?">Suppr.</button>
|
<button class="btn small icon" title="Dupliquer" aria-label="Dupliquer" hx-get="/ui/entries/{{ e.id }}/dupliquer" hx-target="closest tr" hx-swap="afterend">{% call icons::icon("copy") %}{% endcall %}</button>
|
||||||
|
<button class="btn small icon danger" title="Supprimer" aria-label="Supprimer" hx-delete="/ui/entries/{{ e.id }}" hx-target="closest tr" hx-swap="outerHTML" hx-confirm="Supprimer cette entrée ?">{% call icons::icon("trash") %}{% endcall %}</button>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{# Icônes SVG (tracés Lucide), en couleur du texte. #}
|
||||||
|
{% macro icon(name) %}<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
|
||||||
|
{%- if name == "edit" -%}<path d="M12 20h9"/><path d="M16.5 3.5a2.1 2.1 0 0 1 3 3L7 19l-4 1 1-4Z"/>
|
||||||
|
{%- else if name == "copy" -%}<rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/>
|
||||||
|
{%- else if name == "trash" -%}<path d="M3 6h18"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><path d="M10 11v6"/><path d="M14 11v6"/>
|
||||||
|
{%- else if name == "check" -%}<path d="M20 6 9 17l-5-5"/>
|
||||||
|
{%- else if name == "plus" -%}<path d="M5 12h14"/><path d="M12 5v14"/>
|
||||||
|
{%- else if name == "reset" -%}<path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/>
|
||||||
|
{%- else if name == "link" -%}<path d="M15 3h6v6"/><path d="M10 14 21 3"/><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/>
|
||||||
|
{%- else if name == "archive" -%}<rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8"/><path d="M10 12h4"/>
|
||||||
|
{%- else if name == "unarchive" -%}<rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 0 0 2 2h2"/><path d="M20 8v11a2 2 0 0 1-2 2h-2"/><path d="m9 15 3-3 3 3"/><path d="M12 12v9"/>
|
||||||
|
{%- endif -%}
|
||||||
|
</svg>{% endmacro %}
|
||||||
+3
-14
@@ -3,24 +3,13 @@
|
|||||||
<h2>Dernières entrées</h2>
|
<h2>Dernières entrées</h2>
|
||||||
<a href="/entries">Tout voir</a>
|
<a href="/entries">Tout voir</a>
|
||||||
</div>
|
</div>
|
||||||
{% if recent_entries.is_empty() %}
|
{% if recent_days.is_empty() %}
|
||||||
<p class="empty">Aucune entrée pour l'instant.</p>
|
<p class="empty">Aucune entrée pour l'instant.</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="table-wrap">
|
<div class="table-wrap">
|
||||||
<table class="entries">
|
<table class="entries">
|
||||||
<tbody>
|
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
|
||||||
{% for e in recent_entries %}
|
{% let days = recent_days %}{% include "_entry_days.html" %}
|
||||||
<tr{% if e.running() %} class="running"{% endif %}>
|
|
||||||
<td class="nowrap">{{ e.day() }}</td>
|
|
||||||
<td class="time">{{ e.start_time() }} – {{ e.end_time() }}</td>
|
|
||||||
<td>
|
|
||||||
<span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {{ e.project_name }}
|
|
||||||
{% if !e.note.is_empty() %}<div class="note">{{ e.note }}</div>{% endif %}
|
|
||||||
</td>
|
|
||||||
<td class="num">{{ e.duration() }}</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
+4
-10
@@ -6,19 +6,13 @@
|
|||||||
{% if today_entries.is_empty() %}
|
{% if today_entries.is_empty() %}
|
||||||
<p class="empty">Rien de saisi pour l'instant.</p>
|
<p class="empty">Rien de saisi pour l'instant.</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
<div class="table-wrap">
|
||||||
<table class="entries">
|
<table class="entries">
|
||||||
|
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for e in today_entries %}
|
{% for e in today_entries %}{% include "_entry_row.html" %}{% endfor %}
|
||||||
<tr{% if e.running() %} class="running"{% endif %}>
|
|
||||||
<td class="time">{{ e.start_time() }} – {{ e.end_time() }}</td>
|
|
||||||
<td>
|
|
||||||
<span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {{ e.project_name }}
|
|
||||||
{% if !e.note.is_empty() %}<div class="note">{{ e.note }}</div>{% endif %}
|
|
||||||
</td>
|
|
||||||
<td class="num">{{ e.duration() }}</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
+3
-2
@@ -4,12 +4,13 @@
|
|||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>{% block title %}Tempus{% endblock %} · Tempus</title>
|
<title>{% block title %}Tempus{% endblock %} · Tempus</title>
|
||||||
|
<link rel="icon" id="favicon" type="image/svg+xml" href="/static/favicon.svg">
|
||||||
<link rel="stylesheet" href="/static/flatpickr/flatpickr.min.css">
|
<link rel="stylesheet" href="/static/flatpickr/flatpickr.min.css">
|
||||||
<link rel="stylesheet" href="/static/app.css">
|
<link rel="stylesheet" href="/static/app.css?v={{ crate::routes::asset_version() }}">
|
||||||
<script src="/static/htmx.min.js" defer></script>
|
<script src="/static/htmx.min.js" defer></script>
|
||||||
<script src="/static/flatpickr/flatpickr.min.js" defer></script>
|
<script src="/static/flatpickr/flatpickr.min.js" defer></script>
|
||||||
<script src="/static/flatpickr/fr.min.js" defer></script>
|
<script src="/static/flatpickr/fr.min.js" defer></script>
|
||||||
<script src="/static/app.js" defer></script>
|
<script src="/static/app.js?v={{ crate::routes::asset_version() }}" defer></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header class="topbar">
|
<header class="topbar">
|
||||||
|
|||||||
+33
-15
@@ -1,4 +1,5 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
{% import "_icons.html" as icons %}
|
||||||
{% block title %}Clients{% endblock %}
|
{% block title %}Clients{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section class="card">
|
<section class="card">
|
||||||
@@ -6,7 +7,7 @@
|
|||||||
<form method="post" action="/ui/clients" class="row">
|
<form method="post" action="/ui/clients" class="row">
|
||||||
<input type="color" name="color" value="{{ next_color }}" aria-label="Couleur du client">
|
<input type="color" name="color" value="{{ next_color }}" aria-label="Couleur du client">
|
||||||
<input name="name" required placeholder="Nom du client" aria-label="Nom du client" class="grow">
|
<input name="name" required placeholder="Nom du client" aria-label="Nom du client" class="grow">
|
||||||
<button class="btn primary">Ajouter</button>
|
<button class="btn icon primary" title="Ajouter le client" aria-label="Ajouter le client">{% call icons::icon("plus") %}{% endcall %}</button>
|
||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -20,17 +21,22 @@
|
|||||||
<form method="post" action="/ui/clients/{{ c.client.id }}" class="row grow">
|
<form method="post" action="/ui/clients/{{ c.client.id }}" class="row grow">
|
||||||
<input type="color" name="color" value="{{ c.client.color }}" aria-label="Couleur du client">
|
<input type="color" name="color" value="{{ c.client.color }}" aria-label="Couleur du client">
|
||||||
<input name="name" value="{{ c.client.name }}" required aria-label="Nom du client" class="title-input">
|
<input name="name" value="{{ c.client.name }}" required aria-label="Nom du client" class="title-input">
|
||||||
<button class="btn">Enregistrer</button>
|
<button class="btn icon primary" title="Enregistrer" aria-label="Enregistrer">{% call icons::icon("check") %}{% endcall %}</button>
|
||||||
</form>
|
</form>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{% if c.client.archived %}<span class="badge">archivé</span>{% endif %}
|
{% if c.client.archived %}<span class="badge">archivé</span>{% endif %}
|
||||||
<form method="post" action="/ui/clients/{{ c.client.id }}/archive">
|
<form id="archive-client-{{ c.client.id }}" method="post" action="/ui/clients/{{ c.client.id }}/archive" hidden>
|
||||||
<input type="hidden" name="archived" value="{{ !c.client.archived }}">
|
<input type="hidden" name="archived" value="{{ !c.client.archived }}">
|
||||||
<button class="btn">{% if c.client.archived %}Réactiver{% else %}Archiver{% endif %}</button>
|
|
||||||
</form>
|
|
||||||
<form method="post" action="/ui/clients/{{ c.client.id }}/delete" data-confirm="Supprimer ce client, ses projets et tout le temps saisi ?">
|
|
||||||
<button class="btn danger">Supprimer</button>
|
|
||||||
</form>
|
</form>
|
||||||
|
<form id="delete-client-{{ c.client.id }}" method="post" action="/ui/clients/{{ c.client.id }}/delete" data-confirm="Supprimer ce client, ses projets et tout le temps saisi ?" hidden></form>
|
||||||
|
<div class="btn-group">
|
||||||
|
{% if c.client.archived %}
|
||||||
|
<button class="btn icon" form="archive-client-{{ c.client.id }}" title="Réactiver" aria-label="Réactiver">{% call icons::icon("unarchive") %}{% endcall %}</button>
|
||||||
|
{% else %}
|
||||||
|
<button class="btn icon" form="archive-client-{{ c.client.id }}" title="Archiver" aria-label="Archiver">{% call icons::icon("archive") %}{% endcall %}</button>
|
||||||
|
{% endif %}
|
||||||
|
<button class="btn icon danger" form="delete-client-{{ c.client.id }}" title="Supprimer" aria-label="Supprimer">{% call icons::icon("trash") %}{% endcall %}</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -41,20 +47,31 @@
|
|||||||
<input type="color" name="color" value="{{ p.effective_color }}" aria-label="Couleur du projet"
|
<input type="color" name="color" value="{{ p.effective_color }}" aria-label="Couleur du projet"
|
||||||
title="{% if p.color.is_some() %}Couleur propre au projet{% else %}Couleur du client{% endif %}">
|
title="{% if p.color.is_some() %}Couleur propre au projet{% else %}Couleur du client{% endif %}">
|
||||||
<input name="name" value="{{ p.name }}" required aria-label="Nom du projet">
|
<input name="name" value="{{ p.name }}" required aria-label="Nom du projet">
|
||||||
<button class="btn small">Enregistrer</button>
|
<input type="url" name="repo_url" value="{% if let Some(u) = p.repo_url %}{{ u }}{% endif %}" placeholder="URL du repo" aria-label="URL du repo" class="repo-url">
|
||||||
|
<div class="btn-group">
|
||||||
|
<button class="btn small icon primary" title="Enregistrer" aria-label="Enregistrer">{% call icons::icon("check") %}{% endcall %}</button>
|
||||||
{% if p.color.is_some() %}
|
{% if p.color.is_some() %}
|
||||||
<button class="btn small" name="inherit" value="true" title="Reprendre la couleur du client">↺</button>
|
<button class="btn small icon" name="inherit" value="true" title="Reprendre la couleur du client" aria-label="Reprendre la couleur du client">{% call icons::icon("reset") %}{% endcall %}</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{% if p.archived %}<span class="badge">archivé</span>{% endif %}
|
{% if p.archived %}<span class="badge">archivé</span>{% endif %}
|
||||||
<form method="post" action="/ui/projects/{{ p.id }}/archive">
|
<form id="archive-project-{{ p.id }}" method="post" action="/ui/projects/{{ p.id }}/archive" hidden>
|
||||||
<input type="hidden" name="archived" value="{{ !p.archived }}">
|
<input type="hidden" name="archived" value="{{ !p.archived }}">
|
||||||
<button class="btn small">{% if p.archived %}Réactiver{% else %}Archiver{% endif %}</button>
|
|
||||||
</form>
|
|
||||||
<form method="post" action="/ui/projects/{{ p.id }}/delete" data-confirm="Supprimer ce projet et tout le temps saisi dessus ?">
|
|
||||||
<button class="btn small danger">Supprimer</button>
|
|
||||||
</form>
|
</form>
|
||||||
|
<form id="delete-project-{{ p.id }}" method="post" action="/ui/projects/{{ p.id }}/delete" data-confirm="Supprimer ce projet et tout le temps saisi dessus ?" hidden></form>
|
||||||
|
<div class="btn-group">
|
||||||
|
{% if let Some(u) = p.repo_url %}
|
||||||
|
<a class="btn small icon" href="{{ u }}" target="_blank" rel="noopener noreferrer" title="Ouvrir le repo" aria-label="Ouvrir le repo">{% call icons::icon("link") %}{% endcall %}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if p.archived %}
|
||||||
|
<button class="btn small icon" form="archive-project-{{ p.id }}" title="Réactiver" aria-label="Réactiver">{% call icons::icon("unarchive") %}{% endcall %}</button>
|
||||||
|
{% else %}
|
||||||
|
<button class="btn small icon" form="archive-project-{{ p.id }}" title="Archiver" aria-label="Archiver">{% call icons::icon("archive") %}{% endcall %}</button>
|
||||||
|
{% endif %}
|
||||||
|
<button class="btn small icon danger" form="delete-project-{{ p.id }}" title="Supprimer" aria-label="Supprimer">{% call icons::icon("trash") %}{% endcall %}</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -63,7 +80,8 @@
|
|||||||
<form method="post" action="/ui/clients/{{ c.client.id }}/projects" class="row">
|
<form method="post" action="/ui/clients/{{ c.client.id }}/projects" class="row">
|
||||||
<input type="color" name="color" value="{{ c.client.color }}" aria-label="Couleur du projet" title="Garder la couleur du client ou en choisir une autre">
|
<input type="color" name="color" value="{{ c.client.color }}" aria-label="Couleur du projet" title="Garder la couleur du client ou en choisir une autre">
|
||||||
<input name="name" required placeholder="Nouveau projet" aria-label="Nouveau projet" class="grow">
|
<input name="name" required placeholder="Nouveau projet" aria-label="Nouveau projet" class="grow">
|
||||||
<button class="btn">Ajouter le projet</button>
|
<input type="url" name="repo_url" placeholder="URL du repo (facultatif)" aria-label="URL du repo" class="grow">
|
||||||
|
<button class="btn icon primary" title="Ajouter le projet" aria-label="Ajouter le projet">{% call icons::icon("plus") %}{% endcall %}</button>
|
||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="card">
|
<section id="entries-list" class="card" hx-get="/entries?from={{ from }}&to={{ to }}{{ extra_query }}" hx-select="#entries-list" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
|
||||||
<div class="card-head">
|
<div class="card-head">
|
||||||
<h2>Entrées</h2>
|
<h2>Entrées</h2>
|
||||||
<span class="total">{{ total }}</span>
|
<span class="total">{{ total }}</span>
|
||||||
@@ -40,15 +40,13 @@
|
|||||||
<button class="btn">Filtrer</button>
|
<button class="btn">Filtrer</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
{% if entries.is_empty() %}
|
{% if days.is_empty() %}
|
||||||
<p class="empty">Aucune entrée sur cette période.</p>
|
<p class="empty">Aucune entrée sur cette période.</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="table-wrap">
|
<div class="table-wrap">
|
||||||
<table class="entries">
|
<table class="entries">
|
||||||
<thead><tr><th>Jour</th><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
|
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
|
||||||
<tbody>
|
{% include "_entry_days.html" %}
|
||||||
{% for e in entries %}{% include "_entry_row.html" %}{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
+59
-2
@@ -467,7 +467,7 @@ async fn dashboard_lists_20_most_recent_entries() {
|
|||||||
|
|
||||||
let (status, html) = get_html(&app, "/ui/dernieres-entrees").await;
|
let (status, html) = get_html(&app, "/ui/dernieres-entrees").await;
|
||||||
assert_eq!(status, StatusCode::OK);
|
assert_eq!(status, StatusCode::OK);
|
||||||
assert_eq!(html.matches("<tr").count(), 20);
|
assert_eq!(html.matches("<tr id=\"entry-").count(), 20);
|
||||||
assert!(html.contains("25/03/2026") && html.contains("06/03/2026"));
|
assert!(html.contains("25/03/2026") && html.contains("06/03/2026"));
|
||||||
assert!(!html.contains("05/03/2026"));
|
assert!(!html.contains("05/03/2026"));
|
||||||
}
|
}
|
||||||
@@ -649,7 +649,12 @@ async fn duplicate_entry() {
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
assert_eq!(status, StatusCode::OK);
|
assert_eq!(status, StatusCode::OK);
|
||||||
assert!(html.contains("id=\"entry-2\"") && html.contains("mer. 11/03/2026"));
|
assert!(html.contains("id=\"entry-2\"") && html.contains("09:00 – 10:15"));
|
||||||
|
|
||||||
|
// /entries groups rows under one header per day, with the day total.
|
||||||
|
let (_, html) = get_html(&app, "/entries?from=2026-03-09&to=2026-03-15").await;
|
||||||
|
assert_eq!(html.matches("class=\"day-head\"").count(), 2);
|
||||||
|
assert!(html.contains("mer. 11/03/2026") && html.contains("mar. 10/03/2026"));
|
||||||
|
|
||||||
let (_, list) = send(
|
let (_, list) = send(
|
||||||
&app,
|
&app,
|
||||||
@@ -702,3 +707,55 @@ async fn move_timer_start() {
|
|||||||
let (status, _) = send_form(&app, "/ui/timer/debut", &format!("started_at={future}")).await;
|
let (status, _) = send_form(&app, "/ui/timer/debut", &format!("started_at={future}")).await;
|
||||||
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn project_repo_url() {
|
||||||
|
let app = app().await;
|
||||||
|
let (_, c) = send(
|
||||||
|
&app,
|
||||||
|
"POST",
|
||||||
|
"/api/clients",
|
||||||
|
Some(json!({ "name": "Acme" })),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let uri = format!("/api/clients/{}/projects", c["id"]);
|
||||||
|
|
||||||
|
let (status, p) = send(
|
||||||
|
&app,
|
||||||
|
"POST",
|
||||||
|
&uri,
|
||||||
|
Some(json!({ "name": "Site", "repo_url": " https://git.example.com/acme/site " })),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::CREATED);
|
||||||
|
assert_eq!(p["repo_url"], "https://git.example.com/acme/site");
|
||||||
|
|
||||||
|
let (status, _) = send(
|
||||||
|
&app,
|
||||||
|
"POST",
|
||||||
|
&uri,
|
||||||
|
Some(json!({ "name": "Bad", "repo_url": "git@example.com:acme/site.git" })),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
|
||||||
|
// Absent: unchanged; "" clears it.
|
||||||
|
let project = format!("/api/projects/{}", p["id"]);
|
||||||
|
let (_, p) = send(&app, "PATCH", &project, Some(json!({ "name": "Site web" }))).await;
|
||||||
|
assert_eq!(p["repo_url"], "https://git.example.com/acme/site");
|
||||||
|
let (_, html) = get_html(&app, "/clients").await;
|
||||||
|
assert!(html.contains("href=\"https://git.example.com/acme/site\""));
|
||||||
|
let (_, p) = send(&app, "PATCH", &project, Some(json!({ "repo_url": "" }))).await;
|
||||||
|
assert!(p["repo_url"].is_null());
|
||||||
|
|
||||||
|
// HTML form: the URL field is saved with the project.
|
||||||
|
let (status, _) = send_form(
|
||||||
|
&app,
|
||||||
|
&project.replace("/api/", "/ui/"),
|
||||||
|
"name=Site+web&repo_url=https%3A%2F%2Fgit.example.com%2Fx",
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::SEE_OTHER);
|
||||||
|
let (_, p) = send(&app, "GET", &format!("{uri}?archived=true"), None).await;
|
||||||
|
assert_eq!(p[0]["repo_url"], "https://git.example.com/x");
|
||||||
|
}
|
||||||
Reference in new issue
Block a user