Skip to content

Commit 060ce11

Browse files
authored
fix: minor bugfixes (#674)
* fix: download button * fix: returning stringified error messages * fix: github action env * feat: changeset
1 parent 745514e commit 060ce11

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

.changeset/sixty-garlics-vanish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"enspire": patch
3+
---
4+
5+
bugfixes

.github/workflows/on-commit.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Install dependencies
2626
run: pnpm install
2727
env:
28-
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
29-
S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
30-
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
31-
S3_BUCKET: ${{ secrets.S3_BUCKET }}
28+
S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
29+
S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
30+
S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
31+
S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
3232
- name: Apply all pending migrations to the database
3333
run: npx prisma migrate deploy
3434
env:
@@ -70,10 +70,10 @@ jobs:
7070
- name: Install Dependencies
7171
run: pnpm i
7272
env:
73-
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
74-
S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
75-
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
76-
S3_BUCKET: ${{ secrets.S3_BUCKET }}
73+
S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
74+
S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
75+
S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
76+
S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
7777

7878
- name: Create Release Pull Request
7979
uses: changesets/action@v1

.github/workflows/on-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
- name: Install dependencies
3434
run: pnpm install
3535
env:
36-
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
37-
S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
38-
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
39-
S3_BUCKET: ${{ secrets.S3_BUCKET }}
36+
S3_ACCESS_KEY_ID: ${{ secrets.PROD_S3_ACCESS_KEY_ID }}
37+
S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
38+
S3_SECRET_ACCESS_KEY: ${{ secrets.PROD_S3_SECRET_ACCESS_KEY }}
39+
S3_BUCKET: ${{ secrets.PROD_S3_BUCKET }}
4040
- name: Apply all pending migrations to the database
4141
run: npx prisma migrate deploy
4242
env:

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,14 @@ const onSubmit = form.handleSubmit(async (values) => {
8484
submitting.value = false
8585
})
8686
87+
const downloadLink = ref('')
88+
const downloadFilename = ref('')
8789
const msg = ref('')
8890
const currentClubData = ref(null)
8991
const clubUpdating = ref(false)
9092
async function updateClub() {
93+
downloadLink.value = ''
94+
downloadFilename.value = ''
9195
if (!props.club) {
9296
msg.value = '请先选择一个社团'
9397
currentClubData.value = undefined
@@ -112,8 +116,6 @@ async function updateClub() {
112116
clubUpdating.value = false
113117
}
114118
115-
const downloadLink = ref('')
116-
const downloadFilename = ref('')
117119
const dlink: Ref<HTMLElement | null> = ref(null)
118120
const downloading = ref(false)
119121
async function download() {
@@ -133,8 +135,6 @@ async function download() {
133135
dlink.value.click()
134136
downloading.value = false
135137
}
136-
downloadLink.value = ''
137-
downloadFilename.value = ''
138138
}
139139
140140
watch(
@@ -184,6 +184,10 @@ await updateClub()
184184
<div v-else class="mt-2">
185185
{{ msg }}
186186
</div>
187-
<a ref="dlink" :href="downloadLink" :download="downloadFilename" class="hidden">Download</a>
187+
<a
188+
ref="dlink" :href="downloadLink" :download="downloadFilename" class="hidden"
189+
>Download</a>
190+
<!-- @click="downloadLink = '';
191+
downloadFilename = ''" -->
188192
</Card>
189193
</template>

server/api/files/newRecord.post.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default eventHandler(async (event) => {
6666
console.log('Failed when updating')
6767
return {
6868
success: false,
69-
error,
69+
error: error.toString(),
7070
}
7171
}
7272
console.log('Updated s3 content')
@@ -108,7 +108,7 @@ export default eventHandler(async (event) => {
108108
console.log('Failed to create')
109109
return {
110110
success: false,
111-
error,
111+
error: error.toString(),
112112
}
113113
}
114114
}

0 commit comments

Comments
 (0)