From 128db94667b4d19d221b164dc2bf42704fa58f7e Mon Sep 17 00:00:00 2001 From: keep <1603421097@qq.com> Date: Sun, 19 Apr 2026 10:22:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E5=92=8C=E7=AB=AF=E5=8F=A3=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在server.js中添加端口检查功能，自动尝试可用端口 - 重构imageEditor.html界面，添加历史控制、基本调整、滤镜和文本注释功能区域 - 在full.js中实现撤销/重做历史记录功能 - 添加多种图片滤镜效果（灰度、复古、模糊、锐化等） - 实现文本添加功能，支持字体、大小和颜色选择 - 优化UI样式和交互体验 - 添加package-lock.json管理依赖 --- assets/js/full.js | 590 +++++++++++++++++++++++---------- imageEditor.html | 130 ++++++-- package-lock.json | 828 ++++++++++++++++++++++++++++++++++++++++++++++ server.js | 35 +- 4 files changed, 1392 insertions(+), 191 deletions(-) create mode 100644 package-lock.json diff --git a/assets/js/full.js b/assets/js/full.js index cca0294..06fce64 100644 --- a/assets/js/full.js +++ b/assets/js/full.js @@ -6,6 +6,8 @@ var canvas = document.getElementById('canvas'), tempCanvasContext = tempCanvas.getContext('2d'), rubberbandDiv = document.getElementById('rubberbandDiv'), resetButton = document.getElementById('resetButton'), + undoButton = document.getElementById('undoButton'), + redoButton = document.getElementById('redoButton'), increaseBrightness = document.getElementById('ib'), decreaseBrightness = document.getElementById('db'), increaseContrast = document.getElementById('ic'), @@ -14,31 +16,105 @@ var canvas = document.getElementById('canvas'), rotateright = document.getElementById('rr'), zoomin = document.getElementById('zi'), zoomout = document.getElementById('zo'), - body = document.getElementById('body_1'), // not used for now + grayscaleFilter = document.getElementById('grayscaleFilter'), + sepiaFilter = document.getElementById('sepiaFilter'), + blurFilter = document.getElementById('blurFilter'), + sharpenFilter = document.getElementById('sharpenFilter'), + enhanceContrastFilter = document.getElementById('enhanceContrastFilter'), + removeFilter = document.getElementById('removeFilter'), + textInput = document.getElementById('textInput'), + fontSelect = document.getElementById('fontSelect'), + fontSize = document.getElementById('fontSize'), + fontColor = document.getElementById('fontColor'), + addTextButton = document.getElementById('addTextButton'), + body = document.getElementById('body_1'), image = new Image(), mousedown = {}, rubberbandRectangle = {}, dragging = false, centerShiftX, centerShiftY, - originalPixelData, // not used for now + originalPixelData, ratio, isMouseDown = false, - editorHistory = {}; + editorHistory = {}, + historyStack = [], + historyIndex = -1, + maxHistoryLength = 10, + textPosition = null, + isAddingText = false; //> our temp canvas set up tempCanvas.setAttribute('width','800'); tempCanvas.setAttribute('height', '520'); +//> History Management Functions +function saveHistory() { + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + + if (historyIndex < historyStack.length - 1) { + historyStack = historyStack.slice(0, historyIndex + 1); + } + + historyStack.push({ + imageData: imageData, + data: JSON.stringify(Array.from(imageData.data)) + }); + + if (historyStack.length > maxHistoryLength) { + historyStack.shift(); + } else { + historyIndex++; + } + + updateHistoryButtons(); +} + +function updateHistoryButtons() { + undoButton.disabled = historyIndex <= 0; + redoButton.disabled = historyIndex >= historyStack.length - 1; +} + +function undo() { + if (historyIndex > 0) { + historyIndex--; + restoreHistory(historyIndex); + updateHistoryButtons(); + } +} + +function redo() { + if (historyIndex < historyStack.length - 1) { + historyIndex++; + restoreHistory(historyIndex); + updateHistoryButtons(); + } +} + +function restoreHistory(index) { + if (index >= 0 && index < historyStack.length) { + var historyItem = historyStack[index]; + var imageData; + + if (historyItem.imageData) { + imageData = historyItem.imageData; + } else if (historyItem.data) { + var dataArray = new Uint8ClampedArray(JSON.parse(historyItem.data)); + imageData = new ImageData(dataArray, canvas.width, canvas.height); + } + + if (imageData) { + context.clearRect(0, 0, canvas.width, canvas.height); + context.putImageData(imageData, 0, 0); + } + } +} + //> function to zoom in function zoomPlus(){ - //> get the scale var scale = parseFloat(zoomin.getAttribute('data-step')); - //> get the currentvalue var currentvalue = parseFloat(zoomin.getAttribute('data-currentvalue')); - //> get the maxVal var maxVal = parseFloat(zoomin.getAttribute('data-max')); - //> compute the latest delta var delta = scale + currentvalue; if(delta < maxVal){ context.clearRect(0, 0, canvas.width, canvas.height); @@ -48,18 +124,15 @@ function zoomPlus(){ context.scale(scale, scale); context.translate(-canvas.width / 2, -canvas.height / 2); context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); } } //> function to zoom out function zoomMinus(){ - //> get the scale which is always less than 1 but a positive value var scale = parseFloat(zoomout.getAttribute('data-step')); - //> get the currentvalue - starts with zero initially var currentvalue = parseFloat(zoomout.getAttribute('data-currentvalue')); - //> get the minVal - which will be some deep -ve value var minVal = parseFloat(zoomout.getAttribute('data-min')); - //> compute the latest delta - so since we do -(scale), we always end up with a negative value when zoomed out var delta = -scale + currentvalue; if(delta > minVal){ context.clearRect(0, 0, canvas.width, canvas.height); @@ -69,33 +142,10 @@ function zoomMinus(){ context.scale(scale, scale); context.translate(-canvas.width / 2, -canvas.height / 2); context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); } } -/*function zoomonscroll(e){ - e.preventDefault(); - var scale = 1; - var zoomIntensity = 0.2; - var originx = 0; - var originy = 0; - - var mousex = e.clientX - canvas.offsetLeft; - var mousey = e.clientY - canvas.offsetTop; - var wheel = e.wheelDelta/120;//n or -n - var zoom = Math.exp(wheel*zoomIntensity); - - context.translate(originx, originy); - - originx -= mousex/(scale*zoom) - mousex/scale; - originy -= mousey/(scale*zoom) - mousey/scale; - - context.scale(zoom,zoom); - - context.translate(-originx, -originy); - - scale *= zoom; -}*/ - //> function that deals with incrasing contrast function contrastUp(){ var step = parseInt(increaseContrast.getAttribute('data-step')); @@ -121,6 +171,7 @@ function contrastUp(){ } context.clearRect(0, 0, canvas.width, canvas.height); context.putImageData(pixels, 0, 0); + saveHistory(); console.log('complete increaseContrast...'); } } @@ -150,6 +201,7 @@ function contrastDown(){ } context.clearRect(0, 0, canvas.width, canvas.height); context.putImageData(pixels, 0, 0); + saveHistory(); console.log('complete decreaseContrast...'); } } @@ -168,6 +220,7 @@ function rotateAntiClockWise(){ context.rotate(angle * Math.PI / 180); context.translate(-canvas.width / 2, -canvas.height / 2); context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); } } @@ -185,6 +238,7 @@ function rotateClockWise(){ context.rotate(angle * Math.PI / 180); context.translate(-canvas.width / 2, -canvas.height / 2); context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); } } @@ -212,6 +266,7 @@ function brightnessPlus(){ } context.clearRect(0, 0, canvas.width, canvas.height); context.putImageData(pixels, 0, 0); + saveHistory(); console.log('complete increaseBrightness...'); } } @@ -239,216 +294,417 @@ function brightnessMinus(){ pixelDataArray[i + 2] += delta; // blue } context.putImageData(pixels, 0, 0); + saveHistory(); console.log('complete decreaseBrightness...'); } } -//> Functions for CROP ----- START +//> Filter Functions +function applyGrayscale() { + console.log('Applying grayscale filter...'); + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + var data = imageData.data; + + for (var i = 0; i < data.length; i += 4) { + var gray = 0.299 * data[i] + 0.587 * data[i + 1] + 0.114 * data[i + 2]; + data[i] = gray; // red + data[i + 1] = gray; // green + data[i + 2] = gray; // blue + } + + context.putImageData(imageData, 0, 0); + saveHistory(); + console.log('Grayscale filter applied.'); +} -//> this is executed on mouse down -function rubberbandStart(x, y) { +function applySepia() { + console.log('Applying sepia filter...'); + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + var data = imageData.data; + + for (var i = 0; i < data.length; i += 4) { + var red = data[i]; + var green = data[i + 1]; + var blue = data[i + 2]; + + data[i] = Math.min(255, 0.393 * red + 0.769 * green + 0.189 * blue); + data[i + 1] = Math.min(255, 0.349 * red + 0.686 * green + 0.168 * blue); + data[i + 2] = Math.min(255, 0.272 * red + 0.534 * green + 0.131 * blue); + } + + context.putImageData(imageData, 0, 0); + saveHistory(); + console.log('Sepia filter applied.'); +} + +function applyBlur() { + console.log('Applying blur filter...'); + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + var data = imageData.data; + var width = canvas.width; + var height = canvas.height; + var tempData = new Uint8ClampedArray(data); + var blurRadius = 2; + + for (var y = blurRadius; y < height - blurRadius; y++) { + for (var x = blurRadius; x < width - blurRadius; x++) { + var totalRed = 0, totalGreen = 0, totalBlue = 0, totalAlpha = 0; + var pixelCount = 0; + + for (var offsetY = -blurRadius; offsetY <= blurRadius; offsetY++) { + for (var offsetX = -blurRadius; offsetX <= blurRadius; offsetX++) { + var pixelIndex = ((y + offsetY) * width + (x + offsetX)) * 4; + totalRed += tempData[pixelIndex]; + totalGreen += tempData[pixelIndex + 1]; + totalBlue += tempData[pixelIndex + 2]; + totalAlpha += tempData[pixelIndex + 3]; + pixelCount++; + } + } + + var currentIndex = (y * width + x) * 4; + data[currentIndex] = totalRed / pixelCount; + data[currentIndex + 1] = totalGreen / pixelCount; + data[currentIndex + 2] = totalBlue / pixelCount; + data[currentIndex + 3] = totalAlpha / pixelCount; + } + } + + context.putImageData(imageData, 0, 0); + saveHistory(); + console.log('Blur filter applied.'); +} + +function applySharpen() { + console.log('Applying sharpen filter...'); + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + var data = imageData.data; + var width = canvas.width; + var height = canvas.height; + var tempData = new Uint8ClampedArray(data); + + var kernel = [ + 0, -1, 0, + -1, 5, -1, + 0, -1, 0 + ]; + var kernelSize = 3; + var kernelOffset = Math.floor(kernelSize / 2); + + for (var y = kernelOffset; y < height - kernelOffset; y++) { + for (var x = kernelOffset; x < width - kernelOffset; x++) { + var red = 0, green = 0, blue = 0; + + for (var ky = 0; ky < kernelSize; ky++) { + for (var kx = 0; kx < kernelSize; kx++) { + var pixelX = x + kx - kernelOffset; + var pixelY = y + ky - kernelOffset; + var pixelIndex = (pixelY * width + pixelX) * 4; + var kernelValue = kernel[ky * kernelSize + kx]; + + red += tempData[pixelIndex] * kernelValue; + green += tempData[pixelIndex + 1] * kernelValue; + blue += tempData[pixelIndex + 2] * kernelValue; + } + } + + var currentIndex = (y * width + x) * 4; + data[currentIndex] = Math.min(255, Math.max(0, red)); + data[currentIndex + 1] = Math.min(255, Math.max(0, green)); + data[currentIndex + 2] = Math.min(255, Math.max(0, blue)); + } + } + + context.putImageData(imageData, 0, 0); + saveHistory(); + console.log('Sharpen filter applied.'); +} - //> get the coordinates at which the DIV was clicked +function applyEnhanceContrast() { + console.log('Applying enhance contrast filter...'); + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + var data = imageData.data; + + var factor = 1.5; + var intercept = 128 * (1 - factor); + + for (var i = 0; i < data.length; i += 4) { + data[i] = Math.min(255, Math.max(0, data[i] * factor + intercept)); + data[i + 1] = Math.min(255, Math.max(0, data[i + 1] * factor + intercept)); + data[i + 2] = Math.min(255, Math.max(0, data[i + 2] * factor + intercept)); + } + + context.putImageData(imageData, 0, 0); + saveHistory(); + console.log('Enhance contrast filter applied.'); +} + +function removeAllFilters() { + console.log('Removing all filters...'); + context.clearRect(0, 0, canvas.width, canvas.height); + context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); + console.log('All filters removed.'); +} - //> setting the mousedown object - mousedown.x = x; - mousedown.y = y; +//> Text Annotation Functions +function setTextPosition(x, y) { + textPosition = { x: x, y: y }; + isAddingText = true; + + var text = textInput.value; + var font = fontSelect.value; + var size = fontSize.value; + var color = fontColor.value; + + var imageData = context.getImageData(0, 0, canvas.width, canvas.height); + context.clearRect(0, 0, canvas.width, canvas.height); + context.putImageData(imageData, 0, 0); + + context.font = size + 'px ' + font; + context.fillStyle = color; + context.fillText(text, x, y); + + console.log('Text position set at: ' + x + ', ' + y); +} - //>setting the rubberbandRectangle object - rubberbandRectangle.left = mousedown.x; - rubberbandRectangle.top = mousedown.y; +function confirmText() { + if (!textPosition) { + alert('Please click on the canvas to position the text first.'); + return; + } + + var text = textInput.value; + if (!text || text.trim() === '') { + alert('Please enter some text.'); + return; + } + + var font = fontSelect.value; + var size = fontSize.value; + var color = fontColor.value; + + context.font = size + 'px ' + font; + context.fillStyle = color; + context.fillText(text, textPosition.x, textPosition.y); + + saveHistory(); + + textPosition = null; + isAddingText = false; + + console.log('Text added: ' + text); +} - //> move the rubbber band DIV to that point - moveRubberbandDiv(); - //> show the div - showRubberbandDiv(); +//> Functions for CROP ----- START - //> the element is clicked so it is assumed to be dragged. - //dragging = true; +//> this is executed on mouse down +function rubberbandStart(x, y) { + if (isAddingText) { + return; + } + + mousedown.x = x; + mousedown.y = y; + + rubberbandRectangle.left = mousedown.x; + rubberbandRectangle.top = mousedown.y; + + moveRubberbandDiv(); + showRubberbandDiv(); } //> this is executed on mousemove function rubberbandStretch(x, y) { - var canvasCoordinates = canvas.getBoundingClientRect(); - //> we are trying to set the left point again - //> if mousedrag X is less that the point where mouse down was done, choose the mousedrag X, else choose mousedown x - //> set it on the rubberbandRectangle object - rubberbandRectangle.left = (x < mousedown.x) ? x : mousedown.x; - rubberbandRectangle.top = (y < mousedown.y) ? y : mousedown.y; - - //> set the width and height in the rubberbandRectangle object - rubberbandRectangle.width = Math.abs(x - mousedown.x), - rubberbandRectangle.height = Math.abs(y - mousedown.y); - - var isXinRange = rubberbandRectangle.left > canvasCoordinates.left && x < canvasCoordinates.right; - var isYinRange = rubberbandRectangle.top > canvasCoordinates.top && y < canvasCoordinates.bottom; - if(isXinRange && isYinRange){ - moveRubberbandDiv(); - resizeRubberbandDiv(); - } + if (isAddingText) { + return; + } + + var canvasCoordinates = canvas.getBoundingClientRect(); + rubberbandRectangle.left = (x < mousedown.x) ? x : mousedown.x; + rubberbandRectangle.top = (y < mousedown.y) ? y : mousedown.y; + + rubberbandRectangle.width = Math.abs(x - mousedown.x), + rubberbandRectangle.height = Math.abs(y - mousedown.y); + + var isXinRange = rubberbandRectangle.left > canvasCoordinates.left && x < canvasCoordinates.right; + var isYinRange = rubberbandRectangle.top > canvasCoordinates.top && y < canvasCoordinates.bottom; + if(isXinRange && isYinRange){ + moveRubberbandDiv(); + resizeRubberbandDiv(); + } } //> This is executed on mouseup function rubberbandEnd() { - if(dragging){ - var bbox = canvas.getBoundingClientRect(); - - try { - tempCanvasContext.clearRect(0, 0, tempCanvas.width, tempCanvas.height); - tempCanvasContext.drawImage(canvas, - rubberbandRectangle.left - bbox.left, - rubberbandRectangle.top - bbox.top, - rubberbandRectangle.width, - rubberbandRectangle.height, - centerShiftX, centerShiftY, rubberbandRectangle.width * ratio, rubberbandRectangle.height * ratio); - var imageData = tempCanvasContext.getImageData(0,0,tempCanvas.width,tempCanvas.height); - context.clearRect(0, 0, canvas.width, canvas.height); - context.putImageData(imageData, 0, 0); - tempCanvasContext.clearRect(0, 0, tempCanvas.width, tempCanvas.height); + if (isAddingText) { + return; } - catch (e) { - console.log(e); - // Suppress error message when mouse is released - // outside the canvas + + if(dragging){ + var bbox = canvas.getBoundingClientRect(); + + try { + tempCanvasContext.clearRect(0, 0, tempCanvas.width, tempCanvas.height); + tempCanvasContext.drawImage(canvas, + rubberbandRectangle.left - bbox.left, + rubberbandRectangle.top - bbox.top, + rubberbandRectangle.width, + rubberbandRectangle.height, + centerShiftX, centerShiftY, rubberbandRectangle.width * ratio, rubberbandRectangle.height * ratio); + var imageData = tempCanvasContext.getImageData(0,0,tempCanvas.width,tempCanvas.height); + context.clearRect(0, 0, canvas.width, canvas.height); + context.putImageData(imageData, 0, 0); + tempCanvasContext.clearRect(0, 0, tempCanvas.width, tempCanvas.height); + saveHistory(); + } + catch (e) { + console.log(e); + } + + resetRubberbandRectangle(); + rubberbandDiv.style.width = 0; + rubberbandDiv.style.height = 0; + hideRubberbandDiv(); + dragging = false; } - - //> reset the rubberband rectangle object - resetRubberbandRectangle(); - - //> reset the height and width - rubberbandDiv.style.width = 0; - rubberbandDiv.style.height = 0; - - //> hide the rubber band div again - hideRubberbandDiv(); - - //> end of dragging - dragging = false; - } } //> move the rubberbandDiv to that position - so set the style values function moveRubberbandDiv() { - rubberbandDiv.style.top = rubberbandRectangle.top + 'px'; - rubberbandDiv.style.left = rubberbandRectangle.left + 'px'; + rubberbandDiv.style.top = rubberbandRectangle.top + 'px'; + rubberbandDiv.style.left = rubberbandRectangle.left + 'px'; } //> set the new height and width & prevent rubberband from exceeding canvas width & height function resizeRubberbandDiv() { - rubberbandDiv.style.width = rubberbandRectangle.width + 'px'; - rubberbandDiv.style.height = rubberbandRectangle.height + 'px'; + rubberbandDiv.style.width = rubberbandRectangle.width + 'px'; + rubberbandDiv.style.height = rubberbandRectangle.height + 'px'; } //> show the rubber band DIV function showRubberbandDiv() { - rubberbandDiv.style.display = 'inline'; + rubberbandDiv.style.display = 'inline'; } //> hide the rubbber band DIV function hideRubberbandDiv() { - rubberbandDiv.style.display = 'none'; + rubberbandDiv.style.display = 'none'; } //> once the operation is done. Reset the rubberbandDiv function resetRubberbandRectangle() { - rubberbandRectangle = { top: 0, left: 0, width: 0, height: 0 }; + rubberbandRectangle = { top: 0, left: 0, width: 0, height: 0 }; } //> Functions for CROP ----- END function calculateRotation(degree){ - var actual = 0; - if (degree >= 0){ - if(value >=0 && value <= 359){ - actual = degree; - }else { - actual = degree - 360; - } - }else{ - if(degree >= -360){ - actual = degree + 360; + var actual = 0; + if (degree >= 0){ + if(value >=0 && value <= 359){ + actual = degree; + }else { + actual = degree - 360; + } }else{ - actual = 2(360) + degree; + if(degree >= -360){ + actual = degree + 360; + }else{ + actual = 2(360) + degree; + } } - } - return actual; + return actual; } -//> Event handlers for brightness, contrast, rotate, zoom +//> Event handlers +undoButton.addEventListener('click', undo); +redoButton.addEventListener('click', redo); increaseContrast.addEventListener('click', contrastUp); - decreaseContrast.addEventListener('click', contrastDown); - rotateleft.addEventListener('click', rotateAntiClockWise); - rotateright.addEventListener('click', rotateClockWise); - increaseBrightness.addEventListener('click', brightnessPlus); - decreaseBrightness.addEventListener('click', brightnessMinus); - zoomin.addEventListener('click', zoomPlus); - zoomout.addEventListener('click', zoomMinus); -//canvas.addEventListener('mousewheel', zoomonscroll); +//> Filter event handlers +grayscaleFilter.addEventListener('click', applyGrayscale); +sepiaFilter.addEventListener('click', applySepia); +blurFilter.addEventListener('click', applyBlur); +sharpenFilter.addEventListener('click', applySharpen); +enhanceContrastFilter.addEventListener('click', applyEnhanceContrast); +removeFilter.addEventListener('click', removeAllFilters); + +//> Text annotation event handlers +addTextButton.addEventListener('click', confirmText); //> what is to be done when mousedown occurs on canvas canvas.onmousedown = function (e) { - isMouseDown = true; - var x = e.clientX, - y = e.clientY; - - e.preventDefault(); - rubberbandStart(x, y); + isMouseDown = true; + var x = e.clientX, + y = e.clientY; + + e.preventDefault(); + + if (isAddingText || textInput.value.trim() !== '') { + var canvasRect = canvas.getBoundingClientRect(); + var canvasX = x - canvasRect.left; + var canvasY = y - canvasRect.top; + setTextPosition(canvasX, canvasY); + } else { + rubberbandStart(x, y); + } }; //> what is to be done when mouse moves on canvas canvas.onmousemove = function (e) { - //> check if mouse is down while its moving - if(isMouseDown){ - dragging = true; - var x = e.clientX, - y = e.clientY; - - e.preventDefault(); - if (dragging) { - rubberbandStretch(x, y); - } - } + if(isMouseDown){ + dragging = true; + var x = e.clientX, + y = e.clientY; + + e.preventDefault(); + if (dragging && !isAddingText) { + rubberbandStretch(x, y); + } + } }; //> execute rule on mouse up window.onmouseup = function (e) { - isMouseDown = false; - e.preventDefault(); - rubberbandEnd(); + isMouseDown = false; + e.preventDefault(); + rubberbandEnd(); }; //> once the image has loaded - draw the image - this is the 1st of many draws image.onload = function () { - var wRatio = canvas.width/image.width; - var hRatio = canvas.height/image.height; - ratio = Math.min(hRatio, wRatio); - centerShiftX = (canvas.width - image.width * ratio) / 2; - centerShiftY = (canvas.height - image.height * ratio) / 2; - context.save(); - var pixelData = context.getImageData(0, 0, canvas.width, canvas.height).data; - originalPixelData = []; - for (var i = 0; i < pixelData.length; i = i + 1) { - var pixel = pixelData[i]; - originalPixelData[i] = pixel; - } - context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + var wRatio = canvas.width/image.width; + var hRatio = canvas.height/image.height; + ratio = Math.min(hRatio, wRatio); + centerShiftX = (canvas.width - image.width * ratio) / 2; + centerShiftY = (canvas.height - image.height * ratio) / 2; + context.save(); + var pixelData = context.getImageData(0, 0, canvas.width, canvas.height).data; + originalPixelData = []; + for (var i = 0; i < pixelData.length; i = i + 1) { + var pixel = pixelData[i]; + originalPixelData[i] = pixel; + } + context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + + saveHistory(); }; //> click on reset button resetButton.onclick = function(e) { - context.clearRect(0, 0, context.canvas.width, context.canvas.height); - context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + context.clearRect(0, 0, context.canvas.width, context.canvas.height); + context.drawImage(image, 0, 0, image.width, image.height, centerShiftX, centerShiftY, image.width * ratio, image.height * ratio); + saveHistory(); }; //> Initialization of the image - -image.src = 'assets/img/scenery.jpg'; +image.src = 'assets/img/scenery.jpg'; \ No newline at end of file diff --git a/imageEditor.html b/imageEditor.html index fc89662..ba14916 100644 --- a/imageEditor.html +++ b/imageEditor.html @@ -1,50 +1,138 @@ - Rubber bands with layered elements + Image Editor -
- - - - - - - - - - - +
+
History Control
+
+ + + +
+
+ +
+
Basic Adjustments
+
+ + + + + + + + +
+
+ +
+
Filters
+
+ + + + + + +
+
+ +
+
Text Annotation
+
+ + + + + + + + + + + + + +
+
+ Click on the canvas to position the text, then click "Add Text" to confirm. +
+
diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..f607e23 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,828 @@ +{ + "name": "imageEditor", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "imageEditor", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^4.13.4" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" + }, + "node_modules/body-parser": { + "version": "1.20.4", + "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.4.tgz", + "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.14.0", + "raw-body": "~2.5.3", + "type-is": "~1.6.18", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.22.1", + "resolved": "https://registry.npmmirror.com/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.14.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.3.tgz", + "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.13", + "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "license": "MIT" + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.14.2", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.2.tgz", + "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.3", + "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmmirror.com/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.1.tgz", + "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + } + } +} diff --git a/server.js b/server.js index fd42e33..097d64d 100644 --- a/server.js +++ b/server.js @@ -1,4 +1,5 @@ var express = require('express'); +var net = require('net'); var app = express(); app.use("/dist", express.static(__dirname + '/dist')); app.use("/assets", express.static(__dirname + '/assets')); @@ -11,6 +12,34 @@ app.get('/', function(req, res) { res.sendFile(path.join(__dirname + '/imageEditor.html')); }); -app.listen(8080, function(){ - console.log('All bundles up!'); -}); +function checkPort(port, callback) { + var server = net.createServer(); + server.once('error', function(err) { + if (err.code === 'EADDRINUSE') { + callback(false); + } else { + callback(true); + } + }); + server.once('listening', function() { + server.close(); + callback(true); + }); + server.listen(port); +} + +function startServer(port) { + checkPort(port, function(available) { + if (available) { + app.listen(port, function(){ + console.log('Server running at http://localhost:' + port); + console.log('All bundles up!'); + }); + } else { + console.log('Port ' + port + ' is in use, trying port ' + (port + 1)); + startServer(port + 1); + } + }); +} + +startServer(8080);