Merge branch 'main' into chore/data-update

server/main-api/Cargo.toml

@@ -19,6 +19,7 @@ path = "src/main.rs"
 actix-web-prom = { version = "0.8.0", default-features = false, features = [] }
 tracing-subscriber = { version = "0.3.18",features = ["env-filter", "json", "fmt"]}
 tracing = "0.1.40"
+tracing-actix-web = "0.7.11"
 sentry = { version = "0.34.0", features = ["tracing","metrics","backtrace","contexts","debug-images","panic","reqwest","rustls"] }
 sentry-actix = "0.34.0"
 

server/main-api/src/main.rs

@@ -11,6 +11,7 @@ use sqlx::postgres::PgPoolOptions;
 use sqlx::prelude::*;
 use sqlx::PgPool;
 use tracing::{debug, error, info};
+use tracing_actix_web::TracingLogger;
 
 mod calendar;
 mod details;
@@ -153,7 +154,7 @@ async fn run() -> Result<(), BoxedError> {
         App::new()
             .wrap(prometheus.clone())
             .wrap(cors)
-            .wrap(middleware::Logger::default().exclude("/api/status"))
+            .wrap(TracingLogger::default())
             .wrap(middleware::Compress::default())
             .wrap(sentry_actix::Sentry::new())
             .app_data(web::JsonConfig::default().limit(MAX_JSON_PAYLOAD))

webclient/components/AppSearchBar.vue

@@ -116,7 +116,7 @@ const url = computed(() => {
 });
 const { data, error } = await useFetch<SearchResponse>(url, {
   key: "search",
-  dedupe: "defer",
+  dedupe: "cancel",
   deep: false,
   retry: 120,
   retryDelay: 5000,

webclient/components/Btn.vue

@@ -50,7 +50,7 @@ const sizeClasses = computed(() => {
 <template>
   <NuxtLink
     v-if="props.to.length && !disabled && (props.to.startsWith('http') || props.to.startsWith('geo:'))"
-    :href="props.to"
+    :to="props.to"
     :aria-label="ariaLabel"
     :type="props.type"
     v-bind="{ disabled: disabled }"

webclient/package.json

@@ -25,7 +25,7 @@
     "@vueuse/nuxt": "10.11.0",
     "maplibre-gl": "4.5.0",
     "nightwind": "1.1.13",
-    "nuxt": "3.12.2",
+    "nuxt": "3.12.3",
     "sharp": "0.33.4",
     "swagger-ui": "5.17.14",
     "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3",

webclient/pages/[view]/[id].vue

@@ -25,7 +25,7 @@ const runtimeConfig = useRuntimeConfig();
 const url = computed(() => `${runtimeConfig.public.apiURL}/api/get/${route.params.id}?lang=${locale.value}`);
 const { data, error } = useFetch<DetailsResponse, string>(url, {
   key: "details",
-  dedupe: "defer",
+  dedupe: "cancel",
   deep: false,
   retry: 120,
   retryDelay: 5000,

webclient/pages/search.vue

@@ -31,7 +31,7 @@ const apiUrl = computed(() => {
 });
 const { data } = useFetch<SearchResponse>(apiUrl, {
   key: "search",
-  dedupe: "defer",
+  dedupe: "cancel",
   deep: false,
   retry: 120,
   retryDelay: 5000,