Skip to content

Added html markup for all equipment, tried refactoring getEquipFamily… #16

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

Open
danieltichiyama wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added html markup for all equipment, tried refactoring getEquipFamily… #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ import css from '@eslint/css';
import { defineConfig } from 'eslint/config';

export default defineConfig([
{
files: ['**/*.{js,mjs,cjs,vue}'],
plugins: { js },
extends: ['js/recommended'],
languageOptions: { globals: globals.browser },
rules: {
semi: ['warn', 'always'],
quotes: ['warn', 'single', { avoidEscape: true }],
indent: ['warn', 2],
'keyword-spacing': ['warn', { before: true, after: true }],
'comma-spacing': ['warn', { before: false, after: true }],
'object-curly-spacing': ['warn', 'always'],
'space-before-blocks': ['warn', 'always'],
'eqeqeq': ['warn', 'always'],
// End file with newline
'eol-last': ['warn', 'always']
}
},
// {
// files: ['**/*.{js,mjs,cjs,vue}'],
// plugins: { js },
// // extends: ['js/recommended'],
// languageOptions: { globals: globals.browser },
// rules: {
// semi: ['warn', 'always'],
// quotes: ['warn', 'single', { avoidEscape: true }],
// indent: ['warn', 2],
// 'keyword-spacing': ['warn', { before: true, after: true }],
// 'comma-spacing': ['warn', { before: false, after: true }],
// 'object-curly-spacing': ['warn', 'always'],
// 'space-before-blocks': ['warn', 'always'],
// 'eqeqeq': ['warn', 'always'],
// // End file with newline
// 'eol-last': ['warn', 'always']
// }
// },
pluginVue.configs['flat/essential'],
{
rules: {
Expand Down
140 changes: 128 additions & 12 deletions src/components/deck/StepEquipment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,25 @@ const deckStore = useDeckStore();

const emit = defineEmits(['nextStep']);
const { loading: equipLoading } = storeToRefs(equipStore);
const { loading: deckLoading, selectedArmor } = storeToRefs(deckStore);
const { loading: deckLoading, selectedArmor, selectedWeapon, selectedTrinket, selectedMount } = storeToRefs(deckStore);

const addEquipCards = () => {
// TODO: Save to deck store on each equip choice or at the end?
emit('nextStep');
};

const armorSlide = ref('');
const armorSlide = ref(null);
const weaponSlide = ref(null);
const trinketSlide = ref(null);
const mountSlide = ref(null);

const options = {
"armors": selectedArmor,
"weapons": selectedWeapon,
"trinkets": selectedTrinket,
"mounts": selectedMount,
}

// Might need 2 refs for weapons, since one hero can have 2??

// Armor/weapons/support all have 4 tiers
Expand All @@ -27,14 +38,21 @@ const getEquipTypeFromStore = (type) => {
return equipStore.getEquipmentOptionsByType(type);
};

const getEquipFamily = computed(() => {
const hasData = selectedArmor.value;
// const armorSlide = computed(()=>{
// return selectedArmor.value.label;
// })

const getEquipFamily = (type) => {
console.log("getEquipFamily");
const hasData = options[type].value;
if (hasData) {
const family = equipStore.getEquipCardsByTypeAndFamily('armors', selectedArmor.value.label);
const family = equipStore.getEquipCardsByTypeAndFamily(type, options[type].value.label);

armorSlide.value = family[0].name;
return family;
}
return null;
});
};
</script>

<template>
Expand Down Expand Up @@ -70,38 +88,136 @@ const getEquipFamily = computed(() => {
control-color="primary"
>
<q-carousel-slide
v-for="equip in getEquipFamily"
v-for="equip in getEquipFamily('armors')"
:key="equip.id"
:name="equip.name"
>
<p>{{ equip.name }}</p>
<!-- <small-card :card="equip"/> -->
<q-card v-if="equip">
<q-card-section class="col">
<h5>
{{ equip.name }}
</h5>
<i v-if="equip.trait">trait: {{ equip.trait }}</i>
</q-card-section>
<q-card-section>
<h6>Description</h6>
<p>{{ equip.description }}</p>
</q-card-section>
</q-card>

<!-- <p v-for="(value, key) in equip" :key="key">{{ key }}: {{ value }}</p> -->


</q-carousel-slide>

</q-carousel>

</q-expansion-item>

<q-expansion-item
dense
dense-toggle
expand-separator
icon="perm_identity"
label="Weapons"
/>
>
<q-select
:options="getEquipTypeFromStore('weapons')"
v-model="selectedWeapon"
outlined
stack-label
dense
color="primary"
class="q-pa-md"
/>

<q-carousel
v-if="selectedWeapon.value"
v-model="weaponSlide"
arrows
navigation
control-color="primary"
>
<q-carousel-slide
v-for="equip in getEquipFamily('weapons')"
:key="equip.id"
:name="equip.name"
>
<p v-for="(value, key) in equip" :key="key">{{ key }}: {{ value }}</p>
</q-carousel-slide>

</q-carousel>

</q-expansion-item>
<q-expansion-item
dense
dense-toggle
expand-separator
icon="perm_identity"
label="Trinkets"
/>
>
<q-select
:options="getEquipTypeFromStore('trinkets')"
v-model="selectedTrinket"
outlined
stack-label
dense
color="primary"
class="q-pa-md"
/>

<q-carousel
v-if="selectedTrinket.value"
v-model="trinketSlide"
arrows
navigation
control-color="primary"
>
<q-carousel-slide
v-for="equip in getEquipFamily('trinkets')"
:key="equip.id"
:name="equip.name"
>
<p v-for="(value, key) in equip" :key="key">{{ key }}: {{ value }}</p>

</q-carousel-slide>

</q-carousel>
</q-expansion-item>
<q-expansion-item
dense
dense-toggle
expand-separator
icon="perm_identity"
label="Mounts"
/>
>
<q-select
:options="getEquipTypeFromStore('mounts')"
v-model="selectedMount"
outlined
stack-label
dense
color="primary"
class="q-pa-md"
/>

<q-carousel
v-if="selectedMount.value"
v-model="mountSlide"
arrows
navigation
control-color="primary"
>
<q-carousel-slide
v-for="equip in getEquipFamily('mounts')"
:key="equip.id"
:name="equip.name"
>
<p v-for="(value, key) in equip" :key="key">{{ key }}: {{ value }}</p>
</q-carousel-slide>

</q-carousel>
</q-expansion-item>
</q-list>

<div class="q-pa-md row justify-between">
Expand Down
7 changes: 7 additions & 0 deletions src/stores/deckStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export const useDeckStore = defineStore('deckStore', () => {
const selectedHero = ref({ label: '', value: '' });
const selectedRole = ref({ label: '', value: '' });
const selectedArmor = ref({ label: '', value: '' });
const selectedWeapon = ref({ label: '', value: '' });
const selectedTrinket = ref({ label: '', value: '' });
const selectedMount = ref({ label: '', value: '' });


const initializeDeck = async() => {
loading.value = true;
Expand Down Expand Up @@ -59,6 +63,9 @@ export const useDeckStore = defineStore('deckStore', () => {
selectedHero,
selectedRole,
selectedArmor,
selectedWeapon,
selectedTrinket,
selectedMount,
initializeDeck,
getDeck,
loadDeck,
Expand Down