Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

refactor: fix merge conflicts #1

Browse Source
This commit is contained in:
Raymond
2025-01-04 20:17:33 -05:00
parent dbe3f3393c
commit f6efd392b9
5 changed files with 206 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AquaNet/src/components/settings/ChuniSettings.svelte
View File

@@ -23,6 +23,7 @@
import useLocalStorage from "../../libs/hooks/useLocalStorage.svelte";
import { DDS } from "../../libs/userbox/dds";
import ChuniMatchingSettings from "./ChuniMatchingSettings.svelte";
let user: AquaNetUser
let [loading, error, submitting, preview] = [true, "", "", ""]
@@ -255,6 +256,7 @@
<button on:click={() => USERBOX_SETUP_RUN = !USERBOX_SETUP_RUN}>{t(!USERBOX_INSTALLED ? `userbox.new.activate_first` : `userbox.new.activate_update`)}</button>
</p>
{/if}
<ChuniMatchingSettings/>
<!--{#if !USERBOX_SUPPORT || !USERBOX_INSTALLED || !USERBOX_ENABLED.value}
<h2>{t("userbox.header.preview")}</h2>
<p class="notice">{t("userbox.preview.notice")}</p>