From 75271eddabf6cade86de6140048dc28f3efb99ff Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Mon, 3 Jul 2023 00:03:57 +0900
Subject: [PATCH] [fix] fixed accountsync

---
 src-tauri/tauri.conf.json                  |  2 +-
 src/lib/Setting/Pages/FilesSettings.svelte | 61 ++++++++++------------
 src/lib/Setting/Pages/UserSettings.svelte  |  2 +-
 src/ts/storage/database.ts                 |  2 +-
 version.json                               |  2 +-
 5 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 4d24fabe..ec4bf25e 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "1.29.4"
+    "version": "1.29.5"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/lib/Setting/Pages/FilesSettings.svelte b/src/lib/Setting/Pages/FilesSettings.svelte
index 66b9e99d..a42bd890 100644
--- a/src/lib/Setting/Pages/FilesSettings.svelte
+++ b/src/lib/Setting/Pages/FilesSettings.svelte
@@ -8,41 +8,38 @@
 </script>
 
 <h2 class="mb-2 text-2xl font-bold mt-2">{language.files}</h2>
-{#if !$DataBase.account?.useSync}
-
-    <button
-        on:click={async () => {
-            if(await alertConfirm(language.backupConfirm)){
-                localStorage.setItem('backup', 'save')
-                if(isTauri || isNodeServer){
-                    checkDriver('savetauri')
-                }
-                else{
-                    checkDriver('save')
-                }
+<button
+    on:click={async () => {
+        if(await alertConfirm(language.backupConfirm)){
+            localStorage.setItem('backup', 'save')
+            if(isTauri || isNodeServer){
+                checkDriver('savetauri')
             }
-        }}
-        class="drop-shadow-lg p-3 border-borderc border-solid mt-2 flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected text-sm">
-        {language.savebackup}
-    </button>
-
-    <button
-        on:click={async () => {
-            if((await alertConfirm(language.backupLoadConfirm)) && (await alertConfirm(language.backupLoadConfirm2))){
-                localStorage.setItem('backup', 'load')
-                if(isTauri || isNodeServer){
-                    checkDriver('loadtauri')
-                }
-                else{
-                    checkDriver('load')
-                }
+            else{
+                checkDriver('save')
             }
-        }}
-        class="drop-shadow-lg p-3 border-borderc border-solid mt-2 flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected text-sm">
-        {language.loadbackup}
-    </button>
+        }
+    }}
+    class="drop-shadow-lg p-3 border-borderc border-solid mt-2 flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected text-sm">
+    {language.savebackup}
+</button>
+
+<button
+    on:click={async () => {
+        if((await alertConfirm(language.backupLoadConfirm)) && (await alertConfirm(language.backupLoadConfirm2))){
+            localStorage.setItem('backup', 'load')
+            if(isTauri || isNodeServer){
+                checkDriver('loadtauri')
+            }
+            else{
+                checkDriver('load')
+            }
+        }
+    }}
+    class="drop-shadow-lg p-3 border-borderc border-solid mt-2 flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected text-sm">
+    {language.loadbackup}
+</button>
 
-{/if}
 
 <!-- <button
     on:click={async () => {
diff --git a/src/lib/Setting/Pages/UserSettings.svelte b/src/lib/Setting/Pages/UserSettings.svelte
index bc99c919..977c44f4 100644
--- a/src/lib/Setting/Pages/UserSettings.svelte
+++ b/src/lib/Setting/Pages/UserSettings.svelte
@@ -60,7 +60,7 @@
         </div>
         {#if $DataBase.account}
             <span class="mb-4 text-gray-400">ID: {$DataBase.account.id}</span>
-            {#if $DataBase.useExperimental && (!isTauri)}
+            {#if !isTauri}
                 <div class="flex items-center mt-2">
                     {#if $DataBase.account.useSync}
                         <span>{language.dataSavingInAccount}</span>
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index a70d609d..d98f4626 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -9,7 +9,7 @@ import { alertNormal } from '../alert';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = '1.29.4'
+export let appVer = '1.29.5'
 export let webAppSubVer = ''
 
 export function setDatabase(data:Database){
diff --git a/version.json b/version.json
index e7441b41..c77088f5 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version":"1.29.4"}
\ No newline at end of file
+{"version":"1.29.5"}
\ No newline at end of file