diff --git a/_data/merchants-cards.yml b/_data/merchants-cards.yml new file mode 100644 index 0000000..6f6b7be --- /dev/null +++ b/_data/merchants-cards.yml @@ -0,0 +1,9 @@ + +- name: ShakePay + title: Debit Card + url: https://shakepay.co + +- name: SpectroCoin + title: Quality Assurance, Automation, Testing + url: https://spectrocoin.com/ + diff --git a/_data/merchants-games.yml b/_data/merchants-games.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-gifts.yml b/_data/merchants-gifts.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-metals.yml b/_data/merchants-metals.yml new file mode 100644 index 0000000..106ae3b --- /dev/null +++ b/_data/merchants-metals.yml @@ -0,0 +1,16 @@ + +- name: Coaex + url: https://www.coaex.com + image: coaex_logo.png + +- name: Amagi Metals + url: http://www.amagimetals.com + +- name: Bitgild + url: http://www.bitgild.com + +- name: Micro Precious Metals + url: http://www.micropreciousmetals.cf + + + diff --git a/_data/merchants-processors.yml b/_data/merchants-processors.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-stores.yml b/_data/merchants-stores.yml index 779302f..e9d3104 100644 --- a/_data/merchants-stores.yml +++ b/_data/merchants-stores.yml @@ -1,25 +1,5 @@ -- name: ShakePay +- name: ShakePay2 title: Debit Card - image: evan.png url: https://shakepay.co -- name: SpectroCoin - title: Quality Assurance, Automation, Testing - image: evan.png - url: https://spectrocoin.com/ - -- name: Card1 - title: Debit Card - image: evan.png - url: https://shakepay.co - -- name: Card2 - title: Debit Card - image: evan.png - url: https://shakepay.co - -- name: Card3 - title: Debit Card - image: evan.png - url: https://shakepay.co diff --git a/_data/merchants-vpn.yml b/_data/merchants-vpn.yml new file mode 100644 index 0000000..ebe24b9 --- /dev/null +++ b/_data/merchants-vpn.yml @@ -0,0 +1,23 @@ + +- name: BolehVPN + url: https://bolehvpn.net + +- name: VikingVPN + url: https://vikingvpn.com + +- name: QHoster + url: http://www.qhoster.com + +- name: MultiVPN + url: http://multi-vpn.co.uk/ + +- name: AirVPN + url: https://airvpn.org/ + +- name: Seedstuff + url: http://www.seedstuff.ca + + + + + diff --git a/_i18n/en.yml b/_i18n/en.yml index 0d48d76..2e7d3b4 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -129,8 +129,10 @@ pages: hero-map-btn: Merchants Map hero-integrate-btn: Integrate Dash hero-getlisted-btn: Get Listed - debit-cards-heading: Debit Cards + cards-heading: Debit Cards stores-heading: Web Stores + vpn-heading: VPN Providers + metals-heading: Precious Metals participate: title: Join the Dash Network diff --git a/_includes/hero/merchants.html b/_includes/hero/merchants.html index 44d7ea2..4c2cc0d 100644 --- a/_includes/hero/merchants.html +++ b/_includes/hero/merchants.html @@ -15,8 +15,8 @@
{% t pages.merchants.hero-map-btn %} - {% t pages.merchants.hero-integrate-btn %} - {% t pages.merchants.hero-getlisted-btn %} + {% t pages.merchants.hero-integrate-btn %} + {% t pages.merchants.hero-getlisted-btn %}
diff --git a/_includes/merchant-list.html b/_includes/merchant-list.html index feba4e3..16e4c6b 100644 --- a/_includes/merchant-list.html +++ b/_includes/merchant-list.html @@ -3,20 +3,21 @@
{% if merchant.image %}
- {{ merchant.name }} + + {{ merchant.name }} +
{% else %}
- {{ merchant.name }} + + {{ merchant.name }} +
{% endif %}
{{ merchant.name }}
+ {% if merchant.title %}
{{ merchant.title }}
- - {% if merchant.url %} -
{{ merchant.url }}
{% endif %} - diff --git a/assets/img/merchant_generic_logo.png b/assets/img/merchant_generic_logo.png new file mode 100644 index 0000000..24ed7b4 Binary files /dev/null and b/assets/img/merchant_generic_logo.png differ diff --git a/assets/img/home/bolehvpn.png b/assets/img/merchants/bolehvpn.png similarity index 100% rename from assets/img/home/bolehvpn.png rename to assets/img/merchants/bolehvpn.png diff --git a/assets/img/home/bravenewbooks_logo.png b/assets/img/merchants/bravenewbooks_logo.png similarity index 100% rename from assets/img/home/bravenewbooks_logo.png rename to assets/img/merchants/bravenewbooks_logo.png diff --git a/assets/img/home/coaex_logo.png b/assets/img/merchants/coaex_logo.png similarity index 100% rename from assets/img/home/coaex_logo.png rename to assets/img/merchants/coaex_logo.png diff --git a/assets/img/home/giftoff_logo.png b/assets/img/merchants/giftoff_logo.png similarity index 100% rename from assets/img/home/giftoff_logo.png rename to assets/img/merchants/giftoff_logo.png diff --git a/assets/img/home/isg3d_logo.png b/assets/img/merchants/isg3d_logo.png similarity index 100% rename from assets/img/home/isg3d_logo.png rename to assets/img/merchants/isg3d_logo.png diff --git a/assets/img/home/key4coin_logo.png b/assets/img/merchants/key4coin_logo.png similarity index 100% rename from assets/img/home/key4coin_logo.png rename to assets/img/merchants/key4coin_logo.png diff --git a/assets/img/home/livingroomofsatoshi_logo.png b/assets/img/merchants/livingroomofsatoshi_logo.png similarity index 100% rename from assets/img/home/livingroomofsatoshi_logo.png rename to assets/img/merchants/livingroomofsatoshi_logo.png diff --git a/assets/img/home/misconductwine_logo.jpg b/assets/img/merchants/misconductwine_logo.jpg similarity index 100% rename from assets/img/home/misconductwine_logo.jpg rename to assets/img/merchants/misconductwine_logo.jpg diff --git a/assets/img/home/node40.png b/assets/img/merchants/node40.png similarity index 100% rename from assets/img/home/node40.png rename to assets/img/merchants/node40.png diff --git a/assets/img/home/protonmail.png b/assets/img/merchants/protonmail.png similarity index 100% rename from assets/img/home/protonmail.png rename to assets/img/merchants/protonmail.png diff --git a/assets/img/home/qhoster.png b/assets/img/merchants/qhoster.png similarity index 100% rename from assets/img/home/qhoster.png rename to assets/img/merchants/qhoster.png diff --git a/assets/img/home/shakepay_logo.png b/assets/img/merchants/shakepay_logo.png similarity index 100% rename from assets/img/home/shakepay_logo.png rename to assets/img/merchants/shakepay_logo.png diff --git a/assets/img/home/shapeshift_logo.png b/assets/img/merchants/shapeshift_logo.png similarity index 100% rename from assets/img/home/shapeshift_logo.png rename to assets/img/merchants/shapeshift_logo.png diff --git a/index.html b/index.html index 3d22031..2e5af3b 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ description: pages.home.description
- +

