Merge pull request #4 from buildingblocs/master

update master

_data/awards.yml

@@ -1,13 +1,15 @@
 - week: 1
   awards:
   - prize: 1st Prize - 2<sup>0</sup>x Hand sanitizer 🧼
-    winner: 
+    winner: Yap Feng Cheng from ASRJC
   - prize: 2nd Prize - 2<sup>1</sup>x Face masks 😷
-    winner: 
+    winner: Ye Jianrong Jayden from JPJC
   - prize: 3rd Prize - 2<sup>2</sup>x Alocohol swaps 💧
-    winner: 
+    winner: Chen Yiyang from DHS
   - prize: 4th Prize - 2<sup>3</sup>x Toilet paper 🧻
-    winner: 
+    winner: Chong Kai Ying from JPJC
+  - prize: Mystery Prize - Amazon Kindle Paperwhite
+    winner: Ms Foo Fang Fang Computing teacher, from YIJC
 
 - week: 2
   awards:

events-and-workshops/index.md

@@ -3,4 +3,116 @@ layout: default
 published: true
 ---
 
-## More details of main event will be released soon :)
+> ## Invitation to participate in BuildingBloCS 2020, Singapore's largest for students by students Computing education outreach programme.  
+
+<br><br>
+This year, BuildingBloCS is going ONLINE! We would like to invite all Computing students and students interested in Computing to join us for two exciting half days of fun, learning and friendship.  
+
+**We have a Discord server!**  
+We would be posting regular updates through the server and it would be the easiest and quickest way to get the most up-to-date information regarding upcoming BuildingBloCS events and workshops! (Discord link would be sent to you upon signing up)
+
+**Sign up [here]({{ site.baseurl }}/register).**
+<br><br>
+
+## Programme schedule:
+**Thu 14 May**  
+0900 - 0910 Day 1 Opening and entertainment  
+0910 - 0930 Talk by GovTech  
+0930 - 1000 Icebreaking @ Skribbl.io  
+0950 - 1000 Break Loop  
+1000 - 1110 Battle it out @ CodeCombat<sup>[1]</sup>  
+1110 - 1140 Baking with Matplotlib (timing to be confirmed)  
+1140 - 1150 Day 1 Closing  
+1150 - 1200 Lucky draw and entertainment and photo-taking  
+1200 - 1300 Lunch  
+1300 - TBC  Lightning Workshops X Daily Applications of Computing  
+
+**Fri 15 May**  
+0900 - 0910 Day 2 Opening and entertainment  
+0910 - 0930 Talk by Google  
+0930 - 1100 BBCS X The Amazing Race<sup>[2]</sup>  
+1100 - 1110 Break Loop  
+1110 - 1140 Lightning Workshops X Unique Applications of Computing  
+1140 - 1150 Day 2 Closing  
+1150 - 1200 Lucky draw and entertainment and photo-taking  
+
+<div>
+<details>
+  <summary><strong>1: CodeCombat</strong></summary><br>
+  CodeCombat is an online multiplayer game that requires players to utilise code to complete various levels. Unlike typical games which are rigidly based on superficial input, CodeCombat centers itself on tasking players to directly script and code the behaviours of their characters. No WASD keys, R1 to fire, etc. CodeCombat is of a higher level. Code to conquer. Ctrl W to quit.
+</details>  
+
+<br>
+
+<details>
+<summary><strong>2: The Amazing Race</strong></summary><br>
+Participate in an Amazing Race style online competition with multiple stages and tasks based on computing related topics. Participants will be working in groups to tackle a variety of programming problems, each relating to a H2 Computing topic or BBCS workshop. At the end of each stage, participants will play a little scavenger hunt to look for the hidden password which will eventually unlock the final puzzle. Members will have to work together to overcome these unique programming tasks.
+</details>
+</div>
+
+<br>
+**Apart from the conference, there are also other online activities to sign up:**   
+
+<br>
+## BBCS X Games  
+
+Learn programming in a fun and interactive way through our CodeCombat tournament and The Amazing Race! Choose to compete in the Introduction Python or JavaScript courses in CodeCombat and participate in The Amazing that introduces many computing concepts such as computational thinking, databases and many more!  
+
+<sup>**P.S.
+There are lots of attractive prizes to be won so sign up for both days of the main conference to take part in these games! :)**</sup> 
+
+<br>
+## BBCS X Baking  
+
+Cookies! Do they sound like yummy snacks? Well, they can also be fun to code!
+
+In this workshop, you will be learning some interesting computing concepts integrating baking as a metaphor! By relating baking in real life to coding, we will be able to create some cool personalised cookies!  
+
+***Yes we have baking!***    
+
+<br>
+## BBCS X Coursemology  
+
+Do you want to further your knowledge in Python? Sign up for Coursemology to gain access to many interactive programming courses, covering a variety of topics from basic syntax to data visualisation and manipulation!
+
+Every topic is made easy to understand through a series of questions that systematically guide your thinking process, allowing you to apply the mathematical concepts you already know in unique and interesting ways, and fun and exciting storylines allowing you to see applications of such knowledge in the real world.
+
+
+<sup>**P.S. The top 5 scorers of the year get some spicy prizes!**</sup>  
+
+## [More details >>](https://buildingblocs.github.io/2020/pre-event/coursemology/)  
+
+<br>
+
+## BBCS X Workshops  
+
+Have you ever wanted to learn about lane detection (OpenCV), or build your own website (Flask)? 
+
+We have a host of workshops awaiting you to cater to your varying interests! Enter the realm of cyber-defenders by taking on a hands-on approach to cybersecurity, or learn how to use SQLite/NoSQL to enrich your web/mobile applications! If you are looking to refresh your programming knowledge/thinking, do drop by the Intro to Python Workshop! Aspiring game developers, you’ll be glad to know that Intro to Unity Workshop awaits you while those eager to enhance your project workflow should partake in the Intro to Git session.  
+
+## [More details >>](https://buildingblocs.github.io/2020/pre-event/workshop/)  
+
+<br>
+## BBCS X Lucky Draw  
+
+Are you feeling lucky? Participants earn chances to win in regular lucky dips by participating in the various BuildingBloCS activities such as Coursemology, DataCamp, games, workshops and more. The more you participate, the luckier you get! And it is not only about prizes, you learn Computing knowledge and skills while we conduct our lucky draws too!<br>
+
+## [More details >>](https://buildingblocs.github.io/2020/pre-event/luckydraw/)  
+
+<br>
+## BBCS X Entertainment  
+
+Afraid you'll be bored by pure coding lingo and activities? (Though our activities are definitely not boring but) Fret not! We'll be having fun stuff along the way to liven up your experience! Look out for coding jokes, fun games and videos, and even mini competitions! Life is fun! 
+
+*An example to get you going:<br>
+A guy walks into a bar and asks for 1.4 root beers. The bartender says "I'll have to charge you extra, that's a root beer float"*
+
+<br><br><br>
+> **All events are free and limited places are available. Students can register at BuildingBloCS.github.io.**<br><br>
+> **Those who are actively engaged will get to win attractive lucky draw prizes. :)**  
+
+*One machine can do the work of fifty ordinary men. No machine can do the work of one extraordinary man.*  
+
+<br><br><br>
+
+BuildingBloCS 2020 is proudly organised by JC and Integrated Programme Computing students in collaboration with MOE and industry partners.

