Merge pull request 'Версия 0.6.0' (#9) from develop into main

Reviewed-on: #9

app/application/app/Http/Requests/Admin/Projects/About/StoreUpdateRequest.php

@@ -34,7 +34,7 @@ final class StoreUpdateRequest extends FormRequest implements FormRequestDto
     {
         return new StoreUpdate(
             title: $this->input('title'),
-            description: $this->input('description'),
+            description: (string) $this->input('description', ''),
             storages: $this->storages(),
             isTranslateAutomatically: (bool) $this->input('translate-automatically', false),
         );

app/application/app/Services/Storage/Image/ResizeCommandHandler.php

@@ -9,7 +9,7 @@ final readonly class ResizeCommandHandler
 {
     public function resize(Storage $storage, int $width, int $height): Storage
     {
-        $image = InterventionImage::read($storage->path);
+        $image = InterventionImage::decodePath($storage->path);
         if ($image->width() < $width && $image->height() < $height) {
             return $storage;
         }
@@ -23,7 +23,7 @@ final readonly class ResizeCommandHandler
 
     public function width(Storage $storage, int $width): Storage
     {
-        $image = InterventionImage::read($storage->path);
+        $image = InterventionImage::decodePath($storage->path);
         if ($image->width() < $width) {
             return $storage;
         }
@@ -37,7 +37,7 @@ final readonly class ResizeCommandHandler
 
     public function height(Storage $storage, int $height): Storage
     {
-        $image = InterventionImage::read($storage->path);
+        $image = InterventionImage::decodePath($storage->path);
         if ($image->height() < $height) {
             return $storage;
         }

app/application/composer.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://getcomposer.org/schema.json",
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
@@ -6,23 +7,22 @@
     "license": "MIT",
     "require": {
         "php": "^8.3",
-        "intervention/image-laravel": "^1.2",
+        "intervention/image-laravel": "^4.0",
         "kor-elf/captcha-rule-for-laravel": "^1.0",
-        "kor-elf/translate-laravel": "1.3.0",
+        "kor-elf/translate-laravel": "^2.0",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^13.8",
-        "laravel/tinker": "^2.9",
+        "laravel/tinker": "^3.0",
-        "staudenmeir/laravel-adjacency-list": "^1.0"
+        "staudenmeir/laravel-adjacency-list": "^1.26"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.13",
+        "barryvdh/laravel-debugbar": "^4.3",
         "fakerphp/faker": "^1.23",
-        "laravel-lang/common": "^6.2",
+        "laravel/pail": "^1.2.5",
-        "laravel/pint": "^1.13",
+        "laravel/pao": "^1.0.6",
-        "laravel/sail": "^1.26",
+        "laravel/pint": "^1.27",
         "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.0",
+        "nunomaduro/collision": "^8.6",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^12.5.12"
-        "spatie/laravel-ignition": "^2.4"
     },
     "autoload": {
         "psr-4": {
@@ -37,6 +37,22 @@
         }
     },
     "scripts": {
+        "setup": [
+            "composer install",
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
+            "@php artisan key:generate",
+            "@php artisan migrate --force",
+            "npm install --ignore-scripts",
+            "npm run build"
+        ],
+        "dev": [
+            "Composer\\Config::disableProcessTimeout",
+            "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
+        ],
+        "test": [
+            "@php artisan config:clear --ansi @no_additional_args",
+            "@php artisan test"
+        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
@@ -51,6 +67,9 @@
             "@php artisan key:generate --ansi",
             "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
             "@php artisan migrate --graceful --ansi"
+        ],
+        "pre-package-uninstall": [
+            "Illuminate\\Foundation\\ComposerScripts::prePackageUninstall"
         ]
     },
     "extra": {

app/application/lang/en/editor.php

@@ -0,0 +1,6 @@
+<?php declare(strict_types=1);
+
+return [
+    'Do not translate' => 'Do not translate',
+    'Mark as not to translate' => 'Mark as not to translate',
+];

app/application/lang/ru/editor.php

@@ -0,0 +1,6 @@
+<?php declare(strict_types=1);
+
+return [
+    'Do not translate' => 'Не переводить',
+    'Mark as not to translate' => 'Пометить как не переводить',
+];

app/application/resources/views/components/volt/forms/textarea-wysiwyg.blade.php

@@ -95,14 +95,96 @@
                     xhr.send(formData);
                 });
             @endif
+
+            tinymce.PluginManager.add('translateNo', (editor) => {
+                const ATTR = 'translate';
+                const VALUE = 'no';
+
+                const isTranslateNo = (node) =>
+                    node && node.nodeType === 1 && node.getAttribute(ATTR) === VALUE;
+
+                const toggleTranslateNo = () => {
+                    const selectedNode = editor.selection.getNode();
+
+                    if (isTranslateNo(selectedNode)) {
+                        // Remove translate="no", expand span
+                        if (selectedNode.tagName === 'SPAN') {
+                            editor.dom.remove(selectedNode, true); // true = сохранить детей
+                        } else {
+                            editor.dom.setAttrib(selectedNode, ATTR, null);
+                        }
+                        return;
+                    }
+
+                    // If inside translate="no", remove the mark
+                    const wrapper = editor.dom.getParent(selectedNode, `[${ATTR}="${VALUE}"]`);
+                    if (wrapper) {
+                        if (wrapper.tagName === 'SPAN') {
+                            editor.dom.remove(wrapper, true);
+                        } else {
+                            editor.dom.setAttrib(wrapper, ATTR, null);
+                        }
+                        return;
+                    }
+
+                    // Otherwise, wrap the selection
+                    editor.formatter.register('translateNo', {
+                        inline: 'span',
+                        attributes: { [ATTR]: VALUE },
+                        remove: 'all'
+                    });
+                    editor.formatter.apply('translateNo');
+                };
+
+                editor.ui.registry.addToggleButton('translateNo', {
+                    icon: 'translate',
+                    tooltip: '{{ __('editor.Do not translate') }}',
+                    onAction: toggleTranslateNo,
+                    onSetup: (api) => {
+                        const setActive = () => {
+                            const node = editor.selection.getNode();
+                            api.setActive(
+                                isTranslateNo(node) ||
+                                !!editor.dom.getParent(node, `[${ATTR}="${VALUE}"]`)
+                            );
+                        };
+                        editor.on('NodeChange', setActive);
+                        return () => editor.off('NodeChange', setActive);
+                    }
+                });
+
+                editor.ui.registry.addMenuItem('translateNo', {
+                    text: '{{ __('editor.Mark as not to translate') }}',
+                    icon: 'translate',
+                    onAction: toggleTranslateNo
+                });
+            });
+
             tinymce.init({
+                content_style: `
+                    span[translate="no"] {
+                      background: rgba(255, 215, 0, 0.35);
+                      outline: 1px dashed #e0a800;
+                      position: relative;
+                    }
+                    span[translate="no"]:hover::before {
+                        position: absolute;
+                        content: "{{ __('editor.Do not translate') }}";
+                        left: 0;
+                        bottom: 100%;
+                        background: #e0a800;
+                        white-space: nowrap;
+                        padding: 0.25rem;
+                        border: 1px solid #ddd;
+                    }
+              `,
                 selector: '#{{ $tinyId }}',
                 @if(in_array(app()->getLocale(), ['ru'], true))
                     language: '{{ app()->getLocale() }}',
                 @endif
                 license_key: '{{ $tinymceLicenseKey }}',
-                plugins: 'advlist code emoticons link lists table codesample media my-image',
+                plugins: 'advlist code emoticons link lists table codesample media my-image translateNo',
-                toolbar: 'bold italic | bullist numlist | link image emoticons media codesample',
+                toolbar: 'bold italic | bullist numlist | link image emoticons media codesample translateNo',
                 referrer_policy: 'origin',
                 @if($storageUpload !== null)
                     images_upload_handler: imageUpload,

docker-compose-prod_docker-hub.yml

@@ -1,8 +1,8 @@
 #version: '3.7'
 services:
   app:
-    #  image: korelf/my-projects-website:0.5.0 # docker hub
+    #  image: korelf/my-projects-website:0.6.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.5.0 # MDHub
+    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.6.0 # MDHub
     #  restart: always
     depends_on:
       - db
@@ -20,8 +20,8 @@ services:
       # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
 
   queue:
-    #  image: korelf/my-projects-website:0.5.0 # docker hub
+    #  image: korelf/my-projects-website:0.6.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.5.0 # MDHub
+    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.6.0 # MDHub
     #  restart: always
     depends_on:
       - db
@@ -35,8 +35,8 @@ services:
       # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
 
   scheduler:
-    #  image: korelf/my-projects-website:0.5.0 # docker hub
+    #  image: korelf/my-projects-website:0.6.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.5.0 # MDHub
+    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.6.0 # MDHub
     #  restart: always
     depends_on:
       - db