diff --git a/public/js/app.js b/public/js/app.js index 24d6b2cc..e7ae6b17 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -146695,7 +146695,7 @@ var TableRow = /*#__PURE__*/function (_Component) { }); _defineProperty(_assertThisInitialized(_this), "delete", function (id) { - var url = 'api/speedtest/delete/' + id; + var url = 'api/speedtest/delete/' + id + '?token=' + window.token; axios__WEBPACK_IMPORTED_MODULE_3___default.a["delete"](url).then(function (resp) { console.log(resp); react_toastify__WEBPACK_IMPORTED_MODULE_4__["toast"].success('Speedtest deleted'); @@ -148414,6 +148414,22 @@ var SettingsIndex = /*#__PURE__*/function (_Component) { inline: true, earlyReturn: true, classes: 'mr-2' + }], + influxdb: [{ + obj: data.influx_db_enabled, + type: 'checkbox' + }, { + obj: data.influx_db_host, + type: 'text' + }, { + obj: data.influx_db_port, + type: 'number' + }, { + obj: data.influx_db_username, + type: 'text' + }, { + obj: data.influx_db_password, + type: 'password' }] }; }); @@ -148552,6 +148568,10 @@ var SettingsInput = /*#__PURE__*/function (_Component) { input = _this.generateTextInput(disabled); } + if (_this.state.type === 'password') { + input = _this.generatePasswordInput(disabled); + } + if (_this.state.type === 'btn-get') { input = _this.generateButtonGetInput(); } @@ -148665,6 +148685,17 @@ var SettingsInput = /*#__PURE__*/function (_Component) { onInput: this.handleInput }); } + }, { + key: "generatePasswordInput", + value: function generatePasswordInput(disabled) { + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_1__["Form"].Control, { + name: this.state.name, + type: this.state.type, + defaultValue: this.state.value, + disabled: disabled, + onInput: this.handleInput + }); + } }, { key: "generateButtonGetInput", value: function generateButtonGetInput() { @@ -148723,6 +148754,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _tabs_NotificationsSettings__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./tabs/NotificationsSettings */ "./resources/js/components/Settings/tabs/NotificationsSettings.js"); /* harmony import */ var _Authentication_Authentication__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../Authentication/Authentication */ "./resources/js/components/Authentication/Authentication.js"); /* harmony import */ var _tabs_TableSettings__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./tabs/TableSettings */ "./resources/js/components/Settings/tabs/TableSettings.js"); +/* harmony import */ var _tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./tabs/InfluxDBSettings */ "./resources/js/components/Settings/tabs/InfluxDBSettings.js"); function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -148762,6 +148794,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope + var SettingsTabs = /*#__PURE__*/function (_Component) { _inherits(SettingsTabs, _Component); @@ -148775,7 +148808,7 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { _this = _super.call(this, props); _defineProperty(_assertThisInitialized(_this), "generateTabs", function () { - var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'Reset', 'Backup/Restore']; + var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'InfluxDB', 'Reset', 'Backup/Restore']; if (window.config.auth) { tabs.push('Authentication'); @@ -148881,6 +148914,13 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { save: _this.save }); + case 'InfluxDB': + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__["default"], { + data: data.influxdb, + generateInputs: _this.generateInputs, + save: _this.save + }); + case 'Reset': return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_ResetSettings__WEBPACK_IMPORTED_MODULE_6__["default"], { data: data.healthchecks, @@ -149356,6 +149396,115 @@ if (document.getElementById('HealthchecksSettings')) { /***/ }), +/***/ "./resources/js/components/Settings/tabs/InfluxDBSettings.js": +/*!*******************************************************************!*\ + !*** ./resources/js/components/Settings/tabs/InfluxDBSettings.js ***! + \*******************************************************************/ +/*! exports provided: default */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return InfluxDBSettings; }); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js"); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var react_bootstrap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-bootstrap */ "./node_modules/react-bootstrap/esm/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_3__); +function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } + +function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + +function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } + +function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } + +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } + +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + + + + + + +var InfluxDBSettings = /*#__PURE__*/function (_Component) { + _inherits(InfluxDBSettings, _Component); + + var _super = _createSuper(InfluxDBSettings); + + function InfluxDBSettings(props) { + var _this; + + _classCallCheck(this, InfluxDBSettings); + + _this = _super.call(this, props); + + _defineProperty(_assertThisInitialized(_this), "inputHandler", function (name, val) { + var settings = _this.state.data; + var i = 0; + settings.forEach(function (ele) { + if (ele.obj.name == name) { + ele.obj.value = val; + } + + settings[i] = ele; + i++; + }); + + _this.setState({ + data: settings + }); + }); + + _this.state = { + data: _this.props.data + }; + return _this; + } + + _createClass(InfluxDBSettings, [{ + key: "render", + value: function render() { + var _this2 = this; + + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_2__["Tab"].Content, null, settings, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { + className: "mt-3" + }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { + className: "btn btn-primary", + onClick: function onClick() { + _this2.props.save(_this2.state.data, 'healthchecks.io'); + } + }, "Save"))); + } + }]); + + return InfluxDBSettings; +}(react__WEBPACK_IMPORTED_MODULE_0__["Component"]); + + + +if (document.getElementById('InfluxDBSettings')) { + react_dom__WEBPACK_IMPORTED_MODULE_1___default.a.render( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(InfluxDBSettings, null), document.getElementById('InfluxDBSettings')); +} + +/***/ }), + /***/ "./resources/js/components/Settings/tabs/NotificationsSettings.js": /*!************************************************************************!*\ !*** ./resources/js/components/Settings/tabs/NotificationsSettings.js ***! diff --git a/resources/js/components/Settings/SettingsIndex.js b/resources/js/components/Settings/SettingsIndex.js index ddd5c8cf..4c831856 100644 --- a/resources/js/components/Settings/SettingsIndex.js +++ b/resources/js/components/Settings/SettingsIndex.js @@ -259,7 +259,29 @@ export default class SettingsIndex extends Component { classes: 'mr-2' }, - ] + ], + influxdb: [ + { + obj: data.influx_db_enabled, + type: 'checkbox' + }, + { + obj: data.influx_db_host, + type: 'text' + }, + { + obj: data.influx_db_port, + type: 'number' + }, + { + obj: data.influx_db_username, + type: 'text' + }, + { + obj: data.influx_db_password, + type: 'password' + } + ], }; } diff --git a/resources/js/components/Settings/SettingsInput.js b/resources/js/components/Settings/SettingsInput.js index 464edd3c..caca1a54 100644 --- a/resources/js/components/Settings/SettingsInput.js +++ b/resources/js/components/Settings/SettingsInput.js @@ -112,6 +112,15 @@ export default class SettingsInput extends Component { onInput={this.handleInput} /> } + generatePasswordInput(disabled) { + return + } + generateButtonGetInput() { var url = this.state.url; @@ -146,6 +155,10 @@ export default class SettingsInput extends Component { input = this.generateTextInput(disabled); } + if(this.state.type === 'password') { + input = this.generatePasswordInput(disabled); + } + if(this.state.type === 'btn-get') { input = this.generateButtonGetInput(); } diff --git a/resources/js/components/Settings/SettingsTabs.js b/resources/js/components/Settings/SettingsTabs.js index d4721dac..28ff1825 100644 --- a/resources/js/components/Settings/SettingsTabs.js +++ b/resources/js/components/Settings/SettingsTabs.js @@ -12,6 +12,7 @@ import HealthchecksSettings from './tabs/HealthchecksSettings'; import NotificationsSettings from './tabs/NotificationsSettings'; import Authentication from '../Authentication/Authentication'; import TableSettings from './tabs/TableSettings'; +import InfluxDBSettings from './tabs/InfluxDBSettings'; export default class SettingsTabs extends Component { constructor(props) { @@ -30,6 +31,7 @@ export default class SettingsTabs extends Component { 'Tables', 'Notifications', 'healthchecks.io', + 'InfluxDB', 'Reset', 'Backup/Restore', ]; @@ -138,6 +140,11 @@ export default class SettingsTabs extends Component { data={data.healthchecks} generateInputs={this.generateInputs} save={this.save} /> + case 'InfluxDB': + return case 'Reset': return { + var settings = this.state.data; + var i = 0; + settings.forEach(ele => { + if(ele.obj.name == name) { + ele.obj.value = val; + } + settings[i] = ele; + i++; + }); + this.setState({ + data: settings + }); + } + + render() { + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + + return ( + + {settings} +
+ +
+ + ); + } +} + +if (document.getElementById('InfluxDBSettings')) { + ReactDOM.render(, document.getElementById('InfluxDBSettings')); +}