From 48bfed5f012d10c4784ce902bb6731f53abd46b7 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 1 Jul 2020 11:57:47 +0300
Subject: [PATCH] Remove market line

Now those actions are unnecessary
---
 src/DashboardView/VillageStateList.vue       | 25 --------------------
 src/DashboardView/VillageStateStatusLine.vue |  6 ++++-
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue
index ee4b8dd..1b8da02 100644
--- a/src/DashboardView/VillageStateList.vue
+++ b/src/DashboardView/VillageStateList.vue
@@ -83,21 +83,6 @@
             v-if="!villageState.incomingResources.empty()"
           />
 
-          <tr class="normal-line">
-            <td class="right" colspan="7">
-              <a
-                v-for="s in shared.villageStates"
-                v-if="s.id !== villageState.id"
-                class="village-quick-link"
-                :href="marketPath(villageState.village, s.village)"
-                :title="
-                  'Отправить ресурсы из ' + villageState.village.name + ' в ' + s.village.name
-                "
-                >$->{{ s.village.name }}</a
-              >
-            </td>
-          </tr>
-
           <status-line class="second-line" :village-state="villageState" />
 
           <tr class="task-list-line" v-if="isTaskListVisible(villageState.id)">
@@ -114,7 +99,6 @@
 <script>
 import ResourceBalance from './ResourceBalance';
 import VillageResource from './VillageResource';
-import { MARKET_ID } from '../Core/Buildings';
 import { path } from '../Helpers/Path';
 import { Actions } from './Store';
 import { translateProductionQueue } from '../Core/ProductionQueue';
@@ -160,15 +144,6 @@ export default {
       const toFull = villageState.storage.timeToFull;
       return this.renderGatheringTime(toFull.never ? toZero : toFull);
     },
-    marketPath(fromVillage, toVillage) {
-      return path('/build.php', {
-        newdid: fromVillage.id,
-        gid: MARKET_ID,
-        t: 5,
-        x: toVillage.crd.x,
-        y: toVillage.crd.y,
-      });
-    },
     renderTimeInSeconds(value) {
       return secondsToTime(value);
     },
diff --git a/src/DashboardView/VillageStateStatusLine.vue b/src/DashboardView/VillageStateStatusLine.vue
index b521063..105bcc8 100644
--- a/src/DashboardView/VillageStateStatusLine.vue
+++ b/src/DashboardView/VillageStateStatusLine.vue
@@ -5,6 +5,7 @@
       <a href="#" v-text="settings.receiveResourcesMode" v-on:click.prevent="toggleMode()"></a>,
       <span v-text="status"></span>
       |
+      <a class="village-quick-link" :href="marketPath(villageState.village)">Рынок</a>
       <a class="village-quick-link" :href="quartersPath(villageState.village)">Казармы</a>
       <a class="village-quick-link" :href="horseStablePath(villageState.village)">Конюшни</a>
       <a class="village-quick-link" :href="collectionPointPath(villageState.village)">Войска</a>
@@ -15,7 +16,7 @@
 <script>
 import { Actions } from './Store';
 import { path } from '../Helpers/Path';
-import { COLLECTION_POINT_ID, HORSE_STABLE_ID, QUARTERS_ID } from '../Core/Buildings';
+import { COLLECTION_POINT_ID, HORSE_STABLE_ID, MARKET_ID, QUARTERS_ID } from '../Core/Buildings';
 
 export default {
   props: {
@@ -39,6 +40,9 @@ export default {
       const villageId = this.villageState.id;
       this.$store.dispatch(Actions.ToggleVillageReceiveMode, { villageId });
     },
+    marketPath(village) {
+      return path('/build.php', { newdid: village.id, gid: MARKET_ID, t: 5 });
+    },
     collectionPointPath(village) {
       return path('/build.php', { newdid: village.id, gid: COLLECTION_POINT_ID, tt: 1 });
     },