Changed icons for better readability of order
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { useCalendar } from '@/stores/CalendarStore'
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
|
import { computed } from 'vue'
|
||||||
import CalendarMenu from './CalendarMenu.vue'
|
import CalendarMenu from './CalendarMenu.vue'
|
||||||
import Century from './state/Century.vue'
|
import Century from './state/Century.vue'
|
||||||
import Decade from './state/Decade.vue'
|
import Decade from './state/Decade.vue'
|
||||||
import Monthly from './state/Monthly.vue'
|
import Monthly from './state/Monthly.vue'
|
||||||
import Year from './state/Year.vue'
|
import Year from './state/Year.vue'
|
||||||
import { computed } from 'vue'
|
|
||||||
|
|
||||||
const { currentConfig } = useCalendar()
|
const { currentConfig } = useCalendar()
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { Popover, PopoverTrigger } from '@/components/ui/popover'
|
import { Popover, PopoverTrigger } from '@/components/ui/popover'
|
||||||
import type { CalendarEvent } from '@/models/Events'
|
import type { CalendarEvent } from '@/models/Events'
|
||||||
|
|
||||||
import CalendarEventDetails from './CalendarEventDetails.vue'
|
import CalendarEventDetails from './CalendarEventDetails.vue'
|
||||||
|
|
||||||
defineProps<{
|
defineProps<{
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { PopoverContent } from '@/components/ui/popover'
|
|
||||||
import type { CalendarEvent } from '@/models/Events'
|
import type { CalendarEvent } from '@/models/Events'
|
||||||
import { useCalendar } from '@/stores/CalendarStore'
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
|
|
||||||
|
import { PopoverContent } from '@/components/ui/popover'
|
||||||
|
|
||||||
const { getFormattedDateTitle } = useCalendar()
|
const { getFormattedDateTitle } = useCalendar()
|
||||||
|
|
||||||
defineProps<{ event: CalendarEvent }>()
|
defineProps<{ event: CalendarEvent }>()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useCalendar } from '@/stores/CalendarStore'
|
|||||||
import { PhMapPin } from '@phosphor-icons/vue'
|
import { PhMapPin } from '@phosphor-icons/vue'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
|
|
||||||
import CalendarMenuNav from './CalendarMenuNav.vue'
|
import CalendarMenuNav from './CalendarMenuNav.vue'
|
||||||
import CalendarMenuToday from './CalendarMenuToday.vue'
|
import CalendarMenuToday from './CalendarMenuToday.vue'
|
||||||
import CalendarSwitch from './CalendarSwitch.vue'
|
import CalendarSwitch from './CalendarSwitch.vue'
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
|
|
||||||
import { useCalendar } from '@/stores/CalendarStore'
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
|
|
||||||
|
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
|
||||||
import {
|
import {
|
||||||
PhCaretDoubleLeft,
|
PhCaretDoubleLeft,
|
||||||
PhCaretDoubleRight,
|
PhCaretDoubleRight,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
|
|||||||
import { useCalendar } from '@/stores/CalendarStore'
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
|
|
||||||
import Button from '../ui/button/Button.vue'
|
import Button from '../ui/button/Button.vue'
|
||||||
|
|
||||||
const { defaultDate, isCurrentScreenActive } = storeToRefs(useCalendar())
|
const { defaultDate, isCurrentScreenActive } = storeToRefs(useCalendar())
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
|
import { PhCalendarBlank } from '@phosphor-icons/vue'
|
||||||
|
import { computed } from 'vue'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
DropdownMenuContent,
|
DropdownMenuContent,
|
||||||
@@ -7,9 +11,6 @@ import {
|
|||||||
DropdownMenuSeparator,
|
DropdownMenuSeparator,
|
||||||
DropdownMenuTrigger
|
DropdownMenuTrigger
|
||||||
} from '@/components/ui/dropdown-menu'
|
} from '@/components/ui/dropdown-menu'
|
||||||
import { useCalendar } from '@/stores/CalendarStore'
|
|
||||||
import { PhCalendarBlank } from '@phosphor-icons/vue'
|
|
||||||
import { computed } from 'vue'
|
|
||||||
import Button from '../ui/button/Button.vue'
|
import Button from '../ui/button/Button.vue'
|
||||||
|
|
||||||
const { currentConfig, viewTypeOptions, getViewTypeTitle, setViewType } = useCalendar()
|
const { currentConfig, viewTypeOptions, getViewTypeTitle, setViewType } = useCalendar()
|
||||||
|
|||||||
@@ -38,9 +38,15 @@ const isSelectedDate = computed(() => {
|
|||||||
'text-slate-300': !props.faded
|
'text-slate-300': !props.faded
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<div class="text-center">
|
<!-- Used for "display all events" -->
|
||||||
|
<button class="absolute inset-0 w-full h-full cursor-default z-0" />
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="relative z-10 group block w-full text-center cursor-pointer"
|
||||||
|
@click="selectDate(date)"
|
||||||
|
>
|
||||||
<span
|
<span
|
||||||
class="inline-flex w-8 h-8 aspect-square items-center justify-center rounded-full font-bold transition-colors"
|
class="inline-flex w-8 h-8 aspect-square items-center justify-center rounded-full border-2 border-transparent font-bold transition-colors group-hover:border-slate-800"
|
||||||
:class="{
|
:class="{
|
||||||
'bg-slate-800': isDefaultDate && !isSelectedDate,
|
'bg-slate-800': isDefaultDate && !isSelectedDate,
|
||||||
'text-white bg-blue-500': isSelectedDate
|
'text-white bg-blue-500': isSelectedDate
|
||||||
@@ -48,7 +54,7 @@ const isSelectedDate = computed(() => {
|
|||||||
>
|
>
|
||||||
{{ date.day }}
|
{{ date.day }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</button>
|
||||||
|
|
||||||
<ul
|
<ul
|
||||||
v-if="eventsForTheDay.length > 0"
|
v-if="eventsForTheDay.length > 0"
|
||||||
@@ -61,8 +67,6 @@ const isSelectedDate = computed(() => {
|
|||||||
<CalendarEvent :event />
|
<CalendarEvent :event />
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<button class="absolute inset-0 w-full h-full cursor-default z-0" @click="selectDate(date)" />
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import type { LeimDateOrder } from '@/models/Date'
|
|||||||
import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
|
import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
|
||||||
import { useCharacters } from '@/stores/CharacterStore'
|
import { useCharacters } from '@/stores/CharacterStore'
|
||||||
import { useCalendarEvents } from '@/stores/EventStore'
|
import { useCalendarEvents } from '@/stores/EventStore'
|
||||||
import { PhCaretDoubleDown, PhCaretDoubleUp, PhMagnifyingGlass } from '@phosphor-icons/vue'
|
import { PhClockClockwise, PhClockCounterClockwise, PhMagnifyingGlass } from '@phosphor-icons/vue'
|
||||||
import { useMagicKeys, useStorage, useTimeoutFn, whenever } from '@vueuse/core'
|
import { useMagicKeys, useStorage, useTimeoutFn, whenever } from '@vueuse/core'
|
||||||
import { VisuallyHidden } from 'radix-vue'
|
import { VisuallyHidden } from 'radix-vue'
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
@@ -173,7 +173,7 @@ whenever(keys.control_period, () => {
|
|||||||
size="icon"
|
size="icon"
|
||||||
@click="setOrderDesc()"
|
@click="setOrderDesc()"
|
||||||
>
|
>
|
||||||
<PhCaretDoubleUp size="18" />
|
<PhClockCounterClockwise size="18" />
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>
|
<TooltipContent>
|
||||||
@@ -190,7 +190,7 @@ whenever(keys.control_period, () => {
|
|||||||
size="icon"
|
size="icon"
|
||||||
@click="setOrderAsc()"
|
@click="setOrderAsc()"
|
||||||
>
|
>
|
||||||
<PhCaretDoubleDown size="18" />
|
<PhClockClockwise size="18" />
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>
|
<TooltipContent>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { isCharacter, type Character } from '@/models/Characters'
|
import { isCharacter, type Character } from '@/models/Characters'
|
||||||
import { compareDates, type LeimDate, type LeimDateOrder } from '@/models/Date'
|
import { compareDates, type LeimDate, type LeimDateOrder } from '@/models/Date'
|
||||||
import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
|
import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
|
||||||
@@ -7,6 +6,8 @@ import { useCalendar } from '@/stores/CalendarStore'
|
|||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
import type { SearchMode } from '../../Search'
|
import type { SearchMode } from '../../Search'
|
||||||
|
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
results: (Character | CalendarEvent)[]
|
results: (Character | CalendarEvent)[]
|
||||||
currentEntity: SearchMode
|
currentEntity: SearchMode
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import type { LeimDate } from '@/models/Date'
|
|||||||
import { useCalendar } from '@/stores/CalendarStore'
|
import { useCalendar } from '@/stores/CalendarStore'
|
||||||
import { useThrottleFn } from '@vueuse/core'
|
import { useThrottleFn } from '@vueuse/core'
|
||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
|
|
||||||
import CalendarTile from '../CalendarTile.vue'
|
import CalendarTile from '../CalendarTile.vue'
|
||||||
|
|
||||||
const { staticConfig, currentDate, decrementMonth, incrementMonth } = useCalendar()
|
const { staticConfig, currentDate, decrementMonth, incrementMonth } = useCalendar()
|
||||||
|
|||||||
Reference in New Issue
Block a user