Skip to content

Commit 57b1c77

Browse files
drewrobertsdrewroberts
authored
Merge pull request #81 from drewroberts/pdbreen/feature/79
Update BlogController and PageController logic for #79 and #80
2 parents b5f0116 + 1fc8657 commit 57b1c77

15 files changed

+219
-52
lines changed

‎resources/views/page/amp.blade.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
@extends('support::amp')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - page identity tag --}}
5+
<!-- P:{{ $page->id }} C:{{ $child_page->id ?? '0' }} GC:{{ $grand_child_page->id ?? '0' }} -->
6+
7+
8+
{{-- Place holder content - safe to replace --}}
49
<ul>
510
<li>Page: {{ $page->name }}</li>
611
<li>Child: {{ $child_page->name ?? 'NONE' }}</li>

‎resources/views/page/base.blade.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
@extends('support::base')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - page identity tag --}}
5+
<!-- P:{{ $page->id }} C:{{ $child_page->id ?? '0' }} GC:{{ $grand_child_page->id ?? '0' }} -->
6+
7+
8+
{{-- Place holder content - safe to replace --}}
49
<ul>
510
<li>Page: {{ $page->name }}</li>
611
<li>Child: {{ $child_page->name ?? 'NONE' }}</li>

‎resources/views/post/amp.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::amp')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id ?? '0' }} S:{{ $series->id ?? '0' }} P:{{ $post->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name ?? 'NONE' }}</li>
610
<li>Series: {{ $series->name ?? 'NONE' }}</li>

‎resources/views/post/base.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::base')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id ?? '0' }} S:{{ $series->id ?? '0' }} P:{{ $post->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name ?? 'NONE' }}</li>
610
<li>Series: {{ $series->name ?? 'NONE' }}</li>

‎resources/views/series/amp.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::amp')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id }} S:{{ $series->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name }}</li>
610
<li>Series: {{ $series->name }}</li>

‎resources/views/series/base.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::base')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id }} S:{{ $series->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name }}</li>
610
<li>Series: {{ $series->name }}</li>

‎resources/views/topic/amp.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::amp')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name }}</li>
610
</ul>

‎resources/views/topic/base.blade.php

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@extends('support::base')
22

33
@section('content')
4+
{{-- DO NOT REMOVE - identity tag --}}
5+
<!-- T:{{ $topic->id }} -->
6+
7+
{{-- Place holder content - safe to replace --}}
48
<ul>
59
<li>Topic: {{ $topic->name }}</li>
610
</ul>

‎src/Http/Controllers/BlogController.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ private function handleTopicRoute(Request $request, Topic $topic, ?string $slug2
6060
private function handlePageRoute(Request $request, Page $page, ?string $slug2 = null, ?string $slug3 = null)
6161
{
6262
if (empty($slug2)) {
63-
abort_unless($page->is_leaf, 404);
64-
6563
return app(PageController::class)($request, $page);
6664
}
6765

@@ -71,8 +69,6 @@ private function handlePageRoute(Request $request, Page $page, ?string $slug2 =
7169
->where('slug', '=', $slug2)
7270
->first()) {
7371
if (empty($slug3)) {
74-
abort_unless($childPage->is_leaf, 404);
75-
7672
return app(PageController::class)($request, $page, $childPage);
7773
}
7874

@@ -85,7 +81,7 @@ private function handlePageRoute(Request $request, Page $page, ?string $slug2 =
8581
}
8682
}
8783

88-
// Valid topic, but invalid nesting of series or post slugs
84+
// Valid root page, but invalid nesting of pages
8985
abort(404);
9086
}
9187
}

‎src/Http/Controllers/PageController.php

+17
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,23 @@ class PageController extends BaseController
1313
{
1414
public function __invoke(Request $request, Page $page, ?Page $childPage = null, Page $grandChildPage = null)
1515
{
16+
// If location based grand child is only child, redirect!!
17+
if ($grandChildPage) {
18+
if ($grandChildPage->location_based && $grandChildPage->is_only_child) {
19+
return redirect(url($grandChildPage->path));
20+
}
21+
} elseif ($childPage) {
22+
// If location based child is only child, redirect!!!
23+
if ($childPage->location_based && $childPage->is_only_child) {
24+
return redirect(url($childPage->path));
25+
}
26+
} else {
27+
// If there is only location based root page, redirect home!
28+
if ($page->is_only_root_location) {
29+
return redirect(url($page->path));
30+
}
31+
}
32+
1633
$leafPage = $grandChildPage ?: ($childPage ?: $page);
1734
LayoutManager::setLayout($leafPage->layout);
1835

‎src/Models/Page.php

+31-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
* @property Page parent
3030
* @property bool is_leaf
3131
* @property bool is_root
32+
* @property bool is_only_child
33+
* @property bool is_only_root_location
3234
* @property string|null path
3335
* @property int depth
3436
* @property string content
@@ -81,6 +83,7 @@ class Page extends BaseModel
8183
'parent_id',
8284
'slug',
8385
'title',
86+
'location_based',
8487
];
8588

8689
protected static function boot()
@@ -128,15 +131,35 @@ public function getRouteKeyName()
128131
{
129132
return 'slug';
130133
}
131-
134+
132135
public function layout()
133136
{
134137
return $this->belongsTo(app('layout'));
135138
}
136139

137140
public function getPathAttribute(): ?string
138141
{
139-
return $this->is_leaf ? '/' . implode('/', $this->getParentPath()) : null;
142+
if ($this->is_only_root_location) {
143+
return '/';
144+
}
145+
146+
$path = [];
147+
$parent = $this;
148+
while ($parent) {
149+
// Start accumulating slugs when not location based or not only child
150+
if ($path || ! $parent->location_based || ! $parent->is_only_child) {
151+
$path[] = $parent->slug;
152+
}
153+
$parent = $parent->parent;
154+
}
155+
156+
return implode('/', array_reverse($path));
157+
}
158+
159+
public function getIsOnlyRootLocationAttribute(): bool
160+
{
161+
return ($this->location_based && $this->is_root &&
162+
static::query()->whereNull('parent_id')->where('location_based', true)->count() === 1);
140163
}
141164

142165
public function getIsRootAttribute(): bool
@@ -149,21 +172,21 @@ public function getIsLeafAttribute(): bool
149172
return $this->children()->count() === 0;
150173
}
151174

152-
public function getDepthAttribute(): int
175+
public function getIsOnlyChildAttribute(): bool
153176
{
154-
return count($this->getParentPath());
177+
return $this->parent && $this->parent->children->count() === 1;
155178
}
156179

157-
private function getParentPath(): array
180+
public function getDepthAttribute(): int
158181
{
159-
$path = [];
182+
$depth = 0;
160183
$parent = $this;
161184
while ($parent) {
162-
$path[] = $parent;
185+
$depth++;
163186
$parent = $parent->parent;
164187
}
165188

166-
return array_reverse($path);
189+
return $depth;
167190
}
168191

169192
public function author()

0 commit comments

Comments
 (0)