Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Sidebar component #513

Merged
merged 27 commits into from
Feb 20, 2024
Merged

feat: Sidebar component #513

merged 27 commits into from
Feb 20, 2024

Conversation

tigerros
Copy link
Contributor

This finishes and updates #383. I've removed the router integration from SidebarItem in favor of the user just passing in a Link as the children. The router example can be run but the buttons are not functional at the moment because #411 is not merged yet (the Link is in the example, just commented out). Once #411 is merged, this can be merged too.

Sorry for the terrible git history, I really don't know what I'm doing when it comes to git.

marc2332 and others added 22 commits November 17, 2023 23:13
# Conflicts:
#	crates/hooks/src/use_theme.rs
#	examples/sidebar.rs
# Conflicts:
#	.github/workflows/rust.yml
#	README.md
#	crates/components/src/external_link.rs
#	crates/components/src/scroll_views/scroll_bar.rs
#	crates/components/src/slider.rs
#	crates/core/src/types.rs
#	crates/core/tests/pointer_events.rs
#	crates/elements/src/_docs/size_unit.rs
#	crates/freya/src/_docs/animating.rs
#	crates/freya/src/_docs/hot_reload.rs
#	crates/freya/src/_docs/theming.rs
#	crates/freya/src/launch.rs
#	crates/freya/src/lib.rs
#	crates/hooks/src/rope_editor.rs
#	crates/hooks/src/use_accessibility.rs
#	crates/hooks/src/use_animation.rs
#	crates/hooks/src/use_editable.rs
#	crates/renderer/src/app.rs
#	crates/renderer/src/event_loop.rs
#	crates/renderer/src/lib.rs
#	crates/renderer/src/window.rs
#	crates/testing/src/launch.rs
#	crates/testing/src/test_handler.rs
#	crates/torin/src/values/size.rs
#	examples/canvas.rs
#	examples/cloned_editor.rs
#	examples/editor.rs
#	examples/installer/src/main.rs
#	examples/opacity.rs
#	examples/sidebar.rs
#	examples/text.rs
#	examples/viewport.rs
#	examples/virtual_scroll_view.rs
Copy link

codecov bot commented Feb 18, 2024

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (8b9f961) 54.22% compared to head (8e31ee0) 54.01%.
Report is 2 commits behind head on main.

❗ Current head 8e31ee0 differs from pull request most recent head 29c158a. Consider uploading reports for the commit 29c158a to get more accurate results

Files Patch % Lines
crates/components/src/sidebar.rs 0.00% 13 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #513      +/-   ##
==========================================
- Coverage   54.22%   54.01%   -0.21%     
==========================================
  Files         154      153       -1     
  Lines       13732    13678      -54     
==========================================
- Hits         7446     7388      -58     
- Misses       6286     6290       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@marc2332 marc2332 changed the base branch from main to feat/sidebar-component February 18, 2024 09:40
@marc2332 marc2332 changed the base branch from feat/sidebar-component to main February 18, 2024 09:41
@marc2332
Copy link
Owner

let me see what I can do to fix the git thing

@marc2332
Copy link
Owner

might be a line ending thing, what OS do you have?

What does this give you?

git config --global core.autocrlf

@tigerros
Copy link
Contributor Author

might be a line ending thing, what OS do you have?

What does this give you?

git config --global core.autocrlf

Nothing. I'm on Windows 10. I mean all the changed files are just copied from main because I couldn't properly merge main into the branch 😅

@marc2332
Copy link
Owner

git config --global core.autocrlf

Wdym by nothing?

@tigerros
Copy link
Contributor Author

git config --global core.autocrlf

Wdym by nothing?

I ran it again and this is what it gave me:
output.txt

@marc2332
Copy link
Owner

git config --global core.autocrlf

Wdym by nothing?

I ran it again and this is what it gave me: output.txt

What version of git do you have?

@tigerros
Copy link
Contributor Author

git config --global core.autocrlf

Wdym by nothing?

I ran it again and this is what it gave me: output.txt

What version of git do you have?

2.39.1.windows.1 but I just use GitHub desktop

@marc2332
Copy link
Owner

let me now fix this

@marc2332 marc2332 self-requested a review February 18, 2024 11:05
@marc2332 marc2332 added the enhancement 🔥 New feature or request label Feb 18, 2024
@marc2332 marc2332 mentioned this pull request Feb 18, 2024
@marc2332 marc2332 changed the title Sidebar component fate: Sidebar component Feb 18, 2024
@marc2332 marc2332 marked this pull request as ready for review February 18, 2024 18:10
@marc2332 marc2332 changed the title fate: Sidebar component feat: Sidebar component Feb 20, 2024
@marc2332 marc2332 added this to the 0.2.0 milestone Feb 20, 2024
@marc2332 marc2332 merged commit fda8624 into marc2332:main Feb 20, 2024
2 of 3 checks passed
@marc2332
Copy link
Owner

Nice work @tigerros 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement 🔥 New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants