Skip to content

Replace carousel pagination with custom buttons #241

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

Merged
devmount merged 1 commit into from
Mar 17, 2025
Merged

Replace carousel pagination with custom buttons #241

Show file tree
Hide file tree
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
19 changes: 0 additions & 19 deletions frontend/src/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,3 @@ kbd > * {
.dp__calendar_header_item {
@apply h-10 w-auto !rounded-sm
}

/* carousel */
.carousel__pagination-button {
@apply w-full h-0.5 !p-0 bg-blade-300 dark:bg-blade-700
}
.carousel__pagination-item {
width: 100%;
}
@media (min-width: 768px) {
.carousel__pagination-button {
@apply w-6 h-6 rounded-full
}
}
.carousel__pagination-button::after {
@apply !hidden
}
.carousel__pagination-button--active {
@apply !bg-spring-600
}
2 changes: 1 addition & 1 deletion frontend/src/elements/PrimaryButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button
class="
text-white py-2 px-3 rounded-sm shadow-m flex justify-center items-center gap-2
hover:bg-opacity-80 hover:shadow-l disabled:opacity-30 disabled:shadow-none hover:disabled:bg-opacity-100
hover:!bg-opacity-80 hover:shadow-l disabled:opacity-30 disabled:shadow-none hover:disabled:bg-opacity-100
"
:class="{
'bg-spring-600 dark:bg-spring-700': !type,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/elements/SecondaryButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button
class="
py-2 px-3 rounded-sm shadow-md flex justify-center items-center gap-2
hover:bg-opacity-80 hover:shadow-l disabled:opacity-30 disabled:shadow-none hover:disabled:bg-opacity-100
hover:!bg-opacity-80 hover:shadow-l disabled:opacity-30 disabled:shadow-none hover:disabled:bg-opacity-100
"
:class="{
'bg-blade-400 text-white dark:bg-blade-700': !type,
Expand Down
57 changes: 38 additions & 19 deletions frontend/src/modals/SetlistPresent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,30 @@
ref="songContentRef"
/>
</slide>
<template #addons>
<pagination class="hidden md:flex z-50 bottom-0 !m-0 left-0 translate-x-0 gap-2" />
</template>
</carousel>
</div>
<!-- toolbar -->

<!-- Toolbar -->
<div
class="group fixed z-40 bottom-2 right-2 w-full flex justify-end items-center gap-1 transition-opacity"
:class="{ 'opacity-0 hover:opacity-100': !chords }"
>
<!-- back navigation -->
<!-- Pagination -->
<div class="hidden md:flex mr-auto ml-6 gap-2">
<secondary-button
v-for="(song, i) in songs"
:key="i"
class="w-8 h-8 !rounded-full"
:class="{
'!bg-spring-600': i === presentation?.data.currentSlide
}"
@click="presentation.slideTo(i)"
>
<span v-if="chords">{{ song.customTuning }}</span>
</secondary-button>
</div>

<!-- Back navigation -->
<secondary-button
class="absolute bottom-0 left-4 md:left-auto md:right-1/2 flex items-center gap-1 mr-0.5"
:disabled="currentPosition <= 0"
Expand All @@ -48,12 +61,13 @@
<div class="hidden 2xl:block max-w-3xs truncate">
{{ songs[currentPosition-1].title }}
</div>
<div class="text-lg leading-4 font-mono font-bold text-spring-600 dark:text-spring-400">
<div v-if="chords" class="text-lg leading-4 font-mono font-bold text-spring-600 dark:text-spring-400">
{{ songs[currentPosition-1].customTuning }}
</div>
</div>
</secondary-button>
<!-- forward navigation -->

