diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2022-05-06 19:06:00 -0500 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2022-05-06 19:06:00 -0500 |
commit | 4df01bf76dd0c19d29587571131555639bf2b844 (patch) | |
tree | f19565f06da9d6c796bd3962d6f28a4fcff0da63 /src/components/auth | |
parent | Regenerate i18n file (diff) | |
download | ferdium-app-4df01bf76dd0c19d29587571131555639bf2b844.tar.gz ferdium-app-4df01bf76dd0c19d29587571131555639bf2b844.tar.zst ferdium-app-4df01bf76dd0c19d29587571131555639bf2b844.zip |
Use components defined in the codebase; Extract some text for i18n purposes.
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/ChangeServer.js | 3 | ||||
-rw-r--r-- | src/components/auth/Import.js | 3 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 7 | ||||
-rw-r--r-- | src/components/auth/Locked.js | 3 | ||||
-rw-r--r-- | src/components/auth/Login.js | 3 | ||||
-rw-r--r-- | src/components/auth/Password.js | 3 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 9 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 3 | ||||
-rw-r--r-- | src/components/auth/Welcome.js | 3 |
9 files changed, 23 insertions, 14 deletions
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 7e74fe779..081f2d61f 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -11,6 +11,7 @@ import Infobox from '../ui/Infobox'; | |||
11 | import { url, required } from '../../helpers/validation-helpers'; | 11 | import { url, required } from '../../helpers/validation-helpers'; |
12 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config'; | 12 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config'; |
13 | import globalMessages from '../../i18n/globalMessages'; | 13 | import globalMessages from '../../i18n/globalMessages'; |
14 | import { H1 } from '../ui/headline'; | ||
14 | 15 | ||
15 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
16 | headline: { | 17 | headline: { |
@@ -110,7 +111,7 @@ class ChangeServer extends Component { | |||
110 | <div className="auth__container"> | 111 | <div className="auth__container"> |
111 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 112 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
112 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 113 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
113 | <h1>{intl.formatMessage(messages.headline)}</h1> | 114 | <H1>{intl.formatMessage(messages.headline)}</H1> |
114 | {(form.$('server').value === this.franzServer || form.$('server').value === this.ferdiServer) && ( | 115 | {(form.$('server').value === this.franzServer || form.$('server').value === this.ferdiServer) && ( |
115 | <Infobox type="warning"> | 116 | <Infobox type="warning"> |
116 | {intl.formatMessage(messages.warning)} | 117 | {intl.formatMessage(messages.warning)} |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 281ceda97..e7d5731f9 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -8,6 +8,7 @@ import classnames from 'classnames'; | |||
8 | import Form from '../../lib/Form'; | 8 | import Form from '../../lib/Form'; |
9 | import Toggle from '../ui/Toggle'; | 9 | import Toggle from '../ui/Toggle'; |
10 | import Button from '../ui/Button'; | 10 | import Button from '../ui/Button'; |
11 | import { H1 } from '../ui/headline'; | ||
11 | 12 | ||
12 | const messages = defineMessages({ | 13 | const messages = defineMessages({ |
13 | headline: { | 14 | headline: { |
@@ -90,7 +91,7 @@ class Import extends Component { | |||
90 | onSubmit={e => this.submit(e)} | 91 | onSubmit={e => this.submit(e)} |
91 | > | 92 | > |
92 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 93 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
93 | <h1>{intl.formatMessage(messages.headline)}</h1> | 94 | <H1>{intl.formatMessage(messages.headline)}</H1> |
94 | <table className="service-table available-services"> | 95 | <table className="service-table available-services"> |
95 | <tbody> | 96 | <tbody> |
96 | {this.form.$('import').map((service, i) => ( | 97 | {this.form.$('import').map((service, i) => ( |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index a23af7c6b..81618b3bd 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -11,6 +11,7 @@ import Form from '../../lib/Form'; | |||
11 | import { email } from '../../helpers/validation-helpers'; | 11 | import { email } from '../../helpers/validation-helpers'; |
12 | import Input from '../ui/Input'; | 12 | import Input from '../ui/Input'; |
13 | import Button from '../ui/Button'; | 13 | import Button from '../ui/Button'; |
14 | import { H1 } from '../ui/headline'; | ||
14 | 15 | ||
15 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
16 | settingsHeadline: { | 17 | settingsHeadline: { |
@@ -146,9 +147,9 @@ class Invite extends Component { | |||
146 | {!embed && ( | 147 | {!embed && ( |
147 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 148 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
148 | )} | 149 | )} |
149 | <h1 className={embed && 'invite__embed'}> | 150 | <H1 className={embed && 'invite__embed'}> |
150 | {intl.formatMessage(messages.headline)} | 151 | {intl.formatMessage(messages.headline)} |
151 | </h1> | 152 | </H1> |
152 | {form.$('invite').map(invite => ( | 153 | {form.$('invite').map(invite => ( |
153 | <div className="grid" key={invite.key}> | 154 | <div className="grid" key={invite.key}> |
154 | <div className="grid__row"> | 155 | <div className="grid__row"> |
@@ -184,7 +185,7 @@ class Invite extends Component { | |||
184 | > | 185 | > |
185 | {embed && ( | 186 | {embed && ( |
186 | <div className="settings__header"> | 187 | <div className="settings__header"> |
187 | <h1>{this.props.intl.formatMessage(messages.settingsHeadline)}</h1> | 188 | <H1>{this.props.intl.formatMessage(messages.settingsHeadline)}</H1> |
188 | </div> | 189 | </div> |
189 | )} | 190 | )} |
190 | {!embed ? ( | 191 | {!embed ? ( |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index ac1bc4e8c..e09a7d540 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -7,6 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
7 | import Form from '../../lib/Form'; | 7 | import Form from '../../lib/Form'; |
8 | import Input from '../ui/Input'; | 8 | import Input from '../ui/Input'; |
9 | import Button from '../ui/Button'; | 9 | import Button from '../ui/Button'; |
10 | import { H1 } from '../ui/headline'; | ||
10 | import { isMac } from '../../environment'; | 11 | import { isMac } from '../../environment'; |
11 | 12 | ||
12 | import { globalError as globalErrorPropType } from '../../prop-types'; | 13 | import { globalError as globalErrorPropType } from '../../prop-types'; |
@@ -100,7 +101,7 @@ class Locked extends Component { | |||
100 | <div className="auth__container"> | 101 | <div className="auth__container"> |
101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 102 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
102 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 103 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
103 | <h1>{intl.formatMessage(messages.headline)}</h1> | 104 | <H1>{intl.formatMessage(messages.headline)}</H1> |
104 | 105 | ||
105 | {touchIdEnabled && ( | 106 | {touchIdEnabled && ( |
106 | <> | 107 | <> |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index ccffd0c6a..305ed38b2 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -13,6 +13,7 @@ import Button from '../ui/Button'; | |||
13 | import Link from '../ui/Link'; | 13 | import Link from '../ui/Link'; |
14 | 14 | ||
15 | import { globalError as globalErrorPropType } from '../../prop-types'; | 15 | import { globalError as globalErrorPropType } from '../../prop-types'; |
16 | import { H1 } from '../ui/headline'; | ||
16 | 17 | ||
17 | const messages = defineMessages({ | 18 | const messages = defineMessages({ |
18 | headline: { | 19 | headline: { |
@@ -117,7 +118,7 @@ class Login extends Component { | |||
117 | <div className="auth__container"> | 118 | <div className="auth__container"> |
118 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 119 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
119 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 120 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
120 | <h1>{intl.formatMessage(messages.headline)}</h1> | 121 | <H1>{intl.formatMessage(messages.headline)}</H1> |
121 | {isTokenExpired && ( | 122 | {isTokenExpired && ( |
122 | <p className="error-message center"> | 123 | <p className="error-message center"> |
123 | {intl.formatMessage(messages.tokenExpired)} | 124 | {intl.formatMessage(messages.tokenExpired)} |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 49930f6bd..8a5ef28f3 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -10,6 +10,7 @@ import Button from '../ui/Button'; | |||
10 | import Link from '../ui/Link'; | 10 | import Link from '../ui/Link'; |
11 | import Infobox from '../ui/Infobox'; | 11 | import Infobox from '../ui/Infobox'; |
12 | import globalMessages from '../../i18n/globalMessages'; | 12 | import globalMessages from '../../i18n/globalMessages'; |
13 | import { H1 } from '../ui/headline'; | ||
13 | 14 | ||
14 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
15 | headline: { | 16 | headline: { |
@@ -79,7 +80,7 @@ class Password extends Component { | |||
79 | <div className="auth__container"> | 80 | <div className="auth__container"> |
80 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 81 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
81 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 82 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
82 | <h1>{intl.formatMessage(messages.headline)}</h1> | 83 | <H1>{intl.formatMessage(messages.headline)}</H1> |
83 | {status.length > 0 && status.includes('sent') && ( | 84 | {status.length > 0 && status.includes('sent') && ( |
84 | <Infobox type="success" icon="checkbox-marked-circle-outline"> | 85 | <Infobox type="success" icon="checkbox-marked-circle-outline"> |
85 | {intl.formatMessage(messages.successInfo)} | 86 | {intl.formatMessage(messages.successInfo)} |
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index a24f4e4d5..90f6733a6 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -14,6 +14,7 @@ import Appear from '../ui/effects/Appear'; | |||
14 | import globalMessages from '../../i18n/globalMessages'; | 14 | import globalMessages from '../../i18n/globalMessages'; |
15 | 15 | ||
16 | import { CDN_URL } from '../../config'; | 16 | import { CDN_URL } from '../../config'; |
17 | import { H1, H2 } from '../ui/headline'; | ||
17 | 18 | ||
18 | const SLACK_ID = 'slack'; | 19 | const SLACK_ID = 'slack'; |
19 | 20 | ||
@@ -213,8 +214,8 @@ class SetupAssistant extends Component { | |||
213 | )} | 214 | )} |
214 | 215 | ||
215 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 216 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
216 | <h1>{intl.formatMessage(messages.headline)}</h1> | 217 | <H1>{intl.formatMessage(messages.headline)}</H1> |
217 | <h2>{intl.formatMessage(messages.subHeadline)}</h2> | 218 | <H2>{intl.formatMessage(messages.subHeadline)}</H2> |
218 | <div className={classnames('grid', classes.servicesGrid)}> | 219 | <div className={classnames('grid', classes.servicesGrid)}> |
219 | {Object.keys(services).map(id => { | 220 | {Object.keys(services).map(id => { |
220 | const service = services[id]; | 221 | const service = services[id]; |
@@ -252,7 +253,7 @@ class SetupAssistant extends Component { | |||
252 | className={classes.serviceIcon} | 253 | className={classes.serviceIcon} |
253 | alt="" | 254 | alt="" |
254 | /> | 255 | /> |
255 | <h2>{service.name}</h2> | 256 | <H2>{service.name}</H2> |
256 | {id === SLACK_ID && slackWorkspace && ( | 257 | {id === SLACK_ID && slackWorkspace && ( |
257 | <Badge type="secondary" className={classes.slackBadge}> | 258 | <Badge type="secondary" className={classes.slackBadge}> |
258 | {slackWorkspace} | 259 | {slackWorkspace} |
@@ -280,7 +281,7 @@ class SetupAssistant extends Component { | |||
280 | > | 281 | > |
281 | <div className={classes.slackModalContent}> | 282 | <div className={classes.slackModalContent}> |
282 | <img src={`${CDN_URL}/recipes/dist/slack/src/icon.svg`} alt="" /> | 283 | <img src={`${CDN_URL}/recipes/dist/slack/src/icon.svg`} alt="" /> |
283 | <h1>Create your first Slack workspace</h1> | 284 | <H1>Create your first Slack workspace</H1> |
284 | <form | 285 | <form |
285 | onSubmit={e => { | 286 | onSubmit={e => { |
286 | e.preventDefault(); | 287 | e.preventDefault(); |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 3cccb2428..1c7b8e247 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -12,6 +12,7 @@ import Link from '../ui/Link'; | |||
12 | 12 | ||
13 | import { globalError as globalErrorPropType } from '../../prop-types'; | 13 | import { globalError as globalErrorPropType } from '../../prop-types'; |
14 | import { termsBase } from '../../api/apiBase'; | 14 | import { termsBase } from '../../api/apiBase'; |
15 | import { H1 } from '../ui/headline'; | ||
15 | 16 | ||
16 | const messages = defineMessages({ | 17 | const messages = defineMessages({ |
17 | headline: { | 18 | headline: { |
@@ -124,7 +125,7 @@ class Signup extends Component { | |||
124 | onSubmit={e => this.submit(e)} | 125 | onSubmit={e => this.submit(e)} |
125 | > | 126 | > |
126 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 127 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
127 | <h1>{intl.formatMessage(messages.headline)}</h1> | 128 | <H1>{intl.formatMessage(messages.headline)}</H1> |
128 | <div className="grid__row"> | 129 | <div className="grid__row"> |
129 | <Input field={form.$('firstname')} focus /> | 130 | <Input field={form.$('firstname')} focus /> |
130 | <Input field={form.$('lastname')} /> | 131 | <Input field={form.$('lastname')} /> |
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 94ea4d603..ec4e7b68a 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -7,6 +7,7 @@ import serverlessLogin from '../../helpers/serverless-helpers'; | |||
7 | import { shuffleArray } from '../../helpers/array-helpers'; | 7 | import { shuffleArray } from '../../helpers/array-helpers'; |
8 | 8 | ||
9 | import Link from '../ui/Link'; | 9 | import Link from '../ui/Link'; |
10 | import { H1 } from '../ui/headline'; | ||
10 | 11 | ||
11 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
12 | signupButton: { | 13 | signupButton: { |
@@ -56,7 +57,7 @@ class Welcome extends Component { | |||
56 | /> | 57 | /> |
57 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} | 58 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} |
58 | <div className="welcome__text"> | 59 | <div className="welcome__text"> |
59 | <h1>Ferdium</h1> | 60 | <H1>Ferdium</H1> |
60 | </div> | 61 | </div> |
61 | </div> | 62 | </div> |
62 | <div className="welcome__buttons"> | 63 | <div className="welcome__buttons"> |