From c892f93c351d9b537beb5df9b79e631c67040e2f Mon Sep 17 00:00:00 2001 From: Dariusz L Date: Thu, 26 Jun 2025 03:44:21 +0200 Subject: [PATCH] Refactor utils imports and move utility files to utils/ Moved CommonUtils.js, ImageUtils.js, and LoggerUtils.js to a new utils/ directory and updated all import paths accordingly throughout the codebase. Also increased the default canvas width in Canvas.js from 512 to 1024. --- js/Canvas.js | 6 +++--- js/CanvasIO.js | 6 +++--- js/CanvasInteractions.js | 4 ++-- js/CanvasLayers.js | 6 +++--- js/CanvasRenderer.js | 2 +- js/CanvasState.js | 4 ++-- js/Canvas_view.js | 6 +++--- js/ErrorHandler.js | 2 +- js/ImageCache.js | 2 +- js/Mask_tool.js | 2 +- js/db.js | 2 +- js/{ => utils}/CommonUtils.js | 0 js/{ => utils}/ImageUtils.js | 2 +- js/{ => utils}/LoggerUtils.js | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) rename js/{ => utils}/CommonUtils.js (100%) rename js/{ => utils}/ImageUtils.js (99%) rename js/{ => utils}/LoggerUtils.js (98%) diff --git a/js/Canvas.js b/js/Canvas.js index 470a46b..1092abd 100644 --- a/js/Canvas.js +++ b/js/Canvas.js @@ -5,8 +5,8 @@ import {CanvasInteractions} from "./CanvasInteractions.js"; import {CanvasLayers} from "./CanvasLayers.js"; import {CanvasRenderer} from "./CanvasRenderer.js"; import {CanvasIO} from "./CanvasIO.js"; -import {createModuleLogger} from "./LoggerUtils.js"; -import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld} from "./CommonUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; +import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld} from "./utils/CommonUtils.js"; import {withErrorHandling, safeExecute} from "./ErrorHandler.js"; // Inicjalizacja loggera dla modułu Canvas @@ -18,7 +18,7 @@ export class Canvas { this.widget = widget; this.canvas = document.createElement('canvas'); this.ctx = this.canvas.getContext('2d'); - this.width = 512; + this.width = 1024; this.height = 512; this.layers = []; this.selectedLayer = null; diff --git a/js/CanvasIO.js b/js/CanvasIO.js index e69d04f..e16ed1e 100644 --- a/js/CanvasIO.js +++ b/js/CanvasIO.js @@ -1,8 +1,8 @@ import {saveImage, getImage, removeImage} from "./db.js"; import {logger, LogLevel} from "./logger.js"; -import {createCanvas, normalizeToUint8} from "./CommonUtils.js"; -import {createImageFromSource} from "./ImageUtils.js"; -import {createModuleLogger} from "./LoggerUtils.js"; +import {createCanvas, normalizeToUint8} from "./utils/CommonUtils.js"; +import {createImageFromSource} from "./utils/ImageUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; const log = createModuleLogger('CanvasIO'); diff --git a/js/CanvasInteractions.js b/js/CanvasInteractions.js index 9c554a5..d08e2ce 100644 --- a/js/CanvasInteractions.js +++ b/js/CanvasInteractions.js @@ -1,5 +1,5 @@ -import {createModuleLogger} from "./LoggerUtils.js"; -import {snapToGrid, getSnapAdjustment} from "./CommonUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; +import {snapToGrid, getSnapAdjustment} from "./utils/CommonUtils.js"; // Inicjalizacja loggera dla modułu CanvasInteractions const log = createModuleLogger('CanvasInteractions'); diff --git a/js/CanvasLayers.js b/js/CanvasLayers.js index 8500d15..84f26d8 100644 --- a/js/CanvasLayers.js +++ b/js/CanvasLayers.js @@ -1,8 +1,8 @@ import {saveImage, getImage, removeImage} from "./db.js"; -import {createModuleLogger} from "./LoggerUtils.js"; -import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld, createCanvas, generateUniqueFileName} from "./CommonUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; +import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld, createCanvas, generateUniqueFileName} from "./utils/CommonUtils.js"; import {withErrorHandling, createValidationError, safeExecute} from "./ErrorHandler.js"; -import {createImageFromSource} from "./ImageUtils.js"; +import {createImageFromSource} from "./utils/ImageUtils.js"; // Inicjalizacja loggera dla modułu CanvasLayers const log = createModuleLogger('CanvasLayers'); diff --git a/js/CanvasRenderer.js b/js/CanvasRenderer.js index bc61fef..89dd853 100644 --- a/js/CanvasRenderer.js +++ b/js/CanvasRenderer.js @@ -1,4 +1,4 @@ -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; // Inicjalizacja loggera dla modułu CanvasRenderer const log = createModuleLogger('CanvasRenderer'); diff --git a/js/CanvasState.js b/js/CanvasState.js index 4f539f1..adce74b 100644 --- a/js/CanvasState.js +++ b/js/CanvasState.js @@ -1,6 +1,6 @@ import {getCanvasState, setCanvasState, removeCanvasState, saveImage, getImage, removeImage} from "./db.js"; -import {createModuleLogger} from "./LoggerUtils.js"; -import {generateUUID, cloneLayers, getStateSignature, debounce} from "./CommonUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; +import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js"; import {withErrorHandling, safeExecute} from "./ErrorHandler.js"; // Inicjalizacja loggera dla modułu CanvasState diff --git a/js/Canvas_view.js b/js/Canvas_view.js index ec48659..aa184c2 100644 --- a/js/Canvas_view.js +++ b/js/Canvas_view.js @@ -5,10 +5,10 @@ import {$el} from "../../scripts/ui.js"; import {Canvas} from "./Canvas.js"; import {clearAllCanvasStates} from "./db.js"; import {ImageCache} from "./ImageCache.js"; -import {validateImageData, convertImageData, applyMaskToImageData, prepareImageForCanvas, createImageFromSource} from "./ImageUtils.js"; -import {generateUniqueFileName} from "./CommonUtils.js"; +import {validateImageData, convertImageData, applyMaskToImageData, prepareImageForCanvas, createImageFromSource} from "./utils/ImageUtils.js"; +import {generateUniqueFileName} from "./utils/CommonUtils.js"; import {logger, LogLevel} from "./logger.js"; -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; const log = createModuleLogger('Canvas_view'); diff --git a/js/ErrorHandler.js b/js/ErrorHandler.js index 7b7ed76..92c54a8 100644 --- a/js/ErrorHandler.js +++ b/js/ErrorHandler.js @@ -3,7 +3,7 @@ * Eliminuje powtarzalne wzorce obsługi błędów w całym projekcie */ -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; const log = createModuleLogger('ErrorHandler'); diff --git a/js/ImageCache.js b/js/ImageCache.js index d6e0a5b..d53bc33 100644 --- a/js/ImageCache.js +++ b/js/ImageCache.js @@ -1,4 +1,4 @@ -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; // Inicjalizacja loggera dla modułu ImageCache const log = createModuleLogger('ImageCache'); diff --git a/js/Mask_tool.js b/js/Mask_tool.js index 9fa9da6..63093ec 100644 --- a/js/Mask_tool.js +++ b/js/Mask_tool.js @@ -1,4 +1,4 @@ -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; // Inicjalizacja loggera dla modułu Mask_tool const log = createModuleLogger('Mask_tool'); diff --git a/js/db.js b/js/db.js index 6e9e117..ddbd600 100644 --- a/js/db.js +++ b/js/db.js @@ -1,4 +1,4 @@ -import {createModuleLogger} from "./LoggerUtils.js"; +import {createModuleLogger} from "./utils/LoggerUtils.js"; // Inicjalizacja loggera dla modułu db const log = createModuleLogger('db'); diff --git a/js/CommonUtils.js b/js/utils/CommonUtils.js similarity index 100% rename from js/CommonUtils.js rename to js/utils/CommonUtils.js diff --git a/js/ImageUtils.js b/js/utils/ImageUtils.js similarity index 99% rename from js/ImageUtils.js rename to js/utils/ImageUtils.js index e8fb43c..f8b05c3 100644 --- a/js/ImageUtils.js +++ b/js/utils/ImageUtils.js @@ -1,5 +1,5 @@ import {createModuleLogger} from "./LoggerUtils.js"; -import {withErrorHandling, createValidationError} from "./ErrorHandler.js"; +import {withErrorHandling, createValidationError} from "../ErrorHandler.js"; // Inicjalizacja loggera dla modułu ImageUtils const log = createModuleLogger('ImageUtils'); diff --git a/js/LoggerUtils.js b/js/utils/LoggerUtils.js similarity index 98% rename from js/LoggerUtils.js rename to js/utils/LoggerUtils.js index 9fd78f1..1743818 100644 --- a/js/LoggerUtils.js +++ b/js/utils/LoggerUtils.js @@ -3,7 +3,7 @@ * Eliminuje powtarzalny kod inicjalizacji loggera w każdym module */ -import {logger, LogLevel} from "./logger.js"; +import {logger, LogLevel} from "../logger.js"; /** * Tworzy obiekt loggera dla modułu z predefiniowanymi metodami