Skip to content

Commit a150b2b

Browse files
dangerwormdangerworm
committed
Merge branch 'release' into feature/admin-add-feedback
2 parents 318bfb0 + 6f141ed commit a150b2b

File tree

11 files changed

+510
-46
lines changed

11 files changed

+510
-46
lines changed

‎_data/questions/how-to-mentor.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ question: "How do I become a mentor/event organiser?"
33
answer: " <p>
44
First of all, let someone know you're interested. Have a chat with one of the existing mentors or
55
someone on the committee so that we can get an idea of what you want to achieve and what support you
6-
need. From there we'll be able to add you into the appropriate Slack channels, give you a folder
7-
of your own in our Google Drive, show you how to set up events, and so on.
6+
need.
7+
</p>
8+
<p>
9+
When you're ready to begin mentoring, complete the
10+
<a href=\"!SITE_URL!/mentor-application\">mentor application form</a>. From there we'll be able to
11+
add you into the appropriate Slack channels, give you a folder of your own in our Google Drive, show
12+
you how to set up events, and so on.
813
</p>"
14+
15+

‎_includes/question.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div id="collapse-{{ include.question.name }}" class="collapse" aria-labelledby="heading-{{ include.question.name }}" data-parent="#accordion">
1010
<div class="card-body">
1111
<p>
12-
{{ include.question.answer }}
12+
{{ include.question.answer | replace: '!SITE_URL!', site.url }}
1313
</p>
1414
</div>
1515
</div>

‎admin.html‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@ <h1>Useful Links</h1>
1717
<div class="row">
1818
<div class="col-12">
1919
<h2>Admin</h2>
20-
<h4><a href="https://analytics.google.com/analytics/web/#/report/visitors-overview/a174926144w242581676p226110493/_u.date00=20200901&_u.date01=20200913"
21-
target="_blank">Google Analytics</a></h4>
22-
<h4><a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing"
23-
target="_blank">Meeting Minutes</a></h4>
24-
<h4><a href="https://trello.com/codewith2"
25-
target="_blank">Trello</a></h4>
20+
<h4><a href="https://analytics.google.com/analytics/web/#/report/visitors-overview/a174926144w242581676p226110493/_u.date00=20200901&_u.date01=20200913" target="_blank">Google Analytics</a></h4>
21+
<h4><a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing" target="_blank">Meeting Minutes</a></h4>
22+
<h4><a href="{{site.url}}/mentor-process">Mentor Application Process</a></h4>
23+
<h4><a href="https://trello.com/codewith2" target="_blank">Trello</a></h4>
2624

2725
<h2>Events</h2>
28-
<h4><a href="https://docs.google.com/spreadsheets/d/1khRdEN3QSD9yQnv9zz_TshaJ4QcczEtEoy1BAv6_UKU/edit?usp=sharing"
29-
target="_blank">Feedback</a></h4>
30-
<h4><a href="https://forms.gle/HDu49ukTBM6uLpBCA"
31-
target="_blank">Request/Kick-Off Form</a></h4>
26+
<h4><a href="https://docs.google.com/spreadsheets/d/1khRdEN3QSD9yQnv9zz_TshaJ4QcczEtEoy1BAv6_UKU/edit?usp=sharing" target="_blank">Feedback</a></h4>
27+
<h4><a href="https://forms.gle/HDu49ukTBM6uLpBCA" target="_blank">Request/Kick-Off Form</a></h4>
3228
<h4><a href="{{site.url}}/event-process">Process</a></h4>
3329
</div>
3430
</div>

