From 943f7b65f30a4e081042e5f06176fe5abe1423e4 Mon Sep 17 00:00:00 2001
From: Niko PLP <niko@nextgraph.org>
Date: Sat, 19 Aug 2023 06:58:49 +0300
Subject: [PATCH] Revert "revert to previous version of tauri for ngaccount"

This reverts commit b5842f197cab48cdab0553d57345d9150e4028b7.
---
 ngaccount/src/main.rs                  | 2 +-
 ngaccount/web/src/routes/Create.svelte | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ngaccount/src/main.rs b/ngaccount/src/main.rs
index 13bbcbf..1a682a7 100644
--- a/ngaccount/src/main.rs
+++ b/ngaccount/src/main.rs
@@ -265,7 +265,7 @@ async fn main() -> anyhow::Result<()> {
 
     let static_files = warp::get()
         .and(warp_embed::embed(&Static))
-        //.with(warp::reply::with::headers(headers))
+        .with(warp::reply::with::headers(headers))
         .boxed();
 
     let mut cors = warp::cors()
diff --git a/ngaccount/web/src/routes/Create.svelte b/ngaccount/web/src/routes/Create.svelte
index 7900fff..d9c194b 100644
--- a/ngaccount/web/src/routes/Create.svelte
+++ b/ngaccount/web/src/routes/Create.svelte
@@ -58,7 +58,7 @@
         error = "Closing due to " + (result.error || "an error");
       }
       let window_api = await import("@tauri-apps/plugin-window");
-      let main = window_api.WebviewWindow.getByLabel("main");
+      let main = window_api.Window.getByLabel("main");
       if (main) {
         await main.emit("error", result);
       } else {
@@ -79,7 +79,7 @@
     // @ts-ignore
     if (window.__TAURI__) {
       let window_api = await import("@tauri-apps/plugin-window");
-      let main = window_api.WebviewWindow.getByLabel("main");
+      let main = window_api.Window.getByLabel("main");
       if (main) {
         await main.emit("accepted", result);
       } else {