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 +10 -5
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4eed4489f4 - Show all commits

3
app/Http/Controllers/Dash/IndexController.php
View file

@ -67,9 +67,10 @@ class IndexController extends Controller
$title; $title;
$page = []; $page = [];
$views = []; $views = [];
$mode == 'edit' ? $page = $this->pages->getById($uuid)->first() : $page = []; $mode == 'edit' ? $page = $this->pages->getById($uuid) : $page = [];
$mode == 'edit' ? $title = $page['title'] : $title = 'Add New'; $mode == 'edit' ? $title = $page['title'] : $title = 'Add New';
$mode == 'edit' ? $views = $this->themes->getCustomViews($page['layout']) : $views[] = 'page'; $mode == 'edit' ? $views = $this->themes->getCustomViews($page['layout']) : $views[] = 'page';
return view('back.page', [ return view('back.page', [
"status" => $this->auth::status(), "status" => $this->auth::status(),
"mode" => $mode, "mode" => $mode,

6
app/Repositories/PageRepository.php
View file

@ -45,7 +45,10 @@ class PageRepository implements PageRepositoryInterface
public function getById($uuid) public function getById($uuid)
{ {
return $this->pages->where('uuid', $uuid); $page = $this->pages->where('uuid', $uuid)->first();
//quick check to see if layout is set
$page['layout'] == '' ? $page['layout'] = 'page' : $page['layout'] = $page['layout'];
return $page;
} }
public function delete($uuid) public function delete($uuid)
@ -74,6 +77,7 @@ class PageRepository implements PageRepositoryInterface
$file; $file;
$writePath; $writePath;
$message; $message;
$deleted;
if ($task != 'create') { if ($task != 'create') {
$path = date('Y', date($page['rawCreated'])) . $path = date('Y', date($page['rawCreated'])) .
'/' . '/' .

2
app/Services/DocService.php
View file

@ -155,7 +155,7 @@ class DocService
$object->menu . $object->menu .
"\n" . "\n" .
'published: ' . 'published: ' .
$object->menu . $object->published .
"\n" . "\n" .
'featured: ' . 'featured: ' .
$object->featured . $object->featured .

4
app/Services/ThemeService.php
View file

@ -44,7 +44,7 @@ class ThemeService
{ {
$currentTheme = $this->settings->getGlobal()['theme']; $currentTheme = $this->settings->getGlobal()['theme'];
$folder = '../content/themes/' . $currentTheme; $folder = '../content/themes/' . $currentTheme;
$files = array_filter(glob("$folder/*twig"), 'is_file'); $files = array_filter(glob("$folder/*blade.php"), 'is_file');
$views = []; $views = [];
foreach ($files as $file) { foreach ($files as $file) {
@ -62,7 +62,7 @@ class ThemeService
{ {
$currentTheme = $this->settings->getGlobal()['theme']; $currentTheme = $this->settings->getGlobal()['theme'];
$folder = '../content/themes/' . $currentTheme; $folder = '../content/themes/' . $currentTheme;
$files = array_filter(glob("$folder/*twig"), 'is_file'); $files = array_filter(glob("$folder/*blade.php"), 'is_file');
$views = []; $views = [];
foreach ($files as $file) { foreach ($files as $file) {