diff --git a/.github/ISSUE_TEMPLATE/new-merchant.md b/.github/ISSUE_TEMPLATE/new-merchant.md deleted file mode 100644 index 111a1dbf..00000000 --- a/.github/ISSUE_TEMPLATE/new-merchant.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: New Merchant -about: Propose a new merchant to add to the 'Merchants' page -title: 'Add to the list of merchants' -labels: "\U0001F3EA merchant, \U0001F50D Needs investigation" -assignees: '' - ---- - -#### What's the name of your business? - - - -#### What's the URL of the website? - - - -#### Write a brief description of your business/service (max 50 characters) - - - -#### Enter the URL where a Monero mention can be found - - - -https:// - -#### How do you accept Monero? *(choose only one option)* - -- [ ] Monero integrations *(github.com/monero-integrations)* -- [ ] Globee -- [ ] Native wallet -- [ ] Other payment gateaway (Coinpayments, Morphtoken, etc. *Please specify*) - -#### How would you categorize your business? *(choose only one option)* - -- [ ] Exchange -- [ ] Block Explorer -- [ ] Payment Gateway -- [ ] Web Hosting -- [ ] Tool -- [ ] Service -- [ ] Goods -- [ ] Entertainment - -#### Comment - - diff --git a/.github/ISSUE_TEMPLATE/remove-merchant.md b/.github/ISSUE_TEMPLATE/remove-merchant.md deleted file mode 100644 index c316eb03..00000000 --- a/.github/ISSUE_TEMPLATE/remove-merchant.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: Remove Merchant -about: Ask to remove a merchant from the 'Merchants' page -title: 'Remove from the list of merchants' -labels: "\U0001F3EA merchant: removal, \U0001F50D Needs investigation" -assignees: '' - ---- - -#### What's the name of the merchant you are asking to remove? - - - -#### What's the URL of their website? - - - -#### Why do you think it should be removed? - -- [ ] They don't accept Monero anymore -- [ ] They are likely scammers -- [ ] They closed / Their services are unavailable - -#### Useful links - - - -#### Additional comments - - diff --git a/README.md b/README.md index ba47f4c9..e387ca1c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Every section from here on out will talk about how to make a specific type of we A few random points of note: - After [a discussion](https://repo.getmonero.org/monero-project/monero-site/issues/982), the community decided to include only open source wallets in the 'Downloads' section of the website. Requests to add closed source wallets to that page will be rejected. -- Listing merchants on the 'Merchants' page is at our discretion and acceptance shouldn't be assumed. +- Listing exchanges on the 'Merchants' page is at our discretion and acceptance shouldn't be assumed. - All external links must have `https://` in front of them or they will not redirect properly. - If you want to add a new page to the navigation, you should go to ALL LANGUAGES in the `_data/lang` folder and add the page. - It is strongly strongly STRONGLY encouraged that if you make a change, you - at the minimum - test it on your local machine before submitting a PR. Sometimes unexpected things may happen due to a change. If you change a page, check the whole page on multiple screen sizes and browsers to make sure there wasn't any collateral damage. @@ -337,38 +337,6 @@ If you need to add a month, add `

{% t roadmap.MONTH %}

