mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-04-12 03:48:42 +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.
76 lines
3.5 KiB
Svelte
76 lines
3.5 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 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";
|
|
const TYPE_EXISTING = "existing-user";
|
|
const TYPE_NEW = "new-user";
|
|
const TYPE_COMPATIBLE_EXISTING = "compatible-existing-user";
|
|
const TYPE_CANCELLED = "cancelled";
|
|
type ResultType = typeof TYPE_EXISTING | typeof TYPE_NEW | typeof TYPE_COMPATIBLE_EXISTING | typeof TYPE_CANCELLED;
|
|
type Props = {
|
|
setResult: (result: ResultType) => void;
|
|
};
|
|
const { setResult }: Props = $props();
|
|
let userType = $state<ResultType>(TYPE_CANCELLED);
|
|
const canProceed = $derived.by(() => {
|
|
return userType === TYPE_EXISTING || userType === TYPE_NEW || userType === TYPE_COMPATIBLE_EXISTING;
|
|
});
|
|
const proceedMessage = $derived.by(() => {
|
|
if (userType === TYPE_NEW) {
|
|
return "Proceed to the next step.";
|
|
} else if (userType === TYPE_EXISTING) {
|
|
return "Proceed to the next step.";
|
|
} else if (userType === TYPE_COMPATIBLE_EXISTING) {
|
|
return "Apply the settings";
|
|
} else {
|
|
return "Please select an option to proceed";
|
|
}
|
|
});
|
|
</script>
|
|
|
|
<DialogHeader title="Mostly Complete: Decision Required" />
|
|
<Guidance>
|
|
The connection to the server has been configured successfully. As the next step, <strong
|
|
>the local database, that is to say the synchronisation information, must be reconstituted.</strong
|
|
>
|
|
</Guidance>
|
|
<Instruction>
|
|
<Question>Please select your situation.</Question>
|
|
<Option title="I am setting up a new server for the first time / I want to reset my existing server." bind:value={userType} selectedValue={TYPE_NEW}>
|
|
<InfoNote>
|
|
Selecting this option will result in the current data on this device being used to initialise the server.
|
|
Any existing data on the server will be completely overwritten.
|
|
</InfoNote>
|
|
</Option>
|
|
<Option
|
|
title="My remote server is already set up. I want to join this device."
|
|
bind:value={userType}
|
|
selectedValue={TYPE_EXISTING}
|
|
>
|
|
<InfoNote>
|
|
Selecting this option will result in this device joining the existing server. You need to fetching the
|
|
existing synchronisation data from the server to this device.
|
|
</InfoNote>
|
|
</Option>
|
|
<Option
|
|
title="The remote is already set up, and the configuration is compatible (or got compatible by this operation)."
|
|
bind:value={userType}
|
|
selectedValue={TYPE_COMPATIBLE_EXISTING}
|
|
>
|
|
<InfoNote warning>
|
|
Unless you are certain, selecting this options is bit dangerous. It assumes that the server configuration is
|
|
compatible with this device. If this is not the case, data loss may occur. Please ensure you know what you
|
|
are doing.
|
|
</InfoNote>
|
|
</Option>
|
|
</Instruction>
|
|
<UserDecisions>
|
|
<Decision title={proceedMessage} important={true} disabled={!canProceed} commit={() => setResult(userType)} />
|
|
<Decision title="No, please take me back" commit={() => setResult(TYPE_CANCELLED)} />
|
|
</UserDecisions>
|