Skip to content

Commit

Permalink
Workout enhancements (#940)
Browse files Browse the repository at this point in the history
* fix(frontend): use react query to get exercise details

* refactor(frontend): remove mostly duplicated workouts component

* feat(frontend): hide exercise details when not required

* build(ts): upgrade dependencies

* chore(frontend); set correct index

* chore(frontend): add a new prop

* fix(frontend): add id to outer details

* fix(frontend): set correct key for set

* build(backend): upgrade deps

* fix(backend): log when job is running

* chore(backend): allow dead code

* build(backend): remove unused dep
  • Loading branch information
IgnisDa authored Aug 1, 2024
1 parent 2b40a68 commit b0ed55b
Show file tree
Hide file tree
Showing 10 changed files with 294 additions and 368 deletions.
143 changes: 39 additions & 104 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions apps/backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "GPL-3.0"
[dependencies]
anyhow = { workspace = true }
apalis = { version = "=0.5.3", features = ["cron", "limit"] }
argon2 = "=0.6.0-pre.0"
argon2 = "=0.6.0-pre.1"
askama = "0.12.1"
async-graphql = { workspace = true }
async-graphql-axum = "=7.0.7"
Expand Down Expand Up @@ -43,15 +43,14 @@ http = "=1.1.0"
isolang = { version = "=2.4.0", features = ["list_languages"] }
itertools = "=0.13.0"
jsonwebtoken = { version = "=9.3.0", default-features = false }
kinded = "=0.3.0"
lettre = "=0.11.7"
markdown = "=1.0.0-alpha.18"
mime_guess = "=2.0.5"
nanoid = { workspace = true }
openidconnect = "=3.5.0"
paginate = "=1.1.11"
radarr-api-rs = "=3.0.1"
rand = "=0.9.0-alpha.1"
rand = "=0.9.0-alpha.2"
regex = "=1.10.5"
# FIXME: Upgrade once https://github.com/seanmonstar/reqwest/pull/1620 is merged
reqwest = { git = "https://github.com/thomasqueirozb/reqwest", branch = "base_url", features = [
Expand All @@ -75,12 +74,11 @@ slug = "=0.1.5"
sonarr-api-rs = "=3.0.0"
strum = { workspace = true }
struson = { version = "=0.5.0", features = ["serde"] }
tokio = { version = "=1.38.1", features = ["full"] }
tokio = { version = "=1.39.2", features = ["full"] }
tokio-util = { version = "=0.7.11", features = ["codec"] }
tower = { version = "=0.4.13", features = ["buffer"] }
tower-http = { version = "=0.5.2", features = ["catch-panic", "cors", "trace"] }
tracing = { workspace = true }
tracing-subscriber = "=0.3.18"
logs-wheel = "=0.3.1"
unkey = "=0.4.0"
uuid = { version = "=1.10.0", features = ["v4"], default-features = false }
3 changes: 2 additions & 1 deletion apps/backend/src/background.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ impl Job for ScheduledJob {
}

pub async fn background_jobs(
_information: ScheduledJob,
information: ScheduledJob,
misc_service: Data<Arc<MiscellaneousService>>,
) -> Result<(), Error> {
tracing::debug!("Running job at {:#?}", information.0);
misc_service.perform_background_jobs().await.unwrap();
Ok(())
}
Expand Down
1 change: 1 addition & 0 deletions apps/backend/src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ pub trait DatabaseAssetsAsUrls {

#[async_trait]
pub trait AuthProvider {
#[allow(dead_code)]
fn is_mutation(&self) -> bool {
false
}
Expand Down
Loading

0 comments on commit b0ed55b

Please sign in to comment.