Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.5.1 (2022-02-02)
+
+- Improved ISBN validation
+- Fixed possible errors when publish date is being empty
+
 ## 1.5.0 (2022-02-01)
 
 - Added experimental barcode scanner when creating volumes

app/Http/Livewire/Volumes/CreateVolume.php

@@ -5,13 +5,13 @@
 use App\Helpers\IsbnHelpers;
 use App\Models\Series;
 use App\Models\Volume;
+use App\Rules\Isbn;
 use Illuminate\Support\Str;
-use Intervention\Validation\Rules\Isbn;
 use Livewire\Component;
 
 class CreateVolume extends Component
 {
-    public string $publish_date = '';
+    public ?string $publish_date = '';
 
     public string $isbn = '';
 
@@ -37,7 +37,7 @@ public function render()
     protected function rules()
     {
         return [
-            'publish_date' => 'date',
+            'publish_date' => 'nullable|date',
             'status' => 'required|integer|min:0',
             'price' => 'nullable|regex:"^[0-9]{1,9}([,.][0-9]{1,2})?$"',
             'isbn' => ['required', 'unique:volumes,isbn,NULL,id,series_id,' . $this->series->id, new Isbn()],
@@ -71,6 +71,9 @@ public function save(): void
         } else {
             $this->price = 0;
         }
+        if (empty($this->publish_date)) {
+            $this->publish_date = null;
+        }
         $volume = new Volume([
             'series_id' => $this->series->id,
             'number' => ++$number,

app/Http/Livewire/Volumes/EditVolume.php

@@ -6,8 +6,8 @@
 use App\Models\Category;
 use App\Models\Series;
 use App\Models\Volume;
+use App\Rules\Isbn;
 use Illuminate\Support\Str;
-use Intervention\Validation\Rules\Isbn;
 use Jantinnerezo\LivewireAlert\LivewireAlert;
 use Livewire\Component;
 
@@ -31,7 +31,7 @@ public function mount(Category $category, Series $series, int $number): void
     protected function rules()
     {
         return [
-            'volume.publish_date' => 'date',
+            'volume.publish_date' => 'nullable|date',
             'volume.status' => 'required|integer|min:0',
             'volume.price' => 'nullable|regex:"^[0-9]{1,9}([,.][0-9]{1,2})?$"',
             'volume.isbn' => ['required', 'unique:volumes,isbn,' . $this->volume->id . ',id,series_id,' . $this->series->id, new Isbn()],
@@ -49,7 +49,7 @@ public function updated($property, $value): void
             $this->validateOnly($property);
             $isbn = IsbnHelpers::convertTo13($value);
             if (!empty($isbn)) {
-                $this->volume->publish_date = IsbnHelpers::getPublishDateByIsbn($isbn) ?? '';
+                $this->volume->publish_date = IsbnHelpers::getPublishDateByIsbn($isbn) ?? null;
             }
         } else {
             $this->validateOnly($property);
@@ -72,6 +72,9 @@ public function save()
         } else {
             $this->volume->price = 0;
         }
+        if (empty($this->volume->publish_date)) {
+            $this->volume->publish_date = null;
+        }
         $this->validate();
         $this->volume->save();
         toastr()->addSuccess(__('Volumme :number has been updated', ['number' => $this->volume->number]));

app/Rules/Isbn.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+use Nicebooks\Isbn\IsbnTools;
+
+class Isbn implements Rule
+{
+    /**
+     * Create a new rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $tools = new IsbnTools();
+
+        return $tools->isValidIsbn($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return __('The provided ISBN is invalid');
+    }
+}

composer.json

@@ -12,7 +12,6 @@
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.7",
-        "intervention/validation": "^3.0",
         "jantinnerezo/livewire-alert": "^2.2",
         "laravel/framework": "^8.75",
         "laravel/sanctum": "^2.11",

config/app.php

@@ -10,7 +10,7 @@
     | Current application version.
     |
     */
-    'version' => env('APP_VERSION', '1.5.0'),
+    'version' => env('APP_VERSION', '1.5.1'),
 
     /*
     |--------------------------------------------------------------------------

resources/lang/de.json

@@ -36,6 +36,7 @@
     "Finished": "Abgeschlossen",
     "Forgot Your Password?": "Passwort vergessen?",
     "Format ISBNs": "Formatiere ISBNs",
+    "The provided ISBN is invalid": "Die angegebene ISBN ist ungültig",
     "Hide in upcoming releases": "In Anstehende Veröffentlichungen ausblenden",
     "Hide NSFW": "NSFW ausblenden",
     "Home": "Startseite",

resources/views/livewire/volumes/create-volume.blade.php

@@ -137,9 +137,9 @@
 
     <script type="text/javascript">
         document.addEventListener('livewire:load', function() {
-            debugger;
             // Create the QuaggaJS config object for the live stream
             var liveStreamConfig = {
+                frequency: 10,
                 inputStream: {
                     type: "LiveStream",
                     constraints: {
@@ -153,19 +153,18 @@
                             min: 1,
                             max: 100
                         },
-                        facingMode: "environment" // or "user" for the front camera
-                    }
+                        facingMode: "environment"
+                    },
                 },
                 locator: {
                     patchSize: "medium",
-                    halfSample: true
+                    halfSample: true,
                 },
                 numOfWorkers: (navigator.hardwareConcurrency ? navigator.hardwareConcurrency : 4),
                 decoder: {
-                    "readers": [{
-                        "format": "ean_reader",
-                        "config": {}
-                    }]
+                    readers: [
+                        "ean_reader"
+                    ],
                 },
                 locate: true
             };