mirror of
https://github.com/grocy/grocy.git
synced 2026-04-06 21:06:15 +02:00
Use a managed package of qrcode-generator instead of a copy of the JS file
This commit is contained in:
parent
e3666cfb4b
commit
7ccef956ba
|
|
@ -29,6 +29,7 @@
|
|||
"jquery-serializejson": "^2.9.0",
|
||||
"moment": "^2.27.0",
|
||||
"nosleep.js": "^0.11.0",
|
||||
"qrcode-generator": "^1.4.4",
|
||||
"sprintf-js": "^1.1.2",
|
||||
"startbootstrap-sb-admin": "4.0.0",
|
||||
"summernote": "^0.8.18",
|
||||
|
|
|
|||
2297
public/js/qrcode.js
2297
public/js/qrcode.js
File diff suppressed because it is too large
Load Diff
|
|
@ -7,6 +7,7 @@
|
|||
@push('pageScripts')
|
||||
<script src="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.js?v=', true) }}{{ $version }}"></script>
|
||||
@if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/fullcalendar/dist/locale/{{ $__t('fullcalendar_locale') }}.js?v={{ $version }}"></script>@endif
|
||||
<script src="{{ $U('/node_modules/qrcode-generator/qrcode.js?v=', true) }}{{ $version }}"></script>
|
||||
@endpush
|
||||
|
||||
@push('pageStyles')
|
||||
|
|
|
|||
|
|
@ -701,7 +701,6 @@
|
|||
<script src="{{ $U('/js/grocy_wakelockhandling.js?v=', true) }}{{ $version }}"></script>
|
||||
<script src="{{ $U('/js/grocy_nightmode.js?v=', true) }}{{ $version }}"></script>
|
||||
<script src="{{ $U('/js/grocy_clock.js?v=', true) }}{{ $version }}"></script>
|
||||
<script src="{{ $U('/js/qrcode.js?v=', true) }}{{ $version }}"></script>
|
||||
@stack('pageScripts')
|
||||
|
||||
@php
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
@section('activeNav', '')
|
||||
@section('viewJsName', 'manageapikeys')
|
||||
|
||||
@push('pageScripts')
|
||||
<script src="{{ $U('/node_modules/qrcode-generator/qrcode.js?v=', true) }}{{ $version }}"></script>
|
||||
@endpush
|
||||
|
||||
@push('pageStyles')
|
||||
<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
|
|
@ -64,10 +68,9 @@
|
|||
<i class="fas fa-trash"></i>
|
||||
</a>
|
||||
<a class="btn btn-info btn-sm apikey-show-qr-button"
|
||||
href="#"
|
||||
data-apikey-key="{{ $apiKey->api_key }}"
|
||||
data-apikey-type="{{ $apiKey->key_type }}"
|
||||
>
|
||||
href="#"
|
||||
data-apikey-key="{{ $apiKey->api_key }}"
|
||||
data-apikey-type="{{ $apiKey->key_type }}">
|
||||
<i class="fas fa-qrcode"></i>
|
||||
</a>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -2920,6 +2920,11 @@ pupa@^2.0.1:
|
|||
dependencies:
|
||||
escape-goat "^2.0.0"
|
||||
|
||||
qrcode-generator@^1.4.4:
|
||||
version "1.4.4"
|
||||
resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.4.tgz#63f771224854759329a99048806a53ed278740e7"
|
||||
integrity sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==
|
||||
|
||||
qs@~6.5.2:
|
||||
version "6.5.2"
|
||||
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user