Merge branch 'master' into feature/60-adding-link-to-github-to-one-of-the-p

Author: KeiranWDigital

404.html

@@ -1,23 +1,24 @@
 ---
-title: Error 404
 layout: default
+suffixes:
+- Forgiveness,
+- Humour,
+- Us
+title: Error 404
 ---
 
 <div class="container">
     <div class="row">
         <div class="col-md-12">
             <div class="error-template">
-                <h1>
-                    Oops!</h1>
-                <h2>
-                    404 Not Found</h2>
+                <h1>Oops!</h1>
+                <h2>404 Not Found</h2>
                 <div class="error-details">
-                    Sorry, an error has occured, Requested page not found!
+                    Sorry, an error has occurred. Requested page not found!
                 </div>
                 <div class="error-actions">
-                    <a href="index.html" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>
-                        Take Me Home </a><a href="contact.html" class="btn btn-primary btn-lg"><span
-                            class="fas fa-envelope"></span> Contact Us </a>
+                    <a href="index.html" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>Take Me Home</a>
+                    <a href="contact.html" class="btn btn-primary btn-lg"><span class="fas fa-envelope"></span> Contact Us </a>
                 </div>
             </div>
         </div>

README.md

@@ -2,11 +2,70 @@
 This repository holds the code for CodeWith, a group in the UK that offers free coding help and tuition.
 
 # Our Event
