Commit graph

531 commits

Author SHA1 Message Date
Tim Down
0886104862 Merge pull request #18276 from overleaf/td-bs5-load-js
Load correct JS for the active Bootstrap version, second attempt

GitOrigin-RevId: ad8748a941691d745db5cd3e986e9c7b188b3ecb
2024-05-16 08:04:59 +00:00
M Fahru
ec1ab82789 Merge pull request #17479 from overleaf/mf-clean-up-plans-styling
[web] Clean up plans page styling

GitOrigin-RevId: fe05e9a1fd6c29c62941c878fe5e676d062c37de
2024-05-15 08:05:20 +00:00
Jessica Lawshe
c6b88085d5 Merge pull request #18188 from overleaf/jel-react-group-invite
[web] Migrate team invite to React

GitOrigin-RevId: 32e968c3b512020aef9a396808c73a7b4859e6d1
2024-05-09 08:05:03 +00:00
Tim Down
a452e1e8cd Merge pull request #18195 from overleaf/revert-18120-td-bs5-load-js
Revert "Load correct JS for the active Bootstrap version"

GitOrigin-RevId: 7f6e846b5461cfbacec874ed55bba577e414f3a6
2024-05-03 08:04:16 +00:00
Tim Down
56150d9dbc Load correct JS for the active Bootstrap version (#18120)
* Load correct JS for the active Bootstrap version

* Tidy up bootstrapVersion declaration

* Add Bootstrap JS to website redesign layout

* FIx error on interstitial subscriptions page

* Remove unnecessary import of jQuery and Bootstrap

* Use global entrypointScripts in bootstrap-js mixin

GitOrigin-RevId: 6b1977354a72dc69008fc0d2e3baec2f28d97f6b
2024-05-03 08:04:07 +00:00
Jessica Lawshe
ae0abd6445 Merge pull request #18159 from overleaf/jel-group-invite-header
[web] Break word on group invite header

GitOrigin-RevId: 790c24e8291f1dbdfa9231e4c9e3d4e531bf2b8f
2024-05-02 08:03:52 +00:00
Alf Eaton
98cefaa5bd Remove "upgrade to annual" page (#18014)
GitOrigin-RevId: b9f92ad038adab7fc7eb5e2a7175461bfefee379
2024-04-24 08:04:04 +00:00
Davinder Singh
a179751986 Merge pull request #17866 from overleaf/ds-banner-labels
Geo Pricing- Update Banner message on Latam america

GitOrigin-RevId: 7a8adf8e31e7ba4bc1b415a26c492bf6e5867328
2024-04-23 08:04:19 +00:00
Antoine Clausse
b2ef7a935f [web] Use localized number formatting for currencies (#17622)
* Add a unit test on `SubscriptionFormatters.formatPrice`

* Add JSDoc to `formatPrice`

Also: Name the functions before exporting:
This fixes my IDE (WebStorm) navigation

* Make `'USD'` the default param instead of reassigning

* Create `formatCurrency` function

* Use `formatCurrency` in SubscriptionFormatters

* Use an `isNoCentsCurrency` logic for `CLP` `JPY` `KRW` `VND`

And remove custom `CLP` logic and locale

* Add `locale` param to `formatPrice`

* Generate `groups.json` and `localizedPlanPricing.json`

```
bin/exec web node ./scripts/recurly/recurly_prices.js --download -o prices.json
bin/exec web node ./scripts/plan-prices/plans.js -f ../../prices.json -o dir
```

* Update scripts/plan-prices/plans.js to generate numbers instead of localized amounts

* Generate `groups.json` and `localizedPlanPricing.json`

```
bin/exec web node ./scripts/recurly/recurly_prices.js --download -o prices.json
bin/exec web node ./scripts/plan-prices/plans.js -f ../../prices.json -o dir
```

* Remove generation of `plans.json`

As /services/web/frontend/js/main/plans.js was removed in https://github.com/overleaf/internal/pull/12593

* Sort currencies in alphabetical order in scripts/plan-prices/plans.js

* Generate `groups.json` and `localizedPlanPricing.json`

```
bin/exec web node ./scripts/recurly/recurly_prices.js --download -o prices.json
bin/exec web node ./scripts/plan-prices/plans.js -f ../../prices.json -o dir
```

* Use `formatCurrency` in price-summary.tsx

* Use `formatCurrency` in Subscription Pug files

* Fix unit tests SubscriptionHelperTests.js

* Remove unused `currencySymbol`

* Change to `formatCurrency` in other React components

* Add `CurrencyCode` JSDoc types

* Duplicate `formatCurrency` into services/web/app/src/util

* Wrap tests in a top-level describe block

* Use `narrowSymbol`

* Fix tests with `narrowSymbol` expects

* Revert deletion of old `formatPrice` in SubscriptionFormatters.js

* Rename `formatCurrency` -> `formatCurrencyLocalized`

* Revert deletion of `CurrencySymbol`

* Add split-test in SubscriptionController.js

* Add split-test in SubscriptionViewModelBuilder.js

* Add split-test in plans

* Add split-test in subscription-dashboard-context.tsx

* Add split-test in 4 more components

* Update tests

* Show currency and payment methods in interstitial page

* Fix `–` being printed. Use `–` instead

* Fix test with NOK

* Storybook: Fix missing `SplitTestProvider`

* Storybook: Revert "Remove unused `currencySymbol`"

This reverts commit e55387d4753f97bbf8e39e0fdc3ad17312122aaa.

* Replace `getSplitTestVariant` by `useSplitTestContext`

* Use parameterize currencyFormat in `generateInitialLocalizedGroupPrice`

* Fixup import paths of `formatCurrencyLocalized`

* Replace `% 1 === 0` by `Number.isInteger`

* Add comment explaining that any combinations of languages/currencies could happen

* Fixup after rebase: import `useSplitTestContext`

* Revert "Remove SplitTestProvider from subscription root"

This reverts commit be9f378fda715b86589ab0759737581c72321d87.

* Revert "Remove split test provider from some tests"

This reverts commit 985522932b550cfd38fa6a4f4c3d2ebaee6ff7df.

GitOrigin-RevId: 59a83cbbe0f7cc7e45f189c654e23fcf9bfa37af
2024-04-19 08:03:54 +00:00
Jakob Ackermann
ea0a99253c Merge pull request #17864 from overleaf/jpa-fix-redirect
[web] fix navigation flow after try premium page when using skip button

GitOrigin-RevId: 1ae7ccdb14f7125919bc97746761a21c6896938f
2024-04-12 08:05:15 +00:00
Davinder Singh
998d55d159 Merge pull request #17559 from overleaf/ds-latam-v2
LATAM Geo Pricing - Introducing split test in LATAM countries Round 2

GitOrigin-RevId: 76ab880262f126f8db7f8e577154d78b5e9abf7a
2024-04-09 08:04:06 +00:00
Davinder Singh
511ad1b68f Adding BRL geo pricing (#17164)
* BRL geo pricing banners and modals

* format:fix

GitOrigin-RevId: 478435764230e7fea3c8f26e5747562698f78228
2024-03-06 17:27:18 +00:00
M Fahru
920e86e4d0 Merge pull request #17303 from overleaf/mf-fix-plans-page-mobile
[web] Fix plans page table styling on both desktop and mobile

GitOrigin-RevId: 252bbaf7245751b1cfe07286a0fe19069219bb5b
2024-03-04 09:04:08 +00:00
M Fahru
5a8a0fb268 Tear down annual-trials split test:
- Use the `default` variant as the winner
- Remove all `annual-trials`-related code

GitOrigin-RevId: 3956f256157f3e86c99e41eec54ef6fd0da39bc3
2024-03-01 09:03:24 +00:00
M Fahru
dc9b0aa8a5 Merge pull request #17230 from overleaf/mf-tear-down-inr-2
[web] Tear down INR split test

GitOrigin-RevId: 90c6ab4666d9281e804b279d697d6c14ffd682d2
2024-02-22 09:05:02 +00:00
Rebeka Dekany
140b312eca Merge pull request #14799 from overleaf/rd-report-tablist-plan
Accessibility - help the user to navigate through the tabs on the plans page

GitOrigin-RevId: 93822277edd3a44eaf8e1219a4902e28d31e198a
2024-01-26 09:03:36 +00:00
Jessica Lawshe
c5a902656d Merge pull request #16491 from overleaf/rd-plans-table
[web] Accessibility - improve the navigation on the plans page

GitOrigin-RevId: 8fccdfe5c60ad908f028608b79be74ca964fb65a
2024-01-24 09:04:34 +00:00
Rebeka Dekany
61c380c89d Merge pull request #16371 from overleaf/rd-skip-link-dashboard
[web] Accessibility - Add 'main-content' ID to main element for skip link destination

GitOrigin-RevId: f6a7bf4cc12ab2428478562a9edda245dce7c2fb
2024-01-05 09:03:49 +00:00
Rebeka Dekany
5342d95efc Merge pull request #16277 from overleaf/tm-plans-compile-servers
Update plans and interstitial pages with updated compile timeout info

GitOrigin-RevId: a92ccd4a2f381e6456459a3ad4d2840b3b49f3c8
2023-12-19 09:04:36 +00:00
Davinder Singh
310c938f80 adding correct events on plans page (#15951)
GitOrigin-RevId: d86b9cff07b9179a80b19ecdca1542ff8f9c9cd1
2023-11-27 09:04:32 +00:00
M Fahru
6a7f230fa2 Fix "Done" button after accepting group invite button does not work as intended because of href value is not set correctly
the `doneLink` variable on the pug file is expanded in the backend, so this commit will move the href building in the pug file instead of the frontend angular controller to make sure the value exists

GitOrigin-RevId: 74029a03293324955120bca630925a743ee60c22
2023-11-14 09:05:03 +00:00
M Fahru
0639f266d8 Merge pull request #14756 from overleaf/mf-group-invite-new-user-redirection
[web] Redirect to invite screen if new user register with a pending group invitations

GitOrigin-RevId: 39aeffd65b9d793c87e53398a700ad140794594e
2023-11-10 09:04:23 +00:00
Alexandre Bourdin
d45ca7d401 Merge pull request #15582 from overleaf/msm-sso-linking-reminders
[web] SSO Linking redirects and interstitial info

GitOrigin-RevId: fdad0290ebf2b8b8a77f12b75736c030a4c7b642
2023-11-07 09:05:00 +00:00
Jimmy Domagala-Tang
37817f89f4 Merge pull request #15295 from overleaf/jdt-subs-tbl-tab-access
Add subscription table icons to the tab index

GitOrigin-RevId: 1585cf2c7a114a9cae78c5d4bfbd888756aacf43
2023-11-02 08:52:59 +00:00
Rebeka Dekany
4b6b9c3bef Merge pull request #15258 from overleaf/rd-remove-b2s
Tear down Back to School promo 2023

GitOrigin-RevId: e2682f5fd265bdb4ad561a6d98fe49bc1f326489
2023-10-17 08:03:22 +00:00
Rebeka Dekany
2e46f9e8f4 Merge pull request #14797 from overleaf/rd-report-toggle-switch
Accessibility - make the plans view switch to be descriptive

GitOrigin-RevId: cd896b9536d3583cff4094b56f02a6d1a8d11b37
2023-10-09 08:04:32 +00:00
Thomas
843b4f3940 Move checkout to subscriptions module (#15022)
* Move checkout to subscriptions module

GitOrigin-RevId: 0ad6587ddd7042aed7f2e18d9d0668e02942eb1e
2023-10-03 08:04:31 +00:00
Rebeka Dekany
44d2d08353 Merge pull request #15037 from overleaf/rd-extend-b2s-promo
Extending Back to School 2023 promo

GitOrigin-RevId: 31055aac2c9b0b40e3308b5033bd3390ad0785de
2023-10-02 08:03:57 +00:00
John Lees-Miller
3487ddbc81 Merge pull request #14874 from overleaf/tm-compile-timeout-20s-plans-pages
Changes to the plans/interstitial pages for compile timeout reduction

GitOrigin-RevId: 753e6eaf98d70b8aa994ec9dcad5185dbbeb5a42
2023-09-19 08:04:01 +00:00
Alexandre Bourdin
f024f63d0f Merge pull request #14503 from overleaf/mf-change-copy-restricted-to-join-another-group
Update copy when managed user member tries to accept group invitation from another group

GitOrigin-RevId: 1d08135176a9ab5ef3bec0924ba62a9268eb1ac8
2023-08-28 08:04:09 +00:00
Thomas
43c92642c6 Implement Back to School 2023 banners and modal (#14363)
* Implement Back to School 2023 banners and modal

* Only show WritefullPromoBanner if not showing BackToSchoolModal

GitOrigin-RevId: 3bd2ea48fa6d66f112cc26662a61be05cf7daafd
2023-08-24 08:04:09 +00:00
John Lees-Miller
2ad98aa61c Merge pull request #14460 from overleaf/tm-prevent-checkout-unconfirmed-email
Restrict checkout page for users without confirmed primary email

GitOrigin-RevId: a02b0f64824f8adc8f15ae24b9132569bd1029f3
2023-08-24 08:03:21 +00:00
M Fahru
c71bf25363 Show admin email in enrollment page accessed via dashboard notification and email invitation.
GitOrigin-RevId: 4589a276a1b7db2ba0a5da2c06bde797ba8d0b65
2023-08-11 08:04:05 +00:00
M Fahru
a3e30c0a39 Merge pull request #14178 from overleaf/mf-admin-email-managed-group-alert
Add managed group admin email inside managed group alert on the subscription page & team invite page warning

GitOrigin-RevId: 00929008170ef9302ddcbbf10aefd76f95e189a8
2023-08-10 08:05:04 +00:00
Rebeka
b9e8cbff2e copy the plan&interstitial pages and update the view to show the annual view and plan to show the free trial options
GitOrigin-RevId: e77f0f9c4825776d3abb28ce5c46e3e2c456719e
2023-08-10 08:04:47 +00:00
Alexandre Bourdin
4b3cff051a Merge pull request #14096 from overleaf/bg-managed-users-restrict-join-other-group
prevent managed users joining other groups

GitOrigin-RevId: ad47e08d302473dccbe150722d93c9194f15e95f
2023-08-01 08:04:44 +00:00
Rebeka
d2a27c1da0 tear down remove personal plan split test
GitOrigin-RevId: 5bcd4073ffbd444f153a9e081ecdca2b1435487d
2023-08-01 08:04:12 +00:00
Tim Down
3aa0fcf464 Merge pull request #13934 from overleaf/tm-block-subscriptions-restricted-countries
Block web sales to restricted countries

GitOrigin-RevId: 47c0ac1d5dc387369bbadb67f5822d7fc6637d98
2023-07-25 08:03:59 +00:00
Jakob Ackermann
d212be408f Merge pull request #13337 from overleaf/jpa-translate-plans-page
[web] translate all the things on the plans page (to German)

GitOrigin-RevId: cbd812a4eca41573986c2d9e4f5e37b3d5a49e4f
2023-07-19 08:03:57 +00:00
Rebeka
b24d209453 Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant
GitOrigin-RevId: 553fd63f1a0fefaf90afb8c4850c5c7af7855387
2023-07-18 08:06:07 +00:00
Rebeka
0c695fbbcb Revert "Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant"
This reverts commit 3bd0e3aa9cbebbfc41db54ed4307540d1c557363.

GitOrigin-RevId: 4b5f7662105add926c122b9f8205528400c1023d
2023-07-17 11:13:18 +00:00
Rebeka
ece6586dc3 Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant
GitOrigin-RevId: 3bd0e3aa9cbebbfc41db54ed4307540d1c557363
2023-07-17 11:13:08 +00:00
June Kelly
4f8852feaa Merge pull request #13850 from overleaf/ab-invite-enrollment
[web] Managed users - combined invite/surrender flow

GitOrigin-RevId: 70cb0d81e0019eac69a4a565377447bb6d1a1823
2023-07-17 11:10:37 +00:00
Thomas
e704afdcca Merge pull request #13804 from overleaf/tm-geopricing-inr-banners
Implement split test for new INR geo-pricing banners/modal

GitOrigin-RevId: 06fbcf70b7ee90b9b365ac96c1fa0373cbe60847
2023-07-17 11:09:44 +00:00
Rebeka
fdeb36c2c2 Tear down student status check test
GitOrigin-RevId: 5afff525e6748621790fcdc986541363fe19e1e8
2023-07-17 11:01:37 +00:00
M Fahru
afbd143f0f Remove unused code and translation locales from old subscription pages (#13646)
* Remove unused code from old subscription pages.

* Remove unused translation locales from old subscription pages.

GitOrigin-RevId: abf99373188bafa90f4900a358a30b4cc8a433d1
2023-07-17 10:48:45 +00:00
Alexandre Bourdin
39bc601826 Merge pull request #13482 from overleaf/ab-group-settings-page
[web] Group settings button and page enabled based on env var

GitOrigin-RevId: 77574a3705b3f1301935b72010022af61f7fe552
2023-07-17 10:41:41 +00:00
M Fahru
542199febb Merge pull request #13419 from overleaf/mf-sync-border-radius-and-border-color-plans-table
Fix various plans page border-related UI errors

GitOrigin-RevId: 90436bdd3002722e5ce6b08d79d2bf3db1b6c90f
2023-07-17 10:36:56 +00:00
Davinder Singh
4991f9cdc7 Merge pull request #13367 from overleaf/ab-group-invite-halfway-out-of-login
[web] Move the group invite page half-way outside the login wall

GitOrigin-RevId: 8d846df6e248a08433ab2ca991644c78cf9ff330
2023-07-17 10:31:09 +00:00
Alexandre Bourdin
14e014c667 [web] Add some FR translations for the menu header, project dash and plans page (#13057)
* Add some FR translations for the menu header and plans page

* Replace single quotes in translations

* Fix typo and missing translation

* Updates after rebase

GitOrigin-RevId: 637f60513afad1a44a38fabcc6afa261c658d322
2023-07-17 10:23:05 +00:00