Skip to content

Commit

Permalink
Add next and previous trick navigation to single trick page.
Browse files Browse the repository at this point in the history
  • Loading branch information
@stidges
stidges committed Feb 27, 2014
1 parent 37c2537 commit 3ae46a0
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 117 deletions.
5 changes: 4 additions & 1 deletion app/Controllers/TricksController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ public function getShow($slug = null)

Event::fire('trick.view', $trick);

$this->view('tricks.single', compact('trick'));
$next = $this->tricks->findNextTrick($trick);
$prev = $this->tricks->findPreviousTrick($trick);

$this->view('tricks.single', compact('trick', 'next', 'prev'));
}

/**
Expand Down
32 changes: 32 additions & 0 deletions app/Tricks/Repositories/Eloquent/TrickRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,38 @@ public function findByTag($slug, $perPage = 9)
return [ $tag, $tricks ];
}

/**
* Find the next trick that was added after the given trick.
*
* @param \Tricks\Trick $trick
* @return \Tricks\Trick|null
*/
public function findNextTrick(Trick $trick)
{
$next = $this->model->where('created_at', '>=', $trick->created_at)
->where('id', '<>', $trick->id)
->orderBy('created_at', 'asc')
->first([ 'slug', 'title' ]);

return $next;
}

/**
* Find the previous trick added before the given trick.
*
* @param \Tricks\Trick $trick
* @return \Tricks\Trick|null
*/
public function findPreviousTrick(Trick $trick)
{
$prev = $this->model->where('created_at', '<=', $trick->created_at)
->where('id', '<>', $trick->id)
->orderBy('created_at', 'desc')
->first([ 'slug', 'title' ]);

return $prev;
}

/**
* Get the trick creation form service.
*
Expand Down
16 changes: 16 additions & 0 deletions app/Tricks/Repositories/TrickRepositoryInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,20 @@ public function incrementViews(Trick $trick);
* @return array
*/
public function findByTag($slug, $perPage = 9);

/**
* Find the next trick that was added after the given trick.
*
* @param \Tricks\Trick $trick
* @return \Tricks\Trick|null
*/
public function findNextTrick(Trick $trick);

/**
* Find the previous trick added before the given trick.
*
* @param \Tricks\Trick $trick
* @return \Tricks\Trick|null
*/
public function findPreviousTrick(Trick $trick);
}
248 changes: 132 additions & 116 deletions app/views/tricks/single.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,130 +2,146 @@
@section('description', $trick->pageDescription)

@section('scripts')
<script src="{{ url('js/vendor/highlight.pack.1.js')}}"></script>
<script type="text/javascript">
(function($) {
hljs.tabReplace = ' ';
hljs.initHighlightingOnLoad();
})(jQuery);
</script>
@if(Auth::check())
<script>
(function(e){e(".js-like-trick").click(function(t){t.preventDefault();var n=e(this).data("liked")=="0";var r={_token:"{{ csrf_token() }}"};e.post('{{ route("tricks.like", $trick->slug) }}',r,function(t){if(t!="error"){if(!n){e(".js-like-trick .fa").removeClass("text-primary");e(".js-like-trick").data("liked","0");e(".js-like-status").html("Like this?")}else{e(".js-like-trick .fa").addClass("text-primary");e(".js-like-trick").data("liked","1");e(".js-like-status").html("You like this")}e(".js-like-count").html(t+" likes")}})})})(jQuery)
<script src="{{ url('js/vendor/highlight.pack.1.js')}}"></script>
<script type="text/javascript">
(function($) {
hljs.tabReplace = ' ';
hljs.initHighlightingOnLoad();
})(jQuery);
</script>
@endif
@if(Auth::check())
<script>
(function(e){e("[data-toggle=tooltip]").tooltip();e(".js-like-trick").click(function(t){t.preventDefault();var n=e(this).data("liked")=="0";var r={_token:"{{ csrf_token() }}"};e.post('{{ route("tricks.like", $trick->slug) }}',r,function(t){if(t!="error"){if(!n){e(".js-like-trick .fa").removeClass("text-primary");e(".js-like-trick").data("liked","0");e(".js-like-status").html("Like this?")}else{e(".js-like-trick .fa").addClass("text-primary");e(".js-like-trick").data("liked","1");e(".js-like-status").html("You like this")}e(".js-like-count").html(t+" likes")}})})})(jQuery)
</script>
@endif
@stop

