mirror of
https://github.com/Dvorinka/swingmusic-extended.git
synced 2026-06-04 12:33:03 +00:00
fix app grid layout issues
+ fully move now playing to bottom bar + add hover state to playlist card + handle playing tracks from queue page
This commit is contained in:
geoffrey45
committed by
Mungai Njoroge
Mungai Njoroge
parent
0dbc45e20b
commit
20151afcf5
@@ -27,7 +27,7 @@ const q = useQStore();
|
||||
<style lang="scss">
|
||||
.hotkeys {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 2rem);
|
||||
grid-template-columns: 2rem 4rem 2rem;
|
||||
gap: 1rem;
|
||||
width: 100%;
|
||||
|
||||
|
||||
@@ -1,39 +1,21 @@
|
||||
<template>
|
||||
<div class="sidebar-songcard">
|
||||
<div class="art">
|
||||
<router-link
|
||||
:to="{
|
||||
name: 'AlbumView',
|
||||
params: {
|
||||
hash: track?.albumhash ? track.albumhash : ' ',
|
||||
},
|
||||
}"
|
||||
>
|
||||
<img
|
||||
:src="imguri + track?.image"
|
||||
alt=""
|
||||
class="l-image rounded force-lm"
|
||||
/>
|
||||
</router-link>
|
||||
<div id="bitrate" v-if="track?.bitrate">
|
||||
{{ track.filetype }}• {{ track.bitrate }}
|
||||
</div>
|
||||
<div class="heart rounded-sm" @click="heartClicked = !heartClicked">
|
||||
<HeartSvg v-if="!heartClicked" />
|
||||
<HeartFilledSvg v-else />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bottom">
|
||||
<div class="title ellip t-center" v-tooltip>
|
||||
{{ track?.title || "♥ Hello ♥" }}
|
||||
</div>
|
||||
<ArtistName
|
||||
:artists="track?.artist || []"
|
||||
:albumartist="track?.albumartist || 'Play something'"
|
||||
:small="true"
|
||||
class="artists"
|
||||
<router-link
|
||||
:to="{
|
||||
name: 'AlbumView',
|
||||
params: {
|
||||
hash: track?.albumhash ? track.albumhash : ' ',
|
||||
},
|
||||
}"
|
||||
>
|
||||
<img
|
||||
:src="imguri + track?.image"
|
||||
alt=""
|
||||
class="l-image rounded force-lm"
|
||||
/>
|
||||
</router-link>
|
||||
<div id="bitrate" v-if="track?.bitrate" title="file type • bitrate">
|
||||
{{ track.filetype }} • {{ track.bitrate }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -43,78 +25,37 @@ import { ref } from "vue";
|
||||
|
||||
import { paths } from "@/config";
|
||||
import { Track } from "@/interfaces";
|
||||
import ArtistName from "@/components/shared/ArtistName.vue";
|
||||
|
||||
import HeartSvg from "@/assets/icons/heart.svg";
|
||||
import HeartFilledSvg from "@/assets/icons/heart.fill.svg";
|
||||
|
||||
defineProps<{
|
||||
track: Track | null;
|
||||
}>();
|
||||
|
||||
const heartClicked = ref<boolean>(false);
|
||||
|
||||
const imguri = paths.images.thumb.large;
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.sidebar-songcard {
|
||||
.art {
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
place-items: center;
|
||||
margin-bottom: $small;
|
||||
position: relative;
|
||||
|
||||
.heart {
|
||||
position: absolute;
|
||||
bottom: -$smaller;
|
||||
right: 0;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: $smaller;
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
cursor: pointer;
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
#bitrate {
|
||||
position: absolute;
|
||||
font-size: 0.75rem;
|
||||
width: max-content;
|
||||
padding: 0.2rem 0.35rem;
|
||||
bottom: $smaller;
|
||||
left: 0;
|
||||
background-color: $gray4;
|
||||
border-radius: $smaller;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {
|
||||
display: grid;
|
||||
gap: $smaller;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-weight: 900;
|
||||
margin: 0 auto;
|
||||
}
|
||||
width: 100%;
|
||||
position: relative;
|
||||
|
||||
.artists {
|
||||
opacity: 0.5;
|
||||
margin: 0 auto;
|
||||
img {
|
||||
cursor: pointer;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
text-decoration: underline 1px !important;
|
||||
}
|
||||
#bitrate {
|
||||
position: absolute;
|
||||
font-size: 0.75rem;
|
||||
width: max-content;
|
||||
padding: 0.2rem 0.35rem;
|
||||
bottom: $medium;
|
||||
left: $small;
|
||||
background-color: $gray4;
|
||||
border-radius: $smaller;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -11,7 +11,12 @@
|
||||
separator: menu.separator,
|
||||
}"
|
||||
></div>
|
||||
<div class="nav-button" id="home-button" v-else>
|
||||
<div
|
||||
class="nav-button"
|
||||
:class="{ active: $route.name === menu.route_name }"
|
||||
id="home-button"
|
||||
v-else
|
||||
>
|
||||
<div class="in">
|
||||
<component :is="menu.icon"></component>
|
||||
<span>{{ menu.name }}</span>
|
||||
@@ -69,16 +74,27 @@ const menus = [
|
||||
.side-nav-container {
|
||||
text-transform: capitalize;
|
||||
margin-top: 1rem;
|
||||
// background-color: rgba(255, 255, 255, 0.075);
|
||||
// padding: $small;
|
||||
|
||||
.nav-button {
|
||||
border-radius: $small;
|
||||
border-radius: $medium;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: flex-start;
|
||||
padding: $small 0;
|
||||
position: relative;
|
||||
|
||||
&.active::before {
|
||||
content: "•";
|
||||
position: absolute;
|
||||
left: -$small;
|
||||
top: $medium;
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: $gray3;
|
||||
background-color: $darkestblue;
|
||||
}
|
||||
|
||||
.in {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="l-sidebar noscroll">
|
||||
<div class="l-sidebar noscroll border">
|
||||
<div class="withlogo">
|
||||
<Logo />
|
||||
<Navigation />
|
||||
|
||||
@@ -1,67 +1,17 @@
|
||||
<template>
|
||||
<div class="now-playing-card t-center rounded">
|
||||
<SongCard :track="queue.currenttrack" />
|
||||
<div class="l-track-time">
|
||||
<span class="rounded">{{ formatSeconds(duration.current) }}</span>
|
||||
<!-- <HeartSvg /> -->
|
||||
<span class="rounded">{{ formatSeconds(duration.full) }}</span>
|
||||
</div>
|
||||
<Progress />
|
||||
<HotKeys />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import useQStore from "../../stores/queue";
|
||||
import { formatSeconds } from "@/utils";
|
||||
|
||||
import HotKeys from "./NP/HotKeys.vue";
|
||||
import Progress from "./NP/Progress.vue";
|
||||
import SongCard from "./NP/SongCard.vue";
|
||||
|
||||
const queue = useQStore();
|
||||
const { duration } = queue;
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.now-playing-card {
|
||||
padding: 1rem;
|
||||
width: 100%;
|
||||
display: grid;
|
||||
grid-template-rows: 1fr max-content max-content max-content;
|
||||
gap: 1rem;
|
||||
|
||||
.l-track-time {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
opacity: 0.8;
|
||||
|
||||
span {
|
||||
font-size: small;
|
||||
padding: $smaller;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
::-moz-range-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
|
||||
::-webkit-slider-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
|
||||
::-ms-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
}
|
||||
|
||||
.context_on {
|
||||
background-color: $accent;
|
||||
}
|
||||
|
||||
.menu {
|
||||
right: $small;
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -38,7 +38,7 @@ const props = defineProps<{
|
||||
|
||||
&:hover {
|
||||
transition: all .25s ease;
|
||||
background-color: $darkestblue;
|
||||
background-color: $gray3;
|
||||
background-blend-mode: screen;
|
||||
}
|
||||
|
||||
|
||||
@@ -35,21 +35,16 @@ const settings = useSettingsStore();
|
||||
<style lang="scss">
|
||||
.r-sidebar {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
// padding: $small;
|
||||
display: grid;
|
||||
grid-template-rows: max-content 1fr;
|
||||
// gap: 1rem;
|
||||
margin-top: -$small;
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
background-color: rgb(22, 22, 22);
|
||||
padding-bottom: 1rem;
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
|
||||
.gsearch-input {
|
||||
height: 42px;
|
||||
margin: $small;
|
||||
margin-bottom: 1rem;
|
||||
height: 2.5rem;
|
||||
margin: 1rem;
|
||||
}
|
||||
|
||||
.r-content {
|
||||
|
||||
@@ -74,7 +74,7 @@ import HotKeys from "../LeftSidebar/NP/HotKeys.vue";
|
||||
import Progress from "../LeftSidebar/NP/Progress.vue";
|
||||
|
||||
import HeartSvg from "../../assets/icons/heart.svg";
|
||||
import PlusSvg from "../../assets/icons/plus.svg";
|
||||
// import PlusSvg from "../../assets/icons/plus.svg";
|
||||
|
||||
const queue = useQStore();
|
||||
const settings = useSettingsStore();
|
||||
@@ -82,13 +82,28 @@ const settings = useSettingsStore();
|
||||
|
||||
<style lang="scss">
|
||||
.b-bar {
|
||||
height: 65px;
|
||||
// height: 100%;
|
||||
background-color: rgb(22, 22, 22);
|
||||
display: grid;
|
||||
align-items: center;
|
||||
z-index: 1;
|
||||
border-top: solid 1px $gray3;
|
||||
|
||||
|
||||
&:hover {
|
||||
::-moz-range-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
|
||||
::-webkit-slider-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
|
||||
::-ms-thumb {
|
||||
height: 0.8rem;
|
||||
}
|
||||
}
|
||||
|
||||
.centered {
|
||||
width: 50rem;
|
||||
display: grid;
|
||||
@@ -181,7 +196,6 @@ const settings = useSettingsStore();
|
||||
}
|
||||
|
||||
.buttons {
|
||||
// width: 10rem;
|
||||
height: 3.25rem;
|
||||
margin-top: -$smaller;
|
||||
background-color: rgba(255, 255, 255, 0.048);
|
||||
|
||||
@@ -124,7 +124,7 @@ function showMenu(e: Event) {
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: $gray4;
|
||||
background-color: $gray5;
|
||||
|
||||
.index {
|
||||
.text {
|
||||
|
||||
Reference in New Issue
Block a user