<!-- Forward navigation -->
<secondary-button
class="absolute bottom-0 left-16 md:left-1/2 flex items-center gap-1 ml-0.5"
:disabled="currentPosition >= songs.length-1"
Expand All @@ -64,15 +78,17 @@
<div class="hidden 2xl:block max-w-3xs truncate">
{{ songs[currentPosition+1].title }}
</div>
<div class="text-lg leading-4 font-mono font-bold text-spring-600 dark:text-spring-400">
<div v-if="chords" class="text-lg leading-4 font-mono font-bold text-spring-600 dark:text-spring-400">
{{ songs[currentPosition+1].customTuning }}
</div>
</div>
<icon-arrow-right class="w-5 h-5 stroke-1.5" />
</secondary-button>
<!-- live clock -->

<!-- Live clock -->
<div class="font-mono text-2xl px-4">{{ timeonly }}</div>
<!-- song info -->

<!-- Song info -->
<secondary-button
class="hidden lg:block"
:disabled="!songs[currentPosition]?.note"
Expand All @@ -81,7 +97,7 @@
>
<icon-info-circle class="w-5 h-5 stroke-1.5" :class="{ 'stroke-spring-400': showModal.infosongdata }" />
</secondary-button>
<!-- toggle synchronisation -->
<!-- Toggle synchronisation -->
<secondary-button
class="hidden lg:block"
:title="tooltip('sync')"
Expand All @@ -90,7 +106,7 @@
<icon-refresh v-if="autoSync" class="w-5 h-5 stroke-1.5 stroke-spring-400" />
<icon-refresh-off v-else class="w-5 h-5 stroke-1.5" />
</secondary-button>
<!-- toggle content visibility -->
<!-- Toggle content visibility -->
<secondary-button
class="hidden lg:block"
:title="tooltip('display')"
Expand All @@ -99,15 +115,15 @@
<icon-eye v-if="!hide" class="w-5 h-5 stroke-1.5 stroke-spring-400" />
<icon-eye-off v-else class="w-5 h-5 stroke-1.5" />
</secondary-button>
<!-- toggle theme -->
<!-- Toggle theme -->
<secondary-button
class="hidden lg:block"
:title="tooltip('invert')"
@click="dark = !dark"
>
<icon-brightness class="w-5 h-5 stroke-1.5" :class="{ 'stroke-spring-400': !dark }" />
</secondary-button>
<!-- toggle chords -->
<!-- Toggle chords -->
<secondary-button
class="hidden lg:block"
:title="tooltip('chords')"
Expand All @@ -116,7 +132,8 @@
<icon-music v-if="chords" class="w-5 h-5 stroke-1.5 stroke-spring-400" />
<icon-music-off v-else class="w-5 h-5 stroke-1.5" />
</secondary-button>
<!-- dropdown for small viewports -->

<!-- Dropdown for small viewports -->
<div class="lg:hidden">
<dropdown position="up">
<button
Expand Down Expand Up @@ -164,15 +181,16 @@
</button>
</dropdown>
</div>
<!-- exit presentation -->
<!-- Exit presentation -->
<button
class="p-2 text-blade-500"
:title="tooltip('close')"
@click="emit('closed')"
>
<icon-x class="w-5 h-5 stroke-1.5" />
</button>
<!-- remote toolbar -->

<!-- Remote toolbar -->
<div
v-if="sync && !autoSync"
class="flex items-center gap-1 p-1 absolute -top-8 right-10 opacity-0 transition-all group-hover:-top-12 group-hover:opacity-100"
Expand Down Expand Up @@ -202,7 +220,8 @@
</div>
</div>
</modal>
<!-- modal: info song note -->

<!-- Modal: info song note -->
<info-song-data
:active="showModal.infosongdata"
:song="songs[currentPosition]"
Expand All @@ -212,7 +231,7 @@

<script setup>
import 'vue3-carousel/dist/carousel.css';
import { Carousel, Slide, Pagination } from 'vue3-carousel';
import { Carousel, Slide } from 'vue3-carousel';
import { logicOr } from '@vueuse/math';
import { whenever } from '@vueuse/core';
import { reactive, ref, computed, watch, onMounted, onUnmounted, nextTick, inject } from 'vue';
Expand Down
Loading