github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 21:26:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a managed package of qrcode-generator instead of a copy of the JS file

Browse Source
This commit is contained in:
Bernd Bestel 2020-09-06 09:54:24 +02:00
parent e3666cfb4b
commit 7ccef956ba
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
6 changed files with 14 additions and 2302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -29,6 +29,7 @@
"jquery-serializejson": "^2.9.0", "jquery-serializejson": "^2.9.0",
"moment": "^2.27.0", "moment": "^2.27.0",
"nosleep.js": "^0.11.0", "nosleep.js": "^0.11.0",
"qrcode-generator": "^1.4.4",
"sprintf-js": "^1.1.2", "sprintf-js": "^1.1.2",
"startbootstrap-sb-admin": "4.0.0", "startbootstrap-sb-admin": "4.0.0",
"summernote": "^0.8.18", "summernote": "^0.8.18",

2297
public/js/qrcode.js
View File

File diff suppressed because it is too large Load Diff

1
views/calendar.blade.php
View File

@ -7,6 +7,7 @@
@push('pageScripts') @push('pageScripts')
<script src="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.js?v=', true) }}{{ $version }}"></script> <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 @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 @endpush
@push('pageStyles') @push('pageStyles')

1
views/layout/default.blade.php
View File

@ -701,7 +701,6 @@
<script src="{{ $U('/js/grocy_wakelockhandling.js?v=', true) }}{{ $version }}"></script> <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_nightmode.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/grocy_clock.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') @stack('pageScripts')
@php @php

11
views/manageapikeys.blade.php
View File

@ -4,6 +4,10 @@
@section('activeNav', '') @section('activeNav', '')
@section('viewJsName', 'manageapikeys') @section('viewJsName', 'manageapikeys')
@push('pageScripts')
<script src="{{ $U('/node_modules/qrcode-generator/qrcode.js?v=', true) }}{{ $version }}"></script>
@endpush
@push('pageStyles') @push('pageStyles')
<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}" <link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
rel="stylesheet"> rel="stylesheet">
@ -64,10 +68,9 @@
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</a> </a>
<a class="btn btn-info btn-sm apikey-show-qr-button" <a class="btn btn-info btn-sm apikey-show-qr-button"
href="#" href="#"
data-apikey-key="{{ $apiKey->api_key }}" data-apikey-key="{{ $apiKey->api_key }}"
data-apikey-type="{{ $apiKey->key_type }}" data-apikey-type="{{ $apiKey->key_type }}">
>
<i class="fas fa-qrcode"></i> <i class="fas fa-qrcode"></i>
</a> </a>
</td> </td>

5
yarn.lock
View File

@ -2920,6 +2920,11 @@ pupa@^2.0.1:
dependencies: dependencies:
escape-goat "^2.0.0" 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: qs@~6.5.2:
version "6.5.2" version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"