From c174a48049680ea2875ccc8515fec2194f4d8ca1 Mon Sep 17 00:00:00 2001
From: William Roush <william.roush@roushtech.net>
Date: Mon, 10 May 2021 02:58:29 +0000
Subject: [PATCH 1/4] Update Folding@Home announcement, remove Twitch
 announcement

AFAIK: Folding@Home is no longer doing COVID-19 stuff, so update accordingly
We haven't touched Twitch in forever, update that too
---
 _includes/announcement.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/_includes/announcement.html b/_includes/announcement.html
index 3a8aecd..0c5c052 100644
--- a/_includes/announcement.html
+++ b/_includes/announcement.html
@@ -1,5 +1,5 @@
 <aside class="announcement urgent">
-    <h2>Assist in the race to the cure for COVID-19 by Folding At Home!</h2>
+    <h2>Join Devanooga's Folding At Home team!</h2>
     <p>
         Devanooga is proud to announce that its members are using their spare compute for Folding@home. Folding@home is a distributed computing project for performing molecular dynamics simulations of protein dynamics. By joining us in the Folding@home project, you are contributing to the potential discovery of cures and/or treatments for COVID-19.
     </p>
@@ -11,16 +11,6 @@ <h2>Assist in the race to the cure for COVID-19 by Folding At Home!</h2>
     </p>
 </aside>
 
-<aside class="announcement">
-    <h2>There is no live stream currently scheduled, keep an eye out for an announcement in the future.</h2>
-    <p>
-        The devanooga live coding stream schedule is currently ad hoc, please stay tuned for more streams!
-    </p>
-    <p>
-        <a href="https://twitch.tv/devanooga" title="Go to Twitch" class="button button--blue button--block">Follow Devanooga on Twitch</a>
-    </p>
-</aside>
-
 <aside class="announcement">
     <h2>Our next hacknight is currently postponed until further notice while we test out some online hacknights on our Discord due to the COVID-19 situation, stay tuned for more announcements.</h2>
     <p>

From 24421b62c677d9d5f1e0fa47eff845bdd65063e8 Mon Sep 17 00:00:00 2001
From: William Roush <william.roush@roushtech.net>
Date: Mon, 10 May 2021 02:59:34 +0000
Subject: [PATCH 2/4] Minor announcement change about hacknights

---
 _includes/announcement.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/announcement.html b/_includes/announcement.html
index 0c5c052..b235174 100644
--- a/_includes/announcement.html
+++ b/_includes/announcement.html
@@ -12,7 +12,7 @@ <h2>Join Devanooga's Folding At Home team!</h2>
 </aside>
 
 <aside class="announcement">
-    <h2>Our next hacknight is currently postponed until further notice while we test out some online hacknights on our Discord due to the COVID-19 situation, stay tuned for more announcements.</h2>
+    <h2>We're currently looking at opening back up for hacknights in the near future, stay tuned for more announcements.</h2>
     <p>
         The devanooga hacknight will held every other Monday from 6 to 9pm. <strong>All experience levels are welcome for projects, pizza, and banter.</strong> Just bring your enthusiasm!
     </p>

From be8bdc8f89e7f5cd2dd055946fc96dbed008001f Mon Sep 17 00:00:00 2001
From: William Roush <william.roush@roushtech.net>
Date: Mon, 10 May 2021 03:26:28 +0000
Subject: [PATCH 3/4] Since CoC is so far down on the page... bring it up?

---
 _includes/announcement.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/_includes/announcement.html b/_includes/announcement.html
index b235174..d35bcd8 100644
--- a/_includes/announcement.html
+++ b/_includes/announcement.html
@@ -1,3 +1,13 @@
+<aside class="announcement urgent">
+    <h2>Read our Code of Conduct</h2>
+    <p>
+        Remember to read our <a href="/code-of-conduct">Code of Conduct</a> before joining!
+    </p>
+    <p>
+        <a href="/code-of-conduct" title="Devanooga Code of Conduct" class="button button--blue button--block">Read Devanooga's Code of Conduct</a>
+    </p>
+</aside>
+
 <aside class="announcement urgent">
     <h2>Join Devanooga's Folding At Home team!</h2>
     <p>

From 4f35f2b601520cd6b2de9101127fcca2819bded3 Mon Sep 17 00:00:00 2001
From: William Roush <william.roush@roushtech.net>
Date: Mon, 10 May 2021 03:29:22 +0000
Subject: [PATCH 4/4] Add CoC announcement to join us page

---
 _includes/announcement.html | 10 ----------
 _pages/slack.md             | 12 ++++++++++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/_includes/announcement.html b/_includes/announcement.html
index d35bcd8..b235174 100644
--- a/_includes/announcement.html
+++ b/_includes/announcement.html
@@ -1,13 +1,3 @@
-<aside class="announcement urgent">
-    <h2>Read our Code of Conduct</h2>
-    <p>
-        Remember to read our <a href="/code-of-conduct">Code of Conduct</a> before joining!
-    </p>
-    <p>
-        <a href="/code-of-conduct" title="Devanooga Code of Conduct" class="button button--blue button--block">Read Devanooga's Code of Conduct</a>
-    </p>
-</aside>
-
 <aside class="announcement urgent">
     <h2>Join Devanooga's Folding At Home team!</h2>
     <p>
diff --git a/_pages/slack.md b/_pages/slack.md
index ed2aa08..745818e 100644
--- a/_pages/slack.md
+++ b/_pages/slack.md
@@ -7,9 +7,17 @@ menu_sort: 3
 layout_modifier: centered
 ---
 
-Please read our [code of conduct](/code-of-conduct) before joining.
+<aside class="announcement urgent">
+    <h2>Read our Code of Conduct</h2>
+    <p>
+        Remember to read our <a href="/code-of-conduct">Code of Conduct</a> before joining!
+    </p>
+    <p>
+        <a href="/code-of-conduct" title="Devanooga Code of Conduct" class="button button--blue button--block">Read Devanooga's Code of Conduct</a>
+    </p>
+</aside>
 
 <iframe src="https://devanooga-slack.herokuapp.com/"
     width="100%"
     height="600"
-    frameBorder="0"></iframe>
\ No newline at end of file
+    frameBorder="0"></iframe>