Commit Graph

1557 Commits

Author SHA1 Message Date
Caleb Owens
a233cbcb1f Added example page for redux 2024-11-20 18:56:35 +01:00
Caleb Owens
634ce90ea7 Added plumbing for redux in svelte 2024-11-20 18:56:35 +01:00
Caleb Owens
fb1d1703ed Install redux in appropriate packages 2024-11-20 18:56:35 +01:00
ndom91
7a90cfa6c9 feat: force tooltip away from viewport edge 2024-11-20 18:05:32 +01:00
Esteban Vega
788d26722b
Merge pull request #5580 from gitbutlerapp/edit-mode-improvements
Edit mode: Display changed state and warn about conflicts
2024-11-20 08:45:13 +01:00
Kiril Videlov
bb4fe78aca
Merge pull request #5621 from gitbutlerapp/pl-branch-2
fix(ui): correct tooltip and icon for series representation
2024-11-20 07:45:49 +01:00
Pavel Laptev
f3bd6ecedd fix(ui): correct tooltip and icon for series representation 2024-11-20 01:52:58 +01:00
Caleb Owens
fe2c7be055 Update upstream integration UI component 2024-11-19 21:37:56 +01:00
Pavel Laptev
978e24d2e6 don't wrap the text in "mark as resolved" 2024-11-19 16:46:26 +01:00
Pavel Laptev
47c3217283 add onresolveclick 2024-11-19 16:46:26 +01:00
Pavel Laptev
7d866e0912 update the path tooltip place 2024-11-19 16:46:26 +01:00
Pavel Laptev
a3f6485f67 fix path truncation and vertical alignment 2024-11-19 16:46:26 +01:00
Caleb Owens
e6c2177db9 Fix commit line colors
One problem was that we were over eager in assigning the remote_commit_id property, and ended up with remote commits getting the remote_commit_id set to themselves.

