Merge pull request #10 from NCTUCSUnion/dev

Dev

Author: gainsborouo

.github/workflows/main.yml

@@ -81,6 +81,9 @@ jobs:
             ghcr.io/nctucsunion/pastexam:frontend-${{ github.sha }}
           build-args: |
             VITE_API_BASE_URL=${{ secrets.FRONTEND_API_BASE_URL }}
+            VITE_UMAMI_SHARE_URL=${{ secrets.FRONTEND_UMAMI_SHARE_URL }}
+          cache-from: type=registry,ref=ghcr.io/nctucsunion/pastexam:frontend-buildcache
+          cache-to: type=registry,ref=ghcr.io/nctucsunion/pastexam:frontend-buildcache,mode=max
 
       - name: Build and push Backend Docker image
         uses: docker/build-push-action@v4
@@ -92,3 +95,5 @@ jobs:
           tags: |
             ghcr.io/nctucsunion/pastexam:backend
             ghcr.io/nctucsunion/pastexam:backend-${{ github.sha }}
+          cache-from: type=registry,ref=ghcr.io/nctucsunion/pastexam:backend-buildcache
+          cache-to: type=registry,ref=ghcr.io/nctucsunion/pastexam:backend-buildcache,mode=max

backend/app/api/services/courses.py

@@ -63,16 +63,15 @@ async def get_course_archives(
 
     return archives
 
-@router.get("/{course_id}/archives/{archive_id}/url")
-async def get_archive_url(
+@router.get("/{course_id}/archives/{archive_id}/preview")
+async def get_archive_preview_url(
     course_id: int,
     archive_id: int,
-    is_download: bool = False,
     current_user: User = Depends(get_current_user),
     db: AsyncSession = Depends(get_session),
 ):
     """
-    Get presigned URLs for downloading and previewing an archive
+    Get presigned URL for previewing an archive (30 minutes expiry)
     """
     query = select(Archive).where(
         Archive.course_id == course_id,
@@ -88,14 +87,41 @@ async def get_archive_url(
             detail="Archive not found"
         )
 
-    if is_download:
-        archive.download_count += 1
-        await db.commit()
-        await db.refresh(archive)
-        
     return {
-        "download_url": presigned_get_url(archive.object_name, expires=timedelta(hours=1)),
-        "preview_url": presigned_get_url(archive.object_name, expires=timedelta(minutes=30))
+        "url": presigned_get_url(archive.object_name, expires=timedelta(minutes=30))
+    }
+
+@router.get("/{course_id}/archives/{archive_id}/download")
+async def get_archive_download_url(
+    course_id: int,
+    archive_id: int,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_session),
+):
+    """
+    Get presigned URL for downloading an archive (1 hour expiry)
+    This endpoint increments the download count
+    """
+    query = select(Archive).where(
+        Archive.course_id == course_id,
+        Archive.id == archive_id,
+        Archive.deleted_at.is_(None)
+    )
+    result = await db.execute(query)
+    archive = result.scalar_one_or_none()
+    
+    if not archive:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Archive not found"
+        )
+    
+    archive.download_count += 1
+    await db.commit()
+    await db.refresh(archive)
+    
+    return {
+        "url": presigned_get_url(archive.object_name, expires=timedelta(hours=1))
     }
 
 @router.patch("/{course_id}/archives/{archive_id}")

frontend/.env.example

@@ -1 +1,2 @@
-VITE_API_BASE_URL=
+VITE_API_BASE_URL=
+VITE_UMAMI_SHARE_URL=

frontend/Dockerfile

@@ -4,7 +4,9 @@ WORKDIR /app
 RUN corepack enable && corepack prepare pnpm@9.0.0 --activate
 
 ARG VITE_API_BASE_URL
+ARG VITE_UMAMI_SHARE_URL
 ENV VITE_API_BASE_URL=${VITE_API_BASE_URL}
+ENV VITE_UMAMI_SHARE_URL=${VITE_UMAMI_SHARE_URL}
 
 COPY package.json pnpm-lock.yaml ./
 
@@ -13,6 +15,7 @@ RUN pnpm install --frozen-lockfile
 COPY . .
 
 RUN echo "VITE_API_BASE_URL=${VITE_API_BASE_URL}" > .env
+RUN echo "VITE_UMAMI_SHARE_URL=${VITE_UMAMI_SHARE_URL}" >> .env
 RUN pnpm run build
 
 FROM nginx:alpine

frontend/index.html

@@ -48,6 +48,11 @@
 
     <!-- Canonical URL -->
     <link rel="canonical" href="https://pastexam.nctucsunion.me/" />
+    <script
+      defer
+      src="https://cloud.umami.is/script.js"
+      data-website-id="8089a20a-ba6a-4bf5-b629-8a82c03c134e"
+    ></script>
     <script>
       function updateFavicon(isDark) {
         const theme = isDark ? 'dark' : 'bright'

frontend/src/api/services/archives.js

@@ -9,10 +9,12 @@ export const archiveService = {
     })
   },
 
