projects/fipamo
projects/fipamo
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Replaced Moment with Carbon #84

Merged
Ghost merged 148 commits from develop into beta 2022-09-22 05:53:36 +02:00
Conversation 1 Commits 148 Files changed 306 +22 -8
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 928d5468db - Show all commits

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

@ -41,7 +41,7 @@ class RouteController extends Controller
case 'theme': case 'theme':
if ($this->member::status()) { if ($this->member::status()) {
if (isset($second)) { if (isset($second)) {
return $this->theme->getView($third); return $this->theme->getView($third, $fourth);
} else { } else {
return $this->theme->start(); return $this->theme->start();
} }

26
app/Http/Controllers/ThemeController.php
View file

@ -43,7 +43,7 @@ class ThemeController extends Controller
} }
} }
public function getView($view = 'index') public function getView($view = 'index', $id = null)
{ {
//move assets to theme testing dir //move assets to theme testing dir
$this->assets->moveToTheme(); $this->assets->moveToTheme();
@ -53,11 +53,18 @@ class ThemeController extends Controller
switch ($view) { switch ($view) {
case "index": case "index":
case "page": case "page":
$view == 'index' ? $page;
$template = $currentTheme . '.index' : if ($view == 'index') {
$template = $currentTheme . '.index';
$page = $this->pages->getBySlug('first');
} else {
$template = $currentTheme . '.page'; $template = $currentTheme . '.page';
//TODO: Get rid of hard link page IDS //if coming from theme page, grabs id of latest page
$page = $this->pages->getById('F791DED9-0359-4662-8976-4C474803D2C6'); if ($id == null) {
$id = $this->getPageID();
}
$page = $this->pages->getById($id);
}
$pageData = $this->sort->page($page); $pageData = $this->sort->page($page);
break; break;
case "tags": case "tags":
@ -71,7 +78,7 @@ class ThemeController extends Controller
break; break;
default: default:
$template = $currentTheme . '.index'; $template = $currentTheme . '.index';
$page = $this->pages->getById('26245BDB-1A38-4455-80A2-7A03DE26EE33'); $page = $this->pages->getBySlug('first');
$pageData = $this->sort->page($page); $pageData = $this->sort->page($page);
} }
if ($this->member::status()) { if ($this->member::status()) {
@ -80,4 +87,11 @@ class ThemeController extends Controller
return redirect('dashboard/start'); return redirect('dashboard/start');
} }
} }
private function getPageID()
{
$book = $this->pages->getAll();
$page = $book->where('layout', 'page')->first();
return $page['uuid'];
}
} }

2
resources/views/includes/options.blade.php
View file

@ -44,7 +44,7 @@ if(isset($page['uuid']))
<svg id="option-published-icon" class="icon"> <svg id="option-published-icon" class="icon">
<use id="option-published-icon" xlink:href="/assets/images/global/sprite.svg#entypo-globe"/> <use id="option-published-icon" xlink:href="/assets/images/global/sprite.svg#entypo-globe"/>
</svg> </svg>
</button><a href="/dashboard/page/preview/{{ $uuid }}" target="_blank"><button id="option-preview" class="option-inactive post-option-btn" data-active="false" title='preview page' aria-label="preview post"> </button><a href="/theme/view/page/{{ $uuid }}" target="_blank"><button id="option-preview" class="option-inactive post-option-btn" data-active="false" title='preview page' aria-label="preview post">
<svg id="option-preview-icon" class="icon"> <svg id="option-preview-icon" class="icon">
<use id="option-preview-icon" xlink:href="/assets/images/global/sprite.svg#entypo-eye"/> <use id="option-preview-icon" xlink:href="/assets/images/global/sprite.svg#entypo-eye"/>
</svg> </svg>