fix: minor bugfixes

.changeset/sixty-garlics-vanish.md

@@ -0,0 +1,5 @@
+---
+"enspire": patch
+---
+
+bugfixes

.github/workflows/on-commit.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install
         env:
-          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
-          S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
-          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
+          S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
+          S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
+          S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
       - name: Apply all pending migrations to the database
         run: npx prisma migrate deploy
         env:
@@ -70,10 +70,10 @@ jobs:
       - name: Install Dependencies
         run: pnpm i
         env:
-          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
-          S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
-          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
+          S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
+          S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
+          S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
 
       - name: Create Release Pull Request
         uses: changesets/action@v1

.github/workflows/on-release.yml

@@ -33,10 +33,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install
         env:
-          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
-          S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
-          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
+          S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
+          S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
+          S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
       - name: Apply all pending migrations to the database
         run: npx prisma migrate deploy
         env:

app/components/custom/club-file-upload.vue

@@ -84,10 +84,14 @@ const onSubmit = form.handleSubmit(async (values) => {
   submitting.value = false
 })
 
+const downloadLink = ref('')
+const downloadFilename = ref('')
 const msg = ref('')
 const currentClubData = ref(null)
 const clubUpdating = ref(false)
 async function updateClub() {
+  downloadLink.value = ''
+  downloadFilename.value = ''
   if (!props.club) {
     msg.value = '请先选择一个社团'
     currentClubData.value = undefined
@@ -112,8 +116,6 @@ async function updateClub() {
   clubUpdating.value = false
 }
 
-const downloadLink = ref('')
-const downloadFilename = ref('')
 const dlink: Ref<HTMLElement | null> = ref(null)
 const downloading = ref(false)
 async function download() {
@@ -133,8 +135,6 @@ async function download() {
     dlink.value.click()
     downloading.value = false
   }
-  downloadLink.value = ''
-  downloadFilename.value = ''
 }
 
 watch(
@@ -184,6 +184,10 @@ await updateClub()
     <div v-else class="mt-2">
       {{ msg }}
     </div>
-    <a ref="dlink" :href="downloadLink" :download="downloadFilename" class="hidden">Download</a>
+    <a
+      ref="dlink" :href="downloadLink" :download="downloadFilename" class="hidden"
+    >Download</a>
+    <!-- @click="downloadLink = '';
+              downloadFilename = ''" -->
   </Card>
 </template>

server/api/files/newRecord.post.ts

@@ -66,7 +66,7 @@ export default eventHandler(async (event) => {
           console.log('Failed when updating')
           return {
             success: false,
-            error,
+            error: error.toString(),
           }
         }
         console.log('Updated s3 content')
@@ -108,7 +108,7 @@ export default eventHandler(async (event) => {
           console.log('Failed to create')
           return {
             success: false,
-            error,
+            error: error.toString(),
           }
         }
       }