Skip to content

Commit 8ca5343

Browse files
authored
Merge pull request #187 from imsyy/dev
feat: 同步开发分支
2 parents 220ce2e + 231c5b6 commit 8ca5343

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1041
-4704
lines changed

.env

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
# 站点名称
2-
VITE_SITE_NAME = "無名の主页"
3-
VITE_SITE_ANTHOR = "無名"
4-
VITE_SITE_KEYWORDS = "無名,个人主页"
5-
VITE_SITE_DES = "一个默默无闻的主页"
6-
VITE_SITE_URL = "imsyy.top"
7-
VITE_SITE_LOGO = "/images/icon/favicon.ico"
8-
VITE_SITE_APPLE_LOGO = "/images/logo/apple-touch-icon.png"
9-
10-
# 百度统计
11-
## 若不需要,请设为空即可
12-
VITE_SITE_BAIDUTONGJI = "14e9f35ff8bc67fd4bcb5f07a6e6655a"
1+
# 站点信息
2+
VITE_SITE_NAME = "無名の主页" # 名称
3+
VITE_SITE_ANTHOR = "無名" # 作者
4+
VITE_SITE_KEYWORDS = "無名,个人主页" # 关键词
5+
VITE_SITE_DES = "一个默默无闻的主页" # 站点简介
6+
VITE_SITE_URL = "imsyy.top" # 作者地址
7+
VITE_SITE_LOGO = "/images/icon/favicon.ico" # 站点主图标
8+
VITE_SITE_MAIN_LOGO = "/images/icon/logo.png" # 主页图标
9+
VITE_SITE_APPLE_LOGO = "/images/logo/apple-touch-icon.png" # Apple 端图标
1310

1411
# 简介文本
1512
VITE_DESC_HELLO = "Hello World !"

index.html

+11-40
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,28 @@
66
<meta http-equiv="Access-Control-Allow-Origin" content="*">
77
<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
88
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<link rel="icon" href="<%- logo %>">
10-
<link rel="apple-touch-icon" href="<%- appleLogo %>" />
11-
<link rel="bookmark" href="<%- appleLogo %>" />
12-
<link rel="apple-touch-icon-precomposed" sizes="200x200" href="<%- appleLogo %>" />
13-
<meta name="description" content="<%- description %>" />
14-
<meta name="keywords" content="<%- keywords %>" />
15-
<meta name="author" content="<%- author %>" />
9+
<link rel="icon" href="%VITE_SITE_LOGO%">
10+
<link rel="apple-touch-icon" href="%VITE_SITE_APPLE_LOGO%" />
11+
<link rel="bookmark" href="%VITE_SITE_APPLE_LOGO%" />
12+
<link rel="apple-touch-icon-precomposed" sizes="200x200" href="%VITE_SITE_APPLE_LOGO%" />
13+
<meta name="description" content="%VITE_SITE_DES%" />
14+
<meta name="keywords" content="%VITE_SITE_KEYWORDS%" />
15+
<meta name="author" content="%VITE_SITE_ANTHOR%" />
1616
<meta name="theme-color" content="#424242" />
17-
<title><%- title %></title>
17+
<title>%VITE_SITE_NAME%</title>
1818
<!-- HarmonyOS Sans -->
1919
<!-- 本站 CDN 已开启防盗链,非本站域名不可访问,请更改链接为下方内容,否则自定义字体将失效 -->
20-
<!-- https://s1.hdslb.com/bfs/static/jinkela/long/font/regular.css -->
21-
<link rel="stylesheet" href="https://cdn.imsyy.top/gh/imsyy/file/font/HarmonyOS_Sans/regular.min.css" />
22-
<link rel="stylesheet" href="/loading/loading.min.css">
20+
<link rel="stylesheet" href="https://s1.hdslb.com/bfs/static/jinkela/long/font/regular.css" />
21+
<!-- <link rel="stylesheet" href="https://cdn.imsyy.top/gh/imsyy/file/font/HarmonyOS_Sans/regular.min.css" /> -->
2322
<!-- IE Out -->
2423
<script>
2524
if ( /*@cc_on!@*/ false || (!!window.MSInputMethodContext && !!document.documentMode))
2625
window.location.href =
2726
"https://support.dmeng.net/upgrade-your-browser.html?referrer=" + encodeURIComponent(window.location.href)
2827
</script>
29-
<% if (tongji) { %>
30-
<!-- 百度统计 -->
31-
<script>
32-
var _hmt = _hmt || [];
33-
(function() {
34-
var hm = document.createElement("script");
35-
hm.src = "https://hm.baidu.com/hm.js?<%- tongji %>";
36-
var s = document.getElementsByTagName("script")[0];
37-
s.parentNode.insertBefore(hm, s);
38-
})();
39-
</script>
40-
<% } %>
4128
</head>
4229

43-
<body class="loading">
44-
<!--加载动画-->
45-
<div id="loading-box">
46-
<div class="loading-left-bg"></div>
47-
<div class="loading-right-bg"></div>
48-
<div class="spinner-box">
49-
<div class="loader">
50-
<div class="inner one"></div>
51-
<div class="inner two"></div>
52-
<div class="inner three"></div>
53-
</div>
54-
<div class="loading-word">
55-
<p class="loading-title" id="loading-title"><%- title %></p>
56-
<span id="loading-text">加载中</span>
57-
</div>
58-
</div>
59-
</div>
30+
<body>
6031
<!-- 主体内容 -->
6132
<div id="app"></div>
6233
<!-- noscript -->

package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,35 @@
44
"github": "https://github.com/imsyy/home",
55
"home": "https://imsyy.top",
66
"private": true,
7-
"version": "4.0.5",
7+
"version": "4.1.0",
88
"type": "module",
99
"scripts": {
1010
"dev": "vite --host",
1111
"build": "vite build",
1212
"preview": "vite preview"
1313
},
1414
"dependencies": {
15-
"@icon-park/vue-next": "^1.4.2",
1615
"aplayer": "^1.10.1",
1716
"axios": "^1.1.3",
1817
"element-plus": "^2.2.18",
1918
"fetch-jsonp": "^1.2.3",
2019
"pinia": "^2.0.23",
2120
"pinia-plugin-persistedstate": "^3.0.0",
2221
"swiper": "^9.3.2",
23-
"terser": "^5.16.1",
24-
"vue": "^3.2.37",
22+
"vue": "^3.3.4",
2523
"vue3-aplayer": "^1.7.3"
2624
},
2725
"devDependencies": {
26+
"@icon-park/vue-next": "^1.4.2",
2827
"@vicons/fa": "^0.12.0",
29-
"@vicons/material": "^0.12.0",
3028
"@vicons/utils": "^0.1.4",
31-
"@vitejs/plugin-vue": "^3.1.0",
29+
"@vitejs/plugin-vue": "^4.2.3",
3230
"sass": "^1.55.0",
31+
"terser": "^5.16.1",
3332
"unplugin-auto-import": "^0.11.2",
3433
"unplugin-vue-components": "^0.22.8",
35-
"vite": "^3.1.0",
36-
"vite-plugin-html": "^3.2.0",
34+
"vite": "^4.4.5",
35+
"vite-plugin-compression": "^0.5.1",
3736
"vite-plugin-pwa": "^0.14.1"
3837
}
3938
}

0 commit comments

Comments
 (0)