@section('content')
<div class="container">
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="content-box">
@if(Auth::check() && (Auth::user()->id == $trick->user_id))
<div class="text-right">
<a data-toggle="modal" href="#deleteModal">Delete</a> |
<a href="{{$trick->editLink}}">Edit</a>
@include('tricks.delete',['link'=>$trick->deleteLink])
</div>
@endif
<div class="trick-user">
<div class="trick-user-image">
<img src="{{ $trick->user->photocss }}" class="user-avatar">
</div>
<div class="trick-user-data">
<h1 class="page-title">
{{ $trick->title }}
</h1>
<div>
Submitted by <b><a href="{{ route('user.profile', $trick->user->username) }}">{{ $trick->user->username }}</a></b> - {{ $trick->timeago }}
</div>
</div>
</div>
<p>{{{ $trick->description }}}</p>
<pre><code class="php">{{{ $trick->code }}}</code></pre>
</div>
</div>
<div class="col-lg-3 col-md-4">
<div class="content-box">
<b>Stats</b>
<ul class="list-group trick-stats">
<a href="#" class="list-group-item js-like-trick" data-liked="{{ $trick->likedByUser(Auth::user()) ? '1' : '0'}}">
<div class="container">
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="content-box">
@if(Auth::check() && (Auth::user()->id == $trick->user_id))
<div class="text-right">
<a data-toggle="modal" href="#deleteModal">Delete</a> |
<a href="{{$trick->editLink}}">Edit</a>
@include('tricks.delete',['link'=>$trick->deleteLink])
</div>
@endif
<div class="trick-user">
<div class="trick-user-image">
<img src="{{ $trick->user->photocss }}" class="user-avatar">
</div>
<div class="trick-user-data">
<h1 class="page-title">
{{ $trick->title }}
</h1>
<div>
Submitted by <b><a href="{{ route('user.profile', $trick->user->username) }}">{{ $trick->user->username }}</a></b> - {{ $trick->timeago }}
</div>
</div>
</div>
<p>{{{ $trick->description }}}</p>
<pre><code class="php">{{{ $trick->code }}}</code></pre>
</div>
</div>
<div class="col-lg-3 col-md-4">
<div class="content-box">
<b>Stats</b>
<ul class="list-group trick-stats">
<a href="#" class="list-group-item js-like-trick" data-liked="{{ $trick->likedByUser(Auth::user()) ? '1' : '0'}}">

<span class="fa fa-heart @if($trick->likedByUser(Auth::user())) text-primary @endif"></span>
@if(Auth::check())
<span class="js-like-status">
@if($trick->likedByUser(Auth::user()))
You like this
@else
Like this?
@endif
</span>
<span class="pull-right js-like-count">
@endif
{{ $trick->vote_cache }} {{ Str::plural('like', $trick->vote_cache) }}
@if(Auth::check())</span>@endif
</a>
<li class="list-group-item">
<span class="fa fa-eye"></span> {{ $trick->view_cache }} views
</li>
</ul>
@if(count($trick->allCategories))
<b>Categories</b>
<ul class="nav nav-list">
@foreach($trick->allCategories as $category)
<li>
<a href="{{ route('tricks.browse.category', $category->slug) }}">
{{ $category->name }}
</a>
</li>
@endforeach
</ul>
@endif
@if(count($trick->tags))
<b>Tags</b>
<ul class="nav nav-list">
@foreach($trick->tags as $tag)
<li>
<a href="{{ route('tricks.browse.tag', $tag->slug) }}">
{{ $tag->name }}
</a>
</li>
@endforeach
</ul>
@endif
</div>
</div>
<span class="fa fa-heart @if($trick->likedByUser(Auth::user())) text-primary @endif"></span>
@if(Auth::check())
<span class="js-like-status">
@if($trick->likedByUser(Auth::user()))
You like this
@else
Like this?
@endif
</span>
<span class="pull-right js-like-count">
@endif
{{ $trick->vote_cache }} {{ Str::plural('like', $trick->vote_cache) }}
@if(Auth::check())</span>@endif
</a>
<li class="list-group-item">
<span class="fa fa-eye"></span> {{ $trick->view_cache }} views
</li>
</ul>
@if(count($trick->allCategories))
<b>Categories</b>
<ul class="nav nav-list push-down">
@foreach($trick->allCategories as $category)
<li>
<a href="{{ route('tricks.browse.category', $category->slug) }}">
{{ $category->name }}
</a>
</li>
@endforeach
</ul>
@endif
@if(count($trick->tags))
<b>Tags</b>
<ul class="nav nav-list push-down">
@foreach($trick->tags as $tag)
<li>
<a href="{{ route('tricks.browse.tag', $tag->slug) }}">
{{ $tag->name }}
</a>
</li>
@endforeach
</ul>
@endif
<div class="clearfix">
@if($prev)
<a href="{{ route('tricks.show', $prev->slug) }}"
title="{{ $prev->title }}" data-toggle="tooltip"
class="btn btn-sm btn-primary">
&laquo; Previous Trick
</a>
@endif

</div>
<div class="row">
<div class="col-lg-9 col-md-8">
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_shortname = '{{ Config::get("config.disqus_shortname") }}';
var disqus_identifier = '{{$trick->id}}';
@if($next)
<a href="{{ route('tricks.show', $next->slug) }}"
title="{{ $next->title }}" data-toggle="tooltip"
class="btn btn-sm btn-primary pull-right">
Next Trick &raquo;
</a>
@endif
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-9 col-md-8">
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_shortname = '{{ Config::get("config.disqus_shortname") }}';
var disqus_identifier = '{{$trick->id}}';
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</div>
</div>
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</div>
</div>


{{--<div class="row">
<div class="col-lg-12">
<h2 class="title-between">Related tricks</h2>
</div>
</div>
<div class="row">
@for($i = 0; $i < 3; $i++)
@include('tricks.card', [ 'test' => $i ])
@endfor
</div>--}}
{{--<div class="row">
<div class="col-lg-12">
<h2 class="title-between">Related tricks</h2>
</div>
</div>
<div class="row">
@for($i = 0; $i < 3; $i++)
@include('tricks.card', [ 'test' => $i ])
@endfor
</div>--}}

</div>
</div>
@stop

0 comments on commit 3ae46a0

Please sign in to comment.