From 410b83a127c4f90aaf56add0b4e9d001fe91b3e3 Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Sun, 4 Oct 2020 11:52:09 +0100 Subject: [PATCH 1/6] Moved events to YAML --- _data/events.json | 74 ---------------------------- _data/events.yml | 8 +++ _includes/partials/events-table.html | 4 +- 3 files changed, 10 insertions(+), 76 deletions(-) delete mode 100755 _data/events.json create mode 100644 _data/events.yml diff --git a/_data/events.json b/_data/events.json deleted file mode 100755 index a5b7a5a..0000000 --- a/_data/events.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "name": "CoderDojo RISE", - "date": "28 Mar 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-march-2020-tickets-87608614725" - }, - { - "name": "CoderDojo RISE", - "date": "25 Apr 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-april-2020-tickets-87608630773" - }, - { - "name": "CoderDojo RISE", - "date": "30 May 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-30-may-2020-tickets-87608648827" - }, - { - "name": "CoderDojo RISE", - "date": "27 Jun 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-27-june-2020-tickets-87608668887" - }, - { - "name": "CoderDojo RISE", - "date": "25 Jul 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-july-2020-tickets-87608682929" - }, - { - "name": "CoderDojo RISE", - "date": "29 Aug 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-29-august-2020-tickets-87608809307" - }, - { - "name": "CoderDojo RISE", - "date": "26 Sep 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-26-september-2020-tickets-87608819337" - }, - { - "name": "CoderDojo RISE", - "date": "31 Oct 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-31-october-2020-tickets-87608979817" - }, - { - "name": "CoderDojo RISE", - "date": "28 Nov 2020", - "time": "14:00", - "location": "RISE London, 41 Luke street, London EC2A 4DP", - "type": "Regular", - "ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-november-2020-tickets-87608995865" - } -] \ No newline at end of file diff --git a/_data/events.yml b/_data/events.yml new file mode 100644 index 0000000..f97d4ec --- /dev/null +++ b/_data/events.yml @@ -0,0 +1,8 @@ +events: + + # - name: CoderDojo Rise + # date: 28 Mar 2020 + # time: 14:00 + # location: RISE London, 41 Luke Street, London EC2A 4DP + # type: Regular + # ticketsLink: https://www.eventbrite.co.uk/e/coderdojo-rise-28-march-2020-tickets-87608614725 diff --git a/_includes/partials/events-table.html b/_includes/partials/events-table.html index 5f1c5e3..9fcf194 100755 --- a/_includes/partials/events-table.html +++ b/_includes/partials/events-table.html @@ -2,7 +2,7 @@

Upcoming Events

- {% if site.data.events %} + {% if site.data.events.events %} @@ -15,7 +15,7 @@

Upcoming Events

- {% for event in site.data.events %} + {% for event in site.data.events.events %} From b589f21d63fb6f239adde18693eb577f89eff1f9 Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Sun, 4 Oct 2020 11:57:11 +0100 Subject: [PATCH 2/6] Updated README with instructions --- README.md | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 64b197a..c9b805f 100755 --- a/README.md +++ b/README.md @@ -4,10 +4,28 @@ ## Checklist -* TODO: Email forwarding for hi@coderdojorise.com and dev@coderdojorise.com -* TODO: Set-up way to sign-up for email newsletters from Mailchimp. +### Website + * TODO: Volunteer pages * TODO: Resources pages * TODO: Supporters pages * TODO: Community pages -* TODO: Add Google Analytics tag \ No newline at end of file +* TODO: Add Google Analytics tag + +### Systems + +* TODO: Email forwarding for hi@coderdojorise.com and dev@coderdojorise.com +* TODO: Set-up way to sign-up for email newsletters from Mailchimp. + +## Running Locally + +1. Install Github Pages Jekyll: + - Follow this tutorial: https://jekyllrb.com/docs/github-pages/ + +2. Run the following command locally: + - `$ bundle exec jekyll serve` + +## Misc + +- We recommend using `rbenv` to install Ruby: + - https://github.com/rbenv/rbenv From 920eae7637d59a27b5e0acdb39e206f21eaaa8c9 Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Sun, 4 Oct 2020 14:09:39 +0100 Subject: [PATCH 3/6] Cookies Policy page --- _includes/navbar.html | 2 +- pages/legal/cookies.html | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 pages/legal/cookies.html diff --git a/_includes/navbar.html b/_includes/navbar.html index 992d78f..dfa6e21 100755 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -8,7 +8,7 @@ - +
{{ event.date }}