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

Gui wip #386

Merged
merged 54 commits into from
Jan 17, 2025
Merged

Gui wip #386

merged 54 commits into from
Jan 17, 2025

Conversation

tdb30
Copy link
Contributor

@tdb30 tdb30 commented Oct 21, 2024

Attempted fixes for mac os window being on top and extra indexer call.

@francisdb
Copy link
Owner

In case the main branch gets updated again you can do a rebase

make sure everything is committed
Make sure your main branch is updated, can be done here: https://github.com/tdb30/vpxtool/tree/main (button sync)

git checkout main
git pull
git checkout gui-wip
git rebase main

now follow the instructions

when you are 100% sure that everything is ok (rebase completed successfully)

git push --force

But might be better to check a youtube guide on how to do this with your favorite tool.

Can also be good to squash your branch to a single commit first, so you don't have to go through each commit. But then you lose history.

Anyway, I can also take care of all that later if you want.

@francisdb
Copy link
Owner

@tdb30 what happened?

@tdb30
Copy link
Contributor Author

tdb30 commented Nov 19, 2024

Not sure what you mean. I basically just synced my stuff with your changes. and removed the old commits I did as there were a lot.
I'll post another commit once I finish the loading screen. I have it working but it just says Loading... for about 10 seconds while the assets get loaded and I want to give the user some feedback on it so it in't just a boring static page.

@francisdb francisdb reopened this Nov 21, 2024
@francisdb francisdb reopened this Dec 22, 2024
@francisdb
Copy link
Owner

@tdb30 did you mean to close this?

@tdb30
Copy link
Contributor Author

tdb30 commented Dec 23, 2024 via email

@francisdb
Copy link
Owner

@tdb30 I would really like to see this PR merged in the main code and that we can work on this further from there.

I was also thinking about putting this frontend behind a feature flag so that we can still build a vpxtool without all these dependencies. What do you think?

@francisdb francisdb merged commit 30f3e48 into francisdb:main Jan 17, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants