webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Reorgranised blade view files to form a convention

Browse Source 
- Primarily moved and re-organised view files.
- Included readme within views to document the convention.
- Fixed some issues with page field select list in previous commit.
- Tweaked some route names while going through.
- Split some views out further.

Closes #2805
This commit is contained in:
Dan Brown
2021-08-22 13:15:58 +01:00
parent 2036618fbd
commit a61c9c5e98
192 changed files with 647 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Entities/Models/Page.php
View File

@ -25,8 +25,8 @@ use Permissions;
*/
class Page extends BookChild
{
public static $listAttributes = ['name', 'id', 'slug', 'book_id', 'text', 'created_at', 'updated_at'];
public static $contentAttributes = ['name', 'id', 'slug', 'book_id', 'html', 'text', 'created_at', 'updated_at'];
public static $listAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'text', 'created_at', 'updated_at'];
public static $contentAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'html', 'text', 'created_at', 'updated_at'];
protected $fillable = ['name', 'priority', 'markdown'];

2
app/Entities/Tools/BookContents.php
View File

@ -45,7 +45,7 @@ class BookContents
*/
public function getTree(bool $showDrafts = false, bool $renderPages = false): Collection
{
$pages = $this->getPages($showDrafts);
$pages = $this->getPages($showDrafts, $renderPages);
$chapters = Chapter::visible()->where('book_id', '=', $this->book->id)->get();
$all = collect()->concat($pages)->concat($chapters);
$chapterMap = $chapters->keyBy('id');

2
app/Entities/Tools/PageContent.php
View File

@ -223,7 +223,7 @@ class PageContent
*/
public function render(bool $blankIncludes = false): string
{
$content = $this->page->html;
$content = $this->page->html ?? '';
if (!config('app.allow_content_scripts')) {
$content = HtmlContentFilter::removeScripts($content);

2
app/Http/Controllers/BookSortController.php
View File

@ -43,7 +43,7 @@ class BookSortController extends Controller
$book = $this->bookRepo->getBySlug($bookSlug);
$bookChildren = (new BookContents($book))->getTree();
return view('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
return view('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
}
/**

18
app/Http/Controllers/HomeController.php
View File

@ -82,7 +82,7 @@ class HomeController extends Controller
$shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
$data = array_merge($commonData, ['shelves' => $shelves]);
return view('common.home-shelves', $data);
return view('home.shelves', $data);
}
if ($homepageOption === 'books') {
@ -90,7 +90,7 @@ class HomeController extends Controller
$books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
$data = array_merge($commonData, ['books' => $books]);
return view('common.home-book', $data);
return view('home.books', $data);
}
if ($homepageOption === 'page') {
@ -100,26 +100,24 @@ class HomeController extends Controller
$pageContent = new PageContent($customHomepage);
$customHomepage->html = $pageContent->render(true);
return view('common.home-custom', array_merge($commonData, ['customHomepage' => $customHomepage]));
return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage]));
}
return view('common.home', $commonData);
return view('home.default', $commonData);
}
/**
* 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');
return view('common.custom-head');
}
/**
* Show the view for /robots.txt.
*/
public function getRobots()
public function robots()
{
$sitePublic = setting('app-public', false);
$allowRobots = config('app.allow_robots');
@ -129,14 +127,14 @@ class HomeController extends Controller
}
return response()
->view('common.robots', ['allowRobots' => $allowRobots])
->view('misc.robots', ['allowRobots' => $allowRobots])
->header('Content-Type', 'text/plain');
}
/**
* Show the route for 404 responses.
*/
public function getNotFound()
public function notFound()
{
return response()->view('errors.404', [], 404);
}

2
app/Http/Controllers/Images/DrawioImageController.php
View File

@ -30,7 +30,7 @@ class DrawioImageController extends Controller
$imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
return view('components.image-manager-list', [
return view('pages.parts.image-manager-list', [
'images' => $imgData['images'],
'hasMore' => $imgData['has_more'],
]);

2
app/Http/Controllers/Images/GalleryImageController.php
View File

@ -33,7 +33,7 @@ class GalleryImageController extends Controller
$imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
return view('components.image-manager-list', [
return view('pages.parts.image-manager-list', [
'images' => $imgData['images'],
'hasMore' => $imgData['has_more'],
]);

4
app/Http/Controllers/Images/ImageController.php
View File

@ -65,7 +65,7 @@ class ImageController extends Controller
$this->imageRepo->loadThumbs($image);
return view('components.image-manager-form', [
return view('pages.parts.image-manager-form', [
'image' => $image,
'dependantPages' => null,
]);
@ -87,7 +87,7 @@ class ImageController extends Controller
$this->imageRepo->loadThumbs($image);
return view('components.image-manager-form', [
return view('pages.parts.image-manager-form', [
'image' => $image,
'dependantPages' => $dependantPages ?? null,
]);

2
app/Http/Controllers/PageTemplateController.php
View File

@ -31,7 +31,7 @@ class PageTemplateController extends Controller
$templates->appends(['search' => $search]);
}
return view('pages.template-manager-list', [
return view('pages.parts.template-manager-list', [
'templates' => $templates,
]);
}

8
app/Http/Controllers/SearchController.php
View File

@ -54,7 +54,7 @@ class SearchController extends Controller
$term = $request->get('term', '');
$results = $this->searchRunner->searchBook($bookId, $term);
return view('partials.entity-list', ['entities' => $results]);
return view('entities.list', ['entities' => $results]);
}
/**
@ -65,7 +65,7 @@ class SearchController extends Controller
$term = $request->get('term', '');
$results = $this->searchRunner->searchChapter($chapterId, $term);
return view('partials.entity-list', ['entities' => $results]);
return view('entities.list', ['entities' => $results]);
}
/**
@ -86,7 +86,7 @@ class SearchController extends Controller
$entities = (new Popular())->run(20, 0, $entityTypes, $permission);
}
return view('search.entity-ajax-list', ['entities' => $entities]);
return view('search.parts.entity-ajax-list', ['entities' => $entities]);
}
/**
@ -99,6 +99,6 @@ class SearchController extends Controller
$entities = (new SiblingFetcher())->fetch($type, $id);
return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
return view('entities.list-basic', ['entities' => $entities, 'style' => 'compact']);
}
}

2
app/Http/Controllers/UserSearchController.php
View File

@ -27,6 +27,6 @@ class UserSearchController extends Controller
$users = $query->get();
return view('components.user-select-list', compact('users'));
return view('form.user-select-list', compact('users'));
}
}

2
app/Providers/AppServiceProvider.php
View File

@ -54,7 +54,7 @@ class AppServiceProvider extends ServiceProvider
]);
// View Composers
View::composer('partials.breadcrumbs', BreadcrumbsViewComposer::class);
View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
}
/**