diff --git a/components/Cards/LastInfo.js b/components/Cards/LastInfo.js index 1743f38..835fbc1 100644 --- a/components/Cards/LastInfo.js +++ b/components/Cards/LastInfo.js @@ -51,6 +51,10 @@ const styles = StyleSheet.create({ topTitle: { fontSize: 20, fontFamily: 'Ubuntu-Medium', + paddingBottom: 10, + borderBottomColor: '#eee', + borderRadius: 15, + borderBottomWidth: 2, }, container: { // marginTop: 20, diff --git a/components/CovidReports/Reports.js b/components/CovidReports/Reports.js index 9bd6b45..67d2310 100644 --- a/components/CovidReports/Reports.js +++ b/components/CovidReports/Reports.js @@ -57,6 +57,7 @@ const styles = StyleSheet.create({ }, countryInfo: { width: '45%', + paddingRight: 10, }, title: { fontSize: 20, diff --git a/package-lock.json b/package-lock.json index 260cba8..65b0250 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,68 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@antv/adjust": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@antv/adjust/-/adjust-0.1.1.tgz", - "integrity": "sha512-9FaMOyBlM4AgoRL0b5o0VhEKAYkexBNUrxV8XmpHU/9NBPJONBOB/NZUlQDqxtLItrt91tCfbAuMQmF529UX2Q==", - "requires": { - "@antv/util": "~1.3.1" - }, - "dependencies": { - "@antv/util": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz", - "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==", - "requires": { - "@antv/gl-matrix": "^2.7.1" - } - } - } - }, - "@antv/f2": { - "version": "3.6.4-beta.2", - "resolved": "https://registry.npmjs.org/@antv/f2/-/f2-3.6.4-beta.2.tgz", - "integrity": "sha512-CmmJKMOSz9iQNHuztY/gHJigY2qPfw/jDfHasD3bdfDhhurWJONr/0u+E6ad78Q/naKCavTdaj+hd3t8dxxlzA==", - "requires": { - "@antv/adjust": "~0.1.1", - "@antv/scale": "0.1.3", - "@antv/util": "~2.0.6", - "@babel/runtime": "^7.7.7", - "hammerjs": "^2.0.8" - } - }, - "@antv/gl-matrix": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz", - "integrity": "sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q==" - }, - "@antv/scale": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.1.3.tgz", - "integrity": "sha512-oknlOg4OUqIh8LygrfQttx+OAnNJm2fQ81si4g8aby1WJJwj/TU1gCr+J3loIpKBtBK4VpP/OzTTqg1Ym67SOQ==", - "requires": { - "@antv/util": "~1.3.1", - "fecha": "~2.3.3" - }, - "dependencies": { - "@antv/util": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz", - "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==", - "requires": { - "@antv/gl-matrix": "^2.7.1" - } - } - } - }, - "@antv/util": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@antv/util/-/util-2.0.9.tgz", - "integrity": "sha512-JblWzne7msAPDdxkUhEk8zAz0Wd6igKwqymGbvIeyOydGrhBhGjA3nEayFj4IlG+XixCvGFKsCB4yuFS4glRIA==", - "requires": { - "tslib": "^1.10.0" - } - }, "@babel/code-frame": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", @@ -975,16 +913,6 @@ "@types/hammerjs": "^2.0.36" } }, - "@eva-design/dss": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@eva-design/dss/-/dss-2.0.0.tgz", - "integrity": "sha512-jHMSLG9w/uhu92Oi8pViwYL5kbUxDolTpAoS28DSl9SAgGSLpdlyX1vtDKC7+nx1Ay5J5OWhNIcsMML3IGSbZg==" - }, - "@eva-design/processor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@eva-design/processor/-/processor-2.0.0.tgz", - "integrity": "sha512-k+WUjj877u9SoRbSuQ4DO15AF5FkIqIhGzraBNQKDki8J8Xq/4VpOv1YiKEkRF6XjbZU89GKq+e/ipL+VZxI3Q==" - }, "@hapi/address": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", @@ -1341,11 +1269,6 @@ "integrity": "sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==", "dev": true }, - "@react-native-community/masked-view": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.10.tgz", - "integrity": "sha512-rk4sWFsmtOw8oyx8SD3KSvawwaK7gRBSEIy2TAwURyGt+3TizssXP1r8nx3zY+R7v2vYYHXZ+k2/GULAT/bcaQ==" - }, "@react-navigation/bottom-tabs": { "version": "5.4.2", "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.4.2.tgz", @@ -1747,33 +1670,6 @@ } } }, - "@ui-kitten/components": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@ui-kitten/components/-/components-5.0.0.tgz", - "integrity": "sha512-XYcXYju7yPDGvg7TAxfTSlxWbxGL/p2R1Y9rSroIpylnSlow7KGlfq0R1MOxeKCf3tZDxSNvuVzaSlFgvJK7fQ==", - "requires": { - "@eva-design/dss": "^2.0.0", - "@eva-design/processor": "^2.0.0", - "fecha": "3.0.3", - "hoist-non-react-statics": "^3.2.1", - "lodash.merge": "^4.6.1" - }, - "dependencies": { - "fecha": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-3.0.3.tgz", - "integrity": "sha512-6LQK/1jud/FZnfEEZJ7y81vw7ge81DNd/XEsX0hgMUjhS+QMljkb1C0czBaP7dMNRVrd5mw/J2J7qI2Nw+TWZw==" - }, - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "requires": { - "react-is": "^16.7.0" - } - } - } - }, "abab": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", @@ -2876,11 +2772,6 @@ } } }, - "countup.js": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-1.9.3.tgz", - "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0=" - }, "create-react-class": { "version": "15.6.3", "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", @@ -3969,11 +3860,6 @@ } } }, - "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" - }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -4295,11 +4181,6 @@ "dev": true, "optional": true }, - "hammerjs": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", - "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -5921,11 +5802,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -8085,16 +7961,6 @@ "prop-types": "^15.6.2" } }, - "react-countup": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/react-countup/-/react-countup-4.3.3.tgz", - "integrity": "sha512-pWnxpwdPNRyJFha/YKKbyc4RLAw8PzmULdgCziGIgw6vxhT1VdccrvQgj38HBSoM2qF/MoLmn4M2klvDWVIdaw==", - "requires": { - "countup.js": "^1.9.3", - "prop-types": "^15.7.2", - "warning": "^4.0.3" - } - }, "react-devtools-core": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.6.0.tgz", @@ -8433,19 +8299,6 @@ "prop-types": "^15.5.10" } }, - "react-native-reanimated": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.8.0.tgz", - "integrity": "sha512-vGTt94lE5fsZmfMwERWFIsCr5LHsyllOESeNvlKryLgAg7h4cnJ5XSmVSy4L3qogdgFYCL6HEgY+s7tQmKXiiQ==", - "requires": { - "fbjs": "^1.0.0" - } - }, - "react-native-remote-svg": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/react-native-remote-svg/-/react-native-remote-svg-2.0.6.tgz", - "integrity": "sha512-tQbDL+gtfGgG9Evz5TOn5Odmrn/EYsmsLqVZ0Do0VMJevfLBuQRioLiwRsI/BCgOHu1oQLZIIE5p7V/lN9jLrw==" - }, "react-native-safe-area-context": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-1.0.0.tgz", @@ -10016,7 +9869,8 @@ "tslib": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "dev": true }, "tsutils": { "version": "3.17.1", @@ -10326,14 +10180,6 @@ "makeerror": "1.0.x" } }, - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - }, "wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", diff --git a/package.json b/package.json index 59d501e..9549583 100644 --- a/package.json +++ b/package.json @@ -10,20 +10,14 @@ "lint": "eslint ." }, "dependencies": { - "@antv/f2": "^3.6.4-beta.2", - "@react-native-community/masked-view": "^0.1.10", "@react-navigation/bottom-tabs": "^5.4.2", "@react-navigation/native": "^5.3.0", - "@ui-kitten/components": "^5.0.0", "axios": "^0.19.2", "moment": "^2.25.3", "react": "16.11.0", - "react-countup": "^4.3.3", "react-native": "0.62.2", "react-native-elements": "^2.0.0", "react-native-gesture-handler": "^1.6.1", - "react-native-reanimated": "^1.8.0", - "react-native-remote-svg": "^2.0.6", "react-native-safe-area-context": "^1.0.0", "react-native-screens": "^2.7.0", "react-native-splash-screen": "^3.2.0",