-  getArchiveUrl(courseId, archiveId, isDownload = false) {
-    return api.get(`/courses/${courseId}/archives/${archiveId}/url`, {
-      params: { is_download: isDownload },
-    })
+  getArchivePreviewUrl(courseId, archiveId) {
+    return api.get(`/courses/${courseId}/archives/${archiveId}/preview`)
+  },
+
+  getArchiveDownloadUrl(courseId, archiveId) {
+    return api.get(`/courses/${courseId}/archives/${archiveId}/download`)
   },
 
   deleteArchive(courseId, archiveId) {

frontend/src/views/Admin.vue

@@ -5,6 +5,7 @@
         <TabList>
           <Tab value="0">課程管理</Tab>
           <Tab value="1">使用者管理</Tab>
+          <Tab value="2">網站分析</Tab>
         </TabList>
         <TabPanels>
           <TabPanel value="0">
@@ -185,6 +186,53 @@
               </DataTable>
             </div>
           </TabPanel>
+
+          <TabPanel value="2">
+            <div class="p-2 md:p-4 h-full">
+              <div class="flex flex-column gap-3 h-full">
+                <div class="flex justify-content-end align-items-center mb-2">
+                  <Button
+                    v-if="umamiShareUrl"
+                    label="在新視窗開啟"
+                    icon="pi pi-external-link"
+                    severity="secondary"
+                    size="small"
+                    @click="openUmamiInNewTab"
+                  />
+                </div>
+
+                <!-- Loading state -->
+                <div
+                  v-if="umamiLoading"
+                  class="flex-1 flex align-items-center justify-content-center"
+                >
+                  <ProgressSpinner strokeWidth="4" />
+                </div>
+
+                <!-- Error state: No URL configured -->
+                <div
+                  v-else-if="!umamiShareUrl"
+                  class="flex-1 flex flex-column align-items-center justify-content-center gap-4"
+                >
+                  <i class="pi pi-exclamation-circle text-6xl text-red-500" />
+                  <div class="text-xl">無法載入網站分析</div>
+                  <div class="text-sm text-500">請聯絡管理員設定 Umami</div>
+                </div>
+
+                <!-- Success state: Show iframe -->
+                <div v-else class="umami-iframe-container">
+                  <iframe
+                    :src="umamiShareUrl"
+                    frameborder="0"
+                    class="umami-iframe"
+                    title="Umami Analytics"
+                    @load="handleUmamiLoaded"
+                    @error="handleUmamiError"
+                  ></iframe>
+                </div>
+              </div>
+            </div>
+          </TabPanel>
         </TabPanels>
       </Tabs>
 
@@ -383,6 +431,29 @@ const userFormErrors = ref({})
 
 const currentUserId = computed(() => getCurrentUser()?.id)
 
+const umamiShareUrl = ref(import.meta.env.VITE_UMAMI_SHARE_URL || '')
+const umamiLoading = ref(false)
+
+const openUmamiInNewTab = () => {
+  if (umamiShareUrl.value) {
+    window.open(umamiShareUrl.value, '_blank')
+  }
+}
+
+const handleUmamiLoaded = () => {
+  umamiLoading.value = false
+}
+
+const handleUmamiError = () => {
+  umamiLoading.value = false
+  toast.add({
+    severity: 'error',
+    summary: '錯誤',
+    detail: '無法載入 Umami 分析頁面',
+    life: 3000,
+  })
+}
+
 const categoryOptions = [
   { name: '大一課程', value: 'freshman' },
   { name: '大二課程', value: 'sophomore' },
@@ -873,8 +944,29 @@ onMounted(() => {
   flex-wrap: wrap;
 }
 
+.umami-iframe-container {
+  width: 100%;
+  height: calc(100vh - var(--navbar-height) - 200px);
+  min-height: 600px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  overflow: hidden;
+  background: var(--bg-primary);
+}
+
+.umami-iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+
 /* Mobile responsive adjustments */
 @media (max-width: 768px) {
+  .umami-iframe-container {
+    height: calc(100vh - var(--navbar-height) - 200px);
+    min-height: 400px;
+  }
+
   :deep(.p-dialog .p-dialog-content) {
     font-size: 0.875rem;
   }

frontend/src/views/Archive.vue

@@ -813,9 +813,9 @@ const downloadingId = ref(null)
 async function downloadArchive(archive) {
   try {
     downloadingId.value = archive.id
-    const { data } = await archiveService.getArchiveUrl(selectedCourse.value, archive.id, true)
+    const { data } = await archiveService.getArchiveDownloadUrl(selectedCourse.value, archive.id)
 
-    const response = await fetch(data.download_url)
+    const response = await fetch(data.url)
     const blob = await response.blob()
     const url = window.URL.createObjectURL(blob)
     const link = document.createElement('a')
@@ -860,11 +860,11 @@ async function previewArchive(archive) {
     previewError.value = false
     showPreview.value = true
 
-    const { data } = await archiveService.getArchiveUrl(selectedCourse.value, archive.id)
+    const { data } = await archiveService.getArchivePreviewUrl(selectedCourse.value, archive.id)
 
     selectedArchive.value = {
       ...archive,
-      previewUrl: data.preview_url,
+      previewUrl: data.url,
     }
   } catch (error) {
     console.error('Preview error:', error)
@@ -1173,13 +1173,12 @@ async function handlePreviewDownload(onComplete) {
   if (!selectedArchive.value) return
 
   try {
-    const { data } = await archiveService.getArchiveUrl(
+    const { data } = await archiveService.getArchiveDownloadUrl(
       selectedCourse.value,
-      selectedArchive.value.id,
-      true
+      selectedArchive.value.id
     )
 
-    const response = await fetch(data.download_url)
+    const response = await fetch(data.url)
     const blob = await response.blob()
     const url = window.URL.createObjectURL(blob)
     const link = document.createElement('a')