Many Changes

Added a 'default' image for spots where one is missing. Not the best solution, but it looks better on the site.
Cleaned up my code to avoid some duplication.
Added better 'Select All' logic to the event filter.
This commit is contained in:
Annika Merris 2024-01-23 18:33:55 -05:00
parent abe48cd902
commit 255f15798a
24 changed files with 323 additions and 783 deletions

View file

@ -1,15 +1,47 @@
<script setup lang="ts">
import SpecialItemsCard from '@/components/BlessingPower/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/BlessingPower/StandardItemsCard.vue'
import SummaryCard from '@/components/BlessingPower/SummaryCard.vue'
import SpecialItemsCard from '@/components/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/StandardItemsCard.vue'
import SummaryCard from '@/components/SummaryCard.vue'
import { storeToRefs } from 'pinia'
import { usePowerItems } from '@/stores/powerItems'
const {
standardBlessingItems,
standardBlessingItemTotal,
specialBlessingItems,
specialBlessingItemsMinTotal,
specialBlessingItemsMaxTotal,
specialBlessingItemsAveTotal
} = storeToRefs(usePowerItems())
</script>
<template>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard class="ma-2 align-self-start" />
<SpecialItemsCard class="ma-2 align-self-start" />
<SummaryCard class="ma-2 align-self-start" />
</v-sheet>
<v-card>
<v-card-title>Blessing Power</v-card-title>
<v-card-text>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard
class="ma-2 align-self-start"
:items="standardBlessingItems"
:total="standardBlessingItemTotal"
/>
<SpecialItemsCard
class="ma-2 align-self-start"
:items="specialBlessingItems"
:minimum-total="specialBlessingItemsMinTotal"
:maximum-total="specialBlessingItemsMaxTotal"
:average-total="specialBlessingItemsAveTotal"
/>
<SummaryCard
class="ma-2 align-self-start"
:standard-total="standardBlessingItemTotal"
:minimum-total="specialBlessingItemsMinTotal"
:maximum-total="specialBlessingItemsMaxTotal"
:average-total="specialBlessingItemsAveTotal"
/>
</v-sheet>
</v-card-text>
</v-card>
</template>
<style lang="scss" scoped>

View file

@ -1,19 +1,51 @@
<script setup lang="ts">
import SpecialItemsCard from '@/components/FellowPower/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/FellowPower/StandardItemsCard.vue'
import SummaryCard from '@/components/FellowPower/SummaryCard.vue'
import SpecialItemsCard from '@/components/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/StandardItemsCard.vue'
import SummaryCard from '@/components/SummaryCard.vue'
import { storeToRefs } from 'pinia'
import { usePowerItems } from '@/stores/powerItems'
const {
standardFellowItems,
standardFellowItemTotal,
specialFellowItems,
specialFellowItemsMinTotal,
specialFellowItemsMaxTotal,
specialFellowItemsAveTotal
} = storeToRefs(usePowerItems())
</script>
<template>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard class="ma-2 align-self-start"/>
<SpecialItemsCard class="ma-2 align-self-start"/>
<SummaryCard class="ma-2 align-self-start" />
</v-sheet>
<v-card>
<v-card-title>Fellow Power</v-card-title>
<v-card-text>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard
class="ma-2 align-self-start"
:items="standardFellowItems"
:total="standardFellowItemTotal"
/>
<SpecialItemsCard
class="ma-2 align-self-start"
:items="specialFellowItems"
:minimum-total="specialFellowItemsMinTotal"
:maximum-total="specialFellowItemsMaxTotal"
:average-total="specialFellowItemsAveTotal"
/>
<SummaryCard
class="ma-2 align-self-start"
:standard-total="standardFellowItemTotal"
:minimum-total="specialFellowItemsMinTotal"
:maximum-total="specialFellowItemsMaxTotal"
:average-total="specialFellowItemsAveTotal"
/>
</v-sheet>
</v-card-text>
</v-card>
</template>
<style lang="scss" scoped>
@use "@/styles/settings.scss";
@use '@/styles/settings.scss';
:deep(tbody) tr:nth-of-type(even) {
background-color: rgba(var(--v-theme-primary-darken-1), 0.25);
}

View file

