mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-03-30 05:35:16 +00:00
f5315aacb8
### Fixed (This should be backported to 0.25.22 if the beta phase is prolonged) - No longer larger files will not create a chunks during preparing `Reset Synchronisation on This Device`. ### Behaviour changes - Setup wizard is now more `goal-oriented`. Brand-new screens are introduced. - `Fetch everything` and `Rebuild everything` is now `Reset Synchronisation on This Device` and `Overwrite Server Data with This Device's Files`. - Remote configuration and E2EE settings are now separated to each modal dialogue. - Peer-to-Peer settings is also separated into its own modal dialogue. - Setup-URI, and Report for the Issue are now not copied to clipboard automatically. Instead, there are copy dialogue and buttons to copy them explicitly. - No longer optional features are introduced during the setup or `Reset Synchronisation on This Device`, `Overwrite Server Data with This Device's Files`. - We cannot preform `Fetch everything` and `Rebuild everything` (Removed, so the old name) without restarting Obsidian now. ### Miscellaneous - Setup QR Code generation is separated into a src/lib/src/API/processSetting.ts file. Please use it as a subrepository if you want to generate QR codes in your own application. - Setup-URI is also separated into a src/lib/src/API/processSetting.ts - Some direct access to web-APIs are now wrapped into the services layer. ### Dependency updates - Many dependencies are updated. Please see `package.json`. - As upgrading TypeScript, Fixed many UInt8Array<ArrayBuffer> and Uint8Array type mismatches.
63 lines
3.1 KiB
Svelte
63 lines
3.1 KiB
Svelte
<script lang="ts">
|
|
import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
|
|
import Guidance from "@/lib/src/UI/components/Guidance.svelte";
|
|
import Decision from "@/lib/src/UI/components/Decision.svelte";
|
|
import Question from "@/lib/src/UI/components/Question.svelte";
|
|
import Option from "@/lib/src/UI/components/Option.svelte";
|
|
import Options from "@/lib/src/UI/components/Options.svelte";
|
|
import Instruction from "@/lib/src/UI/components/Instruction.svelte";
|
|
import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
|
|
import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
|
|
import ExtraItems from "@/lib/src/UI/components/ExtraItems.svelte";
|
|
import Check from "@/lib/src/UI/components/Check.svelte";
|
|
const TYPE_USE_SETUP_URI = "use-setup-uri";
|
|
const TYPE_SCAN_QR_CODE = "scan-qr-code";
|
|
const TYPE_CONFIGURE_MANUALLY = "configure-manually";
|
|
const TYPE_CANCELLED = "cancelled";
|
|
type ResultType = typeof TYPE_USE_SETUP_URI | typeof TYPE_SCAN_QR_CODE | typeof TYPE_CONFIGURE_MANUALLY | typeof TYPE_CANCELLED;
|
|
type Props = {
|
|
setResult: (result: ResultType) => void;
|
|
};
|
|
const { setResult }: Props = $props();
|
|
let userType = $state<ResultType>(TYPE_CANCELLED);
|
|
let proceedTitle = $derived.by(() => {
|
|
if (userType === TYPE_USE_SETUP_URI) {
|
|
return "Proceed with Setup URI";
|
|
} else if (userType === TYPE_CONFIGURE_MANUALLY) {
|
|
return "I know my server details, let me enter them";
|
|
} else if (userType === TYPE_SCAN_QR_CODE) {
|
|
return "Scan the QR code displayed on an active device using this device's camera.";
|
|
} else {
|
|
return "Please select an option to proceed";
|
|
}
|
|
});
|
|
const canProceed = $derived.by(() => {
|
|
return userType === TYPE_USE_SETUP_URI || userType === TYPE_CONFIGURE_MANUALLY || userType === TYPE_SCAN_QR_CODE;
|
|
});
|
|
</script>
|
|
|
|
<DialogHeader title="Device Setup Method" />
|
|
<Guidance>You are adding this device to an existing synchronisation setup.</Guidance>
|
|
<Instruction>
|
|
<Question>Please select a method to import the settings from another device.</Question>
|
|
<Options>
|
|
<Option selectedValue={TYPE_USE_SETUP_URI} title="Use a Setup URI (Recommended)" bind:value={userType}>
|
|
Paste the Setup URI generated from one of your active devices.
|
|
</Option>
|
|
<Option selectedValue={TYPE_SCAN_QR_CODE} title="Scan a QR Code (Recommended for mobile)" bind:value={userType}>
|
|
Scan the QR code displayed on an active device using this device's camera.
|
|
</Option>
|
|
<Option
|
|
selectedValue={TYPE_CONFIGURE_MANUALLY}
|
|
title="Enter the server information manually"
|
|
bind:value={userType}
|
|
>
|
|
Configure the same server information as your other devices again, manually, very advanced users only.
|
|
</Option>
|
|
</Options>
|
|
</Instruction>
|
|
<UserDecisions>
|
|
<Decision title={proceedTitle} important={canProceed} disabled={!canProceed} commit={() => setResult(userType)} />
|
|
<Decision title="Cancel" commit={() => setResult(TYPE_CANCELLED)} />
|
|
</UserDecisions>
|