Fixed some typos and corrected grammar.

[bookstack] / app / Http / Controllers / Api / ApiDocsController.php

diff --git a/app/Http/Controllers/Api/ApiDocsController.php b/app/Http/Controllers/Api/ApiDocsController.php
index bfb0c1834acec0a8f5782ed4c8d1bb99cf02df5f..a1453e7684bb0c4bb7e55534bf1eb2f8e268effe 100644 (file)
--- a/app/Http/Controllers/Api/ApiDocsController.php
+++ b/app/Http/Controllers/Api/ApiDocsController.php
@@ -1,47 +1,31 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;
 
 use BookStack\Api\ApiDocsGenerator;
-use Cache;
-use Illuminate\Support\Collection;
 
 class ApiDocsController extends ApiController
 {
-
     /**
      * Load the docs page for the API.
      */
     public function display()
     {
-        $docs = $this->getDocs();
-        dd($docs);
-        // TODO - Build view for API docs
-        return view('');
-    }
+        $docs = ApiDocsGenerator::generateConsideringCache();
+        $this->setPageTitle(trans('settings.users_api_tokens_docs'));
 
-    /**
-     * Show a JSON view of the API docs data.
-     */
-    public function json() {
-        $docs = $this->getDocs();
-        return response()->json($docs);
+        return view('api-docs.index', [
+            'docs' => $docs,
+        ]);
     }
 
     /**
-     * Get the base docs data.
-     * Checks and uses the system cache for quick re-fetching.
+     * Show a JSON view of the API docs data.
      */
-    protected function getDocs(): Collection
+    public function json()
     {
-        $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);
-        }
+        $docs = ApiDocsGenerator::generateConsideringCache();
 
-        return $docs;
+        return response()->json($docs);
     }
-
 }