Skip to content

Commit 9bde205

Browse files
dangerwormdangerworm
committed
Merge branch 'release'
2 parents 5540ef7 + 04629dd commit 9bde205

File tree

9 files changed

+93
-12
lines changed

9 files changed

+93
-12
lines changed

‎_data/questions/ad-hoc-help.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ question: "Do I have to wait for drop-ins to ask for help?"
33
answer: " <p>
44
CodeWith isn't just a series of events, it's a community of people who do their best to help each other.
55
If you visit our <a target=\"_blank\" href=\"https://codewithpeople.slack.com\">Slack workspace</a>
6-
or our <a target=\"_blank\" href=\"https://discord.gg/DrZ7B7q\">Discord server</a> there'll usually be
6+
or our <a target=\"_blank\" href=\"https://discord.gg/jKFXkTd\">Discord server</a> there'll usually be
77
someone there. Most of the time they'll be able to help, or will at least know who to ask for an answer,
88
but if not then at least you have some people you can talk to about the problem to try to find a way forward.
99
</p>"

‎about.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ <h4><a href="{{site.url}}/people#jim-evans">Jim Evans</a></h4>
5858
<smaller>Secretary</smaller>
5959
</div>
6060
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
61-
<img class="profile-photo" src="{{site.url}}/images/simon-profile-photo.png">
61+
<img class="profile-photo" src="{{site.url}}/images/marie-profile-photo.png">
6262
<br />
63-
<h4><a href="{{site.url}}/people#simon-davey">Simon Davey</a></h4>
64-
<smaller>Interim Equity Officer</smaller>
63+
<h4><a href="{{site.url}}/people#marie-fayard">Marie Fayard</a></h4>
64+
<smaller>Equity Officer</smaller>
6565
</div>
6666
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
6767
<img class="profile-photo" src="{{site.url}}/images/sean-profile-photo.png">

‎code-of-conduct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ It may be appropriate for a recruitment company to sponsor refreshments and do a
5858

5959
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.
6060

61-
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 Simon Davey, who can be reached through Slack or by email ([simonr.davey@gmail.com](mailto:simonr.davey@gmail.com)).
61+
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)).
6262

6363
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.
6464

‎contact.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ <h2>Social Media</h2>
106106
<span class="fab fa-discord text-green"></span>&nbsp;
107107
<a target="_blank" href="https://discord.gg/jKFXkTd">Discord</a>
108108
</p>
109+
<p>
110+
<span class="fas fa-calendar-alt text-green"></span>&nbsp;
111+
<a target="_blank" href="https://www.eventbrite.co.uk/o/codewith-30834204055">Eventbrite</a>
112+
</p>
109113
<p>
110114
<span class="fab fa-facebook text-green"></span>&nbsp;
111115
<a target="_blank" href="https://www.facebook.com/CodeWithGroup">Facebook</a>
@@ -126,10 +130,6 @@ <h2>Social Media</h2>
126130
<span class="fab fa-twitter text-green"></span>&nbsp;
127131
<a target="_blank" href="https://twitter.com/CodeWithGroup">Twitter</a>
128132
</p>
129-
<p>
130-
<span class="fas fa-calendar-alt text-green"></span>&nbsp;
131-
<a target="_blank" href="https://www.eventbrite.co.uk/o/codewith-30834204055">Eventbrite</a>
132-
</p>
133133

134134
<p>
135135
Alternatively, if you have any questions about CodeWith you can chat to us through Facebook

‎images/marie-profile-photo.png‎

449 KB
Loading

‎pages-people/people-drew.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h4>Drew Morgan</h4>
1111
<div class="col-md-8 col-lg-6">
1212
<div class="row">
1313
<div class="col col-md-6">
14-
<p class="text-muted no-margin">Benevolent Leader, Host, Mentor</p>
14+
<p class="text-muted no-margin">Benevolent Leader, Mentor</p>
1515
</div>
1616
<div class="col-md-6 twitter-mention-container text-right">
1717
<a href="https://twitter.com/intent/tweet?screen_name=dangerworm" class="twitter-mention-button"

