Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-bateman
michael-bateman committed Apr 21, 2018
1 parent a28e840 commit 9d66c7b
Show file tree
Hide file tree
Showing 14 changed files with 103 additions and 63 deletions.
4 changes: 4 additions & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ description: > # Michael Bateman's project website
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://michaelbateman.ca" # the base hostname & protocol for your site

# Settings for the website
update: false # If you should be redirected to the update page
test: true # Beta update notice

# Social accounts
github: https://github.com/michael-bateman/michaelbateman.ca

Expand Down
5 changes: 5 additions & 0 deletions _includes/beta.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% if site.test == true %}
<div class="alert alert-warning" role="alert">
<span class="fa fa-info-circle fa-2x"></span> <b>We're testing!</b> We are testing our website right now and things might not work as expected. If you notice something broken or not working as expected please email <a href="mailto:[email protected]" style="color: inherit">[email protected]</a> with a detailed description of the issue. Thanks!
</div>
{% endif %}
19 changes: 10 additions & 9 deletions _includes/head.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }} | {{ site.title }}</title>
<link href="{{ site.baseurl }}/css/bootstrap.css" rel="stylesheet">
<link href="{{ site.baseurl }}/css/font-awesome.css" rel="stylesheet">
<link href="{{ site.baseurl }}/css/custom.css" rel="stylesheet">
<script src="{{ site.baseurl }}/js/jquery.min.js"></script>
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
<script src="{{ site.baseurl }}/js/gtag.js"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }} | {{ site.title }}</title>
<link href="{{ site.baseurl }}/css/bootstrap.css" rel="stylesheet">
<link href="{{ site.baseurl }}/css/font-awesome.css" rel="stylesheet">
<link href="{{ site.baseurl }}/css/custom.css" rel="stylesheet">
<script src="{{ site.baseurl }}/js/jquery.min.js"></script>
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-110997821-1"></script>
<script src="{{ site.baseurl }}/js/gtag.js"></script>
</head>
16 changes: 9 additions & 7 deletions _includes/notice.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{% if page.title != "We're updating" %}
<script type="text/javascript">
window.location = "/update/"
</script>
<noscript>
<meta http-equiv="refresh" content="0;URL='/update/'" />
</noscript>
{% if site.update == true %}
{% if page.title != "We're updating" %}
<script type="text/javascript">
window.location = "/update/"
</script>
<noscript>
<meta http-equiv="refresh" content="0;URL='/update/'" />
</noscript>
{% endif %}
{% endif %}
2 changes: 2 additions & 0 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

{% include detect.html %}

{% include beta.html %}

{{ content }}

</div>
Expand Down
14 changes: 7 additions & 7 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>About</h1>
<div class="card-block">
<h4 class="card-title">Biography</h4>
<p class="card-body">
For those who do not know me, my name is Michael Bateman. Since you’ve probably been searching around on this website for more information about me, you probably have a little knowledge of who I am. I live in Toronto and I go to school at Upper Canada College. I am a trombone player, former hockey player and rower. I also love all things to do with computers and computer science is a favourite. My original sport was hockey, but then in 2015 I had a horrible injury which caused me to be injured for a while and be unable to play. After that, I decided that I would give rowing a try. So for the past 2 years I’ve been rowing at Upper Canada College. If I am not rowing, and not doing school work, you can often find me trying a computer science project out.
For those who do not know me, my name is Michael Bateman. Since you’ve probably been searching around on this website for more information about me, you probably have a little knowledge of who I am. I live in Toronto and I go to school at Upper Canada College. I am a trombone player, former hockey player and rower. I also love all things to do with computers and computer science is a favourite. My original sport was hockey, but then in 2015, I had a horrible injury which caused me to be injured for a while and be unable to play. After that, I decided that I would give rowing a try. For the past 3 years, I have been rowing at Upper Canada College. If I am not rowing, and not doing school work, you can often find me working on a computer-related project.
</p>
</div>
</div>
Expand All @@ -22,7 +22,7 @@ <h4 class="card-title">Biography</h4>
<div class="card-block">
<h4 class="card-title">Experience</h4>
<p class="panel-body">
I am an experienced software beta tester, blogger and food tester. I test prerelease software from Apple, which includes it’s well known software such as iOS 10 and macOS Sierra. I have also tested iOS 8 and 9, and Yosemite and El Capitan. I run my own blog, which you can visit <a href="http://blog.michaelbateman.ca">here</a>. It’s a lot of fun to blog. I also love computer science, and to learn more about that, you should probably visit <a href="/about/computer-science/">my computer science page</a>.
I am an experienced software beta tester, blogger and food tester. I like to test pre-release software from Apple, which includes well-known software such as iOS 11 and macOS High Sierra. I run my own blog <i>(which is currently being redeveloped)</i> at visit <a href="http://blog.michaelbateman.ca">here</a>. I also love computer science, and to learn more about that, please visit <a href="/about/computer-science/">my computer science page</a>.
</p>
</div>
</div>
Expand All @@ -31,9 +31,9 @@ <h4 class="card-title">Experience</h4>

