Skip to content

Commit

Permalink
Merge pull request #39 from besscroft/dev
Browse files Browse the repository at this point in the history
v0.4.0
  • Loading branch information
besscroft authored Mar 11, 2024
2 parents c85cb15 + 886dac8 commit aa208bd
Show file tree
Hide file tree
Showing 12 changed files with 364 additions and 446 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ export default defineAppConfig({
apiWhiteList: [
'/api/login',
'/api/verify',
'/api/music',
'/api/getImageList',
]
})
Expand All @@ -151,8 +150,6 @@ export default defineAppConfig({
| appName | 网站标题 |
| appDescription | 网站描述 |

如果你要修改音乐列表,请在 `assets/server/music.json` 下更改,可以换成你自己的。

`app.config.ts` 文件中,可以配置:

| Key | 备注 |
Expand Down
1 change: 0 additions & 1 deletion app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default defineAppConfig({
apiWhiteList: [
'/api/login',
'/api/verify',
'/api/music',
'/api/getImageList',
],
mobileRow: 2,
Expand Down
8 changes: 0 additions & 8 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,10 @@
background-color: #f4f4f5;
}

.aplayer-title {
color: #212121 !important;
}

.el-dialog {
width: 100% !important;
}

.aplayer-list-title {
color: #212121 !important;
}

.el-table .cell {
padding: 0 !important;
}
Expand Down
50 changes: 0 additions & 50 deletions assets/server/json/music.json

This file was deleted.

60 changes: 0 additions & 60 deletions components/Music.vue

This file was deleted.

2 changes: 0 additions & 2 deletions layouts/admin.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
const { isMobile } = useDevice()
const breakpoints = useBreakpoints(breakpointsTailwind)
const mdAndLarger = breakpoints.greaterOrEqual('md')
</script>
Expand All @@ -14,7 +13,6 @@ const mdAndLarger = breakpoints.greaterOrEqual('md')
</div>
<ClientOnly>
<el-backtop v-if="mdAndLarger" :right="100" :bottom="100" z-50 />
<Music v-if="mdAndLarger && !isMobile" />
<NavBottom v-if="!mdAndLarger" />
</ClientOnly>
</div>
Expand Down
2 changes: 0 additions & 2 deletions layouts/default.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
const { isMobile } = useDevice()
const breakpoints = useBreakpoints(breakpointsTailwind)
const mdAndLarger = breakpoints.greaterOrEqual('md')
</script>
Expand All @@ -14,7 +13,6 @@ const mdAndLarger = breakpoints.greaterOrEqual('md')
</div>
<el-backtop v-if="mdAndLarger" :right="100" :bottom="100" z-50 />
<ClientOnly>
<Music v-if="mdAndLarger && !isMobile" />
<NavBottom v-if="!mdAndLarger" />
</ClientOnly>
</main>
Expand Down
5 changes: 1 addition & 4 deletions layouts/none.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<script setup lang="ts">
const { isMobile } = useDevice()
</script>

<template>
<div h-full>
<div h-full>
<slot />
</div>
<ClientOnly v-if="!isMobile">
<Music />
</ClientOnly>
</div>
</template>

Expand Down
27 changes: 13 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,35 @@
"typecheck": "vue-tsc --noEmit"
},
"devDependencies": {
"@antfu/eslint-config": "^2.6.4",
"@antfu/eslint-config": "^2.8.0",
"@element-plus/nuxt": "^1.0.7",
"@iconify-json/carbon": "^1.1.30",
"@iconify-json/carbon": "^1.1.31",
"@nuxtjs/color-mode": "^3.3.2",
"@nuxtjs/device": "^3.1.1",
"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
"@pinia/nuxt": "^0.5.1",
"@sentry/node": "^7.102.1",
"@sentry/profiling-node": "^7.102.1",
"@sentry/vue": "^7.102.1",
"@sentry/node": "^7.106.0",
"@sentry/profiling-node": "^7.106.0",
"@sentry/vue": "^7.106.0",
"@unocss/eslint-config": "^0.58.5",
"@unocss/nuxt": "^0.58.5",
"@vueuse/nuxt": "^10.8.0",
"aplayer": "^1.10.1",
"@vueuse/nuxt": "^10.9.0",
"consola": "^3.2.3",
"element-plus": "^2.5.6",
"element-plus": "^2.6.1",
"eslint": "^8.57.0",
"nuxt": "^3.10.3",
"pinia": "^2.1.7",
"typescript": "^5.3.3",
"vue-tsc": "^1.8.27"
"typescript": "^5.4.2",
"vue-tsc": "^2.0.6"
},
"dependencies": {
"@formkit/auto-animate": "^0.8.1",
"@nuxt/ui": "^2.14.1",
"aws-sdk": "^2.1565.0",
"@nuxt/ui": "^2.14.2",
"aws-sdk": "^2.1574.0",
"crypto-js": "^4.2.0",
"exifreader": "^4.21.0",
"exifreader": "^4.21.1",
"jsonwebtoken": "^9.0.2",
"postgres": "^3.4.3",
"vue-waterfall-plugin-next": "^2.3.1"
"vue-waterfall-plugin-next": "^2.4.3"
}
}
Loading

1 comment on commit aa208bd

@vercel
Copy link

@vercel vercel bot commented on aa208bd Mar 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.