From 20982401705050e2b381c3c0baadbe7125e4e7e6 Mon Sep 17 00:00:00 2001 From: zhifan li <64334331+zhifanl@users.noreply.github.com> Date: Sat, 12 Dec 2020 19:37:46 -0700 Subject: [PATCH 01/41] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000000..eecf218279 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +zhifanli.website \ No newline at end of file From 99ba3be8272bed4960291ac20f0b5c3da7d6b7f0 Mon Sep 17 00:00:00 2001 From: zhifan li <64334331+zhifanl@users.noreply.github.com> Date: Sat, 12 Dec 2020 19:47:18 -0700 Subject: [PATCH 02/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index eecf218279..0fdb582520 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -zhifanli.website \ No newline at end of file +www.zhifanli.website \ No newline at end of file From 7d36c0700abffa7d77987a874f24d4ae95f16455 Mon Sep 17 00:00:00 2001 From: zhifan li <64334331+zhifanl@users.noreply.github.com> Date: Sat, 12 Dec 2020 19:47:50 -0700 Subject: [PATCH 03/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 0fdb582520..eecf218279 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.zhifanli.website \ No newline at end of file +zhifanli.website \ No newline at end of file From 4eedf7d5d3bf5147ac90f34d341c0fb1e74e944c Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sat, 12 Dec 2020 21:39:15 -0700 Subject: [PATCH 04/41] Update _config.yml --- _config.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index 34187b8281..cbd58044ad 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ layout: sidebar -style: light +style: dark plugins: - jekyll-octicons @@ -31,11 +31,11 @@ projects: # social_media: # behance: your_username # dribbble: your_username - # facebook: your_username + # facebook: Zhifan Li # hackerrank: your_username - # instagram: your_username + instagram: zhifan.li # keybase: your_username - # linkedin: your_username + linkedin: https://www.linkedin.com/in/zhifan-tom-li-7198331a7/ # mastodon: your_username # medium: your_username # stackoverflow: your_user_id @@ -47,12 +47,14 @@ projects: # youtube: your_username topics: - - name: CSS - web_url: https://github.com/topics/css - image_url: https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/css/css.png + - name: C++ + web_url: https://github.com/topics/cpp + image_url: https://raw.githubusercontent.com/github/explore/80688e429a7d4ef2fca1e82350fe8e3517d3494d/topics/cpp/cpp.png - - name: Web design + - name: Algorithm + web_url: https://github.com/topics/algorithm + image_url: https://d2r55xnwy6nx47.cloudfront.net/uploads/2017/10/StreamAnalysis_2880x1620.jpg - - name: Sass - web_url: https://github.com/topics/sass - image_url: https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/sass/sass.png + - name: HTML + web_url: https://github.com/topics/html + image_url: https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/html/html.png From 3d2ee8d5a6b637d7777e08230b13444b0cb35f80 Mon Sep 17 00:00:00 2001 From: zhifan li <64334331+zhifanl@users.noreply.github.com> Date: Sun, 13 Dec 2020 10:42:00 -0700 Subject: [PATCH 05/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index eecf218279..0fdb582520 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -zhifanli.website \ No newline at end of file +www.zhifanli.website \ No newline at end of file From d4c6513464586a7589526c84cdb7a57df87c5fae Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 12:23:18 -0700 Subject: [PATCH 06/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index cbd58044ad..e29831fb8c 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ layout: sidebar -style: dark +style: light plugins: - jekyll-octicons From bd07f2a13520a7e9e62c3f5a590cf8928d05aff8 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 12:51:27 -0700 Subject: [PATCH 07/41] social_media updated --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index e29831fb8c..e7b72c6914 100644 --- a/_config.yml +++ b/_config.yml @@ -28,7 +28,7 @@ projects: projects: # - repo-name -# social_media: + social_media: # behance: your_username # dribbble: your_username # facebook: Zhifan Li @@ -43,7 +43,7 @@ projects: # twitter: your_username # unsplash: your_username # vk: your_username - # website: http://your_website_url + website: https://zhifanli.website # youtube: your_username topics: From 9efc09e71c5aef33513751fb7fde4aeee06bc476 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 12:55:02 -0700 Subject: [PATCH 08/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index e7b72c6914..0e8bb1300c 100644 --- a/_config.yml +++ b/_config.yml @@ -28,7 +28,7 @@ projects: projects: # - repo-name - social_media: +social_media: # behance: your_username # dribbble: your_username # facebook: Zhifan Li From e209297961a1d5b60b3e99351b45ec0d9651eba1 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 12:58:44 -0700 Subject: [PATCH 09/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 0e8bb1300c..97963b6271 100644 --- a/_config.yml +++ b/_config.yml @@ -43,7 +43,7 @@ social_media: # twitter: your_username # unsplash: your_username # vk: your_username - website: https://zhifanli.website + website: https://www.zhifanli.website # youtube: your_username topics: From 48d031da7b789c4692727f4f95657d17bb7be056 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 12:59:35 -0700 Subject: [PATCH 10/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 97963b6271..5ea369ee78 100644 --- a/_config.yml +++ b/_config.yml @@ -33,7 +33,7 @@ social_media: # dribbble: your_username # facebook: Zhifan Li # hackerrank: your_username - instagram: zhifan.li + instagram: zhifan_li # keybase: your_username linkedin: https://www.linkedin.com/in/zhifan-tom-li-7198331a7/ # mastodon: your_username From 7770b88f88b95a6ad20c05f2a9f05f2031f67937 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 13:03:13 -0700 Subject: [PATCH 11/41] Update _config.yml --- _config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 5ea369ee78..f11fd994ab 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,8 @@ social_media: # hackerrank: your_username instagram: zhifan_li # keybase: your_username - linkedin: https://www.linkedin.com/in/zhifan-tom-li-7198331a7/ + linkedin: https://www.linkedin.com/in/zhifan-tom-li-7198331a7 + # mastodon: your_username # medium: your_username # stackoverflow: your_user_id From 93ec44c8f6e314985f871367e0bc317ebc4e20eb Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 13:05:25 -0700 Subject: [PATCH 12/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index f11fd994ab..9479f054ae 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ social_media: # hackerrank: your_username instagram: zhifan_li # keybase: your_username - linkedin: https://www.linkedin.com/in/zhifan-tom-li-7198331a7 + linkedin: www.linkedin.com/in/zhifan-tom-li-7198331a7 # mastodon: your_username # medium: your_username From d4647ac8725e233580a517fec24e446c9582f86c Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 13:07:36 -0700 Subject: [PATCH 13/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 9479f054ae..afbefec641 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ social_media: # hackerrank: your_username instagram: zhifan_li # keybase: your_username - linkedin: www.linkedin.com/in/zhifan-tom-li-7198331a7 + linkedin: zhifan (tom) li # mastodon: your_username # medium: your_username From e89e46638901d12a06277642caa0a4d01ea46a2b Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 13:23:49 -0700 Subject: [PATCH 14/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index afbefec641..80cfd6bd0f 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ social_media: # hackerrank: your_username instagram: zhifan_li # keybase: your_username - linkedin: zhifan (tom) li + linkedin: zhifan-tom-li-7198331a7 # mastodon: your_username # medium: your_username From 72a50f52f6a5b3aae829fbf07263278941da8882 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 18:17:00 -0700 Subject: [PATCH 15/41] trying to add animation --- _includes/header.html | 4 ++++ _includes/interests.html | 1 + _includes/projects.html | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/_includes/header.html b/_includes/header.html index f69977273a..8ec10a466b 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -29,5 +29,9 @@ + diff --git a/_includes/interests.html b/_includes/interests.html index 65bb047bbe..bd18e9dd49 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,3 +1,4 @@ +

An animated element

My Interests

Topics that I want to learn more about.

diff --git a/_includes/projects.html b/_includes/projects.html index b3263ef310..ed41ffd0c6 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -1,5 +1,5 @@

My Projects

-

GitHub repositories that I've built.

+

GitHub repositories

{% if site.projects.sort_by == 'stars' %} {% assign sort_order = 'stargazers_count', 'last' %} From 105e79aa3713a862e61c8b3c50ea86cc999d6886 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 18:20:48 -0700 Subject: [PATCH 16/41] Update interests.html --- _includes/interests.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/interests.html b/_includes/interests.html index bd18e9dd49..c8915baa96 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,5 +1,6 @@ -

An animated element

-

My Interests

+

+
My Interests
+

Topics that I want to learn more about.

{% for topic in site.topics %} From e592e7fbc42829159ce4636d7c00b9cff0944d45 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 18:28:32 -0700 Subject: [PATCH 17/41] Update interests.html --- _includes/interests.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_includes/interests.html b/_includes/interests.html index c8915baa96..28889f67e2 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,5 +1,9 @@

-
My Interests
+
My Interests + div { + animation-duration: 10s; + } +

Topics that I want to learn more about.

From e0b0574d7a2c593191b0246f111db717fa89bfca Mon Sep 17 00:00:00 2001 From: zhifanl Date: Sun, 13 Dec 2020 18:33:26 -0700 Subject: [PATCH 18/41] animation --- _includes/interests.html | 3 --- _includes/projects.html | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_includes/interests.html b/_includes/interests.html index 28889f67e2..3d66bd53a0 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,8 +1,5 @@

My Interests - div { - animation-duration: 10s; - }

Topics that I want to learn more about.

diff --git a/_includes/projects.html b/_includes/projects.html index ed41ffd0c6..edbc2da711 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -1,4 +1,5 @@ -

My Projects

+

+
My Projects

GitHub repositories

{% if site.projects.sort_by == 'stars' %} From 05d21a6a4903dfa5994f5cac7e8b6e3c7cefcb71 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 09:57:10 -0700 Subject: [PATCH 19/41] css --- assets/styles.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/styles.scss b/assets/styles.scss index 0067f167b3..bd27ddc9db 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -2,7 +2,15 @@ --- @import url('https://unpkg.com/primer/build/build.css'); @import 'highlight-syntax'; - +@import url("219-keyframes.css"); +@import url("219-base.css"); +@import url("219-400.css") all and (min-width: 400px); +@import url("219-800.css") all and (min-width: 800px) and (max-width: 1366px); +@import url("219-1367.css") all and (min-width: 1367px); +@import url("219-1600.css") all and (min-width: 1600px); +@import url("219-fix1.css") all and (min-width: 1367px); +@import url("219-fix2.css") all and (min-width: 1367px); +@import url("219-bg.css") all and (min-width: 400px); // If a user adds a custom font, this component will stop it from bleeding into GitHub components: .github-component { From 58dff95a9885e59c216e7468f28825af1e79b564 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 10:26:20 -0700 Subject: [PATCH 20/41] adding button --- _includes/interests.html | 3 ++- assets/styles.scss | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/_includes/interests.html b/_includes/interests.html index 3d66bd53a0..34f669fa0c 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,4 +1,5 @@ -

+ +Link button

My Interests

diff --git a/assets/styles.scss b/assets/styles.scss index bd27ddc9db..b52a8e7476 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -2,15 +2,8 @@ --- @import url('https://unpkg.com/primer/build/build.css'); @import 'highlight-syntax'; -@import url("219-keyframes.css"); -@import url("219-base.css"); -@import url("219-400.css") all and (min-width: 400px); -@import url("219-800.css") all and (min-width: 800px) and (max-width: 1366px); -@import url("219-1367.css") all and (min-width: 1367px); -@import url("219-1600.css") all and (min-width: 1600px); -@import url("219-fix1.css") all and (min-width: 1367px); -@import url("219-fix2.css") all and (min-width: 1367px); -@import url("219-bg.css") all and (min-width: 400px); +@import "primer-navigation/index.scss"; +@import "primer-buttons/index.scss"; // If a user adds a custom font, this component will stop it from bleeding into GitHub components: .github-component { From d320f4c19263fda1c6003f423fe257aa5fe6df6e Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 10:28:00 -0700 Subject: [PATCH 21/41] . --- assets/styles.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/styles.scss b/assets/styles.scss index b52a8e7476..c5fcf3cc6b 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -2,7 +2,6 @@ --- @import url('https://unpkg.com/primer/build/build.css'); @import 'highlight-syntax'; -@import "primer-navigation/index.scss"; @import "primer-buttons/index.scss"; // If a user adds a custom font, this component will stop it from bleeding into GitHub components: From bdb3e309caa72234bcaaf54d7770f68329514a6e Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 10:33:17 -0700 Subject: [PATCH 22/41] . --- assets/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles.scss b/assets/styles.scss index c5fcf3cc6b..0067f167b3 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -2,7 +2,7 @@ --- @import url('https://unpkg.com/primer/build/build.css'); @import 'highlight-syntax'; -@import "primer-buttons/index.scss"; + // If a user adds a custom font, this component will stop it from bleeding into GitHub components: .github-component { From 4b8df00ade1f4b33d17c350c6f219d3e535e70f3 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 10:37:47 -0700 Subject: [PATCH 23/41] . --- _includes/header.html | 2 ++ _includes/interests.html | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 8ec10a466b..14566ca59d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -33,5 +33,7 @@ rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> + +Link button diff --git a/_includes/interests.html b/_includes/interests.html index 34f669fa0c..3d66bd53a0 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,5 +1,4 @@ - -Link button

+

My Interests

From 93bb9758b1590bdf30450df4d5faf7599bddbdd5 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 10:59:12 -0700 Subject: [PATCH 24/41] . --- assets/styles.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/assets/styles.scss b/assets/styles.scss index 0067f167b3..244777f3e7 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -52,3 +52,11 @@ .min-height-full { min-height: 100vh; } +#btn { + position:relative; + transition: .5s ease; + top: 191px; + left: 420px; + right: -420px; + bottom: -191px; +} From 2e56869a86f00a4eb505e7b9ee8d89e281440d78 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 12:41:52 -0700 Subject: [PATCH 25/41] . --- _includes/interests.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/interests.html b/_includes/interests.html index 3d66bd53a0..bbd6406fb2 100644 --- a/_includes/interests.html +++ b/_includes/interests.html @@ -1,5 +1,5 @@

-
My Interests +
My Interests

Topics that I want to learn more about.

From 4c86ffb261c902a0513592b234bc0933d81a7f41 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:20:00 -0700 Subject: [PATCH 26/41] . --- _config.yml | 1 + _includes/courses.html | 209 ++++++++++++++++++++++++++++++++++++++++ _includes/header.html | 1 - _includes/projects.html | 2 +- 4 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 _includes/courses.html diff --git a/_config.yml b/_config.yml index 80cfd6bd0f..84c5570ac4 100644 --- a/_config.yml +++ b/_config.yml @@ -59,3 +59,4 @@ topics: - name: HTML web_url: https://github.com/topics/html image_url: https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/html/html.png +courses: diff --git a/_includes/courses.html b/_includes/courses.html new file mode 100644 index 0000000000..35f00f331d --- /dev/null +++ b/_includes/courses.html @@ -0,0 +1,209 @@ +

+
Courses I have taken +
+

+

Topics that I want to learn more about.

+
+ {% for topic in site.topics %} +
+ {% include topic-card.html %} +
+ {% endfor %} +
+ + + + + + + + + + + + + + + + + Courses + + + + + +
+ +
+
+

Courses

+
+

+ I've completed my bachelors in software engineering at the University of Calgary and have moved + on to a masters in neuroscience at Western University. I've transitioned into neuroscience + because I want to learn more about the brain to build artificial general intelligence. More information + about my motivation to switch fields can be found + here. Hover over a course to see its title. +

+
+
+ +
+
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Year 1 (2015 - 2016)
FALL 2015WINTER 2016SPRING 2016SUMMER 2016
ENGG 200ENGG 201ENGG 209ENGG 319
ENGG 233ENGG 202ENGG 481COMS 363
MATH 211ENGG 225MATH 271
MATH 275MATH 277
CHEM 209PHYS 259
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Year 2 (2016 - 2017)
FALL 2016WINTER 2017SPRING 2017SUMMER 2017
ENEL 353ENEL 327CPSC 457
ENCM 339ENCM 369CPSC 471
MATH 375CPSC 319 + ENGG 513
PHYS + 365ENSF 409
PHIL 279
+ + +
+
+
+ +
+

+ Back to Top +

+
+ + + + + + \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index 14566ca59d..3082ae6bf1 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -33,7 +33,6 @@ rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> - Link button diff --git a/_includes/projects.html b/_includes/projects.html index edbc2da711..71b3941aa7 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -1,5 +1,5 @@

-
My Projects

+
My Projects

GitHub repositories

{% if site.projects.sort_by == 'stars' %} From 93d83577141cca199dccfabd417ce8deec9fe929 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:25:39 -0700 Subject: [PATCH 27/41] Update _config.yml --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 84c5570ac4..6a4bf415ff 100644 --- a/_config.yml +++ b/_config.yml @@ -60,3 +60,4 @@ topics: web_url: https://github.com/topics/html image_url: https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/html/html.png courses: + \ No newline at end of file From e124f8edb41d03e3eed1995c2d66937dd7610d92 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:31:08 -0700 Subject: [PATCH 28/41] . --- _includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/header.html b/_includes/header.html index 3082ae6bf1..44536f7c5c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -33,6 +33,6 @@ rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> -Link button +Courses I have taken From 3ae5c47f878d03d4f01fcaded11608ce6d210433 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:35:20 -0700 Subject: [PATCH 29/41] . --- _includes/courses.html | 5 +++++ _includes/header.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/_includes/courses.html b/_includes/courses.html index 35f00f331d..e7dfd8ac65 100644 --- a/_includes/courses.html +++ b/_includes/courses.html @@ -1,3 +1,8 @@ +--- +layout: default +--- + +

Courses I have taken
diff --git a/_includes/header.html b/_includes/header.html index 44536f7c5c..6dccc2f1ed 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -33,6 +33,6 @@ rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> -Courses I have taken +Courses I have taken From 92ee06ee87a8fb6f01c117a6d1f2802f8b4631cc Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:39:14 -0700 Subject: [PATCH 30/41] . --- _includes/header.html | 2 +- _includes/{ => http:/zhifanli.website}/courses.html | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename _includes/{ => http:/zhifanli.website}/courses.html (100%) diff --git a/_includes/header.html b/_includes/header.html index 6dccc2f1ed..7350c8d241 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -33,6 +33,6 @@ rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> -Courses I have taken +Courses I have taken diff --git a/_includes/courses.html b/_includes/http:/zhifanli.website/courses.html similarity index 100% rename from _includes/courses.html rename to _includes/http:/zhifanli.website/courses.html From f8d83bd4121f75cb534af2585789de642fa21950 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:43:29 -0700 Subject: [PATCH 31/41] . --- _includes/.DS_Store | Bin 0 -> 6148 bytes .../{http:/zhifanli.website => }/courses.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 _includes/.DS_Store rename _includes/{http:/zhifanli.website => }/courses.html (100%) diff --git a/_includes/.DS_Store b/_includes/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 15 Dec 2020 13:46:57 -0700 Subject: [PATCH 32/41] . --- _layouts/home.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_layouts/home.html b/_layouts/home.html index 967fe115c1..7f110f4e63 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -39,7 +39,7 @@ {% endunless %} {% include projects.html %} - + {% if site.topics %} {% include interests.html %} {% endif %} @@ -47,6 +47,7 @@ {% unless posts_total == 0 %} {% include thoughts.html %} {% endunless %} + {% include courses.html %}

From 65b96161a8ca588f66c0ce7939b419b8c4645620 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 13:59:15 -0700 Subject: [PATCH 33/41] . --- _includes/courses.html | 72 +++++------------------------------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/_includes/courses.html b/_includes/courses.html index e7dfd8ac65..2ef7513e15 100644 --- a/_includes/courses.html +++ b/_includes/courses.html @@ -1,76 +1,21 @@ ---- -layout: default ---- - - -

-
Courses I have taken -
-

-

Topics that I want to learn more about.

-
- {% for topic in site.topics %} -
- {% include topic-card.html %} -
- {% endfor %} -
- - - - - - - - + - - Courses - - -
- -
+ +

+
Courses I have taken +
+

+

Courses

@@ -78,8 +23,7 @@

Courses

I've completed my bachelors in software engineering at the University of Calgary and have moved on to a masters in neuroscience at Western University. I've transitioned into neuroscience because I want to learn more about the brain to build artificial general intelligence. More information - about my motivation to switch fields can be found - here. Hover over a course to see its title. + about my motivation to switch fields can be found

From 531765d87cad0522ae201a4a626642d7f14ceb0b Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 14:14:01 -0700 Subject: [PATCH 34/41] . --- _includes/courses.html | 51 ++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/_includes/courses.html b/_includes/courses.html index 2ef7513e15..c6e8f03cb2 100644 --- a/_includes/courses.html +++ b/_includes/courses.html @@ -20,10 +20,7 @@

Courses

- I've completed my bachelors in software engineering at the University of Calgary and have moved - on to a masters in neuroscience at Western University. I've transitioned into neuroscience - because I want to learn more about the brain to build artificial general intelligence. More information - about my motivation to switch fields can be found + Here are the courses I have taken

@@ -34,7 +31,7 @@

Courses

@@ -44,33 +41,33 @@
- + - - - - + + + + - - - + + + - - + + - + @@ -79,7 +76,7 @@
- + @@ -89,26 +86,26 @@
Year 1 (2015 - 2016)Year 1 (2019 - 2020)
FALL 2015WINTER 2016SPRING 2016SUMMER 2016FALL 2019WINTER 2020SPRING 2020SUMMER 2020
ENGG 200ENGG 201ENGG 209ENGG 319CHEM 209ENSF 337MATH 271
ENGG 233 ENGG 202ENGG 481COMS 363
MATH 211 ENGG 225 MATH 271
MATH 275
CHEM 209ENGG 201 PHYS 259
- + - - - - + + + + - + - + - + @@ -126,8 +123,8 @@
- - + + From 423637b87685b5e661ca2a8926dd27263d4cb7ad Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 14:19:24 -0700 Subject: [PATCH 35/41] . --- _includes/courses.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/_includes/courses.html b/_includes/courses.html index c6e8f03cb2..11ccb959b0 100644 --- a/_includes/courses.html +++ b/_includes/courses.html @@ -10,17 +10,12 @@ - -

-
Courses I have taken -
-

-

Courses

+

Courses

- Here are the courses I have taken + Here are the courses I have taken and planning to take.

@@ -111,8 +106,7 @@
- + From 633709326062bcbfe767df68859965914220cd5b Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 14:24:45 -0700 Subject: [PATCH 36/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 6a4bf415ff..49dfbede83 100644 --- a/_config.yml +++ b/_config.yml @@ -54,7 +54,7 @@ topics: - name: Algorithm web_url: https://github.com/topics/algorithm - image_url: https://d2r55xnwy6nx47.cloudfront.net/uploads/2017/10/StreamAnalysis_2880x1620.jpg + image_url:https://pandorafms.com/blog/wp-content/uploads/2018/05/what-is-an-algorithm-featured.png - name: HTML web_url: https://github.com/topics/html From 106140cae9bdf1e01b4107312fcad232820a0c89 Mon Sep 17 00:00:00 2001 From: zhifanl Date: Tue, 15 Dec 2020 14:25:54 -0700 Subject: [PATCH 37/41] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 49dfbede83..b416a8bdee 100644 --- a/_config.yml +++ b/_config.yml @@ -54,7 +54,7 @@ topics: - name: Algorithm web_url: https://github.com/topics/algorithm - image_url:https://pandorafms.com/blog/wp-content/uploads/2018/05/what-is-an-algorithm-featured.png + image_url: https://pandorafms.com/blog/wp-content/uploads/2018/05/what-is-an-algorithm-featured.png - name: HTML web_url: https://github.com/topics/html From 0a9e8fd0760e710cde30d7ee513d35f755caceb9 Mon Sep 17 00:00:00 2001 From: Zhifan Li <64334331+zhifanl@users.noreply.github.com> Date: Mon, 28 Dec 2020 11:38:16 -0700 Subject: [PATCH 38/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 0fdb582520..eecf218279 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.zhifanli.website \ No newline at end of file +zhifanli.website \ No newline at end of file From 6fd7d841c903e61cebc4eaab459a2cadfe355d18 Mon Sep 17 00:00:00 2001 From: Zhifan Li <64334331+zhifanl@users.noreply.github.com> Date: Mon, 28 Dec 2020 11:40:33 -0700 Subject: [PATCH 39/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index eecf218279..0fdb582520 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -zhifanli.website \ No newline at end of file +www.zhifanli.website \ No newline at end of file From 4d1dd0ced0a0870fed00b853895fa65ce3de3182 Mon Sep 17 00:00:00 2001 From: Zhifan Li <64334331+zhifanl@users.noreply.github.com> Date: Wed, 30 Dec 2020 00:20:39 -0700 Subject: [PATCH 40/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 0fdb582520..eecf218279 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.zhifanli.website \ No newline at end of file +zhifanli.website \ No newline at end of file From 0841db94a10872c4f77d6960ae17e7d424dd949b Mon Sep 17 00:00:00 2001 From: Zhifan Li <64334331+zhifanl@users.noreply.github.com> Date: Wed, 30 Dec 2020 00:21:06 -0700 Subject: [PATCH 41/41] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index eecf218279..0fdb582520 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -zhifanli.website \ No newline at end of file +www.zhifanli.website \ No newline at end of file
Year 2 (2016 - 2017)Year 2 (2020 - 2021)
FALL 2016WINTER 2017SPRING 2017SUMMER 2017FALL 2020WINTER 2021SPRING 2021SUMMER 2021
ENEL 353 ENEL 327CPSC 457
ENCM 339ENGG 319 ENCM 369CPSC 471
PHIL 279ECON 201ENGG 481
MATH 375 CPSC 319 - ENGG 513