From c1f00da176bc8178a8cac493db8ba29d2ca8b00a Mon Sep 17 00:00:00 2001
From: Sirttas <calloch.gael@gmail.com>
Date: Sat, 16 Sep 2023 13:02:24 +0200
Subject: [PATCH] get orders

---
 src/market/Market.vue            | 28 ++++++++++++++++++++++++----
 src/market/MarketResultTable.vue | 22 +++++++++++++++++-----
 src/market/market.ts             |  2 ++
 src/service.ts                   |  3 ++-
 src/table/SortableHeader.vue     |  2 +-
 5 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/market/Market.vue b/src/market/Market.vue
index 2a5f786..32661fa 100644
--- a/src/market/Market.vue
+++ b/src/market/Market.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { evepraisalAxiosInstance } from '@/service';
 import { useStorage } from '@vueuse/core';
 import { onMounted, ref, watch } from 'vue';
 import { MarketOrderHistory, MarketResult, getHistory, jitaId } from ".";
@@ -15,8 +16,16 @@ const itemsStorage = useStorage<MarketItemStorage[]>('market-items', []);
 const items = ref<MarketResult[]>([]);
 const addOrRelaod = async (type: MarketType) => {
     const typeID = type.id;
-    const history = await getHistory(jitaId, typeID);
-    const item = { type, history };
+    const [history, price] = await Promise.all([
+        getHistory(jitaId, typeID),
+        evepraisalAxiosInstance.post('/appraisal.json?market=jita&persist=no', type.name)
+    ]);
+    const item = {
+        type,
+        history,
+        buy: price.data.appraisal.items[0].prices.buy.max,
+        sell: price.data.appraisal.items[0].prices.sell.min
+    };
 
     if (items.value.some(i => i.type.id === typeID)) {
         items.value = items.value.map(i => i.type.id === typeID ? item : i);
@@ -37,9 +46,20 @@ const addItem = async () => {
 watch(items, itms => itemsStorage.value = itms.map(i => ({ typeID: i.type.id, history: i.history })));
 onMounted(async () => {
     const types = await getMarketTypes(itemsStorage.value.map(i => i.typeID));
+    const prices: any = (await evepraisalAxiosInstance.post(`/appraisal.json?market=jita&persist=no&raw_textarea=${types.map(t => t.name).join("%0A")}`)).data;
 
-    items.value = itemsStorage.value.map(i => ({ ...i, type: types.find(t => t.id === i.typeID) as MarketType }));
-})
+    items.value = itemsStorage.value.map(i => {
+        const type = types.find(t => t.id === i.typeID) as MarketType;
+        const price = prices.appraisal.items.find((p: any) => p.typeID === i.typeID);
+        
+        return {
+            ...i,
+            type: type,
+            buy: price.prices.buy.max,
+            sell: price.prices.sell.min
+        };
+    });
+});
 </script>
 
 <template>
diff --git a/src/market/MarketResultTable.vue b/src/market/MarketResultTable.vue
index 44c6f3b..4306311 100644
--- a/src/market/MarketResultTable.vue
+++ b/src/market/MarketResultTable.vue
@@ -33,6 +33,8 @@ const { sortedArray, headerProps } = useSort(computed(() => props.items
             type: r.type,
             typeID: r.type.id,
             name: r.type.name,
+            buy: r.buy,
+            sell: r.sell,
             q1: quartils.q1,
             mmedian: quartils.median,
             q3: quartils.q3,
@@ -47,15 +49,15 @@ const { sortedArray, headerProps } = useSort(computed(() => props.items
 <template>
     <div class="flex">
         <div class="flex justify-self-end mb-2 mt-4 ms-auto">
-        <div class="justify-self-end ms-2">
+        <div class="end">
             <span>Days: </span>
             <input type="number" min="1" max="365" step="1" v-model="days" />
         </div>
-        <div class="justify-self-end ms-2">
+        <div class="end">
             <span>Filter: </span>
             <input type="text" class="w-96" v-model="filter" >
         </div>
-        <div class="justify-self-end ms-2">
+        <div class="end">
             <button class="flex" @click="$emit('relaodAll')"><ArrowPathIcon class="h-6 w-6 me-2" />Reload all</button>
         </div>
     </div>
@@ -64,6 +66,8 @@ const { sortedArray, headerProps } = useSort(computed(() => props.items
         <thead>
             <tr>
                 <SortableHeader v-bind="headerProps" sortKey="name">Item</SortableHeader>
+                <SortableHeader v-bind="headerProps" sortKey="buy">Buy</SortableHeader>
+                <SortableHeader v-bind="headerProps" sortKey="sell">Sell</SortableHeader>
                 <SortableHeader v-bind="headerProps" sortKey="q1">Q1</SortableHeader>
                 <SortableHeader v-bind="headerProps" sortKey="median">Median</SortableHeader>
                 <SortableHeader v-bind="headerProps" sortKey="q3">Q3</SortableHeader>
@@ -72,10 +76,12 @@ const { sortedArray, headerProps } = useSort(computed(() => props.items
             </tr>
         </thead>
         <tbody>
-            <tr v-for="r in sortedArray" :key="r.typeID" class="cursor-pointer" @click="copyToClipboard(r.name)">
+            <tr v-for="r in sortedArray" :key="r.typeID" class="cursor-pointer"  :class="{'bg-emerald-500': r.buy <= r.q1 }" @click="copyToClipboard(r.name)">
                 <td>
                     <MarketTypeLabel :id="r.typeID" :name="r.name" />
                 </td>
+                <td class="text-right">{{ formatIsk(r.buy) }}</td>
+                <td class="text-right">{{ formatIsk(r.sell) }}</td>
                 <td class="text-right">{{ formatIsk(r.q1) }}</td>
                 <td class="text-right">{{ formatIsk(r.mmedian) }}</td>
                 <td class="text-right">{{ formatIsk(r.q3) }}</td>
@@ -86,4 +92,10 @@ const { sortedArray, headerProps } = useSort(computed(() => props.items
             </tr>
         </tbody>
     </table>
-</template>
\ No newline at end of file
+</template>
+
+<style scoped>
+div.end {
+    @apply justify-self-end ms-2;
+}
+</style>
\ No newline at end of file
diff --git a/src/market/market.ts b/src/market/market.ts
index 8f15c1b..eb713ef 100644
--- a/src/market/market.ts
+++ b/src/market/market.ts
@@ -15,6 +15,8 @@ export type MarketOrderHistory = {
 export type MarketResult = {
     type: MarketType;
     history: MarketOrderHistory[];
+    buy: number,
+    sell: number
 }
 
 export type HistoryQuartils = {
diff --git a/src/service.ts b/src/service.ts
index 4ccb1dc..f2037be 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -24,6 +24,7 @@ export const esiAxiosInstance = axios.create({
     baseURL: esiUrl,
     headers: {
         'accept': 'application/json',
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        "User-Agent": "eveal (eveal.shendai.rip calloch.gael@gmail.com)"
     },
 })
diff --git a/src/table/SortableHeader.vue b/src/table/SortableHeader.vue
index 4a755c2..5e53469 100644
--- a/src/table/SortableHeader.vue
+++ b/src/table/SortableHeader.vue
@@ -26,7 +26,7 @@ const emit = defineEmits<Emit>();
 
 <style scoped>
 th {
-    @apply relative h-8;
+    @apply relative h-8 pe-3;
 }
 span.asc, span.desc {
     @apply absolute end-2 cursor-pointer text-xs;