Merge pull request #2 from CodeWithGroup/master

cowlingj · web-flow · commit 4b3af5a04bbc · 2020-09-15T20:24:39.000+01:00
Update from upstream
diff --git a/README.md b/README.md
@@ -43,13 +43,21 @@ Quoted from https://jekyllrb.com/docs/
 
 ## Jekyll setup
 
-Use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
+If you're familiar with Ruby gems, run the following:
+
+`gem install bundle`
+
+`gem install jekyll`
+
+If this is your first time using Ruby or gems, use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
 
 ## Building the site
 
-Open a command line in the root directory of the repository
+Open a command line in the root directory of the repository.
+
+If this is the first time you have built the site, make sure you have run `bundle pack` before attempting to build the site using jekyll.
 
-Run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content
+Otherwise, run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content.
 
 >:Warning: do not edit anything in the site folder as it will not be comitted and is overwritten everytime you build the site.
 
diff --git a/about.html b/about.html
@@ -1,30 +1,29 @@
 ---
 layout: default
 suffixes:
-    - Committee,
-    - Equity,
-    - History,
-    - Leadership,
-    - Publicity,
-    - Support,
-    - Us
+- Committee,
+- Equity,
+- History,
+- Leadership,
+- Publicity,
+- Support,
+- Us
 title: About
 ---
 
 <h1>{{page.title}}</h1>
 
-<h2>Who are we?</h2>
+<h2>Our Mission</h2>
 <p>
-    CodeWith is a new community for adults wanting to learn more about the world of computers.
-</p>
-<p>
-    We're in the process of putting together a programme of events for people who want to learn to code or get into
-    computing. Have a look at our <a href="events.html">events page</a> for more.
+    <strong>
+        To create a virtual space for adults to pursue programming-related learning and conversation, where everyone is
+        valued, everyone has agency, and everyone is supported.
+    </strong>
 </p>
 
 <h2>History</h2>
 <p>
-    CodeWith carries the torch of CodeUp, set up by Claire Wicher in early 2015. The aim to provide free and friendly 
+    CodeWith carries the torch of CodeUp, set up by Claire Wicher in early 2015. The aim to provide free and friendly
     adult coding tuition to adults who wanted it, and that is now CodeWith's aim too. We want somewhere everyone,
     from complete beginners to accomplished software engineers, can come together and share their enjoyment of coding.
 </p>
@@ -70,4 +69,4 @@ <h4><a href="people.html#sean-omahoney">Sean O'Mahoney</a></h4>
         <smaller>Publicity Officer</smaller>
     </div>
 </div>
-<br />
+<br />
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,11 @@
 ---
-title: Code of Conduct
 layout: default
+suffixes:
+    - Assurance,
+    - Safeguards,
+    - Security,
+    - Us
+title: Code of Conduct
 ---
 
 # Code of Conduct
diff --git a/events.html b/events.html
@@ -1,23 +1,28 @@
 ---
 layout: default
 suffixes:
-    - Databases,
-    - Docker,
-    - Git,
-    - SQL,
-    - Kubernetes,
-    - Us
+- Databases,
+- Docker,
+- Git,
+- SQL,
+- Kubernetes,
+- Us
 title: Events
 ---
 
 <h1>{{page.title}}</h1>
-
-<p>CodeWith mentors run drop-in sessions and workshops; you can read more about the sessions below.</p>
-
-<p>Before attending any CodeWith event, please read our <a href="code-of-conduct.html">Code of Conduct</a>, which applies to all events we run. All
-    attendees, speakers, and mentors must agree with this code of conduct. It helps us all to understand the 
-    community&apos;s shared values and provides clear guidelines on how we should behave.</p>
+<p>
+    CodeWith runs <a href="#drop-ins">drop-in sessions</a>, <a href="#huddles">huddles</a>, and
+    <a href="#workshops">scheduled workshops</a>; you can read more about each of these below.
+</p>
+<p>
+    Before attending any CodeWith event, please read our <a href="code-of-conduct.html">Code of Conduct</a>, which
+    applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
+    understand the community&apos;s shared values and provides clear guidelines on how we should behave.
+</p>
 
 {% include_relative pages-events/events-drop-ins.html %}
 <br />
-{% include_relative pages-events/events-eventbrite-list.html %}
+{% include_relative pages-events/events-huddles.html %}
+<br />
+{% include_relative pages-events/events-eventbrite-list.html %}
diff --git a/index.html b/index.html
@@ -1,31 +1,31 @@
 ---
 layout: default
 suffixes:
