From eba2fe9a3e774ec090aca0fa2327e3717ac17a61 Mon Sep 17 00:00:00 2001 From: Davinder Singh Date: Thu, 16 Jun 2022 14:16:33 +0100 Subject: [PATCH] Merge pull request #8212 from overleaf/ds-remove-registration-field-home-page Remove registration from home page GitOrigin-RevId: 3bd04f2f2aa62ef5f3fa8a0cdd09e461c38a27e9 --- .../Features/StaticPages/HomeController.js | 16 +++++++- .../web/app/src/Features/User/UserCreator.js | 37 ++++++++++--------- .../frontend/stylesheets/app/homepage.less | 11 ++++++ services/web/locales/en.json | 1 + 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/services/web/app/src/Features/StaticPages/HomeController.js b/services/web/app/src/Features/StaticPages/HomeController.js index 00b6342f30..1a553cb7ff 100644 --- a/services/web/app/src/Features/StaticPages/HomeController.js +++ b/services/web/app/src/Features/StaticPages/HomeController.js @@ -50,14 +50,26 @@ module.exports = HomeController = { res, 'highlight-sso' ) + const homeRegistration = await SplitTestHandler.promises.getAssignment( + req, + res, + 'home-registration' + ) const highlightSSO = highlightSSOAssignment.variant === 'active' - return res.render('external/home/v2', { highlightSSO }) + const removeRegistration = homeRegistration.variant + return res.render('external/home/v2', { + highlightSSO, + removeRegistration, + }) } catch (err) { logger.error( { err }, "error fetching 'highlight-sso' split test assignment" ) - return res.render('external/home/v2', { highlightSSO: false }) + return res.render('external/home/v2', { + highlightSSO: false, + removeRegistration: 'default', + }) } } else { return res.redirect('/login') diff --git a/services/web/app/src/Features/User/UserCreator.js b/services/web/app/src/Features/User/UserCreator.js index 5f927c0696..a9931c1991 100644 --- a/services/web/app/src/Features/User/UserCreator.js +++ b/services/web/app/src/Features/User/UserCreator.js @@ -37,27 +37,28 @@ async function _addAffiliation(user, affiliationOptions) { } async function recordRegistrationEvent(user) { - SplitTestHandler.promises - .getAssignmentForUser(user._id, 'highlight-sso') - .then(assignment => { - const segmentation = { - highlightSSO: assignment.variant === 'active', - } - if (user.thirdPartyIdentifiers && user.thirdPartyIdentifiers.length > 0) { - segmentation.provider = user.thirdPartyIdentifiers[0].providerId - } - return Analytics.recordEventForUser( + try { + const highlightSSOAssignment = + await SplitTestHandler.promises.getAssignmentForUser( user._id, - 'user-registered', - segmentation + 'highlight-sso' ) - }) - .catch(err => - logger.warn( - { err }, - 'there was an error recording `user-registered` event' + const homeRegistrationAssignment = + await SplitTestHandler.promises.getAssignmentForUser( + user._id, + 'home-registration' ) - ) + const segmentation = { + highlightSSO: highlightSSOAssignment.variant === 'active', + 'home-registration': homeRegistrationAssignment.variant, + } + if (user.thirdPartyIdentifiers && user.thirdPartyIdentifiers.length > 0) { + segmentation.provider = user.thirdPartyIdentifiers[0].providerId + } + Analytics.recordEventForUser(user._id, 'user-registered', segmentation) + } catch (err) { + logger.warn({ err }, 'there was an error recording `user-registered` event') + } } async function createNewUser(attributes, options = {}) { diff --git a/services/web/frontend/stylesheets/app/homepage.less b/services/web/frontend/stylesheets/app/homepage.less index 96eaf852ed..4a6ce758bd 100644 --- a/services/web/frontend/stylesheets/app/homepage.less +++ b/services/web/frontend/stylesheets/app/homepage.less @@ -228,6 +228,17 @@ } } +.sign-up-home-page { + display: flex; + justify-content: space-evenly; + align-items: center; +} + +.sign-up-btn { + display: flex; + align-items: center; +} + .universities-container { border-bottom: 1px solid @gray-lighter; } diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 595cb42204..97e8dfdcf2 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1487,6 +1487,7 @@ "dropbox_sync": "Dropbox Sync", "beta": "Beta", "sign_up_now": "Sign Up Now", + "sign_up_for_free":"Sign up for free", "annual": "Annual", "half_price_student": "Half Price Student Plans", "about_us": "About Us",