jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'release/0.5.18'

Browse source
This commit is contained in:
Jonny Barnes 2017-06-23 10:06:27 +01:00
commit 24c200fe4a
4 changed files with 57 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
changelog.md
View file

@ -1,5 +1,8 @@
# Changelog # Changelog
## Version 0.5.18 (2017-06-23)
- Minor change in deploy script to speed things up
## Version 0.5.17 (2017-06-22) ## Version 0.5.17 (2017-06-22)
- Lots of code tidying, especially in the notes controller - Lots of code tidying, especially in the notes controller
- Fix issue#53 regarding uploading photos - Fix issue#53 regarding uploading photos

35
composer.lock generated
View file

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.29.8", "version": "3.30.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "c60a477ad5ba1b120d4d80cbddf97fbe36573996" "reference": "d234cb5e111945eb4bfca7eda0eef07a25750b29"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c60a477ad5ba1b120d4d80cbddf97fbe36573996", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d234cb5e111945eb4bfca7eda0eef07a25750b29",
"reference": "c60a477ad5ba1b120d4d80cbddf97fbe36573996", "reference": "d234cb5e111945eb4bfca7eda0eef07a25750b29",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -84,7 +84,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2017-06-19T19:14:37+00:00" "time": "2017-06-22T22:40:58+00:00"
}, },
{ {
"name": "barnabywalters/mf-cleaner", "name": "barnabywalters/mf-cleaner",
@ -1042,16 +1042,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.2.3", "version": "6.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1061,9 +1061,12 @@
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"phpunit/phpunit": "^4.0", "phpunit/phpunit": "^4.0 || ^5.0",
"psr/log": "^1.0" "psr/log": "^1.0"
}, },
"suggest": {
"psr/log": "Required for using the Log middleware"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -1100,7 +1103,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2017-02-28T22:50:30+00:00" "time": "2017-06-22T18:50:49+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -4902,16 +4905,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "5.7.20", "version": "5.7.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b" "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db",
"reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b", "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4980,7 +4983,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-05-22T07:42:55+00:00" "time": "2017-06-21T08:11:54+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",

58
routes/web.php
View file

@ -88,21 +88,40 @@ Route::group(['domain' => config('url.longurl')], function () {
}); });
//Blog pages using ArticlesController //Blog pages using ArticlesController
Route::get('blog/feed.rss', 'FeedsController@blogRss'); Route::group(['prefix' => 'blog'], function () {
Route::get('blog/feed.atom', 'FeedsController@blogAtom'); Route::get('/feed.rss', 'FeedsController@blogRss');
Route::get('blog/feed.json', 'FeedsController@blogJson'); Route::get('/feed.atom', 'FeedsController@blogAtom');
Route::get('blog/s/{id}', 'ArticlesController@onlyIdInURL'); Route::get('/feed.json', 'FeedsController@blogJson');
Route::get('blog/{year?}/{month?}', 'ArticlesController@index'); Route::get('/s/{id}', 'ArticlesController@onlyIdInURL');
Route::get('blog/{year}/{month}/{slug}', 'ArticlesController@show'); Route::get('/{year?}/{month?}', 'ArticlesController@index');
Route::get('/{year}/{month}/{slug}', 'ArticlesController@show');
});
//Notes pages using NotesController //Notes pages using NotesController
Route::get('notes', 'NotesController@index'); Route::group(['prefix' => 'notes'], function () {
Route::get('notes/feed.rss', 'FeedsController@notesRss'); Route::get('/', 'NotesController@index');
Route::get('notes/feed.atom', 'FeedsController@notesAtom'); Route::get('/feed.rss', 'FeedsController@notesRss');
Route::get('notes/feed.json', 'FeedsController@notesJson'); Route::get('/feed.atom', 'FeedsController@notesAtom');
Route::get('notes/{id}', 'NotesController@show'); Route::get('/feed.json', 'FeedsController@notesJson');
Route::get('note/{id}', 'NotesController@redirect'); Route::get('/{id}', 'NotesController@show');
Route::get('notes/tagged/{tag}', 'NotesController@tagged'); 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 // IndieAuth
Route::post('indieauth/start', 'IndieAuthController@start')->name('indieauth-start'); Route::post('indieauth/start', 'IndieAuthController@start')->name('indieauth-start');
@ -112,19 +131,6 @@ Route::group(['domain' => config('url.longurl')], function () {
// Token Endpoint // Token Endpoint
Route::post('api/token', 'TokenEndpointController@create'); 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 // Micropub Endpoints
Route::get('api/post', 'MicropubController@get')->middleware('micropub.token'); Route::get('api/post', 'MicropubController@get')->middleware('micropub.token');
Route::post('api/post', 'MicropubController@post')->middleware('micropub.token'); Route::post('api/post', 'MicropubController@post')->middleware('micropub.token');

3
scripts/deploy.sh
View file

@ -3,6 +3,9 @@
echo "Putting the Laravel app in maintenance mode" echo "Putting the Laravel app in maintenance mode"
php artisan down php artisan down
echo "Pulling the latest changes"
git pull
echo "Updating composer and dependencies" echo "Updating composer and dependencies"
sudo composer self-update sudo composer self-update
composer install composer install