From 177b539e395e26c2f160700257a690e28df99019 Mon Sep 17 00:00:00 2001 From: imsyy Date: Mon, 12 Jun 2023 11:39:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E6=94=AF=E6=8C=81=20#129=20#20=20#47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 +- README.md | 2 - package.json | 1 + src/App.vue | 10 +-- src/api/index.js | 10 --- src/assets/siteLinks.json | 41 ++++++++++ {public => src/assets}/socialLinks.json | 0 src/assets/vue.svg | 1 - src/components/Hitokoto/index.vue | 2 +- src/components/Links/index.vue | 102 +++++++++++++++++++----- src/components/SocialLinks/index.vue | 36 ++------- src/views/Box/index.vue | 7 +- yarn.lock | 14 +++- 13 files changed, 155 insertions(+), 77 deletions(-) create mode 100644 src/assets/siteLinks.json rename {public => src/assets}/socialLinks.json (100%) delete mode 100644 src/assets/vue.svg diff --git a/.env b/.env index d568bf7a45..ca09b466ed 100644 --- a/.env +++ b/.env @@ -16,13 +16,13 @@ VITE_DESC_HELLO_OTHER = "Oops !" VITE_DESC_TEXT_OTHER = "哎呀，这都被你发现了（ 再点击一次可关闭 ）" # 社交链接 -## 请在 public 目录下的 socialLinks.json 文件中配置 +## 请在 src/assets/socialLinks.json 文件中配置 # 网站链接 -## 请在 src/components/Links/index.vue 文件中配置 +## 请在 src/assets/siteLinks.json 文件中配置 # 天气 Key -## 请前往高德开放平台注册 Web服务 Key（免费的） +## 请前往高德开放平台注册 **Web服务** Key（免费的） ## 请各位大佬行行好，别再让我超量了 VITE_WEATHER_KEY = "6c13af6fc30868bee488faf2cc652ab4" diff --git a/README.md b/README.md index 264ccd3ae9..04e2f0cfb2 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,6 @@ - [x] 音乐播放器 - [x] 移动端适配 -* [ ] 播放器取消使用 Aplayer - ### 部署 * **安装** [node.js](https://nodejs.org/zh-cn/) **环境** diff --git a/package.json b/package.json index c81c416998..9d543087a8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "fetch-jsonp": "^1.2.3", "pinia": "^2.0.23", "pinia-plugin-persistedstate": "^3.0.0", + "swiper": "^9.3.2", "terser": "^5.16.1", "vue": "^3.2.37", "vue3-aplayer": "^1.7.3" diff --git a/src/App.vue b/src/App.vue index d037d76370..e614aa0e89 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,10 +55,6 @@ const getWidth = () => { onMounted(() => { // 自定义鼠标 cursorInit(); - // 欢迎提示 - helloInit(); - // 默哀模式 - checkDays(); // 加载完成事件 window.addEventListener("load", () => { console.log("加载完成"); @@ -67,6 +63,10 @@ onMounted(() => { // 给加载动画添加结束标记 const loadingBox = document.getElementById("loading-box"); loadingBox.classList.add("loaded"); + // 欢迎提示 + helloInit(); + // 默哀模式 + checkDays(); }); // 屏蔽右键 @@ -207,4 +207,4 @@ main { filter: blur(10px); } } - \ No newline at end of file + diff --git a/src/api/index.js b/src/api/index.js index fa9adc0691..6aeb9be89f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -67,13 +67,3 @@ export const getWeather = async (key, city) => { ); return await res.json(); }; - -/** - * 获取配置 - */ - -// 获取社交链接 -export const getSocialLinks = async () => { - const res = await fetch("/socialLinks.json"); - return await res.json(); -}; diff --git a/src/assets/siteLinks.json b/src/assets/siteLinks.json new file mode 100644 index 0000000000..048680bec1 --- /dev/null +++ b/src/assets/siteLinks.json @@ -0,0 +1,41 @@ +[ + [ + { + "icon": "Blog", + "name": "博客", + "link": "https://blog.imsyy.top/" + }, + { + "icon": "Cloud", + "name": "网盘", + "link": "https://pan.imsyy.top/" + }, + { + "icon": "CompactDisc", + "name": "音乐", + "link": "https://music.imsyy.top/" + }, + { + "icon": "Compass", + "name": "起始页", + "link": "https://nav.imsyy.top/" + }, + { + "icon": "Book", + "name": "网址集", + "link": "https://web.imsyy.top/" + }, + { + "icon": "Fire", + "name": "今日热榜", + "link": "https://hot.imsyy.top/" + } + ], + [ + { + "icon": "LaptopCode", + "name": "站点监测", + "link": "https://status.imsyy.top/" + } + ] +] diff --git a/public/socialLinks.json b/src/assets/socialLinks.json similarity index 100% rename from public/socialLinks.json rename to src/assets/socialLinks.json diff --git a/src/assets/vue.svg b/src/assets/vue.svg deleted file mode 100644 index 770e9d333e..0000000000 --- a/src/assets/vue.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/Hitokoto/index.vue b/src/components/Hitokoto/index.vue index ef33072b54..1cf09576b4 100644 --- a/src/components/Hitokoto/index.vue +++ b/src/components/Hitokoto/index.vue @@ -7,7 +7,7 @@ @click.stop > - +
网站列表
- - -
- - - - {{ item.name }} -
- - + + + + + +
+ + + + {{ item.name }} +
+ + + +
+
\ No newline at end of file + diff --git a/src/views/Box/index.vue b/src/views/Box/index.vue index 43c73ce0ea..e789f9f0e7 100644 --- a/src/views/Box/index.vue +++ b/src/views/Box/index.vue @@ -33,10 +33,10 @@ @@ -60,6 +60,7 @@ const closeShow = ref(false); right: 14px; width: 28px; height: 28px; + transition: transform 0.3s, opacity 0.3s; &:hover { transform: scale(1.2); @@ -80,4 +81,4 @@ const closeShow = ref(false); height: 100%; } } - \ No newline at end of file + diff --git a/yarn.lock b/yarn.lock index e72b3828ac..635d82beb7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3040,6 +3040,11 @@ sourcemap-codec@^1.4.8: resolved "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== +ssr-window@^4.0.2: + version "4.0.2" + resolved "https://registry.npmmirror.com/ssr-window/-/ssr-window-4.0.2.tgz#dc6b3ee37be86ac0e3ddc60030f7b3bc9b8553be" + integrity sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ== + string.prototype.matchall@^4.0.6: version "4.0.8" resolved "https://registry.npmmirror.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3" @@ -3112,6 +3117,13 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +swiper@^9.3.2: + version "9.3.2" + resolved "https://registry.npmmirror.com/swiper/-/swiper-9.3.2.tgz#f29eddb17f231221c7727372637c44279174a4e1" + integrity sha512-Kj9Z4kXRmJR3YT/Wj+XLWj8P6IcRt+WG38uL8M3/Wny7+6sV0TlP9vnE1X+Co9c7VzNooojWGnFa+Wf/9+CUMA== + dependencies: + ssr-window "^4.0.2" + temp-dir@^2.0.0: version "2.0.0" resolved "https://registry.npmmirror.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" @@ -3311,7 +3323,7 @@ uri-js@^4.2.2: vite-plugin-html@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/vite-plugin-html/-/vite-plugin-html-3.2.0.tgz" + resolved "https://registry.npmmirror.com/vite-plugin-html/-/vite-plugin-html-3.2.0.tgz#0d4df9900642a321a139f1c25c05195ba9d0ec79" integrity sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ== dependencies: "@rollup/pluginutils" "^4.2.0"