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

Allow signup page to be customised from admin settings #1692

Merged
merged 11 commits into from
Feb 14, 2023
Merged

Conversation

knolleary
Copy link
Member

@knolleary knolleary commented Feb 10, 2023

Description

In 1.3 we added branding.account.signUpTopBanner to flowforge.yml as a way to insert custom text above the sign-up form.

Via #1621 we have a requirement to insert longer text next to the sign-up form.

The downside of using flowforge.yml is that is requires a platform restart to pickup changes - making it hard to iterate.

This PR allows the Admin to set the content for both pieces of HTML via the Admin Settings screen - if 'allow signup' is enabled.

image

If will still use the value of branding.account.signUpTopBanner from flowforge.yml unless overridden via this new setting. The only limitation being you cannot set it to blank via admin settings and have that override a value from the yml file (blank is interpreted as unset, so the yml file value gets used). The right answer being to remove it from flowforge.yml as a one-off admin task.

The new setting branding:account:signUpLeftBanner does not, as of the current state of this PR, get displayed anywhere. That is over to @joepavitt to add.

Related Issue(s)

#1621

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • [-] Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on flowforge/helm to update ConfigMap Template
    • Issue/PR raised on flowforge/CloudProject to update values for Staging/Production

Labels

  • Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

@joepavitt
Copy link
Contributor

real working demo:

Screenshot 2023-02-10 at 12 50 55

@joepavitt
Copy link
Contributor

Demo (fyi @iskerrett)

Screen.Recording.2023-02-10.at.13.27.46.mov

@joepavitt joepavitt requested a review from Pezmc February 11, 2023 20:57
@joepavitt
Copy link
Contributor

adding @Pezmc as reviewer given that I've since contributed directly to this PR

@joepavitt
Copy link
Contributor

expecting E2E tests to fail, just pushing progress to-date so that someone can sub in to finish if required ahead of Thursday as I'm blocked out in meetings for 1.5 days between now and then

@joepavitt joepavitt removed their request for review February 13, 2023 09:50
@Pezmc Pezmc merged commit 7d19ac9 into main Feb 14, 2023
@Pezmc Pezmc deleted the custom-login-prompt branch February 14, 2023 15:56
@joepavitt
Copy link
Contributor

Verified in Staging #1621 (comment)

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.

3 participants