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

Jump to bottom

Use edit-menu to add mini-widgets #426

Merged
merged 5 commits into from
Aug 13, 2023
Merged

Use edit-menu to add mini-widgets #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f201bd4
Create common component to instantiate mini-widgets
rafaellehmkuhl Aug 11, 2023
7c5d0ff
Allow adding mini-widgets from the edit-menu bottom bar
rafaellehmkuhl Aug 11, 2023
89824b6
Move widget name under add button on edit-menu
rafaellehmkuhl Aug 11, 2023
641ecdb
Remove deticated add-menu from mini-widget container
rafaellehmkuhl Aug 11, 2023
7649bee
Edit menu: Move import and export view buttons to bellow the view add…
rafaellehmkuhl Aug 11, 2023
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
111 changes: 89 additions & 22 deletions src/components/EditMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,21 @@
/>
</div>
</div>
<div ref="managementContainer" class="flex flex-col items-center justify-center w-full px-2 shrink">
<Button class="flex items-center justify-center w-full h-8 my-1 bg-slate-700 hover:bg-slate-500">
<label class="flex items-center justify-center h-8 overflow-auto cursor-pointer">
<input type="file" accept="application/json" hidden @change="(e: Event) => store.importView(e)" />
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Import view</p>
</label>
</Button>
<Button
class="flex items-center justify-center w-full h-8 my-1 bg-slate-700 hover:bg-slate-500"
@click="store.exportCurrentView"
>
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Export current view</p>
</Button>
<div />
</div>
<div class="w-full h-px my-2 sm bg-slate-800/40" />
<div
ref="currentWidgetsContainer"
Expand Down Expand Up @@ -77,28 +92,31 @@
</VueDraggable>
<div class="grow" />
</div>
<div class="w-full h-px my-2 sm bg-slate-800/40" />
<div ref="managementContainer" class="flex flex-col items-center justify-center w-full px-2 shrink">
<Button class="flex items-center justify-center w-full h-8 my-1 bg-slate-700 hover:bg-slate-500">
<label class="flex items-center justify-center h-8 overflow-auto cursor-pointer">
<input type="file" accept="application/json" hidden @change="(e: Event) => store.importView(e)" />
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Import view</p>
</label>
</Button>
<Button
class="flex items-center justify-center w-full h-8 my-1 bg-slate-700 hover:bg-slate-500"
@click="store.exportCurrentView"
>
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Export current view</p>
</Button>
<div />
</div>
<div class="w-full h-px mt-4 bg-slate-800/40" />
</div>
<div class="flex items-center justify-between text-white edit-panel middle-panel" :class="{ active: editMode }"></div>
<div
class="flex flex-col items-center justify-center px-3 text-white edit-panel middle-panel"
:class="{ active: editMode }"
>
<Button
class="flex items-center justify-center w-full h-8 my-1 hover:bg-slate-500"
:class="{ 'bg-slate-700': widgetMode !== WidgetMode.RegularWidgets }"
@click="widgetMode = WidgetMode.RegularWidgets"
>
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Regular widgets</p>
</Button>
<Button
class="flex items-center justify-center w-full h-8 my-1 hover:bg-slate-500"
:class="{ 'bg-slate-700': widgetMode !== WidgetMode.MiniWidgets }"
@click="widgetMode = WidgetMode.MiniWidgets"
>
<p class="overflow-hidden text-ellipsis whitespace-nowrap">Mini widgets</p>
</Button>
</div>
<div class="flex items-center justify-between py-2 edit-panel bottom-panel" :class="{ active: editMode }">
<div class="w-px h-full mr-2 bg-slate-800/40" />
<div
v-show="widgetMode === WidgetMode.RegularWidgets"
ref="availableWidgetsContainer"
class="flex items-center justify-between w-full h-full overflow-x-auto text-white aspect-square"
>
Expand All @@ -107,11 +125,26 @@
:key="widgetType"
class="flex flex-col items-center justify-center p-2 mx-3 rounded-md bg-slate-500 h-5/6 aspect-square"
>
{{ widgetType }}
<div
class="flex items-center justify-center w-8 m-2 transition-all rounded-md cursor-pointer bg-slate-700 aspect-square mdi mdi-plus hover:bg-slate-400"
@click="store.addWidget(widgetType, store.currentView)"
/>
{{ widgetType }}
</div>
</div>
<div
v-show="widgetMode === WidgetMode.MiniWidgets"
ref="availableMiniWidgetsContainer"
class="flex items-center w-full h-full gap-2 overflow-auto"
>
<div
v-for="item in availableMiniWidgetTypes"
:key="item.hash"
class="flex flex-col items-center justify-center p-2 mx-3 rounded-md h-5/6 w-fit text-slate-100"
>
<div class="m-2 pointer-events-none select-none">
<MiniWidgetInstantiator :widget-type="item.component" :options="item.options" />
</div>
</div>
</div>
</div>
Expand All @@ -132,14 +165,17 @@

<script setup lang="ts">
import { useConfirmDialog } from '@vueuse/core'
import { v4 as uuid } from 'uuid'
import { computed, onMounted, ref, toRefs, watch } from 'vue'
import { nextTick } from 'vue'
import { VueDraggable } from 'vue-draggable-plus'
import { type UseDraggableOptions, useDraggable, VueDraggable } from 'vue-draggable-plus'

import { useWidgetManagerStore } from '@/stores/widgetManager'
import { MiniWidgetType } from '@/types/miniWidgets'
import { type View, type Widget, WidgetType } from '@/types/widgets'

import Button from './Button.vue'
import MiniWidgetInstantiator from './MiniWidgetInstantiator.vue'

const store = useWidgetManagerStore()
const trashList = ref<Widget[]>([])
Expand All @@ -159,6 +195,16 @@ const emit = defineEmits<{
}>()

const availableWidgetTypes = computed(() => Object.values(WidgetType))
const availableMiniWidgetTypes = computed(() =>
Object.values(MiniWidgetType).map((widgetType) => ({ component: widgetType, options: {}, hash: uuid() }))
)

const widgetAddMenuGroupOptions = {
name: 'generalGroup',
pull: 'clone',
put: false,
revertClone: false,
}

const editMode = toRefs(props).editMode

Expand All @@ -183,12 +229,33 @@ const renameView = (view: View): void => {
}

const availableWidgetsContainer = ref()
const availableMiniWidgetsContainer = ref()

// @ts-ignore: Documentation is not clear on what generic should be passed to 'UseDraggableOptions'
const miniWidgetsContainerOptions = ref<UseDraggableOptions>({
animation: '150',
group: widgetAddMenuGroupOptions,
sort: false,
})
useDraggable(availableMiniWidgetsContainer, availableMiniWidgetTypes, miniWidgetsContainerOptions)

onMounted(() => {
availableWidgetsContainer.value.addEventListener('wheel', function (e: WheelEvent) {
if (e.deltaY > 0) availableWidgetsContainer.value.scrollLeft += 100
else availableWidgetsContainer.value.scrollLeft -= 100
const widgetContainers = [availableWidgetsContainer.value, availableMiniWidgetsContainer.value]
widgetContainers.forEach((container) => {
container.addEventListener('wheel', function (e: WheelEvent) {
if (e.deltaY > 0) container.scrollLeft += 100
else container.scrollLeft -= 100
})
})
})

// eslint-disable-next-line jsdoc/require-jsdoc, no-redeclare
enum WidgetMode {
RegularWidgets,
MiniWidgets,
}

const widgetMode = ref(WidgetMode.MiniWidgets)
</script>

<style scoped>
Expand Down
Loading