rebase (#1)

* Update 2021-02-21-navcoin-core-602.md * Update index.en.md * Update index.es.md * Update index.it.md * Update index.jp.md * Update index.ru.md * Update index.zh.md * Update index.en.md * Update index.es.md * Update index.it.md * Update index.jp.md * Update index.kr.md * Update index.ru.md * Update index.zh.md * Comment out "merchant" page and remove CoinPayments refs (navcoin#307) * comment out merchant page and remove coinpayments refs * fix wrong char * remove navcollab references (navcoin#308) * issue navcoin#309 * Update index.es.md * issue navcoin#309 * issue navcoin#309 * issue navcoin#309 * issue navcoin#309 * issue navcoin#309 Co-authored-by: Barry Deeney <[email protected]> Co-authored-by: Rodrigo Otero <[email protected]> Co-authored-by: KasteluKannu <[email protected]> Co-authored-by: alex v <[email protected]>
chasingkirkjufell · Mar 24, 2021 · 9dc8a9c · 9dc8a9c
1 parent 7e893e5
commit 9dc8a9c
Show file tree

Hide file tree

Showing 54 changed files with 103 additions and 737 deletions.
diff --git a/config.toml b/config.toml
@@ -134,13 +134,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.en.menu.main]]
-        name = "Merchants"
-        title = "Merchants"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.en.menu.main]]
+    #     name = "Merchants"
+    #     title = "Merchants"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.en.menu.main]]
         name = "Get Involved"
         title = "Get Involved"
@@ -261,13 +261,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.es.menu.main]]
-        name = "Tiendas"
-        title = "Tiendas"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.es.menu.main]]
+    #     name = "Tiendas"
+    #     title = "Tiendas"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.es.menu.main]]
         name = "Involucrarse"
         title = "Involucrarse"
@@ -389,13 +389,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.ru.menu.main]]
-        name = "Торговцы"
-        title = "Торговцы"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.ru.menu.main]]
+    #     name = "Торговцы"
+    #     title = "Торговцы"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.ru.menu.main]]
         name = "Принять участие"
         title = "Принять участие"
@@ -517,13 +517,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.zh.menu.main]]
-        name = "商人"
-        title = "商人"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.zh.menu.main]]
+    #     name = "商人"
+    #     title = "商人"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.zh.menu.main]]
         name = "参与进来"
         title = "参与进来"
@@ -645,13 +645,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.kr.menu.main]]
-        name = "상인"
-        title = "상인"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.kr.menu.main]]
+    #     name = "상인"
+    #     title = "상인"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.kr.menu.main]]
         name = "참여하다"
         title = "참여하다"
@@ -774,13 +774,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.jp.menu.main]]
-        name = "商人"
-        title = "商人"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.jp.menu.main]]
+    #     name = "商人"
+    #     title = "商人"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.jp.menu.main]]
         name = "参加する"
         title = "参加する"
@@ -901,13 +901,13 @@ enableRobotsTXT = true
         url = "https://navhub.org"
         identifier = "navhub"
         parent = "explore"
-    [[Languages.it.menu.main]]
-        name = "Commercianti"
-        title = "Commercianti"
-        weight = 50
-        url = "/merchants/"
-        identifier = "merchants"
-        parent = "explore"
+    # [[Languages.it.menu.main]]
+    #     name = "Commercianti"
+    #     title = "Commercianti"
+    #     weight = 50
+    #     url = "/merchants/"
+    #     identifier = "merchants"
+    #     parent = "explore"
     [[Languages.it.menu.main]]
         name = "Partecipa"
         title = "Partecipa"

diff --git a/content/_index.en.html b/content/_index.en.html
@@ -182,12 +182,6 @@ <h1 style="margin-top: 16px;">Join Our Active Navcoin&nbsp;Community</h1>
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.es.html b/content/_index.es.html
@@ -182,12 +182,6 @@ <h1 style="margin-top: 16px;">Únanse a nuestra comunidad&nbsp;activa</h1>
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.it.html b/content/_index.it.html
@@ -183,12 +183,6 @@ <h1 style="margin-top: 16px;">Unisciti alla nostra comunità attiva Navcoin</h1>
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.jp.html b/content/_index.jp.html
@@ -182,12 +182,6 @@ <h1 style="margin-top: 16px;">私達のアクティブなNavcoinコミュニテ
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.kr.html b/content/_index.kr.html
@@ -171,12 +171,6 @@ <h1 style="margin-top: 16px;">활발한 Nav코인 커뮤니티에 참여하세
           <h3>디스코드</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.ru.html b/content/_index.ru.html
@@ -172,12 +172,6 @@ <h1 style="margin-top: 16px;">Присоединяйтесь к нашему а
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/_index.zh.html b/content/_index.zh.html
@@ -172,12 +172,6 @@ <h1 style="margin-top: 16px;">加入我们积极的Navcoin社区 </h1>
           <h3>Discord</h3>
         </div>
       </a>
-      <a href="https://collab.navcoin.org" target="_blank" rel="noopener noreferrer">
-        <div>
-          <img src="/images/icons/navcoin-collab.svg" alt="Collab website logo">
-          <h3>Collab</h3>
-        </div>
-      </a>
       <a href="https://www.reddit.com/r/Navcoin" target="_blank" rel="noopener noreferrer">
         <div>
           <img src="/images/icons/reddit.svg" alt="Reddit logo">

diff --git a/content/bounties/index.en.md b/content/bounties/index.en.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.es.md b/content/bounties/index.es.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.it.md b/content/bounties/index.it.md
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.jp.md b/content/bounties/index.jp.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.kr.md b/content/bounties/index.kr.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.ru.md b/content/bounties/index.ru.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"

diff --git a/content/bounties/index.zh.md b/content/bounties/index.zh.md
@@ -146,7 +146,7 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     <p class="paragraph-text">Webistes that are covered by this bounty program:</p>
     <h3>1. Navcoin Org</h3>
     <p class="paragraph-text">This is the main public facing site for Navcoin. It contains information about what Navcoin is, where to buy it, how to store it, where to spend it and how the protocol works.</p>
-    <p class="paragraph-text"><b>Bounty Ideas:</b> New merchants, new exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
+    <p class="paragraph-text"><b>Bounty Ideas:</b> New exchanges, new translations, updating existing translations, updating the roadmap, reviewing and refining content, adding pagination on list pages, improving the content management system and more.</p>
     <h3>2. NavHub</h3>
     <p class="paragraph-text">This is the website dedicated to all the layer two applications of Navcoin and the wider community beyond the core protocol.</p>
     <p class="paragraph-text"><b>Bounty Ideas:</b> Writing news articles, updating community projects, adding new community projects, adding new events, adding community assets, adding navcoin heroes, adding or updating guides, adding pagination to list pages, adding search or category filters to the projects listing and more.</p>
@@ -193,11 +193,6 @@ buttonImgSrc="/images/icons/downward-arrow.svg"
     imgSrc="/images/for-beginners/beg-discord.svg"
     linkUrl="https://discordapp.com/invite/y4Vu9jw"
 >}}
-{{< social                 
-    titleText="Collab"
-    imgSrc="/images/for-beginners/beg-collab.svg"
-    linkUrl="https://collab.navcoin.org/dashboard"
->}}
 {{< social                 
     titleText="Reddit"
     imgSrc="/images/for-beginners/beg-reddit.svg"