diff --git a/package.json b/package.json index 846d4fff..19e32aff 100644 --- a/package.json +++ b/package.json @@ -120,6 +120,8 @@ "ical-generator": "^8.0.0", "ical.js": "^2.1.0", "js-base64": "^3.7.6", + "image-in-browser": "^3.1.0", + "js-base64": "^3.7.7", "json5": "^2.2.3", "jwt-decode": "^3.1.2", "libphonenumber-js": "^1.10.28", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96875535..56b76050 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -221,11 +221,14 @@ dependencies: iconv-lite: specifier: ^0.6.3 version: 0.6.3 + image-in-browser: + specifier: ^3.1.0 + version: 3.2.1 iso-639-1: specifier: ^3.1.3 version: 3.1.3 js-base64: - specifier: ^3.7.6 + specifier: ^3.7.7 version: 3.7.7 jsbarcode: specifier: ^3.11.6 @@ -7465,6 +7468,10 @@ packages: engines: {node: '>= 4'} dev: true + /image-in-browser@3.2.1: + resolution: {integrity: sha512-QIhRnkz7ikwtu+U5Q2IkyUeC+7MtiIg0xATF4i72/hxaWjqOPm+VurD7ekCv+dwREmf19nwCurDDeHDayoIgZw==} + dev: false + /image-size@0.5.5: resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} engines: {node: '>=0.10.0'} diff --git a/src/tools/ico-converter/ico-converter.vue b/src/tools/ico-converter/ico-converter.vue new file mode 100644 index 00000000..8acfe8eb --- /dev/null +++ b/src/tools/ico-converter/ico-converter.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/tools/ico-converter/index.ts b/src/tools/ico-converter/index.ts new file mode 100644 index 00000000..e30a82c8 --- /dev/null +++ b/src/tools/ico-converter/index.ts @@ -0,0 +1,12 @@ +import { PictureInPicture } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'ICO/PNG converter', + path: '/ico-converter', + description: 'Convert from PNG/JPEG to/from ICO', + keywords: ['ico', 'png', 'jpeg', 'icon', 'converter'], + component: () => import('./ico-converter.vue'), + icon: PictureInPicture, + createdAt: new Date('2024-08-15'), +}); diff --git a/src/tools/index.ts b/src/tools/index.ts index 7ae29858..92a9cd83 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -2,6 +2,7 @@ import { tool as base64FileConverter } from './base64-file-converter'; import { tool as base64StringConverter } from './base64-string-converter'; import { tool as basicAuthGenerator } from './basic-auth-generator'; import { tool as dnsQueries } from './dns-queries'; +import { tool as icoConverter } from './ico-converter'; import { tool as emailNormalizer } from './email-normalizer'; import { tool as bounceParser } from './bounce-parser'; import { tool as codeHighlighter } from './code-highlighter'; @@ -205,6 +206,7 @@ export const toolsByCategory: ToolCategory[] = [ barcodeReader, barcodeGenerator, heicConverter, + icoConverter, ], }, { diff --git a/src/ui/c-file-upload/c-file-upload.vue b/src/ui/c-file-upload/c-file-upload.vue index b48d8c3b..ecb7f1e4 100644 --- a/src/ui/c-file-upload/c-file-upload.vue +++ b/src/ui/c-file-upload/c-file-upload.vue @@ -5,10 +5,12 @@ const props = withDefaults(defineProps<{ multiple?: boolean accept?: string title?: string + pasteImage?: boolean }>(), { multiple: false, accept: undefined, title: 'Drag and drop files here, or click to select files', + pasteImage: false, }); const emit = defineEmits<{ @@ -16,11 +18,31 @@ const emit = defineEmits<{ (event: 'fileUpload', file: File): void }>(); -const { multiple } = toRefs(props); +const { multiple, pasteImage } = toRefs(props); const isOverDropZone = ref(false); +function toBase64(file: File) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result?.toString() ?? ''); + reader.onerror = error => reject(error); + }); +} + const fileInput = ref(null); +const imgPreview = ref(null); +async function handlePreview(image: File) { + if (imgPreview.value) { + imgPreview.value.src = await toBase64(image); + } +} +function clearPreview() { + if (imgPreview.value) { + imgPreview.value.src = ''; + } +} function triggerFileInput() { fileInput.value?.click(); @@ -39,7 +61,30 @@ function handleDrop(event: DragEvent) { handleUpload(files); } -function handleUpload(files: FileList | null | undefined) { +async function onPasteImage(evt: ClipboardEvent) { + if (!pasteImage.value) { + return false; + } + + const items = evt.clipboardData?.items; + if (!items) { + return false; + } + for (let i = 0; i < items.length; i++) { + if (items[i].type.includes('image')) { + const imageFile = items[i].getAsFile(); + if (imageFile) { + await handlePreview(imageFile); + emit('fileUpload', imageFile); + } + } + } + return true; +} + +async function handleUpload(files: FileList | null | undefined) { + clearPreview(); + if (_.isNil(files) || _.isEmpty(files)) { return; } @@ -49,6 +94,7 @@ function handleUpload(files: FileList | null | undefined) { return; } + await handlePreview(files[0]); emit('fileUpload', files[0]); } @@ -60,6 +106,7 @@ function handleUpload(files: FileList | null | undefined) { 'border-primary border-opacity-100': isOverDropZone, }" @click="triggerFileInput" + @paste.prevent="onPasteImage" @drop.prevent="handleDrop" @dragover.prevent @dragenter="isOverDropZone = true" @@ -73,6 +120,7 @@ function handleUpload(files: FileList | null | undefined) { :accept="accept" @change="handleFileInput" > + {{ title }} @@ -90,6 +138,22 @@ function handleUpload(files: FileList | null | undefined) { Browse files + +
+ +
+
+
+ or +
+
+
+ +

Paste an image from clipboard

+
+
+ +