gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 23:52:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

what in gods name

Browse Source
This commit is contained in:
Scott Chacon 2024-04-30 10:33:35 +02:00
parent 5603dbba5f
commit 2ef63bc1d9
1 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/lib/components/Board.svelte
View File

@ -23,9 +23,11 @@
const activeBranchesError = vbranchService.activeBranchesError; const activeBranchesError = vbranchService.activeBranchesError;
const activeBranches = vbranchService.activeBranches; const activeBranches = vbranchService.activeBranches;
let selectedBranch: { let selectedBranch:
| {
name: string; name: string;
} | undefined; }
| undefined;
let dragged: any; let dragged: any;
let dropZone: HTMLDivElement; let dropZone: HTMLDivElement;
@ -46,7 +48,8 @@
if (!selectedBranch) return; if (!selectedBranch) return;
// while target is setting, display loading // while target is setting, display loading
isSwitching = true; isSwitching = true;
await branchController.setTarget(selectedBranch.name) await branchController
.setTarget(selectedBranch.name)
.then((res) => { .then((res) => {
console.log('done', res); console.log('done', res);
}) })
@ -65,9 +68,7 @@
{:else if !$activeBranches} {:else if !$activeBranches}
<FullviewLoading /> <FullviewLoading />
{:else if isSwitching} {:else if isSwitching}
<div class="middle-message"> <div class="middle-message">switching base branch...</div>
switching base branch...
</div>
{:else} {:else}
<div <div
class="board" class="board"
@ -167,7 +168,14 @@
No remote branches No remote branches
{:else} {:else}
<div class="spacer"> <div class="spacer">
<Select items={remoteBranches.filter(item => item.name != $baseBranch.branchName)} bind:value={selectedBranch} itemId="name" labelId="name"> <Select
items={remoteBranches.filter(
(item) => item.name != $baseBranch.branchName
)}
bind:value={selectedBranch}
itemId="name"
labelId="name"
>
<SelectItem slot="template" let:item let:selected {selected}> <SelectItem slot="template" let:item let:selected {selected}>
{item.name} {item.name}
</SelectItem> </SelectItem>
@ -189,7 +197,7 @@
{:else} {:else}
<div> <div>
<div class="branch-display"> <div class="branch-display">
<div>Your current base branch is: </div> <div>Your current base branch is:</div>
<div class="branch-name">{$baseBranch.branchName}</div> <div class="branch-name">{$baseBranch.branchName}</div>
</div> </div>
<Button <Button