Skip to content

Commit

Permalink
🐞 fix: 修复图片
Browse files Browse the repository at this point in the history
  • Loading branch information
imsyy committed May 24, 2024
1 parent 4cac54c commit 22e2653
Show file tree
Hide file tree
Showing 87 changed files with 90 additions and 67 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ coverage
out
.env

/cypress/videos/
/cypress/screenshots/

# Editor directories and files
.vscode/*
.vscode
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> 一个简约的音乐播放器
![main](/screenshots/SPlayer.jpg)
![main](/screenshot/SPlayer.jpg)

## 说明

Expand Down Expand Up @@ -57,49 +57,49 @@
- 📱 移动端基础适配
- ~~🌐 `i18n` 支持~~

## 🖼️ Screenshots
## 🖼️ screenshot

> 开发中,仅供参考
<details>
<summary>主页面</summary>

![主页面](/screenshots/SPlayer%20-%20主页面.jpg)
![主页面](/screenshot/SPlayer%20-%20主页面.jpg)

</details>

<details>
<summary>播放页面</summary>

![播放页面](/screenshots/SPlayer%20-%20播放页面.jpg)
![播放页面](/screenshot/SPlayer%20-%20播放页面.jpg)

</details>

<details>
<summary>发现页面</summary>

![发现页面](/screenshots/SPlayer%20-%20发现页面.jpg)
![发现页面](/screenshot/SPlayer%20-%20发现页面.jpg)

</details>

<details>
<summary>歌单页面</summary>

![发现页面](/screenshots/SPlayer%20-%20歌单页面.jpg)
![发现页面](/screenshot/SPlayer%20-%20歌单页面.jpg)

</details>

<details>
<summary>评论页面</summary>

![发现页面](/screenshots/SPlayer%20-%20评论页面.jpg)
![发现页面](/screenshot/SPlayer%20-%20评论页面.jpg)

</details>

<details>
<summary>本地音乐</summary>

![发现页面](/screenshots/SPlayer%20-%20本地音乐.jpg)
![发现页面](/screenshot/SPlayer%20-%20本地音乐.jpg)

</details>

Expand Down Expand Up @@ -162,7 +162,7 @@ docker run -d --name SPlayer -p 7899:7899 imsyy/splayer:latest

5.`Build and Output Settings` 中的 `Output Directory` 改为 `out/renderer`

![build](/screenshots/build.png)
![build](/screenshot/build.png)

6. 点击 `Deploy`,即可成功部署

Expand Down
10 changes: 5 additions & 5 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ win:
# 可执行文件名
executableName: SPlayer
# 应用程序的图标文件路径
icon: public/images/icons/favicon-512x512.png
icon: public/imgs/icons/favicon-512x512.png
# 构建类型
target: nsis
# NSIS 安装器配置
Expand All @@ -41,15 +41,15 @@ nsis:
# 是否允许用户更改安装目录
allowToChangeInstallationDirectory: true
# 安装包图标
installerIcon: public/images/icons/favicon.ico
installerIcon: public/imgs/icons/favicon.ico
# 卸载命令图标
uninstallerIcon: public/images/icons/favicon.ico
uninstallerIcon: public/imgs/icons/favicon.ico
# macOS 平台配置
mac:
# 可执行文件名
executableName: SPlayer
# 应用程序的图标文件路径
icon: public/images/icons/favicon-512x512.png
icon: public/imgs/icons/favicon-512x512.png
# 权限继承的文件路径
entitlementsInherit: build/entitlements.mac.plist
# 扩展信息,如权限描述
Expand All @@ -71,7 +71,7 @@ linux:
# 可执行文件名
executableName: SPlayer
# 应用程序的图标文件路径
icon: public/images/icons/favicon-512x512.png
icon: public/imgs/icons/favicon-512x512.png
# 构建类型
target:
- AppImage
Expand Down
8 changes: 4 additions & 4 deletions electron.vite.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ export default defineConfig(({ mode }) => {
background_color: "#efefef",
icons: [
{
src: "/images/icons/favicon-32x32.png",
src: "/imgs/icons/favicon-32x32.png",
sizes: "32x32",
type: "image/png",
},
{
src: "/images/icons/favicon-96x96.png",
src: "/imgs/icons/favicon-96x96.png",
sizes: "96x96",
type: "image/png",
},
{
src: "/images/icons/favicon-256x256.png",
src: "/imgs/icons/favicon-256x256.png",
sizes: "256x256",
type: "image/png",
},
{
src: "/images/icons/favicon-512x512.png",
src: "/imgs/icons/favicon-512x512.png",
sizes: "512x512",
type: "image/png",
},
Expand Down
2 changes: 1 addition & 1 deletion electron/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class MainProcess {
titleBarStyle: "customButtonsOnHover", // Macos 隐藏菜单栏
autoHideMenuBar: true, // 失去焦点后自动隐藏菜单栏
// 图标配置
icon: nativeImage.createFromPath(join(__dirname, "../../public/images/icons/favicon.png")),
icon: nativeImage.createFromPath(join(__dirname, "../../public/imgs/icons/favicon.png")),
// 预加载
webPreferences: {
// devTools: is.dev,
Expand Down
8 changes: 4 additions & 4 deletions electron/main/utils/createSystemTray.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const createSystemTray = (win) => {
join(
__dirname,
process.platform === "win32"
? "../../public/images/icons/favicon.ico"
: "../../public/images/icons/favicon-32x32.png",
? "../../public/imgs/icons/favicon.ico"
: "../../public/imgs/icons/favicon-32x32.png",
),
)
.resize({
Expand Down Expand Up @@ -63,8 +63,8 @@ const createIcon = (name) => {
return nativeImage
.createFromPath(
isDarkMode
? join(__dirname, `../../public/images/icons/${name}-dark.png`)
: join(__dirname, `../../public/images/icons/${name}-light.png`),
? join(__dirname, `../../public/imgs/icons/${name}-dark.png`)
: join(__dirname, `../../public/imgs/icons/${name}-light.png`),
)
.resize({ width: 16, height: 16 });
};
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<html>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/png" sizes="32x32" href="/images/icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/images/icons/favicon-16x16.png" />
<link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/imgs/icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/imgs/icons/favicon-16x16.png" />
<link rel="apple-touch-icon" sizes="180x180" href="/imgs/icons/apple-touch-icon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>%RENDERER_VITE_SITE_TITLE%</title>
<meta name="apple-mobile-web-app-title" content="%RENDERER_VITE_SITE_TITLE%" />
<meta name="author" content="%RENDERER_VITE_SITE_ANTHOR%" />
<meta name="keywords" content="%RENDERER_VITE_SITE_KEYWORDS%" />
<meta name="description" content="%RENDERER_VITE_SITE_DES%" />
<link rel="mask-icon" href="/images/icons/safari-pinned-tab.svg" color="#5bbad5" />
<link rel="mask-icon" href="/imgs/icons/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
</head>
Expand Down
Binary file added public/imgs/icons/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/favicon.ico
Binary file not shown.
Binary file added public/imgs/icons/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/imgs/icons/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/next-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/next-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/open-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/open-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/pause-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/pause-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/play-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/play-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/power-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/power-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/prev-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/prev-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/imgs/icons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/imgs/icons/setting-dark.png
Binary file added public/imgs/icons/setting-light.png
Binary file added public/imgs/pic/album.jpg
Binary file added public/imgs/pic/artist.jpg
Binary file added public/imgs/pic/avatar.jpg
Binary file added public/imgs/pic/cover-2.jpg
Binary file added public/imgs/pic/cover.jpg
Binary file added public/imgs/pic/default.jpg
Binary file added public/imgs/pic/like.jpg
Binary file added public/imgs/pic/pl-1.jpg
Binary file added public/imgs/pic/pl-2.jpg
Binary file added public/imgs/pic/pl-3.jpg
Binary file added public/imgs/pic/pl-4.jpg
Binary file added public/imgs/pic/pointer.png
Binary file added public/imgs/pic/radar-private.jpg
Binary file added public/imgs/pic/radar-treasure.jpg
Binary file added public/imgs/pic/record.png
Binary file added public/imgs/pic/song.jpg
Binary file added public/imgs/pic/video.png
Binary file added public/imgs/pic/vip.png
File renamed without changes
Binary file renamed screenshots/SPlayer.jpg → screenshot/SPlayer.jpg
Binary file renamed screenshots/build.png → screenshot/build.png
6 changes: 3 additions & 3 deletions src/components/Cover/MainCover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
class="loading-img"
:src="
type === 'mv'
? '/images/pic/video.jpg?assest'
? '/imgs/pic/video.jpg?assest'
: type === 'artist'
? '/images/pic/artist.jpg?assest'
: '/images/pic/album.jpg?assest'
? '/imgs/pic/artist.jpg?assest'
: '/imgs/pic/album.jpg?assest'
"
alt="song"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Cover/SpecialCoverCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class: 'cover-img',
}"
class="cover-main-img"
fallback-src="/images/pic/default.jpg?assest"
fallback-src="/imgs/pic/default.jpg?assest"
preview-disabled
@load="
(e) => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Global/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ const changeUserPlaylists = (data) => {
},
},
[
h(NAvatar, { src: v?.coverSize?.s, fallbackSrc: "/images/pic/album.jpg?assest" }),
h(NAvatar, { src: v?.coverSize?.s, fallbackSrc: "/imgs/pic/album.jpg?assest" }),
h(NText, null, () => [v.name]),
],
)
Expand Down Expand Up @@ -333,7 +333,7 @@ const changeUserPlaylists = (data) => {
},
},
[
h(NAvatar, { src: v?.coverSize?.s, fallbackSrc: "/images/pic/album.jpg?assest" }),
h(NAvatar, { src: v?.coverSize?.s, fallbackSrc: "/imgs/pic/album.jpg?assest" }),
h(NText, null, () => [v.name]),
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/List/CommentList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/avatar.jpg?assest" alt="avatar" />
<img class="loading-img" src="/imgs/pic/avatar.jpg?assest" alt="avatar" />
</div>
</template>
</n-image>
Expand Down
2 changes: 1 addition & 1 deletion src/components/List/SongList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/song.jpg?assest" alt="song" />
<img class="loading-img" src="/imgs/pic/song.jpg?assest" alt="song" />
</div>
</template>
</n-image>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Modal/AddPlaylist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
>
<template #prefix>
<n-image
:src="item?.coverSize?.s || '/images/pic/album.jpg?assest'"
:src="item?.coverSize?.s || '/imgs/pic/album.jpg?assest'"
class="cover"
preview-disabled
lazy
Expand All @@ -44,7 +44,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/album.jpg?assest" alt="song" />
<img class="loading-img" src="/imgs/pic/album.jpg?assest" alt="song" />
</div>
</template>
</n-image>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/CloudSongMatch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/song.jpg?assest" alt="loading-img" />
<img class="loading-img" src="/imgs/pic/song.jpg?assest" alt="loading-img" />
</div>
</template>
</n-image>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
>
<div class="login-content">
<div class="title">
<img class="logo" src="/images/icons/favicon.png?asset" alt="logo" />
<img class="logo" src="/imgs/icons/favicon.png?asset" alt="logo" />
</div>
<!-- 登录方式 -->
<n-tabs class="login-tabs" default-value="login-qr" type="segment" animated>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/LoginQRCode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:class="['qr', qrStatusCode === 802 ? 'hidden' : null]"
:size="156"
:icon-size="30"
icon-src="/images/icons/favicon.png?asset"
icon-src="/imgs/icons/favicon.png?asset"
error-correction-level="H"
/>
<n-skeleton v-else class="qr" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Nav/MainNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<nav :class="{ 'main-nav': true, 'no-sider': !showSider }">
<div class="left">
<div :class="['logo', asideMenuCollapsed ? 'collapsed' : null]" @click="router.push('/')">
<!-- <n-avatar class="logo-img" src="/images/icons/favicon.png?asset" /> -->
<!-- <n-avatar class="logo-img" src="/imgs/icons/favicon.png?asset" /> -->
<n-icon class="logo-img" size="30">
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Nav/UserData.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<img
v-if="userLoginStatus && userData.detail?.profile?.vipType === 11"
class="vip"
src="/images/pic/vip.png?assest"
src="/imgs/pic/vip.png?assest"
/>
<n-icon depth="3" class="more">
<SvgIcon icon="menu-down" />
Expand Down
4 changes: 2 additions & 2 deletions src/components/Player/MainControl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/song.jpg?assest" alt="loading-img" />
<img class="loading-img" src="/imgs/pic/song.jpg?assest" alt="loading-img" />
</div>
</template>
</n-image>
Expand Down Expand Up @@ -670,7 +670,7 @@ watch(
justify-content: center;
border-radius: 50%;
animation: playerCoverRotate 18s linear infinite;
background: no-repeat url("/images/pic/record.png?assest") center;
background: no-repeat url("/imgs/pic/record.png?assest") center;
:deep(img) {
width: 40px;
height: 40px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Player/PlayerCover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img
v-if="playCoverType === 'record'"
:class="{ pointer: true, play: playState }"
src="/images/pic/pointer.png?assest"
src="/imgs/pic/pointer.png?assest"
alt="pointer"
/>
<!-- 专辑图片 -->
Expand All @@ -28,7 +28,7 @@
>
<template #placeholder>
<div class="cover-loading">
<img class="loading-img" src="/images/pic/song.jpg?assest" alt="loading-img" />
<img class="loading-img" src="/imgs/pic/song.jpg?assest" alt="loading-img" />
</div>
</template>
</n-image>
Expand Down
Loading

0 comments on commit 22e2653

Please sign in to comment.