Skip to content
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

style: clean up slider and carousel #4261

Merged
merged 11 commits into from
Jul 24, 2024
Merged

style: clean up slider and carousel #4261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30f1218
rm useless classes
shawnyama Jul 24, 2024
e82f843
use actual button instead of icon
shawnyama Jul 24, 2024
79fe07a
resolve conflicts
shawnyama Jul 24, 2024
376c0c3
chore: lint and format client codebase
github-actions[bot] Jul 24, 2024
a04d35c
more clean up
shawnyama Jul 24, 2024
9d2fd21
tab class
shawnyama Jul 24, 2024
71c4195
Merge branch 'carousel-cleanup' of https://github.com/DARPA-ASKEM/ter…
shawnyama Jul 24, 2024
eac72ef
just write a fixme for the carousel
shawnyama Jul 24, 2024
3b8033c
rm icon classes
shawnyama Jul 24, 2024
385e864
chore: lint and format client codebase
github-actions[bot] Jul 24, 2024
0c71129
Merge branch 'main' into carousel-cleanup
shawnyama Jul 24, 2024
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
52 changes: 23 additions & 29 deletions packages/client/hmi-client/src/components/widgets/tera-carousel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,30 @@
<li v-if="isNumeric && itemCount > 5">(+{{ itemCount }})</li>
</ul>
</nav>
<!-- FIXME: If we are going to use this consider making the chevron navigations work (they should positioned properly)
shawnyama marked this conversation as resolved.
Show resolved Hide resolved
<Button
v-if="itemCount > 1"
text
severity="secondary"
icon="pi pi-chevron-left"
@click="move(currentPage - 1)"
class="carousel-chevron go-back"
@click.stop="move(currentPage - 1)"
class="back"
/>
<Button
v-if="itemCount > 1"
text
severity="secondary"
icon="pi pi-chevron-right"
@click="move(currentPage + 1)"
class="carousel-chevron go-forward"
/>
@click.stop="move(currentPage + 1)"
class="forward"
/> -->
</figure>
</template>

<script setup lang="ts">
import { isEmpty } from 'lodash';
import { ref, onMounted, useSlots } from 'vue';
import Button from 'primevue/button';
// import Button from 'primevue/button';

defineProps({
height: {
Expand Down Expand Up @@ -89,6 +90,7 @@ figure {
display: flex;
flex-direction: column;
justify-content: space-between;
position: relative;
}

.content {
Expand Down Expand Up @@ -183,30 +185,22 @@ nav {
}
}

/* May be potentially used later */
& .pi-arrow-left,
& .pi-arrow-right {
border-radius: 24px;
font-size: 10px;
/* Part of above FIXME
&.p-button {
position: absolute;
top: 1.25rem;
opacity: 0;
height: 5rem;
&:hover {
opacity: 0.5;
}
}
}

.carousel-chevron {
opacity: 0;
height: 5rem;
}
.carousel-chevron:hover {
opacity: 0.5;
}
.go-back {
position: absolute;
top: 1.25rem;
left: 8px;
}

.go-forward {
position: absolute;
top: 1.25rem;
right: 8px;
&.back {
left: 8px;
}
&.forward {
right: 8px;
}*/
}
</style>
111 changes: 43 additions & 68 deletions packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue
View file
Open in desktop
shawnyama marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
<template>
<tera-slider :content-width="contentWidth" :tab-width="tabWidth" :direction="direction" :is-open="isOpen">
<template v-slot:content>
<aside class="panel-container" @scroll="onScroll">
<header class="slider-header content sticky" :class="{ 'header-shadow': isScrolled }">
<i
:class="`slider-header-item pi ${directionMap[direction].iconOpen}`"
<aside @scroll="onScroll">
<header :class="{ shadow: isScrolled }">
<Button
:icon="`pi ${directionMap[direction].iconOpen}`"
@click="emit('update:isOpen', false)"
text
rounded
size="large"
/>
<slot name="header"></slot>
<section>
<h4 class="slider-header-item">{{ header }}</h4>
<slot name="subHeader"></slot>
</section>
<h4>{{ header }}</h4>
</header>
<slot name="content"></slot>
<slot name="content" />
</aside>
</template>
<template v-slot:tab>
<div :class="`slider-tab-header ${direction}`">
<i
:class="`slider-header-item pi ${directionMap[direction].iconClosed}`"
<header :class="`tab ${direction}`">
<Button
:icon="`pi ${directionMap[direction].iconClosed}`"
@click="emit('update:isOpen', true)"
text
rounded
size="large"
/>
<h5 class="slider-header-item">{{ header }}</h5>
<Badge v-if="indicatorValue" :value="indicatorValue" class="selected-resources-count" />
</div>
<slot name="tab"></slot>
<h5>{{ header }}</h5>
<Badge v-if="indicatorValue" :value="indicatorValue" />
</header>
<slot name="tab" />
</template>
<template v-if="$slots.footerButtons" v-slot:footerButtons>
<slot name="footerButtons"></slot>
<slot name="footerButtons" />
</template>
</tera-slider>
</template>

<script setup lang="ts">
import { ref } from 'vue';
import Badge from 'primevue/badge';
import Button from 'primevue/button';
import TeraSlider from './tera-slider.vue';

defineProps({
Expand Down Expand Up @@ -89,63 +92,43 @@ const onScroll = (event: Event) => {
</script>

<style scoped>
.panel-container {
height: 100%;
overflow-y: auto;
}
i {
font-size: 1.25rem;
cursor: pointer;
}

.slider-header {
display: flex;
align-items: start;
}

.header-shadow {
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
}

section {
header {
position: sticky;
top: 0;
z-index: 3;
display: flex;
flex-direction: column;
}

.slider-header.content {
align-items: center;
flex-direction: row-reverse;
justify-content: space-between;
padding: 1rem;
padding: var(--gap-2);
padding-left: var(--gap);
gap: var(--gap);
background-color: rgba(255, 255, 255, 0.8);
backdrop-filter: blur(3px);
&.shadow {
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
}
}

.slider-header.tab {
justify-content: center;
aside {
height: 100%;
overflow-y: auto;
}

i.slider-header-item {
color: var(--text-color-subdued);
.p-button.p-button-icon-only.p-button-rounded {
height: 2.5rem;
}

.slider-tab-header {
align-items: center;
display: flex;
.tab {
flex-direction: column;
padding: 1rem;
gap: 2rem;
}

.slider-tab-header h4 {
text-align: left;
line-height: 1em;
margin-bottom: 1rem;
padding: var(--gap-2);
}

.slider-tab-header h5 {
transform: rotate(0deg);
h5 {
writing-mode: vertical-lr;
}

.selected-resources-count {
.p-badge {
background-color: var(--surface-200);
color: var(--text-color-primary);
font-size: 1rem;
Expand All @@ -154,12 +137,4 @@ i.slider-header-item {
line-height: 2rem;
font-weight: var(--font-weight);
}

.sticky {
z-index: 3;
position: sticky;
top: 0;
background-color: rgba(255, 255, 255, 0.8);
backdrop-filter: blur(3px);
}
</style>
Loading