From 97fdd037ca005ea406cb0e52ed6e6cfd51f3f20c Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Tue, 18 May 2021 16:54:39 +0200 Subject: [PATCH] Design refinements + fixes - replaced invite only default icon - removed unused function include - reseted fixtures --- .../portal/src/components/pages/SignupPage.js | 9 +- ghost/portal/src/images/icons/invitation.svg | 2 +- ghost/portal/src/utils/fixtures.js | 134 +++++++++--------- 3 files changed, 70 insertions(+), 75 deletions(-) diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js index 2f7e31af39..0875d7b649 100644 --- a/ghost/portal/src/components/pages/SignupPage.js +++ b/ghost/portal/src/components/pages/SignupPage.js @@ -4,7 +4,7 @@ import AppContext from '../../AppContext'; import PlansSection from '../common/PlansSection'; import InputForm from '../common/InputForm'; import {ValidateInputForm} from '../../utils/form'; -import {getProductDetails, getSitePrices, hasOnlyFreePlan, isInviteOnlySite} from '../../utils/helpers'; +import {getSitePrices, hasOnlyFreePlan, isInviteOnlySite} from '../../utils/helpers'; import {ReactComponent as InvitationIcon} from '../../images/icons/invitation.svg'; const React = require('react'); @@ -147,14 +147,9 @@ export const SignupPageStyles = ` .gh-portal-icon-invitation { width: 44px; + height: 44px; margin: 12px 0 2px; } - - .gh-portal-icon-invitation path, - .gh-portal-icon-invitation circle, - .gh-portal-icon-invitation line { - stroke-width: 1.2px; - } `; class SignupPage extends React.Component { diff --git a/ghost/portal/src/images/icons/invitation.svg b/ghost/portal/src/images/icons/invitation.svg index 8ead5912a9..9fb443d312 100644 --- a/ghost/portal/src/images/icons/invitation.svg +++ b/ghost/portal/src/images/icons/invitation.svg @@ -1 +1 @@ -invitation \ No newline at end of file + \ No newline at end of file diff --git a/ghost/portal/src/utils/fixtures.js b/ghost/portal/src/utils/fixtures.js index ca4930faa1..f79fc64667 100644 --- a/ghost/portal/src/utils/fixtures.js +++ b/ghost/portal/src/utils/fixtures.js @@ -20,73 +20,73 @@ const prices = [ amount: 1500, type: 'recurring', interval: 'month' + }, + { + id: '6086eb2a823dd7240afc8081', + stripe_price_id: 'price_1IkXMUFToJelIqAstq0R3Ero', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Test Price USD', + currency: 'usd', + amount: 1100, + type: 'recurring', + interval: 'month' + }, + { + id: '6086eb3e823dd7240afc8082', + stripe_price_id: 'price_1IkXMoFToJelIqAsTHKl5ELV', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Test Price Comp', + currency: 'usd', + amount: 0, + type: 'recurring', + interval: 'month' + }, + { + id: '6086eff0823dd7240afc8083', + stripe_price_id: 'price_1IkXgCFToJelIqAsTP3V1paQ', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Yearly', + currency: 'aud', + amount: 12200, + type: 'recurring', + interval: 'year' + }, + { + id: '6086f4c9823dd7240afc8084', + stripe_price_id: 'price_1IkY0CFToJelIqAs5h7qlgP5', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Test Price B', + currency: 'gbp', + amount: 12000, + type: 'recurring', + interval: 'year' + }, + { + id: '6087c314d3e64b3266bf715e', + stripe_price_id: 'price_1IkljzFToJelIqAsPNGA2Lov', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Test Price A', + currency: 'cad', + amount: 12200, + type: 'recurring', + interval: 'month' + }, + { + id: '6087c36ed3e64b3266bf715f', + stripe_price_id: 'price_1IkllSFToJelIqAsvElnxOwF', + stripe_product_id: 'prod_JNGGBrrogUXcoM', + active: 1, + nickname: 'Test Price X', + currency: 'gbp', + amount: 12300, + type: 'recurring', + interval: 'month' } - // { - // id: '6086eb2a823dd7240afc8081', - // stripe_price_id: 'price_1IkXMUFToJelIqAstq0R3Ero', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Test Price USD', - // currency: 'usd', - // amount: 1100, - // type: 'recurring', - // interval: 'month' - // }, - // { - // id: '6086eb3e823dd7240afc8082', - // stripe_price_id: 'price_1IkXMoFToJelIqAsTHKl5ELV', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Test Price Comp', - // currency: 'usd', - // amount: 0, - // type: 'recurring', - // interval: 'month' - // }, - // { - // id: '6086eff0823dd7240afc8083', - // stripe_price_id: 'price_1IkXgCFToJelIqAsTP3V1paQ', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Yearly', - // currency: 'aud', - // amount: 12200, - // type: 'recurring', - // interval: 'year' - // }, - // { - // id: '6086f4c9823dd7240afc8084', - // stripe_price_id: 'price_1IkY0CFToJelIqAs5h7qlgP5', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Test Price B', - // currency: 'gbp', - // amount: 12000, - // type: 'recurring', - // interval: 'year' - // }, - // { - // id: '6087c314d3e64b3266bf715e', - // stripe_price_id: 'price_1IkljzFToJelIqAsPNGA2Lov', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Test Price A', - // currency: 'cad', - // amount: 12200, - // type: 'recurring', - // interval: 'month' - // }, - // { - // id: '6087c36ed3e64b3266bf715f', - // stripe_price_id: 'price_1IkllSFToJelIqAsvElnxOwF', - // stripe_product_id: 'prod_JNGGBrrogUXcoM', - // active: 1, - // nickname: 'Test Price X', - // currency: 'gbp', - // amount: 12300, - // type: 'recurring', - // interval: 'month' - // } ]; const priceIds = prices.map(d => d.id); @@ -108,7 +108,7 @@ export const site = { description: 'The default product' }, prices: prices, - allow_self_signup: true, + allow_self_signup: false, members_signup_access: 'all', free_price_name: 'Free', free_price_description: 'Free preview',