Skip to content

Commit 557d78e

Browse files
authored
core: Upgrade Font Awesome and refactor components (#28)
1 parent 0c0d5b1 commit 557d78e

File tree

20 files changed

+43
-61
lines changed

20 files changed

+43
-61
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"@electron-toolkit/preload": "^3.0.2",
2424
"@electron-toolkit/utils": "^4.0.0",
25-
"@fortawesome/fontawesome-free": "^6.7.2",
25+
"@fortawesome/fontawesome-free": "^7.0.1",
2626
"@sveltejs/kit": "^2.27.0",
2727
"@xhayper/discord-rpc": "^1.3.0",
2828
"cli-linux-x64": "^1.1.4",

pnpm-lock.yaml

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

resources/tidal.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

resources/tidalWhite.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/renderer/src/components/miniplayer/Miniplayer.svelte

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,17 @@
263263
}
264264
</script>
265265

266-
<div class="miniplayer-container" on:dblclick={miniplayerDoubleClickHandler}>
266+
<div class="miniplayer-container" ondblclick={miniplayerDoubleClickHandler}>
267267
<!-- Auxiliary icons (more, fullscreen, volume, like) -->
268268

269269
<div
270270
class="miniplayer-player-icon-container miniplayer-player-volume-container"
271271
>
272-
<i class="miniplayer-icon fa-solid {volumeIcon}" on:mousedown={onClickOnVolumeIcon} />
272+
<i class="miniplayer-icon fa-solid {volumeIcon}" onmousedown={onClickOnVolumeIcon} />
273273
<div class="miniplayer-volume-bar-container" id="volume-container">
274274
<div
275275
class="miniplayer-volume-bar-container-inner"
276-
on:mousedown={onClickOnVolumeBar}
276+
onmousedown={onClickOnVolumeBar}
277277
>
278278
<div class="miniplayer-volume-bar-container-inner-2">
279279
<div
@@ -292,7 +292,7 @@
292292
<div
293293
class="miniplayer-player-icon-container miniplayer-player-fullscreen-container"
294294
style="transform:scale(92%) translateY(-7%)"
295-
on:click={toggleFullscreen}
295+
onclick={toggleFullscreen}
296296
>
297297
<i
298298
class="miniplayer-icon fa-solid fa{fullscreen
@@ -309,7 +309,7 @@
309309

310310
<div
311311
class="miniplayer-player-icon-container miniplayer-player-more-container"
312-
on:click={openMenu}
312+
onclick={openMenu}
313313
>
314314
<i
315315
class="miniplayer-icon fa-solid fa-angles-{fullscreen
@@ -333,7 +333,7 @@
333333

334334
<div
335335
class="miniplayer-player-icon-container miniplayer-player-clear-mode-container"
336-
on:click={setViewClear}
336+
onclick={setViewClear}
337337
style="opacity: {fullscreen ? '1' : '0'}; visibility: {fullscreen
338338
? 'visible'
339339
: 'hidden'};"
@@ -343,7 +343,7 @@
343343

344344
<div
345345
class="miniplayer-player-icon-container miniplayer-player-lyrics-mode-container"
346-
on:click={setViewLyrics}
346+
onclick={setViewLyrics}
347347
style="opacity: {fullscreen ? '1' : '0'}; visibility: {fullscreen
348348
? 'visible'
349349
: 'hidden'};"
@@ -423,7 +423,7 @@
423423
></div>
424424
</div>
425425
<div class="miniplayer-nav-container">
426-
<div class="miniplayer-icon-container" on:click={playPrevious}>
426+
<div class="miniplayer-icon-container" onclick={playPrevious}>
427427
<i class="miniplayer-icon fa-solid fa-backward-step"></i>
428428
</div>
429429
<div class="miniplayer-icon-container">
@@ -436,7 +436,7 @@
436436
: resumePlayback}
437437
/>
438438
</div>
439-
<div class="miniplayer-icon-container" on:click={playNext}>
439+
<div class="miniplayer-icon-container" onclick={playNext}>
440440
<i class="miniplayer-icon fa-solid fa-forward-step"></i>
441441
</div>
442442
</div>

src/renderer/src/components/miniplayer/parts/PausePlay.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div
66
class="miniplayer-play-pause-container"
7-
on:click={callback}
7+
onclick={callback}
88
>
99
<i class="miniplayer-play-pause-icon {icon}"></i>
1010
</div>

src/renderer/src/components/side/Button.svelte

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,10 @@
88
}
99
</script>
1010

11-
<a class="button-container {active ? 'button-container-active' : ''}" on:click="{changePage}" href="#">
11+
<a class="button-container {active ? 'button-container-active' : ''}" onclick="{changePage}" href="#">
1212

1313
<div class="button-icon-container">
14-
{#if icon != "tidal" }
1514
<i class="button-icon {icon}"></i>
16-
{/if}
17-
{#if icon == "tidal" }
18-
<img class="button-icon" style="width: 1.3rem; transform: translateX(-45%) translateY(-50%);" src="../../resources/tidal.svg?asset"/>
19-
{/if}
2015
</div>
2116
<p class="button-text {active ? 'button-text-active' : ''}">{text}</p>
2217
</a>

src/renderer/src/components/side/Panel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
active={currentPage.page == "/mpd" ? true : false}
5858
/>
5959
<Button
60-
icon="tidal"
60+
icon="fa-brands fa-tidal"
6161
text="Tidal"
6262
href="/tidal"
6363
active={currentPage.page.indexOf('/tidal') == 0 ? true : false}

src/renderer/src/components/view/pages/Home.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
It's meant to be <i>simple</i>, so don't expect crazy features. It has all you need from
1919
a modern music player, and nothing more.<br/><br/>
2020
If you want to help with the development, <span class="vermilion-grad">Vermilion</span> is made in Electron and Svelte. See
21-
<a target="_blank" class="home-link" href="" on:click={openRepo}>the repo</a>.
21+
<a target="_blank" class="home-link" href="" onclick={openRepo}>the repo</a>.
2222
<br/><br/>
2323
The name <span class="vermilion-grad">Vermilion</span> comes from the same word, defined as a vivid red to reddish-orange color.
2424
</p>

src/renderer/src/components/view/pages/minicontainers/AlbumIcon.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
</script>
2222

23-
<div class="album-icon-container" on:click={goToAlbum}>
23+
<div class="album-icon-container" onclick={goToAlbum}>
2424
{#if iconURL != ""}
2525
<img class="album-icon-image" src={iconURL} />
2626
{:else}

0 commit comments

Comments
 (0)