From c29caf01c8bf853bd2cac32f76fd89818ec0bf13 Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Sun, 12 Oct 2025 15:12:44 +0300
Subject: [PATCH 1/2] footer always on bottom

---
 src/App.vue                      | 37 +++++++++++++++++---------------
 src/components/Footer/Footer.vue |  1 -
 src/styles/styles.css            | 17 +++++++++++++++
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ec2a28a..c98adc3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,29 +8,32 @@ import Footer from '@/components/Footer/Footer.vue'
     <n-message-provider>
       <n-dialog-provider>
         <n-notification-provider>
-          <NavBar />
+          <div class="app-layout">
+            <NavBar />
+            <div class="main-content">
+              <n-grid
+                responsive="screen"
+                item-responsive
+                cols="24"
+                :x-gap="16"
+                :y-gap="16"
+                class="shift"
+              >
+                <n-gi span="xs:1 s:1 m:2 l:2 xl:3 xxl:3" />
 
-          <n-grid
-            responsive="screen"
-            item-responsive
-            cols="24"
-            :x-gap="16"
-            :y-gap="16"
-            class="shift"
-          >
-            <n-gi span="xs:1 s:1 m:2 l:2 xl:3 xxl:3" />
+                <n-gi span="xs:22 s:22 m:20 l:20 xl:18 xxl:18">
+                  <router-view />
+                </n-gi>
 
-            <n-gi span="xs:22 s:22 m:20 l:20 xl:18 xxl:18">
-              <router-view />
-            </n-gi>
-
-            <n-gi span="xs:1 s:1 m:2 l:2 xl:3 xxl:3" />
-          </n-grid>
+                <n-gi span="xs:1 s:1 m:2 l:2 xl:3 xxl:3" />
+              </n-grid>
+            </div>
+            <Footer />
+          </div>
         </n-notification-provider>
       </n-dialog-provider>
     </n-message-provider>
   </n-config-provider>
-  <Footer />
 </template>
 
 <style scoped>
diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue
index 9fdc12e..480b6c3 100644
--- a/src/components/Footer/Footer.vue
+++ b/src/components/Footer/Footer.vue
@@ -1,5 +1,4 @@
 <script setup>
-
 </script>
 
 <template>
diff --git a/src/styles/styles.css b/src/styles/styles.css
index 5c4660b..72e6629 100644
--- a/src/styles/styles.css
+++ b/src/styles/styles.css
@@ -120,3 +120,20 @@
 .link-like-text {
   cursor: pointer;
 }
+
+html,
+body,
+#app {
+  height: 100%;
+  margin: 0;
+}
+
+.app-layout {
+  display: flex;
+  flex-direction: column;
+  min-height: 100dvh;
+}
+
+.main-content {
+  flex: 1;
+}

From 9d80345b77c6ef4383f37ef707fda7089762a219 Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Sat, 18 Oct 2025 14:10:21 +0300
Subject: [PATCH 2/2] images added

---
 src/api/merchImages.js                        |  78 ++++++++
 src/components/icons/BoxIcon.vue              |   3 +-
 src/services/apiClient.js                     |  15 +-
 src/services/convertTime.js                   |   3 +-
 .../CollectionView/CollectionMerchCard.vue    |  41 +++-
 src/views/DetailsView.vue                     |  27 ++-
 src/views/DetailsView/DetailsViewImages.vue   | 180 ++++++++++++++++++
 7 files changed, 332 insertions(+), 15 deletions(-)
 create mode 100644 src/api/merchImages.js
 create mode 100644 src/views/DetailsView/DetailsViewImages.vue

