Merge pull request jamstack#909 from jamstack/rm/2824/remove-discord-links

Remove mentions and links to retired Jamstack discord

Author: hexagoncircle

src/site/code-of-conduct.njk

@@ -20,7 +20,7 @@ layout: layouts/base.njk
     We are a diverse, global community. We have members from every gender, sexuality, gender expression, race, ethnicity, tribal background, religious affiliation, citizenship and nationality, age, physical ability, educational background, experience level that you can think of - and want everyone to feel welcome!
   </p>
   <p>
-    Whether it is contributing to our website, connecting in our Discord, or attending conferences and independently organized meetings, it's not only our hope, but our expectation, that you'll abide by these three basic ground rules:
+    Whether it is contributing to our website or attending conferences and independently organized meetings, it's not only our hope, but our expectation, that you'll abide by these three basic ground rules:
   </p>
 
   <ul class="list-disc list-outside pl-4 my-4">
@@ -68,7 +68,7 @@ layout: layouts/base.njk
   </ul>
 </section>
 
-<section>
+{# <section>
   <h2 class="mb-6">Discord Code of Conduct</h2>
   <ul class="list-disc list-outside pl-4">
     <li>Written communication is easy to misinterpret. Ask for clarification before jumping to conclusions.</li>
@@ -79,7 +79,7 @@ layout: layouts/base.njk
     <li>Limit your use of `@channel` and `@here` as this notifies everyone across global timezones.</li>
     <li>Select the most appropriate channel for your conversation and avoid reposting the same messages across many channels in ways which may feel spammy.</li>
   </ul>
-</section>
+</section> #}
 
 <section>
   <h2 class="mb-6">Group Meeting Code of Conduct</h2>
@@ -106,11 +106,17 @@ layout: layouts/base.njk
   </p>
 
   <ul class="list-disc list-outside pl-4 my-4">
-    <li><h3 class="dark:text-white font-bold inline">In the moment:</h3> Are you safe? If not, get to a safe place. Can you talk to someone you trust about what happened?</li>
-    <li><h3 class="dark:text-white font-bold inline">As soon as possible:</h3> evaluate the situation - is it safe to talk to the person directly about this incident?
+    <li>
+      <h3 class="dark:text-white font-bold inline">In the moment:</h3> Are you safe? If not, get to a safe place. Can you talk to someone you trust about what happened?</li>
+    <li>
+      <h3 class="dark:text-white font-bold inline">As soon as possible:</h3> evaluate the situation - is it safe to talk to the person directly about this incident?
       <ul class="list-disc list-outside pl-4 my-4">
-        <li><h3 class="dark:text-white font-bold inline">If it seems safe</h3>, try and speak with the person privately, <b>in person</b> if you can. Try and work to a resolution together. If it goes well, great! If it does not go well, please speak to an organizer as soon as you can.
-        <li> <h3 class="dark:text-white font-bold inline">If it does not seem safe</h3>, or the conversation did not go well, speak to an organizer about what happened as soon as you can.</li>
+        <li>
+          <h3 class="dark:text-white font-bold inline">If it seems safe</h3>, try and speak with the person privately, <b>in person</b> if you can. Try and work to a resolution together. If it goes well, great! If it does not go well, please speak to an organizer as soon as you can.
+        
+        
+        <li>
+          <h3 class="dark:text-white font-bold inline">If it does not seem safe</h3>, or the conversation did not go well, speak to an organizer about what happened as soon as you can.</li>
       </ul>
     </li>
     <li>
@@ -151,4 +157,4 @@ layout: layouts/base.njk
   <p>
     Depending on the severity of the issue, the person may receive a last-chance warning, may be asked to leave the activity/group, or may receive a future ban. In very severe cases, we reserve the right to involve law enforcement should we feel it necessary. Tickets or other participation fees won't be refunded for people who are removed for CoC violations.
   </p>
-</section>
+</section>

src/site/community.njk

@@ -10,29 +10,11 @@ layout: layouts/base.njk
 <section class="my-16 text-center">
   <h1>Join the global community</h1>
   <p class="w-4/5 mx-auto ">Our community members gather in many channels, online and in-person around the world, to learn about modern web development techniques and emerging technologies. Join the community to exchange ideas, find new opportunities and help build a better web.</p>
-
-  <div class="lg:w-2/3 mx-auto md:grid md:grid-cols-2 md:gap-6 lg:gap-8 my-12">
-    {{ zinger.cta(
-        "Join the Discord",
-        "https://jamstack.org/discord",
-        "bg-gradient-card-sunrise card-shadow hover:card-shadow-sunrise",
-        "#logo-discord"
-        )
-    }}
-    {{ zinger.cta(
-        "JamstackConf Twitter",
-        "https://twitter.com/jamstackconf",
-        "bg-gradient-card-blue-seafoam card-shadow hover:card-shadow-blue-seafoam",
-        "#logo-twitter"
-        )
-    }}
-  </div>
   <p class="pb-20 border-gray-300 dark:border-gray-400 border-b">
     To participate in our community channels, it’s important to read and follow our <a href="/code-of-conduct">Code of Conduct</a>
   </p>
 </section>
 
-
 <section>
   <h2>Community Mission</h2>
   <p class="mb-2">
@@ -46,28 +28,6 @@ layout: layouts/base.njk
   </ul>
 </section>
 
-{% if meetups.length > 0 %}
-<section>
-  <h2>Upcoming Events</h2>
-  <table>
-    <thead class="hidden md:table-header-group">
-      <tr>
-        <th class="text-left p-4">Group</th>
-        <th class="text-left p-4">Name</th>
-        <th class="text-left p-4">Venue</th>
-        <th class="text-left p-4">Date/Time</th>
-      </tr>
-    </thead>
-    <tbody>
-  {% for meetup, data in meetups %}
-    {% set item = meetup %}
-    {% include "components/meetup-link.njk" %}
-  {% endfor %}
-    </tbody>
-  </table>
-</section>
-{% endif %}
-
 <section class="cards">
   <h2 class="mb-12">Find a Local User Group</h2>
   <filter-container data-oninit>
@@ -81,7 +41,7 @@ layout: layouts/base.njk
         <select data-filter-bind="country" class="text-black py-1 px-2 rounded-default border border-gray-200 dark:border-transparent bg-white">
           <option selected value="">All Countries</option>
           {%- for country in community | select("country") | flatten | unique | sort(false, false) %}
-          <option value="{{ country | lower }}">{{ country }}</option>
+            <option value="{{ country | lower }}">{{ country }}</option>
           {%- endfor %}
         </select>
       </label>
@@ -95,12 +55,12 @@ layout: layouts/base.njk
       %}
       {%- for item in community | sort(false, false, 'name') %}
 