-We run the event monthly and manage it all through 
-[our Slack group](https://www.slack.com/).
+We run events online and manage it all through 
+[our Slack group](https://www.codewith.org.uk/contact.html).
 It's all free, so if you're in the area please come along!
 
-# To add yourself to the people page
+You can see our current events at https://www.codewith.org.uk/events.html
+
+# Contributing to this repository
+## Repository branches
+
+Branch | Purpose | Who can commit
+------------ | ------------- | ---------------
+Master | The **Live** branch, commits here will appear in the live website | Maintainers, only from the release branch
+Release | Tested code that is ready for the live website | Maintainers, via pull requests
+Feature/* | New code being developed | Contributors 
+
+## Pull requests
+
+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).
+
+
+## Testing 
+
+Testing is important for maintainers and contributors alike. Ensure all aspects of the site work as the did previously before submitting a pull request. 
+
+Things to look out for when testing
+
+* Responsive design - how does the page display on different devices, and different orientations.
+* Browser support - Test your changes in a few major browsers, are there any errors?
+
+Before pull requests are merged maintainers should test all aspects of the site. 
+
+# Getting started with this site and Jekyll
+
+## What is Jekyll?
+
+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.
+
+Quoted from https://jekyllrb.com/docs/
+
+## Jekyll setup
+
+Use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
+
+## Building the site
+
+Open a command line in the root directory of the repository
+
+Run `jekyll build` to build the site, this will produce a `_site` folder with the required content
+
+>:Warning: do not edit anything in the site folder as it will not be comitted and is overwritten everytime you build the site.
+
+To rebuild the site after a file change append `--watch` to the end of the command. 
+
+e,g. `jekyll build --watch`
+
+Once you have a `_site` folder open the `index.html` file inside to view the site.
+
+## Includes
+
+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/
+
+# Useful guides
+
+## To add yourself to the people page
 
 * Create a branch
 * 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
 Copy the includes code `<br />
 {% include_relative pages-people/people-yourname.html %}` to the bottom of people.html (ensure you update the file name)
 
-# Sitemap
+## Sitemap
 All pages not defined as a default in _config.yml are added to the sitemap
 
 To exclude a specific page use the snippet `sitemap:false` at the top of the page
 
-> :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.
+: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.
 
-## Example default to add to `_config.yml`
+### Example default to add to `_config.yml`
 ```yml
 -
   scope:
@@ -39,7 +98,7 @@ To exclude a specific page use the snippet `sitemap:false` at the top of the pag
 ```
 
 All files in `_include` are excluded from the sitemap automatically
-# Adding a page to the typed suffix functionality
+## Adding a page to the typed suffix functionality
 * 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. 
 
 e.g. 
@@ -49,4 +108,8 @@ For a page named "Home"
 ```javascript
 var Languages = ["Java","HTML"]
 var Home = Languages
-```
+```
+
+
+
+

_includes/head.html

@@ -41,9 +41,8 @@
         <link rel="stylesheet" href="css/sidebar.css">
 
         <!-- 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 -->
-        <script src="./js/suffix-lists.js"></script>
         <script lang="javascript">
-            var suffixOptions = eval("{{ page.title }}".split(" ")[0]).map(function(x) { return x.toUpperCase(); });
+            var suffixOptions = "{{ page.suffixes }}".split(",").map(function(x) { return x.toUpperCase(); });
         </script>
 
     </head>

_includes/scripts.html

@@ -23,15 +23,15 @@
         $.ajax({
             "async": true,
             "crossDomain": true,
-            "url": "https://9buw6tj3aj.execute-api.eu-west-2.amazonaws.com/default/",
+            "url": "https://9buw6tj3aj.execute-api.eu-west-2.amazonaws.com/CodeWithAPI/",
             "method": "GET",
             "headers": {
                 "Content-Type": "application/json"
             }
         }).done(function(data) {
             console.log(data.body);
 
-            $("#events-scheduled").append(data.content);
+            $("#events-scheduled").html(data.content);
             $("#eventBriteWidgets").append(data.widgets);
             $.globalEval(data.widgets);
         });

about.html

@@ -1,6 +1,14 @@
 ---
-title: About
 layout: default
+suffixes:
+    - Committee,
+    - Equity,
+    - History,
+    - Leadership,
+    - Publicity,
+    - Support,
+    - Us
+title: About
 ---
 
 <h1>{{page.title}}</h1>

activities.html

@@ -1,6 +1,24 @@
 ---
-title: Activities
 layout: default
+suffixes:
+    - codecademy,
+    - CodeCombat,
+    - CSSDiner,
+    - CSSTricks,
+    - FreeCodeCamp,
+    - git,
+    - Javascript,
+    - Udemy,
+    - #100DaysOfCode,
+    - AdventOfCode,
+    - Box-256,
+    - CodeWars,
+    - CodinGame,
+    - Edabit,
+    - Reddit,
+    - Jupyter,
+    - Us
+title: Activities
 ---
 
 <h1>{{page.title}}</h1>

admin.html

@@ -0,0 +1,29 @@
+---
+layout: default
+suffixes:
+- Assistance,
+- Power,
+- Resources,
+- Responsibility,
+- Us
+title: Home
+---
+
+<h1>Useful Links</h1>
+
+<div class="row">
+    <div class="col-12">
+            <h4>
+                <a href="https://forms.gle/HDu49ukTBM6uLpBCA" target="_blank">Event Request/Kick-Off Form</a>
+            </h4>
+            <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>
+            <h4>
+                <a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing" target="_blank">Meeting Minutes</a>
+            </h4>
+            <h4>
+                <a href="https://trello.com/codewith2" target="_blank">Trello</a>
+            </h4>
+    </div>
+</div>

aws_lambda/eventBriteHelper.py

@@ -11,7 +11,7 @@
 organisationId = "464103861019"
 monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
 
-eventTemplate = "<div class=\"row card\"><div class=\"col-12`eventClass`\"><div class=\"row\"><div class=\"col-sm-4 col-lg-2 event-date\"><span class=\"event-date-month\">`month`</span> <span class=\"event-date-day\">`day`</span><p><span class=\"event-date-start-time\">`eventStart``eventStartAmPm` - </span><span class=\"event-date-end-time\">`eventEnd``eventEndAmPm`</span></p></div><div class=\"col-sm-8 col-lg-10 event-title\"><span class=\"event-title\">`eventName`</span></div></div><div class=\"row\"><div class=\"col-md-12 col-lg-9 event-description\"><span class=\"event-description\">`eventDescription`</span></div><div class=\"col-md-12 col-lg-3 event-book-button\"><!-- Noscript content for added SEO --><noscript><a href=\"https://www.eventbrite.co.uk/e/programming-101-tickets-`eventId`\"rel=\"noopener noreferrer\" target=\"_blank\"></noscript><!-- You can customize this button any way you like --><button id=\"`eventbriteWidgetModalTriggerEventId`\" class=\"btn btn-primary float-right\"type=\"button\">Register</button><noscript></a>Register for tickets on Eventbrite</noscript></div></div></div></div>"
+eventTemplate = "<div class=\"row card\"><div class=\"col-12`eventClass`\"><div class=\"row\"><div class=\"col-sm-4 col-lg-2 event-date\"><span class=\"event-date-month\">`month`</span> <span class=\"event-date-day\">`day`</span><p><span class=\"event-date-start-time\">`eventStart``eventStartAmPm` - </span><span class=\"event-date-end-time\">`eventEnd``eventEndAmPm`</span></p></div><div class=\"col-sm-8 col-lg-10 event-title\"><span class=\"event-title\">`eventName`</span></div></div><div class=\"row\"><div class=\"col-md-12 col-lg-9 event-description\"><span class=\"event-description\">`eventDescription`</span></div><div class=\"col-md-12 col-lg-3 event-book-button\"><!-- Noscript content for added SEO --><noscript><a href=\"https://www.eventbrite.co.uk/e/programming-101-tickets-`eventId`\"rel=\"noopener noreferrer\" target=\"_blank\"></noscript><!-- You can customize this button any way you like --><button id=\"`eventbriteWidgetModalTriggerEventId`\" class=\"btn `registerButtonClass` float-right\"type=\"button\">`registerButtonText`</button><noscript></a>Register for tickets on Eventbrite</noscript></div></div></div></div>"
 widgetPrefix = "var orderComplete = function () {var resultString = \"Order complete!\";alert(resultString);console.log(resultString);};"
 widgetTemplate = "/* `eventName` */ window.EBWidgets.createWidget({widgetType: 'checkout',eventId: '`eventId`',modal: true,modalTriggerElementId: '`eventbriteWidgetModalTriggerEventId`',onOrderComplete: orderComplete});"
 
@@ -45,7 +45,14 @@ def getEventsAsHtml(event, lambda_context):
 
         ticketClasses = getEventTicketClasses(eventId)['ticket_classes']
         onSaleStatus = '' if ticketClasses == [] else ticketClasses[0]['on_sale_status']
-        eventClass = ' event-sold-out' if onSaleStatus == 'SOLD_OUT' else ''
+        
+        eventClass = ''
+        registerButtonClass = 'btn-primary'
+        registerButtonText = 'Register'
+        if onSaleStatus == 'SOLD_OUT':
+            eventClass = ' event-sold-out'
+            registerButtonClass = 'btn-default'
+            registerButtonText = 'Sold out'
 
         startDate = datetime.strptime(event['start']['local'], "%Y-%m-%dT%H:%M:%S")
         endDate = datetime.strptime(event['end']['local'], "%Y-%m-%dT%H:%M:%S")
@@ -70,6 +77,9 @@ def getEventsAsHtml(event, lambda_context):
 
         if event['status'] == "live":
             content = content + eventTemplate \
+                .replace("`eventClass`", eventClass) \
+                .replace("`registerButtonClass`", registerButtonClass) \
+                .replace("`registerButtonText`", registerButtonText) \
                 .replace("`eventClass`", eventClass) \
                 .replace("`month`", month) \
                 .replace("`day`", str(day)) \
@@ -87,4 +97,4 @@ def getEventsAsHtml(event, lambda_context):
                 .replace("`eventId`", eventId) \
                 .replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
 
-    return {'content': content, 'widgets': widgets}
+    return {'statusCode': 200, 'content': content, 'widgets': widgets}

aws_lambda/getEventBriteEventsAsHtml.py

@@ -67,4 +67,4 @@ def getEventBriteEventsAsHtml(event, lambda_context):
                 .replace("`eventId`", eventId) \
                 .replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
 
-    return {'content': content, 'widgets': widgets}
+    return {'statusCode': 200, 'content': content, 'widgets': widgets}

branding.html

@@ -1,6 +1,12 @@
 ---
-title: Branding Guidelines
 layout: default
+suffixes:
+    - Colours,
+    - Fonts,
+    - Icons,
+    - Logos,
+    - Us
+title: Branding Guidelines
 ---
 
 <h1>{{page.title}}</h1>