index.md

@@ -10,12 +10,12 @@ published: true
             <span class="huge">2020</span>
         </h1>
         <p>
-            {{ site.date }} {{ site.location }} :)<!--
-        </p>
-        <p> <!-- /register-->
-            <!--<a class="btn" href="{{ site.baseurl }}/contact#location">Get there</a> -->
-            <!--<a class="btn" href="{{ site.baseurl }}/register">Register</a> -->
-        </p>
+            {{ site.date }} {{ site.location }} :)
+        </p>    
+	<p>
+	    <h2><a href="https://tinyurl.com/bbcs20conference">Register for conference >></a></h2>
+	</p>
+	
 
     </div>
 </section>
@@ -35,8 +35,7 @@ Already on its 4th year, BuildingBloCS '20 will be the year of breakthroughs! Th
 **Workshop materials, programming puzzles, pop quizzes, fun facts** will be here. The pre-events will boost your Computing prowess and help you to contribute to the progress of Singapore as a Smart Nation one step at a time, they are definitely not to be missed! [More&nbsp;details&nbsp;&raquo;]({{ site.baseurl }}/pre-event)
 
 ## Event
-**(NOTICE, EVENT'S DETAILS WERE FROM LAST YEAR. DO NOT REGARD)**<br>
-Registration is coming soon! [Get to register >>]({{ site.baseurl }}/register)
+[Registration is open! >>]({{ site.baseurl }}/register)
 
 A line up of **games, talks, workshops and winpetition** will be conducted on **{{ site.date }} {{ site.location }}**! Come and join us for this year's BuildingBloCS and together let us all help to build Singapore into a **Smart Nation**! [More&nbsp;details&nbsp;&raquo;]({{ site.baseurl }}/event)
 

lucky_datacamp.py

@@ -1,11 +1,13 @@
 import csv
-import random
 import time
+import secrets
+rng = secrets.SystemRandom()  # Same interface as random module
 
 # Configuration
 winner_num = 3  # Number of winners
 prizes = ['t-shirt', 't-shirt', 't-shirt']  # top-prize first
-csv_path = "lucky_draw2.csv"  # Path of CSV File
+# Path of CSV File
+csv_path = r"lucky_draw2.csv"
 
 
 def read(csv_path):
@@ -27,18 +29,21 @@ def read(csv_path):
 def winner(names, winner_num):
     """Choose Winner"""
     winner_list = []
-    used_email = ''
-    if num_participants > winner_num:  # boundary check, participants > prizes
+    used_email = []
+
+    # boundary check, participants > prizes
+    if num_participants > winner_num:
         while len(winner_list) != winner_num:
-            index = random.randint(0, num_participants-1)
+            index = rng.randint(0, num_participants - 1)
             if not (emails[index] in used_email):  # prevent repeats
-                winner_list += [[names[index], emails[index], schools[index]]]
-                used_email += emails[index]
-
-    else:  # participants < prizes
+                winner_list.append(
+                    [names[index], emails[index], schools[index]])
+                used_email.append(emails[index])
+    # participants < prizes
+    else:
         for index in range(0, num_participants):
             winner_list += [[names[index], emails[index], schools[index]]]
-        random.shuffle(winner_list)  # changes the order of names -> random
+        rng.shuffle(winner_list)  # changes the order of names -> random
     return winner_list
 
 
@@ -53,7 +58,6 @@ def display(winner_list, prizes):
         # time.sleep(2) #automatic
 
 
-# main
 (names, emails, schools, num_participants) = read(
     csv_path)  # reads file and unpack tuple
 winner_list = winner(names, winner_num)  # returns winner list

pre-event/index.md

@@ -2,48 +2,71 @@
 layout: default
 ---
 # On-going
-## Entertainment
-
-Updates will be coming soon :)
+## BuildingBloCS 2020
 
