From 0b0f5bc39e5c90ee927cd91a4af71f8c12daab93 Mon Sep 17 00:00:00 2001
From: Nero Ignis <neroignis@gmail.com>
Date: Fri, 27 May 2022 22:49:58 +0200
Subject: [PATCH] Item info modal;

---
 concept.md                       |   5 +-
 src/components/CropField.vue     |  15 ++-
 src/components/CropShopView.vue  |   5 -
 src/components/InventoryView.vue | 158 +++++++++++++++++++++----------
 src/data/Items.js                |   7 +-
 src/helpers.js                   |   2 +-
 src/store/index.js               |  12 +++
 src/style/app.scss               |   7 +-
 8 files changed, 148 insertions(+), 63 deletions(-)

diff --git a/concept.md b/concept.md
index 606e699..81244f5 100644
--- a/concept.md
+++ b/concept.md
@@ -27,17 +27,18 @@
 - [x] Stores
   - [ ] Each store has tabs [buy / sell]
   - [ ] Depending on store-itemtype, sell-price is 100% or 70%
-  - [ ] Crop-Store
+  - [x] Crop-Store
   - [ ] Animal Store
   - [ ] Machine Store (crafting machines)
   - [ ] Different operation hours for each store
   - [ ] Pixel-art counters / storefronts with shopkeepers
-    - [ ] purchases and failed purchases (no $) trigger emotions on the shopkeepers
+    - [ ] purchases and failed purchases (no $) trigger emotion-bubbles on the shopkeepers
     - [ ] text-boxes for greetings
 - [x] Inventory system
   - [x] Sorting
   - [x] Grouping
   - [ ] Trash items
+  - [ ] Display item-info
 - [ ] Way to sell harvested goods
 - [ ] Quests
   - [ ] Item-quests
diff --git a/src/components/CropField.vue b/src/components/CropField.vue
index 9c36a7d..2f332fd 100644
--- a/src/components/CropField.vue
+++ b/src/components/CropField.vue
@@ -14,7 +14,7 @@
 
         <div class="modal fade" id="cropInventoryModal" tabindex="-1" aria-labelledby="cropInventoryModalLabel"
              aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-dialog modal-dialog-centered modal-sm">
                 <div class="modal-content steel-border">
                     <div class="modal-body">
                         <div class="row">
@@ -49,9 +49,15 @@
 <script>
 import Modal from 'bootstrap/js/src/modal'
 import ItemService from "@/services/ItemService";
