Merge pull request #906 from jamstack/pnh/retire-discord

Phil Hawksworth · web-flow · commit 624da7893a4a · 2023-07-17T15:18:24.000+01:00
Pnh/retire discord
diff --git a/netlify.toml b/netlify.toml
@@ -20,21 +20,12 @@
   to = "https://jamstackconf.com/conf/"
   status = 200
 
-[[redirects]]
-  from = "/conf/cfp"
-  to = "https://docs.google.com/forms/d/e/1FAIpQLSc-z50GyD7zXzr_JCn2M1NBFZ-h65kSdu7zn43V1u2qAKO3ew/viewform"
-  status = 302
 
 [[redirects]]
   from = "/conf/*"
   to = "https://jamstackconf.com/conf/:splat"
   status = 200
 
-[[redirects]]
-  from = "/discord"
-  to = "https://discord.gg/jamstack"
-  status = 302
-
 [[redirects]]
   from = "/best-practices"
   to = "/resources"
diff --git a/src/site/_data/announcementbar.json b/src/site/_data/announcementbar.json
@@ -1,5 +1,5 @@
 {
-  "text": "The 2023 Web Development Community Survey is now open!",
-  "cta": "Help share your insights with the web developer community",
-  "url": "https://www.surveymonkey.com/r/webdevsurvey2023"
+  "text": null,
+  "cta": null,
+  "url": null
 }
diff --git a/src/site/_includes/banner.njk b/src/site/_includes/banner.njk
@@ -1,3 +1,5 @@
+{% if announcementbar.text %}
 <a href="{{ announcementbar.url }}" class="block p-2 md:py-2 text-center text-white font-bold text-xs md:text-sm bg-gradient-jams bg-gradient-pink-orange group">
   {{ announcementbar.text }} <span class="underline group-hover:no-underline">{% if announcementbar.cta %}{{ announcementbar.cta }}{% endif %}</span>
 </a>
+{% endif %}
diff --git a/src/site/_includes/footer.njk b/src/site/_includes/footer.njk
@@ -2,7 +2,7 @@
   <footer class="py-20 dark:text-blue-200">
     <p class="p-2">&copy; {{ page.date | formatDate('yyyy') }}  Netlify </p>
     <ul class="text-left md:flex justify-between flex-wrap">
-      <li class="p-2 flex-[1_0_33%]"><a href="https://jamstack.org/discord">Chat on Discord</a></li>
+      <li class="p-2 flex-[1_0_33%]"><a href="https://netlify.com/jamstack">Jamstack on Netlify</a></li>
       <li class="p-2 flex-[1_0_33%]"><a href="https://community.netlify.com/">Netlify Support</a></li>
       <li class="p-2 flex-[1_0_33%]"><a href="{{ pkg.repository.url }}">Code on GitHub</a></li>
       <li class="p-2 flex-[1_0_33%]"><a href="/code-of-conduct/">Code of Conduct</a></li>