+Invitation to participate in BuildingBloCS 2020, Singapore’s largest for students by students Computing education outreach programme.
 
-## Lucky draw
+This year, BuildingBloCS is going ONLINE! We would like to invite all Computing students and students interested in Computing to join us for two exciting half days of fun, learning and friendship.
 
-This year, we will have weekly lucky draws on every Fri from 17 Apr and your chances accumulate till 5 Jun i.e. a total of 8 lucky draws, and there is no limit to the number of times you can get lucky!
+<a class="btn" href="{{ site.baseurl }}/events-and-workshops">Details</a>
 
-<a class="btn" href="{{ site.baseurl }}/pre-event/luckydraw">Details</a>
+## Workshops
 
-## DataCamp Outreach Workshop
-Data science and artificial intelligence have become hot topics ubiquitous in almost all industries such as business, education, healthcare, security, etc. The list never ends!
+Enter the realm of cyber-defenders by taking on a hands-on approach to cybersecurity, or learn how to use SQLite/NoSQL/HTML/CSS/Flask to enrich your web/mobile applications! If you are looking to refresh your programming knowledge/thinking, do drop by the Intro to Python Workshop!
 
-DataCamp is a platform that allows you to learn about data science, machine learning, etc. It comes in courses 
-conducted by industry experts with bite-size exercises accompanied by clear instructional videos. Users can learn data analytics and machine learning from the comfort of their browser, at their own pace, and tailored to their needs and expertise, and even earn industry certification!
+**Upcoming workshops:**
 
-Join our following outreach workshop on **Wednesday 15th April 2020 from 8 to 830 pm**. We will share more about DataCamp and answer any questions you may have.
+6 May: Intro to Python<br>
+9 May: HTML/CSS and Intro to SQL<br>
+10 May: Intro to Javascript
 
-There will be lucky draw prizes for participants who attend this outreach workshop. :) SIGN UP EARLIER TO STAND HIGHER CHANCES TO WIN! 
+and more...
 
-Please join the BuildingBloCS 2020 Discord at <a href="https://discord.gg/hfRDun5">https://discord.gg/hfRDun5</a>
-**Important** When you join, please indicate your name and school (for security reasons+). We will not be able to accept people whose identity we cannot verify.
+<a class="btn" href="{{ site.baseurl }}/pre-event/workshop">Details</a>
 
