Commit graph

30 commits

Author SHA1 Message Date
Antoine Clausse
5462fcd128 [web] Set layout-react in Subscription pages (#21529)
* Update `User` type

* Set `layout-react`: `subscriptions/successful-subscription-react`

* Set `layout-react`: `subscriptions/canceled-subscription-react`

* Set `layout-react`: `subscriptions/dashboard-react`

* Set `layout-react`: `subscriptions/team/invite-managed`, `subscriptions/team/invite`, `subscriptions/team/invite_logged_out`

* Set `layout-react`: `subscriptions/team/group-invites`

* Add `header-footer-react` to subscription/base.js

* Fix: Replace `date-type` by `data-type`

* Fix SubscriptionControllerTests

GitOrigin-RevId: b9049a9093a700b3be1bf33809e3a1494022350a
2024-11-11 09:04:32 +00:00
Eric Mc Sween
b2d991d74a Merge pull request #21212 from overleaf/revert-20969-ac-subscription-layout-react
Revert "[web] Set Subscription pages to have `layout-react`"

GitOrigin-RevId: eaf3a651160e278adcb103864c5ea81ea3e35aa7
2024-10-18 08:06:05 +00:00
Antoine Clausse
2c7530a6cf [web] Set Subscription pages to have layout-react (#20969)
* [web] Set Subscription pages to have `layout-react`

* [web] import `header-footer-react` in Subscription pages (!!)

* [web] Add `ol-user` meta tag to the subscription pages (!!)

⚠️ invite_logged_out.pug should be updated instead of setting the user as `{}`

* [web] Fix unit test

* [web] Update User types to handle a logged out user, add `LOGGED_OUT_USER` const

* [web] Add type `User` to `getSessionUser`

* [web] Remove `LOGGED_OUT_USER` const

* [web] Just pass `{ id: null }` as the user

* [web] Remove comment in pugs, it breaks things

* [web] Don't pass the full user to the frontend!!!

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 1768f1f13de924a18be43c1a08614000500dcbec
2024-10-18 08:05:53 +00:00
Antoine Clausse
d4bf47932e [web] Migrate /subscription/invites/:token to BS5 (#20640)
* [web] Wiring work for `/subscription/invites/:token` BS5 migration

* [web] Add SCSS for .enrollment-invite

* [web] Update invite_logged_out PUG file for BS5

* [web] Update `GroupInviteViews` (and children) to BS5

* [web] Update `InviteManaged` to BS5

* [web] Update Logout button

* [web] Update subtitles

This removes the `text-overflow:ellipsis`. I think it's better without it, because it can be an accessibility issue.

* [web] Add margin on inner-card

* [web] Style action buttons in InviteManaged

* [web] Add missing container around Row

This was causing the row to overflow the body.

Increased the col width to compensate.

* [web] Fixup lint

* [web] Fix `ManagedUserCannotJoin` title in BS3 (!)

I checked all the other `OLNotification`: we don't use `title` anywhere else

* [web] Put title in OLNotification content

See https://github.com/overleaf/internal/pull/20640#discussion_r1777551257

* [web] Use translations for "aria-label="Email address""

* [web] Handle OLButton `isLoading` in `bs3Props`

* [web] Remove duplicated `btn` class

* [web] Add margin-bottom to InviteManaged title and fix logout button CSS in BS3

* [web] Adjust col class in Pug file for BS3 and BS5

* [web] Revert migration to OLNotification

Revert back to `@/shared/components/notification`

* [web] Add note to remove .team-invite-name after BS5 migration

* [web] Set `btn-link-logout` in BS3 only

* [web] Update OLButton so other classNames automatically get passed to the BS3 implementation

* [web] Revert OLButton changes for BS3 classnames

Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>

* [web] Update services/web/modules/group-settings/frontend/js/components/invite-managed.tsx

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>

* [web] Use OLFormGroup `controlId`

---------

Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>
Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: 64b3f79c83002a9c9585bfb8e344e80b2e8eac5c
2024-10-01 08:05:09 +00:00
Jessica Lawshe
3a59883e7a Merge pull request #18297 from overleaf/jel-remove-angular-group-invite
[web] Remove Angular version of group invite

GitOrigin-RevId: bd31cd2ed3c105c9042ae9c42894cfe960459a46
2024-05-31 08:04:27 +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
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
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
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
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
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
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
Jessica Lawshe
6a127d4408 Merge pull request #11159 from overleaf/jel-use-btn-secondary-on-group-invite
[web] Use new secondary button style on group invite

GitOrigin-RevId: 3772d2a2fd4143592494eae383be957f3ce99cac
2023-01-18 15:09:13 +00:00
Jessica Lawshe
bb882c697c Merge pull request #4288 from overleaf/jel-skip-to-content
Add "Skip to content" to improve accessibility

GitOrigin-RevId: 43368a65057656bdea10b6be3c598d68bd8e2d40
2021-07-28 02:06:54 +00:00
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
2021-04-16 02:05:27 +00:00
Jessica Lawshe
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
2021-04-09 02:05:29 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783)
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788)
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
2021-03-25 03:05:05 +00:00
Thomas
2d8167fa0a Merge pull request #3675 from overleaf/tm-main-landmarks-a11y
Add main landmark roles to multiple templates

GitOrigin-RevId: 80ae851fae015b21a3210d71d04287c0c9a3024d
2021-03-05 03:05:00 +00:00
Alasdair Smith
dc9841cb69 Merge pull request #3723 from overleaf/as-fix-team-invite-xss
Prevent stored XSS on team invite page

GitOrigin-RevId: 0f79b96efcb86d121654a95da52da1c40550d3ae
2021-03-05 03:04:42 +00:00
Jessica Lawshe
4f637f14b5 Merge pull request #2299 from overleaf/as-cleanup-express-locals
Clean up express locals

GitOrigin-RevId: f57e7c57913cbf894a365c5ae9dd2810245a01ae
2019-10-29 15:58:53 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
2019-10-16 10:36:21 +00:00
Simon Detheridge
6e960492ff Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept
Fix broken accept-team-invite page

GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
2019-03-11 11:01:10 +00:00
Simon Detheridge
5d8b8ff012 Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite
Only prompt for group cancellation if group is personal when accepting invite

GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
2019-03-11 11:00:48 +00:00
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01:00
Alberto Fernández Capel
4885b70016 Better translation key 2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b Replace hardcoded string 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
b308dcef63 Clean up markup
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Renamed from services/web/app/views/subscriptions/group/team_invite.pug (Browse further)