diff --git a/src/site/_includes/header.njk b/src/site/_includes/header.njk
@@ -1,12 +1,10 @@
 {%
   set linkList = [
     { "url": "/", "text": "Home" },
-    { "url": "/conf/", "text": "Jamstack Conf 2022" },
     { "url": "/glossary/", "text": "Glossary" },
     { "url": "/tv/", "text": "Jamstack TV" },
     { "url": "/generators/", "text": "Site Generators" },
     { "url": "/headless-cms/", "text": "Headless CMS" },
-    { "url": "/community/", "text": "Community" },
     { "url": "/survey/2022/", "text": "Community Survey", "children": [
       { "url": "/survey/2022/#whos-doing-the-building", "text": "Who’s doing the building?" },
       { "url": "/survey/2022/#what-is-the-jamstack-community-building", "text": "What is the Jamstack Community building?" },
@@ -46,12 +44,7 @@
 
       <div>
         <div class="text-center text-sm mb-4 dark:text-gray-300">Connect with us</div>
-        <div class="grid grid-cols-3 divide-x divide-gray-200 dark:divide-gray-700 dark:text-gray-300">
-          <a href="https://discord.gg/jamstack" target="_BLANK" rel="noopener" class="flex items-center justify-center p-4 hover:text-pink-500">
-            <svg role="img" aria-label="Discord" focusable="false" width="36" height="36" class="fill-current">
-              <use xlink:href="#logo-discord"></use>
-            </svg>
-          </a>
+        <div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700 dark:text-gray-300">
           <a href="https://twitter.com/jamstackconf" target="_BLANK" rel="noopener"  class="flex items-center justify-center p-4 hover:text-pink-500">
             <svg role="img" aria-label="Twitter" focusable="false" width="34" height="28" class="fill-current">
               <use xlink:href="#logo-twitter"></use>
@@ -66,4 +59,4 @@
       </div>
     </nav>
   </details>
-</header>
+</header>
diff --git a/src/site/_includes/layouts/base.njk b/src/site/_includes/layouts/base.njk
@@ -97,12 +97,6 @@ ogimage: "/img/og/default-og-image.png"
             </clipPath>
           </defs>
         </symbol>
-
-
-        <symbol id="logo-discord" preserveAspectRatio="xMidYMid meet" viewBox="0 0 71 55" fill="none">          
-          <path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" class="fill-current"/>          
-        </symbol>
-
         <symbol id="logo-twitter" viewBox="0 0 34 28" fill="none">
           <path d="M10.7387 27.7146C23.4746 27.7146 30.4406 17.163 30.4406 8.01275C30.4406 7.71305 30.4406 7.4147 30.4204 7.1177C31.7755 6.13748 32.9453 4.92378 33.875 3.53345C32.6112 4.09343 31.2706 4.46066 29.8979 4.6229C31.3434 3.75752 32.4253 2.39644 32.9422 0.792946C31.5829 1.59951 30.0959 2.16794 28.5452 2.4737C27.5012 1.36357 26.1204 0.628473 24.6165 0.382159C23.1126 0.135844 21.5695 0.392045 20.2259 1.11111C18.8823 1.83018 17.8131 2.97203 17.1839 4.35997C16.5546 5.7479 16.4003 7.30454 16.7449 8.789C13.9919 8.65098 11.2987 7.93557 8.84011 6.68919C6.38155 5.44282 4.21258 3.69335 2.474 1.55435C1.58852 3.07872 1.31732 4.88326 1.71561 6.60056C2.1139 8.31787 3.15173 9.81881 4.6178 10.7978C3.51585 10.7651 2.43793 10.4679 1.475 9.9311C1.475 9.95945 1.475 9.98915 1.475 10.0188C1.47544 11.6175 2.02885 13.1669 3.04138 14.4041C4.05391 15.6412 5.46321 16.4901 7.03025 16.8066C6.01082 17.0847 4.94123 17.1253 3.90365 16.9254C4.34613 18.3013 5.20757 19.5045 6.3675 20.3667C7.52742 21.2289 8.92783 21.707 10.3729 21.7341C7.92089 23.6612 4.89193 24.7073 1.77335 24.7042C1.22242 24.7031 0.672026 24.6697 0.125 24.6042C3.29161 26.6364 6.97613 27.7143 10.7387 27.7092" class="fill-current"/>
         </symbol>
diff --git a/src/site/_includes/survey/2022/where-are-we-going/index.njk b/src/site/_includes/survey/2022/where-are-we-going/index.njk
@@ -141,14 +141,6 @@
   </p>
 
   <ul>
-    <li>
-      Discuss and share feedback in the
-      <a href="https://discord.com/invite/jamstack" target="_blank">Jamstack Discord</a >
-    </li>
-    <li>
-      <a href="https://jamstack.org/conf/agenda/" target="_blank">Register for Jamstack Conf 2022 for free</a >
-      (November 7 and 8) to watch the talks live and receive the recordings
-    </li>
     <li>
       Read a summary of the results on the
       <a href="https://www.netlify.com/blog/jamstack-community-survey-2022/" target="_blank">Netlify blog</a >
@@ -163,4 +155,4 @@
       Our <a href="/survey/2021/">look at the 2021 data</a> is still available if you'd like to look back
     </li>
   </ul>
-</section>
+</section>
diff --git a/src/site/code-of-conduct.njk b/src/site/code-of-conduct.njk
@@ -137,12 +137,6 @@ layout: layouts/base.njk
   <p>If you'd like to report a CoC violation that happens...</p>
 
   <ul class="list-disc list-outside pl-4 my-4">
-    <li class="mb-4">
-      in the Jamstack Discord, please speak to Domitrius Clark, or Phil Hawksworth by contacting us in the <a href="https://jamstack.org/discord">Jamstack Discord</a> . Please do note we may be out of your timezone, but we will respond.
-    </li>
-    <li class="mb-4">
-      on Jamstack.org, for example in a PR, please speak to Phil Hawksworth or Perry Eising by contacting us in the <a href="https://jamstack.org/discord">Jamstack Discord</a> or via email. Our emails are our first names @ netlify.com
-    </li>
     <li class="mb-4">
       at an in person meeting that is organized by your local city, please speak with the organizers, who will reach out to us via Discord or email.
     </li>
diff --git a/src/site/glossary-404.njk b/src/site/glossary-404.njk
@@ -21,4 +21,3 @@ permalink: glossary/contribute
   </div>
 </section>
 
-{% include "components/join-the-movement.njk" %}
diff --git a/src/site/glossary.njk b/src/site/glossary.njk
@@ -23,4 +23,3 @@ layout: layouts/base.njk
   <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" %}
diff --git a/src/site/index.njk b/src/site/index.njk
@@ -32,6 +32,7 @@ layout: layouts/base.njk
 </div>
 </section>
 
+{#
 <section class="mb-10">
 <div class="border-2 border-white bg-white dark:bg-blue-900 block rounded-xl shadow-lg text-center overflow-hidden">
   <a href="/conf/">
@@ -42,9 +43,10 @@ layout: layouts/base.njk
     <a href="https://jamstack.org/conf/jammies/" class="cta">Check out this year's Jammies winners</a>
   </p>
 </div>
-</section>
+</section> 
 
 {% include "components/join-the-movement.njk" %}
+#}
 
 <section class=" mb-16">
 <div class="md:w-8/12 mx-auto">
@@ -59,4 +61,4 @@ layout: layouts/base.njk
   </div>
   <a href="/resources/" class="cta">See more videos and resources</a>
 </div>
-</section>
+</section>
diff --git a/src/site/resources/index.njk b/src/site/resources/index.njk
@@ -51,5 +51,3 @@ layout: layouts/base.njk
   <a class="cta" href="/resources/articles/">More articles and resources</a>
 </section>
 
-
-{% include "components/join-the-movement.njk" %}
diff --git a/src/site/survey-closed.njk b/src/site/survey-closed.njk
@@ -18,5 +18,4 @@ excludeFromSitemap: true
   <h2>Jamstack Sticker Giveaway</h2>
   <p class="font-semibold">Oh no! We’ve maxed out on our sticker giveaway.</p>
   <p>Thank you for taking the time to complete the survey. Please continue to share with your network, communities, and teams.</p>
-  <p>Ready to connect with others in the Jamstack Community? Join the <a href="https://discord.gg/jamstack">Jamstack Discord</a>!</p>
-</section>
+</section>
diff --git a/src/site/survey-thanks.njk b/src/site/survey-thanks.njk
@@ -8,5 +8,4 @@ excludeFromSitemap: true
 <section class="my-20">
   <h1>We’ve received your sticker request!</h1>
   <p>Stickers will be sent after campaign has ended, or maximum has been reached. Stickers will be shipped with U.S. domestic or international postage stamps. Delivery is not guarenteed or trackable.</p>
-  <p>Ready to connect with others in the Jamstack Community? Join the <a href="https://discord.gg/jamstack">Jamstack Discord</a>!</p>
-</section>
+</section>
diff --git a/src/site/what-is-jamstack.njk b/src/site/what-is-jamstack.njk
@@ -51,4 +51,3 @@ layout: layouts/base.njk
 </section>
 
 
-{% include "components/join-the-movement.njk" %}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "text": "The 2023 Web Development Community Survey is now open!",`
`3`		`- "cta": "Help share your insights with the web developer community",`
`4`		`- "url": "https://www.surveymonkey.com/r/webdevsurvey2023"`
	`2`	`+ "text": null,`
	`3`	`+ "cta": null,`
	`4`	`+ "url": null`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@ permalink: glossary/contribute`
`21`	`21`	`</div>`
`22`	`22`	`</section>`
`23`	`23`
`24`		`-{% include "components/join-the-movement.njk" %}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,3 @@ layout: layouts/base.njk`
`23`	`23`	`<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>`
`24`	`24`	`</section>`
`25`	`25`
`26`		`-{% include "components/join-the-movement.njk" %}`