Skip to content

Commit ae5f987

Browse files
DenTrayDenTray
authored
Merge pull request #26 from RonasIT/dpankratov/version-update
Dpankratov/version update
2 parents af58b34 + fbf369a commit ae5f987

13 files changed

+49
-195
lines changed

‎src/Http/Controllers/AutoDocController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace RonasIT\Support\AutoDoc\Http\Controllers;
44

5+
use Illuminate\Http\Request;
56
use Illuminate\Routing\Controller as BaseController;
67
use RonasIT\Support\AutoDoc\Services\SwaggerService;
78
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -27,7 +28,7 @@ public function index()
2728
return view('auto-doc::documentation');
2829
}
2930

30-
public function getFile($file)
31+
public function getFile(Request $request, $file)
3132
{
3233
$filePath = base_path("vendor/ronasit/laravel-swagger/src/Views/swagger/{$file}");
3334

@@ -37,6 +38,6 @@ public function getFile($file)
3738

3839
$content = file_get_contents($filePath);
3940

40-
return response($content);
41+
return response($content)->header('Content-Type', $request->getAcceptableContentTypes());
4142
}
4243
}

‎src/Http/routes.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
use RonasIT\Support\AutoDoc\Http\Controllers\AutoDocController;
44

5-
65
Route::get('/auto-doc/documentation', ['uses' => AutoDocController::class . '@documentation']);
76
Route::get('/auto-doc/{file}', ['uses' => AutoDocController::class . '@getFile']);
87
Route::get(config('auto-doc.route'), ['uses' => AutoDocController::class . '@index']);

‎src/Views/documentation.blade.php‎

Lines changed: 33 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,60 @@
1+
<!-- HTML for static distribution bundle build -->
12
<!DOCTYPE html>
23
<html lang="en">
34
<head>
45
<meta charset="UTF-8">
5-
<title>{{ config('auto-doc.info.title') }}</title>
6-
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700"
7-
rel="stylesheet">
8-
<link rel="stylesheet" type="text/css" href="/auto-doc/swagger-ui.css">
9-
<link rel="icon" type="image/png" href="/auto-doc/favicon-32x32.png" sizes="32x32"/>
10-
<link rel="icon" type="image/png" href="/auto-doc/favicon-16x16.png" sizes="16x16"/>
6+
<title>Swagger UI</title>
7+
<link rel="stylesheet" type="text/css" href="/auto-doc/swagger-ui.css" >
8+
<link rel="icon" type="image/png" href="/auto-doc/favicon-32x32.png" sizes="32x32" />
9+
<link rel="icon" type="image/png" href="/auto-doc/favicon-16x16.png" sizes="16x16" />
1110
<style>
12-
html {
11+
html
12+
{
1313
box-sizing: border-box;
1414
overflow: -moz-scrollbars-vertical;
1515
overflow-y: scroll;
1616
}
1717
1818
*,
1919
*:before,
20-
*:after {
20+
*:after
21+
{
2122
box-sizing: inherit;
2223
}
2324
24-
body {
25-
margin: 0;
25+
body
26+
{
27+
margin:0;
2628
background: #fafafa;
2729
}
2830
</style>
2931
</head>
3032

3133
<body>
32-
33-
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
34-
style="position:absolute;width:0;height:0">
35-
<defs>
36-
<symbol viewBox="0 0 20 20" id="unlocked">
37-
<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>
38-
</symbol>
39-
40-
<symbol viewBox="0 0 20 20" id="locked">
41-
<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"/>
42-
</symbol>
43-
44-
<symbol viewBox="0 0 20 20" id="close">
45-
<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"/>
46-
</symbol>
47-
48-
<symbol viewBox="0 0 20 20" id="large-arrow">
49-
<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"/>
50-
</symbol>
51-
52-
<symbol viewBox="0 0 20 20" id="large-arrow-down">
53-
<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"/>
54-
</symbol>
55-
56-
57-
<symbol viewBox="0 0 24 24" id="jump-to">
58-
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
59-
</symbol>
60-
61-
<symbol viewBox="0 0 24 24" id="expand">
62-
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
63-
</symbol>
64-
65-
</defs>
66-
</svg>
67-
6834
<div id="swagger-ui"></div>
6935

70-
<script src="/auto-doc/swagger-ui-bundle.js"></script>
71-
<script src="/auto-doc/swagger-ui-standalone-preset.js"></script>
36+
<script src="/auto-doc/swagger-ui-bundle.js" charset="UTF-8"> </script>
37+
<script src="/auto-doc/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
7238
<script>
73-
window.onload = function () {
74-
// Build a system
75-
const ui = SwaggerUIBundle({
76-
url: "/auto-doc/documentation",
77-
dom_id: '#swagger-ui',
78-
presets: [
79-
SwaggerUIBundle.presets.apis,
80-
// yay ES6 modules ↘
81-
Array.isArray(SwaggerUIStandalonePreset) ? SwaggerUIStandalonePreset : SwaggerUIStandalonePreset.default
82-
],
83-
plugins: [
84-
SwaggerUIBundle.plugins.DownloadUrl
85-
],
86-
layout: "StandaloneLayout"
87-
})
88-
89-
window.ui = ui
90-
}
39+
window.onload = function() {
40+
// Begin Swagger UI call region
41+
const ui = SwaggerUIBundle({
42+
url: "/auto-doc/documentation",
43+
dom_id: '#swagger-ui',
44+
deepLinking: true,
45+
presets: [
46+
SwaggerUIBundle.presets.apis,
47+
SwaggerUIStandalonePreset
48+
],
49+
plugins: [
50+
SwaggerUIBundle.plugins.DownloadUrl
51+
],
52+
layout: "StandaloneLayout"
53+
})
54+
// End Swagger UI call region
55+
56+
window.ui = ui
57+
}
9158
</script>
9259
</body>
93-
9460
</html>

‎src/Views/swagger/favicon-16x16.png‎

220 Bytes
Loading

‎src/Views/swagger/favicon-32x32.png‎

-513 Bytes
Loading

‎src/Views/swagger/swagger-ui-bundle.js‎

Lines changed: 2 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Views/swagger/swagger-ui-bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Views/swagger/swagger-ui-standalone-preset.js‎

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Views/swagger/swagger-ui-standalone-preset.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Views/swagger/swagger-ui.css‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)