From 8736789d87bf38721a2cf1b8a6ce068ee2a88bf4 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Jun 2017 08:17:53 +0100 Subject: [PATCH 1/4] Housekeeping the routes file --- routes/web.php | 58 ++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/routes/web.php b/routes/web.php index 6e777391..a8a9281b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -88,21 +88,40 @@ Route::group(['domain' => config('url.longurl')], function () { }); //Blog pages using ArticlesController - Route::get('blog/feed.rss', 'FeedsController@blogRss'); - Route::get('blog/feed.atom', 'FeedsController@blogAtom'); - Route::get('blog/feed.json', 'FeedsController@blogJson'); - Route::get('blog/s/{id}', 'ArticlesController@onlyIdInURL'); - Route::get('blog/{year?}/{month?}', 'ArticlesController@index'); - Route::get('blog/{year}/{month}/{slug}', 'ArticlesController@show'); + Route::group(['prefix' => 'blog'], function () { + Route::get('/feed.rss', 'FeedsController@blogRss'); + Route::get('/feed.atom', 'FeedsController@blogAtom'); + Route::get('/feed.json', 'FeedsController@blogJson'); + Route::get('/s/{id}', 'ArticlesController@onlyIdInURL'); + Route::get('/{year?}/{month?}', 'ArticlesController@index'); + Route::get('/{year}/{month}/{slug}', 'ArticlesController@show'); + }); //Notes pages using NotesController - Route::get('notes', 'NotesController@index'); - Route::get('notes/feed.rss', 'FeedsController@notesRss'); - Route::get('notes/feed.atom', 'FeedsController@notesAtom'); - Route::get('notes/feed.json', 'FeedsController@notesJson'); - Route::get('notes/{id}', 'NotesController@show'); - Route::get('note/{id}', 'NotesController@redirect'); - Route::get('notes/tagged/{tag}', 'NotesController@tagged'); + Route::group(['prefix' => 'notes'], function () { + Route::get('/', 'NotesController@index'); + Route::get('/feed.rss', 'FeedsController@notesRss'); + Route::get('/feed.atom', 'FeedsController@notesAtom'); + Route::get('/feed.json', 'FeedsController@notesJson'); + Route::get('/{id}', 'NotesController@show'); + Route::get('/tagged/{tag}', 'NotesController@tagged'); + }); + Route::get('note/{id}', 'NotesController@redirect'); // for legacy note URLs + + // Micropub Client + Route::group(['prefix' => 'micropub'], function () { + Route::get('/create', 'MicropubClientController@create')->name('micropub-client'); + Route::post('/', 'MicropubClientController@store')->name('micropub-client-post'); + Route::get('/config', 'MicropubClientController@config')->name('micropub-config'); + Route::get('/get-new-token', 'MicropubClientController@getNewToken')->name('micropub-client-get-new-token'); + Route::get('/get-new-token/callback', 'MicropubClientController@getNewTokenCallback')->name('micropub-client-get-new-token-callback'); + Route::get('/query-endpoint', 'MicropubClientController@queryEndpoint')->name('micropub-query-action'); + Route::post('/update-syntax', 'MicropubClientController@updateSyntax')->name('micropub-update-syntax'); + Route::get('/places', 'MicropubClientController@nearbyPlaces'); + Route::post('/places', 'MicropubClientController@newPlace'); + Route::post('/media', 'MicropubClientController@processMedia')->name('process-media'); + Route::get('/media/clearlinks', 'MicropubClientController@clearLinks'); + }); // IndieAuth Route::post('indieauth/start', 'IndieAuthController@start')->name('indieauth-start'); @@ -112,19 +131,6 @@ Route::group(['domain' => config('url.longurl')], function () { // Token Endpoint Route::post('api/token', 'TokenEndpointController@create'); - // Micropub Client - Route::get('micropub/create', 'MicropubClientController@create')->name('micropub-client'); - Route::post('micropub', 'MicropubClientController@store')->name('micropub-client-post'); - Route::get('micropub/config', 'MicropubClientController@config')->name('micropub-config'); - Route::get('micropub/get-new-token', 'MicropubClientController@getNewToken')->name('micropub-client-get-new-token'); - Route::get('micropub/get-new-token/callback', 'MicropubClientController@getNewTokenCallback')->name('micropub-client-get-new-token-callback'); - Route::get('micropub/query-endpoint', 'MicropubClientController@queryEndpoint')->name('micropub-query-action'); - Route::post('micropub/update-syntax', 'MicropubClientController@updateSyntax')->name('micropub-update-syntax'); - Route::get('micropub/places', 'MicropubClientController@nearbyPlaces'); - Route::post('micropub/places', 'MicropubClientController@newPlace'); - Route::post('micropub/media', 'MicropubClientController@processMedia')->name('process-media'); - Route::get('micropub/media/clearlinks', 'MicropubClientController@clearLinks'); - // Micropub Endpoints Route::get('api/post', 'MicropubController@get')->middleware('micropub.token'); Route::post('api/post', 'MicropubController@post')->middleware('micropub.token'); From bfd74ad78d00f3db94f4f555a023fc486f3f3d75 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Jun 2017 10:04:19 +0100 Subject: [PATCH 2/4] Change deploy script to also pull in code changes --- composer.lock | 35 +++++++++++++++++++---------------- scripts/deploy.sh | 3 +++ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index aa79cbcc..aa0c6e31 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.29.8", + "version": "3.30.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "c60a477ad5ba1b120d4d80cbddf97fbe36573996" + "reference": "d234cb5e111945eb4bfca7eda0eef07a25750b29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c60a477ad5ba1b120d4d80cbddf97fbe36573996", - "reference": "c60a477ad5ba1b120d4d80cbddf97fbe36573996", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d234cb5e111945eb4bfca7eda0eef07a25750b29", + "reference": "d234cb5e111945eb4bfca7eda0eef07a25750b29", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2017-06-19T19:14:37+00:00" + "time": "2017-06-22T22:40:58+00:00" }, { "name": "barnabywalters/mf-cleaner", @@ -1042,16 +1042,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.2.3", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { @@ -1061,9 +1061,12 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { @@ -1100,7 +1103,7 @@ "rest", "web service" ], - "time": "2017-02-28T22:50:30+00:00" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", @@ -4902,16 +4905,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.20", + "version": "5.7.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b" + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b", - "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", "shasum": "" }, "require": { @@ -4980,7 +4983,7 @@ "testing", "xunit" ], - "time": "2017-05-22T07:42:55+00:00" + "time": "2017-06-21T08:11:54+00:00" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/scripts/deploy.sh b/scripts/deploy.sh index bf25d95d..27f264c1 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -3,6 +3,9 @@ echo "Putting the Laravel app in maintenance mode" php artisan down +echo "Pulling the latest changes" +git pull + echo "Updating composer and dependencies" sudo composer self-update composer install From 1feeafd39a46d04c7640100f7fa74450244c7d75 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Jun 2017 10:05:30 +0100 Subject: [PATCH 3/4] update changelog --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index 379ae837..31d53700 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Minor change in deploy script to speed things up + ## Version 0.5.17 (2017-06-22) - Lots of code tidying, especially in the notes controller - Fix issue#53 regarding uploading photos From d7b8e1a516a79a26bce24fa2ed960475ad058555 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Jun 2017 10:06:21 +0100 Subject: [PATCH 4/4] Bump version number to 0.5.18 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 31d53700..d864d522 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.5.18 (2017-06-23) - Minor change in deploy script to speed things up ## Version 0.5.17 (2017-06-22)