Forráskód Böngészése

Merge pull request #23872 from overleaf/td-bs5-compromised-password-page

Migrate compromised password page to Bootstrap 5

GitOrigin-RevId: fed58659cdeb12ba16bdd08c0c91c629a71ac169
Tim Down 1 éve
szülő
commit
69896f4c8b

+ 9 - 1
services/web/app/src/Features/User/UserPagesController.mjs

@@ -309,7 +309,15 @@ const UserPagesController = {
     )
   },
 
-  compromisedPasswordPage(_, res) {
+  async compromisedPasswordPage(req, res) {
+    // Populates splitTestVariants with a value for the split test name and allows
+    // Pug to read it
+    await SplitTestHandler.promises.getAssignment(
+      req,
+      res,
+      'bs5-misc-pages-platform'
+    )
+
     res.render('user/compromised_password')
   },
 

+ 0 - 2
services/web/app/views/project/editor/socket_diagnostics.pug

@@ -10,8 +10,6 @@ block vars
 block entrypointVar
 	- entrypoint = 'pages/socket-diagnostics'
 
-block append meta
-
 block content
 	main.content.content-alt#main-content
 		#socket-diagnostics

+ 0 - 2
services/web/app/views/user/addSecondaryEmail.pug

@@ -7,8 +7,6 @@ block vars
 block entrypointVar
 	- entrypoint = 'pages/user/add-secondary-email'
 
-block append meta
-
 block content
 	main.content.content-alt
 		#add-secondary-email

+ 2 - 2
services/web/app/views/user/compromised_password.pug

@@ -4,12 +4,12 @@ block vars
 	- var suppressNavbar = true
 	- var suppressFooter = true
 	- var suppressGoogleAnalytics = true
+	- bootstrap5PageStatus = 'enabled'
+	- bootstrap5PageSplitTest = 'bs5-misc-pages-platform'
 
 block entrypointVar
 	- entrypoint = 'pages/compromised-password'
 
-block append meta
-
 block content
 	main.content.content-alt#main-content
 		#compromised-password

+ 3 - 3
services/web/frontend/js/features/compromised-password/components/compromised-password-root.tsx

@@ -1,5 +1,5 @@
 import useWaitForI18n from '@/shared/hooks/use-wait-for-i18n'
-import { Button } from 'react-bootstrap'
+import OLButton from '@/features/ui/components/ol/ol-button'
 import { Trans, useTranslation } from 'react-i18next'
 import { Interstitial } from '@/shared/components/interstitial'
 
@@ -31,9 +31,9 @@ export function CompromisedPasswordCard() {
         />
       </p>
 
-      <Button className="btn-primary" href="/user/settings">
+      <OLButton className="btn-primary" href="/user/settings">
         {t('change_password_in_account_settings')}
-      </Button>
+      </OLButton>
     </Interstitial>
   )
 }