-    - Ambition,
-    - Assistance,
-    - Beginners,
-    - Confidence,
-    - Determination,
-    - Encouragement,
-    - Experts,
-    - Friends,
-    - Guidance,
-    - Humour,
-    - Intent,
-    - Jokes,
-    - Knowledge,
-    - Laughter,
-    - Mastery,
-    - Novelty,
-    - Others,
-    - Purpose,
-    - Questions,
-    - Reason,
-    - Support,
-    - Trust,
-    - Understanding,
-    - Vision,
-    - Us
+- Ambition,
+- Assistance,
+- Beginners,
+- Confidence,
+- Determination,
+- Encouragement,
+- Experts,
+- Friends,
+- Guidance,
+- Humour,
+- Intent,
+- Jokes,
+- Knowledge,
+- Laughter,
+- Mastery,
+- Novelty,
+- Others,
+- Purpose,
+- Questions,
+- Reason,
+- Support,
+- Trust,
+- Understanding,
+- Vision,
+- Us
 title: Home
 ---
 
@@ -34,13 +34,13 @@ <h1>Welcome to CodeWith!</h1>
 <div class="row intro">
     <div class="col-sm-3 col-md-2 text-center">
         <p class="intro-icon">
-            <a href="about.html"><span class="fas fa-3x fa-book-open"></span></a>
+            <a href="https://codewithpeople.slack.com"><span class="fab fa-3x fa-slack"></span></a>
         </p>
     </div>
     <div class="col-sm-9 col-md-10">
-        <p class="intro-text">CodeWith is about free adult coding tuition for everyone. We offer a friendly space where
-            anyone, from complete beginners to accomplished software engineers, can get together with like-minded people
-            to learn and share a passion for coding. For more information, check out our <a href="about.html">about page</a>.
+        <p class="intro-text">
+            Want to dive right in? We usually have a few people connected to our
+            <a href="https://codewithpeople.slack.com">Slack workspace</a>, so come and speak to us there!
         </p>
     </div>
 </div>
@@ -52,9 +52,10 @@ <h1>Welcome to CodeWith!</h1>
         </p>
     </div>
     <div class="col-sm-9 col-md-10">
-        <p class="intro-text">We started the group in the midst of COVID-19 and so all our events are currently online.
-            We hope to eventually host some events in person, but until then it'll all be done via webcam and
-            microphone.
+        <p class="intro-text">
+            We started the group in the midst of COVID-19 and so all our activities are currently online.
+            We hope to eventually host some events in person, but until then it'll all be done via keyboard,
+            microphone, and/or webcam.
         </p>
         <p class="intro-text">
             For more information about the workshops, events, and drop-ins, have a look at the
@@ -63,14 +64,34 @@ <h1>Welcome to CodeWith!</h1>
     </div>
 </div>
 
+<div class="row intro">
+    <div class="col-sm-3 col-md-2 text-center">
+        <p class="intro-icon">
+            <a href="about.html"><span class="fas fa-3x fa-book-open"></span></a>
+        </p>
+    </div>
+    <div class="col-sm-9 col-md-10">
+        <p class="intro-text">
+            Our mission is <strong>to create a virtual space for adults to pursue programming-related learning
+            and conversation, where everyone is valued, everyone has agency, and everyone is supported.</strong>
+        </p>
+        <p class="intro-text">
+            We offer a friendly space where anyone, from complete beginners to accomplished software engineers, can get
+            together with like-minded people to learn and share a passion for coding. For more information, check out
+            our <a href="about.html">about page</a>.
+        </p>
+    </div>
+</div>
+
 <div class="row intro">
     <div class="col-sm-3 col-md-2 text-center">
         <p class="intro-icon">
             <a href="contact.html"><span class="fas fa-3x fa-envelope"></span></a>
         </p>
     </div>
     <div class="col-sm-9 col-md-10">
-        <p class="intro-text"><strong>Stay up to date!</strong> There will be a lot of announcements over the coming
+        <p class="intro-text">
+            <strong>Stay up to date!</strong> There will be a lot of announcements over the coming
             weeks and the best way to hear about what we're doing is to sign up to our mailing list. There's a form
             where you can give us your details on our <a href="contact.html">contact page</a>.
         </p>
@@ -84,8 +105,8 @@ <h1>Welcome to CodeWith!</h1>
         </p>
     </div>
     <div class="col-sm-9 col-md-10">
-        <p class="intro-text">We'd love to hear your feedback. Let us know your thoughts on our
-            <a href="feedback.html">feedback form</a>.
+        <p class="intro-text">
+            We'd love to hear your feedback. Let us know your thoughts on our <a href="feedback.html">feedback form</a>.
         </p>
     </div>
-</div>
+</div>
diff --git a/pages-events/events-drop-ins.html b/pages-events/events-drop-ins.html
@@ -1,39 +1,103 @@
+<a name="drop-ins"></a>
 <h2>Drop-in sessions</h2>
 <p>