<div class="card">
<div class="card-block">
<h4 class="card-title">Acheivements</h4>
<h4 class="card-title">Achievements</h4>
<p class="panel-body">
I have won some very interesting things and most of them when I played hockey. When I played hockey with the Leaside Flames AA team, I was one of the two MVP's. My rowing so far, has been pretty uneventful. The most success that I have has so far came at The 143th Royal Canadian Henley Regatta, finishing 4th. Other notable finishes include the Head of the Genesee Regatta where my flyweight 4+ came 3rd. I won many music awards as a band. I won two Ontario Band Association gold medals in grade 7, and a OBA gold medal in grade 8. I have also won a gold medal in the grade 8, Upper Canada College Concert Band.
I have won some very interesting things and most of them when I played hockey. When I played hockey with the Leaside Flames AA team, I was one of the two MVPs. My rowing so far has been pretty uneventful. The most success that I have has so far came at The 143rd Royal Canadian Henley Regatta, finishing 4th. Other notable finishes include the Sam and Doug Wells regatta where my flyweight 4+ won the 72kg (lightweight) 4+ event. Playing the trombone, bands that I have been in have achieved a gold standard at competitions. This year, I am part of the Upper Canada College Senior Jazz Band. In Computer Science, I achieved a score of 60/75 on the Junior CCC in 2018(Canadian Computing Contest)
</p>
</div>
</div>
Expand All @@ -42,9 +42,9 @@ <h4 class="card-title">Acheivements</h4>

<div class="card">
<div class="card-block">
<h4 class="card-title">Eduaction</h4>
<h4 class="card-title">Education</h4>
<p class="panel-body">
I am working towards earning my Ontario Secondary School Diploma and my IB Diploma, once I graduate from my high school, Upper Canada College in 2020. I am also working to earn my Duke of Ed Bronze award in six months. In grade 7 at Upper Canada College, I was on the honour roll which means that a student achieves over 80% average.
I am working towards earning my Ontario Secondary School Diploma and my IB Diploma, once I graduate from my high school, Upper Canada College in 2020. I am also working to earn my Duke of Ed Bronze award. In grade 7 at Upper Canada College, I was on the honour roll which means that a student achieves over 80% average.
</p>
</div>
</div>
Expand All @@ -53,7 +53,7 @@ <h4 class="card-title">Eduaction</h4>

<div class="card">
<div class="card-block">
<h4 class="card-title">Intrests</h4>
<h4 class="card-title">Interests</h4>
<p class="panel-body">
<a href="computer-science/">Computer Science</a>, Trombone, <a href="rowing/">Rowing</a>, <a href="hockey/">Hockey</a>, Mathematics, <a href="photography/">Photography</a>, <a href="travel/">Travelling</a>, <a href="http://blog.michaelbateman.ca">Blogging</a> and Airplanes.
</p>
Expand Down
15 changes: 5 additions & 10 deletions computer-science.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>Computer Science</h1>
<div class="card-block">
<h3 class="card-title">About</h3>
<p class="card-text">
Computer science is my favourite subject at school. It is very intresting to learn, and you can do almost anything with computers by programming them.
Computer science is my favourite subject at school. It is very interesting to learn, and you can do almost anything with computers by programming them.
</p>
</div>
</div>
Expand Down Expand Up @@ -50,13 +50,7 @@ <h3 class="card-title">Languages</h3>
Python
</li>
<li>
Java*
</li>
<li>
Elixir*
</li>
<li>
C*
Java
</li>
<li>
Apache Web Server
Expand All @@ -67,8 +61,9 @@ <h3 class="card-title">Languages</h3>
<li>
Git
</li>
<br />
* Still learning...
<li>
AppleScript
</li>
</p>
</div>
</div>
8 changes: 6 additions & 2 deletions contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,16 @@ <h2>
<div class="card">
<div class="card-block">
<h2>
<a href="#" style="color: black;">
<!--<a href="#" style="color: black;">-->
<span class="fa fa-exclamation-triangle fa-lg" style="padding-right: 10px; color: black;"></span> <i>Coming Soon</i>
</a>
<!--</a>-->
</h2>
</div>
</div>

