From 60e3c5d8f9470161f6f23542ddbd5ecf897b9de1 Mon Sep 17 00:00:00 2001 From: Melvin Valster Date: Fri, 26 Jul 2019 21:38:31 +0200 Subject: [PATCH] Include fallback icon into the build --- src/components/Icon.scss | 4 ++-- src/components/Icon.tsx | 11 +++++++++-- src/components/Talent.scss | 2 +- .../{icons => icon-meta}/large/default.png | Bin src/images/{icons => icon-meta}/large/gold.png | Bin .../{icons => icon-meta}/medium/default.png | Bin src/images/{icons => icon-meta}/medium/gold.png | Bin src/images/icons/large/inv_misc_questionmark.jpg | Bin 0 -> 1369 bytes .../icons/medium/inv_misc_questionmark.jpg | Bin 0 -> 892 bytes 9 files changed, 12 insertions(+), 5 deletions(-) rename src/images/{icons => icon-meta}/large/default.png (100%) rename src/images/{icons => icon-meta}/large/gold.png (100%) rename src/images/{icons => icon-meta}/medium/default.png (100%) rename src/images/{icons => icon-meta}/medium/gold.png (100%) create mode 100644 src/images/icons/large/inv_misc_questionmark.jpg create mode 100644 src/images/icons/medium/inv_misc_questionmark.jpg diff --git a/src/components/Icon.scss b/src/components/Icon.scss index d17e190..fbe78de 100644 --- a/src/components/Icon.scss +++ b/src/components/Icon.scss @@ -56,7 +56,7 @@ &--golden { .icon__frame { - background-image: url('../images/icons/large/gold.png'); + background-image: url('../images/icon-meta/large/gold.png'); } } @@ -78,7 +78,7 @@ &__frame { position: absolute; - background-image: url('../images/icons/large/default.png'); + background-image: url('../images/icon-meta/large/default.png'); background-repeat: no-repeat; background-size: contain; } diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx index d615c9d..7adfff9 100644 --- a/src/components/Icon.tsx +++ b/src/components/Icon.tsx @@ -18,7 +18,7 @@ export const Icon = React.forwardRef((props, ref) => { const [name, setName] = useState(defaultName) const bgSize = size !== 'small' ? 'large' : 'medium' - const url = name && `https://wow.zamimg.com/images/wow/icons/${bgSize}/${name}.jpg` + const url = name && iconUrl(name, bgSize) const start = Date.now() @@ -51,4 +51,11 @@ export const Icon = React.forwardRef((props, ref) => { {children} ) -}) \ No newline at end of file +}) + +const iconUrl = (name: string, size: string): string => { + if (name === NOT_FOUND_ICON) { + return require(`../images/icons/${size}/${name}.jpg`) + } + return `https://wow.zamimg.com/images/wow/icons/${size}/${name}.jpg` +} \ No newline at end of file diff --git a/src/components/Talent.scss b/src/components/Talent.scss index d94aa15..6f1a9f0 100644 --- a/src/components/Talent.scss +++ b/src/components/Talent.scss @@ -45,7 +45,7 @@ bottom: -1px; left: -4px; border-radius: 6px; - background-image: url('../images/icons/large/default.png'); + background-image: url('../images/icon-meta/large/default.png'); background-size: 100%; &:after { diff --git a/src/images/icons/large/default.png b/src/images/icon-meta/large/default.png similarity index 100% rename from src/images/icons/large/default.png rename to src/images/icon-meta/large/default.png diff --git a/src/images/icons/large/gold.png b/src/images/icon-meta/large/gold.png similarity index 100% rename from src/images/icons/large/gold.png rename to src/images/icon-meta/large/gold.png diff --git a/src/images/icons/medium/default.png b/src/images/icon-meta/medium/default.png similarity index 100% rename from src/images/icons/medium/default.png rename to src/images/icon-meta/medium/default.png diff --git a/src/images/icons/medium/gold.png b/src/images/icon-meta/medium/gold.png similarity index 100% rename from src/images/icons/medium/gold.png rename to src/images/icon-meta/medium/gold.png diff --git a/src/images/icons/large/inv_misc_questionmark.jpg b/src/images/icons/large/inv_misc_questionmark.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5aadda3a191fa8b8851503838839b2ccd9eb8ecd GIT binary patch literal 1369 zcmb7;eKeB`9LJw$&$eeSHy$R-He+bHp}ady7Ui|%5|%S52@%JUD~hX>oKi?$LR}?N zQ@Tb%vZr4Ugv*H-U=W%z!tEDKq`PjKnMZl?Enz~0TiV8 z_FrLP6dD8J6y{bn00p8!6c&U~@ZSLt1p#Obf>qapHOw5mf~YYm3+8P&O-Jv2*%RMz z|Iq$}Lt_943xg|_X(Opp z4&KMynFbQ|b^05&dkpkSXJ~}ZKlFHf*2^BA^){wU^7v|cij;HaS-Iu&V+6N}L#JBj z%ESX>oPl?H5`51~h~s7sv81%cys4upW4WxMIxhR`2s5dBiO}C;68pkVi&EIpv4?GHQ4nIXsE@?N$D5ozy^DHc z8cH1SEFsQ&RfsvY#p2II`hJ1`hwR{sTJH)o&rsM_BIC&H#|a(&PR#AbB@0CQyx}{e zcwY1^?xcySX=tp#z=Ok}1-2%x{Lmz`U3kpBY&<~9Z{t*@m9P6(J^4%GWi}0* z7%awc#YuHfk9Lj))-|W`U_QK7^gy=jL*Jk8ul9Eo4G~f^a>{d)>RK7I4`#lY`>bp| z(j6A}rb=e6?YQ~AtoKIi`=O+O=vz}y=3>`kfY_jn;nb+mY}O9hJu9Ch^QjKygfT7{$i@SZ{gP$0KOsdOCQX?nSzO2YT>qkVTx9M1ITJ&Cv#PF)M+&qE5whKL! zZuubGV`;y+n~jn8n38!x*A_abV@g+4dX9bDTc8vA=x(xr_N&m)PY#^3Crvci5T3jW zJ6vx#XV(~vzk~CI?#akG59I*%d}Y4vM9h^zQnj$?(4#&dKTZ`8V8Q7#7I`z&mcQf& zU+&1@I>nN%nKp;#f@N@W`^ptYM5(CG#IP;JbG*1Ew7i)X(>}>hnAyrd#(&mI?mq$F zO-{E2mWWFd%>#6cMmo8MoFj3V$X%>$+G9g8k^>QD8;TRJ)uf8LkRT2@j%OV1zAxmG zyLTSm-!+SrK}zQdT|0l`#pi_mEXsNTt)HH~g%uLrnYoMB8y9L>=}b5O kO^Iv6cZ}Shn)o|s8C)VobkFSY^{RFgP6d)UpUF3I(zX15IKRo%pbD% zOSdy>s;Vnn*!J6ZO^$oFy|#KqNTR`))l;rAEmqrA#>c>J4w+ zITCtFc{%gZT$5`vw^U_k6}>E*a{GJvZB52~W&B$iKGm#RJvV*@&ra?M z3#RZ)y6n8s_NBJu*;RbY)ji(N`K$X|Ueugx@|~!A$&DK}9I*Z=yJy9e%*&5deU8u8 zYZY&D&*vPkHn^0%f+`^L#XR`Xvut2b9(O1nUx-^Y9Q zm1(JFb5A%N<9qloXrJ;jryHeFKes*1{A+TV-)zIChl{QsqX}u);aE) zY|5&6$0l(~x?l2FmR6Q}#3*YQ)^MRzWNB1Gv~}p-nT1y#cNGZi-LENk`1q`#sUq?J GZvp@o@IuA_ literal 0 HcmV?d00001