Merge pull request #26 from RonasIT/dpankratov/version-update

Dpankratov/version update
RonasIT · Dec 1, 2020 · ae5f987 · ae5f987
2 parents af58b34 + fbf369a
commit ae5f987
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 195 deletions.
diff --git a/src/Http/Controllers/AutoDocController.php b/src/Http/Controllers/AutoDocController.php
@@ -2,6 +2,7 @@
 
 namespace RonasIT\Support\AutoDoc\Http\Controllers;
 
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 use RonasIT\Support\AutoDoc\Services\SwaggerService;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -27,7 +28,7 @@ public function index()
         return view('auto-doc::documentation');
     }
 
-    public function getFile($file)
+    public function getFile(Request $request, $file)
     {
         $filePath = base_path("vendor/ronasit/laravel-swagger/src/Views/swagger/{$file}");
 
@@ -37,6 +38,6 @@ public function getFile($file)
 
         $content = file_get_contents($filePath);
 
-        return response($content);
+        return response($content)->header('Content-Type', $request->getAcceptableContentTypes());
     }
 }
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -2,7 +2,6 @@
 
 use RonasIT\Support\AutoDoc\Http\Controllers\AutoDocController;
 
-
 Route::get('/auto-doc/documentation', ['uses' => AutoDocController::class . '@documentation']);
 Route::get('/auto-doc/{file}', ['uses' => AutoDocController::class . '@getFile']);
 Route::get(config('auto-doc.route'), ['uses' => AutoDocController::class . '@index']);
diff --git a/src/Views/documentation.blade.php b/src/Views/documentation.blade.php
@@ -1,94 +1,60 @@
+<!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>{{ config('auto-doc.info.title') }}</title>
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700"
-          rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="/auto-doc/swagger-ui.css">
-    <link rel="icon" type="image/png" href="/auto-doc/favicon-32x32.png" sizes="32x32"/>
-    <link rel="icon" type="image/png" href="/auto-doc/favicon-16x16.png" sizes="16x16"/>
+    <title>Swagger UI</title>
+    <link rel="stylesheet" type="text/css" href="/auto-doc/swagger-ui.css" >
+    <link rel="icon" type="image/png" href="/auto-doc/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="/auto-doc/favicon-16x16.png" sizes="16x16" />
     <style>
-        html {
+        html
+        {
             box-sizing: border-box;
             overflow: -moz-scrollbars-vertical;
             overflow-y: scroll;
         }
 
         *,
         *:before,
-        *:after {
+        *:after
+        {
             box-sizing: inherit;
         }
 
-        body {
-            margin: 0;
+        body
+        {
+            margin:0;
             background: #fafafa;
         }
     </style>
 </head>
 
 <body>
-
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     style="position:absolute;width:0;height:0">
-    <defs>
-        <symbol viewBox="0 0 20 20" id="unlocked">
-            <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
-        </symbol>
-
-        <symbol viewBox="0 0 20 20" id="locked">
-            <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
-        </symbol>
-
-        <symbol viewBox="0 0 20 20" id="close">
-            <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
-        </symbol>
-
-        <symbol viewBox="0 0 20 20" id="large-arrow">
-            <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
-        </symbol>
-
-        <symbol viewBox="0 0 20 20" id="large-arrow-down">
-            <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
-        </symbol>
-
-
-        <symbol viewBox="0 0 24 24" id="jump-to">
-            <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
-        </symbol>
-
-        <symbol viewBox="0 0 24 24" id="expand">
-            <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
-        </symbol>
-
-    </defs>
-</svg>
-
 <div id="swagger-ui"></div>
 
-<script src="/auto-doc/swagger-ui-bundle.js"></script>
-<script src="/auto-doc/swagger-ui-standalone-preset.js"></script>
+<script src="/auto-doc/swagger-ui-bundle.js" charset="UTF-8"> </script>
+<script src="/auto-doc/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
 <script>
-  window.onload = function () {
-    // Build a system
-    const ui = SwaggerUIBundle({
-      url: "/auto-doc/documentation",
-      dom_id: '#swagger-ui',
-      presets: [
-        SwaggerUIBundle.presets.apis,
-        // yay ES6 modules ↘
-        Array.isArray(SwaggerUIStandalonePreset) ? SwaggerUIStandalonePreset : SwaggerUIStandalonePreset.default
-      ],
-      plugins: [
-        SwaggerUIBundle.plugins.DownloadUrl
-      ],
-      layout: "StandaloneLayout"
-    })
-
-    window.ui = ui
-  }
+    window.onload = function() {
+        // Begin Swagger UI call region
+        const ui = SwaggerUIBundle({
+            url: "/auto-doc/documentation",
+            dom_id: '#swagger-ui',
+            deepLinking: true,
+            presets: [
+                SwaggerUIBundle.presets.apis,
+                SwaggerUIStandalonePreset
+            ],
+            plugins: [
+                SwaggerUIBundle.plugins.DownloadUrl
+            ],
+            layout: "StandaloneLayout"
+        })
+        // End Swagger UI call region
+
+        window.ui = ui
+    }
 </script>
 </body>
-
 </html>
diff --git a/src/Views/swagger/favicon-16x16.png b/src/Views/swagger/favicon-16x16.png
diff --git a/src/Views/swagger/favicon-32x32.png b/src/Views/swagger/favicon-32x32.png
diff --git a/src/Views/swagger/swagger-ui-bundle.js b/src/Views/swagger/swagger-ui-bundle.js
diff --git a/src/Views/swagger/swagger-ui-bundle.js.map b/src/Views/swagger/swagger-ui-bundle.js.map
diff --git a/src/Views/swagger/swagger-ui-standalone-preset.js b/src/Views/swagger/swagger-ui-standalone-preset.js
diff --git a/src/Views/swagger/swagger-ui-standalone-preset.js.map b/src/Views/swagger/swagger-ui-standalone-preset.js.map
diff --git a/src/Views/swagger/swagger-ui.css b/src/Views/swagger/swagger-ui.css
diff --git a/src/Views/swagger/swagger-ui.css.map b/src/Views/swagger/swagger-ui.css.map
diff --git a/src/Views/swagger/swagger-ui.js b/src/Views/swagger/swagger-ui.js
diff --git a/src/Views/swagger/swagger-ui.js.map b/src/Views/swagger/swagger-ui.js.map