Skip to content

Commit e5a845d

Browse files
KeiranWDigitalKeiranWDigital
authored
Merge pull request #44 from CodeWithGroup/release
Merge release into master
2 parents faff639 + c149698 commit e5a845d

File tree

16 files changed

+311
-124
lines changed

16 files changed

+311
-124
lines changed

‎404.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
---
2-
title: Error 404
32
layout: default
3+
suffixes:
4+
- Forgiveness,
5+
- Humour,
6+
- Us
7+
title: Error 404
48
---
59

610
<div class="container">
711
<div class="row">
812
<div class="col-md-12">
913
<div class="error-template">
10-
<h1>
11-
Oops!</h1>
12-
<h2>
13-
404 Not Found</h2>
14+
<h1>Oops!</h1>
15+
<h2>404 Not Found</h2>
1416
<div class="error-details">
15-
Sorry, an error has occured, Requested page not found!
17+
Sorry, an error has occurred. Requested page not found!
1618
</div>
1719
<div class="error-actions">
18-
<a href="index.html" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>
19-
Take Me Home </a><a href="contact.html" class="btn btn-primary btn-lg"><span
20-
class="fas fa-envelope"></span> Contact Us </a>
20+
<a href="index.html" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>Take Me Home</a>
21+
<a href="contact.html" class="btn btn-primary btn-lg"><span class="fas fa-envelope"></span> Contact Us </a>
2122
</div>
2223
</div>
2324
</div>

‎README.md‎

Lines changed: 71 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,70 @@
22
This repository holds the code for CodeWith, a group in the UK that offers free coding help and tuition.
33

