mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-17 05:51:36 +03:00
Move shared components into shared folder
This commit is contained in:
Mattias Granlund
parent
1dd904b8a6
commit
4161b006b7
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContextStore } from '$lib/utils/context';
|
||||
import { openExternalUrl } from '$lib/utils/url';
|
||||
import { BaseBranch, Branch } from '$lib/vbranches/types';
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
import BranchFooter from './BranchFooter.svelte';
|
||||
import BranchHeader from './BranchHeader.svelte';
|
||||
import EmptyStatePlaceholder from '../components/EmptyStatePlaceholder.svelte';
|
||||
import InfoMessage from '../components/InfoMessage.svelte';
|
||||
import ScrollableContainer from '../components/ScrollableContainer.svelte';
|
||||
import PullRequestCard from '../pr/PullRequestCard.svelte';
|
||||
import InfoMessage from '../shared/InfoMessage.svelte';
|
||||
import ScrollableContainer from '../shared/ScrollableContainer.svelte';
|
||||
import { PromptService } from '$lib/ai/promptService';
|
||||
import { AIService } from '$lib/ai/service';
|
||||
import laneNewSvg from '$lib/assets/empty-state/lane-new.svg?raw';
|
||||
@ -12,14 +12,14 @@
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import CommitDialog from '$lib/commit/CommitDialog.svelte';
|
||||
import CommitList from '$lib/commit/CommitList.svelte';
|
||||
import BranchCardDropzones from '$lib/components/BranchCard/Dropzones.svelte';
|
||||
import Resizer from '$lib/components/Resizer.svelte';
|
||||
import Dropzones from '$lib/components/BranchCard/Dropzones.svelte';
|
||||
import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
|
||||
import { projectAiGenEnabled } from '$lib/config/config';
|
||||
import BranchFiles from '$lib/file/BranchFiles.svelte';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import { SETTINGS, type Settings } from '$lib/settings/userSettings';
|
||||
import Resizer from '$lib/shared/Resizer.svelte';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { getContext, getContextStore, getContextStoreBySymbol } from '$lib/utils/context';
|
||||
import { computeAddedRemovedByFiles } from '$lib/utils/metrics';
|
||||
@ -147,7 +147,7 @@
|
||||
<PullRequestCard />
|
||||
|
||||
<div class="card">
|
||||
<BranchCardDropzones>
|
||||
<Dropzones>
|
||||
{#if branch.files?.length > 0}
|
||||
<div class="branch-card__files">
|
||||
<BranchFiles
|
||||
@ -202,7 +202,7 @@
|
||||
</EmptyStatePlaceholder>
|
||||
</div>
|
||||
{/if}
|
||||
</BranchCardDropzones>
|
||||
</Dropzones>
|
||||
|
||||
<div class="card-commits">
|
||||
<CommitList {isUnapplied} />
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import { BranchService } from '$lib/branches/service';
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import { GitHubService } from '$lib/github/service';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { error } from '$lib/utils/toasts';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import BranchCard from './BranchCard.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Resizer from '$lib/components/Resizer.svelte';
|
||||
import { projectLaneCollapsed } from '$lib/config/config';
|
||||
import FileCard from '$lib/file/FileCard.svelte';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import { SETTINGS, type Settings } from '$lib/settings/userSettings';
|
||||
import Resizer from '$lib/shared/Resizer.svelte';
|
||||
import { getContext, getContextStoreBySymbol, createContextStore } from '$lib/utils/context';
|
||||
import {
|
||||
createIntegratedContextStore,
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<script lang="ts">
|
||||
import { AIService } from '$lib/ai/service';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import { projectAiGenEnabled } from '$lib/config/config';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { normalizeBranchName } from '$lib/utils/branch';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import BranchLabel from './BranchLabel.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import ViewPrContextMenu from '$lib/components/ViewPrContextMenu.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { error } from '$lib/utils/toasts';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Button from '../components/Button.svelte';
|
||||
import TextBox from '../components/TextBox.svelte';
|
||||
import TextBox from '../shared/TextBox.svelte';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import type { SystemPromptHandle } from '$lib/backend/prompt';
|
||||
|
||||
export let prompt: SystemPromptHandle | undefined;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
import CommitDragItem from './CommitDragItem.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import CommitMessageInput from '$lib/commit/CommitMessageInput.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import { persistedCommitMessage } from '$lib/config/config';
|
||||
import { draggable } from '$lib/dragging/draggable';
|
||||
import { DraggableCommit, nonDraggable } from '$lib/dragging/draggables';
|
||||
import BranchFilesList from '$lib/file/BranchFilesList.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { getTimeAgo } from '$lib/utils/timeAgo';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import CommitMessageInput from './CommitMessageInput.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import { persistedCommitMessage, projectRunCommitHooks } from '$lib/config/config';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { intersectionObserver } from '$lib/utils/intersectionObserver';
|
||||
import { slideFade } from '$lib/utils/svelteTransitions';
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
import { PromptService } from '$lib/ai/promptService';
|
||||
import { AIService } from '$lib/ai/service';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Checkbox from '$lib/components/Checkbox.svelte';
|
||||
import DropDownButton from '$lib/components/DropDownButton.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
@ -14,6 +11,9 @@
|
||||
projectCommitGenerationUseEmojis
|
||||
} from '$lib/config/config';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Checkbox from '$lib/shared/Checkbox.svelte';
|
||||
import DropDownButton from '$lib/shared/DropDownButton.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { splitMessage } from '$lib/utils/commitMessage';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { PromptService } from '$lib/ai/promptService';
|
||||
import Content from '$lib/components/AIPromptEdit/Content.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { get } from 'svelte/store';
|
||||
import type { Prompts, UserPrompt } from '$lib/ai/types';
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { MessageRole, type UserPrompt } from '$lib/ai/types';
|
||||
import DialogBubble from '$lib/components/AIPromptEdit/DialogBubble.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
export let displayMode: 'readOnly' | 'writable' = 'writable';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { MessageRole } from '$lib/ai/types';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { useAutoHeight } from '$lib/utils/useAutoHeight';
|
||||
import { marked } from 'marked';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import Select from './Select.svelte';
|
||||
import Select from '../shared/Select.svelte';
|
||||
import { PromptService } from '$lib/ai/promptService';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import SelectItem from '$lib/components/SelectItem.svelte';
|
||||
import SelectItem from '$lib/shared/SelectItem.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import type { Prompts, UserPrompt } from '$lib/ai/types';
|
||||
import type { Persisted } from '$lib/persisted/persisted';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import { UpdaterService } from '$lib/backend/updater';
|
||||
import { showToast } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { tap } from 'rxjs';
|
||||
import { fade } from 'svelte/transition';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script>
|
||||
import Button from './Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
</script>
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import Checkbox from './Checkbox.svelte';
|
||||
import Spacer from './Spacer.svelte';
|
||||
import Checkbox from '../shared/Checkbox.svelte';
|
||||
import Spacer from '../shared/Spacer.svelte';
|
||||
import CommitCard from '$lib/commit/CommitCard.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import { projectMergeUpstreamWarningDismissed } from '$lib/config/config';
|
||||
import { showInfo } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import InfoMessage from './InfoMessage.svelte';
|
||||
import Select from './Select.svelte';
|
||||
import InfoMessage from '../shared/InfoMessage.svelte';
|
||||
import Select from '../shared/Select.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import SelectItem from '$lib/components/SelectItem.svelte';
|
||||
import Section from '$lib/settings/Section.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import SelectItem from '$lib/shared/SelectItem.svelte';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { getRemoteBranches } from '$lib/vbranches/baseBranch';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import BranchLane from '$lib/branch/BranchLane.svelte';
|
||||
import BranchDropzone from '$lib/components/BranchDropzone.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import { cloneWithRotation } from '$lib/dragging/draggable';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { editor } from '$lib/utils/systemEditor';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
import middleSheetSvg from '$lib/assets/new-branch/middle-sheet.svg?raw';
|
||||
import topSheetSvg from '$lib/assets/new-branch/top-sheet.svg?raw';
|
||||
// import components
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Dropzone from '$lib/components/Dropzone/Dropzone.svelte';
|
||||
import { DraggableFile, DraggableHunk } from '$lib/dragging/draggables';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
import { filesToOwnership } from '$lib/vbranches/ownership';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import AccountLink from './AccountLink.svelte';
|
||||
import Icon from './Icon.svelte';
|
||||
import AccountLink from '../shared/AccountLink.svelte';
|
||||
import Icon from '../shared/Icon.svelte';
|
||||
import gbLogoSvg from '$lib/assets/gb-logo.svg?raw';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { getContextStore } from '$lib/utils/context';
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import Checkbox from '$lib/components/Checkbox.svelte';
|
||||
import Toggle from '$lib/components/Toggle.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import Checkbox from '$lib/shared/Checkbox.svelte';
|
||||
import Toggle from '$lib/shared/Toggle.svelte';
|
||||
import type { Writable } from 'svelte/store';
|
||||
|
||||
export let visible: boolean;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
</script>
|
||||
|
||||
<div class="loading" data-tauri-drag-region><Icon name="spinner" /></div>
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import EmptyStatePlaceholder from './EmptyStatePlaceholder.svelte';
|
||||
import FullviewLoading from './FullviewLoading.svelte';
|
||||
import Icon from './Icon.svelte';
|
||||
import LazyloadContainer from './LazyloadContainer.svelte';
|
||||
import ScrollableContainer from './ScrollableContainer.svelte';
|
||||
import SnapshotCard from './SnapshotCard.svelte';
|
||||
import Icon from '../shared/Icon.svelte';
|
||||
import LazyloadContainer from '../shared/LazyloadContainer.svelte';
|
||||
import ScrollableContainer from '../shared/ScrollableContainer.svelte';
|
||||
import emptyFolderSvg from '$lib/assets/empty-state/empty-folder.svg?raw';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import FileCard from '$lib/file/FileCard.svelte';
|
||||
import { HistoryService, createdOnDay } from '$lib/history/history';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { RemoteFile } from '$lib/vbranches/types';
|
||||
import { plainToInstance } from 'class-transformer';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
export let isLast = false;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Link from './Link.svelte';
|
||||
import Link from '../shared/Link.svelte';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { UserService, type LoginToken } from '$lib/stores/user';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import DecorativeSplitView from './DecorativeSplitView.svelte';
|
||||
import Link from './Link.svelte';
|
||||
import ProjectNameLabel from './ProjectNameLabel.svelte';
|
||||
import ProjectSwitcher from './ProjectSwitcher.svelte';
|
||||
import RemoveProjectButton from './RemoveProjectButton.svelte';
|
||||
import Link from '../shared/Link.svelte';
|
||||
import ProjectNameLabel from '../shared/ProjectNameLabel.svelte';
|
||||
import derectionDoubtSvg from '$lib/assets/illustrations/direction-doubt.svg?raw';
|
||||
import { ProjectService, Project } from '$lib/backend/projects';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
import RemoveProjectButton from './RemoveProjectButton.svelte';
|
||||
import loadErrorSvg from '$lib/assets/illustrations/load-error.svg?raw';
|
||||
import { ProjectService, Project } from '$lib/backend/projects';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<script async lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import ProjectSetupTarget from './ProjectSetupTarget.svelte';
|
||||
import newProjectSvg from '$lib/assets/illustrations/new-project.svg?raw';
|
||||
import { Project, ProjectService } from '$lib/backend/projects';
|
||||
import DecorativeSplitView from '$lib/components/DecorativeSplitView.svelte';
|
||||
import KeysForm from '$lib/settings/KeysForm.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
import { platform } from '@tauri-apps/api/os';
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
<script async lang="ts">
|
||||
import ProjectNameLabel from './ProjectNameLabel.svelte';
|
||||
import ProjectNameLabel from '../shared/ProjectNameLabel.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import BackButton from '$lib/components/BackButton.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Login from '$lib/components/Login.svelte';
|
||||
import Select from '$lib/components/Select.svelte';
|
||||
import SelectItem from '$lib/components/SelectItem.svelte';
|
||||
import SetupFeature from '$lib/components/SetupFeature.svelte';
|
||||
import Toggle from '$lib/components/Toggle.svelte';
|
||||
import { projectAiGenEnabled } from '$lib/config/config';
|
||||
import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
|
||||
import GithubIntegration from '$lib/settings/GithubIntegration.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Select from '$lib/shared/Select.svelte';
|
||||
import SelectItem from '$lib/shared/SelectItem.svelte';
|
||||
import Toggle from '$lib/shared/Toggle.svelte';
|
||||
import { UserService } from '$lib/stores/user';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { platform } from '@tauri-apps/api/os';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Select from './Select.svelte';
|
||||
import SelectItem from './SelectItem.svelte';
|
||||
import Select from '../shared/Select.svelte';
|
||||
import SelectItem from '../shared/SelectItem.svelte';
|
||||
import { ProjectService, Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext, maybeGetContext } from '$lib/utils/context';
|
||||
import { derived } from 'svelte/store';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Modal from './Modal.svelte';
|
||||
import TextBox from './TextBox.svelte';
|
||||
import Modal from '../shared/Modal.svelte';
|
||||
import TextBox from '../shared/TextBox.svelte';
|
||||
import { PromptService } from '$lib/backend/prompt';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
|
||||
const promptService = getContext(PromptService);
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
// This is always displayed in the context of not having a cooresponding vbranch or remote
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Link from '$lib/components/Link.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import { RemotesService } from '$lib/remotes/service';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Link from '$lib/shared/Link.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
import { remoteUrlIsHttp } from '$lib/utils/url';
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import DropDownButton from '$lib/components/DropDownButton.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import DropDownButton from '$lib/shared/DropDownButton.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
export let integrate: boolean; // Integrate upstream option enabled
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Resizer from './Resizer.svelte';
|
||||
import ScrollableContainer from './ScrollableContainer.svelte';
|
||||
import BranchPreviewHeader from '../branch/BranchPreviewHeader.svelte';
|
||||
import Resizer from '../shared/Resizer.svelte';
|
||||
import ScrollableContainer from '../shared/ScrollableContainer.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import CommitCard from '$lib/commit/CommitCard.svelte';
|
||||
import FileCard from '$lib/file/FileCard.svelte';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
|
||||
export let projectTitle: string = '#';
|
||||
export let isDeleting = false;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { createEventDispatcher, getContext, onMount } from 'svelte';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
import type { SegmentContext } from './segment';
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import TextArea from './TextArea.svelte';
|
||||
import TextBox from './TextBox.svelte';
|
||||
import TextArea from '../shared/TextArea.svelte';
|
||||
import TextBox from '../shared/TextBox.svelte';
|
||||
import { HttpClient } from '$lib/backend/httpClient';
|
||||
import { invoke, listen } from '$lib/backend/ipc';
|
||||
import * as zip from '$lib/backend/zip';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Checkbox from '$lib/components/Checkbox.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Checkbox from '$lib/shared/Checkbox.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from './Icon.svelte';
|
||||
import Icon from '../shared/Icon.svelte';
|
||||
import { pxToRem } from '$lib/utils/pxToRem';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Icon from './Icon.svelte';
|
||||
import SnapshotAttachment from './SnapshotAttachment.svelte';
|
||||
import Icon from '../shared/Icon.svelte';
|
||||
import { getVSIFileIcon } from '$lib/ext-icons';
|
||||
import { createdOnDay } from '$lib/history/history';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { toHumanReadableTime } from '$lib/utils/time';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import type { Snapshot, SnapshotDetails } from '$lib/history/types';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
import DecorativeSplitView from './DecorativeSplitView.svelte';
|
||||
import ProjectSwitcher from './ProjectSwitcher.svelte';
|
||||
import loadErrorSvg from '$lib/assets/illustrations/load-error.svg?raw';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
|
||||
export let error: any = undefined;
|
||||
</script>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import TimeAgo from '$lib/components/TimeAgo.svelte';
|
||||
import { GitHubService } from '$lib/github/service';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import TimeAgo from '$lib/shared/TimeAgo.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { BaseBranchService } from '$lib/vbranches/baseBranch';
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import { showInfo, showError } from '$lib/notifications/toasts';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import PopupMenu from '$lib/components/PopupMenu.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import PopupMenu from '$lib/shared/PopupMenu.svelte';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
|
||||
export let prUrl: string;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
import WelcomeSigninAction from './WelcomeSigninAction.svelte';
|
||||
import newProjectSvg from '$lib/assets/no-projects/new-project.svg?raw';
|
||||
import { ProjectService } from '$lib/backend/projects';
|
||||
import IconLink from '$lib/components/IconLink.svelte';
|
||||
import IconLink from '$lib/shared/IconLink.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
|
||||
const projectService = getContext(ProjectService);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
|
||||
export let title: string;
|
||||
export let loading = false;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
|
||||
export let icon: keyof typeof iconsJson | undefined = undefined;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Badge from '$lib/components/Badge.svelte';
|
||||
import Checkbox from '$lib/components/Checkbox.svelte';
|
||||
import Badge from '$lib/shared/Badge.svelte';
|
||||
import Checkbox from '$lib/shared/Checkbox.svelte';
|
||||
import { maybeGetContextStore } from '$lib/utils/context';
|
||||
import { Ownership } from '$lib/vbranches/ownership';
|
||||
import type { AnyFile } from '$lib/vbranches/types';
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import BranchFilesHeader from './BranchFilesHeader.svelte';
|
||||
import FileListItem from './FileListItem.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import LazyloadContainer from '$lib/components/LazyloadContainer.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import LazyloadContainer from '$lib/shared/LazyloadContainer.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { selectFilesInList } from '$lib/utils/selectFilesInList';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import FileCardHeader from './FileCardHeader.svelte';
|
||||
import FileDiff from './FileDiff.svelte';
|
||||
import ScrollableContainer from '$lib/components/ScrollableContainer.svelte';
|
||||
import ScrollableContainer from '$lib/shared/ScrollableContainer.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { ContentSection, HunkSection, parseFileSections } from '$lib/utils/fileSections';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import FileStatusTag from './FileStatusTag.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import { getVSIFileIcon } from '$lib/ext-icons';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { computeFileStatus } from '$lib/utils/fileStatus';
|
||||
import { computeAddedRemovedByFiles } from '$lib/utils/metrics';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import PopupMenu from '$lib/components/PopupMenu.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import PopupMenu from '$lib/shared/PopupMenu.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { computeFileStatus } from '$lib/utils/fileStatus';
|
||||
import { editor } from '$lib/utils/systemEditor';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import LargeDiffMessage from '$lib/components/LargeDiffMessage.svelte';
|
||||
import HunkViewer from '$lib/hunk/HunkViewer.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import LargeDiffMessage from '$lib/shared/LargeDiffMessage.svelte';
|
||||
import { computeAddedRemovedByHunk } from '$lib/utils/metrics';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
import { getLocalCommits, getRemoteCommits } from '$lib/vbranches/contexts';
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import FileContextMenu from './FileContextMenu.svelte';
|
||||
import FileStatusIcons from './FileStatusIcons.svelte';
|
||||
import Checkbox from '$lib/components/Checkbox.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import { draggable } from '$lib/dragging/draggable';
|
||||
import { DraggableFile } from '$lib/dragging/draggables';
|
||||
import { getVSIFileIcon } from '$lib/ext-icons';
|
||||
import Checkbox from '$lib/shared/Checkbox.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext, maybeGetContextStore } from '$lib/utils/context';
|
||||
import { updateFocus } from '$lib/utils/selection';
|
||||
import { getCommitStore } from '$lib/vbranches/contexts';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import FileStatusCircle from './FileStatusCircle.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { computeFileStatus } from '$lib/utils/fileStatus';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
import { getLocalCommits, getRemoteCommits } from '$lib/vbranches/contexts';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import type { FileStatus } from '$lib/utils/fileStatus';
|
||||
import type { ComponentColor } from '$lib/vbranches/types';
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import PopupMenu from '$lib/components/PopupMenu.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import PopupMenu from '$lib/shared/PopupMenu.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { editor } from '$lib/utils/systemEditor';
|
||||
import { BranchController } from '$lib/vbranches/branchController';
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import LargeDiffMessage from '$lib/components/LargeDiffMessage.svelte';
|
||||
import Scrollbar from '$lib/components/Scrollbar.svelte';
|
||||
import { draggable } from '$lib/dragging/draggable';
|
||||
import { DraggableHunk } from '$lib/dragging/draggables';
|
||||
import HunkContextMenu from '$lib/hunk/HunkContextMenu.svelte';
|
||||
import HunkLines from '$lib/hunk/HunkLines.svelte';
|
||||
import { SETTINGS, type Settings } from '$lib/settings/userSettings';
|
||||
import LargeDiffMessage from '$lib/shared/LargeDiffMessage.svelte';
|
||||
import Scrollbar from '$lib/shared/Scrollbar.svelte';
|
||||
import { getContext, getContextStoreBySymbol, maybeGetContextStore } from '$lib/utils/context';
|
||||
import { Ownership } from '$lib/vbranches/ownership';
|
||||
import { Branch, type Hunk } from '$lib/vbranches/types';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import SyncButton from '../components/SyncButton.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import Badge from '$lib/components/Badge.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Badge from '$lib/shared/Badge.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
import { BaseBranchService } from '$lib/vbranches/baseBranch';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
import BranchIcon from '../branch/BranchIcon.svelte';
|
||||
// disabled until the performance issue is fixed
|
||||
// import AuthorIcons from '$lib/components/AuthorIcons.svelte';
|
||||
import TimeAgo from '$lib/components/TimeAgo.svelte';
|
||||
import TimeAgo from '$lib/shared/TimeAgo.svelte';
|
||||
import type { CombinedBranch } from '$lib/branches/types';
|
||||
import { goto } from '$app/navigation';
|
||||
import { page } from '$app/stores';
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
import noBranchesSvg from '$lib/assets/empty-state/no-branches.svg?raw';
|
||||
import { BranchService } from '$lib/branches/service';
|
||||
import FilterPopupMenu from '$lib/components/FilterPopupMenu.svelte';
|
||||
import ScrollableContainer from '$lib/components/ScrollableContainer.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import { GitHubService } from '$lib/github/service';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import { storeToObservable } from '$lib/rxjs/store';
|
||||
import ScrollableContainer from '$lib/shared/ScrollableContainer.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { BehaviorSubject, combineLatest } from 'rxjs';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import Badge from '$lib/components/Badge.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Badge from '$lib/shared/Badge.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import type { Snippet } from 'svelte';
|
||||
|
||||
interface Props {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Button from '../components/Button.svelte';
|
||||
import AccountLink from '$lib/components/AccountLink.svelte';
|
||||
import AccountLink from '$lib/shared/AccountLink.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import * as events from '$lib/utils/events';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
import Footer from './Footer.svelte';
|
||||
import ProjectSelector from './ProjectSelector.svelte';
|
||||
import DomainButton from '../components/DomainButton.svelte';
|
||||
import Resizer from '../components/Resizer.svelte';
|
||||
import Resizer from '../shared/Resizer.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import { persisted } from '$lib/persisted/persisted';
|
||||
import { SETTINGS, type Settings } from '$lib/settings/userSettings';
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
import ProjectsPopup from './ProjectsPopup.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { ProjectService } from '$lib/backend/projects';
|
||||
import ListItem from '$lib/components/ListItem.svelte';
|
||||
import ScrollableContainer from '$lib/components/ScrollableContainer.svelte';
|
||||
import ListItem from '$lib/shared/ListItem.svelte';
|
||||
import ScrollableContainer from '$lib/shared/ScrollableContainer.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { goto } from '$app/navigation';
|
||||
import { page } from '$app/stores';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import InfoMessage from '$lib/components/InfoMessage.svelte';
|
||||
import { dismissToast, toastStore } from '$lib/notifications/toasts';
|
||||
import InfoMessage from '$lib/shared/InfoMessage.svelte';
|
||||
import { marked } from 'marked';
|
||||
import { slide } from 'svelte/transition';
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { writable, type Writable } from 'svelte/store';
|
||||
import type { MessageStyle } from '$lib/components/InfoMessage.svelte';
|
||||
import type { MessageStyle } from '$lib/shared/InfoMessage.svelte';
|
||||
|
||||
export interface Toast {
|
||||
id?: string;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<script lang="ts">
|
||||
import DropDownButton from '$lib/components/DropDownButton.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import { MergeMethod } from '$lib/github/types';
|
||||
import { persisted, type Persisted } from '$lib/persisted/persisted';
|
||||
import DropDownButton from '$lib/shared/DropDownButton.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
export let projectId: string;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import DropDownButton from '$lib/components/DropDownButton.svelte';
|
||||
import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
|
||||
import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
|
||||
import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
|
||||
import { persisted, type Persisted } from '$lib/persisted/persisted';
|
||||
import DropDownButton from '$lib/shared/DropDownButton.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
const Action = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<script lang="ts">
|
||||
import MergeButton from './MergeButton.svelte';
|
||||
import Button from '../components/Button.svelte';
|
||||
import InfoMessage from '../components/InfoMessage.svelte';
|
||||
import InfoMessage from '../shared/InfoMessage.svelte';
|
||||
import { Project } from '$lib/backend/projects';
|
||||
import { BranchService } from '$lib/branches/service';
|
||||
import ViewPrContextMenu from '$lib/components/ViewPrContextMenu.svelte';
|
||||
import { GitHubService } from '$lib/github/service';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { createTimeAgoStore } from '$lib/utils/timeAgo';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
@ -15,9 +15,9 @@
|
||||
import { distinctUntilChanged } from 'rxjs';
|
||||
import { mount, onDestroy, unmount } from 'svelte';
|
||||
import { derived, type Readable } from 'svelte/store';
|
||||
import type { MessageStyle } from '$lib/components/InfoMessage.svelte';
|
||||
import type { ChecksStatus, DetailedPullRequest } from '$lib/github/types';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
import type { MessageStyle } from '$lib/shared/InfoMessage.svelte';
|
||||
import type { ComponentColor } from '$lib/vbranches/types';
|
||||
|
||||
type StatusInfo = {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import AnalyticsSettings from '$lib/settings/AnalyticsSettings.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import type { Writable } from 'svelte/store';
|
||||
|
||||
export let analyticsConfirmed: Writable<boolean>;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import Link from '$lib/components/Link.svelte';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import Toggle from '$lib/components/Toggle.svelte';
|
||||
import {
|
||||
appErrorReportingEnabled,
|
||||
appMetricsEnabled,
|
||||
appNonAnonMetricsEnabled
|
||||
} from '$lib/config/appSettings';
|
||||
import Link from '$lib/shared/Link.svelte';
|
||||
import Toggle from '$lib/shared/Toggle.svelte';
|
||||
|
||||
const errorReportingEnabled = appErrorReportingEnabled();
|
||||
const metricsEnabled = appMetricsEnabled();
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<script lang="ts">
|
||||
import { Project, ProjectService } from '$lib/backend/projects';
|
||||
import AiPromptSelect from '$lib/components/AIPromptSelect.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Link from '$lib/components/Link.svelte';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import Spacer from '$lib/components/Spacer.svelte';
|
||||
import Toggle from '$lib/components/Toggle.svelte';
|
||||
import WelcomeSigninAction from '$lib/components/WelcomeSigninAction.svelte';
|
||||
import { projectAiGenEnabled } from '$lib/config/config';
|
||||
import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
|
||||
import Section from '$lib/settings/Section.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Link from '$lib/shared/Link.svelte';
|
||||
import Spacer from '$lib/shared/Spacer.svelte';
|
||||
import Toggle from '$lib/shared/Toggle.svelte';
|
||||
import { UserService } from '$lib/stores/user';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import * as toasts from '$lib/utils/toasts';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import ScrollableContainer from '$lib/components/ScrollableContainer.svelte';
|
||||
import ScrollableContainer from '$lib/shared/ScrollableContainer.svelte';
|
||||
|
||||
export let title: string | undefined = undefined;
|
||||
</script>
|
||||
|
||||
152
app/src/lib/settings/CredentialCheck.svelte
Normal file
152
app/src/lib/settings/CredentialCheck.svelte
Normal file
@ -0,0 +1,152 @@
|
||||
<script lang="ts">
|
||||
import SectionCardDisclaimer from '../components/SectionCardDisclaimer.svelte';
|
||||
import Icon from '../shared/Icon.svelte';
|
||||
import InfoMessage from '../shared/InfoMessage.svelte';
|
||||
import Link from '../shared/Link.svelte';
|
||||
import { AuthService } from '$lib/backend/auth';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { slide } from 'svelte/transition';
|
||||
|
||||
export let projectId: string;
|
||||
export let remoteName: string | null | undefined;
|
||||
export let branchName: string | null | undefined;
|
||||
|
||||
const authService = getContext(AuthService);
|
||||
|
||||
type Check = { name: string; promise: Promise<any> };
|
||||
$: checks = [] as Check[];
|
||||
|
||||
$: errors = 0;
|
||||
$: loading = false;
|
||||
|
||||
async function checkCredentials() {
|
||||
if (!remoteName || !branchName) return;
|
||||
loading = true;
|
||||
errors = 0;
|
||||
checks = [];
|
||||
|
||||
try {
|
||||
const fetchCheck = authService.checkGitFetch(projectId, remoteName);
|
||||
checks = [{ name: 'Fetch', promise: fetchCheck }];
|
||||
await fetchCheck;
|
||||
const pushCheck = authService.checkGitPush(projectId, remoteName, branchName);
|
||||
checks = [...checks, { name: 'Push', promise: pushCheck }];
|
||||
await pushCheck;
|
||||
} catch {
|
||||
errors = 1;
|
||||
} finally {
|
||||
loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
export function reset() {
|
||||
checks = [];
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="credential-check">
|
||||
{#if checks.length > 0}
|
||||
<div transition:slide={{ duration: 250 }}>
|
||||
<InfoMessage
|
||||
style={errors > 0 ? 'warning' : loading ? 'neutral' : 'success'}
|
||||
filled
|
||||
outlined={false}
|
||||
>
|
||||
<svelte:fragment slot="title">
|
||||
{#if loading}
|
||||
Checking git credentials …
|
||||
{:else if errors > 0}
|
||||
There was a problem with your credentials
|
||||
{:else}
|
||||
All checks passed successfully
|
||||
{/if}
|
||||
</svelte:fragment>
|
||||
|
||||
<svelte:fragment slot="content">
|
||||
<div class="checks-list" transition:slide={{ duration: 250, delay: 1000 }}>
|
||||
{#each checks as check}
|
||||
<div class="text-base-body-12 check-result">
|
||||
<i class="check-icon">
|
||||
{#await check.promise}
|
||||
<Icon name="spinner" spinnerRadius={4} />
|
||||
{:then}
|
||||
<Icon name="success-small" color="success" />
|
||||
{:catch}
|
||||
<Icon name="error-small" color="error" />
|
||||
{/await}
|
||||
</i>{check.name}
|
||||
|
||||
{#await check.promise catch err}
|
||||
- {err}
|
||||
{/await}
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
{#if errors > 0}
|
||||
<div class="text-base-body-12 help-text" transition:slide>
|
||||
<span>
|
||||
Try another setting and test again?
|
||||
<br />
|
||||
Consult our
|
||||
<Link href="https://docs.gitbutler.com/troubleshooting/fetch-push">
|
||||
fetch / push guide
|
||||
</Link>
|
||||
for help fixing this problem.
|
||||
</span>
|
||||
</div>
|
||||
{/if}
|
||||
</svelte:fragment>
|
||||
</InfoMessage>
|
||||
</div>
|
||||
{/if}
|
||||
<Button
|
||||
style="pop"
|
||||
kind="solid"
|
||||
wide
|
||||
icon="item-tick"
|
||||
disabled={loading}
|
||||
on:click={checkCredentials}
|
||||
>
|
||||
{#if loading || checks.length === 0}
|
||||
Test credentials
|
||||
{:else}
|
||||
Re-test credentials
|
||||
{/if}
|
||||
</Button>
|
||||
<SectionCardDisclaimer>
|
||||
To test the push command, we create an empty branch and promptly remove it after the check. <Link
|
||||
href="https://docs.gitbutler.com/troubleshooting/fetch-push">Read more</Link
|
||||
> about authentication methods.
|
||||
</SectionCardDisclaimer>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.credential-check {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.checks-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.check-icon {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.check-result {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.help-text {
|
||||
margin-top: 6px;
|
||||
}
|
||||
</style>
|
||||
@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { Project, ProjectService } from '$lib/backend/projects';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import Spacer from '$lib/components/Spacer.svelte';
|
||||
import TextArea from '$lib/components/TextArea.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import Spacer from '$lib/shared/Spacer.svelte';
|
||||
import TextArea from '$lib/shared/TextArea.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { User } from '$lib/stores/user';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<script lang="ts">
|
||||
import { checkAuthStatus, initDeviceOauth } from '$lib/backend/github';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import { GitHubService } from '$lib/github/service';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import Modal from '$lib/shared/Modal.svelte';
|
||||
import { UserService } from '$lib/stores/user';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<script lang="ts">
|
||||
import { AuthService } from '$lib/backend/auth';
|
||||
import { ProjectService, type Key, type KeyType, Project } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import CredentialCheck from '$lib/components/CredentialCheck.svelte';
|
||||
import Link from '$lib/components/Link.svelte';
|
||||
import ProjectNameLabel from '$lib/components/ProjectNameLabel.svelte';
|
||||
import RadioButton from '$lib/components/RadioButton.svelte';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import { showError } from '$lib/notifications/toasts';
|
||||
import Section from '$lib/settings/Section.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import CredentialCheck from '$lib/shared/CredentialCheck.svelte';
|
||||
import Link from '$lib/shared/Link.svelte';
|
||||
import ProjectNameLabel from '$lib/shared/ProjectNameLabel.svelte';
|
||||
import RadioButton from '$lib/shared/RadioButton.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
import { getContext, getContextStore } from '$lib/utils/context';
|
||||
import { openExternalUrl } from '$lib/utils/url';
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
<script lang="ts">
|
||||
import { GitConfigService } from '$lib/backend/gitConfigService';
|
||||
import { Project, ProjectService } from '$lib/backend/projects';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import InfoMessage from '$lib/components/InfoMessage.svelte';
|
||||
import Link from '$lib/components/Link.svelte';
|
||||
import SectionCard from '$lib/components/SectionCard.svelte';
|
||||
import SectionCardDisclaimer from '$lib/components/SectionCardDisclaimer.svelte';
|
||||
import Select from '$lib/components/Select.svelte';
|
||||
import SelectItem from '$lib/components/SelectItem.svelte';
|
||||
import TextBox from '$lib/components/TextBox.svelte';
|
||||
import Toggle from '$lib/components/Toggle.svelte';
|
||||
import { projectRunCommitHooks } from '$lib/config/config';
|
||||
import Section from '$lib/settings/Section.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import InfoMessage from '$lib/shared/InfoMessage.svelte';
|
||||
import Link from '$lib/shared/Link.svelte';
|
||||
import Select from '$lib/shared/Select.svelte';
|
||||
import SelectItem from '$lib/shared/SelectItem.svelte';
|
||||
import TextBox from '$lib/shared/TextBox.svelte';
|
||||
import Toggle from '$lib/shared/Toggle.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { invoke } from '@tauri-apps/api/tauri';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Spacer from '$lib/components/Spacer.svelte';
|
||||
import Spacer from '$lib/shared/Spacer.svelte';
|
||||
import { pxToRem } from '$lib/utils/pxToRem';
|
||||
|
||||
export let spacer = false;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import SupportersBanner from './SupportersBanner.svelte';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { UserService } from '$lib/stores/user';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import type { Settings } from '$lib/settings/userSettings';
|
||||
import type { Writable } from 'svelte/store';
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { pxToRem } from '$lib/utils/pxToRem';
|
||||
import { tooltip } from '$lib/utils/tooltip';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
@ -1,10 +1,10 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Icon from './Icon.svelte';
|
||||
import InfoMessage from './InfoMessage.svelte';
|
||||
import Link from './Link.svelte';
|
||||
import SectionCardDisclaimer from './SectionCardDisclaimer.svelte';
|
||||
import { AuthService } from '$lib/backend/auth';
|
||||
import SectionCardDisclaimer from '$lib/components/SectionCardDisclaimer.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { getContext } from '$lib/utils/context';
|
||||
import { slide } from 'svelte/transition';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import Button from '$lib/components/Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
import type { ComponentColor, ComponentStyleKind } from '$lib/vbranches/types';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
export let href: string;
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
|
||||
export let iconOpacity: number = 0.7;
|
||||
@ -4,8 +4,8 @@
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Icon, { type IconColor } from '$lib/components/Icon.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import Icon, { type IconColor } from '$lib/shared/Icon.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import type iconsJson from '../icons/icons.json';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Button from './Button.svelte';
|
||||
import Button from '$lib/shared/Button.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
|
||||
export let showFrame = false;
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { openExternalUrl } from '$lib/utils/url';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { clickOutside } from '$lib/clickOutside';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import Icon from '$lib/shared/Icon.svelte';
|
||||
import { portal } from '$lib/utils/portal';
|
||||
import type iconsJson from '$lib/icons/icons.json';
|
||||
import type { Snippet } from 'svelte';
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user