</div>

<br /><br />

<p>Having problems or find a bug? Please email me at <a href="mailto:[email protected]">[email protected]</a>. Thank you!</p>
</div>
42 changes: 30 additions & 12 deletions education.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h1>Education</h1>
<div class="card-block">
<h3 class="card-title">School</h3>
<p class="card-text">
I have gone to two schools, both if them being in Toronto. From sk to grade 6 I went to a Montessori School and from Grade 7 to present, I am going to Upper Canada College. School is very fun, and my favourite subject this year is Computer Science.
I have gone to two schools, both of them being in Toronto. From senior kindergarten to grade 6 I went to a Montessori School and from Grade 7 to present, I am going to Upper Canada College. School is very fun, and my favourite subjects this year are chemistry and geography.
</p>
</div>
</div>
Expand Down Expand Up @@ -43,6 +43,9 @@ <h3 class="card-title">Achievements</h3>
<li>
3rd, Head of the Gennessee
</li>
<li>
Canadian Computing Contest Honour Roll
</li>
</p>
</div>
</div>
Expand All @@ -53,7 +56,7 @@ <h3 class="card-title">Achievements</h3>
<div class="card-block">
<h3 class="card-title">Extra Curricular</h3>
<p class="card-text">
At school, I do a lot more than just academics. I play the trombone in bands, and am on the rowing team.
At school, I do a lot more than just academics. I play the trombone in the Senior Jazz Band and am on the rowing team.
<li>
Grade 7 U-14 Cross Country
</li>
Expand All @@ -69,6 +72,9 @@ <h3 class="card-title">Extra Curricular</h3>
<li>
2016-2017 Junior Varsity Rowing
</li>
<li>
2017-2018 Junior Varsity Rowing
</li>
<li>
Grade 7 Concert Band
</li>
Expand All @@ -79,13 +85,16 @@ <h3 class="card-title">Extra Curricular</h3>
Grade 7 Jazz Band
</li>
<li>
Concert Band (Y1)
Concert Band (grade 8)
</li>
<li>
Symphonic Band (grade 9)
</li>
<li>
Symphonic Band (Y2)
Intermediate Jazz Band (grade 9)
</li>
<li>
Intermediate Jazz Band (Y2)
Senior Jazz Band (grade 10)
</li>
</p>
</div>
Expand All @@ -99,25 +108,34 @@ <h3 class="card-title">Clubs</h3>
<p class="card-text">
I haven't joined too many clubs since a lot of my other time has been used by rowing and bands.
<li>
Digital Media and Computer Science (Y1)
Digital Media and Computer Science (grade 8)
</li>
<li>
College Film (grade 8)
</li>
<li>
College Times (grade 8)
</li>
<li>
iDiv Times (grade 9)
</li>
<li>
College Film (Y1)
Health and Life Saving Club (grade 9)
</li>
<li>
College Times (Y2)
Amnesty International Club (grade 9)
</li>
<li>
iDiv Times (Y2)
Engineering Society (Co-club head, grade 9)
</li>
<li>
Health and Life Saving Club (Y2)
Aviation Club (grade 9 and 10)
</li>
<li>
Amnesty International Club (Y2)
French Club (grade 10)
</li>
<li>
Engineering Society (Co-club head)
Mandarin Club
</li>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion hockey.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>Hockey</h1>
<div class="card-block">
<h3 class="card-title">About</h3>
<p class="card-text">
I played hockey for several years at the AA level, until I was forced to stop due to a sever back injury, when I was hit into the boards. I am considering getting back and possibly playing higher level hockey, if I am still have the skills.
I played hockey for several years at the AA level, until I was forced to stop due to a severe back injury. I no longer play hockey competitively but often still play shinny.
</p>
</div>
</div>
Expand Down
14 changes: 9 additions & 5 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<div class="main">
<h1>Michael Bateman</h1>
<br />
<div class="card-columns" style="padding-bottom: 100px;">
<div class="card-columns">