44
# Our Event
5-
We run the event monthly and manage it all through
6-
[our Slack group](https://www.slack.com/).
5+
We run events online and manage it all through
6+
[our Slack group](https://www.codewith.org.uk/contact.html).
77
It's all free, so if you're in the area please come along!
88

9-
# To add yourself to the people page
9+
You can see our current events at https://www.codewith.org.uk/events.html
10+
11+
# Contributing to this repository
12+
## Repository branches
13+
14+
Branch | Purpose | Who can commit
15+
------------ | ------------- | ---------------
16+
Master | The **Live** branch, commits here will appear in the live website | Maintainers, only from the release branch
17+
Release | Tested code that is ready for the live website | Maintainers, via pull requests
18+
Feature/* | New code being developed | Contributors
19+
20+
## Pull requests
21+
22+
Please submit pull requests with useful descriptions, if you don't know how to use pull requests ask in [our Slack group](https://www.codewith.org.uk/contact.html).
23+
24+
25+
## Testing
26+
27+
Testing is important for maintainers and contributors alike. Ensure all aspects of the site work as the did previously before submitting a pull request.
28+
29+
Things to look out for when testing
30+
31+
* Responsive design - how does the page display on different devices, and different orientations.
32+
* Browser support - Test your changes in a few major browsers, are there any errors?
33+
34+
Before pull requests are merged maintainers should test all aspects of the site.
35+
36+
# Getting started with this site and Jekyll
37+
38+
## What is Jekyll?
39+
40+
Jekyll is a static site generator. It takes text written in your favorite markup language and uses layouts to create a static website. You can tweak the site’s look and feel, URLs, the data displayed on the page, and more.
41+
42+
Quoted from https://jekyllrb.com/docs/
43+
44+
## Jekyll setup
45+
46+
Use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
47+
48+
## Building the site
49+
50+
Open a command line in the root directory of the repository
51+
52+
Run `jekyll build` to build the site, this will produce a `_site` folder with the required content
53+
54+
>:Warning: do not edit anything in the site folder as it will not be comitted and is overwritten everytime you build the site.
55+
56+
To rebuild the site after a file change append `--watch` to the end of the command.
57+
58+
e,g. `jekyll build --watch`
59+
60+
Once you have a `_site` folder open the `index.html` file inside to view the site.
61+
62+
## Includes
63+
64+
Jeykll has functionality to include files, which this site makes extensive use of. You can find the documentation for includes here: https://jekyllrb.com/docs/includes/
65+
66+
# Useful guides
67+
68+
## To add yourself to the people page
1069

1170
* Create a branch
1271
* Make a copy of one of the existing bios in *pages-people*
@@ -22,14 +81,14 @@ If you need any help, contact one of the pople who have already added themselves
2281
Copy the includes code `<br />
2382
{% include_relative pages-people/people-yourname.html %}` to the bottom of people.html (ensure you update the file name)
2483

25-
# Sitemap
84+
## Sitemap
2685
All pages not defined as a default in _config.yml are added to the sitemap
2786

2887
To exclude a specific page use the snippet `sitemap:false` at the top of the page
2988

30-
> :warning: **If you are including the page in another page (using `include_relative`)**: add the page as a default in `_config.yml` otherwise the `sitemap:false` is displayed as HTML on the page.
89+
:warning: **If you are including the page in another page (using `include_relative`)**: add the page as a default in `_config.yml` otherwise the `sitemap:false` is displayed as HTML on the page.
3190

32-
## Example default to add to `_config.yml`
91+
### Example default to add to `_config.yml`
3392
```yml
3493
-
3594
scope:
@@ -39,7 +98,7 @@ To exclude a specific page use the snippet `sitemap:false` at the top of the pag
3998
```
4099
41100
All files in `_include` are excluded from the sitemap automatically
42-
# Adding a page to the typed suffix functionality
101+
## Adding a page to the typed suffix functionality
43102
* Add a variable to the suffix-lists.js file with the first word of the page title. Assign the array you want to use to the variable.
44103

45104
e.g.
@@ -49,4 +108,8 @@ For a page named "Home"
49108
```javascript
50109
var Languages = ["Java","HTML"]
51110
var Home = Languages
52-
```
111+
```
112+
113+
114+
115+

‎_includes/head.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
<link rel="stylesheet" href="css/sidebar.css">
4242

4343
<!-- I know scripts aren't supposed to go in the header, but we need this here in order to pick different suffix lists for the typewriter at the top -->
44-
<script src="./js/suffix-lists.js"></script>
4544
<script lang="javascript">
46-
var suffixOptions = eval("{{ page.title }}".split(" ")[0]).map(function(x) { return x.toUpperCase(); });
45+
var suffixOptions = "{{ page.suffixes }}".split(",").map(function(x) { return x.toUpperCase(); });
4746
</script>
4847

4948
</head>

‎about.html‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
---
2-
title: About
32
layout: default
3+
suffixes:
4+
- Committee,
5+
- Equity,
6+
- History,
7+
- Leadership,
8+
- Publicity,
9+
- Support,
10+
- Us
11+
title: About
412
---
513

614
<h1>{{page.title}}</h1>

‎activities.html‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
---
2-
title: Activities
32
layout: default
3+
suffixes:
4+
- codecademy,
5+
- CodeCombat,
6+
- CSSDiner,
7+
- CSSTricks,
8+
- FreeCodeCamp,
9+
- git,
10+
- Javascript,
11+
- Udemy,
12+
- #100DaysOfCode,
13+
- AdventOfCode,
14+
- Box-256,
15+
- CodeWars,
16+
- CodinGame,
17+
- Edabit,
18+
- Reddit,
19+
- Jupyter,
20+
- Us
21+
title: Activities
422
---
523

624
<h1>{{page.title}}</h1>

‎admin.html‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
layout: default
3+
suffixes:
4+
- Assistance,
5+
- Power,
6+
- Resources,
7+
- Responsibility,
8+
- Us
9+
title: Home
10+
---
11+
12+
<h1>Useful Links</h1>
13+
14+
<div class="row">
15+
<div class="col-12">
16+
<h4>
17+
<a href="https://forms.gle/HDu49ukTBM6uLpBCA" target="_blank">Event Request/Kick-Off Form</a>
18+
</h4>
19+
<h4>
20+
<a href="https://analytics.google.com/analytics/web/#/report/visitors-overview/a174926144w242581676p226110493/_u.date00=20200901&_u.date01=20200913" target="_blank">Google Analytics</a>
21+
</h4>
22+
<h4>
23+
<a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing" target="_blank">Meeting Minutes</a>
24+
</h4>
25+
<h4>
26+
<a href="https://trello.com/codewith2" target="_blank">Trello</a>
27+
</h4>
28+
</div>
29+
</div>

‎branding.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
---
2-
title: Branding Guidelines
32
layout: default
3+
suffixes:
4+
- Colours,
5+
- Fonts,
6+
- Icons,
7+
- Logos,
8+
- Us
9+
title: Branding Guidelines
410
---
511

612
<h1>{{page.title}}</h1>

‎contact.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
---
2-
title: Contact
32
layout: default
3+
suffixes:
4+
- Community,
5+
- Events,
6+
- Forums,
7+
- Friends,
8+
- People,
9+
- Support,
10+
- Workshops,
11+
- Us
12+
title: Contact
413
---
514

615
<link href="https://cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">

‎css/style.css‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
--colour-light-highlight: #adffd2;
1111
--colour-black: #000000;
1212
--colour-white: #f8f8f8;
13+
--color-link: #A52A2A;
1314
}
1415

1516
/* Links */
@@ -18,7 +19,7 @@ a:focus,
1819
a:hover {
1920
text-decoration: solid underline;
2021
/* color: var(--colour-light-primary); */
21-
color: brown;
22+
color: var(--color-link);
2223
}
2324

2425
a, a:focus {
@@ -225,6 +226,7 @@ iframe {
225226
padding: 30px;
226227
}
227228

229+
228230
/* Activity and resource cards */
229231

230232
.card {
@@ -387,6 +389,21 @@ div.event-book-button {
387389
width: 7.5em;
388390
}
389391

392+
/*Resources*/
393+
.color-slack{
394+
color:var(--colour-black);
395+
}
396+
397+
.color-github{
398+
color:var(--colour-black);
399+
}
400+
401+
.color-slides{
402+
color:var(--colour-black);
403+
}
404+
405+
406+
390407
/* Twitter */
391408

392409
#twitterButton i {

‎events.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
---
2-
title: Events
32
layout: default
3+
suffixes:
4+
- Databases,
5+
- Docker,
6+
- Git,
7+
- SQL,
8+
- Kubernetes,
9+
- Us
10+
title: Events
411
---
512

613
<h1>{{page.title}}</h1>

0 commit comments

Comments
 (0)