Commit Graph

1470 Commits

Author SHA1 Message Date
Caleb Owens
928262a09b
Merge pull request #5209 from gitbutlerapp/branch
Patch stacks :D
2024-10-18 16:39:16 +02:00
Caleb Owens
178d4f93f2 Use declaration: true to always export types 2024-10-18 16:31:56 +02:00
Pavel Laptev
d9c027dba9
update styles and props (#5204) 2024-10-18 16:26:23 +02:00
Pavel Laptev
45467f33e5
UI stacking lanes style fixes (#5210)
* fix margins and positioning

* fix dots on zoom
2024-10-18 15:19:15 +02:00
Caleb Owens
ff334cccac Patch stacks :D 2024-10-18 14:48:56 +02:00
Esteban Vega
a9ecf285f6
add-branch-to-stack-update (#5188)
* Button: Add more styling props

- Choose the border radius style
- Set a max-width
- Ignore children (helps with the animation in between having no children and having a large child)

* StackingAddSeriesButton

Replace the 'new series' card with a button that appears on hover.
Also:
The modal displays more information, like what the resulting branch name will be called

* style updates

* button center align

* fix tooltip positioning

* some UI fixes

* added focus trap to the context menu

* styles updated

* update: transition time

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-18 12:55:08 +02:00
Caleb Owens
eea2f32220 Prevent undesirable if can't talk to server 2024-10-17 16:13:16 +02:00
Caleb Owens
73f458738b Fix race condition in listing patch stacks 2024-10-17 14:27:28 +02:00
Caleb Owens
92c1188759 Patch stack creation 2024-10-17 12:59:14 +02:00
Caleb Owens
2c00d5f869 Listing series 2024-10-16 17:49:55 +02:00
Caleb Owens
1345c324db Initial implementation of patch stack service 2024-10-15 14:51:29 +02:00
ndom91
b26b30d8d0 fix: ensure commit-lines.css works for both stacking/original lanes 2024-10-17 12:03:09 +02:00
estib
fb152bcc96 PR card updates 2024-10-16 16:20:02 +02:00
Pavel Laptev
a7eef8ff38 center dots 2024-10-16 15:22:27 +02:00
ndom91
6b89ffdecf fix: bottom commitLine dashed 2024-10-16 15:22:27 +02:00
Pavel Laptev
c6482a94de
Improve modal UI and discard changes (#5148)
* style(modal): Update header padding and add color to body

* style: Update font color in modal body paragraphs

* feat(ui): improve DemoModal structure and props usage

* style: Remove unnecessary global styles from Modal component

* feat(ui): Update DemoModal component onclick event and add onSubmit handler

* StoryBook: Update text in DemoModal

* add missing "submit"

* modal lint/checks fixes

* Update "Discard changes" modal
2024-10-15 16:25:02 +02:00
Pavel Laptev
436cd41f44
fix(ui): Change onmousedown to onclick in Segment.svelte (#5147) 2024-10-15 15:10:10 +02:00
Pavel Laptev
4d84a87f5c
Fix button type for modals (#5145) 2024-10-15 14:19:00 +02:00
Pavel Laptev
62ffe0986d
Revert dialog modal implementation (#5143)
* rename `default` size to `medium`

* animation on close and focus trap

* focus trap fix

* fix clickoutside bug with open select

* Update focusTrap.ts

* fix check

* remove unnesessery code
2024-10-15 10:45:09 +02:00
Caleb Owens
5f49663265 Update how auth tokes are passed around
I forgot to run pnpm check
I forgot to run pnpm test
2024-10-14 17:31:02 +02:00
Pavel Laptev
31020d9dec
style(ui): Simplify label badge conditional rendering in IntegrationSeriesRow (#5130) 2024-10-14 14:27:37 +02:00
ndom91
5724136e88 fix: change stacking header line alignment 2024-10-14 12:29:37 +02:00
ndom91
26784d1ae7 fix: divergent commit shorten to 7 char sha 2024-10-14 12:22:18 +02:00
ndom91
0ff749f036 fix: show diverged commitId in diverged state 2024-10-14 12:03:15 +02:00
Pavel Laptev
c7342b1cdf
Integration modal design (#5116)
* new IntegrationListItem component

* Simple commit row added, componenets rename

* Tweak styles and `Select` update

* check fix
2024-10-14 11:10:00 +02:00
Pavel Laptev
c8c269eef7
style: Update design token for shadow commit (#5120) 2024-10-14 01:02:34 +02:00
ndom91
373ba6036e fix: add emptystateplaceholder to series header empty state
fix: update StackingBranchHeader with empty state
fix: empty state marginBottom: 10
2024-10-11 19:05:26 +02:00
ndom91
43f8fa1b2c fix: update stacking mode CommitNode tooltip contents 2024-10-11 15:04:15 +02:00
Caleb Owens
316dd8d2b6 Extract persisted into a shared library 2024-10-11 11:55:07 +02:00
Caleb Owens
d2034e1a5d Move context into shared 2024-10-10 15:57:16 +02:00
Caleb Owens
5b8c37f830 Move httpService into shared library 2024-10-10 15:31:17 +02:00
Caleb Owens
eead534ab7 Add a shared package 2024-10-09 23:06:31 +02:00
ndom91
ebcfa9f9a0 fix: harmonize commitStatus types and ensure correct color commitCard and branchHeader are rendered
fix: eslint
2024-10-09 21:44:20 +02:00
Kiril Videlov
f8c702cf03
Merge pull request #5070 from gitbutlerapp/switch-local-and-local-remote-colors
switch "local" and "local-remote" colors
2024-10-09 17:22:50 +02:00
Pavel Laptev
e05c1a4a08
Move dummy UI and minor code refactor (#5061)
* update: storybook styles

* fix: Link button prop

* move borderless textarea to UI

* add: BorderlessTextarea story

* remove unused `autoHeight`

* simplify "Props" names

* migrate to Svelte 5: EmptyState component

* fix: autofocus when open the branches search

* eslint

* lint fixes

* lint fixes

---------

Co-authored-by: estib <stron@me.com>
2024-10-09 17:00:35 +02:00
Pavel Laptev
488e6d2597 switch "local" and "local-remote" colors 2024-10-09 16:48:32 +02:00
Caleb Owens
82b58b6875 Make edit mode fantastic 2024-10-09 15:27:20 +02:00
Nico Domino
b3e3ebdb34
fix: migrate Icon.svelte to svelte 5 syntax (#4990)
* fix: migrate Icon.svelte to svelte 5 syntax

* fix: prettier
2024-10-09 01:49:31 +02:00
Esteban Vega
72e981f8cc
pr details follow up (#5054)
* PR Details: CMD or Ctrl + Click opens the browser

* Segment: Optionally make it unfocusable

Control whethe the segment can be focused on tab, or not

* PR Details: Remove unused 'e' handler

* Borderless Textarea: Ability to autofocus

Optionally, autofocus the input field on mount

* PR Details: Update focus behavior

- Focus on the title input filed on mount
- Make the segments unfocusable

* design update

* Update PrDetailsModal.svelte

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-08 15:50:43 +02:00
Pavel Laptev
54f7059aa6 update PR card design 2024-10-07 12:30:41 +02:00
Pavel Laptev
06bd38af5d fix: pr description scroll 2024-10-07 11:52:48 +02:00
Pavel Laptev
59b73c7c07 new PR layout 2024-10-06 19:10:37 +02:00
Pavel Laptev
e4793320d0 new Modal width size 2024-10-05 18:22:50 +02:00
Pavel Laptev
a5bfa67ae9 fix: avatarGroup negative margine 2024-10-05 18:22:32 +02:00
Pavel Laptev
51f02db9f0 update "ai" icons 2024-10-04 16:57:15 +02:00
Pavel Laptev
f7b139c634 fix: textbox and textarea text colors 2024-10-04 16:24:10 +02:00
Pavel Laptev
effe3fcb78 Update "Enable PR templates" settings section
- simplify title
- updated section states when empty and disabled
- update and move `EmptyStatePlaceholder` into UI package
2024-10-04 15:44:07 +02:00
Pavel Laptev
5cc83a4fdb fix: modal backdrop color 2024-10-04 12:55:45 +02:00
estib
b07d2ac61b Modal: Capture keyboard input 2024-10-04 09:26:05 +02:00
estib
2be4aaac2d Display the divergent state in the app
If the local target has diverged from the remote target, display that to the user as a warning

Only show either the divergence warning or upstream count
BaseBranch: Use runes

BaseBranch: Display the branch graph

In order to make it a bit clearer what the divergence state of the base branch is. reuse the line graphs to display it

BaseBranch divergence: Add a confirmation modal
2024-09-24 14:06:03 +02:00