diff --git a/Cargo.lock b/Cargo.lock index cfd9fe7753..71ced1155e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ "getrandom", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -235,9 +235,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" -version = "0.6.0-pre.0" +version = "0.6.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c799111f751be3d73409b0b9e4160b0c69389216a66c463797eee5b243f7ef" +checksum = "8f95281c5706985b6c00f8a2270438f968d475672aa68a4a85cddcb57a68577b" dependencies = [ "base64ct", "blake2", @@ -904,11 +904,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.11.0-pre.3" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb6b33ba68af672bcef0f6d1cceeeaf36e4143cd1456cafafda5d7f12d91f14" +checksum = "e6dbf347378982186052c47f25f33fc1a6eb439ee840d778eb3ec132e304379d" dependencies = [ - "digest 0.11.0-pre.8", + "digest 0.11.0-pre.9", ] [[package]] @@ -922,11 +922,11 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.11.0-pre.5" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ded684142010808eb980d9974ef794da2bcf97d13396143b1515e9f0fb4a10e" +checksum = "17092d478f4fadfb35a7e082f62e49f0907fdf048801d9d706277e34f9df8a78" dependencies = [ - "crypto-common 0.2.0-pre.5", + "crypto-common 0.2.0-rc.0", ] [[package]] @@ -1389,9 +1389,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-pre.5" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7aa2ec04f5120b830272a481e8d9d8ba4dda140d2cda59b0f1110d5eb93c38e" +checksum = "8c070b79a496dccd931229780ad5bbedd535ceff6c3565605a8e440e18e1aa2b" dependencies = [ "hybrid-array", ] @@ -1606,12 +1606,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-pre.8" +version = "0.11.0-pre.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065d93ead7c220b85d5b4be4795d8398eac4ff68b5ee63895de0a3c1fb6edf25" +checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" dependencies = [ - "block-buffer 0.11.0-pre.5", - "crypto-common 0.2.0-pre.5", + "block-buffer 0.11.0-rc.0", + "crypto-common 0.2.0-rc.0", "subtle", ] @@ -2889,27 +2889,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "kinded" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4bdbb2f423660b19f0e9f7115182214732d8dd5f840cd0a3aee3e22562f34c" -dependencies = [ - "kinded_macros", -] - -[[package]] -name = "kinded_macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13b4ddc5dcb32f45dac3d6f606da2a52fdb9964a18427e63cd5ef6c0d13288d" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -3134,13 +3113,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3265,16 +3245,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "oauth2" version = "4.4.2" @@ -3558,9 +3528,9 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.5.0" +version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +checksum = "ec3b470a56963403c40f9dbb41eaee539759de9d026d3324da705a0ae0d269cd" dependencies = [ "base64ct", "rand_core 0.6.4", @@ -3953,13 +3923,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31e63ea85be51c423e52ba8f2e68a3efd53eed30203ee029dd09947333693e" +checksum = "c3e256ff62cee3e03def855c4d4260106d2bb1696fdc01af03e9935b993720a5" dependencies = [ - "rand_chacha 0.9.0-alpha.1", - "rand_core 0.9.0-alpha.1", - "zerocopy 0.8.0-alpha.6", + "rand_chacha 0.9.0-alpha.2", + "rand_core 0.9.0-alpha.2", + "zerocopy", ] [[package]] @@ -3974,12 +3944,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78674ef918c19451dbd250f8201f8619b494f64c9aa6f3adb28fd8a0f1f6da46" +checksum = "d299e9db34f6623b2a9e86c015d6e173d5f46d64d4b9b8cc46ae8a982a50b04c" dependencies = [ "ppv-lite86", - "rand_core 0.9.0-alpha.1", + "rand_core 0.9.0-alpha.2", ] [[package]] @@ -3993,12 +3963,12 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc89dffba8377c5ec847d12bb41492bda235dba31a25e8b695cd0fe6589eb8c9" +checksum = "f4e93f5a5e3c528cda9acb0928c31b2ba868c551cc46e67b778075e34aab9906" dependencies = [ "getrandom", - "zerocopy 0.8.0-alpha.6", + "zerocopy", ] [[package]] @@ -4557,7 +4527,6 @@ dependencies = [ "isolang", "itertools 0.13.0", "jsonwebtoken", - "kinded", "lettre", "logs-wheel", "markdown", @@ -4566,7 +4535,7 @@ dependencies = [ "openidconnect", "paginate", "radarr-api-rs", - "rand 0.9.0-alpha.1", + "rand 0.9.0-alpha.2", "regex", "reqwest 0.11.23", "rs-utils", @@ -4592,7 +4561,6 @@ dependencies = [ "tower-http", "tracing", "tracing-subscriber", - "unkey", "uuid", ] @@ -5809,28 +5777,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -6190,18 +6157,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "unkey" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e8f3f2f069033aa3fa93650025c02296e830dda5f5f0631004005fef436d49" -dependencies = [ - "lazy_static", - "reqwest 0.11.27", - "serde", - "serde_json", -] - [[package]] name = "unreachable" version = "1.0.0" @@ -6674,16 +6629,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db678a6ee512bd06adf35c35be471cae2f9c82a5aed2b5d15e03628c98bddd57" -dependencies = [ - "zerocopy-derive 0.8.0-alpha.6", + "zerocopy-derive", ] [[package]] @@ -6697,17 +6643,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "zerocopy-derive" -version = "0.8.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201585ea96d37ee69f2ac769925ca57160cef31acb137c16f38b02b76f4c1e62" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "zeroize" version = "1.8.1" diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml index 5689ff5af9..90d8c69093 100644 --- a/apps/backend/Cargo.toml +++ b/apps/backend/Cargo.toml @@ -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" @@ -43,7 +43,6 @@ 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" @@ -51,7 +50,7 @@ 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 = [ @@ -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 } diff --git a/apps/backend/src/background.rs b/apps/backend/src/background.rs index 56dc2754b9..80960ccbc8 100644 --- a/apps/backend/src/background.rs +++ b/apps/backend/src/background.rs @@ -34,9 +34,10 @@ impl Job for ScheduledJob { } pub async fn background_jobs( - _information: ScheduledJob, + information: ScheduledJob, misc_service: Data>, ) -> Result<(), Error> { + tracing::debug!("Running job at {:#?}", information.0); misc_service.perform_background_jobs().await.unwrap(); Ok(()) } diff --git a/apps/backend/src/traits.rs b/apps/backend/src/traits.rs index ef2d2fb2f4..ea0f32ab74 100644 --- a/apps/backend/src/traits.rs +++ b/apps/backend/src/traits.rs @@ -106,6 +106,7 @@ pub trait DatabaseAssetsAsUrls { #[async_trait] pub trait AuthProvider { + #[allow(dead_code)] fn is_mutation(&self) -> bool { false } diff --git a/apps/frontend/app/components/fitness.tsx b/apps/frontend/app/components/fitness.tsx index 38ebb60b64..a22d17c838 100644 --- a/apps/frontend/app/components/fitness.tsx +++ b/apps/frontend/app/components/fitness.tsx @@ -1,13 +1,19 @@ +import { useAutoAnimate } from "@formkit/auto-animate/react"; import { ActionIcon, Anchor, + Avatar, Badge, Box, Flex, Group, + Image, Paper, Popover, + ScrollArea, + SimpleGrid, Skeleton, + Stack, Text, } from "@mantine/core"; import { useDisclosure } from "@mantine/hooks"; @@ -15,20 +21,31 @@ import { Link } from "@remix-run/react"; import { ExerciseLot, SetLot, - type UserExerciseDetailsQuery, UserUnitSystem, type WorkoutDetailsQuery, type WorkoutSetStatistic, } from "@ryot/generated/graphql/backend/graphql"; -import { startCase, truncate } from "@ryot/ts-utils"; -import { IconTrophy } from "@tabler/icons-react"; +import { startCase } from "@ryot/ts-utils"; +import { + IconClock, + IconInfoCircle, + IconRotateClockwise, + IconRun, + IconTrophy, + IconWeight, + IconZzz, +} from "@tabler/icons-react"; import { useQuery } from "@tanstack/react-query"; +import type { ReactNode } from "react"; import { $path } from "remix-routes"; import { match } from "ts-pattern"; import { withFragment } from "ufo"; import { dayjsLib, getSetColor } from "~/lib/generals"; import { useGetMantineColor, useUserUnitSystem } from "~/lib/hooks"; -import { getWorkoutDetailsQuery } from "~/lib/state/fitness"; +import { + getExerciseDetailsQuery, + getWorkoutDetailsQuery, +} from "~/lib/state/fitness"; export const getSetStatisticsTextToDisplay = ( lot: ExerciseLot, @@ -190,46 +207,176 @@ export const DisplaySet = (props: { }; export const ExerciseHistory = (props: { - exerciseId: string; - exerciseLot: ExerciseLot; - history: NonNullable< - UserExerciseDetailsQuery["userExerciseDetails"]["history"] - >[number]; + entityId: string; + exerciseIdx: number; + hideExerciseDetails?: boolean; + hideExtraDetailsButton?: boolean; }) => { - const { data: workoutData } = useQuery( - getWorkoutDetailsQuery(props.history.workoutId), + const unitSystem = useUserUnitSystem(); + const [opened, { toggle }] = useDisclosure(false); + const [parent] = useAutoAnimate(); + const { data: workoutDetails } = useQuery( + getWorkoutDetailsQuery(props.entityId), + ); + const exercise = + workoutDetails?.details.information.exercises[props.exerciseIdx]; + const { data: exerciseDetails } = useQuery( + getExerciseDetailsQuery(exercise?.name || ""), ); - return ( - - {workoutData ? ( - <> - + const supersetLinks = + exercise && exercise.supersetWith.length > 0 + ? exercise.supersetWith + .map((otherExerciseIdx) => ( - {truncate(workoutData.details.name, { length: 36 })} + { + workoutDetails.details.information.exercises[otherExerciseIdx] + .name + } - - - {dayjsLib(workoutData.details.endTime).format("LLLL")} - - {workoutData.details.information.exercises[ - props.history.idx - ].sets.map((set, idx) => ( + )) + .reduce((prev, curr) => [prev, ", ", curr]) + : null; + + return ( + + {exerciseDetails && workoutDetails && exercise ? ( + <> + + + + + {props.hideExerciseDetails + ? workoutDetails.details.name + : exercise.name} + + {!props.hideExtraDetailsButton ? ( + + + + ) : null} + + {props.hideExerciseDetails ? ( + + {dayjsLib(workoutDetails.details.endTime).format("LLLL")} + + ) : null} + + {opened ? ( + <> + + {exercise.restTime ? ( + + + Rest time: {exercise.restTime}s + + ) : null} + {exercise.total ? ( + <> + {Number(exercise.total.reps) > 0 ? ( + + + Reps: {exercise.total.reps} + + ) : null} + {Number(exercise.total.duration) > 0 ? ( + + + + Duration: {exercise.total.duration} min + + + ) : null} + {Number(exercise.total.weight) > 0 ? ( + + + + Weight:{" "} + {displayWeightWithUnit( + unitSystem, + exercise.total.weight, + )} + + + ) : null} + {Number(exercise.total.distance) > 0 ? ( + + + + Distance:{" "} + {displayDistanceWithUnit( + unitSystem, + exercise.total.distance, + )} + + + ) : null} + + ) : null} + + {!props.hideExerciseDetails && exerciseDetails ? ( + + + {exerciseDetails.attributes.images.map((i) => ( + + ))} + + + ) : null} + + ) : null} + {!props.hideExerciseDetails && supersetLinks ? ( + Superset with {supersetLinks} + ) : null} + {exercise.notes.map((n, idxN) => ( + + {exercise.notes.length === 1 ? undefined : `${idxN + 1})`} {n} + + ))} + {exercise.assets && exercise.assets.images.length > 0 ? ( + + {exercise.assets.images.map((i) => ( + + + + ))} + + ) : null} + + {exercise.sets.map((set, idx) => ( ))} diff --git a/apps/frontend/app/routes/_dashboard.fitness.$entity.$id._index.tsx b/apps/frontend/app/routes/_dashboard.fitness.$entity.$id._index.tsx index c3e4efd89c..c6f4fb0052 100644 --- a/apps/frontend/app/routes/_dashboard.fitness.$entity.$id._index.tsx +++ b/apps/frontend/app/routes/_dashboard.fitness.$entity.$id._index.tsx @@ -1,18 +1,12 @@ -import { useAutoAnimate } from "@formkit/auto-animate/react"; import { ActionIcon, Anchor, - Avatar, Box, Button, Container, - Flex, Group, - Image, Menu, Modal, - Paper, - ScrollArea, SimpleGrid, Stack, Text, @@ -30,7 +24,6 @@ import { EntityLot, UpdateUserWorkoutDocument, WorkoutDetailsDocument, - type WorkoutDetailsQuery, } from "@ryot/generated/graphql/backend/graphql"; import { changeCase, @@ -43,25 +36,22 @@ import { IconClock, IconClockEdit, IconDotsVertical, - IconInfoCircle, IconRepeat, - IconRotateClockwise, IconRun, IconTrash, IconTrophy, IconWeight, IconZzz, } from "@tabler/icons-react"; -import { useQuery } from "@tanstack/react-query"; import { type ReactNode, useState } from "react"; import { namedAction } from "remix-utils/named-action"; import { match } from "ts-pattern"; -import { withFragment, withQuery } from "ufo"; +import { withQuery } from "ufo"; import { z } from "zod"; import { zx } from "zodix"; import { confirmWrapper } from "~/components/confirmation"; import { - DisplaySet, + ExerciseHistory, displayDistanceWithUnit, displayWeightWithUnit, } from "~/components/fitness"; @@ -72,10 +62,7 @@ import { useGetWorkoutStarter, useUserUnitSystem, } from "~/lib/hooks"; -import { - duplicateOldWorkout, - getExerciseDetailsQuery, -} from "~/lib/state/fitness"; +import { duplicateOldWorkout } from "~/lib/state/fitness"; import { useAddEntityToCollection } from "~/lib/state/media"; import { createToastHeaders, @@ -420,10 +407,10 @@ export default function Page() { ) : null} {loaderData.information.exercises.map((exercise, idx) => ( - ))} @@ -432,149 +419,6 @@ export default function Page() { ); } -type Exercise = - WorkoutDetailsQuery["workoutDetails"]["details"]["information"]["exercises"][number]; - -const DisplayExercise = (props: { exercise: Exercise; idx: number }) => { - const loaderData = useLoaderData(); - const unitSystem = useUserUnitSystem(); - const [opened, { toggle }] = useDisclosure(false); - const [parent] = useAutoAnimate(); - const { data: exerciseDetails } = useQuery( - getExerciseDetailsQuery(props.exercise.name), - ); - - const supersetLinks = - props.exercise.supersetWith.length > 0 - ? props.exercise.supersetWith - .map((otherExerciseIdx) => ( - - {loaderData.information.exercises[otherExerciseIdx].name} - - )) - .reduce((prev, curr) => [prev, ", ", curr]) - : null; - - return ( - - - - - {props.exercise.name} - - - - - - {opened ? ( - <> - - {props.exercise.restTime ? ( - - - Rest time: {props.exercise.restTime}s - - ) : null} - {props.exercise.total ? ( - <> - {Number(props.exercise.total.reps) > 0 ? ( - - - Reps: {props.exercise.total.reps} - - ) : null} - {Number(props.exercise.total.duration) > 0 ? ( - - - - Duration: {props.exercise.total.duration} min - - - ) : null} - {Number(props.exercise.total.weight) > 0 ? ( - - - - Weight:{" "} - {displayWeightWithUnit( - unitSystem, - props.exercise.total.weight, - )} - - - ) : null} - {Number(props.exercise.total.distance) > 0 ? ( - - - - Distance:{" "} - {displayDistanceWithUnit( - unitSystem, - props.exercise.total.distance, - )} - - - ) : null} - - ) : null} - - {exerciseDetails ? ( - - - {exerciseDetails.attributes.images.map((i) => ( - - ))} - - - ) : null} - - ) : null} - {supersetLinks ? ( - Superset with {supersetLinks} - ) : null} - {props.exercise.notes.map((n, idxN) => ( - - {props.exercise.notes.length === 1 ? undefined : `${idxN + 1})`} {n} - - ))} - {props.exercise.assets && props.exercise.assets.images.length > 0 ? ( - - {props.exercise.assets.images.map((i) => ( - - - - ))} - - ) : null} - - {props.exercise.sets.map((set, idx) => ( - - ))} - - ); -}; - const DisplayStat = (props: { icon: ReactNode; data: string }) => { return ( diff --git a/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx b/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx index 5f5f596d41..0da366f72f 100644 --- a/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx +++ b/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx @@ -235,10 +235,10 @@ export default function Page() { itemContent={(index, history) => ( )} diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 699a3811ff..c5559e6480 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -26,8 +26,8 @@ "@ryot/graphql": "workspace:*", "@ryot/ts-utils": "workspace:*", "@tabler/icons-react": "3.11.0", - "@tanstack/react-query": "5.51.11", - "@tanstack/react-query-devtools": "5.51.11", + "@tanstack/react-query": "5.51.16", + "@tanstack/react-query-devtools": "5.51.16", "buffer": "6.0.3", "clsx": "2.1.1", "cookie": "0.6.0", @@ -42,11 +42,11 @@ "isbot": "5.1.13", "jotai": "2.9.1", "js-cookie": "3.0.5", - "mantine-datatable": "7.11.2", + "mantine-datatable": "7.11.3", "react": "18.3.1", "react-confirm": "0.3.0-7", "react-dom": "18.3.1", - "react-virtuoso": "4.7.13", + "react-virtuoso": "4.9.0", "react-webcam": "7.2.0", "recharts": "2.12.7", "remix-routes": "1.7.6", @@ -69,14 +69,14 @@ "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@types/uuid": "10.0.0", - "postcss": "8.4.39", + "postcss": "8.4.40", "postcss-preset-mantine": "1.17.0", "postcss-simple-vars": "7.0.1", "ts-essentials": "10.0.1", "typescript": "5.5.4", "typescript-plugin-css-modules": "5.1.0", "typescript-remix-routes-plugin": "1.0.1", - "vite": "5.3.4", + "vite": "5.3.5", "vite-tsconfig-paths": "4.3.2" }, "engines": { diff --git a/libs/generated/package.json b/libs/generated/package.json index d9b9300d07..97ed4aa0fd 100644 --- a/libs/generated/package.json +++ b/libs/generated/package.json @@ -6,6 +6,6 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.3.2" + "@graphql-codegen/client-preset": "4.3.3" } } diff --git a/yarn.lock b/yarn.lock index 0488d9798e..9ff3b87d2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2564,9 +2564,9 @@ __metadata: languageName: node linkType: hard -"@graphql-codegen/client-preset@npm:4.3.2": - version: 4.3.2 - resolution: "@graphql-codegen/client-preset@npm:4.3.2" +"@graphql-codegen/client-preset@npm:4.3.3": + version: 4.3.3 + resolution: "@graphql-codegen/client-preset@npm:4.3.3" dependencies: "@babel/helper-plugin-utils": "npm:^7.20.2" "@babel/template": "npm:^7.20.7" @@ -2583,7 +2583,7 @@ __metadata: tslib: "npm:~2.6.0" peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 10/52c66f1f0de4a1537726d2d6915f307aa650ab425a9b6ba5e24718a412f5b2aa7b27c706074d7fa086cbede7c0a0fb74ff1016ba378cc729a40e301d207a42f8 + checksum: 10/fd58f6d0bad4f687af84015a487e02f01c9cb4a1e310b59ceda48f872885e9dbe69e87271363bf51a805e7970169a121cd13b5df20b124d1d0054530dedbcf81 languageName: node linkType: hard @@ -4844,8 +4844,8 @@ __metadata: "@ryot/graphql": "workspace:*" "@ryot/ts-utils": "workspace:*" "@tabler/icons-react": "npm:3.11.0" - "@tanstack/react-query": "npm:5.51.11" - "@tanstack/react-query-devtools": "npm:5.51.11" + "@tanstack/react-query": "npm:5.51.16" + "@tanstack/react-query-devtools": "npm:5.51.16" "@types/cookie": "npm:0.6.0" "@types/crypto-js": "npm:4.2.2" "@types/howler": "npm:2.2.11" @@ -4867,14 +4867,14 @@ __metadata: isbot: "npm:5.1.13" jotai: "npm:2.9.1" js-cookie: "npm:3.0.5" - mantine-datatable: "npm:7.11.2" - postcss: "npm:8.4.39" + mantine-datatable: "npm:7.11.3" + postcss: "npm:8.4.40" postcss-preset-mantine: "npm:1.17.0" postcss-simple-vars: "npm:7.0.1" react: "npm:18.3.1" react-confirm: "npm:0.3.0-7" react-dom: "npm:18.3.1" - react-virtuoso: "npm:4.7.13" + react-virtuoso: "npm:4.9.0" react-webcam: "npm:7.2.0" recharts: "npm:2.12.7" remix-routes: "npm:1.7.6" @@ -4888,7 +4888,7 @@ __metadata: ufo: "npm:1.5.4" usehooks-ts: "npm:3.1.0" uuid: "npm:10.0.0" - vite: "npm:5.3.4" + vite: "npm:5.3.5" vite-tsconfig-paths: "npm:4.3.2" zod: "npm:3.23.8" zodix: "npm:0.4.4" @@ -4900,7 +4900,7 @@ __metadata: resolution: "@ryot/generated@workspace:libs/generated" dependencies: "@graphql-codegen/cli": "npm:5.0.2" - "@graphql-codegen/client-preset": "npm:4.3.2" + "@graphql-codegen/client-preset": "npm:4.3.3" "@graphql-typed-document-node/core": "npm:3.2.0" graphql: "npm:16.9.0" languageName: unknown @@ -5124,40 +5124,40 @@ __metadata: languageName: node linkType: hard -"@tanstack/query-core@npm:5.51.9": - version: 5.51.9 - resolution: "@tanstack/query-core@npm:5.51.9" - checksum: 10/263f64a2e9448cc412fa9f29b0b77af1a5eeb66ecba6965548d4be97b7e99cca0dd194992b686426745030240764846d9d7e39e43d3ed64b97afb47f3a9661d7 +"@tanstack/query-core@npm:5.51.16": + version: 5.51.16 + resolution: "@tanstack/query-core@npm:5.51.16" + checksum: 10/7b5f48839d41e083fb0a00cd92a2710e4850b3e1c9daa74073b11319b4fa8a3ef335fb8da3dbc711144c7aa982597b34745bd5851b40eab17deadd56681ed798 languageName: node linkType: hard -"@tanstack/query-devtools@npm:5.51.9": - version: 5.51.9 - resolution: "@tanstack/query-devtools@npm:5.51.9" - checksum: 10/ffc19f1a9b16edbb99dc8ef4fb00f6cbc6ac39d0fbdb7976d5b849005d8f1eb80081449bfe379fd1eb8a0aa1a0357b014b822a8f32a9d57644fbb14fb039d8fd +"@tanstack/query-devtools@npm:5.51.16": + version: 5.51.16 + resolution: "@tanstack/query-devtools@npm:5.51.16" + checksum: 10/b0e8c1f86890a515d4ddbab4743387aecd882271f7be2cbc36f69d05ba42b803ae2e9bbfd53a03450ca4827c94f6b5d7d6fa5e013bfabe6ee0aa9a7b34a223d3 languageName: node linkType: hard -"@tanstack/react-query-devtools@npm:5.51.11": - version: 5.51.11 - resolution: "@tanstack/react-query-devtools@npm:5.51.11" +"@tanstack/react-query-devtools@npm:5.51.16": + version: 5.51.16 + resolution: "@tanstack/react-query-devtools@npm:5.51.16" dependencies: - "@tanstack/query-devtools": "npm:5.51.9" + "@tanstack/query-devtools": "npm:5.51.16" peerDependencies: - "@tanstack/react-query": ^5.51.11 + "@tanstack/react-query": ^5.51.16 react: ^18 || ^19 - checksum: 10/2a868370db70ef37ce9185c8d1d01f837ffb15bb3c304ef3eab9261e7de07c67e8a5b09264ffbbd2c650bd33a790f80c3d0be67d528d66cab31718d31081b2d7 + checksum: 10/c2a4ceecd77fa4ad8e6bc43b014310762237646319e85259acd82a49c18a6fc525b8733a79078b8c384b4dd571f9b9c2e2193441d775053994828db791097bf3 languageName: node linkType: hard -"@tanstack/react-query@npm:5.51.11": - version: 5.51.11 - resolution: "@tanstack/react-query@npm:5.51.11" +"@tanstack/react-query@npm:5.51.16": + version: 5.51.16 + resolution: "@tanstack/react-query@npm:5.51.16" dependencies: - "@tanstack/query-core": "npm:5.51.9" + "@tanstack/query-core": "npm:5.51.16" peerDependencies: react: ^18.0.0 - checksum: 10/e840eb5f90fb6ec1693f98be651c5fa55a2885930015a2bf1f8699def596293eac79df8b3335e31b87af0a189d40597d35986379c930faf3496fc5061861d988 + checksum: 10/84261a5c66c4311b06618af78d1534a84d908d5bc32c04f36f39dad977365090c244e8c5e3578f38118431e7a77970fae2ba6af75e1f03e8a22a48458f8d518d languageName: node linkType: hard @@ -10490,15 +10490,15 @@ __metadata: languageName: node linkType: hard -"mantine-datatable@npm:7.11.2": - version: 7.11.2 - resolution: "mantine-datatable@npm:7.11.2" +"mantine-datatable@npm:7.11.3": + version: 7.11.3 + resolution: "mantine-datatable@npm:7.11.3" peerDependencies: "@mantine/core": ">=7.8" "@mantine/hooks": ">=7.8" clsx: ">=2" react: ">=18.2" - checksum: 10/8a7f788b6e64fb86aa303c3a371f356bd71a139a4999f11ea97c15072718e6f36fa6ee121e135483c6fd5cae1e36c3a3e189a803039f603ffd700a03f09a508e + checksum: 10/8fe7c5745ed3ec8278ca52d19b0826d5437d32e5973d2f11d5fb05152e1a8fe47decf8010a9ba3ef1e47f8784742044bd06b4059c8ddb787f141b98ecfbea104 languageName: node linkType: hard @@ -12468,18 +12468,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.39, postcss@npm:^8.4.39": - version: 8.4.39 - resolution: "postcss@npm:8.4.39" - dependencies: - nanoid: "npm:^3.3.7" - picocolors: "npm:^1.0.1" - source-map-js: "npm:^1.2.0" - checksum: 10/ad9c1add892c96433b9a5502878201ede4a20c4ce02d056251f61f8d9a3e5426dab3683fe5a086edfa78a1a19f2b4988c8cea02c5122136d29758cb5a17e2621 - languageName: node - linkType: hard - -"postcss@npm:^8.4.23": +"postcss@npm:8.4.40, postcss@npm:^8.4.23": version: 8.4.40 resolution: "postcss@npm:8.4.40" dependencies: @@ -12501,6 +12490,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.39": + version: 8.4.39 + resolution: "postcss@npm:8.4.39" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.0.1" + source-map-js: "npm:^1.2.0" + checksum: 10/ad9c1add892c96433b9a5502878201ede4a20c4ce02d056251f61f8d9a3e5426dab3683fe5a086edfa78a1a19f2b4988c8cea02c5122136d29758cb5a17e2621 + languageName: node + linkType: hard + "prettier@npm:^2.7.1": version: 2.8.8 resolution: "prettier@npm:2.8.8" @@ -13010,13 +13010,13 @@ __metadata: languageName: node linkType: hard -"react-virtuoso@npm:4.7.13": - version: 4.7.13 - resolution: "react-virtuoso@npm:4.7.13" +"react-virtuoso@npm:4.9.0": + version: 4.9.0 + resolution: "react-virtuoso@npm:4.9.0" peerDependencies: react: ">=16 || >=17 || >= 18" react-dom: ">=16 || >=17 || >= 18" - checksum: 10/0cf91b50baaaecfd2ca117b284b3298f45fa847dfba047f2da67ba4a49120e1fd55770c34b37dca4177505e8d3b11e86f5cbe7492444e87fa81d00fb7cf74a69 + checksum: 10/24f7790b69d791e912a69f64b9d453477643e00f39310f3e0a79e008bac3a9c46ca68892496eacb8ad57bdd9b7e15836a4497c9960b67e006ed76e6623339fc0 languageName: node linkType: hard @@ -15361,9 +15361,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.3.4": - version: 5.3.4 - resolution: "vite@npm:5.3.4" +"vite@npm:5.3.5": + version: 5.3.5 + resolution: "vite@npm:5.3.5" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" @@ -15397,7 +15397,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10/9eadb261be1f5f6335a67cb44a8803febd8b190202909385fd2ae7849991095ee13c5af914da53da48a421ee0901a8fedbb7519dc7d1b8ade3ea6e42bd9b2b39 + checksum: 10/5672dde4a969349d9cf90a9e43029c8489dfff60fb04d6a10717d6224553cf12283a8cace633fa80b006df6037f72d08a459a38bf8ea66cb19075d60fe159482 languageName: node linkType: hard