+import iziToast from "izitoast";
 
 export default {
     name: "CropField",
+    data() {
+        return {
+            selectedItem: null
+        }
+    },
     computed: {
         fields() {
             return this.$store.state.cropField;
@@ -63,6 +69,13 @@ export default {
                 this.selectSeed(field.id);
             } else if (field.data.readyForHarvest) {
                 this.harvestField(field);
+            } else if (!field.data.readyForHarvest) {
+                let seed = ItemService.getItemByID(field.data.crop_id)
+                console.log(seed)
+
+                iziToast.info({
+                    title: 'KUCHEN'
+                })
             }
         },
         selectSeed(id) {
diff --git a/src/components/CropShopView.vue b/src/components/CropShopView.vue
index 48f9ebc..8ab66c7 100644
--- a/src/components/CropShopView.vue
+++ b/src/components/CropShopView.vue
@@ -186,9 +186,4 @@ export default {
     margin: 0 0.1em;
     display: inline-block;
 }
-
-.number-marker {
-    color: green;
-    text-decoration: underline;
-}
 </style>
\ No newline at end of file
diff --git a/src/components/InventoryView.vue b/src/components/InventoryView.vue
index 1c25223..63b08b4 100644
--- a/src/components/InventoryView.vue
+++ b/src/components/InventoryView.vue
@@ -4,65 +4,38 @@
             <div class="col-12">
                 <div class="float-end" id="sort-buttons">
                     <div class="pixel-border-static" v-on:click="$store.commit('toggleGrouping')">
-                        Group by category
+                        {{ $store.state.groupInventory ? 'Group by category' : 'List all'}}
                     </div>
 
                     <div class="pixel-border-static" v-on:click="$store.commit('sortInventory')">
-                        Sort {{ $store.state.inventorySortDesc ? 'Z-A' : 'A-Z' }}
+                        {{ $store.state.inventorySortDesc ? 'A-Z' : 'Z-A' }}
+                    </div>
+
+                    <div class="pixel-border-static" v-on:click="$store.commit('sortInventoryByQuantity')">
+                        QNTY
                     </div>
                 </div>
             </div>
             <template v-if="$store.state.groupInventory">
-                <template v-if="$store.getters.getSeedsInInventory.length > 0">
-                    <div class="col-12 inventory-header">
-                        <h5>Seeds</h5>
-                    </div>
-                    <div class="col-6"
-                         v-for="item in $store.getters.getSeedsInInventory"
-                         v-bind:key="item"
-                         data-bs-dismiss="modal">
-                        <div :class="'inventory-item ' + getFrameClass(item.type)">
-                            <div class="float-end">
-                                <img :src="item.icon" :alt="item.name" class="item-icon">
-                            </div>
-                            {{ item.name }}<br/>
-                            x{{ item.quantity }}
-                        </div>
-                    </div>
-                </template>
-                <template v-if="$store.getters.getFieldProductsInInventory.length > 0">
-                    <div class="col-12 inventory-header">
-                        <h5>Field products</h5>
-                    </div>
-                    <div class="col-6"
-                         v-for="item in $store.getters.getFieldProductsInInventory"
-                         v-bind:key="item"
-                         data-bs-dismiss="modal">
-                        <div :class="'inventory-item ' + getFrameClass(item.type)">
-                            <div class="float-end">
-                                <img :src="item.icon" :alt="item.name" class="item-icon">
-                            </div>
-                            {{ item.name }}<br/>
-                            x{{ item.quantity }}
+                <template v-for="category in categories" v-bind:key="category.name">
+                    <template v-if="category.items.length > 0">
+                        <div class="col-12 inventory-header">
+                            <h5>{{ category.name }}</h5>
                         </div>
-                    </div>
-                </template>
-                <template v-if="$store.getters.getAnimalProductsInInventory.length > 0">
-                    <div class="col-12 inventory-header">
-                        <h5>Animal products</h5>
-                    </div>
-                    <div class="col-6"
-                         v-for="item in $store.getters.getAnimalProductsInInventory"
-                         v-bind:key="item"
-                         data-bs-dismiss="modal">
-                        <div :class="'inventory-item ' + getFrameClass(item.type)">
-                            <div class="float-end">
-                                <img :src="item.icon" :alt="item.name" class="item-icon">
+
+                        <div class="col-6"
+                             v-for="item in category.items"
+                             v-bind:key="item"
+                             data-bs-dismiss="modal">
+                            <div :class="'inventory-item ' + getFrameClass(item.type)" v-on:click="showItemInfo(item)">
+                                <div class="float-end">
+                                    <img :src="item.icon" :alt="item.name" class="item-icon">
+                                </div>
+                                {{ item.name }}<br/>
+                                x{{ item.quantity }}
                             </div>
-                            {{ item.name }}<br/>
-                            x{{ item.quantity }}
                         </div>
-                    </div>
+                    </template>
                 </template>
             </template>
             <template v-else>
@@ -70,7 +43,7 @@
                      v-for="item in $store.getters.getInventoryWithItemData"
                      v-bind:key="item"
                      data-bs-dismiss="modal">
-                    <div :class="'inventory-item ' + getFrameClass(item.type)">
+                    <div :class="'inventory-item ' + getFrameClass(item.type)" v-on:click="showItemInfo(item)">
                         <div class="float-end">
                             <img :src="item.icon" :alt="item.name" class="item-icon">
                         </div>
@@ -83,17 +56,98 @@
                 Your inventory is empty.
             </div>
         </div>
+
+        <div class="modal fade" id="itemInfoModal" tabindex="-1" aria-labelledby="itemInfoModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-content steel-border" v-if="selectedItem">
+                    <div class="modal-header">
+                        <div class="float-start">
+                            <img :src="selectedItem.icon" :alt="selectedItem.name" class="item-icon">
+                            {{ selectedItem.name }}
+                        </div>
+                    </div>
+                    <div class="modal-body" v-if="selectedItem">
+                        <div class="row">
+                            <div class="col-12" v-if="selectedItem.description" v-html="selectedItem.description">
+
+                            </div>
+                            <div class="col-12" v-if="selectedItem.cropData">
+                                <div class="float-end">
+                                    <img :src="selectedSeedFieldProductIcon" alt="">
+                                </div>
+                                <small class="text-muted">Seed info</small><br/>
+                                Sells for <span class="number-marker">{{ selectedItem.economy.sell }}$</span> when harvested.<br/>
+                                Takes <span class="number-marker">{{ selectedItem.cropData.timeToGrow }}</span> minutes to grow.
+                                <hr>
+                            </div>
+                            <div class="col-12" v-if="selectedItem.cropData">
+                                <div class="float-end">
+                                    <img :src="selectedSeedFieldProductIcon" alt="">
+                                </div>
+                                <small class="text-muted">Seed info</small><br/>
+                                Sells for <span class="number-marker">{{ selectedItem.economy.sell }}$</span> when harvested.<br/>
+                                Takes <span class="number-marker">{{ selectedItem.cropData.timeToGrow }}</span> minutes to grow.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <div class="float-end">
+                            <div class="btn-pixel" data-bs-dismiss="modal">
+                                Close
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
-import {ItemTypeFrameClasses} from "@/data/ItemTypes";
+import {ItemTypeFrameClasses, ItemTypes} from "@/data/ItemTypes";
+import {openModal} from "@/helpers";
+import ItemService from "@/services/ItemService";
 
 export default {
     name: "InventoryView",
+    data() {
+        return {
+            selectedItem: null,
+        }
+    },
+    computed: {
+        categories() {
+            return [
+                {
+                    name: 'Seeds',
+                    type: ItemTypes.Seeds,
+                    items: this.$store.getters.getSeedsInInventory
+                },
+                {
+                    name: 'Field products',
+                    type: ItemTypes.FieldProducts,
+                    items: this.$store.getters.getFieldProductsInInventory
+                },
+                {
+                    name: 'Animal products',
+                    type: ItemTypes.AnimalProducts,
+                    items: this.$store.getters.getAnimalProductsInInventory
+                }
+            ]
+        },
+        selectedSeedFieldProductIcon() {
+            let product = ItemService.getItemByID(this.selectedItem.cropData.product_id);
+            return product.icon;
+        }
+    },
     methods: {
         getFrameClass(type) {
             return ItemTypeFrameClasses[type];
+        },
+        showItemInfo(item) {
+            this.selectedItem = item;
+            openModal('itemInfoModal');
+            console.log(item);
         }
     }
 }
@@ -129,7 +183,7 @@ export default {
     color: white;
 }
 
-.pixel-border-static {
+#sort-buttons .pixel-border-static, #sort-buttons .pixel-border-red, #sort-buttons .pixel-border-green {
     margin-left: 0.3em;
     display: inline-block;
     background-color: white;
diff --git a/src/data/Items.js b/src/data/Items.js
index 05f5a2d..f88e368 100644
--- a/src/data/Items.js
+++ b/src/data/Items.js
@@ -559,7 +559,12 @@ export default [
         id: AnimalProducts.Egg,
         name: 'Egg',
         type: ItemTypes.AnimalProducts,
-        description: '',
+        description: '<iframe\n' +
+            '    src="https://player.twitch.tv/?channel=mobula_birostris&parent=stingl.dev"\n' +
+            '    height="300px"\n' +
+            '    width="100%"\n' +
+            '    allowfullscreen>\n' +
+            '</iframe>',
         assetsFolder: FoodAssets + 'egg_whole_brown.png',
         icon: FoodAssets + 'egg_whole_brown.png',
         economy: {
diff --git a/src/helpers.js b/src/helpers.js
index 56cc6dc..ddef433 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -1,6 +1,6 @@
 import Modal from "bootstrap/js/src/modal";
 
 export const openModal = (modalName) => {
-    const modal = new Modal(document.getElementById(modalName))
+    let modal = new Modal(document.getElementById(modalName))
     modal.toggle();
 }
diff --git a/src/store/index.js b/src/store/index.js
index b964598..696b83a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -27,6 +27,7 @@ export default createStore({
         },
         inventory: [],
         inventorySortDesc: true,
+        inventorySortQntyDesc: true,
         groupInventory: false,
         cropField: [],
         selections: {
@@ -240,6 +241,17 @@ export default createStore({
 
             state.inventorySortDesc = !state.inventorySortDesc;
         },
+        sortInventoryByQuantity(state) {
+            state.inventory = state.inventory.sort((a, b) => {
+                if (state.inventorySortQntyDesc === true) {
+                    return (b.quantity > a.quantity) ? 1 : -1;
+                } else {
+                    return (a.quantity < b.quantity) ? -1 : 1;
+                }
+            });
+
+            state.inventorySortQntyDesc = !state.inventorySortQntyDesc;
+        },
         toggleGrouping(state) {
             state.groupInventory = !state.groupInventory;
         }
diff --git a/src/style/app.scss b/src/style/app.scss
index 29891db..9b8dd46 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -13,4 +13,9 @@ body {
 
 .text-right {
     text-align: right;
-}
\ No newline at end of file
+}
+
+.number-marker {
+    color: green;
+    text-decoration: underline;
+}