diff --git a/src/api/merchImages.js b/src/api/merchImages.js
new file mode 100644
index 0000000..93d9b6d
--- /dev/null
+++ b/src/api/merchImages.js
@@ -0,0 +1,78 @@
+import { apiClient } from '@/services/apiClient.js'
+
+export const useMerchImagesApi = () => {
+  const uploadImage = async (uuid, file) => {
+    const formData = new FormData()
+    formData.append('file', file)
+    formData.append('imageType', 'all')
+
+    try {
+      const response = await apiClient.post(`/merch/images/${uuid}`, formData)
+
+      if (response.status !== 200) {
+        throw new Error(`Upload failed: ${response.status}`)
+      }
+
+      return response.data
+    } catch (error) {
+      console.error('Upload failed:', error)
+      throw error
+    }
+  }
+
+  const cachedImages = new Map() // Map<uuid, { etag, url }>
+  const getImageUrl = async (uuid, type) => {
+    try {
+      const response = await apiClient.get(`/merch/images/${uuid}`, { type })
+
+      if (response.status !== 200) {
+        throw new Error(`Get image failed: ${response.status}`)
+      }
+
+      const { link, ETag } = response.data
+
+      if (cachedImages.has(uuid) && cachedImages.get(uuid).etag === ETag) {
+        return cachedImages.get(uuid)
+      }
+
+      const res = await fetch(link)
+      if (!res.ok) throw new Error(`Failed to load image: ${res.status}`)
+
+      const blob = await res.blob()
+      const imgUrl = URL.createObjectURL(blob)
+
+      cachedImages.set(uuid, { imgUrl, etag: ETag })
+      return { imgUrl, etag: ETag }
+
+    } catch (error) {
+      console.error('Get image failed:', error)
+      throw error
+    }
+  }
+
+  const deleteImage = async (uuid) => {
+    try {
+      const response = await apiClient.delete(`/merch/images/${uuid}`)
+      if (response.status !== 200) {
+        throw new Error(`Delete failed: ${response.status}`)
+      }
+
+      if (cachedImages.has(uuid)) {
+        const cached = cachedImages.get(uuid)
+        if (cached.imgUrl?.startsWith('blob:')) URL.revokeObjectURL(cached.imgUrl)
+        cachedImages.delete(uuid)
+      }
+
+      return true
+    } catch (error) {
+      console.error('Delete image failed:', error)
+      throw error
+    }
+  }
+
+  return {
+    uploadImage,
+    getImageUrl,
+    deleteImage,
+  }
+}
diff --git a/src/components/icons/BoxIcon.vue b/src/components/icons/BoxIcon.vue
index 7dc1b16..e3083f1 100644
--- a/src/components/icons/BoxIcon.vue
+++ b/src/components/icons/BoxIcon.vue
@@ -1,13 +1,12 @@
 <template>
   <svg
-    height="800px"
-    width="800px"
     version="1.1"
     id="Layer_1"
     xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     viewBox="0 0 512 512"
     xml:space="preserve"
+    style="width: 100%; height: 100%; display: block;"
   >
     <polygon
       style="fill: #e0b76e"
diff --git a/src/services/apiClient.js b/src/services/apiClient.js
index cb9e0ee..60d5d46 100644
--- a/src/services/apiClient.js
+++ b/src/services/apiClient.js
@@ -126,10 +126,17 @@ export const apiClient = {
     const fullUrl = queryString ? `${url}?${queryString}` : url;
     return request(fullUrl, { method: 'GET' });
   },
