From cc10f38a5466eaee192ccab8837d099ec7d4ba15 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Thu, 16 Apr 2020 18:53:38 +0300
Subject: [PATCH] Fix styles

---
 src/Dashboard/Components/DashboardApp.vue |  3 +--
 src/Dashboard/Components/Header.vue       |  6 ++++--
 src/Dashboard/Components/TaskList.vue     |  6 ++++--
 src/Game.ts                               | 15 ++++++++++-----
 src/Page/ResourcesBlock.ts                |  9 ++++++---
 src/State/ResourceGrabber.ts              |  6 +++---
 src/State/VillageState.ts                 | 14 ++++++++++++--
 7 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/Dashboard/Components/DashboardApp.vue b/src/Dashboard/Components/DashboardApp.vue
index 89a0cad..1e1f79e 100644
--- a/src/Dashboard/Components/DashboardApp.vue
+++ b/src/Dashboard/Components/DashboardApp.vue
@@ -47,8 +47,7 @@ export default {
 }
 #dashboard-inner {
   background-color: white;
-  margin: 4px;
-  padding-bottom: 10px;
+  padding: 10px;
 }
 .separator {
   margin: 10px auto;
diff --git a/src/Dashboard/Components/Header.vue b/src/Dashboard/Components/Header.vue
index 378c90c..0894827 100644
--- a/src/Dashboard/Components/Header.vue
+++ b/src/Dashboard/Components/Header.vue
@@ -24,10 +24,12 @@ export default {
 <style scoped>
 .title {
   font-size: 160%;
-  margin: 8px;
+  padding-top: 8px;
+  margin-bottom: 8px;
 }
 .version {
   font-size: 120%;
-  margin: 8px;
+  margin-top: 8px;
+  margin-bottom: 8px;
 }
 </style>
diff --git a/src/Dashboard/Components/TaskList.vue b/src/Dashboard/Components/TaskList.vue
index 01d3a84..8c4318d 100644
--- a/src/Dashboard/Components/TaskList.vue
+++ b/src/Dashboard/Components/TaskList.vue
@@ -47,10 +47,12 @@ export default {
 
 <style scoped>
 .task-list {
-  margin: 8px 8px auto;
+  margin-top: 8px;
+  margin-bottom: 8px;
 }
 .summary {
-  margin: 10px auto 0;
+  margin-top: 10px;
+  margin-bottom: 0;
 }
 .container {
   overflow-y: scroll;
diff --git a/src/Game.ts b/src/Game.ts
index 58a2600..d03a098 100644
--- a/src/Game.ts
+++ b/src/Game.ts
@@ -28,15 +28,11 @@ export class Resources {
     readonly clay: number;
     readonly iron: number;
     readonly crop: number;
-    readonly warehouse: number;
-    readonly granary: number;
-    constructor(lumber: number, clay: number, iron: number, crop: number, warehouse: number, granary: number) {
+    constructor(lumber: number, clay: number, iron: number, crop: number) {
         this.lumber = lumber;
         this.clay = clay;
         this.iron = iron;
         this.crop = crop;
-        this.warehouse = warehouse;
-        this.granary = granary;
     }
 
     getByType(type: ResourceType): number {
@@ -61,6 +57,15 @@ export class Resources {
     }
 }
 
+export class ResourceStorage {
+    readonly warehouse: number;
+    readonly granary: number;
+    constructor(warehouse: number, granary: number) {
+        this.warehouse = warehouse;
+        this.granary = granary;
+    }
+}
+
 export class Coordinates {
     readonly x: number;
     readonly y: number;
diff --git a/src/Page/ResourcesBlock.ts b/src/Page/ResourcesBlock.ts
index 14b0b29..59c3f25 100644
--- a/src/Page/ResourcesBlock.ts
+++ b/src/Page/ResourcesBlock.ts
@@ -1,4 +1,4 @@
-import { Resources, ResourceType } from '../Game';
+import { Resources, ResourceStorage, ResourceType } from '../Game';
 import { GrabError } from '../Errors';
 import { getNumber } from '../utils';
 
@@ -8,10 +8,13 @@ export function grabResources(): Resources {
     const iron = grabResource(ResourceType.Iron);
     const crop = grabResource(ResourceType.Crop);
 
+    return new Resources(lumber, clay, iron, crop);
+}
+
+export function grabResourceStorage() {
     const warehouse = grabCapacity('warehouse');
     const granary = grabCapacity('granary');
-
-    return new Resources(lumber, clay, iron, crop, warehouse, granary);
+    return new ResourceStorage(warehouse, granary);
 }
 
 function findStockBarElement() {
diff --git a/src/State/ResourceGrabber.ts b/src/State/ResourceGrabber.ts
index e972f19..ed9fa03 100644
--- a/src/State/ResourceGrabber.ts
+++ b/src/State/ResourceGrabber.ts
@@ -1,13 +1,13 @@
 import { StateGrabber } from './StateGrabber';
 import { grabActiveVillageId } from '../Page/VillageBlock';
-import { grabResources } from '../Page/ResourcesBlock';
+import { grabResources, grabResourceStorage } from '../Page/ResourcesBlock';
 import { VillageState } from './VillageState';
 
 export class ResourceGrabber extends StateGrabber {
     grab(): void {
         const villageId = grabActiveVillageId();
-        const resources = grabResources();
         const state = new VillageState(villageId);
-        state.storeResources(resources);
+        state.storeResources(grabResources());
+        state.storeResourceStorage(grabResourceStorage());
     }
 }
diff --git a/src/State/VillageState.ts b/src/State/VillageState.ts
index 39c3cba..1650998 100644
--- a/src/State/VillageState.ts
+++ b/src/State/VillageState.ts
@@ -1,5 +1,5 @@
 import { DataStorage } from '../Storage/DataStorage';
-import { Resources } from '../Game';
+import { Resources, ResourceStorage } from '../Game';
 
 export class VillageState {
     private storage: DataStorage;
@@ -13,7 +13,17 @@ export class VillageState {
 
     getResources(): Resources {
         let plain = this.storage.get('res');
-        let res = new Resources(0, 0, 0, 0, 0, 0);
+        let res = new Resources(0, 0, 0, 0);
         return Object.assign(res, plain) as Resources;
     }
+
+    storeResourceStorage(storage: ResourceStorage) {
+        this.storage.set('cap', storage);
+    }
+
+    getResourceStorage(): ResourceStorage {
+        let plain = this.storage.get('res');
+        let res = new ResourceStorage(0, 0);
+        return Object.assign(res, plain) as ResourceStorage;
+    }
 }