Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Design refinements + fixes

Browse source 
- replaced invite only default icon
- removed unused function include
- reseted fixtures
This commit is contained in:
Peter Zimon 2021-05-18 16:54:39 +02:00
parent afb3e9ad64
commit 97fdd037ca
3 changed files with 70 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ghost/portal/src/components/pages/SignupPage.js
View file

@ -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 {

2
ghost/portal/src/images/icons/invitation.svg
View file

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.a{fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px;}</style></defs><title>invitation</title><path class="a" d="M12,13.5H3.75A1.5,1.5,0,0,1,2.25,12V2.25A1.5,1.5,0,0,1,3.75.75h16.5a1.5,1.5,0,0,1,1.5,1.5V12a1.5,1.5,0,0,1-1.5,1.5h-4.5"/><line class="a" x1="12.9" y1="3.75" x2="18.75" y2="3.75"/><path class="a" d="M15.75,13.5V9.375a1.875,1.875,0,0,0-3.75,0v5.1l-.488,1.949a5.593,5.593,0,0,0,0,2.925A14.112,14.112,0,0,0,12.75,21.3v1.95H19.5c0-4.414-.189-3.769.557-6.8"/><path class="a" d="M11.633,15.941a4.34,4.34,0,0,1-1.516,1.946c-.59.309-1.867.115-1.867-.975V13.5"/><circle class="a" cx="7.5" cy="6.375" r="2.25"/></svg>
<svg version="1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.inviteicon{fill: currentColor;}</style></defs><path class="inviteicon" d="M23.991 11.464l-.036-.146-.028-.068-.011-.027-.115-.114-.018-.021-.008-.005h-.001l-3.774-2.596v-7.987c0-.276-.224-.5-.5-.5h-15c-.276 0-.5.224-.5.5v7.987l-3.774 2.595-.003.002-.006.004-.015.016-.118.118-.011.027-.028.068-.036.146-.009.037v10.5c0 1.103.897 2 2 2h20c1.103 0 2-.897 2-2v-10.5l-.009-.036zm-1.383.03l-2.608 1.738v-3.531l2.608 1.793zm-18.608 1.738l-2.608-1.739 2.608-1.792v3.531zm18 9.768h-20c-.551 0-1-.449-1-1v-9.566l5.223 3.482c.085.057.181.084.276.084.162 0 .32-.078.417-.223.153-.23.091-.54-.139-.693l-1.777-1.185v-12.899h14v12.899l-1.777 1.185c-.23.153-.292.463-.139.693.096.145.255.223.416.223.095 0 .191-.027.277-.084l5.223-3.482v9.566c0 .551-.449 1-1 1zM15.812 16.109c-.088-.07-.198-.109-.312-.109h-7c-.114 0-.224.039-.312.109l-5 4c-.215.173-.25.487-.078.703.173.215.487.251.703.078l4.862-3.89h6.649l4.863 3.891c.093.073.203.109.313.109.147 0 .292-.065.391-.188.172-.216.137-.53-.078-.703l-5.001-4zM11.706 12.779c.087.064.191.096.294.096s.207-.032.294-.096c.482-.35 4.706-3.497 4.706-6.101 0-1.868-1.387-2.984-2.728-2.984-.772 0-1.674.379-2.272 1.368-.598-.988-1.5-1.368-2.272-1.368-1.341-.001-2.728 1.116-2.728 2.984 0 2.604 4.224 5.751 4.706 6.101zm-1.978-8.086c.844 0 1.511.681 1.786 1.822.108.45.864.45.973 0 .274-1.141.942-1.822 1.786-1.822.85 0 1.728.742 1.728 1.984 0 1.646-2.658 4.037-4 5.072-1.342-1.035-4-3.426-4-5.072-.001-1.241.877-1.984 1.727-1.984z"/></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 1.5 KiB

134
ghost/portal/src/utils/fixtures.js
View file

@ -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',