Living Room of..

@@ -52,7 +52,7 @@ description: pages.home.description
- +

Misconduct Wine

@@ -63,7 +63,7 @@ description: pages.home.description
- +

Boleh VPN

@@ -74,7 +74,7 @@ description: pages.home.description
- +

ShapeShift

@@ -85,7 +85,7 @@ description: pages.home.description
- +

Node40

@@ -96,7 +96,7 @@ description: pages.home.description
- +

ProtonMail

@@ -107,7 +107,7 @@ description: pages.home.description
- +

Qhoster

@@ -118,7 +118,7 @@ description: pages.home.description
- +

ISG3D

@@ -129,7 +129,7 @@ description: pages.home.description
- +

CoaEX

@@ -140,7 +140,7 @@ description: pages.home.description
- +

BraveNewBooks

@@ -151,7 +151,7 @@ description: pages.home.description
- +

GiftOff

@@ -162,7 +162,7 @@ description: pages.home.description
- +

Key4Coin

diff --git a/merchants/index.html b/merchants/index.html index 6a2021d..454c8f6 100644 --- a/merchants/index.html +++ b/merchants/index.html @@ -9,12 +9,10 @@ description: pages.merchants.description
-
-

{% t pages.merchants.debit-cards-heading %}

+

{% t pages.merchants.cards-heading %}

-
    {% for merchant in site.data.merchants-stores %} {% include merchant-list.html %} @@ -22,18 +20,44 @@ description: pages.merchants.description
+
-
-

{% t pages.merchants.stores-heading %}

+

{% t pages.merchants.stores-heading %}

    - {% for merchant in site.data.merchants-stores %} + {% for merchant in site.data.merchants-cards %} + {% include merchant-list.html %} + {% endfor %} +
+
+
+ +
+
+
+

{% t pages.merchants.vpn-heading %}

+
+
    + {% for merchant in site.data.merchants-vpn %} {% include merchant-list.html %} {% endfor %}
-
+ +
+
+
+

{% t pages.merchants.metals-heading %}

+
+
    + {% for merchant in site.data.merchants-metals %} + {% include merchant-list.html %} + {% endfor %} +
+
+
+