Skip to content

Commit 2f05e4c

Browse files
authored
Homepage update (#2207)
* Homepage update * Temp patches
1 parent 11f74c4 commit 2f05e4c

File tree

9 files changed

+1755
-1064
lines changed

9 files changed

+1755
-1064
lines changed

.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
node: ['12.x', '14.x']
14+
node: ['14.x']
1515
os: [ubuntu-latest, windows-latest, macOS-latest]
1616

1717
steps:

package-lock.json

Lines changed: 1738 additions & 1047 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@reduxjs/toolkit": "^1.5.0",
6+
"@reduxjs/toolkit": "^1.8.6",
77
"@thenewboston/ui": "^0.1.16",
88
"@thenewboston/utils": "^1.0.0",
9-
"axios": "^0.21.1",
9+
"axios": "^0.21.4",
1010
"clsx": "^1.1.1",
1111
"date-fns": "^2.16.1",
1212
"formik": "^2.2.2",
1313
"normalize.css": "^8.0.1",
14-
"qrcode": "^1.4.4",
14+
"qrcode": "^1.5.1",
1515
"raf": "^3.4.1",
1616
"react": "^17.0.1",
1717
"react-cool-onclickoutside": "^1.5.5",
@@ -84,7 +84,7 @@
8484
"eslint-config-airbnb": "^18.2.0",
8585
"eslint-config-airbnb-typescript": "^11.0.0",
8686
"eslint-config-prettier": "^6.12.0",
87-
"eslint-plugin-import": "^2.22.1",
87+
"eslint-plugin-import": "^2.26.0",
8888
"eslint-plugin-jest": "^24.1.0",
8989
"eslint-plugin-jsx-a11y": "^6.3.1",
9090
"eslint-plugin-prettier": "^3.1.4",
@@ -104,7 +104,7 @@
104104
"typescript-plugin-styled-components": "^2.0.0"
105105
},
106106
"engines": {
107-
"node": ">=12"
107+
"node": ">=14"
108108
},
109109
"husky": {
110110
"hooks": {

src/assets/logos/thenewboston.png

20 KB
Loading

src/containers/App/Styles.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ export const Container = styled.div`
88
justify-content: center;
99
`;
1010

11-
export const Red = styled.span`
12-
color: #dd0d15;
13-
`;
14-
15-
export const Unite = styled.div`
16-
color: white;
17-
font-family: var(--font-family-mono);
18-
font-size: 26px;
11+
export const Image = styled.img`
12+
height: auto;
13+
max-width: 260px;
1914
`;

src/containers/App/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import React, {FC} from 'react';
22

3+
import thenewbostonLogo from 'assets/logos/thenewboston.png';
34
import * as S from './Styles';
45

56
const App: FC = () => {
67
return (
78
<S.Container>
8-
<S.Unite>
9-
U<S.Red>n</S.Red>ite.
10-
</S.Unite>
9+
<S.Image alt="thenewboston logo" src={thenewbostonLogo} />
1110
</S.Container>
1211
);
1312
};

src/containers/EditUserModal/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ const EditUserModal: FC<ComponentProps> = ({close}) => {
3939
try {
4040
setSubmitting(true);
4141
await dispatch(
42+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
43+
// @ts-ignore
4244
editUser({
4345
account_number: accountNumber,
4446
discord_username: discordUsername,

src/containers/Profile/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ const Profile: FC = () => {
2626
useEffect(() => {
2727
const fetchData = async (): Promise<void> => {
2828
try {
29+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
30+
// @ts-ignore
2931
await dispatch(getUser(userId));
3032
} catch (error) {
3133
setErrorMessage('Error retrieving user');

src/containers/SignIn/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const SignIn: FC = () => {
2525
const handleSubmit = async ({email, password}: FormValues): Promise<void> => {
2626
try {
2727
setSubmitting(true);
28+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
29+
// @ts-ignore
2830
const {data} = await dispatch(login({email, password}));
2931
setSubmitting(false);
3032
history.push(`/users/${data.user.pk}`);

0 commit comments

Comments
 (0)