@ -13,6 +13,11 @@ const entries20240121 = ref([
'Added event icon display',
'Added filters, looks ugly, maybe works'
])
const entries20240122 = ref([
'Added a better "Select All" to event filters',
'Added a default image so there aren\'t random blank spots',
'Did a bunch of code cleanup',
])
</script>
<template>
@ -84,6 +89,7 @@ const entries20240121 = ref([
</v-list-item>
<ChangeLogEntry date="2024-01-20" :entries="entries20240120"></ChangeLogEntry>
<ChangeLogEntry date="2024-01-21" :entries="entries20240121"></ChangeLogEntry>
<ChangeLogEntry date="2024-01-22" :entries="entries20240122"></ChangeLogEntry>
</v-list>
</v-sheet>
<v-sheet :elevation="1" class="ma-2 my-4">
@ -95,7 +101,7 @@ const entries20240121 = ref([
</p>
<p>
Thanks to <span class="font-weight-bold">@kathinja</span> for her assistance with flavor
text and proof reading.
text and proofreading.
</p>
<p>
Thanks <span class="font-weight-bold">@werewaffle</span> for all of his help with

View file

@ -1,19 +1,51 @@
<script setup lang="ts">
import SpecialItemsCard from '@/components/IntimacyPower/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/IntimacyPower/StandardItemsCard.vue'
import SummaryCard from '@/components/IntimacyPower/SummaryCard.vue'
import SpecialItemsCard from '@/components/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/StandardItemsCard.vue'
import SummaryCard from '@/components/SummaryCard.vue'
import { storeToRefs } from 'pinia'
import { usePowerItems } from '@/stores/powerItems'
const {
standardIntimacyItems,
standardIntimacyItemTotal,
specialIntimacyItems,
specialIntimacyItemsMinTotal,
specialIntimacyItemsMaxTotal,
specialIntimacyItemsAveTotal
} = storeToRefs(usePowerItems())
</script>
<template>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard class="ma-2 align-self-start"/>
<SpecialItemsCard class="ma-2 align-self-start"/>
<SummaryCard class="ma-2 align-self-start" />
</v-sheet>
<v-card>
<v-card-title>Intimacy Power</v-card-title>
<v-card-text>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard
class="ma-2 align-self-start"
:items="standardIntimacyItems"
:total="standardIntimacyItemTotal"
/>
<SpecialItemsCard
class="ma-2 align-self-start"
:items="specialIntimacyItems"
:minimum-total="specialIntimacyItemsMinTotal"
:maximum-total="specialIntimacyItemsMaxTotal"
:average-total="specialIntimacyItemsAveTotal"
/>
<SummaryCard
class="ma-2 align-self-start"
:standard-total="standardIntimacyItemTotal"
:minimum-total="specialIntimacyItemsMinTotal"
:maximum-total="specialIntimacyItemsMaxTotal"
:average-total="specialIntimacyItemsAveTotal"
/>
</v-sheet>
</v-card-text>
</v-card>
</template>
<style lang="scss" scoped>
@use "@/styles/settings.scss";
@use '@/styles/settings.scss';
:deep(tbody) tr:nth-of-type(even) {
background-color: rgba(var(--v-theme-primary-darken-1), 0.25);
}

52
src/views/Test.vue Normal file
View file

@ -0,0 +1,52 @@
<script setup lang="ts">
import SpecialItemsCard from '@/components/SpecialItemsCard.vue'
import StandardItemsCard from '@/components/StandardItemsCard.vue'
import SummaryCard from '@/components/SummaryCard.vue'
import { storeToRefs } from 'pinia'
import { usePowerItems } from '@/stores/powerItems'
const {
standardBlessingItems,
standardBlessingItemTotal,
specialBlessingItems,
specialBlessingItemsMinTotal,
specialBlessingItemsMaxTotal,
specialBlessingItemsAveTotal
} = storeToRefs(usePowerItems())
</script>
<template>
<v-card>
<v-card-title>Intimacy Power</v-card-title>
<v-card-text>
<v-sheet class="d-flex flex-wrap flex-fill">
<StandardItemsCard
class="ma-2 align-self-start"
:items="standardBlessingItems"
:total="standardBlessingItemTotal"
/>
<SpecialItemsCard
class="ma-2 align-self-start"
:items="specialBlessingItems"
:minimum-total="specialBlessingItemsMinTotal"
:maximum-total="specialBlessingItemsMaxTotal"
:average-total="specialBlessingItemsAveTotal"
/>
<SummaryCard
class="ma-2 align-self-start"
:standard-total="standardBlessingItemTotal"
:minimum-total="specialBlessingItemsMinTotal"
:maximum-total="specialBlessingItemsMaxTotal"
:average-total="specialBlessingItemsAveTotal"
/>
</v-sheet>
</v-card-text>
</v-card>
</template>
<style lang="scss" scoped>
@use '@/styles/settings.scss';
:deep(tbody) tr:nth-of-type(even) {
background-color: rgba(var(--v-theme-primary-darken-1), 0.25);
}
</style>