From dac08458d410c021511d9bf92e4e7b8bb0531a12 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Fri, 10 Apr 2020 01:13:34 +0100 Subject: [PATCH] Started building update functions out --- app/Helpers/UpdateHelper.php | 13 +++++++++++++ app/Http/Controllers/UpdateController.php | 16 ++++++++++++++++ composer.lock | 10 +++++----- config/app.php | 8 -------- config/speedtest.php | 21 +++++++++++++++++++++ public/js/app.js | 2 +- resources/js/components/Data/Restore.js | 2 +- resources/views/app.blade.php | 2 +- routes/api.php | 8 ++++++++ 9 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 app/Helpers/UpdateHelper.php create mode 100644 app/Http/Controllers/UpdateController.php create mode 100644 config/speedtest.php diff --git a/app/Helpers/UpdateHelper.php b/app/Helpers/UpdateHelper.php new file mode 100644 index 00000000..77aa0d98 --- /dev/null +++ b/app/Helpers/UpdateHelper.php @@ -0,0 +1,13 @@ +json([ + 'update' => UpdateHelper::check(), + ], 200); + } +} diff --git a/composer.lock b/composer.lock index d76fb65c..8806a544 100644 --- a/composer.lock +++ b/composer.lock @@ -690,16 +690,16 @@ }, { "name": "laravel/framework", - "version": "v7.5.1", + "version": "v7.5.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b2457b1ddb9c59396313eae4e948bdc5fa5251db" + "reference": "3a3b3f7fea69813f5a03449c6314bfb42c3ccf78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b2457b1ddb9c59396313eae4e948bdc5fa5251db", - "reference": "b2457b1ddb9c59396313eae4e948bdc5fa5251db", + "url": "https://api.github.com/repos/laravel/framework/zipball/3a3b3f7fea69813f5a03449c6314bfb42c3ccf78", + "reference": "3a3b3f7fea69813f5a03449c6314bfb42c3ccf78", "shasum": "" }, "require": { @@ -837,7 +837,7 @@ "framework", "laravel" ], - "time": "2020-04-07T18:52:38+00:00" + "time": "2020-04-08T15:54:18+00:00" }, { "name": "laravel/tinker", diff --git a/config/app.php b/config/app.php index 0243232d..8409e00e 100644 --- a/config/app.php +++ b/config/app.php @@ -123,14 +123,6 @@ return [ 'cipher' => 'AES-256-CBC', - /* - |-------------------------------------------------------------------------- - | Version numebr - |-------------------------------------------------------------------------- - */ - - 'version' => '1.1.0', - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers diff --git a/config/speedtest.php b/config/speedtest.php new file mode 100644 index 00000000..a49e37b9 --- /dev/null +++ b/config/speedtest.php @@ -0,0 +1,21 @@ + '1.1.0', + + /* + |-------------------------------------------------------------------------- + | GitHub Repo Variables + |-------------------------------------------------------------------------- + */ + + 'user' => 'henrywhitaker3', + 'repo' => 'Speedtest-Tracker', + 'branch' => 'master', +]; diff --git a/public/js/app.js b/public/js/app.js index 2246af1c..6877cd20 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -126769,7 +126769,7 @@ var Restore = /*#__PURE__*/function (_Component) { }; var url = '/api/restore'; axios__WEBPACK_IMPORTED_MODULE_4___default.a.post(url, data).then(function (resp) { - react_toastify__WEBPACK_IMPORTED_MODULE_3__["toast"].success('Your is being restored...'); + react_toastify__WEBPACK_IMPORTED_MODULE_3__["toast"].success('Your data is being restored...'); _this.setState({ show: false, diff --git a/resources/js/components/Data/Restore.js b/resources/js/components/Data/Restore.js index 1c472efa..ffd28268 100644 --- a/resources/js/components/Data/Restore.js +++ b/resources/js/components/Data/Restore.js @@ -57,7 +57,7 @@ export default class Restore extends Component { Axios.post(url, data) .then((resp) => { - toast.success('Your is being restored...'); + toast.success('Your data is being restored...'); this.setState({ show: false, data: null, diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index cdb73d5b..f93ffdf6 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -5,7 +5,7 @@ - + diff --git a/routes/api.php b/routes/api.php index 353f9372..45580e18 100644 --- a/routes/api.php +++ b/routes/api.php @@ -37,3 +37,11 @@ Route::group([ Route::post('restore', 'BackupController@restore') ->name('data.restore'); }); + +Route::group([ + 'middleware' => 'api', + 'prefix' => 'update', +], function () { + Route::get('check', 'UpdateController@checkForUpdate') + ->name('update.check'); +});