mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-24 14:31:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'notifications' into dependabot/composer/dev/fideloper/proxy-4.4.0

Browse Source
This commit is contained in:
Henry Whitaker
2020-06-24 22:37:57 +01:00
committed by GitHub
parent b3bcd6e375 df2d069d09
commit 743dca5c05
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
composer.lock generated
View File

@@ -3416,16 +3416,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
"reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"shasum": ""
},
"require": {
@@ -3438,6 +3438,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -5856,16 +5860,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
"reference": "30441f2752e493c639526b215ed81d54f369d693"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
"reference": "30441f2752e493c639526b215ed81d54f369d693",
"shasum": ""
},
"require": {
@@ -5879,7 +5883,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
"dev-1.x": "1.x-dev"
}
},
"autoload": {
@@ -5898,7 +5902,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-02-18T18:59:58+00:00"
"time": "2020-06-19T20:22:09+00:00"
},
{
"name": "phpspec/prophecy",
@@ -6217,16 +6221,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.6",
"version": "8.5.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348"
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
"shasum": ""
},
"require": {

12
package-lock.json generated
View File

@@ -8476,9 +8476,9 @@
}
},
"react-toastify": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-6.0.5.tgz",
"integrity": "sha512-1YXSb6Jr478c1TJEyVpxLHFvtmeXGMvdpZc0fke/7lK+MoLBC+NFgB74bq+C2SZe6LdK+K1voEURJoY88WqWvA==",
"version": "6.0.6",
"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-6.0.6.tgz",
"integrity": "sha512-NdHiMhj76Z877kZlXuelVfJONslvpmDTL95FVAoBy2kkU75hiqR5+pu1GdJZfRWPhen9ecdb58d3HmefaJ06Yw==",
"requires": {
"classnames": "^2.2.6",
"prop-types": "^15.7.2",
@@ -8916,9 +8916,9 @@
"dev": true
},
"sass": {
"version": "1.26.8",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.8.tgz",
"integrity": "sha512-yvtzyrKLGiXQu7H12ekXqsfoGT/aTKeMDyVzCB675k1HYuaj0py63i8Uf4SI9CHXj6apDhpfwbUr3gGOjdpu2Q==",
"version": "1.26.9",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.9.tgz",
"integrity": "sha512-t8AkRVi+xvba4yZiLWkJdgJHBFCB3Dh4johniQkPy9ywkgFHNasXFEFP+RG/F6LhQ+aoE4aX+IorIWQjS0esVw==",
"dev": true,
"requires": {
"chokidar": ">=2.0.0 <4.0.0"

4
package.json
View File

@@ -21,7 +21,7 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"resolve-url-loader": "^3.1.0",
"sass": "^1.26.8",
"sass": "^1.26.9",
"sass-loader": "^8.0.0"
},
"dependencies": {
@@ -32,6 +32,6 @@
"react-chartjs-2": "^2.9.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-toastify": "^6.0.5"
"react-toastify": "^6.0.6"
}
}

8
resources/js/components/Home/Settings.js vendored
View File

@@ -54,13 +54,13 @@ export default class Settings extends Component {
var e = this.state.data;
return (
<Row>
<Col lg={{ span: 2, offset: 3 }} md={{ span: 6 }} sm={{ span: 12 }}>
<Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
<Setting name={e.schedule.name} value={e.schedule.value} description={e.schedule.description} />
</Col>
<Col lg={{ span: 2 }} md={{ span: 6 }} sm={{ span: 12 }}>
<Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
<Setting name={e.server.name} value={e.server.value} description={e.server.description} />
</Col>
<Col lg={{ span: 2 }} md={{ span: 6 }} sm={{ span: 12 }}>
<Col lg={{ span: 4 }} md={{ span: 6 }} sm={{ span: 12 }}>
<SettingWithModal title="Notification settings" description="Control which types of notifications the server sends." settings={[
{
obj: e.speedtest_notifications,
@@ -92,7 +92,7 @@ export default class Settings extends Component {
return (
<div>
<Container className="my-4" fluid>
<Container className="my-4">
<Row>
<Col sm={{ span: 12 }} className="mb-3 text-center">
<div className="mouse" onClick={this.toggleShow}>