From dbeb5398222a1f190f1019af874e0000f4849346 Mon Sep 17 00:00:00 2001 From: Nero Ignis Date: Fri, 27 May 2022 19:33:55 +0200 Subject: [PATCH] WIP tabs; --- concept.md | 2 + src/assets/gui/border_dark.png | Bin 2019 -> 7933 bytes src/assets/gui/border_light.png | Bin 2019 -> 7744 bytes src/components/CropShopView.vue | 128 ++++++++++++++++++++++++++++++++ src/components/ShopView.vue | 94 ----------------------- src/router/index.js | 6 +- 6 files changed, 133 insertions(+), 97 deletions(-) create mode 100644 src/components/CropShopView.vue delete mode 100644 src/components/ShopView.vue diff --git a/concept.md b/concept.md index afb18fe..606e699 100644 --- a/concept.md +++ b/concept.md @@ -25,6 +25,8 @@ - [ ] Mini blackjack - [ ] Mini slotmachine - [x] Stores + - [ ] Each store has tabs [buy / sell] + - [ ] Depending on store-itemtype, sell-price is 100% or 70% - [ ] Crop-Store - [ ] Animal Store - [ ] Machine Store (crafting machines) diff --git a/src/assets/gui/border_dark.png b/src/assets/gui/border_dark.png index e7aaca039dda54a180110aad259b91733ee55e4a..60332065207c286f148cae5849cc8140ecd4b52f 100644 GIT binary patch literal 7933 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 literal 2019 zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM4rT@h2IbheO+bpVILO_JVcj{Imp~3nx}&cn z1H;CC?mvmF3=GT+0X`wFK=H*v3j5OywibK;Z?`$s9QJ=^)V+i2{~wt7|LDU1S9iU+ zd-?yJWB(st{Qv(yQ1K`j4T0el0<}pAM}hf-p(MyJ7?{FGGGGY)&aMiKTh0QH$YKTt zZeb8+WSBKa0$5lic)B=-RK&f#da>xTg+xQ(v^=NT+xGmwEtZ@qnH~IN!So+B<K*mQn8D3=P%`*Pa&LG`pL(z4DRC-hKP_?b#EvKHT9wyT-5B1#90H8qa#} zcX`?8A3rLtFl=Gb_+`A{ZLrOGm0k1glpTy6F1k0ksn2xzemR{bgH3~L!S=l$4er0m z-F;l;*X!RmzepN2FoeppTZMkURqdR7f??L#?DxFAip&{i>-U8H-T}B3Fo&q9$-S>V4lLD>)W&!s5VpR4ew0OlAL|^sTi4n38;aOF=`fzeO2{u Zw!?ZhJq}y4fYmqygQu&X%Q~loCIDW$T5kXV diff --git a/src/assets/gui/border_light.png b/src/assets/gui/border_light.png index d2e640603eb1516c2b05ad52ec7d75945823a1ce..3f45dc032a6f2670e03c33a890cfdf3c48f3ecd0 100644 GIT binary patch literal 7744 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 Ph5&nOC#&);0WtpuzG(b~ literal 2019 zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM4rT@h2IbheO+bpVILO_JVcj{Imp~3nx}&cn z1H;CC?mvmF3=GT+0X`wFK=E@0I@dY_pY%Gtn4kE6bI|{N*{=>S|9^ei|A)Ij-Z=LE z$1Z*aPzkLrIWdFffIWWWW&oom~|ex10qYk;M!Q z+`=Ht$S`Y;1hBA3@N{tusfc@f^>)z}3lWDvwaX?iV}AVK&wK1rz_pSDXSt8J@~16b zcWKq9m;U+Xw)emOH1Tb6ZkVQaP|?AA@&kbdOFauXE?iQvV9Cf7l9}ZYob>*_u=$LC zH>HglrZKoSC^-l&&}ewJZtupIJZHJ(rCvL;2`tEp`*9&c-e^BlRYk>*q9(oRr}uoW zXN+PJVZE^1WbxY%*M-0Q_+jzy?sm0<_Z%2lR{Y|)FvHH@-~Y4uzgKzNZ>N>)jbq#^ zzu*Ob!?8=(JeQr{_}kM&gW)WL>wfN%RWFO*)CqwM`z!L|w|RMl)x$5AW@;Dtc^&@q z2e4=`i7<9S-NiA=9h{-TwP5Y(r<-zj-Oc-aB(tivwzjfzXWaURd;9@kb~{Ahew=1< ze(o~g=Rbe`T)~*Z8So|D;r8;1d7dTqwQdb*4U762di{(#-z`7Sae*g5#38@>apJz4 zx6ArHzg+*m`K56R1LGB! zJcU8mw`s2;GcaMl;gtlY_JsTs3{kUKs)1@Rsoan@5`J-`rv4Q6oWQijgtP9;w{N`D WGgIXp&RnPg6|SDHelF{r5}E*h>S1L7 diff --git a/src/components/CropShopView.vue b/src/components/CropShopView.vue new file mode 100644 index 0000000..3960d9a --- /dev/null +++ b/src/components/CropShopView.vue @@ -0,0 +1,128 @@ + + + + + \ No newline at end of file diff --git a/src/components/ShopView.vue b/src/components/ShopView.vue deleted file mode 100644 index 4f0f954..0000000 --- a/src/components/ShopView.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index ff795f2..b684391 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import {createRouter, createWebHistory} from 'vue-router' import FieldView from '@/components/CropField' -import ShopView from "@/components/ShopView"; +import CropShopView from "@/components/CropShopView"; import InventoryView from "@/components/InventoryView"; const routes = [ @@ -16,7 +16,7 @@ const routes = [ { path: '/shop', name: 'shop', - component: ShopView, + component: CropShopView, meta: { title: 'Shop', background: '/assets/backgrounds/planks.jpg', @@ -36,7 +36,7 @@ const routes = [ { path: '/barn', name: 'barn', - component: ShopView, + component: CropShopView, meta: { title: 'Barn', background: '/assets/backgrounds/planks.jpg',