From 2b005d718684a03bc230dd36658cd10335b7d76c Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:12:48 +0100 Subject: [PATCH 1/7] We want to regenerate slugs for places --- app/Place.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Place.php b/app/Place.php index ccf38b1b..e3bc6acc 100644 --- a/app/Place.php +++ b/app/Place.php @@ -41,6 +41,7 @@ class Place extends Model return [ 'slug' => [ 'source' => 'name', + 'onUpdate' => true, ], ]; } From 02cdcbf4f138c9bc5069ec670a5cb6b7ef46ad5f Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:13:31 +0100 Subject: [PATCH 2/7] update changelog --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index 4dcb88a2..af762903 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Allow place `slug`s to be re-generated + ## Version 0.5.15 (2017-06-17) - Add support for ownyourgram.com sending h-card locations - change sluggable implementation From cd35e6c16673fc4ae82f9ebbad4f4d1fd40c6d2d Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:34:33 +0100 Subject: [PATCH 3/7] Add syndication links for swarm and instagram --- database/seeds/NotesTableSeeder.php | 7 +++++++ resources/views/templates/note.blade.php | 13 ++++++++++++- resources/views/templates/social-links.blade.php | 10 ++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/database/seeds/NotesTableSeeder.php b/database/seeds/NotesTableSeeder.php index c6688ecb..334ba2df 100644 --- a/database/seeds/NotesTableSeeder.php +++ b/database/seeds/NotesTableSeeder.php @@ -40,5 +40,12 @@ class NotesTableSeeder extends Seeder 'note' => 'Note from somehwere', 'location' => '53.499,-2.379' ]); + $noteSyndicated = App\Note::create([ + 'note' => 'This note has all the syndication targets', + 'tweet_id' => '123456', + 'facebook_url' => 'https://www.facebook.com/post/12345789', + 'swarm_url' => 'https://www.swarmapp.com/checking/123456789', + 'instagram_url' => 'https://www.instagra.com/p/aWsEd123Jh', + ]); } } diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index 9789dd3d..958d6103 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -23,7 +23,18 @@ @if($note->replies > 0) @include('templates.replies-icon'): {{ $note->replies }}@endif @if ($note->placeLink) diff --git a/resources/views/templates/social-links.blade.php b/resources/views/templates/social-links.blade.php index 2717e440..f6017c83 100644 --- a/resources/views/templates/social-links.blade.php +++ b/resources/views/templates/social-links.blade.php @@ -17,3 +17,13 @@ /> @endif +@if($swarm_url !== null) + + + +@endif +@if($instagram_url !== null) + + + +@endif From 1291f3a471567a90459d7a49994069cea4366374 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:35:06 +0100 Subject: [PATCH 4/7] update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index af762903..3ea0c7fc 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ ## Version {next} - Allow place `slug`s to be re-generated + - Add syndication links for swarm and instagram ## Version 0.5.15 (2017-06-17) - Add support for ownyourgram.com sending h-card locations From 0b3bedef964442b0a0222f9c616c57e09fcd69b7 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:39:40 +0100 Subject: [PATCH 5/7] Add pnut.io social link --- resources/views/notes/index.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/notes/index.blade.php b/resources/views/notes/index.blade.php index d3087269..26ae8b56 100644 --- a/resources/views/notes/index.blade.php +++ b/resources/views/notes/index.blade.php @@ -39,6 +39,7 @@ Notes «
  • I push code to GitHub
  • I scrobble songs to last.fm that I listen to on Spotify
  • I post photos to Instagram
    • +
  • I also post to pnut.io

    • My usual online nickname is normally jonnybarnes for other services. Here’s a profile pic. I also have a PGP key, with fingerprint. You can email me at jonny at my domain, or message me on XMPP using the same address.

    From 45c8bb8bab281bb7ab3535853d8af34c5135b1bd Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:43:33 +0100 Subject: [PATCH 6/7] Move bio to its own template --- changelog.md | 1 + resources/views/notes/index.blade.php | 18 +----------------- resources/views/templates/bio.blade.php | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 resources/views/templates/bio.blade.php diff --git a/changelog.md b/changelog.md index 3ea0c7fc..df0be63b 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,7 @@ ## Version {next} - Allow place `slug`s to be re-generated - Add syndication links for swarm and instagram + - Move bio to its own template, next step database? ## Version 0.5.15 (2017-06-17) - Add support for ownyourgram.com sending h-card locations diff --git a/resources/views/notes/index.blade.php b/resources/views/notes/index.blade.php index 26ae8b56..b892d27e 100644 --- a/resources/views/notes/index.blade.php +++ b/resources/views/notes/index.blade.php @@ -28,20 +28,4 @@ Notes « @stop -@section('bio') - @if ($homepage === true) -
    -

    My name is Jonny Barnes, and jonnybarnes.uk is my site. I’m from Manchester, UK.

    -

    I am active to varying degrees on several silos:

    - -

    My usual online nickname is normally jonnybarnes for other services. Here’s a profile pic. I also have a PGP key, with fingerprint. You can email me at jonny at my domain, or message me on XMPP using the same address.

    -
    - @endif -@stop +@if ($homepage === true)@include('templates.bio')@endif diff --git a/resources/views/templates/bio.blade.php b/resources/views/templates/bio.blade.php new file mode 100644 index 00000000..4c448f41 --- /dev/null +++ b/resources/views/templates/bio.blade.php @@ -0,0 +1,15 @@ +@section('bio') +
    +

    My name is Jonny Barnes, and jonnybarnes.uk is my site. I’m from Manchester, UK.

    +

    I am active to varying degrees on several silos:

    + +

    My usual online nickname is normally jonnybarnes for other services. Here’s a profile pic. I also have a PGP key, with fingerprint. You can email me at jonny at my domain, or message me on XMPP using the same address.

    +
    +@stop From 8313a06b40fcad0adb4c40d72f472fde457e3d58 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 17 Jun 2017 14:44:06 +0100 Subject: [PATCH 7/7] Bump version number to 0.5.16 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index df0be63b..a56629b2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.5.16 - Allow place `slug`s to be re-generated - Add syndication links for swarm and instagram - Move bio to its own template, next step database?