From 27d85f0cda4d6f71a5a8eab8f416f29f01602b38 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Mon, 11 Mar 2024 00:32:51 +0000 Subject: Add rest of item stack picker --- assets/base.css | 10 +- components/base/ItemStack/ItemStackForm.vue | 248 +++++++++++++++++++++ .../base/ItemStack/ItemStackFormOptionLabel.vue | 26 +++ components/base/ItemStack/ItemStackModal.vue | 159 +++++++++++++ components/base/ItemStack/ItemStackPicker.vue | 96 ++++++++ components/base/ItemStackForm.vue | 50 ----- components/base/ItemStackModal.vue | 159 ------------- components/base/ItemStackPicker.vue | 97 -------- components/base/Modal.vue | 10 +- components/editor/Sidebar.vue | 6 +- data/enchantments.json | 23 ++ data/itemflags.json | 10 + lib/enchantments.ts | 3 + lib/itemflags.ts | 3 + package-lock.json | 4 +- package.json | 3 +- pages/category/[id].vue | 2 +- pages/quest/[id].vue | 2 +- 18 files changed, 590 insertions(+), 321 deletions(-) create mode 100644 components/base/ItemStack/ItemStackForm.vue create mode 100644 components/base/ItemStack/ItemStackFormOptionLabel.vue create mode 100644 components/base/ItemStack/ItemStackModal.vue create mode 100644 components/base/ItemStack/ItemStackPicker.vue delete mode 100644 components/base/ItemStackForm.vue delete mode 100644 components/base/ItemStackModal.vue delete mode 100644 components/base/ItemStackPicker.vue create mode 100644 data/enchantments.json create mode 100644 data/itemflags.json create mode 100644 lib/enchantments.ts create mode 100644 lib/itemflags.ts diff --git a/assets/base.css b/assets/base.css index 5e116e8..9dc14ce 100644 --- a/assets/base.css +++ b/assets/base.css @@ -112,7 +112,7 @@ code { font-family: 'Fira Code', monospace; } -input { +input, textarea { font-family: inherit; font-size: inherit; color: inherit; @@ -123,18 +123,22 @@ input { transition: border-color 0.5s; } -input:focus { +input:focus, textarea:focus { outline: none; border-color: var(--color-primary); } -input:disabled { +input:disabled, textarea:disabled { background: var(--color-background-mute); border-color: var(--color-border); color: var(--color-text-mute); cursor: not-allowed; } +a { + color: var(--color-primary) +} + fieldset { border: 1px solid var(--color-border); } diff --git a/components/base/ItemStack/ItemStackForm.vue b/components/base/ItemStack/ItemStackForm.vue new file mode 100644 index 0000000..ef13abd --- /dev/null +++ b/components/base/ItemStack/ItemStackForm.vue @@ -0,0 +1,248 @@ + + + + + \ No newline at end of file diff --git a/components/base/ItemStack/ItemStackFormOptionLabel.vue b/components/base/ItemStack/ItemStackFormOptionLabel.vue new file mode 100644 index 0000000..ab067f8 --- /dev/null +++ b/components/base/ItemStack/ItemStackFormOptionLabel.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/components/base/ItemStack/ItemStackModal.vue b/components/base/ItemStack/ItemStackModal.vue new file mode 100644 index 0000000..7cf4db9 --- /dev/null +++ b/components/base/ItemStack/ItemStackModal.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/components/base/ItemStack/ItemStackPicker.vue b/components/base/ItemStack/ItemStackPicker.vue new file mode 100644 index 0000000..9141100 --- /dev/null +++ b/components/base/ItemStack/ItemStackPicker.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/components/base/ItemStackForm.vue b/components/base/ItemStackForm.vue deleted file mode 100644 index 250e8c9..0000000 --- a/components/base/ItemStackForm.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/base/ItemStackModal.vue b/components/base/ItemStackModal.vue deleted file mode 100644 index 7a8aae2..0000000 --- a/components/base/ItemStackModal.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/base/ItemStackPicker.vue b/components/base/ItemStackPicker.vue deleted file mode 100644 index 66b665f..0000000 --- a/components/base/ItemStackPicker.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/base/Modal.vue b/components/base/Modal.vue index 46d5da5..f7b6df3 100644 --- a/components/base/Modal.vue +++ b/components/base/Modal.vue @@ -18,7 +18,7 @@ const model = defineModel(); \ No newline at end of file diff --git a/components/editor/Sidebar.vue b/components/editor/Sidebar.vue index 20168df..c48f3b4 100644 --- a/components/editor/Sidebar.vue +++ b/components/editor/Sidebar.vue @@ -29,7 +29,7 @@ const setSelectedType = (type: 'quests' | 'items') => { -
+
{ } #quests { - max-height: calc(100vh - 73px - 46px); - overflow-y: scroll; + max-height: calc(100vh - 73px - 46px - 30px); + overflow-y: auto; } #configuration-container { diff --git a/data/enchantments.json b/data/enchantments.json new file mode 100644 index 0000000..c44e73c --- /dev/null +++ b/data/enchantments.json @@ -0,0 +1,23 @@ +[ +"PROTECTION_ENVIRONMENTAL", +"PROTECTION_FIRE", +"PROTECTION_FALL", +"PROTECTION_EXPLOSIONS", +"PROTECTION_PROJECTILE", +"OXYGEN", +"WATER_WORKER", +"THORNS", +"DEPTH_STRIDER", +"FROST_WALKER", +"BINDING_CURSE", +"DAMAGE_ALL", +"DAMAGE_UNDEAD", +"DAMAGE_ARTHROPODS", +"KNOCKBACK", +"FIRE_ASPECT", +"LOOT_BONUS_MOBS", +"SWEEPING_EDGE", +"DIG_SPEED", +"SILK_TOUCH", +"DURABILITY" +] \ No newline at end of file diff --git a/data/itemflags.json b/data/itemflags.json new file mode 100644 index 0000000..2afe61f --- /dev/null +++ b/data/itemflags.json @@ -0,0 +1,10 @@ +[ + "HIDE_ARMOR_TRIM", + "HIDE_ATTRIBUTES", + "HIDE_DESTROYS", + "HIDE_DYE", + "HIDE_ENCHANTS", + "HIDE_PLACED_ON", + "HIDE_POTION_EFFECTS", + "HIDE_UNBREAKABLE" +] \ No newline at end of file diff --git a/lib/enchantments.ts b/lib/enchantments.ts new file mode 100644 index 0000000..a770feb --- /dev/null +++ b/lib/enchantments.ts @@ -0,0 +1,3 @@ +import enchantments from '@/data/enchantments.json'; + +export default enchantments; \ No newline at end of file diff --git a/lib/itemflags.ts b/lib/itemflags.ts new file mode 100644 index 0000000..a7ce433 --- /dev/null +++ b/lib/itemflags.ts @@ -0,0 +1,3 @@ +import itemflags from '@/data/itemflags.json'; + +export default itemflags; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1b376da..11c78fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "quests-web-editor", "version": "0.0.0", + "hasInstallScript": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-brands-svg-icons": "^6.5.1", @@ -18,7 +19,8 @@ "pinia": "^2.1.7", "vue": "^3.4.15", "vue-multiselect": "^3.0.0-beta.3", - "vue-router": "^4.2.5" + "vue-router": "^4.2.5", + "yaml": "^2.4.1" }, "devDependencies": { "@rushstack/eslint-patch": "^1.3.3", diff --git a/package.json b/package.json index c9fff2d..bd11781 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "pinia": "^2.1.7", "vue": "^3.4.15", "vue-multiselect": "^3.0.0-beta.3", - "vue-router": "^4.2.5" + "vue-router": "^4.2.5", + "yaml": "^2.4.1" }, "devDependencies": { "@rushstack/eslint-patch": "^1.3.3", diff --git a/pages/category/[id].vue b/pages/category/[id].vue index 59993e7..a16df59 100644 --- a/pages/category/[id].vue +++ b/pages/category/[id].vue @@ -92,7 +92,7 @@ const categoryName = sessionStore.getCategoryById(categoryId)?.display.name; display: flex; gap: 1rem; padding: 1rem; - overflow: scroll; + overflow: auto; max-height: calc(100% - 55px); } diff --git a/pages/quest/[id].vue b/pages/quest/[id].vue index a3a393d..6695f69 100644 --- a/pages/quest/[id].vue +++ b/pages/quest/[id].vue @@ -140,7 +140,7 @@ const duplicateQuest = (oldId: string, newId: string) => { display: flex; gap: 1rem; padding: 1rem; - overflow: scroll; + overflow: auto; max-height: calc(100% - 55px); } -- cgit v1.2.3-70-g09d2