Updated prod assets

Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json
snipe · Sep 28, 2023 · cfe6b07 · cfe6b07
2 parents 68c9fac + 7512400
commit cfe6b07
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
         "bootstrap-less": "^3.3.8",
         "bootstrap-table": "1.22.1",
         "chart.js": "^2.9.4",
+        "clipboard": "^2.0.11",
         "css-loader": "^4.0.0",
         "ekko-lightbox": "^5.1.1",
         "imagemin": "^8.0.1",

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
-    "/css/dist/all.css": "/css/dist/all.css?id=585e3d8144b38119f62c59c1ed8e0714",
+    "/css/dist/all.css": "/css/dist/all.css?id=7871ba49ce03aeb14efc98327f593e3a",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=a656b2d865fe379d8851757e8e4001ef",
@@ -29,10 +29,10 @@
     "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=7f63d634454e771396bce3e09dfcdbc5",
     "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=70ad875b2378eb850254f01dec991ade",
     "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=d36941873b661076f146b0221f13497d",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=4801d104e8303a8fa134a927ebf55536",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=2bd29fa7f9d666800c246a52ce708633",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=917784d6fe54bcfe39656e0ded1b43e4",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=1f678160a05960c3087fb8263168ff41",
-    "/js/dist/all.js": "/js/dist/all.js?id=37dceeb0fe493b5c8af846264a1a34b2",
+    "/js/dist/all.js": "/js/dist/all.js?id=357da5b17e959095c74406f94361d777",
     "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=07e52318da2cdf3171c4d88113f25fb6",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=44f9320d0739f419c9246f7f39395b02",

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -485,6 +485,8 @@
     ],
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+    'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+    'copy_to_clipboard' => 'Copy to Clipboard',
+    'copied' => 'Copied!',
 
 ];
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -221,7 +221,11 @@
                                                 <strong>{{ trans('admin/hardware/form.serial') }}</strong>
                                             </div>
                                             <div class="col-md-6">
-                                                {{ $asset->serial  }}
+                                                <span class="js-copy">{{ $asset->serial  }}</span>
+
+                                                <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                                    <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                                                </i>
                                             </div>
                                         </div>
                                     @endif

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
@@ -959,6 +959,11 @@ class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noo
 
         <script nonce="{{ csrf_token() }}">
 
+            var clipboard = new ClipboardJS('.js-copy-link');
+
+            clipboard.on('success', function(e) {
+                $('.js-copy-link').tooltip('hide').attr('data-original-title', '{{ trans('general.copied') }}').tooltip('show');
+            });
 
             // ignore: 'input[type=hidden]' is required here to validate the select2 lists
             $.validate({

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
@@ -125,7 +125,10 @@
                     </div>
                     <div class="col-md-9">
                       @can('viewKeys', $license)
-                        {!! nl2br(e($license->serial)) !!}
+                        <span class="js-copy">{!! nl2br(e($license->serial)) !!}</span>
+                          <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                            <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                          </i>
                       @else
                         ------------
                       @endcan

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -26,7 +26,6 @@ mix
       "./node_modules/bootstrap-table/dist/bootstrap-table.css",
       "./public/css/build/app.css",
       "./node_modules/select2/dist/css/select2.css",
-      "./resources/assets/css/dragtable.css",
       "./public/css/build/overrides.css",
     ],
     "./public/css/dist/all.css"
@@ -144,7 +143,7 @@ mix
     [
       "./node_modules/bootstrap-table/dist/bootstrap-table.css",
       "./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css",
-      "./node_modules/dragtable/dragtable.css",
+     "./resources/assets/css/dragtable.css",
     ],
     "public/css/dist/bootstrap-table.css"
   )
@@ -172,6 +171,7 @@ mix.combine(
     "./resources/assets/js/signature_pad.js",
     "./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js", //problem?
     "./node_modules/list.js/dist/list.js",
+    "./node_modules/clipboard/dist/clipboard.js",
   ],
   "public/js/build/vendor.js" // this file seems OK!
 );