fix openapi ui

This commit is contained in:
Katharina Bogad 2021-06-25 23:35:14 +02:00
parent 45d7febeed
commit ab83064e2c
4 changed files with 20 additions and 9 deletions

View File

@ -128,7 +128,6 @@ function clean(cb)
// It can also be used within the `series()` composition.
function build(cb)
{
// body omitted
return parallel(
js,
css,
@ -136,7 +135,9 @@ function build(cb)
viewjs,
resourceFileCopy,
copyLocales,
makeLocales)(cb);
makeLocales,
openApi,
)(cb);
}
function publish(cb)
@ -230,6 +231,14 @@ function copyLocales(cb)
)(cb);
}
function openApi(cb)
{
return parallel(
icb => src(['./node_modules/swagger-ui-dist/*.js', './node_modules/swagger-ui-dist/*.js.map']).pipe(dest('./public/js')),
icb => src(['./node_modules/swagger-ui-dist/*.css', './node_modules/swagger-ui-dist/*.css.map']).pipe(dest('./public/css')),
)(cb);
}
function live(cb)
{
watch('./scss/**/*.scss', css);
@ -302,5 +311,6 @@ export
publish,
release,
bundle,
makeLocales
makeLocales,
openApi
}

View File

@ -24,5 +24,4 @@ const swaggerUi = SwaggerUIBundle({
docExpansion: "list"
});
window.ui = swaggerUi;
window.ui = swaggerUi;

View File

@ -90,6 +90,7 @@
data-apikey-id="{{ $apiKey->id }}"
data-apikey-apikey="{{ $apiKey->api_key }}"
data-toggle="tooltip"
data-boundary="viewport"
title="{{ $__t('Delete this item') }}">
<i class="fas fa-trash"></i>
</a>
@ -98,6 +99,7 @@
data-apikey-key="{{ $apiKey->api_key }}"
data-apikey-type="{{ $apiKey->key_type }}"
data-toggle="tooltip"
data-boundary="viewport"
title="{{ $__t('Show a QR-Code for this API key') }}">
<i class="fas fa-qrcode"></i>
</a>

View File

@ -20,7 +20,7 @@
<title>{{ $__t('REST API & data model documentation') }} | grocy</title>
<link href="{{ $U('/node_modules/swagger-ui-dist/swagger-ui.css?v=', true) }}{{ $version }}"
<link href="{{ $U('/css/swagger-ui.css?v=', true) }}{{ $version }}"
rel="stylesheet">
@if(file_exists(GROCY_DATAPATH . '/custom_css.html'))
@ -60,9 +60,9 @@
<body>
<div id="swagger-ui"></div>
<script src="{{ $U('/node_modules/swagger-ui-dist/swagger-ui.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/swagger-ui-dist/swagger-ui-bundle.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/swagger-ui-dist/swagger-ui-standalone-preset.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/swagger-ui.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/swagger-ui-bundle.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/swagger-ui-standalone-preset.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/viewjs', true) }}/openapiui.js?v={{ $version }}"></script>
@if(file_exists(GROCY_DATAPATH . '/custom_js.html'))