diff --git a/ghost/portal/src/App.js b/ghost/portal/src/App.js index 2b9779b52e..56a7bbebb8 100644 --- a/ghost/portal/src/App.js +++ b/ghost/portal/src/App.js @@ -12,8 +12,8 @@ const React = require('react'); const DEV_MODE_DATA = { showPopup: true, site: Fixtures.site, - member: Fixtures.member.free, - page: 'signup' + member: Fixtures.member.paid, + page: 'signin' }; export default class App extends React.Component { constructor(props) { diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js index a3ba17ff79..cbc5905cb3 100644 --- a/ghost/portal/src/components/pages/AccountHomePage.js +++ b/ghost/portal/src/components/pages/AccountHomePage.js @@ -86,9 +86,9 @@ export const AccountHomePageStyles = ` const UserAvatar = ({avatar, brandColor}) => { return ( -
+ <> -
+ ); }; diff --git a/ghost/portal/src/components/pages/AccountPlanPage.js b/ghost/portal/src/components/pages/AccountPlanPage.js index 331d1fde65..8cf7d5485e 100644 --- a/ghost/portal/src/components/pages/AccountPlanPage.js +++ b/ghost/portal/src/components/pages/AccountPlanPage.js @@ -114,7 +114,7 @@ const PlanConfirmationSection = ({action, member, plan, type, brandColor, onConf const planStartMessage = `${plan.currency}${plan.price}/${plan.type} – Starting ${planStartDate}`; if (type === 'changePlan') { return ( -
+ <>
@@ -140,11 +140,11 @@ const PlanConfirmationSection = ({action, member, plan, type, brandColor, onConf height: '40px' }} /> -
+ ); } else { return ( -
+ <>

If you confirm and end your subscription now, you can still access it until {getDateString(subscription.current_period_end)}.

onConfirm(e, plan)} @@ -157,7 +157,7 @@ const PlanConfirmationSection = ({action, member, plan, type, brandColor, onConf height: '40px' }} /> -
+ ); } }; @@ -380,7 +380,7 @@ export default class AccountPlanPage extends React.Component { const plans = this.plans; const {selectedPlan, showConfirmation, confirmationPlan, confirmationType} = this.state; return ( -
+ <>
this.onPlanCheckout(e, name)} />
-
+ ); } } \ No newline at end of file diff --git a/ghost/portal/src/components/pages/AccountProfilePage.js b/ghost/portal/src/components/pages/AccountProfilePage.js index 1809a4bf4b..234a543924 100644 --- a/ghost/portal/src/components/pages/AccountProfilePage.js +++ b/ghost/portal/src/components/pages/AccountProfilePage.js @@ -195,7 +195,7 @@ export default class AccountProfilePage extends React.Component { return null; } return ( -
+ <>
{this.renderHeader()}
@@ -203,7 +203,7 @@ export default class AccountProfilePage extends React.Component {
{this.renderAccountFooter()} -
+ ); } } \ No newline at end of file diff --git a/ghost/portal/src/components/pages/MagicLinkPage.js b/ghost/portal/src/components/pages/MagicLinkPage.js index 4bf8d68995..aedd4d4ec3 100644 --- a/ghost/portal/src/components/pages/MagicLinkPage.js +++ b/ghost/portal/src/components/pages/MagicLinkPage.js @@ -39,14 +39,14 @@ export default class MagicLinkPage extends React.Component { renderLoginMessage() { return ( -
+ <>
this.context.onAction('switchPage', {page: 'signin'})} > Back to Log in
-
+ ); } diff --git a/ghost/portal/src/components/pages/SigninPage.js b/ghost/portal/src/components/pages/SigninPage.js index 1b36467ef1..826ed30f9f 100644 --- a/ghost/portal/src/components/pages/SigninPage.js +++ b/ghost/portal/src/components/pages/SigninPage.js @@ -137,7 +137,7 @@ export default class SigninPage extends React.Component { render() { return ( -
+ <>
{this.renderFormHeader()} {this.renderForm()} @@ -146,7 +146,7 @@ export default class SigninPage extends React.Component { {this.renderSubmitButton()} {this.renderSignupMessage()} -
+ ); } } diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js index 05955276ae..7284d58721 100644 --- a/ghost/portal/src/components/pages/SignupPage.js +++ b/ghost/portal/src/components/pages/SignupPage.js @@ -327,13 +327,13 @@ class SignupPage extends React.Component { const {site} = this.context; const plansData = getSitePlans({site}); return ( -
+ <> this.handleSelectPlan(e, name)} /> -
+ ); } @@ -414,7 +414,7 @@ class SignupPage extends React.Component { } return ( -
+ <>
{this.renderFormHeader()} {this.renderForm()} @@ -423,7 +423,7 @@ class SignupPage extends React.Component { {this.renderSubmitButton()} {this.renderLoginMessage()} -
+ ); } }