From a0b31b73918f4d6261dfb990a7324e66e4633e38 Mon Sep 17 00:00:00 2001 From: ToBinio Date: Tue, 12 May 2026 09:22:21 +0200 Subject: [PATCH] remove nitro based api --- api/src/lib.rs | 9 +- api/src/main.rs | 2 +- app/components/Edit/DataSelect.vue | 2 +- app/components/Edit/EditTodoSheet.vue | 2 +- app/components/Edit/NewTodoSheet.vue | 2 +- app/components/Edit/Time/TimePointSelect.vue | 2 +- app/components/Edit/Time/TimeRangeSelect.vue | 2 +- .../Edit/Time/TimeRecurringSelect.vue | 2 +- app/components/Filter/CategorySelect.vue | 2 +- app/components/Filter/TagSelect.vue | 2 +- app/components/Settings/Categories.vue | 2 +- .../Settings/Labels/AddCategory.vue | 2 +- app/components/Settings/Labels/AddLabel.vue | 2 +- app/components/Settings/Labels/Category.vue | 2 +- .../Settings/Labels/EditCategory.vue | 2 +- app/components/Settings/Labels/EditLabel.vue | 4 +- app/components/Settings/Labels/Tag.vue | 2 +- app/components/Settings/Tags.vue | 2 +- .../Todo/TimeDisplay/TimeDisplay.vue | 2 +- .../Todo/TimeDisplay/TimeDisplayPoint.vue | 4 +- .../Todo/TimeDisplay/TimeDisplayRange.vue | 4 +- app/components/Todo/Todo.vue | 4 +- app/components/Utils/Label/CategoryLabel.vue | 2 +- app/components/Utils/Label/CategorySelect.vue | 2 +- app/components/Utils/Label/TagLabel.vue | 2 +- app/components/Utils/Label/TagSelect.vue | 2 +- app/composables/useFilteredTodos.ts | 4 +- app/composables/useTodoDragging.ts | 2 +- app/composables/useWeekDays.ts | 2 +- app/stores/useCategoryStore.ts | 2 +- app/stores/useTagStore.ts | 2 +- app/stores/useTodoStore.ts | 8 +- {shared => app/utils}/array.ts | 0 {shared => app/utils}/color.ts | 0 {shared => app/utils}/date.ts | 0 {shared => app/utils}/todo.ts | 2 +- {shared => app/utils}/types.ts | 0 nuxt.config.ts | 13 -- server/api/categories/.get.ts | 7 -- server/api/categories/.post.ts | 15 --- server/api/categories/[uuid].delete.ts | 20 ---- server/api/categories/sse.ts | 6 - server/api/subscription/.post.ts | 12 -- server/api/tags/.get.ts | 7 -- server/api/tags/.post.ts | 15 --- server/api/tags/[uuid].delete.ts | 20 ---- server/api/tags/sse.ts | 6 - server/api/todos/.get.ts | 7 -- server/api/todos/.post.ts | 27 ----- server/api/todos/[uuid].delete.ts | 20 ---- server/api/todos/check/[uuid].delete.ts | 20 ---- server/api/todos/check/[uuid].post.ts | 20 ---- server/api/todos/move.post.ts | 23 ---- server/api/todos/sse.ts | 6 - server/plugins/storage.ts | 98 ---------------- server/plugins/webpush.ts | 11 -- server/tasks/notify/push.ts | 9 -- server/utils/authHandle.ts | 56 --------- server/utils/db/label/categorize.ts | 22 ---- server/utils/db/label/labels.ts | 53 --------- server/utils/db/label/tags.ts | 19 --- server/utils/db/subscription.ts | 55 --------- server/utils/db/todos.ts | 111 ------------------ server/utils/sse.ts | 68 ----------- server/utils/subscriptions.ts | 49 -------- 65 files changed, 42 insertions(+), 842 deletions(-) rename {shared => app/utils}/array.ts (100%) rename {shared => app/utils}/color.ts (100%) rename {shared => app/utils}/date.ts (100%) rename {shared => app/utils}/todo.ts (96%) rename {shared => app/utils}/types.ts (100%) delete mode 100644 server/api/categories/.get.ts delete mode 100644 server/api/categories/.post.ts delete mode 100644 server/api/categories/[uuid].delete.ts delete mode 100644 server/api/categories/sse.ts delete mode 100644 server/api/subscription/.post.ts delete mode 100644 server/api/tags/.get.ts delete mode 100644 server/api/tags/.post.ts delete mode 100644 server/api/tags/[uuid].delete.ts delete mode 100644 server/api/tags/sse.ts delete mode 100644 server/api/todos/.get.ts delete mode 100644 server/api/todos/.post.ts delete mode 100644 server/api/todos/[uuid].delete.ts delete mode 100644 server/api/todos/check/[uuid].delete.ts delete mode 100644 server/api/todos/check/[uuid].post.ts delete mode 100644 server/api/todos/move.post.ts delete mode 100644 server/api/todos/sse.ts delete mode 100644 server/plugins/storage.ts delete mode 100644 server/plugins/webpush.ts delete mode 100644 server/tasks/notify/push.ts delete mode 100644 server/utils/authHandle.ts delete mode 100644 server/utils/db/label/categorize.ts delete mode 100644 server/utils/db/label/labels.ts delete mode 100644 server/utils/db/label/tags.ts delete mode 100644 server/utils/db/subscription.ts delete mode 100644 server/utils/db/todos.ts delete mode 100644 server/utils/sse.ts delete mode 100644 server/utils/subscriptions.ts diff --git a/api/src/lib.rs b/api/src/lib.rs index 8655f9b..9f3a4c2 100644 --- a/api/src/lib.rs +++ b/api/src/lib.rs @@ -8,9 +8,8 @@ use sea_orm::{ConnectOptions, ConnectionTrait, Database, DatabaseConnection}; use tower::ServiceBuilder; use tower_http::{ cors::{Any, CorsLayer}, - trace::{self, TraceLayer}, + trace::TraceLayer, }; -use tracing::Level; use crate::{ auth::{JwksCache, User}, @@ -66,11 +65,7 @@ pub async fn app( .nest("/api", routes::routes(state.clone())) .layer( ServiceBuilder::new() - .layer( - TraceLayer::new_for_http() - .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO)) - .on_response(trace::DefaultOnResponse::new().level(Level::INFO)), - ) + .layer(TraceLayer::new_for_http()) .layer( CorsLayer::new() .allow_headers([AUTHORIZATION, CONTENT_TYPE, ACCEPT]) diff --git a/api/src/main.rs b/api/src/main.rs index 122bcbd..427d844 100644 --- a/api/src/main.rs +++ b/api/src/main.rs @@ -21,7 +21,7 @@ async fn main() -> eyre::Result<()> { let app = app(&db_url, None, web_push_key, auth_api_base, self_api_base).await?; info!("Starting server"); - let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:8080")) + let listener = tokio::net::TcpListener::bind("0.0.0.0:8080".to_string()) .await .expect("failed to bind listener"); diff --git a/app/components/Edit/DataSelect.vue b/app/components/Edit/DataSelect.vue index d07788c..f63611f 100644 --- a/app/components/Edit/DataSelect.vue +++ b/app/components/Edit/DataSelect.vue @@ -6,7 +6,7 @@ TabsRoot, TabsTrigger, } from "reka-ui"; - import type { Time, UUID } from "~~/shared/types"; + import type { Time, UUID } from "~/utils/types"; import CategorySelect from "../Utils/Label/CategorySelect.vue"; import TagSelect from "../Utils/Label/TagSelect.vue"; import NoteSelect from "./NoteSelect.vue"; diff --git a/app/components/Edit/EditTodoSheet.vue b/app/components/Edit/EditTodoSheet.vue index 89660d2..91c2086 100644 --- a/app/components/Edit/EditTodoSheet.vue +++ b/app/components/Edit/EditTodoSheet.vue @@ -1,6 +1,6 @@