diff options
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/AuthLayout.js | 6 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 26 | ||||
-rw-r--r-- | src/components/auth/Login.js | 6 | ||||
-rw-r--r-- | src/components/auth/Pricing.js | 23 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 3 |
5 files changed, 36 insertions, 28 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 4e1b0c52e..ac8fdbe5b 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -15,7 +15,6 @@ import { isWindows } from '../../environment'; | |||
15 | export default @observer class AuthLayout extends Component { | 15 | export default @observer class AuthLayout extends Component { |
16 | static propTypes = { | 16 | static propTypes = { |
17 | children: oneOrManyChildElements.isRequired, | 17 | children: oneOrManyChildElements.isRequired, |
18 | pathname: PropTypes.string.isRequired, | ||
19 | error: globalErrorPropType.isRequired, | 18 | error: globalErrorPropType.isRequired, |
20 | isOnline: PropTypes.bool.isRequired, | 19 | isOnline: PropTypes.bool.isRequired, |
21 | isAPIHealthy: PropTypes.bool.isRequired, | 20 | isAPIHealthy: PropTypes.bool.isRequired, |
@@ -32,7 +31,6 @@ export default @observer class AuthLayout extends Component { | |||
32 | render() { | 31 | render() { |
33 | const { | 32 | const { |
34 | children, | 33 | children, |
35 | pathname, | ||
36 | error, | 34 | error, |
37 | isOnline, | 35 | isOnline, |
38 | isAPIHealthy, | 36 | isAPIHealthy, |
@@ -45,8 +43,8 @@ export default @observer class AuthLayout extends Component { | |||
45 | 43 | ||
46 | return ( | 44 | return ( |
47 | <div className={darkMode ? 'theme__dark' : ''}> | 45 | <div className={darkMode ? 'theme__dark' : ''}> |
48 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} | 46 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />} |
49 | <div className={'auth'}> | 47 | <div className="auth"> |
50 | {!isOnline && ( | 48 | {!isOnline && ( |
51 | <InfoBar | 49 | <InfoBar |
52 | type="warning" | 50 | type="warning" |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index 5da89f2ce..fd957ee73 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -141,11 +141,13 @@ export default @observer class Invite extends Component { | |||
141 | )} | 141 | )} |
142 | 142 | ||
143 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 143 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
144 | {!embed && (<img | 144 | {!embed && ( |
145 | src="./assets/images/logo.svg" | 145 | <img |
146 | className="auth__logo" | 146 | src="./assets/images/logo.svg" |
147 | alt="" | 147 | className="auth__logo" |
148 | />)} | 148 | alt="" |
149 | /> | ||
150 | )} | ||
149 | <h1 className={embed && 'invite__embed'}> | 151 | <h1 className={embed && 'invite__embed'}> |
150 | {intl.formatMessage(messages.headline)} | 152 | {intl.formatMessage(messages.headline)} |
151 | </h1> | 153 | </h1> |
@@ -164,12 +166,14 @@ export default @observer class Invite extends Component { | |||
164 | label={intl.formatMessage(messages.submitButtonLabel)} | 166 | label={intl.formatMessage(messages.submitButtonLabel)} |
165 | loaded={!isLoadingInvite} | 167 | loaded={!isLoadingInvite} |
166 | /> | 168 | /> |
167 | {!embed && (<Link | 169 | {!embed && ( |
168 | to="/" | 170 | <Link |
169 | className="franz-form__button franz-form__button--secondary auth__button auth__button--skip" | 171 | to="/" |
170 | > | 172 | className="franz-form__button franz-form__button--secondary auth__button auth__button--skip" |
171 | {intl.formatMessage(messages.skipButtonLabel)} | 173 | > |
172 | </Link>)} | 174 | {intl.formatMessage(messages.skipButtonLabel)} |
175 | </Link> | ||
176 | )} | ||
173 | </form> | 177 | </form> |
174 | </Fragment> | 178 | </Fragment> |
175 | ); | 179 | ); |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 2cf614041..5d21f8b60 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -83,18 +83,18 @@ export default @observer class Login extends Component { | |||
83 | }, | 83 | }, |
84 | }, this.context.intl); | 84 | }, this.context.intl); |
85 | 85 | ||
86 | emailField = null; | ||
87 | |||
86 | submit(e) { | 88 | submit(e) { |
87 | e.preventDefault(); | 89 | e.preventDefault(); |
88 | this.form.submit({ | 90 | this.form.submit({ |
89 | onSuccess: (form) => { | 91 | onSuccess: (form) => { |
90 | this.props.onSubmit(form.values()); | 92 | this.props.onSubmit(form.values()); |
91 | }, | 93 | }, |
92 | onError: () => {}, | 94 | onError: () => { }, |
93 | }); | 95 | }); |
94 | } | 96 | } |
95 | 97 | ||
96 | emailField = null; | ||
97 | |||
98 | render() { | 98 | render() { |
99 | const { form } = this; | 99 | const { form } = this; |
100 | const { intl } = this.context; | 100 | const { intl } = this.context; |
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js index f08129568..7ab14f429 100644 --- a/src/components/auth/Pricing.js +++ b/src/components/auth/Pricing.js | |||
@@ -69,18 +69,29 @@ export default @observer class Signup extends Component { | |||
69 | donor.amount ? ( | 69 | donor.amount ? ( |
70 | <span> | 70 | <span> |
71 | <p> | 71 | <p> |
72 | Thank you so much for your previous donation of <strong>$ {donor.amount}</strong>. | 72 | Thank you so much for your previous donation of |
73 | {' '} | ||
74 | <strong> | ||
75 | $ | ||
76 | {donor.amount} | ||
77 | </strong> | ||
78 | . | ||
73 | <br /> | 79 | <br /> |
74 | Your support allowed us to get where we are today. | 80 | Your support allowed us to get where we are today. |
75 | <br /> | 81 | <br /> |
76 | </p> | 82 | </p> |
77 | <p> | 83 | <p> |
78 | As an early supporter, you get <strong>a lifetime premium supporter license</strong> without any | 84 | As an early supporter, you get |
85 | {' '} | ||
86 | <strong>a lifetime premium supporter license</strong> | ||
87 | {' '} | ||
88 | without any | ||
79 | additional charges. | 89 | additional charges. |
80 | </p> | 90 | </p> |
81 | <p> | 91 | <p> |
82 | However, If you want to keep supporting us, you are more than welcome to subscribe to a plan. | 92 | However, If you want to keep supporting us, you are more than welcome to subscribe to a plan. |
83 | <br /><br /> | 93 | <br /> |
94 | <br /> | ||
84 | </p> | 95 | </p> |
85 | </span> | 96 | </span> |
86 | ) : ( | 97 | ) : ( |
@@ -113,12 +124,6 @@ export default @observer class Signup extends Component { | |||
113 | hideInfo={Boolean(donor.amount)} | 124 | hideInfo={Boolean(donor.amount)} |
114 | skipButtonLabel={intl.formatMessage(messages.skipPayment)} | 125 | skipButtonLabel={intl.formatMessage(messages.skipPayment)} |
115 | /> | 126 | /> |
116 | {/* <Link | ||
117 | to={inviteRoute} | ||
118 | className="franz-form__button franz-form__button--secondary auth__button auth__button--skip" | ||
119 | > | ||
120 | {intl.formatMessage(messages.skipPayment)} | ||
121 | </Link> */} | ||
122 | </Appear> | 127 | </Appear> |
123 | </Loader> | 128 | </Loader> |
124 | </form> | 129 | </form> |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index bbcad8b67..d9b83eeb8 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -199,7 +199,8 @@ export default @observer class Signup extends Component { | |||
199 | className="link" | 199 | className="link" |
200 | > | 200 | > |
201 | {intl.formatMessage(messages.privacy)} | 201 | {intl.formatMessage(messages.privacy)} |
202 | </Link>. | 202 | </Link> |
203 | . | ||
203 | </p> | 204 | </p> |
204 | </form> | 205 | </form> |
205 | <div className="auth__links"> | 206 | <div className="auth__links"> |