-      {# chose a pseudorandom theme based on the city name #}
-      {% set theme =  item.name.length % 4 %}
-      <li
+        {# chose a pseudorandom theme based on the city name #}
+        {% set theme = item.name.length % 4 %}
+        <li
       {%- if item.country %} data-filter-country="{{ item.country | lower }}"{% endif %}>
-        {{ meetup.card( item.name, item.link, themes[theme] ) }}
-      </li>
+          {{ meetup.card( item.name, item.link, themes[theme] ) }}
+        </li>
       {%- endfor %}
     </ul>
   </filter-container>
@@ -112,5 +72,4 @@ layout: layouts/base.njk
     Don’t see a group near you? We love to support new user group leaders and help grow the community. We can connect you with other user group leaders to share content ideas, provide stickers and swag, and get you listed on the user group page.
   </p>
   <a href="https://netlify.notion.site/Jamstack-Meetup-Handbook-42a5bf83e4eb4034bb485d81f5129cfb" class="cta">Learn how to get started</a>
-</section>
-
+</section>

src/site/glossary-pages.njk

@@ -14,20 +14,18 @@ eleventyComputed:
 
 ---
 
-
 <section class="mt-16">
   <h1 class="text-3xl">Glossary</h1>
-  <p class="w-2/3"><a href="/glossary/">A collection of terms</a> often used when talking about Jamstack and associated web technologies.</p>
+  <p class="w-2/3">
+    <a href="/glossary/">A collection of terms</a> often used when talking about Jamstack and associated web technologies.</p>
 </section>
 
 <section class="border-gray-300 dark:border-gray-400 border-b mb-10">
   <h2 class="text-5xl font-bold">{{ item.term }}</h2>
   <div class="mt-8 border-l border-gray-300 dark:border-gray-400 pl-4">
-  {% markdown %}
+    {% markdown %}
     {{- item.definition | safe }}
-  {% endmarkdown %}
+    {% endmarkdown %}
   </div>
   <p class="mt-12 mb-20">You can help us to expand and improve this glossary <a href="{{ pkg.repository.url }}/issues">by creating an issue</a>.</p>
-</section>
-
-{% include "components/join-the-movement.njk" %}
+</section>

src/site/index.njk

@@ -61,4 +61,4 @@ layout: layouts/base.njk
   </div>
   <a href="/resources/" class="cta">See more videos and resources</a>
 </div>
-</section>
+</section>

src/site/why-jamstack.njk

@@ -66,6 +66,4 @@ layout: layouts/base.njk
   <p>
     Jamstack sites can be built with a wide variety of tools. They do not depend on the proprietary technologies or exotic and little known frameworks. Instead, they build on widely available tools and conventions. As a result, it's not hard to find enthusiastic and talented developers who have the right skills to build with the Jamstack. Efficiency and effectiveness can prosper.
   </p>
-</section>
-
-{% include "components/join-the-movement.njk" %}
+</section>