Skip to content

feat: add shuffle mechanic to folder music #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nayrode wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add shuffle mechanic to folder music #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 45 additions & 13 deletions src/components/nav/Titles/Folder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@
</div>
<BreadCrumbNav @navigate="navigate" />
</div>
<DropDown
:items="items"
:current="current"
component_key="sortbar"
:reverse="folder.trackSortReverse"
@item-clicked="handleSortKeySet"
/>
<div class="controls">
<button class="randomize-btn" @click="handleRandomize" title="Randomize">
<ShuffleSvg />
</button>
<DropDown
:items="items"
:current="current"
component_key="sortbar"
:reverse="folder.trackSortReverse"
@item-clicked="handleSortKeySet"
/>
</div>
</div>
</template>

Expand All @@ -30,6 +35,7 @@ import { useRouter } from 'vue-router'
import { Routes } from '@/router'

import FolderSvg from '@/assets/icons/folder.svg'
import ShuffleSvg from '@/assets/icons/shuffle.svg'
import BreadCrumbNav from '@/components/FolderView/BreadCrumbNav.vue'
import DropDown from '@/components/shared/DropDown.vue'
import useFolder from '@/stores/pages/folder'
Expand Down Expand Up @@ -67,6 +73,11 @@ const handleSortKeySet = (item: SortItem) => {
folder.setFolderTrackSortKey(item.key)
}

const handleRandomize = () => {
folder.trackSortBy = 'random'
folder.fetchAll(folder.path, true)
}

const current = computed(() => {
return items.find(item => item.key === folder.trackSortBy) || items[0]
})
Expand All @@ -86,27 +97,48 @@ const current = computed(() => {
// overflow: hidden;
display: grid;
grid-template-columns: 1fr;
// gap: 1rem;
justify-content: space-between;
// width: 100%;
margin-right: 10rem; // sortbar width
// gap: 1rem;3rem; // controls width

@include allPhones {
display: grid;
padding-top: $medium;
padding-bottom: 1rem;

// INFO: Folder page sort bar overrides
.sortbar {
.controls {
top: $medium !important;
right: 1rem !important;
}
}

.sortbar {
.controls {
position: absolute;
top: 1rem;
right: 0;
display: flex;
align-items: center;
flex-direction: row;
gap: $small;
}

.randomize-btn {
width: 3rem;
aspect-ratio: 1;
display: flex;
align-items: center;
justify-content: center;
background-color: transparent;
outline: solid 1px $gray5;
border-radius: $small;
cursor: pointer;
transition: all 0.2s ease;

&:hover {
background-color: $gray5;
}
}

.sortbar {
width: 9rem;
}

Expand Down