pb

package-lock.json

@@ -9,14 +9,15 @@
       "version": "0.0.0",
       "dependencies": {
         "@heroicons/vue": "^2.0.18",
+        "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
         "@vueuse/core": "^10.2.1",
         "@vueuse/integrations": "^10.2.1",
         "axios": "^1.4.0",
+        "pocketbase": "^0.18.0",
         "vue": "^3.3.4",
         "vue-router": "^4.2.4"
       },
       "devDependencies": {
-        "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
         "@types/node": "^20.4.5",
         "@vitejs/plugin-vue": "^4.2.3",
         "autoprefixer": "^10.4.14",
@@ -496,7 +497,6 @@
       "version": "0.0.0-insiders.565cd3e",
       "resolved": "https://registry.npmjs.org/@tailwindcss/nesting/-/nesting-0.0.0-insiders.565cd3e.tgz",
       "integrity": "sha512-WhHoFBx19TnH/c+xLwT/sxei6+4RpdfiyG3MYXfmLaMsADmVqBkF7B6lDalgZD9YdM459MF7DtxVbWkOrV7IaQ==",
-      "dev": true,
       "dependencies": {
         "postcss-nested": "^5.0.5"
       },
@@ -508,7 +508,6 @@
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
       "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
-      "dev": true,
       "dependencies": {
         "postcss-selector-parser": "^6.0.6"
       },
@@ -1156,7 +1155,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -1730,6 +1728,11 @@
         "node": ">= 6"
       }
     },
+    "node_modules/pocketbase": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/pocketbase/-/pocketbase-0.18.0.tgz",
+      "integrity": "sha512-09ri0Rnm4JjboU4OJeibd6pgvKi4DPg/r/Uu/QI3mKSZsrROoMT75zyiOldbBBMWZUDG1TRlv6BjQj30SFsrVw=="
+    },
     "node_modules/postcss": {
       "version": "8.4.29",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
@@ -1845,7 +1848,6 @@
       "version": "6.0.13",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
       "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-      "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -2151,8 +2153,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-      "dev": true
     },
     "node_modules/vite": {
       "version": "4.4.9",

package.json

@@ -9,11 +9,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
     "@heroicons/vue": "^2.0.18",
+    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
     "@vueuse/core": "^10.2.1",
     "@vueuse/integrations": "^10.2.1",
     "axios": "^1.4.0",
+    "pocketbase": "^0.18.0",
     "vue": "^3.3.4",
     "vue-router": "^4.2.4"
   },

src/market/scan/ScanResultTable.vue

@@ -2,7 +2,7 @@
 import { formatIsk, percentFormater } from '@/formaters';
 import { MarketType, MarketTypeLabel } from "@/market";
 import { SortableHeader, useSort } from '@/table';
-import { ArrowPathIcon, ShoppingCartIcon } from '@heroicons/vue/24/outline';
+import { ShoppingCartIcon } from '@heroicons/vue/24/outline';
 import { useStorage } from '@vueuse/core';
 import { computed, ref } from 'vue';
 import { ScanResult, getHistoryQuartils } from '.';
@@ -24,8 +24,6 @@ interface Props {
 }
 
 interface Emits {
-    (e: 'relaod', type: MarketType): void;
-    (e: 'relaodAll'): void;
     (e: 'buy', type: MarketType, buy: number, sell: number): void;
 }
 
