From 48fef2313bd337c8f3cce06906944ebbb455fcd2 Mon Sep 17 00:00:00 2001 From: Colin Kallemein Date: Fri, 8 Nov 2024 22:03:10 +0100 Subject: [PATCH] Renamed and moved assets for clarity, removed unused svg's --- public/assets/icons/arrow.svg | 4 -- .../assets/icons/{ => ingameUI}/chat-icon.svg | 40 +++++++------- .../assets/icons/{ => ingameUI}/f1-icon.png | Bin .../assets/icons/{ => ingameUI}/f2-icon.png | Bin .../assets/icons/{ => ingameUI}/f3-icon.png | Bin .../assets/icons/{ => ingameUI}/f4-icon.png | Bin .../assets/icons/{ => ingameUI}/f5-icon.png | Bin .../assets/icons/{ => ingameUI}/f6-icon.png | Bin .../assets/icons/{ => ingameUI}/f7-icon.png | Bin .../assets/icons/{ => ingameUI}/f8-icon.png | Bin .../assets/icons/{ => ingameUI}/map-icon.svg | 50 +++++++++--------- .../assets/icons/{ => ingameUI}/menu-icon.svg | 20 +++---- .../icons/{ => ingameUI}/socials-icon.svg | 50 +++++++++--------- .../icons/{ => modal}/close-button-white.svg | 6 +-- .../assets/icons/{ => modal}/full-screen.svg | 0 .../{ => modal}/increase-size-option.svg | 0 public/assets/icons/{ => modal}/minimize.svg | 0 .../icons/{ => modal}/modalFullscreen.svg | 0 .../assets/icons/{ => modal}/resize-icon.svg | 0 public/assets/icons/submit-icon.svg | 1 - public/assets/icons/treasure-chest.png | Bin 2101 -> 0 bytes .../assets/shapes/character-select-shape.svg | 1 - public/assets/shapes/hud-shape-empty.svg | 1 - public/assets/shapes/hud-shape.svg | 1 - .../assets/shapes/select-screen-bg-shape.svg | 1 - ...l.svg => button-ui-box-textured-small.svg} | 46 ++++++++-------- ...corners.svg => button-ui-box-textured.svg} | 0 ...rs-light.svg => button-ui-frame-empty.svg} | 44 +++++++-------- ...ct-border-4-corners.svg => hud-ui-box.svg} | 46 ++++++++-------- ...i-box-inner.svg => login-ui-box-inner.svg} | 46 ++++++++-------- ...i-box-outer.svg => login-ui-box-outer.svg} | 46 ++++++++-------- src/components/gui/CharacterProfile.vue | 4 +- src/components/gui/Chat.vue | 2 +- src/components/gui/Hotkeys.vue | 32 +++++------ src/components/gui/Hud.vue | 2 +- src/components/gui/Menu.vue | 12 ++--- src/components/gui/Minimap.vue | 4 +- src/components/gui/UserPanel.vue | 2 +- src/components/screens/Characters.vue | 2 +- src/components/screens/Login.vue | 4 +- .../utilities/BackgroundImageLoader.vue | 2 +- src/components/utilities/Modal.vue | 4 +- 42 files changed, 232 insertions(+), 241 deletions(-) delete mode 100644 public/assets/icons/arrow.svg rename public/assets/icons/{ => ingameUI}/chat-icon.svg (99%) rename public/assets/icons/{ => ingameUI}/f1-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f2-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f3-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f4-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f5-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f6-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f7-icon.png (100%) rename public/assets/icons/{ => ingameUI}/f8-icon.png (100%) rename public/assets/icons/{ => ingameUI}/map-icon.svg (99%) rename public/assets/icons/{ => ingameUI}/menu-icon.svg (99%) rename public/assets/icons/{ => ingameUI}/socials-icon.svg (99%) rename public/assets/icons/{ => modal}/close-button-white.svg (99%) rename public/assets/icons/{ => modal}/full-screen.svg (100%) rename public/assets/icons/{ => modal}/increase-size-option.svg (100%) rename public/assets/icons/{ => modal}/minimize.svg (100%) rename public/assets/icons/{ => modal}/modalFullscreen.svg (100%) rename public/assets/icons/{ => modal}/resize-icon.svg (100%) delete mode 100644 public/assets/icons/submit-icon.svg delete mode 100644 public/assets/icons/treasure-chest.png delete mode 100644 public/assets/shapes/character-select-shape.svg delete mode 100644 public/assets/shapes/hud-shape-empty.svg delete mode 100644 public/assets/shapes/hud-shape.svg delete mode 100644 public/assets/shapes/select-screen-bg-shape.svg rename public/assets/ui-elements/{ui-border-4-corners-small.svg => button-ui-box-textured-small.svg} (99%) rename public/assets/ui-elements/{ui-border-4-corners.svg => button-ui-box-textured.svg} (100%) rename public/assets/ui-elements/{ui-border-4-corners-light.svg => button-ui-frame-empty.svg} (99%) rename public/assets/ui-elements/{ui-rect-border-4-corners.svg => hud-ui-box.svg} (99%) rename public/assets/ui-elements/{ui-box-inner.svg => login-ui-box-inner.svg} (99%) rename public/assets/ui-elements/{ui-box-outer.svg => login-ui-box-outer.svg} (99%) diff --git a/public/assets/icons/arrow.svg b/public/assets/icons/arrow.svg deleted file mode 100644 index b1e7127..0000000 --- a/public/assets/icons/arrow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/public/assets/icons/chat-icon.svg b/public/assets/icons/ingameUI/chat-icon.svg similarity index 99% rename from public/assets/icons/chat-icon.svg rename to public/assets/icons/ingameUI/chat-icon.svg index c499689..66f5cfb 100644 --- a/public/assets/icons/chat-icon.svg +++ b/public/assets/icons/ingameUI/chat-icon.svg @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/icons/f1-icon.png b/public/assets/icons/ingameUI/f1-icon.png similarity index 100% rename from public/assets/icons/f1-icon.png rename to public/assets/icons/ingameUI/f1-icon.png diff --git a/public/assets/icons/f2-icon.png b/public/assets/icons/ingameUI/f2-icon.png similarity index 100% rename from public/assets/icons/f2-icon.png rename to public/assets/icons/ingameUI/f2-icon.png diff --git a/public/assets/icons/f3-icon.png b/public/assets/icons/ingameUI/f3-icon.png similarity index 100% rename from public/assets/icons/f3-icon.png rename to public/assets/icons/ingameUI/f3-icon.png diff --git a/public/assets/icons/f4-icon.png b/public/assets/icons/ingameUI/f4-icon.png similarity index 100% rename from public/assets/icons/f4-icon.png rename to public/assets/icons/ingameUI/f4-icon.png diff --git a/public/assets/icons/f5-icon.png b/public/assets/icons/ingameUI/f5-icon.png similarity index 100% rename from public/assets/icons/f5-icon.png rename to public/assets/icons/ingameUI/f5-icon.png diff --git a/public/assets/icons/f6-icon.png b/public/assets/icons/ingameUI/f6-icon.png similarity index 100% rename from public/assets/icons/f6-icon.png rename to public/assets/icons/ingameUI/f6-icon.png diff --git a/public/assets/icons/f7-icon.png b/public/assets/icons/ingameUI/f7-icon.png similarity index 100% rename from public/assets/icons/f7-icon.png rename to public/assets/icons/ingameUI/f7-icon.png diff --git a/public/assets/icons/f8-icon.png b/public/assets/icons/ingameUI/f8-icon.png similarity index 100% rename from public/assets/icons/f8-icon.png rename to public/assets/icons/ingameUI/f8-icon.png diff --git a/public/assets/icons/map-icon.svg b/public/assets/icons/ingameUI/map-icon.svg similarity index 99% rename from public/assets/icons/map-icon.svg rename to public/assets/icons/ingameUI/map-icon.svg index 87d3e31..aefd9a7 100644 --- a/public/assets/icons/map-icon.svg +++ b/public/assets/icons/ingameUI/map-icon.svg @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/icons/menu-icon.svg b/public/assets/icons/ingameUI/menu-icon.svg similarity index 99% rename from public/assets/icons/menu-icon.svg rename to public/assets/icons/ingameUI/menu-icon.svg index e4e1ab4..9a2115b 100644 --- a/public/assets/icons/menu-icon.svg +++ b/public/assets/icons/ingameUI/menu-icon.svg @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/public/assets/icons/socials-icon.svg b/public/assets/icons/ingameUI/socials-icon.svg similarity index 99% rename from public/assets/icons/socials-icon.svg rename to public/assets/icons/ingameUI/socials-icon.svg index ddd5ad6..79a8eb5 100644 --- a/public/assets/icons/socials-icon.svg +++ b/public/assets/icons/ingameUI/socials-icon.svg @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/icons/close-button-white.svg b/public/assets/icons/modal/close-button-white.svg similarity index 99% rename from public/assets/icons/close-button-white.svg rename to public/assets/icons/modal/close-button-white.svg index ba24aea..f222c7f 100644 --- a/public/assets/icons/close-button-white.svg +++ b/public/assets/icons/modal/close-button-white.svg @@ -1,3 +1,3 @@ - - - + + + diff --git a/public/assets/icons/full-screen.svg b/public/assets/icons/modal/full-screen.svg similarity index 100% rename from public/assets/icons/full-screen.svg rename to public/assets/icons/modal/full-screen.svg diff --git a/public/assets/icons/increase-size-option.svg b/public/assets/icons/modal/increase-size-option.svg similarity index 100% rename from public/assets/icons/increase-size-option.svg rename to public/assets/icons/modal/increase-size-option.svg diff --git a/public/assets/icons/minimize.svg b/public/assets/icons/modal/minimize.svg similarity index 100% rename from public/assets/icons/minimize.svg rename to public/assets/icons/modal/minimize.svg diff --git a/public/assets/icons/modalFullscreen.svg b/public/assets/icons/modal/modalFullscreen.svg similarity index 100% rename from public/assets/icons/modalFullscreen.svg rename to public/assets/icons/modal/modalFullscreen.svg diff --git a/public/assets/icons/resize-icon.svg b/public/assets/icons/modal/resize-icon.svg similarity index 100% rename from public/assets/icons/resize-icon.svg rename to public/assets/icons/modal/resize-icon.svg diff --git a/public/assets/icons/submit-icon.svg b/public/assets/icons/submit-icon.svg deleted file mode 100644 index f041ce7..0000000 --- a/public/assets/icons/submit-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/icons/treasure-chest.png b/public/assets/icons/treasure-chest.png deleted file mode 100644 index 03e6bb1de1d6334038bf6d2fb28034c2d481b5e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2101 zcmV-52+H?~P)Px+?@2^KRA_$Z3~tq#Q*s%52upqtC2R8s+u5*7aKM%gt=$%uA@&1f$5s3 zZRl7?>9LVR8AsfH;gleXDOMu%qI!5u#^SEQufOz4cU*0a>~x^Q#M*F?%Lz*|ka5T) z6=LC*Y}3-bbozlE2PgJ#zoJY2F3Ga4R{6m2dZE;BQ?~lV{E6Bayjn~p&N}qcR_pX)EIZf%W*)iaQ*J^WN?3B^{BNN)lq#C~BKJ+ezYyl0p}UVhwL*WF zWJN-nc#n^K!;$Q>m2~HStA#P8sz%2P8R`Hf73CP zYnp0(Vf+A77<2DXDe*Hg`j=>>_PZveN%7H<&nKifl(5CX{BQNpP^xLd#qzb_AHs;e zLtlI8xs}-MIQ@2t=kwO2A3i_rhYRAvu?6{zqBmtB<-9#Ke8^z_F#f>sGZPOFZ(gq5 zuARu)AAdBht)6cRVZMzKbHSfZC^D`@%qujp0l%j4>oI0w0ENJTgr&c~?#@?Bmqds$ zh_esg^c5rG`#}t0px}pSV_2VdK!TKzbuE&PoHy6-)+wJ!uMrwbh(=BWl$02wYpyLu zw(UFdw>1@VX8-VwCT2f^VF16b8Ji05Ynq`x2OUE;p~$5y0Bj}5CKZk)F~)H6RE4oZ zt)-1j%6fC>{cmhp6Cv;Y^rj6~WPV`a4goTZ45y0$g>r}i>>fp*rBJgQtPKqGSh%(V zAZbhfR|puJYApgl2*F^=-g?7*$BwreXDvs-JEPY+ec9X|6UF;LWB|^ULQYQyXk!pk zuzpL14a5Bq!NeaYF_U$agn}O-&|HyosD?559vdAS&K3g}shM*aWAL?p0{B=au@GS?OdJ7KTjenF$jo_!BL9!X&WSj zkzsr$px}or_2?HuFxYEvy9@;x$BL*~XSFu;rff29O5&NiRf6 z!N$G>*KJ7Cmu~E}Qu5hWYqpIM^Q)Z;_Be>x{*GmL=9)jU)O_F0t{5D znsPZJULwD0Z8&qL%DM9a2FR2(nRf#Qvo=BqbZq9X*cbMnZ0YN=>d1Uj35DxOyjqMO zX!MISoIOz{^~pYZHzi4>6t1iA%Cqs)+#F+=nyNECULlMOLI`q}WTU5Xa}EY5coE~% zHA3Clsjf;0fE0~qN6L|n7Lli^J~N3wW;1V z9)G&s*se6_yaTs<%W=fLwv>r>V>=PzScKVx{m72{j_>W%hpx0td-fdpksbN{UJySW zuj0N50ljJKuenSrzZ?;)Q4{-WTbQR7>&mmli3p%4soqVy)|YM^ef{l~*zLNICf=hr z-)1X$z_DcR!vD_~;@Z;BI@aCW?>lyIHTKp_NR#rTBl}#7?^sG&Tp+}jLieVuC$`(i z_lQweozB->2te`Rj(#V$f9+WEbI+eFh#ptIlE}EXe*C+yPFxE6U8i_p$F`S8uiy55 f`*E4eEQ9|8W+{O2{bV+b00000NkvXXu0mjfJT@HX diff --git a/public/assets/shapes/character-select-shape.svg b/public/assets/shapes/character-select-shape.svg deleted file mode 100644 index 85b6f01..0000000 --- a/public/assets/shapes/character-select-shape.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/shapes/hud-shape-empty.svg b/public/assets/shapes/hud-shape-empty.svg deleted file mode 100644 index f8fa62b..0000000 --- a/public/assets/shapes/hud-shape-empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/shapes/hud-shape.svg b/public/assets/shapes/hud-shape.svg deleted file mode 100644 index e89ab60..0000000 --- a/public/assets/shapes/hud-shape.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/shapes/select-screen-bg-shape.svg b/public/assets/shapes/select-screen-bg-shape.svg deleted file mode 100644 index 9e48c2d..0000000 --- a/public/assets/shapes/select-screen-bg-shape.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/ui-elements/ui-border-4-corners-small.svg b/public/assets/ui-elements/button-ui-box-textured-small.svg similarity index 99% rename from public/assets/ui-elements/ui-border-4-corners-small.svg rename to public/assets/ui-elements/button-ui-box-textured-small.svg index 12201c7..e6bf378 100644 --- a/public/assets/ui-elements/ui-border-4-corners-small.svg +++ b/public/assets/ui-elements/button-ui-box-textured-small.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/ui-elements/ui-border-4-corners.svg b/public/assets/ui-elements/button-ui-box-textured.svg similarity index 100% rename from public/assets/ui-elements/ui-border-4-corners.svg rename to public/assets/ui-elements/button-ui-box-textured.svg diff --git a/public/assets/ui-elements/ui-border-4-corners-light.svg b/public/assets/ui-elements/button-ui-frame-empty.svg similarity index 99% rename from public/assets/ui-elements/ui-border-4-corners-light.svg rename to public/assets/ui-elements/button-ui-frame-empty.svg index 509ed89..623c32e 100644 --- a/public/assets/ui-elements/ui-border-4-corners-light.svg +++ b/public/assets/ui-elements/button-ui-frame-empty.svg @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/ui-elements/ui-rect-border-4-corners.svg b/public/assets/ui-elements/hud-ui-box.svg similarity index 99% rename from public/assets/ui-elements/ui-rect-border-4-corners.svg rename to public/assets/ui-elements/hud-ui-box.svg index a6e4c5c..8f8cd88 100644 --- a/public/assets/ui-elements/ui-rect-border-4-corners.svg +++ b/public/assets/ui-elements/hud-ui-box.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/ui-elements/ui-box-inner.svg b/public/assets/ui-elements/login-ui-box-inner.svg similarity index 99% rename from public/assets/ui-elements/ui-box-inner.svg rename to public/assets/ui-elements/login-ui-box-inner.svg index 2597751..4435e7f 100644 --- a/public/assets/ui-elements/ui-box-inner.svg +++ b/public/assets/ui-elements/login-ui-box-inner.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/ui-elements/ui-box-outer.svg b/public/assets/ui-elements/login-ui-box-outer.svg similarity index 99% rename from public/assets/ui-elements/ui-box-outer.svg rename to public/assets/ui-elements/login-ui-box-outer.svg index 87f051b..5c6947a 100644 --- a/public/assets/ui-elements/ui-box-outer.svg +++ b/public/assets/ui-elements/login-ui-box-outer.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/gui/CharacterProfile.vue b/src/components/gui/CharacterProfile.vue index 14e52a2..d3e2167 100644 --- a/src/components/gui/CharacterProfile.vue +++ b/src/components/gui/CharacterProfile.vue @@ -5,7 +5,7 @@
Character Profile [Alt+C]
@@ -15,7 +15,7 @@

{{ gameStore.character?.name }}

{{ gameStore.character?.experience }} / 18.600XP
- + diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue index dbdd9e3..fa9f0f4 100644 --- a/src/components/gui/Chat.vue +++ b/src/components/gui/Chat.vue @@ -7,7 +7,7 @@
- +
- + F1 -
+
- + F2 -
+
- + F3 -
+
- + F4 -
+
- + F5 -
+
- + F6 -
+
- + F7 -
+
- + F8 -
+
diff --git a/src/components/gui/Hud.vue b/src/components/gui/Hud.vue index 9c0bcb8..93667e3 100644 --- a/src/components/gui/Hud.vue +++ b/src/components/gui/Hud.vue @@ -1,5 +1,5 @@