webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Cleaned up api docs implementation, added missing titles

Browse Source
This commit is contained in:
Dan Brown
2020-11-21 17:03:24 +00:00
parent 65ddd16532
commit f76a2a69f7
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Api/ApiDocsController.php
View File

@ -1,8 +1,6 @@
<?php namespace BookStack\Http\Controllers\Api;
use BookStack\Api\ApiDocsGenerator;
use Cache;
use Illuminate\Support\Collection;
class ApiDocsController extends ApiController
{
@ -12,7 +10,8 @@ class ApiDocsController extends ApiController
*/
public function display()
{
$docs = $this->getDocs();
$docs = ApiDocsGenerator::generateConsideringCache();
$this->setPageTitle(trans('settings.users_api_tokens_docs'));
return view('api-docs.index', [
'docs' => $docs,
]);
@ -21,27 +20,10 @@ class ApiDocsController extends ApiController
/**
* Show a JSON view of the API docs data.
*/
public function json() {
$docs = $this->getDocs();
public function json()
{
$docs = ApiDocsGenerator::generateConsideringCache();
return response()->json($docs);
}
/**
* Get the base docs data.
* Checks and uses the system cache for quick re-fetching.
*/
protected function getDocs(): Collection
{
$appVersion = trim(file_get_contents(base_path('version')));
$cacheKey = 'api-docs::' . $appVersion;
if (Cache::has($cacheKey) && config('app.env') === 'production') {
$docs = Cache::get($cacheKey);
} else {
$docs = (new ApiDocsGenerator())->generate();
Cache::put($cacheKey, $docs, 60*24);
}
return $docs;
}
}

1
app/Http/Controllers/RecycleBinController.php
View File

@ -31,6 +31,7 @@ class RecycleBinController extends Controller
{
$deletions = Deletion::query()->with(['deletable', 'deleter'])->paginate(10);
$this->setPageTitle(trans('settings.recycle_bin'));
return view('settings.recycle-bin.index', [
'deletions' => $deletions,
]);