‎css/style.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ hr {
171171

172172
iframe {
173173
width: 100%;
174-
height: 300vh;
174+
height: 100vh;
175175
}
176176

177177
.center-when-small {
@@ -322,6 +322,10 @@ div.row.intro {
322322
margin: 2em 0;
323323
}
324324

325+
div.row.intro>div {
326+
min-height: 72px;
327+
}
328+
325329
p.intro-icon {
326330
color: var(--colour-dark-primary);
327331
}
@@ -330,7 +334,7 @@ p.intro-icon {
330334
color: var(--colour-dark-primary);
331335
} */
332336

333-
p.intro-text {
337+
div.intro-text>p {
334338
font-size: large;
335339
}
336340

‎events.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,19 @@ <h1>{{page.title}}</h1>
1717
<a href="#workshops">scheduled workshops</a>. You can read more about each of these below.
1818
</p>
1919
<p>
20-
Before attending any CodeWith event, please read our <a href="{{site.url}}/code-of-conduct">Code of Conduct</a>, which
21-
applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
20+
Before attending any CodeWith event, please read our <a href="{{site.url}}/code-of-conduct">Code of Conduct</a>,
21+
which applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
2222
understand the community&apos;s shared values and provides clear guidelines on how we should behave.
2323
</p>
2424

25+
<h2>Previous Events</h2>
26+
<p>
27+
Slides from previous events and workshops can be found in our
28+
<a href="https://drive.google.com/drive/folders/1j6irw_cUfU_u2P1LLe_tJiM6T4dBID5Q?usp=sharing">Google Drive
29+
folder</a>.
30+
</p>
31+
32+
2533
{% include_relative pages-events/events-drop-ins.html %}
2634
<br />
2735
{% include_relative pages-events/events-huddles.html %}

‎feedback.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
title: Feedback
1111
---
1212

13-
<iframe name="feedback" class="feedback-form"
13+
<iframe name="feedback" class="embedded-google-form"
1414
src="https://docs.google.com/forms/d/e/1FAIpQLSfp26KbuYZXc49kXPfAlZaq9IfAvAtDStAK8aCSC0-nVLqwtQ/viewform?embedded=true"
1515
frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>

‎images/flowchart-mentor.svg‎

Lines changed: 412 additions & 0 deletions
Loading

‎index.html‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,51 +40,53 @@ <h4>
4040
</h4>
4141
</div>
4242
</div>
43+
4344
<div class="row intro">
4445
<div class="col-sm-3 col-md-2 text-center">
4546
<p class="intro-icon">
46-
<a href="https://codewithpeople.slack.com"><span class="fab fa-3x fa-slack"></span></a>
47+
<a href="events"><span class="fas fa-3x fa-calendar-alt"></span></a>
4748
</p>
4849
</div>
49-
<div class="col-sm-9 col-md-10">
50-
<p class="intro-text">
51-
Want to dive right in? We usually have a few people connected to our
52-
<a href="https://codewithpeople.slack.com">Slack workspace</a>, so come and speak to us
53-
there. If you're not signed up, you can
54-
<a href="https://launchpass.com/codewithpeople">join our Slack here</a>.
50+
<div class="col-sm-9 col-md-10 intro-text">
51+
<p>
52+
<a href="https://www.eventbrite.co.uk/o/codewith-30834204055">Follow us on Eventbrite</a> and you'll
53+
get an email whenever we set up a new event. The <a href="events">events page</a> has information about
54+
the different types of event we run.
55+
</p>
56+
<p>
57+
All our activities are currently online. We hope to eventually host some events in person, but until then
58+
it'll all be done via keyboard, microphone, and/or webcam.
5559
</p>
5660
</div>
5761
</div>
5862

5963
<div class="row intro">
6064
<div class="col-sm-3 col-md-2 text-center">
6165
<p class="intro-icon">
62-
<a href="events"><span class="fas fa-3x fa-calendar-alt"></span></a>
66+
<a href="about"><span class="fas fa-3x fa-book-open"></span></a>
6367
</p>
6468
</div>
65-
<div class="col-sm-9 col-md-10">
66-
<p class="intro-text">
67-
Make sure you get notified of our events!
68-
<a href="https://www.eventbrite.co.uk/o/codewith-30834204055">Follow us on Eventbrite</a> and you'll
69-
get an email whenever we have something new to offer. Thanks to COVID-19 all our activities are currently
70-
online. We hope to eventually host some events in person, but until then it'll all be done via keyboard,
71-
microphone, and/or webcam. For more information on the types of event we run, have a look at the
72-
<a href="events">events page</a>.
69+
<div class="col-sm-9 col-md-10 intro-text">
70+
<p>
71+
We offer a friendly space where anyone, from complete beginners to accomplished software engineers, can get
72+
together with like-minded people to learn and share a passion for coding. For more information, check out
73+
our <a href="about">about page</a>.
7374
</p>
7475
</div>
7576
</div>
7677

7778
<div class="row intro">
7879
<div class="col-sm-3 col-md-2 text-center">
7980
<p class="intro-icon">
80-
<a href="about"><span class="fas fa-3x fa-book-open"></span></a>
81+
<a href="https://codewithpeople.slack.com"><span class="fab fa-3x fa-slack"></span></a>
8182
</p>
8283
</div>
83-
<div class="col-sm-9 col-md-10">
84-
<p class="intro-text">
85-
We offer a friendly space where anyone, from complete beginners to accomplished software engineers, can get
86-
together with like-minded people to learn and share a passion for coding. For more information, check out
87-
our <a href="about">about page</a>.
84+
<div class="col-sm-9 col-md-10 intro-text">
85+
<p>
86+
Want to dive right in? We usually have a few people connected to our Slack workspace, so
87+
<a href="https://launchpass.com/codewithpeople" target="_blank">get yourself an invitation</a>,
88+
join up, and come and talk to us there. If Slack's not your thing, we're also on
89+
<a target="_blank" href="https://discord.gg/jKFXkTd">Discord</a>.
8890
</p>
8991
</div>
9092
</div>
@@ -95,10 +97,10 @@ <h4>
9597
<a href="contact"><span class="fas fa-3x fa-envelope"></span></a>
9698
</p>
9799
</div>
98-
<div class="col-sm-9 col-md-10">
99-
<p class="intro-text">
100+
<div class="col-sm-9 col-md-10 intro-text">
101+
<p>
100102
We send out annoucements and updates from time to time. The best way to hear about what we're doing is to
101-
sign up to our mailing list. There's a form where you can give us your details on our <a href="contact">contact page</a>.
103+
sign up to our mailing list using the form on our <a href="contact">contact page</a>.
102104
</p>
103105
</div>
104106
</div>
@@ -109,8 +111,8 @@ <h4>
109111
<a href="feedback"><span class="fas fa-3x fa-smile"></span></a>
110112
</p>
111113
</div>
112-
<div class="col-sm-9 col-md-10">
113-
<p class="intro-text">
114+
<div class="col-sm-9 col-md-10 intro-text">
115+
<p>
114116
We'd love to hear your feedback. Let us know your thoughts on our <a href="feedback">feedback form</a>.
115117
</p>
116118
</div>

‎mentor-application.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
permalink: /mentor-application/
3+
layout: default
4+
suffixes:
5+
- Assistance,
6+
- Power,
7+
- Resources,
8+
- Responsibility,
9+
- Us
10+
title: Mentor Application
11+
---
12+
13+
<iframe name="mentor-application" class="embedded-google-form"
14+
src="https://docs.google.com/forms/d/e/1FAIpQLSdMeoHoDEqnTaZ14Gcr__otLs5pdXMLMlaiD4ZqMhAnmEPIfg/viewform?embedded=true"
15+
frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>

‎mentor-process.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
permalink: /mentor-process/
3+
layout: default
4+
suffixes:
5+
- Assistance,
6+
- Power,
7+
- Resources,
8+
- Responsibility,
9+
- Us
10+
title: Mentor Application Process
11+
sitemap: false
12+
---
13+
14+
<h1>Mentor Application Process</h1>
15+
16+
<div class="row">
17+
<div class="col-12">
18+
<img class="img-fluid" src="{{site.url}}/images/flowchart-mentor.svg" style="max-width: 24em;">
19+
</div>
20+
</div>

0 commit comments

Comments
 (0)