mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Add new Grist login page
Summary: Adds a new Grist login page to the login app, and replaces the server-side Cognito Google Sign-In flow with Google's own OAuth flow. Test Plan: Browser and server tests. Reviewers: jarek Reviewed By: jarek Differential Revision: https://phab.getgrist.com/D3332
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import {beaconOpenMessage} from 'app/client/lib/helpScout';
|
||||
import {AppModel, reportError} from 'app/client/models/AppModel';
|
||||
import {BillingModel, BillingModelImpl, ISubscriptionModel} from 'app/client/models/BillingModel';
|
||||
import {getLoginUrl, getMainOrgUrl, urlState} from 'app/client/models/gristUrlState';
|
||||
import {getLoginUrl, urlState} from 'app/client/models/gristUrlState';
|
||||
import {AppHeader} from 'app/client/ui/AppHeader';
|
||||
import {BillingForm, IFormData} from 'app/client/ui/BillingForm';
|
||||
import * as css from 'app/client/ui/BillingPageCss';
|
||||
@@ -499,7 +499,7 @@ export class BillingPage extends Disposable {
|
||||
// If the user is not logged in and selects the free plan, provide a login link that
|
||||
// redirects back to the free org.
|
||||
return css.upgradeBtn('Sign up',
|
||||
{href: getLoginUrl(getMainOrgUrl())},
|
||||
{href: getLoginUrl()},
|
||||
testId('plan-btn')
|
||||
);
|
||||
} else if ((!selectedPlan && plan.amount === 0) || (selectedPlan && plan.id === selectedPlan.id)) {
|
||||
|
||||
@@ -98,7 +98,7 @@ export class WelcomePage extends Disposable {
|
||||
`If you already have a Grist account as `,
|
||||
dom('b', email.get()),
|
||||
` you can just `,
|
||||
dom('a', {href: getLoginUrl(urlState().makeUrl({}))}, 'log in'),
|
||||
dom('a', {href: getLoginUrl()}, 'log in'),
|
||||
` now. Otherwise, please pick a password.`
|
||||
),
|
||||
cssSeparatedLabel('The email address you activated Grist with:'),
|
||||
|
||||
Reference in New Issue
Block a user