-  post: (url, data) => request(url, {
-    method: 'POST',
-    body: JSON.stringify(data),
-  }),
+  post: (url, data) => {
+    const isFormData = data instanceof FormData
+
+    return request(url, {
+      method: 'POST',
+      body: isFormData ? data : JSON.stringify(data),
+      headers: isFormData
+        ? {}
+        : { 'Content-Type': 'application/json' }
+    })
+  },
   put: (url, data) => request(url, {
     method: 'PUT',
     body: JSON.stringify(data),
diff --git a/src/services/convertTime.js b/src/services/convertTime.js
index ead8655..5d3cb64 100644
--- a/src/services/convertTime.js
+++ b/src/services/convertTime.js
@@ -1,12 +1,11 @@
 export function convertIso(isoString) {
   const date = new Date(isoString);
 
-  // Извлекаем компоненты времени и даты
   const hours = String(date.getUTCHours()).padStart(2, '0');
   const minutes = String(date.getUTCMinutes()).padStart(2, '0');
   const seconds = String(date.getUTCSeconds()).padStart(2, '0');
   const day = String(date.getUTCDate()).padStart(2, '0');
-  const month = String(date.getUTCMonth() + 1).padStart(2, '0'); // Месяцы в JS — от 0 до 11
+  const month = String(date.getUTCMonth() + 1).padStart(2, '0');
   const year = date.getUTCFullYear();
 
   return `${hours}:${minutes}:${seconds} ${day}-${month}-${year}`;
diff --git a/src/views/CollectionView/CollectionMerchCard.vue b/src/views/CollectionView/CollectionMerchCard.vue
index 4c876f1..293ba94 100644
--- a/src/views/CollectionView/CollectionMerchCard.vue
+++ b/src/views/CollectionView/CollectionMerchCard.vue
@@ -1,12 +1,36 @@
 <script setup>
 import BoxIcon from '@/components/icons/BoxIcon.vue'
+import { useMerchImagesApi } from '@/api/merchImages.js'
+import { onMounted, ref } from 'vue'
+const { getImageUrl } = useMerchImagesApi()
 
-defineProps({
+const props = defineProps({
   merch: {
     type: Object,
     required: true,
   }
 })
+
+const fileList = ref([])
+
+onMounted(async () => {
+  try {
+    const { imgUrl } = await getImageUrl(props.merch.merch_uuid, 'thumbnail')
+    fileList.value = [
+      {
+        name: 'full.jpg',
+        url: imgUrl,
+        status: 'finished',
+      },
+    ]
+  } catch (error) {
+    fileList.value = []
+    if (!error.message?.includes('404')) {
+      console.error('Error getting image: ', error)
+    }
+  }
+})
+
 </script>
 
 <template>
@@ -16,7 +40,13 @@ defineProps({
     </template>
     <template #cover>
       <div class="cover-wrapper">
-        <BoxIcon />
+        <img
+          v-if="fileList.length > 0 && fileList[0].url"
+          :src="fileList[0].url"
+          alt="Thumbnail"
+          class="thumbnail"
+        />
+        <BoxIcon v-else />
       </div>
     </template>
   </n-card>
@@ -52,6 +82,13 @@ defineProps({
   overflow: hidden;
 }
 
+.thumbnail {
+  width: 100%;
+  height: auto;
+  max-width: 80%;
+  object-fit: contain;
+}
+
 .cover-wrapper :deep(svg) {
   width: 100%;
   height: auto;
diff --git a/src/views/DetailsView.vue b/src/views/DetailsView.vue
index 1c54897..71d6f62 100644
--- a/src/views/DetailsView.vue
+++ b/src/views/DetailsView.vue
@@ -7,6 +7,7 @@ import ChartBlock from '@/components/ChartBlock.vue'
 import { useChartsApi } from '@/api/charts.js'
 import EditLink from '@/views/DetailsView/EditLink.vue'
 import CopyToClipboard from '@/components/CopyToClipboard.vue'
+import DetailsViewImages from '@/views/DetailsView/DetailsViewImages.vue'
 
 const { getMerchDetails, deleteMerch } = useMerchApi()
 const { getDistinctPrices } = useChartsApi()
@@ -102,8 +103,13 @@ onMounted(() => {
   <div v-else-if="error">Error: {{ error }}</div>
   <n-card v-else-if="merchDetails" :title="merchDetails.name">
     <n-divider title-placement="left">Main</n-divider>
-    <p><strong>Uuid:</strong> {{ merchDetails.merch_uuid }}</p>
-    <p><strong>Name:</strong> {{ merchDetails.name }}</p>
+    <div class="container-stackable">
+      <div>
+        <p><strong>Uuid:</strong> {{ merchDetails.merch_uuid }}</p>
+        <p><strong>Name:</strong> {{ merchDetails.name }}</p>
+      </div>
+      <DetailsViewImages :merch-uuid="merchDetails.merch_uuid"/>
+    </div>
 
     <n-divider title-placement="left">Prices</n-divider>
     <PeriodSelector @days="handleSelectDays" />
@@ -131,7 +137,9 @@ onMounted(() => {
         </n-button>
       </template>
       <template v-else>
-        <span class="default-color underline link-like-text" @click="editing.surugaya = true">Add link</span>
+        <span class="default-color underline link-like-text" @click="editing.surugaya = true"
+          >Add link</span
+        >
       </template>
     </div>
 
@@ -164,7 +172,9 @@ onMounted(() => {
         </n-button>
       </template>
       <template v-else>
-        <span class="default-color underline link-like-text" @click="editing.mandarake = true">Add link</span>
+        <span class="default-color underline link-like-text" @click="editing.mandarake = true"
+          >Add link</span
+        >
       </template>
     </div>
 
@@ -195,4 +205,11 @@ onMounted(() => {
   </n-modal>
 </template>
 
-<style scoped></style>
+<style scoped>
+.container-stackable {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  justify-content: space-between;
+}
+</style>
diff --git a/src/views/DetailsView/DetailsViewImages.vue b/src/views/DetailsView/DetailsViewImages.vue
new file mode 100644
index 0000000..db724f4
--- /dev/null
+++ b/src/views/DetailsView/DetailsViewImages.vue
@@ -0,0 +1,180 @@
+<script setup>
+import { onMounted, ref } from 'vue'
+import { NModal, NUpload, useMessage } from 'naive-ui'
+import BoxIcon from '@/components/icons/BoxIcon.vue'
+import { useMerchImagesApi } from '@/api/merchImages.js'
+
+const { uploadImage, getImageUrl, deleteImage } = useMerchImagesApi()
+const message = useMessage()
+
+const props = defineProps({
+  merchUuid: { type: String, required: true },
+})
+
+const showModal = ref(false)
+const previewImageUrl = ref('')
+const fileList = ref([])
+
+function handlePreview(file) {
+  if (file.file) {
+    previewImageUrl.value = URL.createObjectURL(file.file)
+  } else if (file.url) {
+    previewImageUrl.value = file.url
+  }
+  showModal.value = true
+}
+
+function onModalClose() {
+  if (previewImageUrl.value && previewImageUrl.value.startsWith('blob:')) {
+    URL.revokeObjectURL(previewImageUrl.value)
+  }
+  previewImageUrl.value = ''
+}
+
+function beforeUpload({ fileList: newFileList }) {
+  return newFileList.length <= 1
+}
+
+async function handleUpload({ fileList: newFileList }) {
+  const file = newFileList[newFileList.length - 1]
+  try {
+    await uploadImage(props.merchUuid, file.file)
+
+    const { imgUrl } = await getImageUrl(props.merchUuid, 'full')
+
+    message.success('Image uploaded successfully.')
+
+    fileList.value = [
+      {
+        name: file.name,
+        url: imgUrl,
+        status: 'finished',
+      },
+    ]
+  } catch (error) {
+    message.error('Upload error: ' + (error.message || 'Unknown error.'))
+  }
+}
+
+onMounted(async () => {
+  try {
+    const { imgUrl } = await getImageUrl(props.merchUuid, 'full')
+    fileList.value = [
+      {
+        name: 'full.jpg',
+        url: imgUrl,
+        status: 'finished',
+      },
+    ]
+  } catch (error) {
+    fileList.value = []
+    if (!error.message?.includes('404')) {
+      console.error('Error getting image: ', error)
+    }
+  }
+})
+
+const showConfirmDelete = ref(false)
+
+const deleteImageHandler = async () => {
+  showConfirmDelete.value = true
+  return false //prevents instant "delete image" in n-upload before confirm
+}
+
+const confirmDeleteImage = async () => {
+  try {
+    await deleteImage(props.merchUuid)
+    fileList.value = []
+    message.success('Image deleted successfully.')
+  } catch (error) {
+    message.error('Image delete error: ' + (error.message || 'Unknown error.'))
+  } finally {
+    showConfirmDelete.value = false
+  }
+}
+
+const cancelDelete = () => {
+  showConfirmDelete.value = false
+}
+</script>
+
+<template>
+  <div>
+    <n-upload
+      v-model:file-list="fileList"
+      :default-upload="false"
+      list-type="image-card"
+      :max="1"
+      :before-upload="beforeUpload"
+      @before-preview="handlePreview"
+      @change="handleUpload"
+      @remove="deleteImageHandler"
+    >
+      <div class="upload-trigger" v-if="fileList.length === 0">
+        <BoxIcon class="upload-icon" />
+        <span class="upload-text">Click to Upload</span>
+      </div>
+    </n-upload>
+
+    <n-modal
+      v-model:show="showModal"
+      preset="card"
+      style="width: 600px"
+      title="Preview"
+      @after-leave="onModalClose"
+    >
+      <img
+        :src="previewImageUrl"
+        style="width: 100%; max-height: 600px; object-fit: contain"
+        alt="Preview"
+      />
+    </n-modal>
+  </div>
+
+  <n-modal v-model:show="showConfirmDelete" preset="dialog" title="Confirmation">
+    <template #default>
+      <p>Confirm delete image</p>
+    </template>
+    <template #action>
+      <n-button @click="confirmDeleteImage" type="error">Delete</n-button>
+      <n-button @click="cancelDelete">Cancel</n-button>
+    </template>
+  </n-modal>
+</template>
+
+<style scoped>
+.upload-trigger {
+  width: 300px;
+  max-height: 600px;
+  min-height: 180px;
+  border: 1px dashed #ccc;
+  border-radius: 8px;
+  background-color: #fafafa;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition:
+    background-color 0.2s ease,
+    border-color 0.2s ease;
+}
+
+.upload-trigger:hover {
+  border-color: #18a058;
+  background-color: #f0fdf4;
+}
+
+.upload-icon {
+  width: 150px;
+  height: 150px;
+  opacity: 0.6;
+}
+
+.upload-text {
+  margin-top: 8px;
+  font-size: 14px;
+  color: #555;
+}
+
+</style>