Commit graph

26 commits

Author SHA1 Message Date
Alf Eaton
c24ace801b Remove Angular (#17534)
GitOrigin-RevId: 7a0d45e17d9905fa75569e2d19ca59caa4a41565
2024-06-06 08:04:09 +00:00
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
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
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
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
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
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
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
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
Rebeka
d2a27c1da0 tear down remove personal plan split test
GitOrigin-RevId: 5bcd4073ffbd444f153a9e081ecdca2b1435487d
2023-08-01 08:04:12 +00:00
Jimmy Domagala-Tang
76d0d82e74 Merge pull request #13027 from overleaf/jdt-personal-plan-split-test
Personal plan split test

GitOrigin-RevId: 067973398c57be7466f6529f28fbfd896c86b10b
2023-05-25 08:05:52 +00:00
June Kelly
f5740e6b17 Merge pull request #12593 from overleaf/jk-remove-plans-split-test
[web] Remove 'plans-page-layout-v3' split test

GitOrigin-RevId: 91e0d3d8bc40632df630131b2e872fa824015da5
2023-04-26 08:04:21 +00:00
Thomas
e84c1740bc Merge pull request #9652 from overleaf/tm-plans-v2-default-monthly
Default to showing Annual plans when rendering the V2 plans variant

GitOrigin-RevId: a709e81de3672959c67f6afd0234fb9277400d9d
2022-09-21 08:04:53 +00:00
Thomas
281f222d82 Merge pull request #9612 from overleaf/tm-onboarding-upgrade-prompt-analytics-fix
Fix event tracking for onboarding upgrade prompt page

GitOrigin-RevId: 8122cc7f290cc0ba07c8d38c71d8b762bb760f32
2022-09-15 08:04:27 +00:00
Thomas
db9fad7cf8 Merge onboarding experiments integration branch (#9571)
* Add onboarding survey page

* Add onboarding new analytics events to mixpanel allowlist

* [web] Try Premium prompt

* moved try-premium code to overleaf-integration

* fixed sheet styling

* Add onboarding flow redirect handling to registration handlers (#9462)

* Add redirect logic for onboarding flow after registration

* Update UPGRADE_PROMPT_URL

* Cleanup style of OverleafAuthenticationController

* Refactor finishLogin calls to call wrapped function in OverleafAuthenticationController

* Refactor user properties/onboarding flow redirect into finishLogin wrapper

* Fix async/await calls after refactoring

* Update tests for finishLogin refactoring

* Don't redirect to upgrade prompt if user has premium via commons

Co-authored-by: Miguel Serrano <mserranom@users.noreply.github.com>
GitOrigin-RevId: 7c392aa6949f99fa909f9ca4e4baad4c4d4ff6be
2022-09-15 08:04:06 +00:00
M Fahru
37c69fc6b7 Fix interstitial payment monthly annual switch doesn't show the correct table
GitOrigin-RevId: ad88867922aafd65f245ff04d13203acbcf21b94
2022-07-28 08:03:43 +00:00
M Fahru
bbaac83b82 Refactor plans v2 sticky header to use dedicated config instead of hardcode (#8659)
GitOrigin-RevId: 3ea56ad5c6b9b5f6556e97429cf3e67a0b0d56bc
2022-07-06 08:03:02 +00:00
M Fahru
d00d40464f Implement interstitial payment page analytics (#8512)
GitOrigin-RevId: 927e85df0a933d3da2378443c38d852e1970b574
2022-06-29 08:05:01 +00:00
M Fahru
1070dd53f3 Remove footer and rightside of the navbar on the interstitial payment page (#8407)
Co-authored with Thomas Mees (thomas.mees@overleaf.com)

GitOrigin-RevId: 270e11f0cfd09830e5c7600d636b8ebbfc6049a2
2022-06-15 08:05:00 +00:00
M Fahru
73cf4116b6 Interstitial Payment Page UI + Route (#8305)
GitOrigin-RevId: a31f7094db819e0dad4ff3f09c17544d40260dd4
2022-06-14 08:02:16 +00:00