-So sign up below! For inquires, feel free to email <a href="mailto:[email protected]">[email protected]</a>
+## DataCamp Account Sign-up
+If you are keen to learn about data science and would like to request for a full access DataCamp subscription, you can do so by requesting for a full access DataCamp subscription (valid til mid Sep 2020). Do note that accounts are limited.
 
-<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSc6DY1-z4F2V1eXyCe0cEtRaonbdcp4-oQKjBt4mOik944MnA/viewform?embedded=true" width="640" height="1462" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>
+<a class="btn" href="http://tinyurl.com/bbcs20datacamp">Details</a>
 
 ## Coursemology
 Challenge yourself with Project Euler questions and hone your Python programming skills and mathematical knowledge. You will learn how to create different kinds of visualizations for different kinds of data and also make use of cool data science tools to start your own analyses. Join our BBCS Coursemology and start your journey!
 
-<a class="btn" href="{{ site.baseurl }}/pre-event/Coursemology">Details</a>
+<a class="btn" href="{{ site.baseurl }}/pre-event/coursemology">Details</a>
+
+## Lucky draw
+
+Are you feeling lucky? Participants earn chances to win in regular lucky dips by participating in the various BuildingBloCS activities such as Coursemology, DataCamp, games, workshops and more. The more you participate, the luckier you get! And it is not only about prizes, you learn Computing knowledge and skills while we conduct our lucky draws too!
 
+<a class="btn" href="{{ site.baseurl }}/pre-event/luckydraw">Details</a>
+
+## Entertainment
+
+Afraid you'll be bored by pure coding lingo and activities? (Though our activities are definitely not boring but) Fret not! We'll be having fun stuff along the way to liven up your experience! Look out for coding jokes, fun games and videos, and even mini competitions! Life is fun! 
+
+*An example to get you going: A guy walks into a bar and asks for 1.4 root beers.
+The bartender says "I'll have to charge you extra, that's a root beer float"*
+
+<br>
 # Past events
 
 ## Workshops at FOSSASIA
 
 BuildingBloCS 2020 has partnered with **FOSSASIA** - the largest Asia-Pacific Open Source Conference this year. We are excited to announce free technology workshops for the community taking place at the FOSSASIA Summit 2019 evenings on Friday, March 15 and Saturday, March 16 as well as Saturday morning. This event is separate from main conference, but serve as a lead to help students improve their coding proficiency.
 
-Our workshops **workshops** at FOSSASIA include Cybersecurity with Python, Introduction to Socket Programming in Python, Web Applications with Flask in Python, and Circuit Python Workshop.
+The workshops that BuildingBloCS members have conducted are 
+- Cybersecurity with Python
+- Socket Programming with Python
+- Web Applications with Flask with Python
+- SQLite with Python
 
 <a class="btn" href="{{ site.baseurl }}/pre-event/workshop#Fossasia">Details</a>
 
+<br>
+
+## DataCamp Outreach Workshop
+Data science and artificial intelligence have become hot topics ubiquitous in almost all industries such as business, education, healthcare, security, etc. The list never ends! 
 
+Held on the 15th April 2020, participants had the opportunity to learn about these topics through DataCamp.
 
+[DataCamp](https://www.datacamp.com/) is a platform that allows you to learn about data science, machine learning, etc. It comes in courses conducted by industry experts with bite-size exercises accompanied by clear instructional videos. Users can learn data analytics and machine learning from the comfort of their browser, at their own pace, and tailored to their needs and expertise, and even earn industry certification!

pre-event/luckydraw/index.md

@@ -5,7 +5,7 @@ layout: default
 
 # Lucky draw
 
-We will have weekly draws for all the registered participants on every Friday from 19 Apr and your chances accumulate till 7 Jun i.e. a total of 8 lucky draws, and there is no limit to the number of times you can get lucky!
+Are you feeling lucky? Participants earn chances to win in regular lucky dips by participating in the various BuildingBloCS activities such as Coursemology, DataCamp, games, workshops and more. The more you participate, the luckier you get! And it is not only about prizes, you learn Computing knowledge and skills while we conduct our lucky draws too!
 
 >Lucky draws will take place every Friday at **12 20 pm**
 
@@ -20,7 +20,7 @@ To ensure the equalness for every participant, we have decided to share the sour
 
 ## Result
 {% for week in site.data.awards %}
-<h3>Week {{ week.week }}</h3>
+<h3>Lucky Draw {{ week.week }}</h3>
 <a class="btn" href="{{ site.baseurl }}/pre-event/luckydraw/video#{{week.week}}">Video</a>
 <table>
     {% for awards in week.awards %}