-    Drop-in sessions are hosted by at least one mentor and run regularly in the evenings.
-    You can get help on our <a href="https://codewithpeople.slack.com">Slack Workspace</a>
-    or, if it's a really tricky problem, we can always jump into a Jitsi meeting with you.
+    Drop-in sessions are run from our Slack workspace. We pick a time and make sure helpers and mentors are online,
+    and invite people to come and ask us for help with anything at all. They run fairly regularly on weekday evenings,
+    and occasionally even start without being scheduled! Discussions can be done through written messages, voice, or
+    even over a video call. Sign in to our <a href="https://codewithpeople.slack.com">Slack workspace</a> to find out
+    more.
 </p>
 <p>
-    Jitsi links for regularly-scheduled sessions will be added to the web site a little
-    before each drop-in event, so check back here to join via the 'Jitsi Link' button.
+    Jitsi links for regularly-scheduled sessions will be added to the web site a little before each drop-in event, but
+    we have a permanent Jitsi room set up at <a href="https://join.codewith.org.uk">https://join.codewith.org.uk</a>.
+    You can also click the 'Jitsi Link' buttons below.
 </p>
+
+<h3>National Coding Week</h3>
 <section id="events-drop-ins">
     <div class="row card">
         <div class="col-12">
             <div class="row">
                 <div class="col-sm-4 col-lg-2 event-date">
-                    <span class="event-date-month"></span>
-                    <span class="event-date-day">TBC</span>
+                    <span class="event-date-month">SEP</span>
+                    <span class="event-date-day">16</span>
+                    <p>
+                        <span class="event-date-start-time">7pm - </span>
+
+                        <span class="event-date-end-time">9pm</span>
+                    </p>
+                </div>
+                <div class="col-sm-8 col-lg-10 event-title">
+                    <span class="event-title">National Coding Week Drop-In</span>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12 col-lg-9 event-description">
+                    <span class="event-description">
+                        An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
+                        something related to one of our workshops, a question about how to get started, or anything else! </span>
+                </div>
+                <div class="col-md-12 col-lg-3 event-book-button">
+                    <a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
+                        <span class="fas fa-link"></span></a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row card">
+        <div class="col-12">
+            <div class="row">
+                <div class="col-sm-4 col-lg-2 event-date">
+                    <span class="event-date-month">SEP</span>
+                    <span class="event-date-day">18</span>
+                    <p>
+                        <span class="event-date-start-time">7pm - </span>
+
+                        <span class="event-date-end-time">9pm</span>
+                    </p>
+                </div>
+                <div class="col-sm-8 col-lg-10 event-title">
+                    <span class="event-title">National Coding Week Drop-In</span>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12 col-lg-9 event-description">
+                    <span class="event-description">
+                        An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
+                        something related to one of our workshops, a question about how to get started, or anything else! </span>
+                </div>
+                <div class="col-md-12 col-lg-3 event-book-button">
+                    <a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
+                        <span class="fas fa-link"></span></a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row card">
+        <div class="col-12">
+            <div class="row">
+                <div class="col-sm-4 col-lg-2 event-date">
+                    <span class="event-date-month">OCT</span>
+                    <span class="event-date-day">12</span>
                     <p>
                         <span class="event-date-start-time">7pm - </span>
 
                         <span class="event-date-end-time">9pm</span>
                     </p>
                 </div>
                 <div class="col-sm-8 col-lg-10 event-title">
-                    <span class="event-title">National Coding Week</span>
+                    <span class="event-title">CodeWith Drop-In</span>
                 </div>
             </div>
             <div class="row">
                 <div class="col-md-12 col-lg-9 event-description">
                     <span class="event-description">
-                        A drop in for anyone who would like help with coding. This can be something related to one of
-                        our workshops or anything else! </span>
+                        An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
+                        something related to one of our workshops, a question about how to get started, or anything else! </span>
                 </div>
                 <div class="col-md-12 col-lg-3 event-book-button">
-                    <a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link <span
-                            class="fas fa-link"></span></a>
+                    <a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
+                        <span class="fas fa-link"></span></a>
                 </div>
             </div>
         </div>
diff --git a/pages-events/events-eventbrite-list.html b/pages-events/events-eventbrite-list.html
@@ -1,5 +1,5 @@
+<a name="workshops"></a>
 <h2>Scheduled Workshops</h2>
-
 <section id="events-scheduled">
     <p><i class="fas fa-spinner fa-w-16 fa-spin fa-lg"></i> Loading...</p>
 </section>
diff --git a/pages-events/events-huddles.html b/pages-events/events-huddles.html
