From 9f8221479724b80a562737f914358066aab61cd6 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Thu, 6 Nov 2025 01:33:49 +0800
Subject: [PATCH] :recycle: Refactored attachment page

---
 app/components/AttachmentItem.vue |   5 +-
 app/layouts/default.vue           |   2 +-
 app/pages/files/[id].vue          | 384 +++++++++++++++++++-----------
 app/pages/posts/[id].vue          |   5 +-
 app/types/api/index.ts            |   2 +-
 app/types/api/post.ts             |   5 +-
 app/types/api/publisher.ts        |   6 +-
 app/types/api/user.ts             |   6 +-
 8 files changed, 264 insertions(+), 151 deletions(-)

diff --git a/app/components/AttachmentItem.vue b/app/components/AttachmentItem.vue
index c3566b2..fffc42a 100644
--- a/app/components/AttachmentItem.vue
+++ b/app/components/AttachmentItem.vue
@@ -24,6 +24,7 @@
         @click="openExternally"
       />
     </template>
+
     <audio
       v-else-if="itemType == 'audio'"
       class="w-full h-auto"
@@ -59,8 +60,10 @@ const aspectRatio = computed(
 )
 const imageLoaded = ref(false)
 
+const router = useRouter()
+
 function openExternally() {
-  window.open(remoteSource.value + "?original=true", "_blank")
+  router.push('/files/' + props.item.id)
 }
 
 const blurCanvas = ref<HTMLCanvasElement | null>(null)
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index b4d1409..4e45f5b 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -28,7 +28,7 @@
               class="me-4"
               color="grey-darken-1"
               size="32"
-              icon="mdi-account-circle-outline"
+              icon="mdi-account-circle"
               :image="
                 user?.profile.picture
                   ? `${apiBase}/drive/files/${user?.profile.picture?.id}`
diff --git a/app/pages/files/[id].vue b/app/pages/files/[id].vue
index 0a560cc..9b56e35 100644
--- a/app/pages/files/[id].vue
+++ b/app/pages/files/[id].vue
@@ -1,137 +1,138 @@
 <template>
-  <div class="d-flex align-center justify-center fill-height">
-    <v-card class="pa-6" max-width="1200" width="100%">
+  <div class="lightbox-container">
+    <!-- Top Toolbar -->
+    <v-app-bar
+      v-if="fileInfo"
+      class="top-toolbar"
+      flat
+      height="56"
+      color="rgba(0,0,0,0.7)"
+      dark
+    >
+      <v-container fluid>
+        <v-row align="center" class="pa-2">
+          <v-col cols="12" md="4">
+            <div class="d-flex align-center gap-2">
+              <v-icon>mdi-file</v-icon>
+              <span>{{ fileInfo.name || "File" }}</span>
+            </div>
+          </v-col>
+          <v-col cols="12" md="8">
+            <div class="d-flex align-center justify-end gap-4">
+              <span>{{ fileInfo.mimeType }} ({{ fileType }})</span>
+              <span>{{ formatBytes(fileInfo.size) }}</span>
+              <span>{{ new Date(fileInfo.createdAt).toLocaleString() }}</span>
+              <v-btn icon size="small" density="compact" @click="handleDownload">
+                <v-icon>mdi-download</v-icon>
+              </v-btn>
+              <v-btn icon size="small" density="compact" @click="infoDialog = true">
+                <v-icon>mdi-information</v-icon>
+              </v-btn>
+            </div>
+          </v-col>
+        </v-row>
+      </v-container>
+    </v-app-bar>
+
+    <!-- Main Content - File Preview -->
+    <div class="preview-container">
       <v-progress-circular
         v-if="!fileInfo && !error"
         indeterminate
-        size="32"
+        size="64"
+        class="loading-spinner"
       ></v-progress-circular>
       <v-alert
+        v-else-if="error"
         type="error"
         title="No file was found"
         :text="error"
-        v-else-if="error"
+        class="error-alert"
       ></v-alert>
