Merge branch 'master' into gractwo

.gitea/workflows/build-and-publish.yaml

@@ -0,0 +1,33 @@
+name: mnemo-build-and-publish
+run-name: Mnemosyne Build&Publish by ${{gitea.actor}} on ${{gitea.ref_name}}
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  gractwo-mnemo-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+      - name: set short sha
+        run: echo "short_sha=$(echo ${{gitea.sha}} | cut -c1-12)" >> $GITEA_ENV
+      - name: build image
+        run: |
+          docker buildx build --platform linux/amd64 \
+          -t git.gractwo.pl/gractwo/mnemosyne:${{env.short_sha}} \
+          .
+      - name: log into package registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.gractwo.pl
+          username: ${{gitea.actor}}
+          password: ${{secrets.TOKEN2}}
+      - name: publish
+        run: docker push git.gractwo.pl/gractwo/mnemosyne:${{env.short_sha}}
+      - uses: actions-hub/kubectl@master
+        env:
+          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+        with:
+          args: patch statefulset -n cytaty mnemosyne -p '{"spec":{"template":{"spec":{"containers":[{"name":"mnemosyne","image":"git.gractwo.pl/gractwo/mnemosyne:${{env.short_sha}}"}]}}}}'

src/web/pages/mod.rs

@@ -51,7 +51,10 @@ pub fn pages() -> Router<MnemoState> {
         //
         .route("/quotes", get(quotes::page))
         .route("/quotes/{id}", get(quotes::id::page))
-        .route("/quotes/{id}/delete", post(quotes::id::delete))
+        .route(
+            "/quotes/{id}/delete",
+            get(quotes::id::delete_confirm).post(quotes::id::delete),
+        )
         .route("/quotes/add", get(quotes::add::page))
         .route("/quotes/add-form", post(quotes::add::form))
         //

src/web/pages/quotes/id.rs

@@ -53,12 +53,62 @@ pub async fn page(
                             span class="scale-[.75]" {(PreEscaped(icons::PEN))}
                             "Edit"
                         }
-                        form method="post" action=(format!("/quotes/{id}/delete")) {
-                            button type="submit" class="px-2 py-1 border rounded flex flex-row gap-1 bg-pink-400/10 border-pink-400/25 hover:bg-pink-400/20 hover:border-pink-400/45" {
+                        a href=(format!("/quotes/{id}/delete")) class="px-2 py-1 cursor-pointer border rounded flex flex-row gap-1 bg-pink-400/10 border-pink-400/25 hover:bg-pink-400/20 hover:border-pink-400/45" {
                             span class="scale-[.75]" {(PreEscaped(icons::TRASH))}
                             "Delete"
                         }
                     }
+                } @else {
+                    "Failed to fetch quote. Are you sure it exists?"
+                }
+            }
+        ),
+    )
+    .into_response())
+}
+
+pub async fn delete_confirm(
+    State(state): State<MnemoState>,
+    Path(id): Path<Uuid>,
+    req: Request,
+) -> Result<Response, CompositeError> {
+    let mut conn = state.pool.acquire().await?;
+    let u = match User::authenticate(&mut *conn, req.headers()).await? {
+        Some(u) => u,
+        None => return Ok(Redirect::to(&format!("/login?r={}", req.uri().path())).into_response()),
+    };
+    let q = Quote::get_by_id(&mut conn, id).await;
+
+    Ok(base(
+        "Delete Quote | Mnemosyne",
+        html!(
+            (nav(&mut conn, Some(&u), req.uri().path()).await)
+
+            div class="max-w-4xl mx-auto px-2" {
+                div class="my-4 flex justify-between" {
+                    p class="flex items-center gap-2 text-neutral-500" {
+                        (PreEscaped(icons::TRASH))
+                        span class="font-lora" {"Deleting quote of ID " (id)}
+                    }
+                }
+                @if let Ok(q) = q {
+                    div class="border border-pink-400/25 bg-pink-400/10 rounded-md p-3 mb-4" {
+                        p class="flex flex-wrap items-center gap-2 text-pink-200" {
+                            span class="font-semibold" {"Are you sure you want to delete this quote?"}
+                            span class="text-pink-300/80" {"This cannot be undone."}
+                        }
+                    }
+                    (quote(&q))
+                    div class="flex flex-row w-full flex-wrap justify-start gap-2 mt-2" {
+                        form method="post" action=(format!("/quotes/{id}/delete")) {
+                            button type="submit" class="px-2 py-1 cursor-pointer border rounded flex flex-row gap-1 bg-pink-400/10 border-pink-400/25 hover:bg-pink-400/20 hover:border-pink-400/45" {
+                                span class="scale-[.75]" {(PreEscaped(icons::TRASH))}
+                                "Delete"
+                            }
+                        }
+                        a href=(format!("/quotes/{id}")) class="px-2 py-1 border rounded flex flex-row gap-1 bg-neutral-200/5 border-neutral-200/25 hover:bg-neutral-200/15 hover:border-neutral-200/45" {
+                            "Cancel"
+                        }
                     }
                 } @else {
                     "Failed to fetch quote. Are you sure it exists?"