8000 refactor: sign up flow changes (backport #31205) by mergify[bot] · Pull Request #31494 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

refactor: sign up flow changes (backport #31205) #31494

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

Merged
merged 2 commits into from
Mar 4, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 3, 2025

* fix: logout to site login page if the site is on Frappe Cloud

* fix: check if the site user is logged in before rendering trial banner

* fix: show dropdown even if the site is not on trial plan

* refactor: don't expose communication secret in boot

* feat: show install app button for fc sites

* fix: remove auth from desk

we can simplify it and let user do auth in fc

* fix: install app button condition

* refactor: use `is_fc_site` method

* fix: return boolean value for `is_fc_site` function

* fix: add install app button in /apps page

* fix: don't generate otp for login to fc

* fix: remove install app option from desk

* fix: design changes for trial banner

* fix: add more details to the `current_site_info` endpoint

also don't render trial banner if trial end date is passed

* fix: don't route user to welcome page

always put them on the site's dashboard

* fix: override base_url when needed

also remove misleading class

* fix: show banner to normal user to contact system admin for plan upgrade

* refactor: redirect from /login instead of every /logout code

* fix: rename login to fc to manage billing

also move it above the divider

* refactor: separate out site-login url from login.py

(cherry picked from commit 5886234)

# Conflicts:
#	frappe/website/utils.py
@mergify mergify bot added the conflicts label Mar 3, 2025
Copy link
Contributor Author
mergify bot commented Mar 3, 2025

Cherry-pick of 5886234 has failed:

On branch mergify/bp/version-15-hotfix/pr-31205
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 5886234b53.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/boot.py
	modified:   frappe/integrations/frappe_providers/frappecloud_billing.py
	modified:   frappe/public/js/billing.bundle.js
	modified:   frappe/www/login.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/website/utils.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@BreadGenie BreadGenie merged commit 4d57a9f into version-15-hotfix Mar 4, 2025
16 of 17 checks passed
@BreadGenie BreadGenie deleted the mergify/bp/version-15-hotfix/pr-31205 branch March 4, 2025 06:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant
0