matei/zeroone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Richard Unger
2024-03-04 15:38:13 +01:00
parent 1f562ea492 45ad907bfc
commit f1bd01d807
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/renderer/src/components/navbar/Navbar.vue
View File

@@ -93,17 +93,36 @@
<MenubarMenu> <MenubarMenu>
<MenubarTrigger class="app-titlebar-button">Help</MenubarTrigger> <MenubarTrigger class="app-titlebar-button">Help</MenubarTrigger>
<MenubarContent> <MenubarContent>
<MenubarItem>Software Source</MenubarItem> <MenubarItem @click="electronAPI.openExternal('https://github.com/katbinaris/zeroone')"
<MenubarItem>Hardware Source</MenubarItem> >Software Source</MenubarItem
>
<MenubarItem
@click="electronAPI.openExternal('https://github.com/katbinaris/NanoD_RatchetH1')"
>Firmware Source</MenubarItem
>
<MenubarItem
@click="electronAPI.openExternal('https://github.com/katbinaris/Nano_D_PlusPlus')"
>Hardware Source</MenubarItem
>
<MenubarSeparator /> <MenubarSeparator />
<MenubarItem>Report Software Issue</MenubarItem> <MenubarItem
<MenubarItem>Report Hardware Issue</MenubarItem> @click="electronAPI.openExternal('https://github.com/katbinaris/zeroone/issues/new')"
>Report Software Issue</MenubarItem
>
<MenubarItem
@click="
electronAPI.openExternal('https://github.com/katbinaris/NanoD_RatchetH1/issues/new')
"
>Report Device Issue</MenubarItem
>
<MenubarSeparator /> <MenubarSeparator />
<MenubarItem class="flex justify-between"> <MenubarItem class="flex justify-between">
<p>Software Version:&nbsp;</p> <p>Software Version:&nbsp;</p>
<p>v0.1</p> <p>v0.1</p>
</MenubarItem> </MenubarItem>
<MenubarItem>Contact Support</MenubarItem> <MenubarItem @click="electronAPI.openExternal('https://discord.gg/jgRd77YN5T')"
>Contact Support</MenubarItem
>
<template v-if="electronAPI.isDevelopment"> <template v-if="electronAPI.isDevelopment">
<MenubarSeparator /> <MenubarSeparator />
<MenubarItem @click="electronAPI.openDevTools">Developer Tools</MenubarItem> <MenubarItem @click="electronAPI.openDevTools">Developer Tools</MenubarItem>

18
src/renderer/src/components/profile/ProfileManager.vue
View File

@@ -69,7 +69,7 @@
<Collapsible v-model:open="collapse[dragCategory.element.name]" :default-open="true"> <Collapsible v-model:open="collapse[dragCategory.element.name]" :default-open="true">
<!-- TODO: Make profile groups computed instead defining them of using v-for --> <!-- TODO: Make profile groups computed instead defining them of using v-for -->
<CollapsibleTrigger <CollapsibleTrigger
class="h-12 w-full border-0 border-b bg-zinc-900 py-2 text-left text-sm text-muted-foreground" class="group h-12 w-full border-0 border-b bg-zinc-900 py-2 text-left text-sm text-muted-foreground"
> >
<ChevronRight <ChevronRight
class="chevrot mb-0.5 ml-4 inline-block size-4 transition-transform" class="chevrot mb-0.5 ml-4 inline-block size-4 transition-transform"
@@ -78,6 +78,9 @@
}}<span class="font-heading text-sm text-zinc-600"> }}<span class="font-heading text-sm text-zinc-600">
({{ dragCategory.element.profiles?.length || 0 }})</span ({{ dragCategory.element.profiles?.length || 0 }})</span
> >
<span class="float-right mx-4 w-4 cursor-grab text-zinc-600">
<GripHorizontal class="mb-0.5 inline-block size-4" />
</span>
</CollapsibleTrigger> </CollapsibleTrigger>
<CollapsibleContent> <CollapsibleContent>
<TransitionGroup> <TransitionGroup>
@@ -91,8 +94,8 @@
@end="drag = false" @end="drag = false"
@change="(event) => onProfileDrop(event, dragCategory.index)" @change="(event) => onProfileDrop(event, dragCategory.index)"
> >
<template v-if="dragCategory.element.profiles.length === 0" #header> <template #header>
<div class="hideable-header flex h-12 items-center justify-center"> <div class="hideable-header m-2 flex h-12 items-center justify-center">
<MoreHorizontal class="w-4 text-zinc-600" /> <MoreHorizontal class="w-4 text-zinc-600" />
</div> </div>
</template> </template>
@@ -131,7 +134,14 @@
</template> </template>
<script setup> <script setup>
import { Separator } from '@renderer/components/ui/separator' import { Separator } from '@renderer/components/ui/separator'
import { ChevronRight, Plus, ArrowLeft, List, MoreHorizontal } from 'lucide-vue-next' import {
ChevronRight,
Plus,
ArrowLeft,
List,
MoreHorizontal,
GripHorizontal
} from 'lucide-vue-next'
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { import {
Collapsible, Collapsible,

1
src/renderer/src/components/ui/slider/Slider.vue
View File

@@ -3,6 +3,7 @@ import { type HTMLAttributes, computed } from 'vue'
import type { SliderRootEmits, SliderRootProps } from 'radix-vue' import type { SliderRootEmits, SliderRootProps } from 'radix-vue'
import { SliderRange, SliderRoot, SliderThumb, SliderTrack, useForwardPropsEmits } from 'radix-vue' import { SliderRange, SliderRoot, SliderThumb, SliderTrack, useForwardPropsEmits } from 'radix-vue'
import { cn } from '@renderer/lib/utils' import { cn } from '@renderer/lib/utils'
import { MoreHorizontal } from 'lucide-vue-next'
const props = defineProps<SliderRootProps & { class?: HTMLAttributes['class'] }>() const props = defineProps<SliderRootProps & { class?: HTMLAttributes['class'] }>()
const emits = defineEmits<SliderRootEmits>() const emits = defineEmits<SliderRootEmits>()