-      <div v-else>
-        <v-row>
-          <v-col cols="12" md="6">
-            <div v-if="fileInfo.isEncrypted">
-              <v-alert type="info" title="Encrypted file" class="mb-4">
-                The file has been encrypted. Preview not available. Please enter
-                the password to download it.
-              </v-alert>
-            </div>
-            <div v-else>
-              <v-img
-                v-if="fileType === 'image'"
-                :src="fileSource"
-                class="w-full"
-              />
-              <video
-                v-else-if="fileType === 'video'"
-                :src="fileSource"
-                controls
-                class="w-full"
-              />
-              <audio
-                v-else-if="fileType === 'audio'"
-                :src="fileSource"
-                controls
-                class="w-full"
-              />
-              <v-alert
-                type="warning"
-                title="Preview Unavailable"
-                text="How can you preview this file?"
-                v-else
-              />
-            </div>
-          </v-col>
-
-          <v-col cols="12" md="6">
-            <div class="mb-3">
-              <v-card
-                title="File Information"
-                prepend-icon="mdi-information-outline"
-                variant="tonal"
-              >
-                <v-card-text>
-                  <div class="d-flex gap-2 mb-2">
-                    <span class="flex-grow-1 d-flex align-center gap-2">
-                      <v-icon size="18">mdi-information</v-icon>
-                      File Type
-                    </span>
-                    <span>{{ fileInfo.mimeType }} ({{ fileType }})</span>
-                  </div>
-                  <div class="d-flex gap-2 mb-2">
-                    <span class="flex-grow-1 d-flex align-center gap-2">
-                      <v-icon size="18">mdi-chart-pie</v-icon>
-                      File Size
-                    </span>
-                    <span>{{ formatBytes(fileInfo.size) }}</span>
-                  </div>
-                  <div class="d-flex gap-2 mb-2">
-                    <span class="flex-grow-1 d-flex align-center gap-2">
-                      <v-icon size="18">mdi-upload</v-icon>
-                      Uploaded At
-                    </span>
-                    <span>{{
-                      new Date(fileInfo.createdAt).toLocaleString()
-                    }}</span>
-                  </div>
-                  <div class="d-flex gap-2 mb-2">
-                    <span class="flex-grow-1 d-flex align-center gap-2">
-                      <v-icon size="18">mdi-details</v-icon>
-                      Technical Info
-                    </span>
-                    <v-btn
-                      text
-                      size="x-small"
-                      @click="showTechDetails = !showTechDetails"
-                    >
-                      {{ showTechDetails ? "Hide" : "Show" }}
-                    </v-btn>
-                  </div>
-
-                  <v-expand-transition>
-                    <div
-                      v-if="showTechDetails"
-                      class="mt-2 d-flex flex-column gap-1"
-                    >
-                      <p class="text-caption opacity-75">#{{ fileInfo.id }}</p>
-
-                      <v-card class="pa-2" variant="outlined">
-                        <pre
-                          class="overflow-x-auto px-2 py-1"
-                        ><code>{{ JSON.stringify(fileInfo.fileMeta, null, 4) }}</code></pre>
-                      </v-card>
-                    </div>
-                  </v-expand-transition>
-                </v-card-text>
-              </v-card>
-            </div>
-
-            <div class="d-flex flex-column gap-3">
-              <v-text-field
-                v-if="fileInfo.isEncrypted"
-                label="Password"
-                v-model="filePass"
-                type="password"
-              />
-              <v-btn class="flex-grow-1" @click="downloadFile">Download</v-btn>
-            </div>
-            <v-expand-transition>
-              <v-progress-linear
-                v-if="!!progress"
-                :model-value="progress"
-                :indeterminate="progress < 100"
-                class="mt-4"
-              />
-            </v-expand-transition>
-          </v-col>
-        </v-row>
+      <div v-else class="preview-content">
+        <div v-if="fileInfo?.isEncrypted" class="encrypted-notice">
+          <v-alert type="info" title="Encrypted file" class="mb-4">
+            The file has been encrypted. Preview not available. Please enter the
+            password to download it.
+          </v-alert>
+        </div>
+        <div v-else class="file-preview">
+          <v-img
+            v-if="fileType === 'image'"
+            :src="fileSource"
+            class="preview-image"
+            contain
+          />
+          <video
+            v-else-if="fileType === 'video'"
+            :src="fileSource"
+            controls
+            class="preview-video"
+          />
+          <audio
+            v-else-if="fileType === 'audio'"
+            :src="fileSource"
+            controls
+            class="preview-audio"
+          />
+          <v-alert
+            v-else
+            type="warning"
+            title="Preview Unavailable"
+            text="How can you preview this file?"
+            class="preview-unavailable"
+          />
+        </div>
       </div>
-    </v-card>
+    </div>
+
+    <!-- Password Dialog -->
+    <v-dialog v-model="secretDialog" max-width="400">
+      <v-card>
+        <v-card-title>
+          <v-icon left>mdi-lock</v-icon>
+          Enter Password
+        </v-card-title>
+        <v-card-text>
+          <v-text-field
+            v-model="dialogPassword"
+            label="Password"
+            type="password"
+            variant="outlined"
+            autofocus
+            @keyup.enter="confirmDownload"
+          />
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn @click="secretDialog = false">Cancel</v-btn>
+          <v-btn color="primary" @click="confirmDownload">Download</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <!-- Technical Details Dialog -->
+    <v-dialog v-model="infoDialog" max-width="640">
+      <v-card title="File Information" prepend-icon="mdi-information">
+        <v-card-text>
+          <div class="mb-4">
+            <b>FID</b> <span class="font-mono">#{{ fileInfo?.id }}</span>
+          </div>
+          <div class="mb-4">
+            <strong>Metadata:</strong>
+          </div>
+          <v-card variant="outlined" class="pa-2">
+            <pre
+              class="overflow-x-auto text-body-2"
+            ><code>{{ JSON.stringify(fileInfo?.fileMeta, null, 2) }}</code></pre>
+          </v-card>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn @click="infoDialog = false">Close</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
@@ -141,29 +142,35 @@ import { computed, onMounted, ref } from "vue"
 
 import { downloadAndDecryptFile } from "./secure"
 import { formatBytes } from "./format"
