aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-08-28 13:13:44 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-08-28 13:13:44 +0200
commit40c0cf7b6cd575e540db1d921d55fd8c2d260420 (patch)
tree6c226326cfd82d0a8187a43349b3d8ab3cbcd3ef /src
parentAdd default value for server setting (diff)
downloadferdium-app-40c0cf7b6cd575e540db1d921d55fd8c2d260420.tar.gz
ferdium-app-40c0cf7b6cd575e540db1d921d55fd8c2d260420.tar.zst
ferdium-app-40c0cf7b6cd575e540db1d921d55fd8c2d260420.zip
Lint
Diffstat (limited to 'src')
-rw-r--r--src/components/auth/Login.js14
-rw-r--r--src/components/auth/Signup.js4
-rw-r--r--src/components/ui/Link.js2
3 files changed, 12 insertions, 8 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 8777b00f8..f8caebd7e 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -141,11 +141,15 @@ export default @observer class Login extends Component {
141 <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p> 141 <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
142 { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( 142 { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && (
143 <p className="error-message center"> 143 <p className="error-message center">
144 Using a custom Ferdi server? Try{' '} 144 Using a custom Ferdi server? Try
145 <Link 145 {' '}
146 to={ window.ferdi.stores.settings.all.app.server.replace('v1', '') + '/import' } 146 <Link
147 target="_blank" 147 to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`}
148 style={{ cursor: 'pointer', textDecoration: 'underline' }}>importing your Franz account</Link> 148 target="_blank"
149 style={{ cursor: 'pointer', textDecoration: 'underline' }}
150 >
151importing your Franz account
152 </Link>
149 </p> 153 </p>
150 )} 154 )}
151 </> 155 </>
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 447d5dccc..2aedbe6ea 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -188,7 +188,7 @@ export default @observer class Signup extends Component {
188 {intl.formatMessage(messages.legalInfo)} 188 {intl.formatMessage(messages.legalInfo)}
189 <br /> 189 <br />
190 <Link 190 <Link
191 to={ termsBase + '/terms' } 191 to={`${termsBase}/terms`}
192 target="_blank" 192 target="_blank"
193 className="link" 193 className="link"
194 > 194 >
@@ -196,7 +196,7 @@ export default @observer class Signup extends Component {
196 </Link> 196 </Link>
197 &nbsp;&amp;&nbsp; 197 &nbsp;&amp;&nbsp;
198 <Link 198 <Link
199 to={ termsBase + '/privacy' } 199 to={`${termsBase}/privacy`}
200 target="_blank" 200 target="_blank"
201 className="link" 201 className="link"
202 > 202 >
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 5c5ef9d7d..5f729844b 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -75,5 +75,5 @@ Link.wrappedComponent.defaultProps = {
75 activeClassName: '', 75 activeClassName: '',
76 strictFilter: false, 76 strictFilter: false,
77 target: '', 77 target: '',
78 style: {} 78 style: {},
79}; 79};