TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-22 10:21:36 +03:00
Code Issues Projects Releases Wiki Activity
36,450 Commits 250 Branches 1,686 Tags 392 MiB
a284e8275d
Commit Graph

856 Commits

Author SHA1 Message Date
renovate[bot]
777ea0912c Update dependency minimist to v1.2.8 2023-06-21 12:46:16 +02:00
renovate[bot]
ddec966e5d Update dependency tailwindcss to v3.3.2 2023-06-21 12:46:05 +02:00
renovate[bot]
e98d9e3f3c Update dependency chokidar to v3.5.3 2023-06-21 12:41:49 +02:00
renovate[bot]
6e0e9e02ca Update dependency postcss to v8.4.24 2023-06-21 12:41:39 +02:00
renovate[bot]
e8f5ea0f33 Update dependency serve-handler to v6.1.5 2023-06-21 12:41:12 +02:00
Daniel Lockyer
8d611112a1 Updated Renovate config to quietJS 
- this is our homegrown Renovate preset that should keep things quiet around here
 2023-06-21 12:35:40 +02:00
Daniel Lockyer
08aef4fbb4 Pinned dependencies 
- this is an app so we want to pin dependencies to ensure we know what
  version they're using
 2023-06-21 12:26:56 +02:00
renovate[bot]
94242ec627 Update dependency @testing-library/react to v12.1.5 2023-06-21 12:19:41 +02:00
renovate[bot]
5a426e5575 Update dependency @testing-library/jest-dom to v5.16.5 2023-06-21 12:17:06 +02:00
renovate[bot]
7a7629620b Add renovate.json 2023-06-21 12:15:03 +02:00
Hannah Wolfe
3a58b6402a Update dependency eslint-plugin-ghost to v3.2.0 
refs: https://github.com/TryGhost/Toolbox/issues/595

- Adds custom rules for node assert
- Enforces assert/strict as an error
 2023-06-21 10:34:37 +01:00