+import type { SnCloudFile } from "~/types/api/post"
+
+useHead({
+  title: computed(() => fileInfo.value?.name ? `${fileInfo.value.name} - File Preview` : 'File Preview')
+})
 
 const route = useRoute()
 
 const error = ref<string | null>(null)
 
-const filePass = ref<string>("")
 const fileId = route.params.id
 const passcode = route.query.passcode as string | undefined
 
 const progress = ref<number | undefined>(0)
 
-const showTechDetails = ref<boolean>(false)
+const infoDialog = ref<boolean>(false)
+const secretDialog = ref<boolean>(false)
+const dialogPassword = ref<string>("")
 
 const api = useSolarNetwork()
 
-const fileInfo = ref<any>(null)
+const fileInfo = ref<SnCloudFile | null>(null)
 async function fetchFileInfo() {
   try {
     let url = "/drive/files/" + fileId + "/info"
     if (passcode) {
       url += `?passcode=${passcode}`
     }
-    const resp = await api(url)
+    const resp = await api<SnCloudFile>(url)
     fileInfo.value = resp
   } catch (err) {
     error.value = (err as Error).message
@@ -171,34 +178,47 @@ async function fetchFileInfo() {
 }
 onMounted(() => fetchFileInfo())
 
-const apiBase = useSolarNetworkUrl(false)
+const apiBase = useSolarNetworkUrl()
 
 const fileType = computed(() => {
   if (!fileInfo.value) return "unknown"
   return fileInfo.value.mimeType?.split("/")[0] || "unknown"
 })
 const fileSource = computed(() => {
-  let url = `${apiBase}/drive/files/${fileId}`
+  let url = `${apiBase}/drive/files/${fileId}?original=true`
   if (passcode) {
     url += `?passcode=${passcode}`
   }
   return url
 })
 
-async function downloadFile() {
-  if (fileInfo.value.isEncrypted && !filePass.value) {
-    alert("Please enter the password to download the file.")
+function handleDownload() {
+  if (fileInfo.value!.isEncrypted) {
+    secretDialog.value = true
+    dialogPassword.value = ""
+  } else {
+    performDownload("")
+  }
+}
+
+async function confirmDownload() {
+  if (!dialogPassword.value.trim()) {
     return
   }
-  if (fileInfo.value.isEncrypted) {
+  secretDialog.value = false
+  await performDownload(dialogPassword.value)
+}
+
+async function performDownload(password: string) {
+  if (fileInfo.value!.isEncrypted) {
     downloadAndDecryptFile(
       fileSource.value,
-      filePass.value,
-      fileInfo.value.name,
+      password,
+      fileInfo.value!.name,
       (p: number) => {
         progress.value = p * 100
       }
-    ).catch((err: any) => {
+    ).catch((err: Error) => {
       alert("Download failed: " + err.message)
       progress.value = undefined
     })
@@ -206,7 +226,7 @@ async function downloadFile() {
     const res = await fetch(fileSource.value)
     if (!res.ok) {
       throw new Error(
-        `Failed to download ${fileInfo.value.name}: ${res.statusText}`
+        `Failed to download ${fileInfo.value!.name}: ${res.statusText}`
       )
     }
 
@@ -235,12 +255,98 @@ async function downloadFile() {
     const a = document.createElement("a")
     a.href = blobUrl
     a.download =
-      fileInfo.value.fileName ||
-      "download." + fileInfo.value.mimeType.split("/")[1]
+      fileInfo.value!.name ||
+      "download." + fileInfo.value!.mimeType.split("/")[1]
     document.body.appendChild(a)
     a.click()
     a.remove()
     window.URL.revokeObjectURL(blobUrl)
   }
 }
+
+definePageMeta({
+  layout: "minimal"
+})
 </script>
+
+<style scoped>
+.lightbox-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.9);
+  display: flex;
+  flex-direction: column;
+  z-index: 1000;
+}
+
+.top-toolbar {
+  position: relative;
+  z-index: 1001;
+  backdrop-filter: blur(10px);
+}
+
+.preview-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  overflow: auto;
+}
+
+.preview-content {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.file-preview {
+  width: 100%;
+  height: 100%;
+  max-width: calc(100vw - 40px);
+  max-height: calc(
+    100vh - 88px
+  ); /* Account for top toolbar (48px) + padding (40px) */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.preview-image {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+.preview-video,
+.preview-audio {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.preview-unavailable {
+  max-width: 500px;
+}
+
+.loading-spinner {
+  color: white;
+}
+
+.error-alert {
+  max-width: 500px;
+}
+
+.encrypted-notice {
+  max-width: 500px;
+}
+
+/* Ensure toolbar doesn't interfere with content */
+.top-toolbar :deep(.v-app-bar__content) {
+  padding: 0;
+}
+</style>
diff --git a/app/pages/posts/[id].vue b/app/pages/posts/[id].vue
index 437b190..4f8e02b 100644
--- a/app/pages/posts/[id].vue
+++ b/app/pages/posts/[id].vue
@@ -61,7 +61,8 @@
           <v-card class="pa-6">
             <article
               v-if="htmlContent"
-              class="prose prose-xl dark:prose-invert prose-slate max-w-none mb-8"
+              class="prose dark:prose-invert prose-slate max-w-none mb-8"
+              :class="classesContent"
             >
               <div v-html="htmlContent" />
             </article>
@@ -165,6 +166,8 @@ const {
 const post = computed(() => postData.value?.post || null)
 const htmlContent = computed(() => postData.value?.html || "")
 
+const classesContent = computed(() => postData.value?.post.type == 1 ? 'prose-xl' : 'prose-md');
+
 useHead({
   title: computed(() => {
     if (pending.value) return "Loading post..."
diff --git a/app/types/api/index.ts b/app/types/api/index.ts
index 8307a78..026d0a7 100644
--- a/app/types/api/index.ts
+++ b/app/types/api/index.ts
@@ -1,5 +1,5 @@
 // Re-export all types from separate files for easy importing
-export type { SnFileMeta, SnAttachment, SnPost } from './post'
+export type { SnFileMeta, SnCloudFile as SnAttachment, SnPost } from './post'
 export type { SnVerification, SnPublisher } from './publisher'
 export type { SnActivity } from './activity'
 export type { SnWalletOrder, OrderStatus } from './order'
diff --git a/app/types/api/post.ts b/app/types/api/post.ts
index 461e1c6..0709729 100644
--- a/app/types/api/post.ts
+++ b/app/types/api/post.ts
@@ -23,7 +23,7 @@ export interface SnFileMeta {
 }
 
 // Attachment interface
-export interface SnAttachment {
+export interface SnCloudFile {
   id: string;
   name: string;
   fileMeta: SnFileMeta;
@@ -33,6 +33,7 @@ export interface SnAttachment {
   hash: string;
   size: number;
   hasCompression: boolean;
+  isEncrypted: boolean;
   createdAt: string;
   updatedAt: string;
   deletedAt: string | null;
@@ -69,7 +70,7 @@ export interface SnPost {
   forwardedPost: SnPost | null;
   realmId: string | null;
   realm: unknown | null;
-  attachments: SnAttachment[];
+  attachments: SnCloudFile[];
   publisherId: string;
   publisher: SnPublisher;
   awards: unknown | null;
diff --git a/app/types/api/publisher.ts b/app/types/api/publisher.ts
index 30e260c..c0b5565 100644
--- a/app/types/api/publisher.ts
+++ b/app/types/api/publisher.ts
@@ -1,4 +1,4 @@
-import type { SnAttachment } from './post'
+import type { SnCloudFile } from './post'
 
 // Verification interface
 export interface SnVerification {
@@ -17,8 +17,8 @@ export interface SnPublisher {
   bio: string;
   pictureId: string;
   backgroundId: string;
-  picture: SnAttachment | null;
-  background: SnAttachment | null;
+  picture: SnCloudFile | null;
+  background: SnCloudFile | null;
   verification: SnVerification | null;
   accountId: string;
   realmId: string | null;
diff --git a/app/types/api/user.ts b/app/types/api/user.ts
index 34875c0..3b0079a 100644
--- a/app/types/api/user.ts
+++ b/app/types/api/user.ts
@@ -1,4 +1,4 @@
-import type { SnAttachment } from './post'
+import type { SnCloudFile } from './post'
 import type { SnVerification } from './publisher'
 
 // Account link interface
@@ -63,8 +63,8 @@ export interface SnAccountProfile {
   socialCredits: number;
   socialCreditsLevel: number;
   levelingProgress: number;
-  picture: SnAttachment | null;
-  background: SnAttachment | null;
+  picture: SnCloudFile | null;
+  background: SnCloudFile | null;
   accountId: string;
   resourceIdentifier: string;
   createdAt: string;