jonny/jonnybarnes.uk
Watch
1
0
Fork
You've already forked jonnybarnes.uk
 0
Code Issues 9 Pull requests Projects Releases 35 Packages Wiki Activity Actions

Merge branch 'release/0.2.4'

Browse source
This commit is contained in:
Jonny Barnes 2017-02-15 16:22:18 +00:00
commit 968b044db2
27 changed files with 277 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -50,3 +50,5 @@ TWITTER_ACCESS_TOKEN=
TWITTER_ACCESS_TOKEN_SECRET=
SCOUT_DRIVER=pgsql
PIWIK=false

16
app/Http/Controllers/ArticlesController.php
View file

@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use App\Article;
use Illuminate\Http\Response;
use Jonnybarnes\IndieWeb\Numbers;
class ArticlesController extends Controller
@ -16,11 +15,11 @@ class ArticlesController extends Controller
public function showAllArticles($year = null, $month = null)
{
$articles = Article::where('published', '1')
->date($year, $month)
->orderBy('updated_at', 'desc')
->simplePaginate(5);
->date($year, $month)
->orderBy('updated_at', 'desc')
->simplePaginate(5);
return view('multipost', ['data' => $articles]);
return view('articles', compact('articles'));
}
/**
@ -35,7 +34,7 @@ class ArticlesController extends Controller
throw new \Exception;
}
return view('singlepost', ['article' => $article]);
return view('article', compact('article'));
}
/**
@ -62,8 +61,9 @@ class ArticlesController extends Controller
{
$articles = Article::where('published', '1')->orderBy('updated_at', 'desc')->get();
$buildDate = $articles->first()->updated_at->toRssString();
$contents = (string) view('rss', ['articles' => $articles, 'buildDate' => $buildDate]);
return (new Response($contents, '200'))->header('Content-Type', 'application/rss+xml');
return response()
->view('rss', compact('articles', 'buildDate'), 200)
->header('Content-Type', 'application/rss+xml');
}
}

2
app/Http/Controllers/ContactsController.php
View file

@ -25,7 +25,7 @@ class ContactsController extends Controller
'/assets/profile-images/default-image';
}
return view('contacts', ['contacts' => $contacts]);
return view('contacts', compact('contacts'));
}
/**

11
app/Http/Controllers/NotesController.php
View file

@ -63,7 +63,7 @@ class NotesController extends Controller
$homepage = ($request->path() == '/');
return view('allnotes', ['notes' => $notes, 'homepage' => $homepage]);
return view('notes', compact('notes', 'homepage'));
}
/**
@ -161,12 +161,7 @@ class NotesController extends Controller
}
$note->photoURLs = $photoURLs;
return view('singlenote', [
'note' => $note,
'replies' => $replies,
'reposts' => $reposts,
'likes' => $likes,
]);
return view('note', compact('note', 'replies', 'reposts', 'likes'));
}
/**
@ -201,7 +196,7 @@ class NotesController extends Controller
$note->human_time = $note->updated_at->diffForHumans();
}
return view('taggednotes', ['notes' => $notes, 'tag' => $tag]);
return view('taggednotes', compact('notes', 'tag'));
}
/**

5
changelog.md
View file

@ -1,5 +1,10 @@
# Changelog
## Version 0.2.4 (2017-02-15)
- Make embedded youtube iframe a dynamic size
- Add Piwik tracking code
- Minor profile tweaks
## Version 0.2.3 (2017-02-05)
- Autolink/embed youtube videos and spotify links

212
composer.lock generated
View file

@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.21.6",
"version": "3.22.4",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "b51512a4ad4aa080ab963942a1e234265771fcde"
"reference": "916f708c1a643f86f74eacd3c5be787b40d814f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b51512a4ad4aa080ab963942a1e234265771fcde",
"reference": "b51512a4ad4aa080ab963942a1e234265771fcde",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/916f708c1a643f86f74eacd3c5be787b40d814f8",
"reference": "916f708c1a643f86f74eacd3c5be787b40d814f8",
"shasum": ""
},
"require": {
@ -134,7 +134,7 @@
"s3",
"sdk"
],
"time": "2017-01-27T00:34:55+00:00"
"time": "2017-02-14T21:23:54+00:00"
},
{
"name": "barnabywalters/mf-cleaner",
@ -543,16 +543,16 @@
},
{
"name": "doctrine/dbal",
"version": "v2.5.10",
"version": "v2.5.12",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "fc376f7a61498e18520cd6fa083752a4ca08072b"
"reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/fc376f7a61498e18520cd6fa083752a4ca08072b",
"reference": "fc376f7a61498e18520cd6fa083752a4ca08072b",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
"reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
"shasum": ""
},
"require": {
@ -610,7 +610,7 @@
"persistence",
"queryobject"
],
"time": "2017-01-23T23:17:10+00:00"
"time": "2017-02-08T12:53:47+00:00"
},
{
"name": "doctrine/inflector",
@ -1088,16 +1088,16 @@
},
{
"name": "indieauth/client",
"version": "0.1.16",
"version": "0.2.0",
"source": {
"type": "git",
"url": "https://github.com/indieweb/indieauth-client-php.git",
"reference": "81e425892c00afef1b6bf9fe16e771b4503bbb8a"
"reference": "4b9bd766a92b8abbe420f5889bf7ebac7678151d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/indieweb/indieauth-client-php/zipball/81e425892c00afef1b6bf9fe16e771b4503bbb8a",
"reference": "81e425892c00afef1b6bf9fe16e771b4503bbb8a",
"url": "https://api.github.com/repos/indieweb/indieauth-client-php/zipball/4b9bd766a92b8abbe420f5889bf7ebac7678151d",
"reference": "4b9bd766a92b8abbe420f5889bf7ebac7678151d",
"shasum": ""
},
"require": {
@ -1123,7 +1123,7 @@
}
],
"description": "IndieAuth Client Library",
"time": "2016-05-21T16:43:04+00:00"
"time": "2017-02-09T23:42:05+00:00"
},
{
"name": "indieweb/link-rel-parser",
@ -1173,16 +1173,16 @@
},
{
"name": "intervention/image",
"version": "2.3.10",
"version": "2.3.11",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "88911910dcbb7bf617f1370602ba1706489c8505"
"reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/88911910dcbb7bf617f1370602ba1706489c8505",
"reference": "88911910dcbb7bf617f1370602ba1706489c8505",
"url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
"reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
"shasum": ""
},
"require": {
@ -1231,7 +1231,7 @@
"thumbnail",
"watermark"
],
"time": "2017-01-25T18:52:04+00:00"
"time": "2017-02-04T10:37:19+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@ -1510,16 +1510,16 @@
},
{
"name": "laravel/framework",
"version": "v5.4.9",
"version": "v5.4.12",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "600330ae1d218919b3b307e0578461a2df248663"
"reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/600330ae1d218919b3b307e0578461a2df248663",
"reference": "600330ae1d218919b3b307e0578461a2df248663",
"url": "https://api.github.com/repos/laravel/framework/zipball/707f32d32dce58232f7a860e0a1d62caf6f9dbfc",
"reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc",
"shasum": ""
},
"require": {
@ -1635,7 +1635,7 @@
"framework",
"laravel"
],
"time": "2017-02-03T19:47:35+00:00"
"time": "2017-02-15T14:31:32+00:00"
},
{
"name": "laravel/scout",
@ -1884,16 +1884,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.34",
"version": "1.0.35",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299"
"reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299",
"reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062",
"reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062",
"shasum": ""
},
"require": {
@ -1963,7 +1963,7 @@
"sftp",
"storage"
],
"time": "2017-01-30T17:41:17+00:00"
"time": "2017-02-09T11:33:58+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
@ -2400,16 +2400,16 @@
},
{
"name": "nikic/php-parser",
"version": "v3.0.3",
"version": "v3.0.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "5b8182cc0abb4b0ff290ba9df6c0e1323286013a"
"reference": "0bf561dfe75ba80441c22adecc0529056671a7d2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5b8182cc0abb4b0ff290ba9df6c0e1323286013a",
"reference": "5b8182cc0abb4b0ff290ba9df6c0e1323286013a",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0bf561dfe75ba80441c22adecc0529056671a7d2",
"reference": "0bf561dfe75ba80441c22adecc0529056671a7d2",
"shasum": ""
},
"require": {
@ -2447,7 +2447,7 @@
"parser",
"php"
],
"time": "2017-02-03T21:57:31+00:00"
"time": "2017-02-10T20:20:03+00:00"
},
{
"name": "paragonie/random_compat",
@ -3226,16 +3226,16 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.5",
"version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "cd142238a339459b10da3d8234220963f392540c"
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c",
"reference": "cd142238a339459b10da3d8234220963f392540c",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"shasum": ""
},
"require": {
@ -3276,20 +3276,20 @@
"mail",
"mailer"
],
"time": "2016-12-29T10:02:40+00:00"
"time": "2017-02-13T07:52:53+00:00"
},
{
"name": "symfony/console",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "4f9e449e76996adf310498a8ca955c6deebe29dd"
"reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/4f9e449e76996adf310498a8ca955c6deebe29dd",
"reference": "4f9e449e76996adf310498a8ca955c6deebe29dd",
"url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936",
"reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936",
"shasum": ""
},
"require": {
@ -3339,7 +3339,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2017-01-08T20:47:33+00:00"
"time": "2017-02-06T12:04:21+00:00"
},
{
"name": "symfony/css-selector",
@ -3396,16 +3396,16 @@
},
{
"name": "symfony/debug",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05"
"reference": "b4d9818f127c60ce21ed62c395da7df868dc8477"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/810ba5c1c5352a4ddb15d4719e8936751dff0b05",
"reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05",
"url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477",
"reference": "b4d9818f127c60ce21ed62c395da7df868dc8477",
"shasum": ""
},
"require": {
@ -3449,11 +3449,11 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2017-01-02T20:32:22+00:00"
"time": "2017-01-28T02:37:08+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@ -3513,7 +3513,7 @@
},
{
"name": "symfony/finder",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@ -3562,16 +3562,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "33eb76bf1d833c705433e5361a646c164696394b"
"reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/33eb76bf1d833c705433e5361a646c164696394b",
"reference": "33eb76bf1d833c705433e5361a646c164696394b",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e192b04de44aa1ed0e39d6793f7e06f5e0b672a0",
"reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0",
"shasum": ""
},
"require": {
@ -3611,20 +3611,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2017-01-08T20:47:33+00:00"
"time": "2017-02-02T13:47:35+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "8a898e340a89022246645b1288d295f49c9381e4"
"reference": "96443239baf674b143604fb87cb27cb01672ab77"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/8a898e340a89022246645b1288d295f49c9381e4",
"reference": "8a898e340a89022246645b1288d295f49c9381e4",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/96443239baf674b143604fb87cb27cb01672ab77",
"reference": "96443239baf674b143604fb87cb27cb01672ab77",
"shasum": ""
},
"require": {
@ -3693,7 +3693,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2017-01-12T21:36:33+00:00"
"time": "2017-02-06T13:15:19+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@ -3756,16 +3756,16 @@
},
{
"name": "symfony/process",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893"
"reference": "32646a7cf53f3956c76dcb5c82555224ae321858"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893",
"reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893",
"url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858",
"reference": "32646a7cf53f3956c76dcb5c82555224ae321858",
"shasum": ""
},
"require": {
@ -3801,20 +3801,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2017-01-02T20:32:22+00:00"
"time": "2017-02-03T12:11:38+00:00"
},
{
"name": "symfony/routing",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "fda2c67d47ec801726ca888c95d701d31b27b444"
"reference": "af464432c177dbcdbb32295113b7627500331f2d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/fda2c67d47ec801726ca888c95d701d31b27b444",
"reference": "fda2c67d47ec801726ca888c95d701d31b27b444",
"url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d",
"reference": "af464432c177dbcdbb32295113b7627500331f2d",
"shasum": ""
},
"require": {
@ -3876,20 +3876,20 @@
"uri",
"url"
],
"time": "2017-01-02T20:32:22+00:00"
"time": "2017-01-28T02:37:08+00:00"
},
{
"name": "symfony/translation",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda"
"reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/6520f3d4cce604d9dd1e86cac7af954984dd9bda",
"reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda",
"url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5",
"reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5",
"shasum": ""
},
"require": {
@ -3940,20 +3940,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2017-01-02T20:32:22+00:00"
"time": "2017-01-21T17:06:35+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2"
"reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b54b23f9a19b465e76fdaac0f6732410467c83b2",
"reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511",
"reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511",
"shasum": ""
},
"require": {
@ -4003,7 +4003,7 @@
"debug",
"dump"
],
"time": "2017-01-03T08:53:57+00:00"
"time": "2017-01-24T12:58:58+00:00"
},
{
"name": "themattharris/tmhoauth",
@ -4440,22 +4440,22 @@
},
{
"name": "laravel/browser-kit-testing",
"version": "v1.0.2",
"version": "v1.0.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/browser-kit-testing.git",
"reference": "60e038e3dcfef2977347f9610c14b48721802278"
"reference": "0adfb725147815bff5516d157577f375a6e66ebd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/60e038e3dcfef2977347f9610c14b48721802278",
"reference": "60e038e3dcfef2977347f9610c14b48721802278",
"url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/0adfb725147815bff5516d157577f375a6e66ebd",
"reference": "0adfb725147815bff5516d157577f375a6e66ebd",
"shasum": ""
},
"require": {
"php": ">=5.5.9",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/css-selector": "~3.1",
"symfony/dom-crawler": "~3.1"
},
"type": "library",
"extra": {
@ -4483,7 +4483,7 @@
"laravel",
"testing"
],
"time": "2017-01-25T13:07:25+00:00"
"time": "2017-02-08T22:32:37+00:00"
},
{
"name": "maximebf/debugbar",
@ -4548,16 +4548,16 @@
},
{
"name": "mockery/mockery",
"version": "0.9.7",
"version": "0.9.8",
"source": {
"type": "git",
"url": "https://github.com/padraic/mockery.git",
"reference": "4de7969f4664da3cef1ccd83866c9f59378c3371"
"reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/padraic/mockery/zipball/4de7969f4664da3cef1ccd83866c9f59378c3371",
"reference": "4de7969f4664da3cef1ccd83866c9f59378c3371",
"url": "https://api.github.com/repos/padraic/mockery/zipball/1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
"reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
"shasum": ""
},
"require": {
@ -4609,7 +4609,7 @@
"test double",
"testing"
],
"time": "2016-12-19T14:50:55+00:00"
"time": "2017-02-09T13:29:38+00:00"
},
{
"name": "myclabs/deep-copy",
@ -5108,16 +5108,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.7.9",
"version": "5.7.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "69f832b87c731d5cacad7f91948778fe98335fdd"
"reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69f832b87c731d5cacad7f91948778fe98335fdd",
"reference": "69f832b87c731d5cacad7f91948778fe98335fdd",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
"reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
"shasum": ""
},
"require": {
@ -5134,11 +5134,11 @@
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.2.2",
"sebastian/comparator": "^1.2.4",
"sebastian/diff": "~1.2",
"sebastian/environment": "^1.3.4 || ^2.0",
"sebastian/exporter": "~2.0",
"sebastian/global-state": "^1.0 || ^2.0",
"sebastian/global-state": "^1.1",
"sebastian/object-enumerator": "~2.0",
"sebastian/resource-operations": "~1.0",
"sebastian/version": "~1.0|~2.0",
@ -5186,7 +5186,7 @@
"testing",
"xunit"
],
"time": "2017-01-28T06:14:33+00:00"
"time": "2017-02-10T09:05:10+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -5818,16 +5818,16 @@
},
{
"name": "symfony/yaml",
"version": "v3.2.2",
"version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "50eadbd7926e31842893c957eca362b21592a97d"
"reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/50eadbd7926e31842893c957eca362b21592a97d",
"reference": "50eadbd7926e31842893c957eca362b21592a97d",
"url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b",
"reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b",
"shasum": ""
},
"require": {
@ -5869,7 +5869,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2017-01-03T13:51:32+00:00"
"time": "2017-01-21T17:06:35+00:00"
},
{
"name": "webmozart/assert",

2
config/app.php
View file

@ -271,4 +271,6 @@ return [
],
'piwik' => env('PIWIK', false),
];

8
package.json
View file

@ -5,12 +5,10 @@
"license": "CC0-1.0",
"dependencies": {
"alertify.js": "^1.0.12",
"autolinker": "^1.2.0",
"mapbox-gl": "^0.29.0",
"mapbox-gl": "^0.32.0",
"marked": "^0.3.6",
"normalize.css": "^5.0.0",
"webStorage": "^1.2.2",
"whatwg-fetch": "^1.0.0"
"webStorage": "^1.2.2"
},
"devDependencies": {
"babel-cli": "^6.18.0",
@ -21,7 +19,7 @@
"babel-runtime": "^6.20.0",
"lint-staged": "^3.2.1",
"pre-commit": "^1.1.3",
"stylelint-config-standard": "^14.0.0",
"stylelint-config-standard": "^16.0.0",
"webpack": "^2.2.0"
},
"private": true,

2
public/assets/css/app.css vendored
View file

File diff suppressed because one or more lines are too long

BIN
public/assets/css/app.css.br
View file

Binary file not shown.

BIN
public/assets/css/app.css.gz
View file

Binary file not shown.

2
public/assets/css/app.css.map
View file

@ -1 +1 @@
{"version":3,"sources":["../../../resources/assets/sass/app.scss","../../../resources/assets/sass/layout.scss","../../../resources/assets/sass/styles.scss","../../../resources/assets/sass/pagination.scss","../../../resources/assets/sass/note-form.scss","../../../resources/assets/sass/mapbox.scss","../../../resources/assets/sass/contacts.scss","../../../resources/assets/sass/emoji.scss"],"names":[],"mappings":"AAIA,KACI,sBACA,cAAe,CAClB,qBAKG,kBAAmB,CACtB,KCVG,eACA,cACA,iBACA,kBACA,oBAAqB,CACxB,WAGG,iBAAkB,CACrB,SAGG,gBAAiB,CACpB,MAGG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,eAGG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,gBAAiB,CACpB,cAGG,oBACA,AADA,aACA,yBAAmB,AAAnB,kBAAmB,CACtB,kBAGG,gBAAiB,CACpB,iBAGG,qBACA,WAAY,CACf,aAGG,eACA,yBAA0B,CAC7B,OAGG,eAAgB,CACnB,cAGG,eAAgB,CACnB,WAGG,eACA,cACA,iBAAkB,CACrB,sBAGG,cAAe,CAClB,sBAGG,iBACA,cAAe,CAClB,KClEG,6JAWc,CACjB,EAGG,qBACA,wBACA,UAAW,CACd,gBAGG,kBAAmB,CACtB,MAGG,WACA,UAAW,CACd,OAGG,iBACA,iBAAkB,CACrB,WAGG,kBAAmB,CACtB,UAGG,YACA,WAAY,CACf,YC1CG,WACA,YACA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,yBAAmB,AAAnB,kBAAmB,CACtB,eAGG,oBAAqB,CACxB,SCVG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,0BAGG,aACI,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,cAAe,CAClB,CAGL,0BACI,sBACI,UAAW,CACd,CAGL,eACI,UACA,oBACA,gBAAiB,CACpB,oDAIG,mBAAO,AAAP,MAAO,CACV,kBAGG,qBAAsB,CACzB,QAGG,mBAAoB,CACvB,KCnCG,eACA,YAAa,CAChB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,SCtBG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,eACA,6BAA8B,CACjC,aAGG,oBACA,YACA,YAAa,CAChB,sDCPG,iBAAkB,CACrB,gFAIG,kBACA,cACA,UACA,aACA,OACA,cACA,qBACA,yBACA,oBACA,oCACA,yBACA,kCACA,WACA,cACA,0CAAkC,AAAlC,iCAAkC,CACrC,2BAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,AApBC,mBAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CAAA","file":"app.css"}
{"version":3,"sources":["../../../resources/assets/sass/app.scss","../../../resources/assets/sass/layout.scss","../../../resources/assets/sass/styles.scss","../../../resources/assets/sass/pagination.scss","../../../resources/assets/sass/note-form.scss","../../../resources/assets/sass/mapbox.scss","../../../resources/assets/sass/contacts.scss","../../../resources/assets/sass/emoji.scss"],"names":[],"mappings":"AAIA,KACI,sBACA,cAAe,CAClB,qBAKG,kBAAmB,CACtB,KCVG,eACA,cACA,iBACA,kBACA,oBAAqB,CACxB,WAGG,iBAAkB,CACrB,SAGG,gBAAiB,CACpB,MAGG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,eAGG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,gBAAiB,CACpB,cAGG,oBACA,AADA,aACA,yBAAmB,AAAnB,kBAAmB,CACtB,kBAGG,gBAAiB,CACpB,iBAGG,qBACA,WAAY,CACf,aAGG,eACA,yBAA0B,CAC7B,OAGG,eAAgB,CACnB,cAGG,eAAgB,CACnB,WAGG,eACA,cACA,iBAAkB,CACrB,sBAGG,cAAe,CAClB,sBAGG,iBACA,cAAe,CAClB,WAGG,kBACA,WACA,SACA,qBAAsB,CACzB,SAGG,kBACA,MACA,OACA,WACA,WAAY,CACf,KCjFG,6JAWc,CACjB,EAGG,qBACA,wBACA,UAAW,CACd,gBAGG,kBAAmB,CACtB,MAGG,WACA,UAAW,CACd,OAGG,iBACA,iBAAkB,CACrB,WAGG,kBAAmB,CACtB,UAGG,YACA,WAAY,CACf,YC1CG,WACA,YACA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,yBAAmB,AAAnB,kBAAmB,CACtB,eAGG,oBAAqB,CACxB,SCVG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,0BAGG,aACI,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,cAAe,CAClB,CAGL,0BACI,sBACI,UAAW,CACd,CAGL,eACI,UACA,oBACA,gBAAiB,CACpB,oDAIG,mBAAO,AAAP,MAAO,CACV,kBAGG,qBAAsB,CACzB,QAGG,mBAAoB,CACvB,KCnCG,eACA,YAAa,CAChB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,SCtBG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,eACA,6BAA8B,CACjC,aAGG,oBACA,YACA,YAAa,CAChB,sDCPG,iBAAkB,CACrB,gFAIG,kBACA,cACA,UACA,aACA,OACA,cACA,qBACA,yBACA,oBACA,oCACA,yBACA,kCACA,WACA,cACA,0CAAkC,AAAlC,iCAAkC,CACrC,2BAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,AApBC,mBAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CAAA","file":"app.css"}

2
public/assets/js/links.js
View file

@ -1 +1 @@
!function(t){function e(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var r={};return e.m=t,e.c=r,e.i=function(t){return t},e.d=function(t,r,n){e.o(t,r)||Object.defineProperty(t,r,{configurable:!1,enumerable:!0,get:n})},e.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(r,"a",r),r},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=18)}({18:function(t,e){var r=/watch\?v=([A-Za-z0-9\-_]+)\b/,n=/https\:\/\/play\.spotify\.com\/(.*)\b/,o=document.querySelectorAll(".e-content"),a=!0,u=!1,i=void 0;try{for(var c,l=o[Symbol.iterator]();!(a=(c=l.next()).done);a=!0){var s=c.value,f=s.textContent.match(r);if(f){var p=document.createElement("iframe");p.classList.add("youtube"),p.setAttribute("src","https://www.youtube.com/embed/"+f[1]),p.setAttribute("frameborder",0),p.setAttribute("allowfullscreen","true"),s.appendChild(p)}var d=s.textContent.match(n);if(d){var b=d[1].replace("/",":"),m=document.createElement("iframe");m.classList.add("spotify"),m.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+b),m.setAttribute("frameborder",0),m.setAttribute("allowtransparency","true"),s.appendChild(m)}}}catch(t){u=!0,i=t}finally{try{!a&&l.return&&l.return()}finally{if(u)throw i}}}});
!function(t){function e(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var r={};return e.m=t,e.c=r,e.i=function(t){return t},e.d=function(t,r,n){e.o(t,r)||Object.defineProperty(t,r,{configurable:!1,enumerable:!0,get:n})},e.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(r,"a",r),r},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=18)}({18:function(t,e){var r=/watch\?v=([A-Za-z0-9\-_]+)\b/,n=/https\:\/\/play\.spotify\.com\/(.*)\b/,o=document.querySelectorAll(".e-content"),a=!0,i=!1,u=void 0;try{for(var c,l=o[Symbol.iterator]();!(a=(c=l.next()).done);a=!0){var s=c.value,d=s.textContent.match(r);if(d){var f=document.createElement("div");f.classList.add("container");var p=document.createElement("iframe");p.classList.add("youtube"),p.setAttribute("src","https://www.youtube.com/embed/"+d[1]),p.setAttribute("frameborder",0),p.setAttribute("allowfullscreen","true"),f.appendChild(p),s.appendChild(f)}var m=s.textContent.match(n);if(m){var b=m[1].replace("/",":"),y=document.createElement("iframe");y.classList.add("spotify"),y.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+b),y.setAttribute("frameborder",0),y.setAttribute("allowtransparency","true"),s.appendChild(y)}console.log(s.innerHTML)}}catch(t){i=!0,u=t}finally{try{!a&&l.return&&l.return()}finally{if(i)throw u}}}});

BIN
public/assets/js/links.js.br
View file

Binary file not shown.

BIN
public/assets/js/links.js.gz
View file

Binary file not shown.

5
resources/assets/es6/links.js
View file

@ -8,12 +8,15 @@ let notes = document.querySelectorAll('.e-content');
for (let note of notes) {
let ytid = note.textContent.match(youtubeRegex);
if (ytid) {
let ytcontainer = document.createElement('div');
ytcontainer.classList.add('container');
let ytiframe = document.createElement('iframe');
ytiframe.classList.add('youtube');
ytiframe.setAttribute('src', 'https://www.youtube.com/embed/' + ytid[1]);
ytiframe.setAttribute('frameborder', 0);
ytiframe.setAttribute('allowfullscreen', 'true');
note.appendChild(ytiframe);
ytcontainer.appendChild(ytiframe)
note.appendChild(ytcontainer);
}
let spotifyid = note.textContent.match(spotifyRegex);
if (spotifyid) {

15
resources/assets/sass/layout.scss vendored
View file

@ -69,3 +69,18 @@ footer button {
margin-top: 0.5em;
font-size: 1rem;
}
.container {
position: relative;
width: 100%;
height: 0;
padding-bottom: 56.25%;
}
.youtube {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

24
resources/views/article.blade.php Normal file
View file

@ -0,0 +1,24 @@
@extends('master')
@section('title')
{{ strip_tags($article->title) }} «
@stop
@section('content')
@if($article->url != '')<article class="link h-entry">@else<article class="h-entry">@endif
<header>
<h1 class="p-name">
<a href="@if($article->url == ''){{ $article->link }}@else{{ $article->url }}@endif">{{ $article->title }}</a>
</h1>
<span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
</header>
<div class="e-content">
{!! $article->main !!}
</div>
</article>
@stop
@section('scripts')
<script src="/assets/prism/prism.js"></script>
<link rel="stylesheet" href="/assets/prism/prism.css">
@stop

36
resources/views/articles.blade.php Normal file
View file

@ -0,0 +1,36 @@
@extends('master')
@section('title')
Articles «
@stop
@section('content')
@if (count($articles) == 0)
<p>No articles exist for this time.</p>
@endif
@foreach ($articles as $article)
@if ($article->url != '')<article class="link h-entry">@else<article class="h-entry">@endif
<header>
<h1 class="p-name">
@if($article->url == '')
<a href="{{ $article->link }}">{{ $article->title }}</a>
@else
<a href="{{ $article->url }}">{{ $article->title }}</a>
@endif
</h1>
<span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
</header>
<div class="e-content">
{!! $article['main'] !!}
</div>
</article>
@endforeach
{{ $articles->links() }}
@stop
@section('scripts')
<script src="/assets/prism/prism.js"></script>
<link rel="stylesheet" href="/assets/prism/prism.css">
@stop

4
resources/views/contacts.blade.php
View file

@ -1,11 +1,11 @@
@extends('master')
@section('title')
Contacts «
Contacts «
@stop
@section('content')
@foreach($contacts as $contact)
@include('templates.contact', array('contact' => $contact))
@include('templates.contact', ['contact' => $contact])
@endforeach
@stop

Some files were not shown because too many files have changed in this diff Show more