Sodbileg Gansukh
19b8bd2b50 Released Announcement-Bar v1.1.6 2023-06-21 17:04:56 +08:00
Sodbileg Gansukh
c1cd18b526 Added correct cursor style to announcement bar links 2023-06-21 17:03:58 +08:00
Hannah Wolfe
6161f94910
Updated to use assert/strict everywhere (#17047) 
refs: https://github.com/TryGhost/Toolbox/issues/595

We're rolling out new rules around the node assert library, the first of which is enforcing the use of assert/strict. This means we don't need to use the strict version of methods, as the standard version will work that way by default.

This caught some gotchas in our existing usage of assert where the lack of strict mode had unexpected results:
- Url matching needs to be done on `url.href` see aa58b354a4
- Null and undefined are not the same thing,  there were a few cases of this being confused
- Particularly questionable changes in [PostExporter tests](c1a468744b) tracked [here](https://github.com/TryGhost/Team/issues/3505).
- A typo see eaac9c293a

Moving forward, using assert strict should help us to catch unexpected behaviour, particularly around nulls and undefineds during implementation.
 2023-06-21 09:56:59 +01:00
Simon Backx
3e932458a4 Released Signup Form v0.1.3 2023-06-21 10:48:22 +02:00
Simon Backx
40f71cb79b 🐛 Fixed accessibility issue with hidden success message in signup form 
refs https://ghost.slack.com/archives/CTH5NDJMS/p1686928938857799

The button read 'Subscribe email sent' on screen readers.
 2023-06-21 10:38:27 +02:00
Daniel Lockyer
1be11e4648
Fixed include path for signup-form translations 
- this fixes the path after we moved the signup-form folder between
  workspace folders
 2023-06-21 09:12:28 +02:00
renovate[bot]
e3c9af380c Update dependency @storybook/testing-library to v0.2.0 2023-06-21 08:12:26 +02:00
Daniel Lockyer
5c4ef092b6 Updated vitest to v0.32 
refs https://github.com/TryGhost/Ghost/pull/16949
refs https://github.com/vitest-dev/vitest/releases/tag/v0.32.0

- contains a switch from `@vitest/coverage-c8` to `@vitest/coverage-v8`
  as this is now required in 0.32
 2023-06-20 14:54:04 +02:00
renovate[bot]
ea3ab6beb6 Update dependency @vitejs/plugin-react to v4.0.1 2023-06-20 08:09:23 +02:00
Daniel Lockyer
2173fd9ef9 Moved signup-form to apps/ folder 
refs https://github.com/TryGhost/Toolbox/issues/594

- we're moving all the standalone apps to a separate folder to keep them
  out of the core code and easier to find
 2023-06-19 09:43:33 +02:00
Daniel Lockyer
e13fcd3272
Released Portal v2.33.2 2023-06-16 13:41:31 +02:00
Daniel Lockyer
f3894d5898 Moved Portal to apps/ 
refs https://github.com/TryGhost/Toolbox/issues/594

- we're moving all the standalone apps to a separate folder to keep them
  out of the core code and easier to find
 2023-06-16 13:37:58 +02:00
Elena Baidakova
333471c263 Released Announcement-Bar v1.1.5 2023-06-15 09:54:19 +04:00
Daniel Lockyer
7a124a6901 Moved announcement-bar to apps/ 
refs https://github.com/TryGhost/Toolbox/issues/594

- we're moving all the standalone apps to a separate folder to keep them
  out of the core code and easier to find
 2023-06-14 12:28:55 +02:00
Daniel Lockyer
fa43a0236b Moved Sodo-Search into apps/ 
refs https://github.com/TryGhost/Toolbox/issues/594

- this is the first of a set of commits to move our "apps" into the
  `apps/` folder, so we don't mix Ghost core and standalone apps
 2023-06-14 12:10:57 +02:00
Daniel Lockyer
33fa048c7e Pinned dependencies 
- Comments-UI is an app so we should pin the dependencies to ensure we
  know what version it is running
 2023-03-21 09:59:12 +01:00
Daniel Lockyer
fac4ec7876 Fixed minor linting issues 
- these classes needed to be reordered to satisfy eslint-plugin-tailwindcss
 2023-03-17 12:19:52 +01:00
Sodbileg Gansukh
1892be929b v0.12.4 2023-03-14 18:46:10 +08:00
Rishabh
7aa1281e45 Fixed build script not working on Node 18.x 
- `yarn start:dev` was failing with `error:0308010C:digital envelope routines::unsupported` without the `--openssl-legacy-provider` option on Node 18. Currently react-scripts@4.x doesn't support Node 18, so until we upgrade to use react-scripts@5.x we'll need to pass in this change for build scripts
 2023-03-14 15:42:40 +05:30
Sodbileg Gansukh
be7e3f3e62 Fixed invisible top border issue of the form input (#14) 
refs https://github.com/TryGhost/Team/issues/2615
 2023-03-14 18:11:49 +08:00
James Morris
4abbb0a8ca v0.12.3 2022-11-11 15:33:51 +00:00
James Morris
a41259be27 Fix the word break for long links in comments on mobile 
refs https://github.com/TryGhost/Team/issues/2245
 2022-11-11 15:31:34 +00:00
James Morris
9bcdfb911d Removed the duplicate sm config 
refs https://github.com/TryGhost/Team/issues/2244
 2022-11-11 15:25:57 +00:00
James Loh
62149ea747 v0.12.2 2022-11-08 10:06:51 +11:00
Kevin Ansfield
c334afef3a v0.12.1 2022-11-07 22:45:15 +00:00
Kevin Ansfield
fcf8570393 🐛 Fixed error rendering count with no number (#13) 
refs https://github.com/TryGhost/Team/issues/2221

- added guard to `formatNumber` helper used in the `<Count>` component via the `<ContentTitle>` component so a missing count prop is handled gracefully
 2022-11-07 22:40:58 +00:00
e.baidakova
cb6bf40f56 v0.12.0 2022-11-04 09:28:47 +04:00
James Morris
6956b82245 Add comma separators to all numbers in comments 
refs https://github.com/TryGhost/Team/issues/2210
 2022-11-03 15:47:49 +00:00
e.baidakova
40c26a26f6 v0.11.0 2022-11-02 10:22:49 +04:00
Elena Baidakova
290e3d5713 Updated counts api url (#12) 
closes TryGhost/Team#2094
- Counts request was changed from `post` to `get` for enable request caching.
 2022-11-02 10:02:26 +04:00
Simon Backx
883a9728ca v0.10.3 2022-10-10 11:45:22 +02:00
Simon Backx
a2daf2e448 🐛 Fixed CMD+C focussing main form 
fixes https://github.com/TryGhost/Ghost/issues/15563
 2022-10-10 11:43:07 +02:00
James Morris
1a00c070d1 v0.10.2 2022-10-06 16:25:19 +01:00
James Morris
92dec78902 Improving the border, text and buttons to work in light, dark and other weird colours 
- Changed all borders to work better in different background colours
- Same goes for main buttons like pagination for main and reply
- Same goes for any secondary text which should help

no issue
 2022-10-06 16:06:40 +01:00
Simon Backx
ec586d02af Removed start-server-and-test dev dependency 2022-09-09 17:34:21 +02:00
Simon Backx
68c2e6a30d Removed Cypress from CI 
refs 24af5ad0dd

CI is not working yet with Cypress atm.
 2022-09-09 17:32:57 +02:00
Simon Backx
24af5ad0dd Added experimental Cypress tests 
refs https://github.com/TryGhost/Team/issues/1780

This commit adds some Cypress tests as a POC to the project. If we decide to go with Cypress, we can add more tests to cover the rest of the codebase. The main reason to have a E2E framework is that some editor related UI is hard to test with the React tests because it uses JSDOM.
 2022-09-09 17:27:32 +02:00
Simon Backx
ddbc2db76d Fixed error when not signed in as admin 
no issue

When loading comments UI without being logged in as an admin, it would throw an error every time when unpacking result.users[0].
 2022-09-09 12:05:14 +02:00
Simon Backx
500ebf0de2 Prevented relative time updates on comment state changes 
no issue

When the state of a comment changes (e.g., after a like) the relative time would update. This is not desirable because it looks glitchy. If the relative time doesn't update every second, then it is better to never update it after the initial render.
 2022-09-09 11:52:26 +02:00
Simon Backx
f72e804d08 Removed event bus 2022-09-09 11:48:24 +02:00
Simon Backx
527abdbcd6 Cleaned up ContentBox and PopupBox 2022-09-09 11:46:55 +02:00
Simon Backx
65dd6bd1d6 Cleaned up component props 2022-09-09 11:46:08 +02:00
Simon Backx
87729cd0ee Splitted Content component from ContentBox 2022-09-09 11:38:52 +02:00
Simon Backx
d63e75f0a2 Cleaned up Form and splitted it into multiple components (#9) 
refs https://github.com/TryGhost/Team/issues/1858
 2022-09-09 11:25:34 +02:00
Ronald Langeveld
7e95bfd42c V0.10.1 2022-09-09 09:20:08 +02:00
Ronald Langeveld
71b81c8995 Replaced missed memberBio with memberExpertise 
no issue
 2022-09-09 09:12:13 +02:00
Ronald Langeveld
878e5eba1d Replaced all references of "Bio" to "Expertise" for Comments (#10) 
ref https://github.com/TryGhost/Team/issues/1772

- all references of "Bio" to "Expertise" for Comments
- this commit is a breaking change as it relies on the API that returns `expertise` instead of `bio`.
 2022-09-09 09:05:39 +02:00
James Morris
778080eebe Added better support for dark mode and other background colours 
no issue
 2022-09-07 11:14:57 +01:00
James Morris
4625026fc2 Made some tweaks to the pagination buttons to look less like dividers 
no issue
 2022-09-05 16:53:05 +01:00
Simon Backx
8a26164200 Fixed ReplyButton text 2022-09-01 15:09:34 +02:00
Simon Backx
92accd76f0 Added Button suffix to all Button components 
refs https://github.com/TryGhost/Team/issues/1858
 2022-08-31 15:35:44 +02:00
Simon Backx
e8eeacac9e Renamed PopupModal to PopupBox 
refs https://github.com/TryGhost/Team/issues/1858

- PopupBox better reflects that it contains a Popup and is not a Popup
- In line with ContentBox, that contains the iframe with the comments content
 2022-08-31 15:31:38 +02:00
Simon Backx
fd7cebe906 Renamed dialogs to popups 
refs https://github.com/TryGhost/Team/issues/1858

Better to use the same terminology everywhere, and the name 'popup' is already used in Portal.
 2022-08-31 15:30:05 +02:00
Simon Backx
bea90b0922 Renamed CommentsBox to ContentBox and splitted Title component 
refs https://github.com/TryGhost/Team/issues/1858
 2022-08-31 15:25:49 +02:00
Simon Backx
a28ee5c133 Updated components folder structure 
refs https://github.com/TryGhost/Team/issues/1858
 2022-08-31 15:09:48 +02:00
Simon Backx
a7bfd8d878 Updated tests for new iframe title 2022-08-31 14:54:43 +02:00
Simon Backx
bcb23bc9dc Cleaned up Frame components 
refs https://github.com/TryGhost/Team/issues/1858
 2022-08-31 14:52:49 +02:00
Simon Backx
02a514f17c Removed style option from Frame component 2022-08-31 14:36:26 +02:00
Simon Backx
c3c00d0215 Fixed linting issues 2022-08-31 14:20:23 +02:00
Simon Backx
c803f7454e Fixed secundaryFormCount debug counter visible 
no issue
 2022-08-31 13:29:23 +02:00
Simon Backx
90e0ced175 Added separate BlankAvatar component 
refs https://github.com/TryGhost/Team/issues/1858
 2022-08-31 13:29:01 +02:00
Simon Backx
b701ba9c0d Cleaned up Comment component (#8) 
refs https://github.com/TryGhost/Team/issues/1858
fixes https://github.com/TryGhost/Team/issues/1789

- Split up the Comment component in many small Components to make it easier to read and maintain
- Added support for synchronous actions, which are required for actions that affect the context state based on the current value (e.g., increasing a value by one) because of the asynchronous nature of setState:

Before this change
```
// Context state: {hello: 0};
dispatchAction('increaseHelloByOne')
dispatchAction('increaseHelloByOne')
```

Could end up having a state `{hello: 1}` instead of the expected `{hello: 2}`, because underlying this would resolve into:

```
// Context state: {hello: 0};
const hello = {hello: 0};
setState({hello: hello + 1});
setState({hello: hello + 1});
```

Instead of

```
// Context state: {hello: 0};
setState(({hello}) => {hello: hello + 1});
setState(({hello}) => {hello: hello + 1});
```

Synchronous actions now support this.

- Removed deprecated `onAction` context state function
- Replaced the boolean based form checking by the more reliable counter based checking that uses synchronous actions (reason we needed synchronous actions) (fixes https://github.com/TryGhost/Team/issues/1789)
- Prevent creating a new `dispatchAction` function every time the context state changes, by using bind. This prevents infinte updates in `useEffect` hooks that depend on `dispatchAction` and also update the context via actions.
 2022-08-30 16:25:40 +02:00
James Morris
3a29a55228 Added eslinting to better manage Tailwind classes 2022-08-30 14:53:35 +01:00
James Morris
455cba4da2 Fixed the transparent background on text input for light mode 2022-08-30 10:38:17 +01:00
Simon Backx
31c2174d47 v0.9.2 2022-08-15 12:45:46 +02:00
Peter Zimon
e95e93618f Refined spacings for paragraphs and blockquotes 
- paragraphs had a bit too much bottom margin
- blockquotes missed bottom margin
 2022-08-15 12:42:40 +02:00
Simon Backx
6274e90e27 v0.9.1 2022-08-15 12:34:45 +02:00
Simon Backx
c8d4b89ac7 🐛 Added line break on Shift + Enter 
refs https://github.com/TryGhost/Team/issues/1793

Included in the @tiptap/extension-hard-break extension.
 2022-08-15 12:32:59 +02:00
Simon Backx
41623a6512 v0.9.0 2022-08-15 11:30:18 +02:00
Simon Backx
2b83af85d1 🐛 Fixed popups not closing correctly 
refs https://ghost.slack.com/archives/C02G9E68C/p1660323308235919

- When opening and closing a popup very fast, it will stay in DOM, blocking all pointer events.
- The Headless UI component <Transition show={show}> is not removed from DOM when show is set to true, and false very fast
- Fixed this by forcing a popup to get removed from DOM after 250ms after is has been closed.
- Updated HeadlessUI version
- Moved testing packges to dev dependencies
 2022-08-15 10:22:26 +02:00
Simon Backx
bf698c9a75 v0.8.0 2022-08-12 15:56:07 +02:00
Simon Backx
e44415eb6f Cleaned up margin syntax 2022-08-12 15:51:35 +02:00
Simon Backx
99ae23cf23 Excluded the last paragraph from bottom margin 2022-08-12 15:50:32 +02:00
James Morris
398a410ba2 Fixed up the paragraph spacing in the editor 
no issue
 2022-08-12 14:23:18 +01:00
James Morris
ee210d80b6 v0.7.0 2022-08-12 14:03:38 +01:00
Simon Backx
991e0856b8 Removed unused jsom import 2022-08-12 14:47:31 +02:00
Simon Backx
11c3dcc77a Fixed comment content missing after unhiding them 
fixes https://github.com/TryGhost/Team/issues/1786
 2022-08-12 14:22:48 +02:00
Simon Backx
de30741fce Added unlike spy 2022-08-12 14:17:35 +02:00
Simon Backx
75510aac5e Added like and unlike tests 
refs https://github.com/TryGhost/Team/issues/1780
 2022-08-12 14:15:48 +02:00
James Morris
39629145d0 Added in more spacing for the CTAs to catch more ophans 
no issue
 2022-08-12 13:08:32 +01:00
James Morris
001229801d Fixed up some small dark mode problems 
- The loading spinner in dark mode wasn't black
- The action buttons didn't hover correctly in dark mode

no issue
 2022-08-12 11:19:01 +01:00
Simon Backx
42d69562d9 Added test for replies and deleted members 
refs https://github.com/TryGhost/Team/issues/1780
 2022-08-12 11:19:48 +02:00
James Morris
2d79ef7cf9 Fixed local warnings in the terminal when building for comments 
no issue
 2022-08-12 09:29:29 +01:00
James Morris
fa056be39b Fixed pagination buttons to show singular values properly 
refs https://github.com/TryGhost/Team/issues/1782
 2022-08-12 08:56:19 +01:00
James Morris
34004cd135 Added in precise fixed width buttons for form 
- Reduces large widths of the buttons and so now variable
- Added fixed width to keep button same width when sending

refs https://github.com/TryGhost/Team/issues/1779
 2022-08-11 17:14:00 +01:00
James Morris
63476f6eca Updated the shadow to bring a little more contrast 
refs https://github.com/TryGhost/Team/issues/1779
 2022-08-11 16:56:26 +01:00
James Morris
52cfac284f Added in some spacing to the CTA when there are comments 
refs https://github.com/TryGhost/Team/issues/1779
 2022-08-11 16:41:57 +01:00
Simon Backx
163367dd93 Removed transformApiSiteData import 2022-08-11 17:29:37 +02:00
Simon Backx
58d32b3c82 Implemented dark mode tests 
refs https://github.com/TryGhost/Team/issues/1780
 2022-08-11 17:28:41 +02:00
Simon Backx
ef4cfc9b9a Readded auth frame test and improved test structure 
refs https://github.com/TryGhost/Team/issues/1780
 2022-08-11 17:11:26 +02:00
James Morris
6abd6f6d03 Updated the report dialog to a nicer style 
refs https://github.com/TryGhost/Team/issues/1778
 2022-08-11 16:07:37 +01:00
Simon Backx
fd21a88d52 Added first basic comments test 2022-08-11 16:40:10 +02:00
James Morris
3b7d26154e Added in the comment border line when replying with no replies 
refs https://github.com/TryGhost/Team/issues/1779
 2022-08-11 15:35:04 +01:00
James Morris
91134ecb62 Pushed some changes to the profile modal for comments 
- Includes a fix to the close button when on mobile
- Has some tweaks suggested by Zimo to bring in line with Portal

refs https://github.com/TryGhost/Team/issues/1779
 2022-08-11 15:30:34 +01:00
Simon Backx
24f384b0a2 Fixed calculating if reply form is in viewport 2022-08-11 15:16:36 +02:00
James Morris
e130c2edcd Tweaked non-published comments in dark mode 
refs https://github.com/TryGhost/Team/issues/1775
 2022-08-11 13:57:35 +01:00
James Morris
1e72a267a3 Pushed a little fix to the dark mode for the comment border 
refs https://github.com/TryGhost/Team/issues/1777
 2022-08-11 13:53:42 +01:00
Simon Backx
ceaecf43e6 Updated form to only close when another form opens and scroll better 
fixes https://github.com/TryGhost/Team/issues/1753
refs https://github.com/TryGhost/Team/issues/1758

- Scroll only if form is not in viewport + scroll to center
- Fixes: You can’t tap reply if another reply box is open (or at least you have to tap a bunch of times)
 2022-08-11 14:46:14 +02:00
James Morris
4a0ad8c6bc Little style tweaks to comment replies border and pagination border 
refs https://github.com/TryGhost/Team/issues/1777
 2022-08-11 12:41:27 +01:00
James Morris
6db7d9bd2d Fixes for super long expertise in form and comments 
refs https://github.com/TryGhost/Team/issues/1758
 2022-08-11 12:35:38 +01:00
James Morris
5e8ebe44b8 Adding in a subtle border for the comments when it has replies 
refs https://github.com/TryGhost/Team/issues/1777
 2022-08-11 11:54:28 +01:00
James Morris
9a306a2db2 Posted a few little tweaks to the deleted/hidden comment 
refs https://github.com/TryGhost/Team/issues/1775
 2022-08-11 11:26:05 +01:00
James Morris
ba8df169ad Changed the markup layout of the comments to fix a positoning problem when expertise is too long on mobile 
- When the Expertise is too long, it can cause a broken look to comments on mobile
- Changed how the markup works to better handle the details
 2022-08-11 10:09:14 +01:00
James Morris
0cf0c5833a This seems to fix the modal zooming on iOS 
refs https://github.com/TryGhost/Team/issues/1758
 2022-08-11 09:16:55 +01:00
Simon Backx
12b224e17a v0.6.0 2022-08-11 10:03:22 +02:00
James Morris
a64f13ae2d Some attempts to fix some issues with comments on mobile 
refs https://github.com/TryGhost/Team/issues/1758
 2022-08-10 17:36:00 +01:00
James Morris
bcad43c5a4 Added back the padding so comment boxes don't open full width again on desktop 
refs https://github.com/TryGhost/Team/issues/1758
 2022-08-10 17:36:00 +01:00
James Morris
0ae689dbfb Added a small tweak to CTAs on mobile 
refs https://github.com/TryGhost/Team/issues/1754
 2022-08-10 17:36:00 +01:00
Simon Backx
94d72c2846 Wired up publication name attribute 
fixes https://github.com/TryGhost/Team/issues/1776
 2022-08-10 17:34:28 +02:00
Simon Backx
35ed0af99d Fixed releasing mouse outside modals closing it 
fixes https://github.com/TryGhost/Team/issues/1769
 2022-08-10 16:45:45 +02:00
Simon Backx
bf9e190e15 Added reply pagination (#7) 
refs https://github.com/TryGhost/Team/issues/1723

- Moved usage from likes_count to count.likes
- Implemented real reply pagination based by an ID filter
- The backend now returns the relations correctly when creating new comments, so we don't need to fix them any longer.
 2022-08-10 16:14:42 +02:00
Simon Backx
b703ddd703 Fixed C keyboard shortcut when input is focused 
fixes https://github.com/TryGhost/Team/issues/1767

- Only focus the form if there is no other input focused on the page
 2022-08-10 15:46:14 +02:00
James Morris
1640901114 Added in the accent colour to the add details modal for comments 
refs https://github.com/TryGhost/Team/issues/1768
 2022-08-09 19:12:22 +01:00
James Morris
56facd62aa Adding more tweaks to the modals to ensure works well across platforms 
refs https://github.com/TryGhost/Team/issues/1756
 2022-08-09 18:58:21 +01:00
James Morris
82cc974549 Updated the copy and logic for the CTAs 
refs https://github.com/TryGhost/Team/issues/1754
 2022-08-09 18:29:07 +01:00
Fabien "egg" O'Carroll
fbdb70330f v0.5.0 2022-08-09 15:15:41 +01:00
Fabien "egg" O'Carroll
37db4df98a Added handling for updating comment count based on local actions 
refs https://github.com/TryGhost/Team/issues/1761
 2022-08-09 13:41:14 +01:00
Fabien "egg" O'Carroll
b908db41d1 Fixed pluralisation for comment count when there is just one 2022-08-09 13:41:14 +01:00
Fabien "egg" O'Carroll
4b453a8b3a Updated comment count to use the /comments/count API 
refs https://github.com/TryGhost/Team/issues/1763

We still need to use the pagination for the other checks because these
are based on how many comments are visible, which includes deleted or
hidden comments.

By using the /comments/count API we ensure that any changes to the
calculation of comments is replicated by both the comment_count
helper, as well as the comments-ui
 2022-08-09 13:41:14 +01:00
James Morris
3a48518407 Few adjustments to the CTAs 
- Keep tweaking the spacing
- Added a plan link for paid CTAs

refs https://github.com/TryGhost/Team/issues/1754
 2022-08-09 13:12:08 +01:00
James Morris
20fe790e5d First round of improving the name and bio modal 
refs https://github.com/TryGhost/Team/issues/1756
 2022-08-09 12:40:59 +01:00
James Morris
2629c5704d Combining the two CTA boxes into one and updating the copy 
refs https://github.com/TryGhost/Team/issues/1754
 2022-08-09 08:50:10 +01:00
James Morris
ac3dd62e6e Added in a hover state for editng bio 
- Improved the affordance for editing bio
- Added a new edit icon for this

refs https://github.com/TryGhost/Team/issues/1756
 2022-08-08 16:22:46 +01:00
James Morris
2b2b7c540b First round of CTA and empty state updates based on feedback 
- Added in a new line for further explanation
- Adjusted various text sizes and spacings
- Put back in the bottom border
- Currently has a hardcoded publication name for wiring up

refs https://github.com/TryGhost/Team/issues/1754
 2022-08-08 15:12:19 +01:00
James Morris
fa9b22e2c6 Removed the left and right spacing around the textbox when there are no comments 
refs https://github.com/TryGhost/Team/issues/1752
 2022-08-05 14:57:08 +01:00
Simon Backx
a1a0bf6723 Fixed blinking when bluring reply form 
fixes https://github.com/TryGhost/Team/issues/1749

Transition syntax was not working, and unused. The transition component also caused a delay, which caused the blinking.
 2022-08-05 15:24:38 +02:00
James Morris
a84bcc3d30 Removed the bottom margin from signed out boxes 
- After some trying things out, just removed that now
- There should be no more bottom spacing apart from what's in the iFrame now

refs https://github.com/TryGhost/Team/issues/1747
 2022-08-05 14:22:24 +01:00
Simon Backx
648ecd6bae Fixed first comment of a post nos showing until a refresh 
fixes https://github.com/TryGhost/Team/issues/1748
 2022-08-05 15:04:23 +02:00
Simon Backx
5d844b2122 Updated submit keyboard shortcut 
refs https://github.com/TryGhost/Team/issues/1725

- CTRL + Enter or CMD + Enter is now supported
- Removed ESC + CMD
 2022-08-05 14:58:54 +02:00
Simon Backx
164fdcbeb2 v0.4.0 2022-08-05 11:47:52 +02:00
James Morris
5b89bd0818 Changed the padding on the iFrame to work better with themes 
- There were left over paddings that were present with old design
- Stripping back the paddings to have better placement in more themes without adjustment

refs https://github.com/TryGhost/Team/issues/1747
 2022-08-05 10:28:18 +01:00
James Morris
b3a71d8c94 Fixed the avatar icon to only show if there is no image but no name 
- This changes the behaviour of the Avatar component to show the icon properly
- This removes a parameter from the Avatar component

refs https://github.com/TryGhost/Team/issues/1746
 2022-08-05 09:59:05 +01:00
Simon Backx
1c878615a8 Fixed comments of deleted members throwing error 2022-08-05 10:15:50 +02:00
James Morris
7ecf063b42 Added an icon for when there is no member name on comment box 
- This replaces the A that showed which was a bit confusing
- Icon may still change but it feels better than what was there before
- Added new parameter for Avatar component for Blank and Anonymous

refs https://github.com/TryGhost/Team/issues/1746
 2022-08-04 17:30:33 +01:00
James Morris
e4e4c07fa0 Change the title of the modal for name and bio for comments 
- Trying out a new modal title as it's easier to read
- Also, works better on mobile for the modal

refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 16:49:39 +01:00
James Morris
758651013d Tidying up dialog calls for bio with correct autofocus 
- Removed only showing bio in modal, now showing both always
- Changed how the modal is called with parameters to focus on bio if clicked

refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 16:46:22 +01:00
James Morris
4cc2ed88c3 Added in the right character count for bio when bio is present 
refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 15:33:52 +01:00
James Morris
5128360df4 Making the buttons work for name and bio in form 
refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 15:32:16 +01:00
James Morris
2027c88f58 Correctly used the max length variable for the bio text box in modal 
refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 16:25:55 +02:00
James Morris
0a1b1eb70a Added in the max length counter for the bio modal 
refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 16:25:55 +02:00
James Morris
1ab2787495 Little tweak to button size on mobile for comments 
no issue
 2022-08-04 16:25:55 +02:00
Simon Backx
d88b2e582d Wired up editing bio to API 
refs https://github.com/TryGhost/Team/issues/1716

- Read bio from member
- Allow editing member
- Sync changed bio across visible comments
 2022-08-04 16:25:55 +02:00
James Morris
dd06e31959 Added some rudimentary bio stuff that needs wiring up 
- This adds in the bio UI into the modal
- Adds in a simple button for bio under the name in textbox
- Still needs wiring up as it data doesn't save and update yet

refs https://github.com/TryGhost/Team/issues/1716
 2022-08-04 16:25:55 +02:00
Fabien "egg" O'Carroll
5530ec7b4c v0.2.4 2022-08-04 11:34:52 +01:00
Fabien "egg" O'Carroll
c87b059c0b v0.3.0 2022-08-04 10:42:59 +01:00
James Morris
a2597e5584 Added in a explicit time as a title tooltip for relative dates in comments 
- Uses the title attribute to pop up the default tooltip
- No helper function introduced to generate explicit date

refs https://github.com/TryGhost/Team/issues/1741
 2022-08-03 17:42:20 +01:00
Simon Backx
9b402625ca Added targetOrigin option to postMessage (admin auth) 
refs https://github.com/TryGhost/Team/issues/1694
 2022-08-03 15:49:16 +02:00
Simon Backx
587e5b887e Added origin check to admin auth frame message listener 
refs https://github.com/TryGhost/Team/issues/1694

- Only listen to messages that are coming from the auth iframe
- Related PR for the other side: https://github.com/TryGhost/Ghost/pull/15135
 2022-08-03 14:54:13 +02:00
Fabien "egg" O'Carroll
14a9fab688 Removed empty element from DOM when neither title or count are shown 
refs https://github.com/TryGhost/Team/issues/1695

This is based on feedback from Sodo!
 2022-08-02 22:11:01 +01:00
Simon Backx
c7655ceca0 Added keyboard shortcuts 
fixes https://github.com/TryGhost/Team/issues/1725

- ESC to close/blur forms
- CMD + ESC to submit forms
- C to focus and scroll to main comment form
- ESC to close any modals (context menus or dialogs)
- keydown events are passed down from iframes to the main window to prevent having to listen on all iframes + window every time we need these events.
 2022-08-02 16:43:48 +02:00
James Morris
551e12000d Removed some commented code to clean up the empty states and CTA 
refs https://github.com/TryGhost/Team/issues/1704
 2022-08-02 11:35:52 +01:00
Simon Backx
e7338b71d8 Fixed reply box disappearing instantly when add details dialog appears 
refs https://github.com/TryGhost/Team/issues/1710
 2022-08-02 10:40:54 +02:00
Simon Backx
01e2fbde7c Fixed #ghost-comments-root and renamed it to #ghost-comments 
fixes https://github.com/TryGhost/Team/issues/1729
refs https://github.com/TryGhost/Team/issues/1730

Please note that it only works on initial page load for now. Browsers have custom implementations for handling URL hashes/fragments that mess with the scroll position if you reload a page.

We need a special JS based handling of the URL fragment/hash because:
- We should only scroll after the comments have loaded, else we risk landing on a higher position on the page due to content height changes.
- The DIV we scroll to (#ghost-comments-root) is inserted via JS, making it more difficult to scroll to it without JS.
- We cannot wrap the `<script>` tag that loads the comments with a different DIV that has an id where we can scroll to. This would break themes and would make it harder to work with existing CSS grids (tried this first). And we still have the first issue too if we use this.
 2022-08-01 16:14:49 +02:00
Djordje Vlaisavljevic
a36233aa8a Updated colors for dark color scheme 
refs https://github.com/TryGhost/Team/issues/1704
 2022-07-28 20:38:05 +02:00
Fabien "egg" O'Carroll
7d60531709 Fixed the comment count displaying 
refs https://github.com/TryGhost/Team/issues/1695

The count param was renamed to showCount in index.js and wasn't
updated elsewhere. This fixes that
 2022-07-28 15:37:13 +01:00
Fabien "egg" O'Carroll
5ed16075b7 Fixed title conditional to allow for no title 
refs https://github.com/TryGhost/Team/issues/1695

We should allow for an empty string to be passed in as the title,
which means a boolean coercion check is not appropriate, we should
check for null which in this case means to use the default title
 2022-07-28 15:34:00 +01:00
Rishabh
beb8807966 Fixed resize observer error in tests 
- resize observer used in auth frame is not available in Jest, so we mock it instead
- ignores missing methods on resize observer for tests
 2022-07-28 19:01:24 +05:30
Rishabh
9afb36fa53 Disabled context menu edit if editing another comment 
refs https://github.com/TryGhost/Team/issues/1710

- if a comment is in edit mode, it stops opening edit for another comment till existing edit mode is exited
 2022-07-28 18:50:14 +05:30
Peter Zimon
d28f00656c Updated CTA styles 
no issue

- typography and spacing was a bit off in the signup / upgrade CTA boxes
- the line style was inconsistent with the rest of the comments design
- button sizes and spacings needed also a bit of refinement
 2022-07-28 14:19:55 +02:00
Fabien 'egg' O'Carroll
f3f6b2a98f Added ability to change title and hide comment count (#3) 
refs https://github.com/TryGhost/Team/issues/1695

This allows theme developers to customise the output via the
{{comments}} helper
 2022-07-28 12:21:14 +01:00
Peter Zimon
b58970f9e8 Added minor visual improvements 
no issue

- applied typography changes to bio and date line as they were too strong
- padding and positioning of the comment input form was a bit misaligned
 2022-07-28 13:11:39 +02:00
Peter Zimon
2906018b34 Added spinner to submit button 2022-07-28 12:19:15 +02:00
Rishabh
a10c244e7c Updated member count to use total across pagination 
refs https://github.com/TryGhost/Team/issues/1695

- member count was using total comments of current page than all comments across
 2022-07-28 00:22:43 +05:30
Rishabh
91d3864126 v0.2.3 2022-07-27 21:17:37 +05:30
Rishabh
8078c4a495 v0.2.2 2022-07-27 19:38:38 +05:30
James Morris
b444500f45 A few dark mode tweaks to make sure it looks nice 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-27 14:28:56 +01:00
James Morris
3dd1cb026a Added a truncation for mobile for the comments title 2022-07-27 14:22:45 +01:00
James Morris
c69409cbac Updated the included comment count to be dynamic 
- Before it was static, with an X, but now using the variable available
- Do note, this doesn't seem to be showing the right number

refs https://github.com/TryGhost/Team/issues/1695
 2022-07-27 14:03:50 +01:00
James Morris
ffabb79703 Added in the title and comments into the Comments repo, rather than in be in the theme only 
refs https://github.com/TryGhost/Team/issues/1695
 2022-07-27 14:00:20 +01:00
James Morris
457406a86b Added in a cancel button for when replying 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-27 13:39:09 +01:00
James Morris
14dedbf95a Brought the pagination style inline with the reply one 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-27 13:35:35 +01:00
James Morris
1ff7b15a50 Subtle fade in for comments on render and pagination 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-27 11:49:17 +01:00
James Morris
9bd258b461 Commented out Bio stuff for now until it can be wired up 
- Please note the commenting out of code here
- We want to put this back in when Bio is available

refs: https://github.com/TryGhost/Team/issues/1716
 2022-07-27 11:39:11 +01:00
James Morris
8b4b838547 Tweaking up the form shadow with some subtle hover state 
- Added in a shadow hover state for the form but has to be subtle to not show cutoff

refs https://github.com/TryGhost/Team/issues/1703
 2022-07-27 10:46:09 +01:00
James Morris
83928a8965 Removed the testing text for bio 
refs https://github.com/TryGhost/Team/issues/1716
 2022-07-27 10:24:31 +01:00
Djordje Vlaisavljevic
a4fe453bfa Fixed CTA spacing in empty state 
refs #1704
 2022-07-27 11:15:48 +02:00
Rishabh
c1961b30dd Updated to show only single edit box at one time 
refs https://github.com/TryGhost/Team/issues/1710

- if a user is already editing/replying a comment, we shouldn't show other text boxes they can edit as it can be generally confusing
 2022-07-27 14:36:08 +05:30
Djordje Vlaisavljevic
00f2d455da Updated CTA design 
refs #1704
 2022-07-27 10:13:52 +02:00
Djordje Vlaisavljevic
db584379fa Updated empty state design 
refs #1698
 2022-07-27 10:13:36 +02:00
Rishabh
b351e75feb Removed extra comment box when in reply mode 
refs https://github.com/TryGhost/Team/issues/1710

- keeps a single comment box when in reply mode, hiding the main comment box outside
 2022-07-26 22:55:01 +05:30
James Morris
843a79511f Changed the bio in the comment box to bring up the modal 2022-07-26 18:08:18 +01:00
James Morris
7e4f0bf361 Adding in bio position to comments, change to comment layout, changed up mobile design tweaks, new comment form, no global styles on iframes 
- This removes the global styles on the iFrame
- Changes to comment layout for new bio, new position for date and edited tag
- Lots of design tweaks for desktop and mobile

refs https://github.com/TryGhost/Team/issues/1716
 2022-07-26 16:22:45 +01:00
James Morris
550d28cc96 Moved the date up to underneath the name and tweaked over bits 2022-07-26 12:44:49 +01:00
James Morris
531e0036b2 Renamed the add name dialog to better suit including bio 2022-07-26 11:47:36 +01:00
James Morris
b1e1d4e23b Aded in a basic Bio field into the Add Name dialog 2022-07-26 11:45:10 +01:00
Rishabh
1eb16692aa v0.2.1 2022-07-26 15:40:34 +05:30
Rishabh
75503279d4 v0.2.0 2022-07-25 22:40:53 +05:30
Rishabh Garg
3314a03a3b Replaced hardcoded css link with styles from config (#2) 
refs https://github.com/TryGhost/Team/issues/1719

- the stylesheet link was prev hardcoded in the app, which made it impossible to configure from Ghost
- fetches styles url from the data attribute on script instead, which allows app to load styles based on config upstream
 2022-07-25 22:39:23 +05:30
Simon Backx
2e7055622e Fixed reply box redrawing when clicking the button again 
refs https://github.com/TryGhost/Team/issues/1710

Was caused by: mouseDown triggered on Reply button -> editor blurred -> editor closed itself -> onClick on reply opened the form again
 2022-07-22 17:38:28 +02:00
Simon Backx
3fbb7a6c24 Improved Form stability 2022-07-22 17:26:14 +02:00
Simon Backx
45d3ffcf06 Added proper cleanup functions to Form's useEffect 2022-07-22 17:24:02 +02:00
Simon Backx
6550d1b8cc Fixed add name dialog enter transition 2022-07-22 17:20:55 +02:00
Simon Backx
8544dbb1ba Removed old for attribute and readded appear animation in modals 2022-07-22 17:12:28 +02:00
Simon Backx
fd996da083 Refixed selection and flashing by properly stopping propagation 2022-07-22 17:07:17 +02:00
Simon Backx
e5d6a626bd Fixed selection inside forms 2022-07-22 16:34:05 +02:00
James Morris
34724c991e Tons of added styles to make mobile look better 
refs: https://github.com/TryGhost/Team/issues/1712
 2022-07-22 15:14:47 +01:00
Simon Backx
e333ecdb85 Fixed flashing when clicking around comment box when open 
refs https://github.com/TryGhost/Team/issues/1710
 2022-07-22 15:56:05 +02:00
Simon Backx
4bd1181e33 Removed admin auth log 2022-07-22 15:31:27 +02:00
James Morris
b2c7a49398 Removed the unncessary toggle reply prop that was passed 
no issue
 2022-07-22 13:46:12 +01:00
Simon Backx
c2d49d549c Removed default include from comments browse API call 2022-07-22 14:02:35 +02:00
James Morris
0dab85bfe9 Added in some basic hover to the action buttons 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 11:26:44 +01:00
James Morris
e1648551bf Improved the dropdowns on mobile 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 11:12:36 +01:00
James Morris
9f93eb75f5 Better blank avatar in dark mode and hover states for pagination 
- The blank avatar needed some work in dark mode and removed bits from svg file
- Added in some hover states for the pagination buttons

refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 11:05:50 +01:00
James Morris
4ab0bdf3b7 Added in conditions to the submit button values to work on mobile 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 10:54:33 +01:00
James Morris
fa411fdbf2 Fixing up some things with the modals and mobile and other bits 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 10:44:31 +01:00
James Morris
273c19db45 Fixed up the dropdown text alignments 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 09:39:27 +01:00
James Morris
2c013b8db0 Added in some responsive design to the Comments modals for mobile 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-22 09:35:52 +01:00
Simon Backx
8d41ec360b Skipped waiting for admin authentication 
fixes https://github.com/TryGhost/Team/issues/1700

- Admin authentication requests are non blocking now
 2022-07-22 09:44:21 +02:00
James Morris
a5af3f47ce Improved the hidden and removed status where it's now hidding name 
- Before, this was still showing name and avatar
- This now reverts to a blank avatar image

refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 19:46:53 +01:00
James Morris
59e29f30b0 Fixed the bug where the portal windows open inside the iFrame 
refs https://github.com/TryGhost/Team/issues/1706
 2022-07-21 18:43:32 +01:00
James Morris
ea643a4847 Added in some error handling and a few other tiny tweaks to Add Name dialog 
- Added in some error handling to catch empty names
- Basic checks for trimmed strings
- Subtle transition effects

refs https://github.com/TryGhost/Team/issues/1682
 2022-07-21 18:31:58 +01:00
James Morris
47a8386da2 Spacing tweaks to tighten things up based on John's feedback 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 18:08:30 +01:00
James Morris
16cccc2fcc Added the reply box disappearing properly with the toggle when finished 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 17:50:23 +01:00
James Morris
b60f0995d9 Added in the toggle so when blurring from reply textbox it'll undo the reply button too 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 17:50:23 +01:00
James Morris
5466ca2608 Needing more control over the opening and closing of text box so moved some things around 
- Note this may look a bit more complicated but I need more control over opening/closing
- Will look to refactor this and make it simpler soon enough

refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 17:50:20 +01:00
Simon Backx
30cd5c278e Fixed More button not toggling context menu 2022-07-21 17:35:24 +02:00
Simon Backx
dcfebd5e5f Fixed generic dialogs closing when clicking inside them 2022-07-21 17:27:58 +02:00
Simon Backx
b262d7010a Fixed closing context menus when clicking outside them 
fixes https://github.com/TryGhost/Team/issues/1702
 2022-07-21 17:23:35 +02:00
Simon Backx
20f2b26c23 Removed Modal component 2022-07-21 17:00:10 +02:00
Simon Backx
2980e58201 Updated Popup Modals now using global context 2022-07-21 16:59:18 +02:00
James Morris
15b534f7d3 Push some more style tweaks for iFrame but it may need more 
- Includes more dynamic styling for negative margins for iFrames
- This may well change again when looking more closely with themes

refs https://github.com/TryGhost/Team/issues/1701
 2022-07-21 15:33:04 +01:00
James Morris
dd8715fa46 Moved iFrame comments adjustments 
- Moved where the styling is to not mess with modals
- Added in some padding at the top for edit box

refs https://github.com/TryGhost/Team/issues/1701
 2022-07-21 14:44:37 +01:00
Simon Backx
f011de6b5b Cleaned up the modals iframe being in DOM when not shown 2022-07-21 15:31:26 +02:00
James Morris
6d19323df2 Quick fix for iFrame, negative margins and padding to retain shadow 
refs https://github.com/TryGhost/Team/issues/1701
 2022-07-21 14:09:13 +01:00
Simon Backx
866a020072 Fixed scrolling to reply form 2022-07-21 15:03:40 +02:00
Simon Backx
0b8f92ddbe Switched from Shadow DOM back to Iframes 
refs https://github.com/TryGhost/Team/issues/1701

The Selection API is missing in Safari in Shadow DOM: https://bugs.webkit.org/show_bug.cgi?id=163921. So we need to move away from it for now.

- Adds a new component: Modal, which makes sure we can style modals using tailwind, while displaying them outside of the main iframe (inside a different iframe that is positioned fixed)
- Updated GenericDialog to use the new Modal component
- Removed ShadowDOM
 2022-07-21 14:35:32 +02:00
James Morris
a9c3ef5444 Fixed the quotes back to double for HTML elements 
no issue
 2022-07-21 13:11:33 +01:00
James Morris
6b4290694b Added in a simple scroll to reply to ensure it's always in view 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 13:05:23 +01:00
James Morris
e6cacdb2db Moved reply box to bottom and made it autofocus 
refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 12:36:54 +01:00
James Morris
64b6dbd3ee Little tweak to how the Add Name dialog box opens from comments 
- Now doesn't jump when opening the Add Name dialog box
- Still some minor things to visually tweak on this but it's an improvement

refs https://github.com/TryGhost/Team/issues/1682
 2022-07-21 12:04:08 +01:00
James Morris
269bd6506e Smaller UI and UX tweaks from John's feedback 
- Increase rounded border size of submit button
- Make cursor be text when editing
- Remove ugly outlines from actions

refs https://github.com/TryGhost/Team/issues/1703
 2022-07-21 11:31:12 +01:00
Rishabh
9e06f28bb5 Wired saving member's name for comments 
refs https://github.com/TryGhost/Team/issues/1682

- wires member name to be saved from the popup for adding comments
 2022-07-21 15:47:51 +05:30
James Morris
a2e3b06548 Basic modal but needs more work 
- This modal style is mostly there
- It needs key behaviours to work with React properly
- It triggers only when there isn't a name present
- It doesn't save yet or anything fancy

refs https://github.com/TryGhost/Team/issues/1682
 2022-07-20 18:40:04 +01:00
James Morris
360c5f9779 Uncommented the reporting action 
refs https://github.com/TryGhost/Team/issues/1685
 2022-07-20 17:36:38 +01:00
James Morris
55f650f964 Updated some of the logic for the dropdowns for hidden, etc 
refs https://github.com/TryGhost/Team/issues/1693
 2022-07-20 17:26:29 +01:00
James Morris
48b4aaf838 Fixed up the loading state with proper positioning and adjusted colours 
refs https://github.com/TryGhost/Team/issues/1692
 2022-07-20 16:36:15 +01:00
Simon Backx
6eb32599bd Added darkmode support for loading spinner 2022-07-20 17:03:45 +02:00
Simon Backx
28921a8dbf Fixed randomly not loading comments area 
refs https://github.com/TryGhost/Team/issues/1696

- Wait for the iframe to load before sending messages to it
- High chance this fixes the issue, but still need to monitor if this was the real cause.
 2022-07-20 16:30:28 +02:00
Simon Backx
723b35bfa6 Added CSS support for custom local setup for Safari 2022-07-20 16:03:07 +02:00
Simon Backx
e4c9ecc621 Wired up really basic reply pagination 
refs https://github.com/TryGhost/Team/issues/1689

Needs input on https://github.com/TryGhost/Team/issues/1689#issuecomment-1190189896
 2022-07-20 14:16:06 +02:00
James Morris
e4d90f7a82 Basic working empty comments that needs further styling 
refs https://github.com/TryGhost/Team/issues/1698
 2022-07-20 12:58:28 +01:00
James Morris
75ac4dcdc3 Added a dummy reply pagination button ready to wire up 
refs https://github.com/TryGhost/Team/issues/1689
 2022-07-20 12:31:35 +01:00
Simon Backx
4a4db114f0 Updated loading state to kick in earlier 
refs https://github.com/TryGhost/Team/issues/1692

- Moved Loading component to App (so it shows as a placeholder)
- Disabled loading settings from the API (not used for now), to speed up loading
 2022-07-20 11:01:30 +02:00
Simon Backx
2657af11f6 Restricted actions for logged in members and paid members 
refs https://github.com/TryGhost/Team/issues/1693

- Added a new data attribute to the injected stript tag: `data-comments-enabled`. This contains the commentsEnabled setting, and can be 'all' or 'paid' (when it is off the comments section is never injected).
- Added a new component `<NotPaidBox>`, which is visible when a member is signed in but doesn't have paid access to comment
- Prevented clicking the reply and like buttons when a member doesn't have access
 2022-07-20 10:38:21 +02:00
James Morris
dd5a4bb35e Added a member check for showing more menu or not 
- This should stop people who are not logged in from showing more menu

refs https://github.com/TryGhost/Team/issues/1693
 2022-07-19 17:51:17 +01:00
James Morris
28b566f95a Added a member check for toggling on and off likes 
- This should stop people who are not logged in from liking comments

refs https://github.com/TryGhost/Team/issues/1693
 2022-07-19 17:45:22 +01:00
James Morris
dce15950cd Added a proper loading component for comments plus a few tweaks 
- New loader component for when comments come in
- New spinner used for loader and the report button progress
- We don't seem to have a working loading state to show it though

refs https://github.com/TryGhost/Team/issues/1692
 2022-07-19 17:23:02 +01:00
Simon Backx
a1b1dd9dad Fixed appVersion attribute warning 2022-07-19 16:55:47 +02:00
Simon Backx
98486d159b Added temporary working test 2022-07-19 16:46:16 +02:00
James Morris
4b504130d8 Working progress of the button when sending reporting 
refs https://github.com/TryGhost/Team/issues/1685
 2022-07-19 15:35:32 +01:00
Simon Backx
0424fcd099 Fixed context menus for comment of deleted member 2022-07-19 16:28:33 +02:00
Simon Backx
0da39ddeeb Added support for deleted members' comments 
fixes https://github.com/TryGhost/Team/issues/1690
 2022-07-19 16:22:09 +02:00
James Morris
6768ae2d55 First version of basic reporting modal 
refs https://github.com/TryGhost/Team/issues/1685
 2022-07-19 13:05:42 +01:00
Simon Backx
e84b4e5320 Added temporary report functionality without confirmation 2022-07-18 17:36:09 +02:00
Simon Backx
a0eb8af4ac Fixed empty member names in comments 
refs https://github.com/TryGhost/Team/issues/1681

Default to 'Anonymous' for members without a name. Still need some UI to ask for a name.
 2022-07-18 09:52:03 +02:00
Rishabh
fc3f091e2d 🐛 Fixed internal css leaking outside iframe 
refs https://github.com/TryGhost/Team/issues/1675

- the main css file was imported in the root js script, causing it to be included alongside the final minified bundle and get injected outside the iframe.
- the main css is pushed as a separate file outside of bundle and used directly as link inside the iframe instead
 2022-07-13 08:19:52 +05:30
Simon Backx
072574ee71 Fixed autofocus cursor position when editing comments 2022-07-12 16:18:26 +02:00
Simon Backx
e002904ce7 v0.1.2 2022-07-12 15:48:50 +02:00
James Morris
e7c2a0bbf6 Little tweak to make the transition work again on the form opening 2022-07-11 16:23:10 +01:00
Peter Zimon
3a5813fbf5 Fixed bug for darkmode 
- Fixed a bug for darkmode not being loaded properly
 2022-07-11 15:23:20 +02:00
Simon Backx
eea1bf19a1 Moved AuthFrame back to use useEffect 2022-07-08 13:29:04 +02:00
Peter Zimon
08cc74c894 Added sequential load for CSS 
- Loading CSS from external source might take time which can result in
content appearing for a split-second without any formatting. To avoid
this, we added a CSS class that hides all content until the CSS is
properly loaded.
 2022-07-08 13:28:39 +02:00
Simon Backx
6cb29e434a Fixed reply Form autofocus 2022-07-08 13:24:50 +02:00
Simon Backx
ef84ab2f40 Moved Avatar to new style 2022-07-08 13:21:37 +02:00
Peter Zimon
5f9f05d60e Fixed missing animation 
- added animation CSS definitions for heartbeat animation
 2022-07-08 13:18:27 +02:00
Peter Zimon
d44571be16 Fixed port for local development 
- updated helpers to use port 4000 for local development
 2022-07-08 13:16:03 +02:00
Simon Backx
4ac29fc40a Moved NotAuthorContextMenu to newer syntax 2022-07-08 13:14:32 +02:00
Peter Zimon
d89ff82582 Added animation to Like button 
- added a heartbeat animation to the Like button for a little delight
 2022-07-08 13:13:35 +02:00
Simon Backx
de6ea5aa45 Moved CommentContextMenu to newer syntax 2022-07-08 13:11:02 +02:00
Fabien "egg" O'Carroll
8b72c0ec8d v0.1.1 2022-07-08 13:09:02 +02:00
Fabien "egg" O'Carroll
b7fbd4e74e Setup app to support prod published flow 2022-07-08 13:09:02 +02:00
Simon Backx
aa8b729180 Moved AuthorContextMenu to newer syntax 2022-07-08 13:07:11 +02:00
Simon Backx
65eb942c73 Moved AdminContextMenu to newer style 2022-07-08 13:04:30 +02:00
Simon Backx
250df54a14 Removed onLoad again from useEffect 2022-07-08 13:03:49 +02:00
Simon Backx
54344c218e Fixed useEffect warnings 2022-07-08 12:55:02 +02:00
Simon Backx
99f0038633 Moved Pagination to newer React syntax 2022-07-08 12:49:56 +02:00
Simon Backx
2837f67f97 Updated edit form to set selection to end 2022-07-08 12:34:58 +02:00
James Morris
714ef334a0 Fixed up the reply box no having proper margins 2022-07-08 12:27:44 +02:00
James Morris
7aa4a4a44f Fixed position bugs for when form is with no comments and as edited 2022-07-08 12:21:02 +02:00
Peter Zimon
f1248435ba Fixed spaces not rendered in FF issue 2022-07-08 12:19:13 +02:00
James Morris
d7df229927 Fixed the missing semicolon problem with compiling 2022-07-08 12:13:41 +02:00
James Morris
8893b701b0 Fixed up the margin problem when there are no comments 2022-07-08 12:12:46 +02:00
Peter Zimon
880dc77044 Fix FF outline bug 2022-07-08 12:10:07 +02:00
Peter Zimon
45655fecd3 Updated CTA 2022-07-08 11:59:43 +02:00
James Morris
8fd5c5bb77 Tiny tweaks for alignment for boxes 2022-07-08 11:56:42 +02:00
James Morris
6b8232c637 Fixed up positioning problems 2022-07-08 11:55:48 +02:00
Simon Backx
bc6c1e0470 Added accent color to css variables 2022-07-08 11:47:14 +02:00
Peter Zimon
da21656b14 Added theme variables to context 2022-07-08 11:38:58 +02:00
Simon Backx
1550f582be Added blockquotes 2022-07-08 11:03:19 +02:00
James Morris
9f11eaf547 Refactored edit form down into base form, still needs fixes 2022-07-08 10:50:59 +02:00
Simon Backx
d55ffafb43 Fixed replies hidden if all removed or hidden 2022-07-08 10:49:01 +02:00
Simon Backx
0c8c89c651 Fixed linting warning in Comment component 2022-07-08 10:45:59 +02:00
Simon Backx
ff036bba90 Fixed iframe linting error 2022-07-08 10:45:14 +02:00
Peter Zimon
1fb189cae9 Added accent color 2022-07-08 10:44:18 +02:00
Simon Backx
c677f60f0b Added Tiptap core dependency 2022-07-08 10:43:33 +02:00
Simon Backx
a10c73ac89 Removed Tiptap starter kit from package.json 2022-07-08 10:41:17 +02:00
Simon Backx
8dfb77182e Removed Tailwind classes from comment contents 2022-07-08 10:39:13 +02:00
James Morris
19d2fba350 Combined add and reply form into one and adjusted styles 2022-07-08 10:33:25 +02:00
Simon Backx
10626d9bf7 Added editor to EditForm 2022-07-08 10:24:52 +02:00
James Morris
1a894e3120 Tweaks styles for add form now new editor is in there 2022-07-08 10:13:39 +02:00
Simon Backx
52d96c1bf0 Added editor to replyForm 2022-07-08 10:13:28 +02:00
Simon Backx
a2d5e51c76 Moved editor configuration to separate file 2022-07-08 10:07:43 +02:00
Simon Backx
d9a7062454 Disable editor autofocus 2022-07-08 10:00:32 +02:00
Simon Backx
6f0573ccb0 Added TipTap editor 2022-07-08 09:58:55 +02:00
Peter Zimon
50b7c089f8 Updated colors for textarea 2022-07-08 09:49:43 +02:00
Peter Zimon
200717f779 Making add form width dynamic based on comment count 2022-07-07 17:47:34 +02:00
Peter Zimon
81bb2fb441 More dark mode refinements 2022-07-07 17:39:36 +02:00
Peter Zimon
d0b069d2bb Dark mode refinements 2022-07-07 17:33:26 +02:00
Peter Zimon
3a79597c9a Add form darkmode 2022-07-07 17:23:00 +02:00
Simon Backx
6a11c5ed8d Revert "Added TipTap editor" 
This reverts commit f2c1b3397c.
 2022-07-07 17:18:40 +02:00
Simon Backx
f2c1b3397c Added TipTap editor 2022-07-07 17:12:24 +02:00
Peter Zimon
7376d5383d Added min width to context menu 2022-07-07 16:39:27 +02:00
Peter Zimon
b0f0d412e8 Updated add box styles 2022-07-07 16:35:10 +02:00
James Morris
6df89902c1 Tiny tweak to broken button placement 2022-07-07 16:28:17 +02:00
Peter Zimon
301a129665 Updated edit and reply form style 2022-07-07 16:24:37 +02:00
James Morris
828338331c Tiny tweaks to forms 2022-07-07 16:24:02 +02:00
Peter Zimon
508c60bb86 Adjusted shadows 2022-07-07 16:07:56 +02:00
James Morris
c1cb977980 Form tweaks 2022-07-07 16:05:28 +02:00
Simon Backx
2eabb69be3 Readded deleted comments 
no issue

- Hiding deleted comments caused pagination issues.
- Updated text for logged in admins to differentiate between hidden and deleted comments
 2022-07-07 15:42:45 +02:00
James Morris
838fe784f1 Little tweaks for better add and reply forms 2022-07-07 15:25:38 +02:00
Simon Backx
d0633fb70e Added logic to hide deleted comments without replies 2022-07-07 15:09:31 +02:00
James Morris
9e9cd270b9 New tweaks to the bottom text box 2022-07-07 14:49:10 +02:00
Kevin Ansfield
9735665ca1 Fixed like/unlike on replies 2022-07-07 14:47:10 +02:00
Peter Zimon
857dbbc315 Moved reply box above replies 2022-07-07 14:36:19 +02:00
Kevin Ansfield
b9740dbe1e Fixed hide comment on replies 2022-07-07 14:33:37 +02:00
Kevin Ansfield
165e84d8e0 Fixed delete/show on replies 2022-07-07 14:29:32 +02:00
Peter Zimon
09e2efe8fd Updated comment list layouts 2022-07-07 14:28:13 +02:00
Peter Zimon
c542918dae Avatar color refinements 2022-07-07 13:00:07 +02:00
James Morris
a142a86b5d Remove reply on a deleted comment 2022-07-07 12:59:50 +02:00
James Morris
c0cf87583f Little tweaks to replies and comments and a refactor 2022-07-07 12:58:07 +02:00
Peter Zimon
ff362cabbf Colorized avatars 2022-07-07 12:42:02 +02:00
James Morris
6948b1222b Quick visual fixes for replies 2022-07-07 12:34:09 +02:00
James Morris
e582f8723a Tweaked the link for sign in 2022-07-07 12:03:46 +02:00
James Morris
88d2fc4bd2 Some basic styling for the sign in box 2022-07-07 12:02:58 +02:00
Simon Backx
68012c9264 Implemented editing replies 2022-07-07 11:39:12 +02:00
Simon Backx
25c86689f8 Fixed adding a reply to a new comment 2022-07-07 11:24:39 +02:00
Simon Backx
5d5e63ba92 Swapped reply form order and removed form after submitting 2022-07-07 11:22:23 +02:00
Simon Backx
6a179b06c4 Wired up adding replies 2022-07-07 11:12:44 +02:00
Peter Zimon
2e58f65b24 Added color scheme parameter 2022-07-07 11:10:31 +02:00
James Morris
f7528a032c Removed the total comments component as it's unneeded 2022-07-07 11:06:59 +02:00
James Morris
32010e5a6d Tiny quick tweak to reply, needs more though 2022-07-07 11:05:41 +02:00
James Morris
70e435ccb3 Added in basic reply toggle with form ready for logic 2022-07-07 10:56:45 +02:00
Simon Backx
8a67716b17 Moved to modern React syntax for the Comment component 2022-07-07 10:42:03 +02:00
Simon Backx
17ae8d6985 Fixed missing <button> type attribute 2022-07-07 10:30:48 +02:00
Simon Backx
0f6e4a86d0 Wired up editing comments 2022-07-07 10:29:29 +02:00
Simon Backx
125afc5e23 Moved to modern React syntax for More component 2022-07-07 10:17:55 +02:00
Simon Backx
405c981131 Moved to modern React syntax for EditForm 2022-07-07 09:41:59 +02:00
Simon Backx
319a477aaf Moved to modern React syntax for AddForm 2022-07-07 09:33:05 +02:00
James Morris
e762853ac6 Bit more radical style changes for comment layout 2022-07-06 20:10:31 +02:00
James Morris
02d81a36f1 Made unblur work on the text box when adding 2022-07-06 19:41:36 +02:00
James Morris
9ad8a0afcc Lots of little fixes and tweaks to styles 2022-07-06 19:22:52 +02:00
James Morris
ef4cbdde1d Fix height 2022-07-06 18:01:27 +02:00
James Morris
bb4957ba75 Indented replies 2022-07-06 17:55:09 +02:00
James Morris
84972865f9 Updated to fix some dark mode things 2022-07-06 17:47:32 +02:00
Simon Backx
8e0efd8bfa Removed console log 2022-07-06 17:36:37 +02:00
Simon Backx
dc196ddeb1 Fixed adding comments missing some properties 2022-07-06 17:30:50 +02:00
Hannah Wolfe
3ce42c05f6 Added basic replies 2022-07-06 17:26:50 +02:00
Simon Backx
f498811321 Added like/dislike comments 2022-07-06 17:20:19 +02:00
James Morris
c394037cab Added basic toggle state to like component 2022-07-06 17:02:18 +02:00
James Morris
ddd72eba98 Little tweaks 2022-07-06 16:55:14 +02:00
James Morris
50d5d74d91 Added autofocus to edit when it's on 2022-07-06 16:46:57 +02:00
James Morris
652d9191b5 Basic version of expandable textbox for adding 2022-07-06 16:45:50 +02:00
James Morris
1ac92467b5 Renamed form component again, now to separate from edit for now 2022-07-06 15:46:04 +02:00
James Morris
c7bc1f9b8d Fixed up a merge for forms 2022-07-06 15:42:42 +02:00
James Morris
cd85b7cad9 Updated forms and tweaks with styles 2022-07-06 15:41:47 +02:00
Hannah Wolfe
1e9b5d6bcf Added commented out Form component using hooks 
- demoing how to use useState and function components to keep the code minimal
 2022-07-06 15:18:56 +02:00
James Morris
22c99f3b31 Commented out reply component as we won't get to it yet 2022-07-06 15:10:21 +02:00
James Morris
fdc9e5f2e9 Different looking text boxes and other bits 2022-07-06 15:08:15 +02:00
Peter Zimon
5ce4924624 Added postcss and minify 2022-07-06 14:54:44 +02:00
James Morris
feae7836d7 Lots of little action tweaks 2022-07-06 12:16:29 +02:00
James Morris
7b424800aa Added back in the refactor of actions into components 2022-07-06 11:48:25 +02:00
James Morris
16279da1ac Merging in some changes to close dropdown along other 2022-07-06 11:48:25 +02:00
Simon Backx
121f1711cd Added 'show comment' implementation for admins 2022-07-06 11:45:45 +02:00
Simon Backx
7570b2ef04 Added check to hide more button without actions 2022-07-06 11:39:33 +02:00
Simon Backx
cc32b55ee9 Fixed context menu closing after actions 2022-07-06 11:32:56 +02:00
Simon Backx
1be6d305a0 Added close method to context menus 2022-07-06 11:31:01 +02:00
Simon Backx
03ab129380 Wired up deleting comments 2022-07-06 11:27:03 +02:00
Simon Backx
f711498a3e Wired up hiding comments admin API endpoint 
no issue

The endpoint is not yet implemented on the backend, so it doesn't work yet.
 2022-07-06 11:13:03 +02:00
James Morris
19ac2765e2 Added in a fake like along with dropdown together 2022-07-06 11:05:13 +02:00
James Morris
eec31572db Added in general styles to the dropdown 2022-07-06 10:47:57 +02:00
Simon Backx
d5c98b1002 Added admin to the shared context 2022-07-06 10:12:24 +02:00
James Morris
8aebf187f9 Little adjustment to dropdown placement and tiny tweaks 2022-07-06 10:10:08 +02:00
James Morris
af56ecf5ef Fixed an avatar component bug with multiple users 2022-07-06 10:02:02 +02:00
James Morris
73e6e053eb Refactored and cleaned up avatar component 2022-07-06 09:50:16 +02:00
Simon Backx
172bbc07c6 Added basic context aware context menus 2022-07-06 09:39:35 +02:00
Simon Backx
5479993c96 Fixed up getInitials helper 2022-07-06 09:28:05 +02:00
Simon Backx
9e445b8307 Added basic context menu button that doesn't work yet 2022-07-06 09:24:33 +02:00
James Morris
63050013ca Removed some unneeded bits 2022-07-06 08:09:59 +01:00
James Morris
7493cda1a6 Working avatars for comments but needs refactor 2022-07-05 16:49:18 +01:00
Peter Zimon
3161196554 Refined button 2022-07-05 17:35:58 +02:00
Simon Backx
f839931548 Added wip context menu 2022-07-05 17:32:51 +02:00
Peter Zimon
6079142f54 Added line-height to textarea 2022-07-05 17:30:00 +02:00
Peter Zimon
a54e1f0d12 Cleanup 2022-07-05 17:26:12 +02:00
Peter Zimon
5b4dbb34fc Added important to reset 2022-07-05 17:00:27 +02:00
James Morris
ce54fb4e36 Tiny tweaks for weeks 2022-07-05 15:44:40 +01:00
James Morris
68b7fe2e6b Small style tweaks for left aligned better 2022-07-05 15:43:30 +01:00
Peter Zimon
cc58f97e1a Copy update 2022-07-05 16:38:06 +02:00
Simon Backx
3522ee6ee1 Added whitespace and newline support 2022-07-05 16:37:32 +02:00
Peter Zimon
81db05a3ac Removed outline from focused textarea 2022-07-05 16:34:12 +02:00
Peter Zimon
45172d875a Hid auth iframe 2022-07-05 16:30:16 +02:00
Peter Zimon
870639db94 Updated dark mode styles 2022-07-05 16:26:51 +02:00
Simon Backx
0390995d76 Fixed pagination after new comments are added 2022-07-05 16:24:30 +02:00
Simon Backx
5841241a42 Fixed adding comments order 2022-07-05 16:10:24 +02:00
Simon Backx
fdeed0eeec Fixed comments order 2022-07-05 16:08:13 +02:00
Peter Zimon
771fd15f27 Applied dark mode to form 2022-07-05 16:05:17 +02:00
Peter Zimon
736d07fbd0 Added some dark styles 2022-07-05 15:56:53 +02:00
Simon Backx
4de5c7a64b Added API connection to add and view comments 2022-07-05 15:53:28 +02:00
Simon Backx
74defe9e0c Ignore admin api errors + added relative time formatting 2022-07-05 15:45:16 +02:00
Peter Zimon
c4c8e1ea62 Added contrast detection 2022-07-05 15:39:07 +02:00
Fabien "egg" O'Carroll
ea531e8c19 Added initial support for the Admin API 
refs https://github.com/TryGhost/Team/issues/1664

This allows us to have access to the currently logged in admin user as well as
future access to show and hide comments via the Admin API.
 2022-07-05 15:33:55 +02:00
James Morris
19493073f6 Tiny little tweaky things 2022-07-05 14:32:45 +01:00
Simon Backx
a40f8f114b Connected comments to real API endpoints 2022-07-05 15:30:09 +02:00
James Morris
de06441c5d Removed the public main again 2022-07-05 14:27:01 +01:00
James Morris
103c812758 Added more styles to get something a little nicer going 2022-07-05 14:22:02 +01:00
James Morris
6b2b22f9f3 Fixed up merged styles and added in a few more for fun 2022-07-05 14:21:02 +01:00
James Morris
f0f544d03d Merged with new styles 2022-07-05 14:18:14 +01:00
Peter Zimon
ebca33f561 Deleted main.css 2022-07-05 15:10:07 +02:00
Peter Zimon
dd5b870239 Added main.css to gitignore 2022-07-05 14:30:27 +02:00
Simon Backx
65ac303308 Added basic pagination and API mocking 2022-07-05 14:27:06 +02:00
Peter Zimon
c6fb93d280 Updated Tailwind config 2022-07-05 14:19:05 +02:00
James Morris
aaff736673 Basic components added with basic styling 2022-07-05 11:46:55 +01:00
Simon Backx
5ad294d630 Fixed wrong data attribute used for site url 2022-07-05 12:13:20 +02:00
Simon Backx
6933994738 Fixed comments not working for members without a name 2022-07-05 11:58:01 +02:00
Rishabh
1164bacd24 Added tailwind watch for dev mode 
- adds auto compile for tailwind in dev mode
 2022-07-05 11:53:27 +02:00
Simon Backx
d0acbad698 Renamed customIFrame component to ShadowRoot 2022-07-05 11:49:36 +02:00
Simon Backx
7e9b2d544c Replaced iframe with shadow DOM 
no issue

- Instead of an iframe tag, we use the shadow DOM to separate CSS.
- The CSS is fully isolated, except for inherited properties. To fix that, we needed to add `:host { all: initial; }` to the CSS.
 2022-07-05 11:46:14 +02:00
Peter Zimon
1504e84c7e Fixed commentbox not injected 2022-07-05 11:34:51 +02:00
Peter Zimon
eb10f02e5f Fixed local dev env crashing 2022-07-05 11:22:48 +02:00
Peter Zimon
ea54c073c3 Updated default Tailwind styles 2022-07-05 10:54:27 +02:00
Peter Zimon
93e7376403 Updated iframe size 2022-07-05 10:43:10 +02:00
Simon Backx
e76a62b34a Removed temporary inline styles 2022-07-05 10:40:26 +02:00
Simon Backx
710c265601 Added basic member authentication 
refs https://github.com/TryGhost/Team/issues/1664

- Added basic API handling
- Added member authentication
- Basic avatar with form
- Setup sentry
 2022-07-05 10:38:39 +02:00
Peter Zimon
0eeff657de Updated frame styles 2022-07-05 10:34:22 +02:00
Peter Zimon
32c396d75b Added Tailwind CSS 2022-07-05 10:15:12 +02:00
Simon Backx
6f0defc6a1 Added AppContext and basic Form component 2022-07-04 17:23:01 +02:00
Simon Backx
fccc18f51c Updated comment box location 2022-07-04 16:12:43 +02:00
Rishabh
aeb644cf84 Fixed lint 2022-07-04 16:00:02 +02:00
Rishabh
c71db17200 Fixed tests 2022-07-04 15:59:11 +02:00
Simon Backx
a47dc6b7c2 Replaced portal wording 2022-07-04 15:33:51 +02:00