Commit Graph

855 Commits

Author SHA1 Message Date
Peter Zimon
75d0b40be8 Added benefit fixtures (alpha) 2021-06-21 15:32:55 +02:00
Rishabh
40e86e0a77 Added default product selection handling
refs https://github.com/TryGhost/Team/issues/767

- updates product selection if first available product's id changes between renders
2021-06-21 18:47:40 +05:30
Rishabh
b7d644cc66 Updated available site prices based on products
refs https://github.com/TryGhost/Team/issues/768

- updates available prices data based on available products
- updates available products to check portal products (which is behind a flag)
2021-06-21 18:47:40 +05:30
Peter Zimon
134d6a756a Refined spacing for desktop product card 2021-06-21 14:39:21 +02:00
Rishabh Garg
a8f6ea6aa9 Added portal products handling (#151)
refs https://github.com/TryGhost/Team/issues/768

- handles new `portal_products` to filter products shown on Portal UI (behind the flag for multiple products)
2021-06-21 14:37:53 +05:30
Rishabh
fda3726b93 Fixed lint
no refs
2021-06-20 13:32:46 +05:30
Joakimk
b80ab90d61 Updated dateString method to use cleaner toLocaleDateString (#144)
no refs

- Updates `getDateString` method to use `toLocaleDateString` which is cleaner and shorter with same result
2021-06-20 13:30:46 +05:30
Renovate Bot
df54d8cf34 Update dependency @testing-library/user-event to v13 2021-06-18 14:47:28 +00:00
Renovate Bot
9963696ef9 Update Test & linting packages 2021-06-18 13:36:11 +00:00
Rishabh
aa5b29ae5a v1.6.2 2021-06-17 17:35:33 +05:30
Rishabh
097dfe4452 Handled available Products based on prices
refs https://github.com/TryGhost/Team/issues/767

- takes into account available prices to decide if multiple products screen needs to be shown
2021-06-17 17:18:34 +05:30
Rishabh
d91cd4240e Handled active interval for Products section
refs https://github.com/TryGhost/Team/issues/767

- handles active interval for product section based on available prices as well as switch
2021-06-17 17:17:39 +05:30
Rishabh
3a8e31f065 Handled portal plans selection in products list
refs https://github.com/TryGhost/Team/issues/767

- Portal products UI updates to the available prices from monthly/yearly in list
2021-06-17 14:08:44 +05:30
Rishabh
762c1c53a3 Removed jsdom fourteen dependency on test
refs aa228a8df2

Removes jsdom fourteen dependency for running tests as the latest version of packages doesn't need the fallback
2021-06-16 20:58:44 +05:30
Rishabh
885fe178dd Updated local start mode script
no issues

- adds new start-combined script which combines all chunks in `yarn start` for local portal development
- allows easier loading of local portal bundle in ghost via load-portal script, which needs to inject single script
- updates `yarn start:dev` to use updated script which uses the combined mode for better local development

refs
https://gist.github.com/simpixelated/90a3c16c3ed268fe24f5e5c9585ced2f
2021-06-16 20:58:44 +05:30
Rishabh
6e2952901a Updated Portal build script to use rewired webpack config
no issues

- updates Portal build script to use rewired react-scripts config
- updated config handles css embed as well as output location/name for portal bundle as part of cra build
- makes extra webpack bundling redundant for now
- updates dev mode to map the portal source map useful for testing build version locally
- updates custom webpack config with copy plugin for future use

refs -
https://github.com/facebook/create-react-app/issues/5306#issuecomment-603772477
https://gist.github.com/phdesign/3fd306db2bc53f6368e6f0f73bbeff19
2021-06-16 20:58:44 +05:30
Rishabh
7c5cb61ee5 Updated Ghost config URL for dev mode script
no refs

- updates portal url for Ghost config to use a dynamic URL to work same as start mode script
2021-06-16 20:58:44 +05:30
Rishabh
596cef4df7 Removed unused prop-types dependency
no refs
2021-06-16 20:58:44 +05:30
Rishabh
90c076fc39 🏗 Bumped major versions for React and CRA
no refs

- bumps React version to 17 - https://github.com/facebook/react/blob/master/CHANGELOG.md#1700-october-20-2020
- bumps CRA to v4  - https://github.com/facebook/create-react-app/blob/master/CHANGELOG.md#403-2021-02-22
2021-06-16 20:58:44 +05:30
Rishabh
9061d40c6e Fixed plan name to monthly/yearly by interval
no refs

- Reverts using hardcoded monthly/yearly plan name on Portal UI instead of using the price nickname
2021-06-16 16:07:39 +05:30
Peter Zimon
9acb194214 Fixed signup grid for mobile 2021-06-15 13:44:05 +02:00
Rishabh
37295e32e9 Updated dynamic styling of product grid
refs https://github.com/TryGhost/Team/issues/767

- adds dynamic calculation of frame styles based on site data
- handles product grid style based on no of products available
2021-06-14 20:31:25 +05:30
Rishabh
47c3367396 Updated free product handling in list
refs https://github.com/TryGhost/Team/issues/767

- free product is shown based on other site settings like `allowSelfSignup` and `portalPlans`
- fixed product/price selection to handle selected interval
- updated default product/price handling
2021-06-14 20:13:15 +05:30
Peter Zimon
5e13f964bc Signup product grid update 2021-06-14 13:33:15 +02:00
Rishabh
c98ab9981a Handled price selection for multiple products
refs https://github.com/TryGhost/Team/issues/767

- updated list of site prices to use all prices from products
- handled price selection in product section
2021-06-14 13:55:11 +05:30
Rishabh
d7c645f71a Removed deprecated NODE_PATH usage in tests
no refs

Using NODE_PATH is deprecated in future versions of Create React App in favor of using jsconfig.json , this change removes files relying on NODE_PATH and uses relative path instead till we update usage to jsconfig in future as needed.
2021-06-14 11:55:09 +05:30
Rishabh
00f9481f11 v1.6.1 2021-06-11 20:15:30 +05:30
Peter Zimon
298ada96a2 Minor mobile refinements 2021-06-11 16:29:57 +02:00
Rishabh
a4afeba183 Updated dev mode script to serve on static URL
no refs

- adds static serve path for portal dev mode script same as start mode
2021-06-11 19:55:43 +05:30
Peter Zimon
06817969bb Mobile footer refinements 2021-06-11 16:10:41 +02:00
Peter Zimon
45147cacb2 Multiple products responsive UI 2021-06-11 16:03:35 +02:00
Peter Zimon
f94435dab5 Multiple products desktop UI
Lots of refinement for the desktop multiple products Portal signup and signin page. Alpha version.
2021-06-11 14:56:44 +02:00
Rishabh
bf62b981bd v1.6.0 2021-06-11 14:06:54 +05:30
Rishabh
fc0ef9d164 Fixed lint errors
no refs
2021-06-11 14:06:16 +05:30
Rishabh
950495c836 Updated product selection to work on full card
refs https://github.com/TryGhost/Team/issues/767

- handles product selection on full product card instead of just small surface area on checkbox
- removes dummy product card method
2021-06-11 14:03:20 +05:30
Rishabh
55298cd999 Sorted products by monthly price amount
refs https://github.com/TryGhost/Team/issues/767

- sorts list of products from site by their monthly price amount
2021-06-11 12:55:50 +05:30
Rishabh
1b1133cd47 Updated default product fixtures
refs https://github.com/TryGhost/Team/issues/767

- cleans up default set of products available in fixtures for easy testing
2021-06-11 12:55:24 +05:30
Rishabh
42c8a481c5 Removed dummy products component
no refs

- comments out the dummy products component till needed again for UI development
2021-06-11 12:46:57 +05:30
Rishabh
33adaedc97 Cleaned fixtures data
no refs

- cleans up the products/prices passed to fixtures
2021-06-11 12:45:06 +05:30
Rishabh
8d7988a334 Wired UI for multiple products with site data
refs https://github.com/TryGhost/Team/issues/767

- wires real products data from site/fixtures to multiple products UI
- adds new helpers to manage price display/UI
- cleans up switch default params to clear type errors
2021-06-11 12:41:36 +05:30
Rishabh
7a65caa806 Updated fixtures for products
refs https://github.com/TryGhost/Team/issues/718

- updates `products` fixture to match API and include monthly/yearly price
2021-06-11 12:39:00 +05:30
Rishabh
5ebfbb79a7 Fixed multiple products check helper method
no refs

- fixes incorrect condition in helper that determines if Portal has multiple products or single from site
2021-06-11 12:38:02 +05:30
Rishabh
8d51bc20f0 Fixed tests
no refs
2021-06-11 12:33:45 +05:30
Peter Zimon
5516e348af Alpha version of multiple products
- added Products grid component to signup page with static data
- separate signup design between single vs. multiple products
- alpha!
2021-06-10 17:26:10 +02:00
Rishabh
859043e22e Updated dev mode check with custom site url
no refs

- takes advantage of new dev script by loading Portal in dev mode on ghost site with full features
- restricts some dev mode features only if no custom site url is passed, which is expected with fixture development
2021-06-10 15:26:32 +05:30
Rishabh
f0ba337659 Cleaned dev mode script
no refs

Cleans up dev mode script for lint errors
2021-06-10 15:05:33 +05:30
Rishabh
47c6509bea Added experimental start mode script for local development
no refs

Adds a new `yarn start:dev` command to start portal in development mode that allows development script to be used directly on Ghost site without needing a build for each change. Allows faster development on Portal locally.
2021-06-10 15:05:08 +05:30
Rishabh
a73a04034b Added logic for introducing multiple products
refs https://github.com/TryGhost/Team/issues/767

- Adds new helper to switch UI for multiple products
- Cleans up fixtures
2021-06-09 20:51:18 +05:30
Rishabh
f59711ab1b v1.5.3 2021-06-09 09:22:44 +05:30
Rishabh
c1df8366fb Filtered empty prices from list
no refs

Handles empty price objects in the API and ignores them from UI
2021-06-09 09:21:52 +05:30
Rishabh
928122a8f7 v1.5.2 2021-06-08 18:11:19 +05:30
Peter Zimon
d4c648d79c Fixed signup page pricing responsive layout bug 2021-06-08 14:39:22 +02:00
Rishabh
c45b1abede Added source map explorer for analyzing builds
no refs

`yarn analyze` now launches source map explorer which analyzes the local bundle, helping in keeping Portal size as small as possible.
2021-06-07 15:32:55 +05:30
Rishabh
0b2af14567 Added dev script for Portal development
no refs

The new dev script allows running `yarn dev` on the Portal code to make Portal development easier as well as integrate more easily with Ghost config. The script runs a local development server that serves portal bundle, which allows for static `portal` config to be used in Ghost for pointing to Portal script. It also watches the files for any changes, and auto re-builds and bundles latest Portal code.
2021-06-07 14:22:31 +05:30
Renovate Bot
3240f2670d Update dependency @testing-library/jest-dom to v5.13.0 2021-06-07 01:53:00 +00:00
Rishabh
cf710eb9c2 v1.5.1 2021-06-04 18:30:45 +05:30
Rishabh
d383723f21 Updated available prices for Portal to use multiple products
refs https://github.com/TryGhost/Team/issues/718

Instead of using default prices, Portal goes through active prices of all available products to use for query in data attributes
2021-06-04 18:23:26 +05:30
Rishabh
f3fd043580 Fixed non-default product prices not working
refs https://github.com/TryGhost/Team/issues/718

We passthrough any unknown price ids directly to checkout session as it currently Portal cannot verify prices across all products
2021-06-04 18:09:58 +05:30
Rishabh
82f7d69d8d v1.5.0 2021-06-04 17:09:54 +05:30
Rishabh
ee136bc918 Fixed lint 2021-06-04 14:12:56 +05:30
Rishabh
0f4be436be Handled named plan values in portal_plans setting
refs https://github.com/TryGhost/Team/issues/753

We reverted back to using named plan values - `monthly`, `yearly` - in `portal_plans` setting to allow us to easily handle active prices for a product. This change handles the updated values in `portal_plans` to use new values.
2021-06-04 13:29:22 +05:30
Rishabh
f790cb47ef v1.4.7 2021-06-01 14:37:31 +05:30
Kevin
701ca69053 🐛 Fixed toggle newsletter subscription (#146)
closes https://github.com/TryGhost/Ghost/issues/12996
2021-06-01 14:27:41 +05:30
Renovate Bot
97dd3a0470 Update dependency @testing-library/react to v11.2.7 2021-05-27 13:55:49 +00:00
Rishabh
28de418d9e v1.4.6 2021-05-27 17:53:42 +05:30
Rishabh
07f1d6d3a5 Fixed tests
no refs
2021-05-27 17:52:32 +05:30
Rishabh
6f88adf4b4 Renamed master to main for test workflow and readme
no refs

The master -> main rename was missed for test workflows as well as Readme badge, which caused the error reporting to incorrectly report passing tests on `master` while they were failing on `main`
2021-05-27 17:52:32 +05:30
Rishabh
0bac70c326 💡 Added resize listener for portal container height change
no refs

We need the Portal preview container on Admin to re-adjust based on height of Portal container. This change adds a resizeObserver for portal container and fires a postMessage with height for Admin to listen and update the iframe height based on height of portal container

Updated resize observer to fire on update

Cleanup
2021-05-27 17:52:32 +05:30
Rishabh
817d6650b2 v1.4.5 2021-05-27 13:40:07 +05:30
Rishabh
0f31838b35 Updated target origin to all for portal ready event
no refs

The purpose of broadcasting portal-ready event is it allows Preview in Admin to have better UX with showing Portal when its ready than show the site while its loading. Having a strict target origin like site url won't work when sites have custom domains as it browser security will block the event due to origin mismatch.

Since `portal-ready` is just an event message and doesn't contain any sensitive data that needs to be restricted to origin, this bumps it to `*` which allows any site listening to be able to read the message.
2021-05-27 13:39:23 +05:30
Rishabh
e4cd0034ad v1.4.4 2021-05-24 19:23:02 +05:30
Rishabh
08d740133f Updated site and member data to load in parallel
This reverts commit 841793e4d3.
2021-05-24 19:22:07 +05:30
Rishabh
674f6f8e1e Added firing of portal-ready post message for preview""
This reverts commit 5650b8d716.
2021-05-24 19:20:32 +05:30
Rishabh
9129fa7cf9 v1.4.3 2021-05-24 19:14:23 +05:30
Rishabh
841793e4d3 Revert "Updated site and member data to load in parallel"
This reverts commit 8ac6364d3a.
2021-05-24 19:13:55 +05:30
Rishabh
5650b8d716 Revert " Added firing of portal-ready post message for preview"
This reverts commit 347805d4d0.
2021-05-24 19:13:37 +05:30
Rishabh
edba56fbfb v1.4.2 2021-05-24 18:32:42 +05:30
Rishabh
347805d4d0 Added firing of portal-ready post message for preview
no refs

This adds a way for top level site/admin to detect when Portal is loaded on the site and is ready to render, which allows dynamic UI handling specially in Preview mode in Admin.
2021-05-24 18:12:08 +05:30
Rishabh
8ac6364d3a Updated site and member data to load in parallel
no refs

Previously, the site and member data needed by Portal were loaded sequentially, which delayed the first load slightly as both the requests can be instead made in parallel. This change updates the API init to load both requests in parallel.
2021-05-24 18:10:48 +05:30
Rishabh
9472a29568 v1.4.1 2021-05-19 00:27:11 +05:30
Peter Zimon
97fdd037ca Design refinements + fixes
- replaced invite only default icon
- removed unused function include
- reseted fixtures
2021-05-18 16:54:39 +02:00
Peter Zimon
afb3e9ad64 UI refinements
- removed cadence indicator from prices
- refined spacings for prices
2021-05-18 16:43:30 +02:00
Peter Zimon
ef10fce723 Setting site title as default title 2021-05-18 16:36:48 +02:00
Rishabh
d4fe243d43 Added signup access setting to preview
no refs

Allows Portal preview to use `members_signup_access` setting from the URL instead of relying on saved setting to change the preview without saving on Admin.
2021-05-18 17:43:18 +05:30
Rishabh
8044dc836a v1.4.0 2021-05-18 14:57:42 +05:30
Rishabh
370f721deb 🐛 Fixed falsy value not used in preview
no refs

For some boolean preview keys like `allowSelfSignup` and `disableBackground`, we ignored setting the falsy value which is incorrect and doesnt' load the expected Portal preview
2021-05-18 14:55:37 +05:30
Rishabh
fd6fee4c9d 🐛 Fixed extra email sent for logged in members on upgrade
refs https://github.com/TryGhost/Team/issues/695
refs 212be5fb02 (Patch)

Currently when we have a successful Stripe checkout session, we will always send the member an email confirming their signup when using data-members-* attributes.

This is considered a bug for members who have signed up as a free member first, meaning they have already received this email. This change passes a `checkoutType` metadata same as Portal to not send the email when member is already logged in.
2021-05-18 09:19:00 +05:30
Rishabh
4e14d811bf 💡 Handled updated API response for logged out member
refs https://github.com/TryGhost/Team/issues/560
refs 196cdafe6b

The endpoint `/members/api/member/` is used by Portal for fetching member details on site load to setup different flows. The response from this endpoint for logged out member has now changed from 401 Unauthorized to 204 No Content. This updates the API handling in Portal for updated response status.

This change also handles the visible error messages on console for Portal when it first loads and tries to establish member logged-in status, and instead handles it now behind the scenes. This also makes Portal functioning more transparent on the site.
2021-05-13 15:32:32 +05:30
Rishabh
9fcad8e31d Updated default currency for free price
no refs

Since custom prices now allow prices with multiple currencies to exist, till we have a default currency for a site, we use the currency for first paid price on the list as default currency for a free price visually on Portal UI
2021-05-13 15:28:52 +05:30
Rishabh
66cbbce917 v1.3.1 2021-05-12 17:13:16 +05:30
Rishabh
52d52c9a9e Updated default page to signin for invite only sites
closes https://github.com/TryGhost/Team/issues/689

For invite only sites, the default page should be signin as it makes more sense and is actionable than a static signup page
2021-05-12 17:11:48 +05:30
Peter Zimon
0bbdccea72 Refined billing period indicator 2021-05-10 21:05:46 +02:00
Rishabh
4d9579e11c Added interval to prices on Plan UI
closes https://github.com/TryGhost/Team/issues/673
2021-05-11 00:07:55 +05:30
Rishabh
39b7c01909 v1.3.0 2021-05-10 23:09:02 +05:30
Rishabh
56756ff9b6 Fixed lint 2021-05-10 23:05:02 +05:30
Peter Zimon
280181720b Fixed modal width logic 2021-05-10 23:05:02 +05:30
Rishabh
9ac53e5b27 Fixed legacy price names link/data-attribute not working
closed https://github.com/TryGhost/Team/issues/683

The legacy price names `monthly` / `yearly` should still redirect to checkout flows as a special exception.
2021-05-10 23:05:02 +05:30
Rishabh
1ca383df5d Updated default free price fixture
refs https://github.com/TryGhost/Team/issues/648

We use sentence case everywhere for labels, the default description for free price should be the same
2021-05-10 23:05:02 +05:30
Rishabh
bc79df66e8 Added sorted prices in Portal plans UI
refs https://github.com/TryGhost/Team/issues/641

Updated prices list to be sorted on `currency` -> `amount` which is consistent with price list on Admin.
2021-05-10 23:05:02 +05:30
Rishabh
e9d8f25773 Updated old members data attribute handling for custom prices
refs https://github.com/TryGhost/Team/issues/643

With custom products and prices, the old data attributes for members functionality - `data-members-plan` - was still using the plan name for checkout session which won't work as it now expects a price ID. This change reworks how we setup to listen to `data-members-*` attributes and moves them inside App.js so they can work with API data fetched from site settings and use the price ID for the `monthly` and `yearly` names as fallback.
2021-05-10 23:05:02 +05:30