Merge pull request #100 from CodeWithGroup/release

Latest Release

Author: codewithgithub

Gemfile.lock

@@ -24,6 +24,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     ethon (0.14.0)
       ffi (>= 1.15.0)
+    eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
     execjs (2.7.0)
     faraday (1.4.1)
@@ -35,6 +36,7 @@ GEM
     faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.1.0)
+    ffi (1.15.0)
     ffi (1.15.0-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
@@ -215,7 +217,9 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.14.4)
     multipart-post (2.1.1)
-    nokogiri (1.11.3-x64-mingw32)
+    nokogiri (1.11.6-x64-mingw32)
+      racc (~> 1.4)
+    nokogiri (1.11.6-x86_64-linux)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
@@ -253,13 +257,15 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
+    unf_ext (0.0.7.7)
     unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     wdm (0.1.1)
     zeitwerk (2.4.2)
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   github-pages

_data/discordQuestions/cantHearAnything.yaml

@@ -0,0 +1,7 @@
+name: "cantHearAnything"
+question: "I can't hear anything!?!"
+answer: "<p>
+    Make sure your speakers/headphones are plugged in/turned on. Make sure your system
+    volume is turned up.
+</p>
+"

_data/discordQuestions/cantSeePresentation.yaml

@@ -0,0 +1,8 @@
+name: "cantSeePresentation"
+question: "I can't see the presentation!"
+answer: "<p>
+    Click on the channel name (on the left of the screen) and you will see everyone's pictures. One of them will have a
+    button saying \"Watch Stream\". Click this button.
+    <img class=\"discord-image mg-fluid\" width=\"300\" src=\"../images/discord/discord-watch-stream.png\">
+</p>
+"

_data/discordQuestions/imTalkingCantHear.yaml

@@ -0,0 +1,21 @@
+name: "imTalkingCantHear"
+question: "I'm talking but you can't hear me!"
+answer: "<p>
+    Make sure your microphone/headset is plugged in/turned on. Make sure your microphone is set in the settings.
+</p>
+<p> You can see settings by clicking the gear icon.
+</p>
+<img class=\"discord-image mg-fluid\" width=\"300\" src=\"../images/discord/discord-setting-button.png\">
+
+<p>Click \"Voice and Video\" </p>
+<img class=\"discord-image mg-fluid\" width=\"300\" src=\"../images/discord/discord-voice.png\">
+
+<p>Make Sure your microphone is selected here:</p>
+
+<img class=\"discord-image mg-fluid\" width=\"500\" src=\"../images/discord/discord-microphone-dropdown.png\">
+
+<p>You can test it by clicking the \"Let's Check\" button:</p>
+
+<img class=\"discord-image mg-fluid\" width=\"500\" src=\"../images/discord/discord-mic-test.png\">
+
+"

_data/questions/discord.yaml

@@ -7,4 +7,6 @@ answer: "<p>
 
     Once you have joined the server, check your email before the event which will tell you which channel to join. Most
     of our events will start at the Main Stage channel.
-</p>"
+
+    
+</p><p>If you would like more information about using Discord then you can see our <a href=\"!SITE_URL!/discord\">Discord guide</a>.</p>"

_layouts/default.html

@@ -22,7 +22,7 @@ <h1 class="cover-heading">CODEWITH<span id="small-screen-break"><br /></span><sp
                 </div>
             </div>
             <div class="row unpadded">
-                <div class="col-lg-10">
+                <div class="col-l-12 col-xl-10">
                     {{content}}
                 </div>
             </div>

admin.html

@@ -22,6 +22,7 @@ <h4><a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8x
         <h4><a href="https://forms.gle/dGTDofzcYKCD8zSXA" target="_blank">Mentor Application Form</a></h4>
         <h4><a href="{{site.url}}/mentor-process">Mentor Application Process</a></h4>
         <h4><a href="https://trello.com/codewith2" target="_blank">Trello</a></h4>
+        <h4><a href="https://docs.google.com/drawings/d/1AAm2w7afb_zjZTiXJT8FUaloReFKU8LJvkatAHk4dkE/edit?usp=sharing" target="_blank" rel="noopener noreferrer">Code of Conduct Report Response Process Flowchart</a></h4>
 
         <h2>Events</h2>
         <h4><a href="{{site.url}}/availability-process">Availability Spreadsheet</a></h4>