‎pages-people/people-marie.html‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<a name="marie-fayard"></a>
2+
<div class="row person-blurb">
3+
<div class="col-md-4 col-lg-5 col-xl-3">
4+
<div class="mb-2 box-shadow text-center">
5+
<img
6+
class="profile-photo"
7+
src="{{site.url}}/images/marie-profile-photo.png"
8+
alt="Marie Fayard's profile picture"
9+
/>
10+
</div>
11+
<div class="col-12 text-center">
12+
<h4>Marie Fayard</h4>
13+
</div>
14+
</div>
15+
<div class="col-md-8 col-lg-6">
16+
<div class="row">
17+
<div class="col col-md-6">
18+
<p class="text-muted no-margin">Equity Officer, Mentor</p>
19+
</div>
20+
</div>
21+
<div class="row">
22+
<div class="col-md-12">
23+
<p>
24+
Marie discovered coding during her Physics studies and immediately
25+
fell in love with it. She received a scholarship for Women and
26+
Minorities to attend a software development bootcamp in Manchester.
27+
After graduating, she taught Python to kids and teenagers during
28+
week-long camps and is now working as a Full Stack Developer in a
29+
UK-based startup.
30+
</p>
31+
<p>
32+
In her spare time, she volunteers on open source projects and teaches
33+
coding to adults. She enjoys doing sports a lot (particularly yoga),
34+
going for long walks in the countryside, reading and learning all kinds of
35+
new things. She has recently taken up boxing and gets hit in the face
36+
a lot, but still thinks it's fun!
37+
</p>
38+
</div>
39+
</div>
40+
</div>
41+
<div class="col-lg-12 col-xl-3 skills">
42+
<div class="row">
43+
<div class="col-12">
44+
<h5>Marie can help with...</h5>
45+
</div>
46+
<div class="col-md-4 col-lg-12">
47+
<!-- <h6>Languages</h6> -->
48+
<p>
49+
<span class="badge badge-secondary">JavaScript</span>
50+
<span class="badge badge-secondary">Python</span>
51+
<span class="badge badge-secondary">HTML</span>
52+
<span class="badge badge-secondary">CSS</span>
53+
<span class="badge badge-secondary">TypeScript</span>
54+
</p>
55+
</div>
56+
<div class="col-md-4 col-lg-12">
57+
<!-- <h6>Technologies</h6> -->
58+
<p>
59+
<span class="badge badge-secondary">React</span>
60+
<span class="badge badge-secondary">React Native</span>
61+
<span class="badge badge-secondary">NodeJS</span>
62+
<span class="badge badge-secondary">Express</span>
63+
<span class="badge badge-secondary">Mocha</span>
64+
<span class="badge badge-secondary">JSON</span>
65+
<span class="badge badge-secondary">REST</span>
66+
<span class="badge badge-secondary">Google Cloud</span>
67+
</p>
68+
</div>
69+
<div class="col-md-4 col-lg-12">
70+
<!-- <h6>Tools</h6> -->
71+
<p>
72+
<span class="badge badge-secondary">Git</span>
73+
<span class="badge badge-secondary">PyCharm</span>
74+
<span class="badge badge-secondary">VS Code</span>
75+
</p>
76+
</div>
77+
</div>
78+
</div>
79+
</div>

‎pages-people/people-simon.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h4>Simon Davey</h4>
1111
<div class="col-md-8 col-lg-6">
1212
<div class="row">
1313
<div class="col col-md-12">
14-
<p class="text-muted no-margin">Mentor, Interim Equity Officer</p>
14+
<p class="text-muted no-margin">Mentor</p>
1515
</div>
1616
</div>
1717
<div class="row">

‎people.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ <h1>{{page.title}}</h1>
2222
<br />
2323
{% include_relative pages-people/people-jim.html %}
2424
<br />
25-
{% include_relative pages-people/people-liz.html %}
25+
{% include_relative pages-people/people-marie.html %}
2626
<br />
2727
{% include_relative pages-people/people-sean.html %}
2828
<br />
29+
{% include_relative pages-people/people-liz.html %}
30+
<br />
2931
{% include_relative pages-people/people-simon.html %}
3032

3133
{% for person_hash in site.data.people %}

0 commit comments

Comments
 (0)