Merge pull request #25 from resonatecoop/new-website

Update Join now style and links, rename the-coop -> coop and update footer links

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);

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,24 +38,20 @@ 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
       url: https://id.resonate.coop/join
       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,24 +246,20 @@ 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
       url: https://id.resonate.coop/join
       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

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"

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"

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"

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:

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:

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:

src/content/the-coop/_index.en.md → 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"

src/content/the-coop/_index.es.md → 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"

src/content/the-coop/_index.fr.md → 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"

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 | €      |

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 | €      |

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 | €      |

src/layouts/the-coop/single.html → 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> 

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>