` abo The roadmap can be translated on Weblate [on Weblate](https://translate.getmonero.org/projects/getmonero/monero-site/). -## How to add or remove a merchant - -### Add a merchant - -If you want to add a merchant you should first open an issue using the ['New Merchant' template](https://github.com/monero-project/monero-site/issues/new?assignees=&labels=%F0%9F%8F%AA+merchant:+removal%2C+%F0%9F%94%8D+Needs+investigation&template=new-merchant.md&title=Remove+%3CNAME_OF_THE_MECHANT%3E+from+the+list+of+merchants). Fill upp all sections and wait for somebody to investigate it. - -After the issue has been accepted, the merchant can be added to the page. - -To add a merchant (after it has been approved) follow these steps: - -Navigate to the `/_data/` folder and open `merchants.yml`. You will notice a list separated by hyphenated `-category` tags. - -Find the category that best describes your business/service and copy the code below, making sure you are keeping the alphabetic order consistent: - -``` -- name: - url: -``` - -and paste it in the correct category under the `merchants:` section. Make sure to respect the alphabetical order of the entries. - -Fill in the data as follows: - -- `name:` The name of the business/service. -- `url:` The external url of the business/service. This link must have http:// (or https://) at the beginning if it is an external link. - -Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail. - -### Remove a merchant - -Open an issue using the ['Remove Merchant' template](https://github.com/monero-project/monero-site/issues/new?assignees=&labels=%F0%9F%8F%AA+merchant%3A+removal%2C+%F0%9F%94%8D+Needs+investigation&template=remove-merchant.md&title=Remove+%3CNAME_OF_THE_MECHANT%3E+from+the+list+of+merchants) and fill up all sections. - ## How to add a question to the FAQ The structure of the FAQ is a bit more complex than it used to be and contains anchors, variables and a TOC. A step by step guide would be too complex to follow. A basic knowledge of HTML is necessary to edit the page. If you wish to add a new FAQ please open an issue in the repository or/and contact the Website workgroup. diff --git a/_i18n/en.yml b/_i18n/en.yml index b428bbad..28aaec35 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -30,7 +30,7 @@ titles: workgroups: Workgroups hangouts: Hangouts sponsorships: Sponsorships - merchants: Merchants & Services + merchants: Merchants & Exchanges about: About Monero roadmap: Roadmap researchlab: Monero Research Lab (MRL) @@ -52,7 +52,7 @@ navigation: contributing: Contributing mining: Mining community: Community - merchants: Merchants + merchants: Merchants & Exchanges resources: Resources about: About mrl: Research Lab @@ -81,7 +81,7 @@ home: getcoins_para: After you install a wallet, you need to get some Monero. There are multiple ways to acquire some coins to spend, like mining or working in exchange for Monero, but the easiest way is to use an exchange and convert your fiat money into XMR. Many exchanges, centralized and decentralized, list Monero (XMR). exchanges: Exchanges useit: "It's a Currency: Use It!" - useit_para: Monero is a currency and can be exchanged for goods and services, privately and with very low fees. Many entities will gladly accept XMR for payments; take a look at our list of merchants currently accepting Monero. + useit_para: Monero is a currency and can be exchanged for goods, services and other currencies, privately and with very low fees. Many entities will gladly accept XMR for payments; take a look at our 'Merchants' page. merchants: Merchants answers: Find Answers to Your Questions faq: FAQ @@ -127,12 +127,32 @@ hangouts: monero-site: Where the development of this website is coordinated. merchants: - intro1: Merchants of all kinds have come to value the financial privacy that Monero brings. Below is a list of the merchants that we know of that currently accept Monero for their goods and services. These merchants are not vetted by the Getmonero team, see the disclaimer at the bottom of this page. If a company no longer accepts Monero or you would like your business to be listed, please - intro2: open a GitHub issue and let us know - intro3: (select the "Merchant" template and fill up all sections). + descr: On this page you will find stores and merchants that accept Monero as payment, as well as exchanges that trade Monero for other currencies. + useit: "Merchants that accept Monero" + use: Over the years, merchants of all kinds have come to value the financial privacy that Monero brings. In fact, merchant adoption is continuously rising. + dirdescr: "If you are looking for places to spend your Monero, the directories below have some options. Please remember to do your own research before trusting them with your money:" + descrp2p: The best way to exchange Monero for other currencies (or the other way round) is using P2P exchanges, because they allow traders to directly interact with each other, without the need of trusted third parties (except maybe for providing an escrow service). These exchanges are more private then their centralized counterparts and allow people to be in complete control of their coins if they are non-custodial, but they usually have less volume than 'traditional' exchanges. In the section below, we offer a list of P2P exchanges that support Monero. + swapsdescr: A new exciting way to exchange Monero is Atomic Swaps, which we announced on August 2021. Atomic Swaps are a completely decentralized way to swap Bitcoin <-> Monero (more info in the blog post). The technology is brand new, so there aren't many swap providers yet, but you can already sell XMR for BTC using this protocol at + bisqdescr: Decentralized P2P exchange based on Bitcoin and Tor. + cardfoss: "Open source:" + cardkyc: "No KYC (Know Your Customer):" + cardbtcfiat: (BTC ↔ fiat possible) + cardonion: "Onion address:" + noncustodial: "Non-custodial:" + hodlhodldescr: P2P trading platform with non-custodial escrow. + locmondescr: Online P2P exchange offering person-to-person trades. + depsell: Depends by the seller + locnojs: (but no-JS version available) + simpleswapdescr: Non-custodial instant exchange. disclaimer: | "Please note: these links are being provided as a convenience and for informational purposes only; they do not constitute an endorsement by the Monero community of any products, services or opinions of the corporations or organizations or individuals listed. The Monero community bears no responsibility for the accuracy, legality, or content of these external sites. Contact the external site for answers to questions regarding its content. As always, caveat emptor ('buyer beware'); you are responsible for doing your own research. Always use judgement when making online purchases." - onion: Onion address (needs Tor) + visitbisq: Visit Bisq + visitlocalmonero: Visit LocalMonero + visithodlhodl: Visit HodlHodl + centrexchanges: Centralized exchanges (CEXs) & Swappers + centrexchangesp: If you prefer to use centralized exchanges, here is a list of renowned CEXes and swappers. Many more exchanges support Monero, we list here only a few reputable ones. + cexp: Centralized exchanges that offer exchanging Monero for national currencies and cryptocurrencies. + swappersp: Swappers let users exchange XMR for other cryptocurrencies. sponsorships: intro: The following businesses actively support the Monero Project in its goal to bring financial privacy to the world. We couldn't be more grateful for their contributions. If you would like to sponsor the Monero Project and be listed on this page, please send an email to dev@getmonero.org. diff --git a/community/merchants/index.md b/community/merchants/index.md index 4a46d396..a1de1d2d 100644 --- a/community/merchants/index.md +++ b/community/merchants/index.md @@ -4,74 +4,111 @@ title: titles.merchants permalink: /community/merchants/index.html --- {% t global.lang_tag %} -
-

{% t merchants.intro1 %} {% t merchants.intro2 %} {% t merchants.intro3 %}

-
- -{% assign itemCount = site.data.merchants | size %} -{% assign headerRow = itemCount | divided_by: 5.0 | ceil | times: 1.0 %} -{% assign itemInRow = itemCount | divided_by: headerRow | ceil %} - -{% assign Item_processed = 0 %} - -
- {% for toplevel in site.data.merchants %} - {% assign isHeader = Item_processed | modulo: itemInRow %} - {% if isHeader == 0 %} -
- {% endif %} -

{{ toplevel.category }}

- {% assign Item_processed = Item_processed | plus: 1 %} - {% assign isHeader = Item_processed | modulo: itemInRow %} - {% if isHeader == 0 %} -
- {% if Item_processed != itemCount %} - {% assign headerRow = itemCount | minus: Item_processed | divided_by: 5.0 | ceil | times: 1.0 %} - {% assign itemInRow = itemCount | minus: Item_processed | divided_by: headerRow | ceil %} - {% endif %} - {% endif %} - {% endfor %} -
- - -
-
-
- - - -
+
+
+
+

{% t merchants.descr %}

-
- - -
-{% for toplevel in site.data.merchants %} -
-
-

{{toplevel.category}}

-
- {% assign sortedMerchants = toplevel.merchants | sort: 'name' %} - {% for merchants in sortedMerchants %} -
-

{{merchants.name}} - {% if merchants.url contains ".onion" %}onion{% endif %}

-
- {% endfor %} +
+
+

{% t merchants.useit %}

+

{% t merchants.use %}

+

{% t merchants.dirdescr %}

+ +
+
+
+
+

P2P exchanges and Atomic Swaps

+

{% t merchants.descrp2p %}

+

{% t merchants.swapsdescr %} unstoppableswap.net.

+
+
+
+
+
+
+ Bisq Logo +

{% t merchants.bisqdescr %}

+
+
+

{% t merchants.cardfoss %}

+

{% t merchants.noncustodial %}

+

{% t merchants.cardkyc %}

+

XMR ↔ fiat: {% t merchants.cardbtcfiat %}

+

{% t merchants.cardonion %}

+
+
+

{% t merchants.visitbisq %}

+
+
+
+
+
+ LocalMonero logo +

{% t merchants.locmondescr %}

+
+
+

{% t merchants.cardfoss %}

+

{% t merchants.noncustodial %}

+

{% t merchants.cardkyc %} {% t merchants.depsell %}

+

XMR ↔ fiat:

+

{% t merchants.cardonion %}

+
+
+

{% t merchants.visitlocalmonero %}

+
-
-{%endfor%} - -
-
-

- {% t merchants.disclaimer %} -

-
- - +
+
+
+
+ HodlHodl Logo +

{% t merchants.hodlhodldescr %}

+
+
+

{% t merchants.cardfoss %}

+

{% t merchants.noncustodial %}

+

{% t merchants.cardkyc %}

+

XMR ↔ fiat: {% t merchants.cardbtcfiat %}

+

{% t merchants.cardonion %}

+
+
+

{% t merchants.visithodlhodl %}

+
+
+
+
+
+
+

{% t merchants.centrexchanges %}

+

{% t merchants.centrexchangesp %}

+

CEXes

+

{% t merchants.cexp %}

+ +

*Fiat currency to Monero trading pair (e.g. XMR/USD, XMR/EUR)

+

Swappers

+

{% t merchants.swappersp %}

+ +
+
+
+

{% t merchants.disclaimer %}

+
+
+
diff --git a/css/custom.css b/css/custom.css index da8a0a9a..eaf332eb 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3532,119 +3532,27 @@ span.icon-git { /***************************MERCHANTS STYLING***********************************/ -.merchants .col-md-4 { - padding-left: 1rem; - padding-right: 1rem; +.merchants img.merch { + max-height: 85px; } -.merchants a { - margin-top: 0.4rem; - margin-bottom: 0.4rem; - display: inline; +.merchants span { + height: 1.8rem; + width: 1.8rem; + display: inline-block; + vertical-align: middle; } -.tabPanel-merchant { - position: relative; - margin-bottom: 1rem; +.merchants span.check { + background-image: url("/img/emojis/2714.svg"); } -.tabPanel-merchant + .tabPanel-merchant { - margin-top: -1rem; +.merchants span.cross { + background-image: url("/img/emojis/274C.svg"); } -.tabPanel-merchant > h2 { - font-size: 1.1rem; - height: 2rem; - line-height: 2rem; - padding: 1rem 0; -} - -.tabPanel-merchant > h2 { - position: relative; - margin: 0; - text-align: center; - background: #ffffff; - color: #000; - -moz-box-shadow: 0 1px 0px rgba(50,50,93,.1); - -webkit-box-shadow: 0 1px 0px rgba(50,50,93,.1); - box-shadow: 0 1px 0px rgba(50,50,93,.1); -} - -.tabPanel-merchant > h2 ~ h2 { - position: absolute; - top: 0; -} - -.tabPanel-merchant a:hover, .tabPanel-merchant a:focus, .tabPanel-merchant a:active { - color: #d26e2b; -} - -.tabPanel-merchant h2:nth-child(1) { - left: 0; -} - -.tabPanel-merchant3 > h2 { - width: calc(100% / 3); -} - -.tabPanel-merchant3 h2:nth-child(2) { - left: calc(1 * (100% / 3)); -} - -.tabPanel-merchant3 h2:nth-child(3) { - left: calc(2 * (100% / 3)); -} - -.tabPanel-merchant4 > h2 { - width: calc(100% / 4); -} - -.tabPanel-merchant4 h2:nth-child(2) { - left: calc(1 * (100% / 4)); -} - -.tabPanel-merchant4 h2:nth-child(3) { - left: calc(2 * (100% / 4)); -} - -.tabPanel-merchant4 h2:nth-child(4) { - left: calc(3 * (100% / 4)); -} - -.tabPanel-merchant5 > h2 { - width: calc(100% / 5); -} - -.tabPanel-merchant5 h2:nth-child(2) { - left: calc(1 * (100% / 5)); -} - -.tabPanel-merchant5 h2:nth-child(3) { - left: calc(2 * (100% / 5)); -} - -.tabPanel-merchant5 h2:nth-child(4) { - left: calc(3 * (100% / 5)); -} - -.tabPanel-merchant5 h2:nth-child(5) { - left: calc(3 * (100% / 5)); -} - -@media only screen and (max-width: 50rem) { - -.tabPanel-merchant > h2 { - font-size: 1.1rem; - height: 3rem; - padding: 1rem 0; -} -} - -@media only screen and (max-width: 62rem) { - -.tabPanel-merchant { - display: none; -} +.merchants a.btn-fixed { + margin-top: 1rem; } /***************************ROADMAP STYLING*********************************/ diff --git a/img/emojis/274C.svg b/img/emojis/274C.svg new file mode 100644 index 00000000..3f85bd5a --- /dev/null +++ b/img/emojis/274C.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/img/merchants/bisq.svg b/img/merchants/bisq.svg new file mode 100644 index 00000000..f2efd750 --- /dev/null +++ b/img/merchants/bisq.svg @@ -0,0 +1,18 @@ + + + + bisq_logo_green + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/img/merchants/hodlhodl.jpg b/img/merchants/hodlhodl.jpg new file mode 100644 index 00000000..4057c632 Binary files /dev/null and b/img/merchants/hodlhodl.jpg differ diff --git a/img/merchants/localmonero.png b/img/merchants/localmonero.png new file mode 100644 index 00000000..1b82f2ee Binary files /dev/null and b/img/merchants/localmonero.png differ diff --git a/img/merchants/simpleswap.png b/img/merchants/simpleswap.png new file mode 100644 index 00000000..18fb5499 Binary files /dev/null and b/img/merchants/simpleswap.png differ diff --git a/index.html b/index.html index 4359eac0..786b1f77 100644 --- a/index.html +++ b/index.html @@ -58,7 +58,7 @@ permalink: index.html

{% t home.getcoins %}

{% t home.getcoins_para %}

-

{% t home.exchanges %}

+

{% t home.exchanges %}