From ad50f90ba0fde04050a8bdcb156b9bcbf4390ed8 Mon Sep 17 00:00:00 2001
From: tim1234ltp <tim1234.ltp@gmail.com>
Date: Tue, 17 Oct 2017 23:48:23 +0800
Subject: [PATCH] Bug fixes on Merchandise Page [Fixes Issues #9144] (#9195)

* Moved pictures of merch items from assets/images/merch/ to /website/static/merch
Image src in merch.vue is linked to the new path.

* Rebased and fixed.

* Reverted changes of package-lock.json
---
 package-lock.json                                   |   2 +-
 website/client/components/static/merch.vue          |   7 ++++---
 .../images => static}/merch/stickermule-logo.png    | Bin
 .../images => static}/merch/stickermule-logo.svg    |   0
 .../assets/images => static}/merch/stickermule.png  | Bin
 .../images => static}/merch/teespring-eu-logo.png   | Bin
 .../assets/images => static}/merch/teespring-eu.png | Bin
 .../images => static}/merch/teespring-logo.png      | Bin
 .../images => static}/merch/teespring-logo.svg      |   0
 .../merch/teespring-mug-eu-logo.png                 | Bin
 .../images => static}/merch/teespring-mug-eu.png    | Bin
 .../images => static}/merch/teespring-mug-logo.png  | Bin
 .../images => static}/merch/teespring-mug.png       | Bin
 .../assets/images => static}/merch/teespring.png    | Bin
 14 files changed, 5 insertions(+), 4 deletions(-)
 rename website/{client/assets/images => static}/merch/stickermule-logo.png (100%)
 rename website/{client/assets/images => static}/merch/stickermule-logo.svg (100%)
 rename website/{client/assets/images => static}/merch/stickermule.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-eu-logo.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-eu.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-logo.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-logo.svg (100%)
 rename website/{client/assets/images => static}/merch/teespring-mug-eu-logo.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-mug-eu.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-mug-logo.png (100%)
 rename website/{client/assets/images => static}/merch/teespring-mug.png (100%)
 rename website/{client/assets/images => static}/merch/teespring.png (100%)

diff --git a/package-lock.json b/package-lock.json
index 50695a4406..c581e40abc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19047,4 +19047,4 @@
       "dev": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/website/client/components/static/merch.vue b/website/client/components/static/merch.vue
index fd62575558..d4f3f440b9 100644
--- a/website/client/components/static/merch.vue
+++ b/website/client/components/static/merch.vue
@@ -3,16 +3,17 @@
     .row
       .col-md-6.offset-3
         h1 {{ $t('merch') }}
-        // @TODO: how do we use static images here?
+        // @TODO: Visual experience: Separate each merch items with new line? Or to show items in a table?
         .col-lg-6.col-md-6.col-sm-12(v-for="(merchant, index) in merchants")
           .merch-block
-            img(v-if='merchant.logo' :src="`~assets/images/merch/${merchant.key}-logo.png`")
+            img(v-if='merchant.logo' :src="`/static/merch/${merchant.key}-logo.png`")
             h2(v-else) {{ merchant.name }}
             div
               a(:href="merchant.link" target='_blank')
-                img.img-rendering-auto(:src="`~assets/images/merch/${merchant.key}.png`")
+                img.img-rendering-auto(:src="`/static/merch/${merchant.key}.png`")
             p {{ $t('merch-' + merchant.key + '-summary') }}
             a.btn.btn-primary(:href="merchant.link" target='_blank') {{$t('merch-' + merchant.key + '-goto')}}
+			
 </template>
 
 <script>
diff --git a/website/client/assets/images/merch/stickermule-logo.png b/website/static/merch/stickermule-logo.png
similarity index 100%
rename from website/client/assets/images/merch/stickermule-logo.png
rename to website/static/merch/stickermule-logo.png
diff --git a/website/client/assets/images/merch/stickermule-logo.svg b/website/static/merch/stickermule-logo.svg
similarity index 100%
rename from website/client/assets/images/merch/stickermule-logo.svg
rename to website/static/merch/stickermule-logo.svg
diff --git a/website/client/assets/images/merch/stickermule.png b/website/static/merch/stickermule.png
similarity index 100%
rename from website/client/assets/images/merch/stickermule.png
rename to website/static/merch/stickermule.png
diff --git a/website/client/assets/images/merch/teespring-eu-logo.png b/website/static/merch/teespring-eu-logo.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-eu-logo.png
rename to website/static/merch/teespring-eu-logo.png
diff --git a/website/client/assets/images/merch/teespring-eu.png b/website/static/merch/teespring-eu.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-eu.png
rename to website/static/merch/teespring-eu.png
diff --git a/website/client/assets/images/merch/teespring-logo.png b/website/static/merch/teespring-logo.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-logo.png
rename to website/static/merch/teespring-logo.png
diff --git a/website/client/assets/images/merch/teespring-logo.svg b/website/static/merch/teespring-logo.svg
similarity index 100%
rename from website/client/assets/images/merch/teespring-logo.svg
rename to website/static/merch/teespring-logo.svg
diff --git a/website/client/assets/images/merch/teespring-mug-eu-logo.png b/website/static/merch/teespring-mug-eu-logo.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-mug-eu-logo.png
rename to website/static/merch/teespring-mug-eu-logo.png
diff --git a/website/client/assets/images/merch/teespring-mug-eu.png b/website/static/merch/teespring-mug-eu.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-mug-eu.png
rename to website/static/merch/teespring-mug-eu.png
diff --git a/website/client/assets/images/merch/teespring-mug-logo.png b/website/static/merch/teespring-mug-logo.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-mug-logo.png
rename to website/static/merch/teespring-mug-logo.png
diff --git a/website/client/assets/images/merch/teespring-mug.png b/website/static/merch/teespring-mug.png
similarity index 100%
rename from website/client/assets/images/merch/teespring-mug.png
rename to website/static/merch/teespring-mug.png
diff --git a/website/client/assets/images/merch/teespring.png b/website/static/merch/teespring.png
similarity index 100%
rename from website/client/assets/images/merch/teespring.png
rename to website/static/merch/teespring.png