diff --git a/package.json b/package.json index 5dbc5f25..0df47515 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,7 @@ "redux-thunk": "^2.2.0", "sanitize.css": "^5.0.0", "sharetribe-scripts": "1.0.14", - "sharetribe-sdk": - "git+ssh://git@github.com/sharetribe/sharetribe-sdk-js#acec122c4c1279bfecb411b027f7bb8928b6b44b", + "sharetribe-sdk": "git+ssh://git@github.com/sharetribe/sharetribe-sdk-js#acec122c4c1279bfecb411b027f7bb8928b6b44b", "source-map-support": "^0.5.0", "url": "^0.11.0" }, @@ -54,14 +53,13 @@ "clean": "rm -rf build/*", "dev": "sharetribe-scripts start", "build": "sharetribe-scripts build", - "format": "prettier --write '**/*.{js,json,css}'", - "format-ci": "prettier --list-different '**/*.{js,json,css}'", + "format": "prettier --write '**/*.{js,css}'", + "format-ci": "prettier --list-different '**/*.{js,css}'", "test": "sharetribe-scripts test --env=jsdom", "test-ci": "sharetribe-scripts test --env=jsdom --runInBand", "eject": "sharetribe-scripts eject", "start": "node server/index.js", - "dev-server": - "REACT_APP_CANONICAL_ROOT_URL=http://localhost:4000 yarn run build&&nodemon --watch server server/index.js", + "dev-server": "REACT_APP_CANONICAL_ROOT_URL=http://localhost:4000 yarn run build&&nodemon --watch server server/index.js", "heroku-prebuild": "./heroku-copy-ssh-key-from-env.sh", "heroku-postbuild": "yarn run build", "audit": "nsp check" diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index f2ed992b..8f77ca79 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -4,6 +4,7 @@ import { connect } from 'react-redux'; import { withRouter, Redirect } from 'react-router-dom'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; +import config from '../../config'; import * as propTypes from '../../util/propTypes'; import { ensureCurrentUser } from '../../util/data'; import { @@ -64,10 +65,6 @@ export const AuthenticationPageComponent = props => { return ; } - const title = intl.formatMessage({ - id: isLogin ? 'AuthenticationPage.loginPageTitle' : 'AuthenticationPage.signupPageTitle', - }); - /* eslint-disable no-console */ if (loginError && console && console.error) { console.error(loginError); @@ -197,6 +194,11 @@ export const AuthenticationPageComponent = props => { ); + const siteTitle = config.siteTitle; + const schemaTitle = isLogin + ? intl.formatMessage({ id: 'AuthenticationPage.schemaTitleLogin' }, { siteTitle }) + : intl.formatMessage({ id: 'AuthenticationPage.schemaTitleSignup' }, { siteTitle }); + const topbarClasses = classNames({ [css.hideOnMobile]: showEmailVerification, }); @@ -205,8 +207,15 @@ export const AuthenticationPageComponent = props => {
diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap index 7c294d0e..50e7d30d 100644 --- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap +++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap @@ -4,8 +4,15 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `