starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-01 23:13:16 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Stacks and InlineCode

Browse Source
This commit is contained in:
Gregory Schier
2026-03-12 19:45:19 -07:00
parent 4d792c7f9f
commit 77ec87ea17
74 changed files with 293 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/yaak-client/components/git/BranchSelectionDialog.tsx
View File

@@ -1,7 +1,7 @@
import { HStack, VStack } from '@yaakapp-internal/ui';
import { useState } from 'react';
import { Button } from '../core/Button';
import { Select } from '../core/Select';
import { HStack, VStack } from '../core/Stacks';
interface Props {
branches: string[];

4
apps/yaak-client/components/git/GitCommitDialog.tsx
View File

@@ -1,4 +1,3 @@
import type { GitStatusEntry } from '@yaakapp-internal/git';
import { useGit } from '@yaakapp-internal/git';
import type {
@@ -9,6 +8,7 @@ import type {
WebsocketRequest,
Workspace,
} from '@yaakapp-internal/models';
import { Banner, HStack, Icon, InlineCode, SplitLayout } from '@yaakapp-internal/ui';
import classNames from 'classnames';
import { useCallback, useMemo, useState } from 'react';
import { modelToYaml } from '../../lib/diffYaml';
@@ -18,10 +18,8 @@ import { Button } from '../core/Button';
import type { CheckboxProps } from '../core/Checkbox';
import { Checkbox } from '../core/Checkbox';
import { DiffViewer } from '../core/Editor/DiffViewer';
import { Banner, Icon, InlineCode, SplitLayout } from '@yaakapp-internal/ui';
import { Input } from '../core/Input';
import { Separator } from '../core/Separator';
import { HStack } from '../core/Stacks';
import { EmptyStateText } from '../EmptyStateText';
import { gitCallbacks } from './callbacks';
import { handlePushResult } from './git-util';

6
apps/yaak-client/components/git/diverged.tsx
View File

@@ -1,10 +1,9 @@
import type { DivergedStrategy } from '@yaakapp-internal/git';
import { HStack, InlineCode } from '@yaakapp-internal/ui';
import { useState } from 'react';
import { showDialog } from '../../lib/dialog';
import { InlineCode } from '@yaakapp-internal/ui';
import { Button } from '../core/Button';
import { RadioCards } from '../core/RadioCards';
import { HStack } from '../core/Stacks';
type Resolution = 'force_reset' | 'merge';
@@ -40,7 +39,8 @@ function DivergedDialog({ remote, branch, onResult, onHide }: DivergedDialogProp
Your local branch has diverged from{' '}
<InlineCode>
{remote}/{branch}
</InlineCode>. How would you like to resolve this?
</InlineCode>
. How would you like to resolve this?
</p>
<RadioCards
name="diverged-strategy"