Another problem is that the commit line logic's integrated commit list was supposed to be mutually exclusive from the other arrays. I've added some extra logic to ensure that is the case
2024-11-19 15:16:14 +01:00
ndom91
d4e81fd227
fix: update errorSeries card 2024-11-19 13:42:27 +01:00
ndom91
700f65096e
feat: add errorSeries placeholder 2024-11-19 13:34:16 +01:00
Pavel Laptev
7ad78157f7
style: add overflow hidden to SidebarEntry styles (#5598) 2024-11-19 11:34:40 +01:00
ndom91
e63578b93a fix: truncate long path from front, not back 2024-11-18 14:14:17 +01:00
Kiril Videlov
557b907fc6
Merge pull request #5552 from gitbutlerapp/upstream-integration
Stack upstream integration
2024-11-18 10:17:58 +01:00
Pavel Laptev
dc043da507 refactor CommitAction component 2024-11-15 17:44:10 +01:00
estib
312d764708 Shared: Ephemeral persited values
Add a shared utility function for the temporary persitance of values.
If retrieved after the given number of seconds, the value will be considered not present.
2024-11-15 16:28:48 +01:00
ndom91
55d6fde463 feat: remove storybook test 2024-11-15 15:45:23 +01:00
Caleb Owens
311a0281d7 Fix stack of branches 2024-11-14 18:36:40 +01:00
Caleb Owens
57fe6c03a9 Merge pull request #5544 from gitbutlerapp/Integrate-upstream-modal-components
Integrate upstream modal components
2024-11-14 18:36:40 +01:00
Pavel Laptev
bf8f3229dc
UI: Improve branch cards (#5546)
* fix: don't show `draggable` handle on integrated commits

* refactor: simplify functions and CSS

- move `getColorFromBranchType` to the UI
- simplify `lineManager`
- use single CSS variable for the lane color

* add `typeOverride` for the base branch case

* new design for the empty series
2024-11-14 17:17:14 +01:00
Pavel Laptev
a91774301f refactor: update character count from Textarea component 2024-11-14 10:12:45 +01:00
ndom91
40e630edb8 feat: add char count to commit msg input 2024-11-14 10:12:45 +01:00
Mattias Granlund
2291e38a82 Include repo domain and hash in posthog events
- so we can understand and prioritise forge support
2024-11-13 11:45:09 +01:00
Pavel Laptev
229c9b8fe3
remove-unused-icons (#5524)
* refactor(icons): icons rename, remove unused

* feat(icons): update small AI icon

* refactor: make icon optional in snapshot operation mapping
2024-11-12 12:30:01 +01:00
Mattias Granlund
ee04556008 Fix "load failed" on pr creation
- rust returns null for optional values rather than undefined
- add missing $derived
2024-11-12 11:10:24 +01:00
Pavel Laptev
cf73b39fc8
UI improve context menu (#5498)
* Add stack footer

* add `Toggle` story

* refactor styles and copy: update context menu components

* feat(prFooter): update footer format to enhance clarity

* remove extra `PR` word from the PR card context menu

* simplify labels in SeriesHeaderContextMenu + add a section title

* refactor: replace StackingCommitCard with CommitCard component

* refactor: replace parent.close() with menu.close() in context menu

* refactor: replace onopen/onclose with ontoggle in context menus

* refactor(contextmenu): streamline toggle event handling

* refactor: update context menu to support right- and left-click triggers

* Update DropDownButton.svelte

* copy and title style update

* added series header right click menu

* do not allow interactions until the animation ends

* fix typo

* improve `setTransformOrigin` function readability

* simplify `setHorizontalAlign`

* remove "title" from the PR context menu

* copy fix

* remove commented out code

* leave the "Reload PR" action only on the PR card

* do not show the rename action if it is no longer available

---------

Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
2024-11-11 14:35:47 +00:00
Pavel Laptev
784e380892
UI smaller empty branch state (#5516)
* rename category "Elements" to "Basic"

* fix import typo

* UI: Smaller "new branch" empty state

* discard files styles update
2024-11-11 13:59:58 +01:00
Pavel Laptev
e627b95e74
Integrate-upstream-modal-updates (#5487)
* fix: bold target branch name in divergence message

* feat: update IntegrationSeriesRow to use series data instead of title

* feat(ui): add tooltip for additional series in labels row

* feat: add SeriesLabelsRow component to IntegrationSeriesRow
2024-11-08 15:49:57 +01:00
Pavel Laptev
fa67b34637
style fix: tags width (#5483) 2024-11-07 13:04:05 +00:00
Pavel Laptev
d0d4a4cafe style: increase branch labels contrast 2024-11-06 16:18:37 +01:00
Pavel Laptev
beb2887762 feat(icons): remove unused "description-small icon 2024-11-06 16:06:20 +01:00
ndom91
64a5bf8706 fix: BaseBranch commitLine colors 2024-11-06 14:46:44 +01:00
Pavel Laptev
88f2849341
sidebar-update-for-stacking (#5463)
* feat: add SeriesLabelsRow component and update imports

Introduce the SeriesLabelsRow component to display a list of series 
with an optional counter label. Update the CollapsedLane and HeaderMetaSection 
to use the new component. Create stories for SeriesLabelsRow in Storybook 
to facilitate testing and documentation. This enhances the UI by providing 
a clearer representation of series data.

* feat: refactorEntry to use series instead of title

Remove title prop from SidebarEntry and replace it with a series 
array. Update related components and stories to reflect this change. 
This enhances the component's flexibility by allowing it to handle 
multiple series, improving the overall user experience.

* style: update hover background color in SidebarEntry

* feat: add tooltip to series labels for clarity

* refactor: move wiggle animation to utility styles


Also removes unused DefaultTargetButton component code.

* Merge branch 'master' into sidebar-update-for-stacking

* feat: enhance SidebarEntry with title and optional series

Fix: PR sidebar entry
2024-11-06 11:45:37 +01:00
Pavel Laptev
1f50954792
some-style-fixes (#5445)
* fix added/removed tag colors

* fix helper class

* UI edit: integrated modal not so wide

* simplify copy
2024-11-05 16:17:59 +01:00
Pavel Laptev
de47b68e9b
New stack header (#5437)
* fix search icon in `Select`

* update "scroll into view" btn

* remove unused code

* stick header

* fix sticky top margin

* fix header z-index

* cut first series

* wiggle animation to the header added

* fix lane background on drag

* Delete OldStackHeader.svelte

* Update StackSeriesRow.svelte

* added `ControlSection` - the header top

* icons updated

* added StackMetaSection

* add branches selector

* animation fix

* Merge branch 'master' into new-stack-header

* fix wiggle animation

* stackheader menu added

* update collapsed lane

* Merge branch 'new-stack-header' of https://github.com/gitbutlerapp/gitbutler into new-stack-header

* Fix wrong imports

* Revert wrong change

* rename files

* fix renamed file import

* update get commit color with an existing function
2024-11-05 14:43:18 +00:00
ndom91
0eb38fec90 fix: LineSpacer export 2024-11-05 14:32:45 +01:00
ndom91
bfd6981311 fix: remove old commitLines 2024-11-05 14:32:45 +01:00
Pavel Laptev
0f4f8caa6b
Update Textarea.svelte (#5402)
* Update Textarea.svelte

* Update Textarea.svelte

* remove additional wrapper

* set time out to ensure the element is rendered
2024-11-01 16:51:39 +00:00
Pavel Laptev
ad2a37113d
Fix fileitem path truncation (#5397)
* Update Textarea.svelte

* fix file path and name strings truncation

* add tooltip

* fix tooltip word break

* update tooltip name
2024-11-01 16:34:52 +01:00
ndom91
dff3071b83 feat: remove non-stacking feature flag branches in markup 2024-11-01 15:16:48 +01:00
estib
e9f2b97f83 ai: Stream the Butler AI messages
Users that hava AI enabled through their GitButler cloud account will get streamed responses.

Also:
- Commit generation is stremed into the message input
2024-11-01 13:57:35 +01:00
Pavel Laptev
790ecd9261
Update Textarea.svelte (#5389) 2024-11-01 09:39:07 +01:00
Pavel Laptev
359d8d5b51
Improve textarea and fix bugs (#5380)
* Delete Textarea-old.svelte

* Update PrDetailsModal.svelte

* update height calculation method

* remove `console.log`

* Delete autoHeight.ts

* Update CommitCard.svelte

* code review fixes

* improve textarea size detection

* Update CommitMessageInput.svelte

* simplify styles

* Update CommitMessageInput.svelte
2024-10-31 13:08:04 +00:00
Pavel Laptev
000a9fa248 revert textarea element 2024-10-31 10:30:24 +01:00
Pavel Laptev
56aaccd3eb text-area-fixes 2024-10-31 10:30:24 +01:00
Nico Domino
b4bdbdcfb6 fix: StackingSeriesHeader merge conflicts
Discard changes to apps/desktop/src/lib/branch/BranchLabel.svelte
2024-10-31 10:30:24 +01:00