<div class="card" style="width: 100%;">
<img class="card-img-top" src="images/hockey.jpg" alt="Card image cap" style="height: 100%;width: 100%;">
<div class="card-block">
<h4 class="card-title">Hockey</h4>
<p class="card-text">
I played AA hockey in the GTHL for several years along with select hockey for mostly the Leaside Flames. I enjoyed playing hockey, until I was forced to stop due to severe injuries.
I played AA hockey in the GTHL for several years along with select hockey for mostly the Leaside Flames. I enjoyed playing hockey until I was forced to stop due to severe injuries.
</p>
<a href="{{ site.baseurl }}/about/hockey/" class="btn btn-primary">Learn More &raquo;</a>
</div>
Expand All @@ -24,7 +24,7 @@ <h4 class="card-title">Hockey</h4>
<div class="card-block">
<h4 class="card-title">Rowing</h4>
<p class="card-text">
I currently row at my high school, Upper Canada College. I am in the JV program at UCC, and also row at other clubs in Toronto.
I currently row at my high school, Upper Canada College. I am in the JV program at UCC and also row at other clubs in Toronto.
</p>
<a href="{{ site.baseurl }}/about/rowing/" class="btn btn-primary">Learn More &raquo;</a>
</div>
Expand All @@ -35,7 +35,7 @@ <h4 class="card-title">Rowing</h4>
<div class="card-block">
<h4 class="card-title">Computer Science</h4>
<p class="card-text">
Computer science is very fun and intresting. I currently take computer science at my school as one of my electives.
Computer science is very fun and interesting. I currently take computer science at my school as one of my electives.
</p>
<a href="{{ site.baseurl }}/about/computer-science/" class="btn btn-primary">Learn More &raquo;</a>
</div>
Expand All @@ -46,7 +46,11 @@ <h4 class="card-title">Computer Science</h4>
<div class="card-block">
<h4 class="card-title">Blog</h4>
<p class="card-text">
I run my own personal blog, using Jekyll. You can see my blogging and ranting about things that are of intrest! I also write about current issues that are happening around the world.
I run my own personal blog, using Jekyll. You can see my blogging about things that are of interest! I also write about current issues that are happening around the world.
<br /><br />
<i>
Please note that my blog is currently being updated and is not online
</i>
<br /><br />
Subscribe via <a href="https://blog.michaelbateman.ca/feed.xml" style="color: inherit;"><span class="fa fa-rss fa-lg"></span></a>
</p>
Expand Down
12 changes: 4 additions & 8 deletions js/gtag.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-110997821-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'UA-110997821-1');
</script>
gtag('config', 'UA-110997821-1');
4 changes: 2 additions & 2 deletions travel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h3 class="card-title">Rome, Italy</h3>
<p class="card-text">
<img src="{{ site.baseurl }}/images/rome.jpg">
<br /><br />
I visited Rome, Italy this past summer. We spent 10 days in Rome, 4 days in Florence, and 6 days in Venice. The trip was really fun and one of the highlights of the trip was the Colosseum in Rome. It was really intresting to see the old buildings in Italy, as there are very few to none in Canada
I visited Rome, Italy during the summer of 2016. We spent 10 days in Rome, 4 days in Florence, and 6 days in Venice. The trip was really fun and one of the highlights of the trip was the Colosseum in Rome. It was really interesting to see the old buildings in Italy, as there are very few to none in Canada
</p>
</div>
</div>
Expand All @@ -51,7 +51,7 @@ <h3 class="card-title">Iceland</h3>
<p class="card-text">
<img src="{{ site.baseurl }}/images/iceland.jpg">
<br /><br />
In June of 2014, I travelled to Iceland for 10 days with my previous school. In Iceland, we went whale watching, visited some museums, and went on a fishing boat for a day. The fishing boat was awesome, as we caught many fish, which some we later ate. The fish that we caught on the boat that I was on, was sold the next day at the local market.
In June of 2014, I travelled to Iceland for 10 days with my previous school. In Iceland, we went whale watching, visited some museums, and went on a fishing boat for a day. The fishing boat was awesome, as we caught many fish including some that we later ate and others that were sold the next day at the local market.
</p>
</div>
</div>
9 changes: 9 additions & 0 deletions update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
permalink: /update/
---

{% if site.update == false %}
<script type="text/javascript">
window.location = "/"
</script>
<noscript>
<meta http-equiv="refresh" content="0;URL='/'" />
</noscript>
{% endif %}

<div class="main">
<h1>We're updating...</h1>
<br />
Expand Down

0 comments on commit 9d66c7b

Please sign in to comment.