Skip to content

Commit 8b996b6

Browse files
committed
Merge branch 'master' into jw-react-upgrade
2 parents 197038c + c951337 commit 8b996b6

11 files changed

+148
-189
lines changed

website/.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "react-app"
2+
"extends": "react-app",
33
}

website/package-lock.json

+45-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

website/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"redux": "^4.2.1",
2323
"redux-logger": "^3.0.6",
2424
"redux-thunk": "^2.2.0",
25-
"styled-components": "^5.0.1",
25+
"styled-components": "^6.1.11",
2626
"typeface-crimson-text": "1.1.13",
2727
"typeface-quicksand": "1.1.13"
2828
},
@@ -34,8 +34,8 @@
3434
},
3535
"scripts": {
3636
"analyze": "source-map-explorer build/static/js/*",
37-
"lint": "prettier --check 'src/**/*.{js,css}'",
38-
"format": "prettier --write 'src/**/*.{js,css}'",
37+
"lint": "prettier --check 'src/**/*.{js,jsx,ts,tsx,json,css}'",
38+
"format": "prettier --write 'src/**/*.{js,jsx,ts,tsx,json,css}'",
3939
"start": "react-scripts start",
4040
"build": "react-scripts build",
4141
"test": "react-scripts test --env=jsdom",

website/src/components/ErrorMessage.js

-39
This file was deleted.
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import React from 'react';
2+
import styled from 'styled-components';
3+
4+
const ErrorMessageWrapper = styled.p`
5+
width: 700px;
6+
margin: 40px auto;
7+
font-size: 28px;
8+
text-align: center;
9+
line-height: 1.5;
10+
color: ${(props) => props.theme.colors.red};
11+
text-shadow: black 1px 1px;
12+
13+
@media (max-width: 1200px) {
14+
width: 70%;
15+
font-size: 24px;
16+
}
17+
`;
18+
19+
export const ErrorMessage: React.FC<{
20+
readonly errorMessage: string;
21+
}> = ({errorMessage}) => {
22+
if (!errorMessage) return null;
23+
24+
const tokens = errorMessage.split('"');
25+
26+
return (
27+
<ErrorMessageWrapper>
28+
{tokens.map((token, i) =>
29+
// Bold page titles in the provided error message.
30+
i % 2 === 0 ? <span key={i}>{token}</span> : <b key={i}>"{token}"</b>
31+
)}
32+
</ErrorMessageWrapper>
33+
);
34+
};

website/src/components/Home.js

-79
This file was deleted.

0 commit comments

Comments
 (0)