Skip to content

Commit 54dc27b

Browse files
committed
fix: fix style
1 parent 7a70b56 commit 54dc27b

File tree

14 files changed

+32
-34
lines changed

14 files changed

+32
-34
lines changed

docs/FETCH_REQUESTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ const UserProfile = ({ id }) => {
140140
const [user, loading, error, refresh] = useGet('/api/user', { id })
141141

142142
if (loading) return <Spin />
143-
if (error) return <Alert message={error.message} />
143+
if (error) return <Alert title={error.message} />
144144

145145
return (
146146
<div>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@
387387
"user-agents": "^1.1.669"
388388
},
389389
"engines": {
390-
"node": ">=20.12.1",
391-
"npm": ">=10.5.0",
390+
"node": ">=22.21.0",
391+
"npm": ">=11.6.3",
392392
"yarn": ">=1.22.10"
393393
},
394394
"packageManager": "[email protected]",
525 KB
Loading
649 KB
Loading
500 KB
Loading
525 KB
Loading

src/components/stateless/FixMusicPlayer/Track.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
2-
import wkylinPng from '@assets/images/wkylin.png'
2+
import defaultPng from '@assets/images/music/music00.png'
33

44
const Track = ({ isPlaying, isActive, activeSong, textColor, secondaryTextColor }) => {
5-
const coverArt = activeSong?.coverart ?? wkylinPng
5+
const coverArt = activeSong?.coverart ?? defaultPng
66
const title = activeSong?.title ?? 'No active Song'
77
const subtitle = activeSong?.subtitle ?? 'No active Song'
88

src/components/stateless/FixMusicPlayer/data/songs.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
import heartyAudio from '@assets/audio/hearty.mp3'
22
import longnightAudio from '@assets/audio/longnight.mp3'
33
import yesterdayAudio from '@assets/audio/yesterday.mp3'
4-
import heImage from '@assets/images/he.png'
5-
import springImage from '@assets/images/song.png'
6-
import xueImage from '@assets/images/xue.png'
4+
import music01Png from '@assets/images/music/music01.png'
5+
import music02Png from '@assets/images/music/music02.png'
6+
import music03Png from '@assets/images/music/music03.png'
77

88
export const songData = [
99
{
1010
key: 'song-1',
1111
title: 'Hearty',
1212
subtitle: 'Aventure - Hearty',
13-
coverart: heImage,
13+
coverart: music01Png,
1414
audioUrl: heartyAudio,
1515
},
1616
{
1717
key: 'song-2',
1818
title: 'Long Night',
1919
subtitle: 'Bohdan Hlukhov - Long Night',
20-
coverart: springImage,
20+
coverart: music02Png,
2121
audioUrl: longnightAudio,
2222
},
2323
{
2424
key: 'song-3',
2525
title: 'Yesterday',
2626
subtitle: 'Aventure - Yesterday',
27-
coverart: xueImage,
27+
coverart: music03Png,
2828
audioUrl: yesterdayAudio,
2929
},
3030
]

src/components/stateless/FixMusicPlayer/index.jsx

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,21 @@ const MusicPlayer = () => {
6666
const activeColor = themeSettings.colorPrimary || '#1677ff'
6767

6868
return (
69-
<>
70-
<div className={`animate-slideup absolute right-0 bottom-0 left-0 z-10 flex h-20 sm:h-28 ${bgClass}`}>
69+
<div className="flex h-full flex-col">
70+
<div className="flex-1">
71+
<Playlist
72+
songs={currentSongs}
73+
currentIndex={currentIndex}
74+
isPlaying={isPlaying}
75+
isActive={isActive}
76+
onSongClick={handleSongClick}
77+
themeMode={themeSettings.themeMode}
78+
textColor={textColor}
79+
secondaryTextColor={secondaryTextColor}
80+
activeColor={activeColor}
81+
/>
82+
</div>
83+
<div className={`animate-slideup sticky right-0 bottom-0 left-0 z-10 mt-auto flex h-20 sm:h-28 ${bgClass}`}>
7184
<div className="relative flex w-full items-center justify-between px-4 sm:px-8 md:px-12">
7285
<Track
7386
isPlaying={isPlaying}
@@ -123,18 +136,7 @@ const MusicPlayer = () => {
123136
/>
124137
</div>
125138
</div>
126-
<Playlist
127-
songs={currentSongs}
128-
currentIndex={currentIndex}
129-
isPlaying={isPlaying}
130-
isActive={isActive}
131-
onSongClick={handleSongClick}
132-
themeMode={themeSettings.themeMode}
133-
textColor={textColor}
134-
secondaryTextColor={secondaryTextColor}
135-
activeColor={activeColor}
136-
/>
137-
</>
139+
</div>
138140
)
139141
}
140142

src/components/stateless/FixTabPanel/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const FixTabPanel = React.forwardRef(({ style, children, className, ...rest }, r
3030
}}
3131
>
3232
{children}
33-
<FloatButton.BackTop target={() => innerRef.current} style={{ right: 20, bottom: 10 }}>
33+
<FloatButton.BackTop target={() => innerRef.current} style={{ right: 6, bottom: 2 }}>
3434
<VerticalAlignTopOutlined style={{ fontSize: 20 }} />
3535
</FloatButton.BackTop>
3636
</div>

0 commit comments

Comments
 (0)