Christian Byrne
a9db25ecc3
[backport rh-test] subscription panel ( #6140 )
...
## Summary
Backport of #6064 (subscription page) to the `rh-test` branch.
This PR manually cherry-picks commit
7e1e8e3b65 to the rh-test branch and
resolves merge conflicts that prevented automatic backporting.
## Conflicts Resolved
### 1. `src/components/actionbar/ComfyActionbar.vue`
- **Conflict**: HEAD (rh-test) used `<ComfyQueueButton />` while the
subscription PR introduced `<ComfyRunButton />`
- **Resolution**: Updated to use `<ComfyRunButton />` to include the
subscription functionality wrapper while maintaining the existing
rh-test template structure
### 2. `src/composables/auth/useFirebaseAuthActions.ts`
- **Conflict**: Simple ordering difference in the return statement
- **Resolution**: Used the subscription PR's ordering: `deleteAccount,
accessError, reportError`
## Testing
The cherry-pick completed successfully and passed all pre-commit hooks:
- ✅ ESLint
- ✅ Prettier formatting
- ⚠️ Note: 2 unused i18n keys detected (informational only, same as
original PR)
## Related
- Original PR: #6064
- Cherry-picked commit: 7e1e8e3b65
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6140-backport-subscription-page-to-rh-test-2916d73d365081f38f00df422004f61a )
by [Unito](https://www.unito.io )
Co-authored-by: Terry Jia <terryjia88@gmail.com >
Co-authored-by: GitHub Action <action@github.com >
2025-10-19 00:14:03 -07:00
Arjan Singh
5869b04e57
Merge main (as of 10-06-2025) into rh-test ( #5965 )
...
## Summary
Merges latest changes from `main` as of 10-06-2025.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-5965-Merge-main-as-of-10-06-2025-into-rh-test-2856d73d3650812cb95fd8917278a770 )
by [Unito](https://www.unito.io )
---------
Signed-off-by: Marcel Petrick <mail@marcelpetrick.it >
Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com >
Co-authored-by: Christian Byrne <cbyrne@comfy.org >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: Claude <noreply@anthropic.com >
Co-authored-by: Alexander Brown <drjkl@comfy.org >
Co-authored-by: Benjamin Lu <benceruleanlu@proton.me >
Co-authored-by: Terry Jia <terryjia88@gmail.com >
Co-authored-by: snomiao <snomiao@gmail.com >
Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com >
Co-authored-by: Jake Schroeder <jake.schroeder@isophex.com >
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com >
Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com >
Co-authored-by: GitHub Action <action@github.com >
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com >
Co-authored-by: Marcel Petrick <mail@marcelpetrick.it >
Co-authored-by: Alexander Brown <DrJKL0424@gmail.com >
Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com >
Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com >
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe >
Co-authored-by: JakeSchroeder <jake@axiom.co >
Co-authored-by: AustinMroz <austin@comfy.org >
Co-authored-by: DrJKL <DrJKL@users.noreply.github.com >
Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com >
2025-10-08 19:06:40 -07:00
bymyself
ff0c15b119
merge main into rh-test
2025-09-28 15:33:29 -07:00
Jin Yi
59a1380f39
[feat] Cloud onboarding flow implementation ( #5494 )
...
* feature: cloud onboarding scaffolding
* fix: redirect unknown routes
* feature: cloud onboarding flow
* chore: code review
* test: api mock for test failing
* refactor: Centralize onboarding routing with dedicated check views
- Add UserCheckView to handle all user status routing decisions
- Add InviteCheckView to manage invite code validation flow
- Simplify auth.ts by removing async operations and extra complexity
- Update login/signup to always redirect through UserCheckView
- Remove distributed routing logic from all onboarding components
- Simplify router guards to delegate to check views
- Fix infinite redirect loops for non-whitelisted users
- Use window.location.href for final navigation to bypass router conflicts
Breaking changes:
- Removed claimInvite from auth.ts (moved to CloudClaimInviteView)
- Changed route names to use cloud- prefix consistently
- Simplified getMe() to synchronous function
🤖 Generated with [Claude Code](https://claude.ai/code )
Co-Authored-By: Claude <noreply@anthropic.com >
* fix: delete unused file
* Revert "test: api mock for test failing"
This reverts commit 06ca56c05e .
* feature: API applied
* feature: survey view
* feature: signup / login view completed
* style: min-h-screen deleted
* feature: completed login flow
* feature: router view added
---------
Co-authored-by: Claude <noreply@anthropic.com >
2025-09-14 16:36:57 -07:00
Chenlei Hu
be84d81c32
[Branding] Show execution progress in favicon ( #3880 )
2025-05-13 15:57:18 -04:00
Chenlei Hu
131fae72d4
[Branding] Use new logo on menu bar ( #3788 )
2025-05-06 15:18:50 -04:00
Chenlei Hu
2a21dd1004
[Branding] Use new logo favicon ( #3787 )
2025-05-06 11:02:49 -04:00
Chenlei Hu
3bdd814b3c
[Branding] Use new comfyorg logo ( #3786 )
2025-05-06 10:54:37 -04:00
Chenlei Hu
851739a768
[API Node] Sign in required dialog ( #3457 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-14 17:49:17 -04:00
Christian Byrne
d8721760f1
Add custom nodes manager UI ( #2923 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-03-08 18:54:08 -05:00
filtered
601b739f75
Add GPU selection to desktop installer ( #1888 )
...
* Remove redundant code
* Add GPU picker screen to installer
* Permit jumping installation steps when visited
* Prevent sad girl from covering buttons
* Update gpu options to match availability
* Ensure install screen renders inside bounds
* Pre-select GPU detected by desktop native
* Redesign GPU selection screen
* Prevent text highlight on installer stepper
* Add translations for GPU picker
* Rename for clarity
* Remove unused code
* Update electron types
* Update locales [skip ci]
---------
Co-authored-by: huchenlei <huchenlei@proton.me >
Co-authored-by: github-actions <github-actions@github.com >
2024-12-16 15:26:40 -08:00
filtered
0bf30e7621
Add git download page ( #1742 )
2024-11-29 13:12:09 -05:00
Chenlei Hu
39eaa2e850
[Electron] Add not supported hardware page ( #1717 )
2024-11-27 10:46:24 -05:00
Chenlei Hu
6c4143ca94
Show node by frequency on empty query ( #878 )
2024-09-19 09:35:22 +09:00