Skip to content

Commit 117ea98

Browse files
committed
optimized ResourceController, fixed autosave in CKEditor, error views
1 parent 4f0d8ac commit 117ea98

File tree

10 files changed

+18
-37
lines changed

10 files changed

+18
-37
lines changed

app/Http/Controllers/Frontend/ResourceController.php

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
class ResourceController extends Controller
1010
{
1111
// is requested slug relevant to post or page?
12-
public function show($request)
12+
public function show($slug)
1313
{
14-
if (Post::where('slug', $request)->exists()) {
15-
$resource = Post::where('slug', $request)
16-
->with('tagged')
17-
->withCount('comments')
18-
->first();
14+
$resource = Post::where('slug', $slug)
15+
->with('tagged')
16+
->withCount('comments')
17+
->first();
18+
if ($resource) {
1919
return $this->showPost($resource);
2020
}
2121

22-
if (Page::where('slug', $request)->exists()) {
23-
$resource = Page::where('slug', $request)
24-
->first();
22+
$resource = Page::where('slug', $slug)
23+
->first();
24+
if ($resource) {
2525
return $this->showPage($resource);
2626
}
2727

2828
// if there is no resource with that slug
29-
return abort('404');
29+
abort('404');
3030
}
3131

32-
public function showPost($resource)
32+
private function showPost($resource)
3333
{
3434
$next = Post::select(['slug'])
3535
->where('id', '>', $resource->id)
@@ -41,29 +41,28 @@ public function showPost($resource)
4141
->published()
4242
->latest('id')
4343
->first();
44-
4544
$comments = $resource->comments()
4645
->with('user')
4746
->paginate(50)
4847
->onEachSide(1);
4948

5049
// view for custom template
5150
if ($resource->custom_template) {
52-
return view('frontend.posts.single-custom', compact('resource','comments', 'next', 'prev'));
51+
return view('frontend.posts.single-custom', compact('resource', 'comments', 'next', 'prev'));
5352
}
5453
// view for default template
55-
return view('frontend.posts.single', compact('resource','comments','next', 'prev'));
54+
return view('frontend.posts.single', compact('resource', 'comments', 'next', 'prev'));
5655
}
5756

58-
public function showPage($resource)
57+
private function showPage($resource)
5958
{
6059
// view for custom template
6160
if ($resource->custom_template) {
6261
// for common templates
6362
$next = null;
6463
$prev = null;
6564
$comments = null;
66-
return view('frontend.pages.single-custom', compact('resource','comments', 'next', 'prev'));
65+
return view('frontend.pages.single-custom', compact('resource', 'comments', 'next', 'prev'));
6766
}
6867
// view for default template
6968
return view('frontend.pages.single', compact('resource'));

app/Http/Controllers/Frontend/SearchController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function search(Request $request)
1919
if ($posts) {
2020
foreach ($posts as $post) {
2121
$output .=
22-
'<a href="' . route('front.resource.show',$post->slug) . '">
22+
'<a href="' . route('front.resource.show', $post->slug) . '">
2323
<div class="search-item padding-small">' . $post->first_sentence . '</div>
2424
</a>';
2525
}

app/Http/Middleware/Authenticate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function redirectTo($request)
1616
{
1717
if (! $request->expectsJson()) {
1818
// // guests should not know admin's urls
19-
return abort(404);
19+
abort(404);
2020
}
2121
}
2222
}

public/ckeditor/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ CKEDITOR.editorConfig = function( config ) {
5050
// Autosave
5151
config.autosave = {
5252
messageType : "no",
53-
delay : 1,
53+
delay : 0,
5454
autoLoad: true,
5555
saveOnDestroy : true,
5656
// saveDetectionSelectors : "a[href^='javascript:__doPostBack'][id*='Save'],a[id*='Cancel']",
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>401</h1>
87
<p>Unauthorized.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>403</h1>
87
<p>Forbidden.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>404</h1>
87
<p>This page doesn't exist.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>419</h1>
87
<p>Page expired.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>500</h1>
87
<p>Server error.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
@extends('layouts.frontend')
22

33
@section('content')
4-
<div class="container ">
54
<div class="row flex-center">
65
<div>
76
<h1>503</h1>
87
<p>Service Unavailable.</p>
98
</div>
10-
119
</div>
12-
</div>
1310
@endsection

0 commit comments

Comments
 (0)