From a3ff6e5f960ac7a15d04271fda881417645cd016 Mon Sep 17 00:00:00 2001 From: Katy Date: Tue, 17 Dec 2019 11:41:35 +0800 Subject: [PATCH 001/142] JSAEM2-10 UI design --- src/Navigator/index.jsx | 1 + src/Personal/index.jsx | 41 +++++++++++++++++++++++++++++++++++--- src/TransCreator/index.jsx | 1 - 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/Navigator/index.jsx b/src/Navigator/index.jsx index d00cd9c..51a40eb 100644 --- a/src/Navigator/index.jsx +++ b/src/Navigator/index.jsx @@ -12,6 +12,7 @@ const AppNavigator = createBottomTabNavigator({ Me: Personal, }, { + initialRouteName: 'Me', // set default page defaultNavigationOptions: ({ navigation }) => ({ // eslint-disable-next-line react/prop-types tabBarIcon: ({ focused, tintColor }) => ( diff --git a/src/Personal/index.jsx b/src/Personal/index.jsx index 355a416..9440f84 100644 --- a/src/Personal/index.jsx +++ b/src/Personal/index.jsx @@ -1,10 +1,45 @@ -import React from 'react'; +import React, { useState } from 'react'; import { View, Text } from 'react-native'; +import { Avatar, ListItem, Tooltip } from 'react-native-elements'; +import styles from '../Common/themeStyle'; export default function Personal() { + const [switchValue, setSwitchValue] = useState(false); + const toggleSwitch = (value) => { + if (value) { + setSwitchValue(false); + } else { + setSwitchValue(true); + } + }; return ( - - Personal Screen + + + + + Personal Info + + + General + + toggleSwitch(switchValue), + }} + /> + + ); } diff --git a/src/TransCreator/index.jsx b/src/TransCreator/index.jsx index c2dc53d..4f4ac81 100644 --- a/src/TransCreator/index.jsx +++ b/src/TransCreator/index.jsx @@ -5,7 +5,6 @@ import { useDispatch } from 'react-redux'; import PropTypes from 'prop-types'; import moment from 'moment'; import { NavigationScreenPropType } from 'react-navigation'; - import styles from './Style'; import PageFooter from './PageFooter'; import DateSelector from './DateSelector'; From eb79630dd1d576caa070e3854b7964e441f88637 Mon Sep 17 00:00:00 2001 From: Katy Date: Tue, 17 Dec 2019 18:10:12 +0800 Subject: [PATCH 002/142] JSAEM2-10 Set UI design --- src/Common/themeStyle.js | 11 +++++++++++ src/Personal/index.jsx | 27 ++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/Common/themeStyle.js b/src/Common/themeStyle.js index 16830b7..be65e01 100644 --- a/src/Common/themeStyle.js +++ b/src/Common/themeStyle.js @@ -29,7 +29,11 @@ const styles = StyleSheet.create({ card: { backgroundColor: 'white', +<<<<<<< HEAD borderRadius: 5, +======= + borderRadius: 6, +>>>>>>> JSAEM2-10 Set UI design shadowColor: 'grey', shadowOffset: { width: 2, @@ -68,6 +72,13 @@ const styles = StyleSheet.create({ borderBottomColor: '#30d29d', justifyContent: 'center', }, + + secondaryHeading: { + fontSize: 20, + fontWeight: '500', + marginTop: 10, + marginBottom: 10, + }, cardAlign: { flexDirection: 'row', diff --git a/src/Personal/index.jsx b/src/Personal/index.jsx index 9440f84..a5c2fd2 100644 --- a/src/Personal/index.jsx +++ b/src/Personal/index.jsx @@ -1,29 +1,24 @@ import React, { useState } from 'react'; import { View, Text } from 'react-native'; -import { Avatar, ListItem, Tooltip } from 'react-native-elements'; +import { Avatar, ListItem } from 'react-native-elements'; import styles from '../Common/themeStyle'; export default function Personal() { const [switchValue, setSwitchValue] = useState(false); - const toggleSwitch = (value) => { - if (value) { - setSwitchValue(false); - } else { - setSwitchValue(true); - } - }; + return ( - Personal Info + Johnathan Doe + Email - - General + + General toggleSwitch(switchValue), + disabled: false, trackColor: { true: '#5C6BC0' }, value: switchValue, onValueChange: () => setSwitchValue(!switchValue), }} + bottomDivider + /> + + From 266c7731b3a2101a1956ac40271972f6394f7a42 Mon Sep 17 00:00:00 2001 From: Katy Date: Thu, 19 Dec 2019 11:58:57 +0800 Subject: [PATCH 003/142] JSAEM2-10 update: add redux and install fecth mock --- package-lock.json | 103 ++++++++++++++++++++++++++++++++++ package.json | 3 +- src/Personal/actionCreator.js | 16 ++++++ src/Personal/index.jsx | 12 +++- src/Personal/reducer.js | 20 +++++++ 5 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 src/Personal/actionCreator.js create mode 100644 src/Personal/reducer.js diff --git a/package-lock.json b/package-lock.json index 1f728c1..d1e80ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1778,6 +1778,30 @@ "babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0" } }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -3446,6 +3470,35 @@ } } }, + "fetch-mock": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-8.1.0.tgz", + "integrity": "sha512-Xp4yYTwMvKiHAdbZNm3ZOYzhmyLuI3ziSJcW0L781TMe+mXydiGmpHSfwaM8xIyShyz9DMJMPail41Az+8+2zA==", + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "core-js": "^3.0.0", + "glob-to-regexp": "^0.4.0", + "lodash.isequal": "^4.5.0", + "path-to-regexp": "^2.2.1", + "querystring": "^0.2.0", + "whatwg-url": "^6.5.0" + }, + "dependencies": { + "core-js": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz", + "integrity": "sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q==", + "dev": true + }, + "path-to-regexp": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz", + "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==", + "dev": true + } + } + }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -4184,6 +4237,12 @@ "is-glob": "^2.0.0" } }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, "global": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", @@ -4812,6 +4871,12 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, "lodash.pad": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", @@ -4827,6 +4892,12 @@ "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz", "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=" }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -6315,6 +6386,12 @@ "strict-uri-encode": "^2.0.0" } }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, "querystringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", @@ -8187,6 +8264,15 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -8470,11 +8556,28 @@ "minimist": "^1.2.0" } }, + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true + }, "whatwg-fetch": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" }, + "whatwg-url": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", + "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", diff --git a/package.json b/package.json index 67781b9..1bf8761 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "eslint-plugin-import": "^2.18.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-react": "^7.17.0", - "eslint-plugin-react-hooks": "^1.7.0" + "eslint-plugin-react-hooks": "^1.7.0", + "fetch-mock": "^8.1.0" }, "private": true } diff --git a/src/Personal/actionCreator.js b/src/Personal/actionCreator.js new file mode 100644 index 0000000..f243d32 --- /dev/null +++ b/src/Personal/actionCreator.js @@ -0,0 +1,16 @@ +export const actionType = { + BACKUP_REQUEST: 'BACKUP_REQUEST', +}; + +export function backupRequest(transactionData) { + return { + type: actionType.BACKUP_REQUEST, + data: transactionData, + }; +} + +export const backupData = (transactions) => function (dispatch) { + console.log(transactions); + + // dispatch(backupRequest(transactions)); +}; diff --git a/src/Personal/index.jsx b/src/Personal/index.jsx index a5c2fd2..c6d33dc 100644 --- a/src/Personal/index.jsx +++ b/src/Personal/index.jsx @@ -1,10 +1,20 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { View, Text } from 'react-native'; import { Avatar, ListItem } from 'react-native-elements'; +import { useDispatch, useSelector } from 'react-redux'; +import { backupData } from './actionCreator'; import styles from '../Common/themeStyle'; export default function Personal() { const [switchValue, setSwitchValue] = useState(false); + const dispatch = useDispatch(); + const { transactions } = useSelector((state) => state.transactions); + + useEffect(() => { + if (switchValue) { + dispatch(backupData(transactions)); + } + }, [switchValue]); return ( diff --git a/src/Personal/reducer.js b/src/Personal/reducer.js new file mode 100644 index 0000000..7086c9a --- /dev/null +++ b/src/Personal/reducer.js @@ -0,0 +1,20 @@ +import { actionType } from './actionCreator'; + +const initialState = { + loading: false, + transactions: [], + error: '', +}; + +export default (state = initialState, action) => { + switch (action.type) { + case actionType.BACKUP_REQUEST: + return { + ...state, + transactions: [...state.transactions, { ...action.data }], + }; + + default: + return state; + } +}; From 944865e2ce3cd546f0b82bbeeb053a667f7e8eb2 Mon Sep 17 00:00:00 2001 From: Katy Date: Thu, 19 Dec 2019 15:27:06 +0800 Subject: [PATCH 004/142] JSAEM2-10 fix: resolve conflict --- src/Common/themeStyle.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Common/themeStyle.js b/src/Common/themeStyle.js index be65e01..59cc45c 100644 --- a/src/Common/themeStyle.js +++ b/src/Common/themeStyle.js @@ -29,11 +29,7 @@ const styles = StyleSheet.create({ card: { backgroundColor: 'white', -<<<<<<< HEAD - borderRadius: 5, -======= borderRadius: 6, ->>>>>>> JSAEM2-10 Set UI design shadowColor: 'grey', shadowOffset: { width: 2, @@ -72,7 +68,7 @@ const styles = StyleSheet.create({ borderBottomColor: '#30d29d', justifyContent: 'center', }, - + secondaryHeading: { fontSize: 20, fontWeight: '500', From a6e725db316ff5529931e1a54b85631ff06f6fe5 Mon Sep 17 00:00:00 2001 From: Katy Date: Thu, 19 Dec 2019 18:49:05 +0800 Subject: [PATCH 005/142] JSAEM2-10 update: set backup function with redux --- package-lock.json | 103 ---------------------------------- package.json | 3 +- src/Common/MainHeader.jsx | 4 +- src/Personal/actionCreator.js | 25 ++++++--- src/Personal/index.jsx | 80 ++++++++++++++------------ src/Personal/reducer.js | 7 ++- src/reduxStore.js | 3 +- 7 files changed, 73 insertions(+), 152 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1e80ad..1f728c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1778,30 +1778,6 @@ "babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0" } }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - } - } - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -3470,35 +3446,6 @@ } } }, - "fetch-mock": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-8.1.0.tgz", - "integrity": "sha512-Xp4yYTwMvKiHAdbZNm3ZOYzhmyLuI3ziSJcW0L781TMe+mXydiGmpHSfwaM8xIyShyz9DMJMPail41Az+8+2zA==", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "core-js": "^3.0.0", - "glob-to-regexp": "^0.4.0", - "lodash.isequal": "^4.5.0", - "path-to-regexp": "^2.2.1", - "querystring": "^0.2.0", - "whatwg-url": "^6.5.0" - }, - "dependencies": { - "core-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz", - "integrity": "sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q==", - "dev": true - }, - "path-to-regexp": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz", - "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==", - "dev": true - } - } - }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -4237,12 +4184,6 @@ "is-glob": "^2.0.0" } }, - "glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, "global": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", @@ -4871,12 +4812,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true - }, "lodash.pad": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", @@ -4892,12 +4827,6 @@ "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz", "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=" }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -6386,12 +6315,6 @@ "strict-uri-encode": "^2.0.0" } }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, "querystringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", @@ -8264,15 +8187,6 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -8556,28 +8470,11 @@ "minimist": "^1.2.0" } }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, "whatwg-fetch": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" }, - "whatwg-url": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", - "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", diff --git a/package.json b/package.json index 1bf8761..67781b9 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,7 @@ "eslint-plugin-import": "^2.18.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-react": "^7.17.0", - "eslint-plugin-react-hooks": "^1.7.0", - "fetch-mock": "^8.1.0" + "eslint-plugin-react-hooks": "^1.7.0" }, "private": true } diff --git a/src/Common/MainHeader.jsx b/src/Common/MainHeader.jsx index 47b47a2..5aba48a 100644 --- a/src/Common/MainHeader.jsx +++ b/src/Common/MainHeader.jsx @@ -16,7 +16,9 @@ export default function MainHeader(props) { flex: 1, alignItems: 'flex-end', }} > -