added refresh button

package.json

@@ -23,6 +23,7 @@
  "rc-progress": "^2.5.2",
  "react": "^16.12.0",
  "react-animated-number": "^0.4.4",
+ "react-bootstrap": "^1.0.0-beta.16",
  "react-chartjs-2": "^2.9.0",
  "react-dom": "^16.12.0",
  "react-scripts": "3.4.0"

src/App.js

@@ -2,8 +2,6 @@ import React, { Component } from "react";
 import "bootswatch/dist/united/bootstrap.min.css";
 import axios from "axios";
 
-import TitleBar from "frameless-titlebar";
-
 import Population from "./components/Population.jsx";
 import Header from "./components/Header.jsx";
 import Invasions from "./components/Invasions.jsx";
@@ -18,7 +16,7 @@ class App extends Component {
  lastUpdate: "Never"
  };
 
- async loadData() {
+ loadData = async () => {
  // define variables
  var popData;
  var sillyData;
@@ -57,7 +55,7 @@ class App extends Component {
  // also update the current time
  lastUpdate: time.toLocaleTimeString()
  });
- }
+ };
 
  async componentDidMount() {
  // load data for the first time
@@ -75,18 +73,7 @@ class App extends Component {
  render() {
  return (
  <div>
- <TitleBar
- app="Toontown Rewritten Statistics"
- theme={{
- barTheme: "dark",
- barBackgroundColor: "rgb(36, 37, 38)",
- barColor: "rgb(230, 230, 230)",
- menuHighlightColor: "#373277",
- menuDimItems: false,
- showIconDarwin: false
- }}
- />
- <Header lastUpdate={this.state.lastUpdate} />
+ <Header lastUpdate={this.state.lastUpdate} refresh={this.loadData} />
  <div className="px-5 py-3">
  <div className="row">
  <div className="col-4 text-left">

src/components/Header.jsx

@@ -1,11 +1,16 @@
 import React, { Component } from "react";
+import { Button } from "react-bootstrap";
 
 class Header extends Component {
  render() {
  return (
  <div className="text-center py-2 bg-dark text-white">
  <h1>Toontown Rewritten Statistics</h1>
- <p>Last updated: {this.props.lastUpdate}</p>
+ Last updated: {this.props.lastUpdate}
+ {" "}
+ <Button variant="outline-info" size="sm" onClick={this.props.refresh}>
+ Update Now
+ </Button>
  </div>
  );
  }

yarn.lock

@@ -1527,7 +1527,7 @@
  core-js-pure "^3.0.0"
  regenerator-runtime "^0.13.2"
 
-"@babel/[email protected]", "@babel/runtime@^7.5.1", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3":
+"@babel/[email protected]", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3":
  version "7.8.4"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
@@ -1867,6 +1867,16 @@
  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@restart/context@^2.1.4":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@restart/context/-/context-2.1.4.tgz#a99d87c299a34c28bd85bb489cb07bfd23149c02"
+ integrity sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==
+
+"@restart/hooks@^0.3.11", "@restart/hooks@^0.3.12":
+ version "0.3.21"
+ resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.21.tgz#5264d12019ffb844dc1fc44d55517ded7b580ee2"
+ integrity sha512-Wcu3CFJV+iiqPEIoPVx3/CYnZBRgPeRABo6bLJByRH9ptJXyObn7WYPG7Rv0cg3+55bqcBbG0xEfovzwE2PNXg==
+
 "@sheerun/mutationobserver-shim@^0.3.2":
  version "0.3.2"
  resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b"
@@ -2167,6 +2177,14 @@
  "@types/prop-types" "*"
  csstype "^2.2.0"
 
+"@types/react@^16.8.23", "@types/react@^16.9.11":
+ version "16.9.23"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
+ integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
+ dependencies:
+ "@types/prop-types" "*"
+ csstype "^2.2.0"
+
 "@types/stack-utils@^1.0.1":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -3670,6 +3688,11 @@ class-utils@^0.3.5:
  isobject "^3.0.0"
  static-extend "^0.1.1"
 
+classnames@^2.2.6:
+ version "2.2.6"
+ resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+ integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
+
 clean-css@^4.2.3:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
@@ -4365,7 +4388,7 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
  dependencies:
  cssom "0.3.x"
 
-csstype@^2.2.0:
+csstype@^2.2.0, csstype@^2.6.7:
  version "2.6.9"
  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
@@ -4666,6 +4689,14 @@ dom-converter@^0.2:
  dependencies:
  utila "~0.4"
 
+dom-helpers@^5.0.1, dom-helpers@^5.1.0, dom-helpers@^5.1.2:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
+ integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+ dependencies:
+ "@babel/runtime" "^7.6.3"
+ csstype "^2.6.7"
+
 dom-serializer@0:
  version "0.2.2"
  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -7548,6 +7579,11 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
  array-includes "^3.0.3"
  object.assign "^4.1.0"
 
+keycode@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
+ integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
+
 keyv@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -9071,6 +9107,11 @@ [email protected]:
  dependencies:
  ts-pnp "^1.1.2"
 
+popper.js@^1.15.0, popper.js@^1.16.0:
+ version "1.16.1"
+ resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+ integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
+
 portfinder@^1.0.25:
  version "1.0.25"
  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
@@ -9825,6 +9866,14 @@ prompts@^2.0.1:
  kleur "^3.0.3"
  sisteransi "^1.0.3"
 
+prop-types-extra@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b"
+ integrity sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==
+ dependencies:
+ react-is "^16.3.2"
+ warning "^4.0.0"
+
 prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
  version "15.7.2"
  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -10029,6 +10078,27 @@ react-app-polyfill@^1.0.6:
  regenerator-runtime "^0.13.3"
  whatwg-fetch "^3.0.0"
 
+react-bootstrap@^1.0.0-beta.16:
+ version "1.0.0-beta.16"
+ resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.0.0-beta.16.tgz#42da0314aee6754494e478687b8e6953de1aaf62"
+ integrity sha512-wjb+3CwviDWAaz4O3gQpd2XMDNqbOiqOOzpLm5aLPcp1wTsQsVRhyM+rTPmO3hYU8auA2eNpTYLz08/fAcMqDA==
+ dependencies:
+ "@babel/runtime" "^7.4.2"
+ "@restart/context" "^2.1.4"
+ "@restart/hooks" "^0.3.11"
+ "@types/react" "^16.8.23"
+ classnames "^2.2.6"
+ dom-helpers "^5.1.2"
+ invariant "^2.2.4"
+ keycode "^2.2.0"
+ popper.js "^1.16.0"
+ prop-types "^15.7.2"
+ prop-types-extra "^1.1.0"
+ react-overlays "^2.1.0"
+ react-transition-group "^4.0.0"
+ uncontrollable "^7.0.0"
+ warning "^4.0.3"
+
 react-chartjs-2@^2.9.0:
  version "2.9.0"
  resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.9.0.tgz#d054dbdd763fbe9a76296a4ae0752ea549b76d9e"
@@ -10082,11 +10152,34 @@ react-error-overlay@^6.0.6:
  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz#ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"
  integrity sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==
 
+react-is@^16.3.2:
+ version "16.13.0"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
+ integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
+
 react-is@^16.8.1, react-is@^16.8.4:
  version "16.12.0"
  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
 
+react-lifecycles-compat@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+ integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+
+react-overlays@^2.1.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-2.1.1.tgz#ffe2090c4a10da6b8947a1c7b1a67d0457648a0d"
+ integrity sha512-gaQJwmb8Ij2IGVt4D1HmLtl4A0mDVYxlsv/8i0dHWK7Mw0kNat6ORelbbEWzaXTK1TqMeQtJw/jraL3WOADz3w==
+ dependencies:
+ "@babel/runtime" "^7.4.5"
+ "@restart/hooks" "^0.3.12"
+ dom-helpers "^5.1.0"
+ popper.js "^1.15.0"
+ prop-types "^15.7.2"
+ uncontrollable "^7.0.0"
+ warning "^4.0.3"
+
 [email protected]:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.0.tgz#f413680f0b5b937c8879ba1ffdae9b8c5b364bf5"
@@ -10147,6 +10240,16 @@ [email protected]:
  optionalDependencies:
  fsevents "2.1.2"
 
+react-transition-group@^4.0.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
+ integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ dom-helpers "^5.0.1"
+ loose-envify "^1.4.0"
+ prop-types "^15.6.2"
+
 react@^16.12.0:
  version "16.12.0"
  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
@@ -11820,6 +11923,16 @@ uglify-js@^3.1.4:
  commander "~2.20.3"
  source-map "~0.6.1"
 
+uncontrollable@^7.0.0:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556"
+ integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q==
+ dependencies:
+ "@babel/runtime" "^7.6.3"
+ "@types/react" "^16.9.11"
+ invariant "^2.2.4"
+ react-lifecycles-compat "^3.0.4"
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -12104,6 +12217,13 @@ walker@^1.0.7, walker@~1.0.5:
  dependencies:
  makeerror "1.0.x"
 
+warning@^4.0.0, warning@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+ integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+ dependencies:
+ loose-envify "^1.0.0"
+
 watchpack@^1.6.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"