@@ -84,9 +82,6 @@ const getLineColor = (result: Result) => {
                 <span>Filter: </span>
                 <input type="search" class="w-96" v-model="filter" >
             </div>
-            <div class="end">
-                <button class="flex" @click="$emit('relaodAll')"><ArrowPathIcon class="stroke-slate-100 sh-6 w-6 me-2" />Reload all</button>
-            </div>
         </div>
     </div>
     <table>
@@ -115,7 +110,6 @@ const getLineColor = (result: Result) => {
                 <td class="text-right">{{  percentFormater.format(r.profit) }}</td>
                 <td class="text-right">
                     <button class="btn-icon-stroke me-1" @click="$emit('buy', r.type, r.buy, r.sell)"><ShoppingCartIcon /></button>
-                    <button class="btn-icon-stroke me-1" @click="$emit('relaod', r.type)"><ArrowPathIcon /></button>
                 </td>
             </tr>
         </tbody>

src/pages/market/Scan.vue

@@ -1,24 +1,13 @@
 <script setup lang="ts">
-import { MarketOrderHistory, MarketType, MarketTypePrice, getHistory, getMarketType, getMarketTypes, getPrice, getPrices, jitaId } from "@/market";
+import { MarketType, MarketTypePrice, getHistory, getMarketType, getMarketTypes, getPrice, getPrices, jitaId } from "@/market";
 import { BuyModal, ScanResult, ScanResultTable } from '@/market/scan';
 import { useStorage } from '@vueuse/core';
 import { onMounted, ref, watch } from 'vue';
 
-type MarketItemStorage = {
-    typeID: number;
-    history: MarketOrderHistory[];
-}
-
 const buyModal = ref<typeof BuyModal>();
 
 const item = ref("");
-/**
+const itemsStorage = useStorage<number[]>('market-scan-items', []);
- * @deprecated use itemsStorage instead
- * 
- * TODO: remove this in the future
- */
-const oldStorage = useStorage<MarketItemStorage[]>('market-items', []);
-const itemsStorage = useStorage<MarketItemStorage[]>('market-scan-items', []);
 const items = ref<ScanResult[]>([]);
 const addOrRelaod = async (type: MarketType) => {
     const typeID = type.id;
@@ -39,9 +28,6 @@ const addOrRelaod = async (type: MarketType) => {
         items.value = [ ...items.value, item];
     }
 }
-const reloadAll = async () => {
-    items.value = await Promise.all(items.value.map( async i => ({ ...i, history: await getHistory(jitaId, i.type.id) })));
-}
 const addItem = async () => {
     const type = await getMarketType(item.value.split('\t')[0]);
     
@@ -49,26 +35,20 @@ const addItem = async () => {
     addOrRelaod(type);
 }
 
-watch(items, itms => itemsStorage.value = itms.map(i => ({ typeID: i.type.id, history: i.history })));
+watch(items, itms => itemsStorage.value = itms.map(i => i.type.id));
 onMounted(async () => {
-
     if (itemsStorage.value.length === 0) {
-        if (oldStorage.value.length > 0) {
-            itemsStorage.value = oldStorage.value;
-            oldStorage.value = [];
-        } else {
-            return;
-        }
         return;
     }
 
-    const prices = await getPrices(await getMarketTypes(itemsStorage.value.map(i => i.typeID)));
+    const prices = await getPrices(await getMarketTypes(itemsStorage.value));
 
-    items.value = itemsStorage.value.map(i => {
+    items.value = await Promise.all(itemsStorage.value.map(async i => {
-        const price = prices.find(p => p.type.id === i.typeID) as MarketTypePrice;
+        const price = prices.find(p => p.type.id === i) as MarketTypePrice;
+        const history = await getHistory(jitaId, i);
         
-        return { ...i, ...price };
+        return { id: i, history, ...price };
-    });
+    }));
 });
 
 </script>
@@ -83,7 +63,7 @@ onMounted(async () => {
     </div>
     <template v-if="items.length > 0">
         <hr />
-        <ScanResultTable :items="items" @relaod="type => addOrRelaod(type)" @relaodAll="reloadAll" @buy="(type, buy, sell) => buyModal?.open(type, { 'Buy': buy, 'Sell': sell })" />
+        <ScanResultTable :items="items" @buy="(type, buy, sell) => buyModal?.open(type, { 'Buy': buy, 'Sell': sell })" />
         <BuyModal ref="buyModal" />
     </template>
 </template>