aws_lambda/eventBriteHelper.py

@@ -7,8 +7,7 @@
 
 session = Session()
 headers = {
-    "Authorization": "Bearer <key>",
-    "Content-Type": "application/json"
+    "Authorization": "Bearer <key>"
 }
 
 eventBriteApiUrl = "https://www.eventbriteapi.com/v3/"
@@ -26,7 +25,7 @@ async def fetchEventTicketClasses(session, eventId):
         return {'eventId': eventId, 'response': responseJson}
 
 def getOrganisationEvents(organisationId):
-    eventsUrl = eventBriteApiUrl + "organizations/" + str(organisationId) + "/events/"
+    eventsUrl = eventBriteApiUrl + "organizations/" + str(organisationId) + "/events/?time_filter=current_future&status=live"
     response = session.get(url = eventsUrl, headers = headers)
     return json.loads(response.text)['events']
 

code-of-conduct.md

@@ -56,15 +56,13 @@ It may be appropriate for a recruitment company to sponsor refreshments and do a
 
 ### What to do if you have a concern
 
-If you are being harassed or feel uncomfortable, notice that someone else is being harassed, or have any other concerns, please speak to the event organiser(s) immediately. You can also contact the event organiser through Meetup and Slack.
+If you are being harassed or feel uncomfortable, notice that someone else is being harassed, or have any other concerns, CodeWith is here to listen to your concerns or questions. You don’t have to make a formal report unless you want to. You don't have to give us details of the harassment.
 
-If you are not able to to do this or you feel that your concern is not being taken seriously then please contact the Equity Officer. This is currently Marie Fayard, who can be reached on Discord, on Slack, or by email ([marie.fayard@gmail.com](mailto:marie.fayard@gmail.com)).
+If you wish to report something, please use the [Code Of Conduct Report Form]({{site.url}}/code-of-conduct-report) to send a report directly to the Code of Conduct Committee.
 
-CodeWith is here to listen to your concerns or questions and you don’t have to make a formal report unless you want to. You do not have to give us details of the harassment.
+If you witness a incident at an event that you think should be addressed right away, please bring it to the attention of the event organiser(s). If necessary, the event organiser(s) will help you contact police or venue security, or otherwise assist those experiencing harassment to feel safe for the duration of the event. After the event, please also submit a report using the [reporting form]({{site.url}}/code-of-conduct-report), so that the Code of Conduct Committee has your account of the incident.
 
-If you wish to report it, we will take details of the harassment and work with you to respond to the issue in a way that helps you feel safe.
-
-If necessary, the event organisers will help participants contact police or venue security, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the event.
+If you have a concern or a question and do not wish to make a formal report, you can write to the Equity Officer at [equityofficer.codewith@gmail.com](mailto:equityofficer.codewith@gmail.com).
 
 ### Where and when this code of conduct applies
 
@@ -85,6 +83,6 @@ Thank you
 This document was based on the [Sheffield Digital Code of Conduct](https://sheffield.digital/events/meetup-code-of-conduct/), which in turn is based on the work of JSConf, Geek Feminism, confcodeofconduct.com, and inspired by resources provided by Ashe Dryden.
 
 Licensed under a Creative Commons Attribution 3.0 Unported License.
-Version 1
+Version 2
 
-This is version 1 of the CodeWith Code of Conduct. It was last updated by Simon Davey on 31 August 2020. If you think we have made any errors or omissions, please contact us by email ([contact@codewith.org.uk](mailto:contact@codewith.org.uk)) or through one of the communication channels listed on the [contact page](contact.html).
+This is version 2 of the CodeWith Code of Conduct. It was last updated by Simon Davey on 31 August 2021. If you think we have made any errors or omissions, please contact us by email ([contact@codewith.org.uk](mailto:contact@codewith.org.uk)) or through one of the communication channels listed on the [contact page](contact.html).

css/style.css

@@ -471,6 +471,17 @@ div.event-book-button {
     text-decoration: none;
 }
 
+/*Discord*/
+
+.discord-image{
+    padding-top:10px;
+    padding-bottom:10px;
+}
+
+.discord-cols{
+    padding:10px;
+}
+
 /* RESIZING (min-width) */
 
 @media screen and (min-width: 576px) {