Skip to content

Commit 374980b

Browse files
committed
refactor: prettier tailwindcss
1 parent 28c301e commit 374980b

41 files changed

Lines changed: 254 additions & 172 deletions

File tree

Some content is hidden

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

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"plugins": ["prettier-plugin-tailwindcss"],
23
"semi": false,
34
"trailingComma": "es5",
45
"printWidth": 120,

package-lock.json

Lines changed: 84 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@
188188
"postcss-normalize": "^13.0.1",
189189
"postcss-preset-env": "^10.1.3",
190190
"pre-commit": "^1.2.2",
191-
"prettier": "^3.5.0",
191+
"prettier": "^3.5.1",
192+
"prettier-plugin-tailwindcss": "^0.6.11",
192193
"pretty-quick": "^4.0.0",
193194
"purgecss-webpack-plugin": "^7.0.2",
194195
"react-refresh": "^0.16.0",

src/components/container/musicPlayer/Controls.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Controls = ({
1717
size={20}
1818
color={repeat ? 'red' : 'white'}
1919
onClick={() => setRepeat((prev) => !prev)}
20-
className="hidden sm:block cursor-pointer"
20+
className="hidden cursor-pointer sm:block"
2121
/>
2222
{currentSongs?.length > 0 && (
2323
<SkipBack size={20} color="#FFF" className="cursor-pointer" onClick={handlePrevSong} />
@@ -34,7 +34,7 @@ const Controls = ({
3434
size={20}
3535
color={shuffle ? 'red' : 'white'}
3636
onClick={() => setShuffle((prev) => !prev)}
37-
className="hidden sm:block cursor-pointer"
37+
className="hidden cursor-pointer sm:block"
3838
/>
3939
</div>
4040
)

src/components/container/musicPlayer/Seekbar.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ const Seekbar = ({ value, min, max, onInput, setSeekTime, appTime }) => {
55
const getTime = (time) => `${Math.floor(time / 60)}:${`0${Math.floor(time % 60)}`.slice(-2)}`
66

77
return (
8-
<div className="hidden sm:flex flex-row items-center">
8+
<div className="hidden flex-row items-center sm:flex">
99
<Rewind
1010
size={16}
1111
color="#FFF"
1212
onClick={() => setSeekTime(appTime - 5)}
13-
className="hidden lg:mr-1 lg:block text-white"
13+
className="hidden text-white lg:mr-1 lg:block"
1414
/>
15-
<span className="text-white mr-1">{value === 0 ? '0:00' : getTime(value)}</span>
15+
<span className="mr-1 text-white">{value === 0 ? '0:00' : getTime(value)}</span>
1616
<input
1717
type="range"
1818
step="any"
1919
value={value}
2020
min={min}
2121
max={max}
2222
onInput={onInput}
23-
className="md:block w-24 md:w-56 2xl:w-96 h-1 mx-4 2xl:mx-6 rounded-lg"
23+
className="mx-4 h-1 w-24 rounded-lg md:block md:w-56 2xl:mx-6 2xl:w-96"
2424
/>
25-
<span className="text-white mb-0">{max === 0 ? '0:00' : getTime(max)}</span>
25+
<span className="mb-0 text-white">{max === 0 ? '0:00' : getTime(max)}</span>
2626
<FastForward
2727
size={16}
2828
color="#FFF"
2929
onClick={() => setSeekTime(appTime + 5)}
30-
className="hidden lg:ml-1 lg:block text-white"
30+
className="hidden text-white lg:ml-1 lg:block"
3131
/>
3232
</div>
3333
)

src/components/container/musicPlayer/SongCard.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react'
22

33
const SongCard = ({ song }) => (
4-
<div className="flex flex-col w-[250px] p-4 bg-black bg-opacity-80 rounded-lg cursor-pointer">
5-
<div className="relative w-full h-56 group">
6-
<img alt="song_img" src={song.images?.coverart} className="w-full h-full rounded-lg" />
4+
<div className="bg-opacity-80 flex w-[250px] cursor-pointer flex-col rounded-lg bg-black p-4">
5+
<div className="group relative h-56 w-full">
6+
<img alt="song_img" src={song.images?.coverart} className="h-full w-full rounded-lg" />
77
</div>
88

99
<div className="mt-4 flex flex-col">
10-
<p className="font-semibold text-lg text-white truncate">{song.title}</p>
11-
<p className="text-sm truncate text-gray-300 mt-1">{song.subtitle}</p>
10+
<p className="truncate text-lg font-semibold text-white">{song.title}</p>
11+
<p className="mt-1 truncate text-sm text-gray-300">{song.subtitle}</p>
1212
</div>
1313
</div>
1414
)

src/components/container/musicPlayer/Track.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import React from 'react'
22
import wkylinPng from '@assets/images/wkylin.png'
33

44
const Track = ({ isPlaying, isActive, activeSong }) => (
5-
<div className="flex-1 flex items-center justify-start">
5+
<div className="flex flex-1 items-center justify-start">
66
<div
7-
className={`${isPlaying && isActive ? 'animate-[spin_3s_linear_infinite]' : ''} hidden sm:block h-16 w-16 mr-4`}
7+
className={`${isPlaying && isActive ? 'animate-[spin_3s_linear_infinite]' : ''} mr-4 hidden h-16 w-16 sm:block`}
88
>
99
<img src={activeSong?.images?.coverart ?? wkylinPng} alt="cover art" className="rounded-full" />
1010
</div>
1111
<div className="w-[50%]">
12-
<p className="truncate text-white font-bold text-lg">
12+
<p className="truncate text-lg font-bold text-white">
1313
{activeSong?.title ? activeSong?.title : 'No active Song'}
1414
</p>
1515
<p className="truncate text-gray-300">{activeSong?.subtitle ? activeSong?.subtitle : 'No active Song'}</p>

src/components/container/musicPlayer/VolumeBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const VolumeBar = ({ value, min, max, onChange, setVolume }) => (
1313
min={min}
1414
max={max}
1515
onChange={onChange}
16-
className="2xl:w-40 lg:w-32 md:w-32 h-1 ml-2"
16+
className="ml-2 h-1 md:w-32 lg:w-32 2xl:w-40"
1717
/>
1818
</div>
1919
)

src/components/container/musicPlayer/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ const MusicPlayer = () => {
3939
}
4040

4141
return (
42-
<div className="absolute h-28 bottom-0 left-0 right-0 flex animate-slideup bg-linear-to-br from-white/10 to-[#2a2a80] backdrop-blur-lg z-10">
43-
<div className="relative flex items-center justify-between w-full px-8 sm:px-12">
42+
<div className="animate-slideup absolute right-0 bottom-0 left-0 z-10 flex h-28 bg-linear-to-br from-white/10 to-[#2a2a80] backdrop-blur-lg">
43+
<div className="relative flex w-full items-center justify-between px-8 sm:px-12">
4444
<Track isPlaying={isPlaying} isActive={isActive} activeSong={activeSong} />
45-
<div className="flex flex-col items-center justify-center flex-1">
45+
<div className="flex flex-1 flex-col items-center justify-center">
4646
<Controls
4747
isPlaying={isPlaying}
4848
isActive={isActive}

src/components/stateless/AdvancedCodeBlock/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ const AdvancedCodeBlock = ({ code, fileName, lang = 'typescript', theme = 'githu
77
return (
88
<figure
99
className={clsx(
10-
'-mt-1 relative flex w-full flex-col flex-wrap rounded-2xl bg-neutral-200/70 text-white leading-6 dark:bg-[rgb(33,33,38)]',
10+
'relative -mt-1 flex w-full flex-col flex-wrap rounded-2xl bg-neutral-200/70 leading-6 text-white dark:bg-[rgb(33,33,38)]',
1111
className
1212
)}
1313
{...props}
1414
>
1515
<div className="flex items-center justify-between px-5 py-3">
16-
<figcaption className="mr-[-48px] max-w-full whitespace-nowrap font-medium text-neutral-600 text-xs dark:text-neutral-200">
16+
<figcaption className="mr-[-48px] max-w-full text-xs font-medium whitespace-nowrap text-neutral-600 dark:text-neutral-200">
1717
<span>{fileName ?? <br />}</span>
1818
</figcaption>
1919
<CopyToClipboard code={code} />

0 commit comments

Comments
 (0)