From 1086de8406bdcf01030f617f0b2ce5a7085163f4 Mon Sep 17 00:00:00 2001
From: timotheegoguely <timothee@goguely.com>
Date: Mon, 18 Oct 2021 22:02:03 +0200
Subject: [PATCH 1/3] Add btn-black class to Join now buttons

---
 src/assets/css/_buttons.css                 | 10 +++++++++-
 src/layouts/index.html                      |  2 +-
 src/layouts/partials/components/footer.html |  5 +----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/assets/css/_buttons.css b/src/assets/css/_buttons.css
index be6d492..8b96605 100644
--- a/src/assets/css/_buttons.css
+++ b/src/assets/css/_buttons.css
@@ -18,12 +18,20 @@ a.btn {
   color: var(--black);
 }
 
+.btn-black {
+  border-color: var(--black);
+  background: var(--black);
+  color: var(--near-white);
+}
+.btn-black:hover {
+  color: var(--white);
+}
+
 .btn-white {
   background: none;
   border-color: var(--light-gray);
   color: var(--light-gray);
 }
-
 .btn-white:hover {
   border-color: var(--white);
   color: var(--white);
diff --git a/src/layouts/index.html b/src/layouts/index.html
index e14b093..87817cd 100644
--- a/src/layouts/index.html
+++ b/src/layouts/index.html
@@ -49,7 +49,7 @@ <h1 class="f1 f1-vw-l lh-solid tracked-tight normal black ma0 mb3 pl3" style="ma
       <img class="h-auto db center-l" src="{{ $img.Permalink }}" srcset="{{ $img2x.Permalink }} 2x" width="118" height="118" alt="">
     </div>
     <div class="fl w-100 w-60-m w-40-l pl2 pl3-ns pt3 f5 f5-vw-l">
-      <a href="https://id.resonate.coop/join" class="btn">{{ T "join_now" }}</a>
+      <a href="https://id.resonate.coop/join" class="btn btn-black">{{ T "join_now" }}</a>
       <p class="mt3"><a href="https://stream.resonate.coop/api/v2/user/connect/resonate" class="b">{{ T "login_player" }}</a></p>
     </div>
   </div>
diff --git a/src/layouts/partials/components/footer.html b/src/layouts/partials/components/footer.html
index 78dfa78..fd74d3c 100644
--- a/src/layouts/partials/components/footer.html
+++ b/src/layouts/partials/components/footer.html
@@ -1,5 +1,5 @@
 <section id="join" class="ph3 ph4-ns bt b--gray text-center flex justify-center items-center pv5">
-  <a href="https://id.resonate.coop/join" class="btn f5 f5-vw-l">{{ T "join_now" }}</a>
+  <a href="https://id.resonate.coop/join" class="btn btn-black f5 f5-vw-l">{{ T "join_now" }}</a>
 </section>
 
 <footer id="footer" class="footer-component bg-black white pt4 pb6 pb5-l f5" role="contentinfo">
@@ -75,9 +75,6 @@ <h2 class="f5 normal ttu mb2 mt0">{{ T "code" }}</h2>
           <a class="link ttu" href="{{ .URL | absLangURL }}">{{ .Name }}</a>
         </div>
         {{ end }}
-        <div class="w-100 w-50-m w-25-l ph2 ph3-ns">
-          <span>7.0.2</span>
-        </div>
       </div>
     </div>
   </div>

From c90284e424ae269da3cf00828dd1d28573141d62 Mon Sep 17 00:00:00 2001
From: timotheegoguely <timothee@goguely.com>
Date: Mon, 18 Oct 2021 22:02:49 +0200
Subject: [PATCH 2/3] =?UTF-8?q?Rename=20/the-coop=20=E2=80=93>=20/coop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/content/_index.en.md                    | 4 ++--
 src/content/_index.es.md                    | 4 ++--
 src/content/_index.fr.md                    | 4 ++--
 src/content/about/_index.en.md              | 4 ++--
 src/content/about/_index.es.md              | 4 ++--
 src/content/about/_index.fr.md              | 4 ++--
 src/content/{the-coop => coop}/_index.en.md | 6 +++---
 src/content/{the-coop => coop}/_index.es.md | 6 +++---
 src/content/{the-coop => coop}/_index.fr.md | 6 +++---
 src/content/pricing/_index.en.md            | 2 +-
 src/content/pricing/_index.es.md            | 2 +-
 src/content/pricing/_index.fr.md            | 2 +-
 src/layouts/{the-coop => coop}/single.html  | 2 +-
 13 files changed, 25 insertions(+), 25 deletions(-)
 rename src/content/{the-coop => coop}/_index.en.md (98%)
 rename src/content/{the-coop => coop}/_index.es.md (98%)
 rename src/content/{the-coop => coop}/_index.fr.md (98%)
 rename src/layouts/{the-coop => coop}/single.html (99%)

diff --git a/src/content/_index.en.md b/src/content/_index.en.md
index aca6298..e7d2108 100644
--- a/src/content/_index.en.md
+++ b/src/content/_index.en.md
@@ -18,7 +18,7 @@ playfair:
     - text: "Manifesto"
       href: "/manifesto"
     - text: "The Co-op"
-      href: "/the-coop"
+      href: "/coop"
     - text: "stream2own"
       href: "/pricing"
   cta: "Become a member"
@@ -39,7 +39,7 @@ features:
       src: "images/illustrations/Resonate_Ear.png"
   - id: govern-and-own
     title: "Gover & own your platform"
-    text: "**[GOVERN & OWN your platform](/the-coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
+    text: "**[GOVERN & OWN your platform](/coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
     details: "Our members are artists, labels, listeners and workers. <br>One member, one share, one vote."
     img:
       src: "images/illustrations/Badge.png"
diff --git a/src/content/_index.es.md b/src/content/_index.es.md
index aca6298..e7d2108 100644
--- a/src/content/_index.es.md
+++ b/src/content/_index.es.md
@@ -18,7 +18,7 @@ playfair:
     - text: "Manifesto"
       href: "/manifesto"
     - text: "The Co-op"
-      href: "/the-coop"
+      href: "/coop"
     - text: "stream2own"
       href: "/pricing"
   cta: "Become a member"
@@ -39,7 +39,7 @@ features:
       src: "images/illustrations/Resonate_Ear.png"
   - id: govern-and-own
     title: "Gover & own your platform"
-    text: "**[GOVERN & OWN your platform](/the-coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
+    text: "**[GOVERN & OWN your platform](/coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
     details: "Our members are artists, labels, listeners and workers. <br>One member, one share, one vote."
     img:
       src: "images/illustrations/Badge.png"
diff --git a/src/content/_index.fr.md b/src/content/_index.fr.md
index aca6298..e7d2108 100644
--- a/src/content/_index.fr.md
+++ b/src/content/_index.fr.md
@@ -18,7 +18,7 @@ playfair:
     - text: "Manifesto"
       href: "/manifesto"
     - text: "The Co-op"
-      href: "/the-coop"
+      href: "/coop"
     - text: "stream2own"
       href: "/pricing"
   cta: "Become a member"
@@ -39,7 +39,7 @@ features:
       src: "images/illustrations/Resonate_Ear.png"
   - id: govern-and-own
     title: "Gover & own your platform"
-    text: "**[GOVERN & OWN your platform](/the-coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
+    text: "**[GOVERN & OWN your platform](/coop)** Join as a co-op member to have a real say in the future of digital audio. Be a part of an active co-operative community; govern the decisions and development, share in the profits, build a fairer future."
     details: "Our members are artists, labels, listeners and workers. <br>One member, one share, one vote."
     img:
       src: "images/illustrations/Badge.png"
diff --git a/src/content/about/_index.en.md b/src/content/about/_index.en.md
index cdd8f61..a7fb342 100644
--- a/src/content/about/_index.en.md
+++ b/src/content/about/_index.en.md
@@ -19,7 +19,7 @@ for:
     details: "Resonate stands in solidarity with artists and independent labels fighting the commodification of music and the excessive profits of the majors and tech giants."
     links:
       - text: "Join a global community of creativity"
-        href: "/join"
+        href: "https://id.resonate.coop/join"
     img:
       src: "images/illustrations/Collaboration.png"
   - id: "everyone"
@@ -29,7 +29,7 @@ for:
     links:
       - title: "Why we’re a coop"
         text: "We’re doing things differently — learn more"
-        href: "/the-coop"      
+        href: "/coop"      
     img:
       src: "images/illustrations/Badge.png"
 why:
diff --git a/src/content/about/_index.es.md b/src/content/about/_index.es.md
index 275d145..bdc44b0 100644
--- a/src/content/about/_index.es.md
+++ b/src/content/about/_index.es.md
@@ -19,7 +19,7 @@ for:
     details: "Resonate stands in solidarity with artists and independent labels fighting the commodification of music and the excessive profits of the majors and tech giants."
     links:
       - text: "Join a global community of creativity"
-        href: "/join"
+        href: "https://id.resonate.coop/join"
     img:
       src: "images/illustrations/Collaboration.png"
   - id: "everyone"
@@ -29,7 +29,7 @@ for:
     links:
       - title: "Why we’re a coop"
         text: "We’re doing things differently — learn more"
-        href: "/the-coop"      
+        href: "/coop"      
     img:
       src: "images/illustrations/Badge.png"
 why:
diff --git a/src/content/about/_index.fr.md b/src/content/about/_index.fr.md
index 275d145..bdc44b0 100644
--- a/src/content/about/_index.fr.md
+++ b/src/content/about/_index.fr.md
@@ -19,7 +19,7 @@ for:
     details: "Resonate stands in solidarity with artists and independent labels fighting the commodification of music and the excessive profits of the majors and tech giants."
     links:
       - text: "Join a global community of creativity"
-        href: "/join"
+        href: "https://id.resonate.coop/join"
     img:
       src: "images/illustrations/Collaboration.png"
   - id: "everyone"
@@ -29,7 +29,7 @@ for:
     links:
       - title: "Why we’re a coop"
         text: "We’re doing things differently — learn more"
-        href: "/the-coop"      
+        href: "/coop"      
     img:
       src: "images/illustrations/Badge.png"
 why:
diff --git a/src/content/the-coop/_index.en.md b/src/content/coop/_index.en.md
similarity index 98%
rename from src/content/the-coop/_index.en.md
rename to src/content/coop/_index.en.md
index e94183a..f87c917 100644
--- a/src/content/the-coop/_index.en.md
+++ b/src/content/coop/_index.en.md
@@ -1,5 +1,5 @@
 ---
-title: "The Co-op"
+title: "Co-op"
 description: "Resonate is the world’s first co-operative music streaming service — a multi-stakeholder platform co-operative, democratically governed by its members: artists, listeners and workers."
 subtitle: "The community-owned music streaming service."
 hero:
@@ -23,8 +23,8 @@ features:
 
     We believe the “one member, one share, one vote” system is democratic, and supports community in a crucial way. Resonate is a co-op because we think that everyone should have the opportunity to own their platform. Everyone involved in the co-op has a say in how platform develops.
   cta: 
-    text: "Join the Co-op"
-    href: "/join"
+    text: "Join now"
+    href: "https://id.resonate.coop/join"
   link: 
     text: "Donate"
     href: "https://opencollective.com/resonate"
diff --git a/src/content/the-coop/_index.es.md b/src/content/coop/_index.es.md
similarity index 98%
rename from src/content/the-coop/_index.es.md
rename to src/content/coop/_index.es.md
index e94183a..f87c917 100644
--- a/src/content/the-coop/_index.es.md
+++ b/src/content/coop/_index.es.md
@@ -1,5 +1,5 @@
 ---
-title: "The Co-op"
+title: "Co-op"
 description: "Resonate is the world’s first co-operative music streaming service — a multi-stakeholder platform co-operative, democratically governed by its members: artists, listeners and workers."
 subtitle: "The community-owned music streaming service."
 hero:
@@ -23,8 +23,8 @@ features:
 
     We believe the “one member, one share, one vote” system is democratic, and supports community in a crucial way. Resonate is a co-op because we think that everyone should have the opportunity to own their platform. Everyone involved in the co-op has a say in how platform develops.
   cta: 
-    text: "Join the Co-op"
-    href: "/join"
+    text: "Join now"
+    href: "https://id.resonate.coop/join"
   link: 
     text: "Donate"
     href: "https://opencollective.com/resonate"
diff --git a/src/content/the-coop/_index.fr.md b/src/content/coop/_index.fr.md
similarity index 98%
rename from src/content/the-coop/_index.fr.md
rename to src/content/coop/_index.fr.md
index e94183a..f87c917 100644
--- a/src/content/the-coop/_index.fr.md
+++ b/src/content/coop/_index.fr.md
@@ -1,5 +1,5 @@
 ---
-title: "The Co-op"
+title: "Co-op"
 description: "Resonate is the world’s first co-operative music streaming service — a multi-stakeholder platform co-operative, democratically governed by its members: artists, listeners and workers."
 subtitle: "The community-owned music streaming service."
 hero:
@@ -23,8 +23,8 @@ features:
 
     We believe the “one member, one share, one vote” system is democratic, and supports community in a crucial way. Resonate is a co-op because we think that everyone should have the opportunity to own their platform. Everyone involved in the co-op has a say in how platform develops.
   cta: 
-    text: "Join the Co-op"
-    href: "/join"
+    text: "Join now"
+    href: "https://id.resonate.coop/join"
   link: 
     text: "Donate"
     href: "https://opencollective.com/resonate"
diff --git a/src/content/pricing/_index.en.md b/src/content/pricing/_index.en.md
index f6ea481..8831cd6 100644
--- a/src/content/pricing/_index.en.md
+++ b/src/content/pricing/_index.en.md
@@ -8,7 +8,7 @@ hero:
   p2: "To support exploration of new music, Resonate guarantees artists a minimum earning of One Cent per Play while keeping the price so low Listeners can stream dozens of tracks for the first time for pennies (about 4 cents an hour in most cases). This way, listeners start as explorers and become backers."
   link:
     text: "Open a new account and we’ll give you around 4 hours of free credit"
-    href: "/join"
+    href: "https://id.resonate.coop/join"
 pricing:
   table: |-
     | Stream | Credits | €      |
diff --git a/src/content/pricing/_index.es.md b/src/content/pricing/_index.es.md
index f6ea481..8831cd6 100644
--- a/src/content/pricing/_index.es.md
+++ b/src/content/pricing/_index.es.md
@@ -8,7 +8,7 @@ hero:
   p2: "To support exploration of new music, Resonate guarantees artists a minimum earning of One Cent per Play while keeping the price so low Listeners can stream dozens of tracks for the first time for pennies (about 4 cents an hour in most cases). This way, listeners start as explorers and become backers."
   link:
     text: "Open a new account and we’ll give you around 4 hours of free credit"
-    href: "/join"
+    href: "https://id.resonate.coop/join"
 pricing:
   table: |-
     | Stream | Credits | €      |
diff --git a/src/content/pricing/_index.fr.md b/src/content/pricing/_index.fr.md
index f6ea481..8831cd6 100644
--- a/src/content/pricing/_index.fr.md
+++ b/src/content/pricing/_index.fr.md
@@ -8,7 +8,7 @@ hero:
   p2: "To support exploration of new music, Resonate guarantees artists a minimum earning of One Cent per Play while keeping the price so low Listeners can stream dozens of tracks for the first time for pennies (about 4 cents an hour in most cases). This way, listeners start as explorers and become backers."
   link:
     text: "Open a new account and we’ll give you around 4 hours of free credit"
-    href: "/join"
+    href: "https://id.resonate.coop/join"
 pricing:
   table: |-
     | Stream | Credits | €      |
diff --git a/src/layouts/the-coop/single.html b/src/layouts/coop/single.html
similarity index 99%
rename from src/layouts/the-coop/single.html
rename to src/layouts/coop/single.html
index 5518159..8321b52 100644
--- a/src/layouts/the-coop/single.html
+++ b/src/layouts/coop/single.html
@@ -32,7 +32,7 @@ <h2 class="f4 f4-vw-l mb0">{{ .title }}</h2>
       <div>{{ .text | markdownify }}</div>
       <p class="mt5">
         {{ with .cta }}
-        <a href="{{ .url }}" class="btn mr4">{{ .text }}</a> 
+        <a href="{{ .url }}" class="btn btn-black mr4">{{ .text }}</a> 
         {{ end }}
         {{ with .link }}
         <a href="{{ .url }}" class="b">{{ .text }}</a> 

From bae55d4b96396c5c3dcf93e32d9c5bfc9264032a Mon Sep 17 00:00:00 2001
From: timotheegoguely <timothee@goguely.com>
Date: Mon, 18 Oct 2021 22:03:00 +0200
Subject: [PATCH 3/3] Update footer links

---
 src/config/_default/languages.yaml | 62 +++++++++++++-----------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/config/_default/languages.yaml b/src/config/_default/languages.yaml
index 012e93a..db9e713 100644
--- a/src/config/_default/languages.yaml
+++ b/src/config/_default/languages.yaml
@@ -13,7 +13,7 @@ en:
       weight: -110
     - name: The Co-op
       title: The Co-op
-      url: /the-coop/
+      url: /coop/
       weight: -109
     - name: Blog
       title: Resonate Blog
@@ -38,16 +38,12 @@ en:
       weight: 1
     - name: The Co-op
       title: The Co-op
-      url: /the-coop/
+      url: /coop/
       weight: 2
-    - name: Blog
-      title: Resonate Blog
-      url: /blog/
-      weight: 3
     - name: Handbook
       title: Handbook
       url: https://community.resonate.is/c/handbook/60
-      weight: 4
+      weight: 3
     footer2:
     - name: Join
       title: Join Resonate
@@ -55,7 +51,7 @@ en:
       weight: 1
     - name: Volunteering
       title: Volunteering
-      url: /volunteering/
+      url: https://community.resonate.is/
       weight: 2
     - name: Team
       title: Resonate Team
@@ -79,9 +75,9 @@ en:
       url: /contact/
       weight: 4
     footer4:
-    - name: Documentation
-      title: Documentation
-      url: /documentation/
+    - name: Help us build
+      title: Platform - Resonate Community Forum
+      url: https://community.resonate.is/c/platform
       weight: 1
     - name: GitHub
       title: Resonate GitHub
@@ -97,12 +93,12 @@ en:
       weight: 4
     footer:
     - name: Terms + Conditions
-      title: Documentation
-      url: /terms/
+      title: Terms + Conditions
+      url: https://community.resonate.is/docs?topic=1865
       weight: 2
     - name: Privacy Policy
       title: Privacy Policy
-      url: /privacy-policy/
+      url: https://community.resonate.is/docs?topic=1863
       weight: 3
 fr:
   weight: 2
@@ -144,7 +140,7 @@ fr:
       weight: 1
     - name: La Coop
       title: La Coop
-      url: /the-coop/
+      url: /coop/
       weight: 2
     - name: Blog
       title: Blog de Resonate
@@ -161,7 +157,7 @@ fr:
       weight: 1
     - name: Volunteering
       title: Volunteering
-      url: /volunteering/
+      url: https://community.resonate.is/
       weight: 2
     - name: Équipe
       title: Équipe de Resonate
@@ -185,9 +181,9 @@ fr:
       url: /contact/
       weight: 4
     footer4:
-    - name: Documentation
-      title: Documentation
-      url: /documentation/
+    - name: Help us build
+      title: Resonate Community Forum Platform
+      url: https://community.resonate.is/c/platform
       weight: 1
     - name: GitHub
       title: Resonate GitHub
@@ -203,12 +199,12 @@ fr:
       weight: 4
     footer:
     - name: Terms + Conditions
-      title: Documentation
-      url: /terms/
+      title: Terms + Conditions
+      url: https://community.resonate.is/docs?topic=1865
       weight: 2
     - name: Privacy Policy
       title: Privacy Policy
-      url: /privacy-policy/
+      url: https://community.resonate.is/docs?topic=1863
       weight: 3
 es:
   weight: 3
@@ -250,16 +246,12 @@ es:
       weight: 1
     - name: The Co-op
       title: The Co-op
-      url: /the-coop/
+      url: /coop/
       weight: 2
-    - name: Blog
-      title: Resonate Blog
-      url: /blog/
-      weight: 3
     - name: Handbook
       title: Handbook
       url: https://community.resonate.is/c/handbook/60
-      weight: 4
+      weight: 3
     footer2:
     - name: Join
       title: Join Resonate
@@ -267,7 +259,7 @@ es:
       weight: 1
     - name: Volunteering
       title: Volunteering
-      url: /volunteering/
+      url: https://community.resonate.is/
       weight: 2
     - name: Team
       title: Resonate Team
@@ -291,9 +283,9 @@ es:
       url: /contact/
       weight: 4
     footer4:
-    - name: Documentation
-      title: Documentation
-      url: /documentation/
+    - name: Help us build
+      title: Resonate Community Forum Platform
+      url: https://community.resonate.is/c/platform
       weight: 1
     - name: GitHub
       title: Resonate GitHub
@@ -309,10 +301,10 @@ es:
       weight: 4
     footer:
     - name: Terms + Conditions
-      title: Documentation
-      url: /terms/
+      title: Terms and Conditions
+      url: https://community.resonate.is/docs?topic=1865
       weight: 2
     - name: Privacy Policy
       title: Privacy Policy
-      url: /privacy-policy/
+      url: https://community.resonate.is/docs?topic=1863
       weight: 3
\ No newline at end of file