X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cd6572b61af2165133468d2562d04dffdca8fca8..refs/pull/691/head:/app/Http/Controllers/HomeController.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index f4706a5c4..b2620588f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -1,10 +1,7 @@ -signedIn ? $this->entityRepo->getUserDraftPages(6) : []; $recentFactor = count($draftPages) > 0 ? 0.5 : 1; - $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 10*$recentFactor); - $recentlyCreatedPages = $this->entityRepo->getRecentlyCreated('page', 5); - $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 5); - return view('home', [ + $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor); + $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12); + + // Custom homepage + $customHomepage = false; + $homepageSetting = setting('app-homepage'); + if ($homepageSetting) { + $id = intval(explode(':', $homepageSetting)[0]); + $customHomepage = $this->entityRepo->getById('page', $id, false, true); + $this->entityRepo->renderPage($customHomepage, true); + } + + $view = $customHomepage ? 'home-custom' : 'home'; + return view($view, [ 'activity' => $activity, 'recents' => $recents, - 'recentlyCreatedPages' => $recentlyCreatedPages, 'recentlyUpdatedPages' => $recentlyUpdatedPages, - 'draftPages' => $draftPages + 'draftPages' => $draftPages, + 'customHomepage' => $customHomepage ]); } /** * Get a js representation of the current translations * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response + * @throws \Exception */ - public function getTranslations() { - $locale = trans()->getLocale(); + public function getTranslations() + { + $locale = app()->getLocale(); $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale; if (cache()->has($cacheKey) && config('app.env') !== 'development') { $resp = cache($cacheKey); @@ -63,10 +72,10 @@ class HomeController extends Controller ]; if ($locale !== 'en') { $enTrans = [ - 'common' => trans('common', [], null, 'en'), - 'components' => trans('components', [], null, 'en'), - 'entities' => trans('entities', [], null, 'en'), - 'errors' => trans('errors', [], null, 'en') + 'common' => trans('common', [], 'en'), + 'components' => trans('components', [], 'en'), + 'entities' => trans('entities', [], 'en'), + 'errors' => trans('errors', [], 'en') ]; $translations = array_replace_recursive($enTrans, $translations); } @@ -79,4 +88,12 @@ class HomeController extends Controller ]); } + /** + * Get custom head HTML, Used in ajax calls to show in editor. + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function customHeadContent() + { + return view('partials/custom-head-content'); + } }