From d4a7a2a750d5497521f4682ffb668ce98dd43751 Mon Sep 17 00:00:00 2001 From: Yu Heng Su Date: Sat, 17 Apr 2021 18:05:40 -0400 Subject: [PATCH 1/4] Added past teams pageA --- assets/styles/main.css | 1 + content/team/past-teams.json | 63 ++++++++++++++++++++++++++++++++++++ pages/index.vue | 2 +- pages/past-team/index.vue | 61 ++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 content/team/past-teams.json create mode 100644 pages/past-team/index.vue diff --git a/assets/styles/main.css b/assets/styles/main.css index f53364de..0cc63140 100644 --- a/assets/styles/main.css +++ b/assets/styles/main.css @@ -54,6 +54,7 @@ body { font-size: 30px; font-weight: 600; line-height: 1.05; + margin-top: 30px; } .scrolling-wrapper { diff --git a/content/team/past-teams.json b/content/team/past-teams.json new file mode 100644 index 00000000..ca0fb14d --- /dev/null +++ b/content/team/past-teams.json @@ -0,0 +1,63 @@ +{ + "teams": [ + { + "year": "2020-2021", + "members": [ + { + "name": "Alexandra Thompson", + "imgSrc": "/team/AlexThompson.jpg", + "position": "General Manager", + "message": "Alexandra found her passion for working with students in her time as an undergraduate Computer Science teaching assistant. She enjoys conversations on the ups and downs of student life and her experience as an undergraduate. Alexandra loves to share her tips on overcoming struggles in university.", + "discord": "LovecraftsSiren#8059", + "email": "jenniferalexandrathompson@mail.utoronto.ca", + "linkedin": "https://www.linkedin.com/in/jenalexthompson" + }, + { + "name": "Chris Lim", + "imgSrc": "https://avatars1.githubusercontent.com/u/24628243?s=400&u=0edf079732c29b3c8cdd0358a39210d57d301002&v=4", + "position": "Technical Director", + "message": "Chris is our tech lead! He recently finished a CSC492 project where he created a tinder-like application for students to match with school clubs! If you need help with your personal projects or want to learn a new technology, he's your go to man!", + "discord": "Eat My Shuriken#1325", + "email": "christopher.limtungtseung@utoronto.ca", + "linkedin": "https://www.linkedin.com/in/hiimchrislim" + }, + { + "name": "Jessica Anderson", + "imgSrc": "/team/jess.jpg", + "position": "Operations Director", + "message": "Jessica was accepted into UTM as an Accounting Student, but ended up wanting to do Computer Science, so she is ready to tackle any of your POSt questions. She always struggles to choose which courses are most important to take and she's ready to share her findings!", + "discord": "janders#8886", + "email": "jess.anderson@mail.utoronto.ca", + "linkedin": "https://www.linkedin.com/in/jessicaanderson9" + }, + { + "name": "VyVy Ngo", + "imgSrc": "https://avatars.githubusercontent.com/u/45834118?s=460&u=83382baac5f0a500fa99646a4d5899fe391f7328&v=4", + "position": "Student Resource Curator", + "message": "As the student resource curator, VyVy wants to create a welcoming computer science environment by providing students access to any information they need. She has a passion learning and grabs any information within her reach. In her spare time, she enjoys knitting and some Skyrim.", + "discord": "SleepyVyvy#9713", + "email": "vyvy.ngo@mail.utoronto.ca", + "linkedin": "https://www.linkedin.com/in/tuong-vy-n-614b4213b/" + }, + { + "name": "Nameera Azim", + "imgSrc": "/team/Nameera.png", + "position": "Student Culture Coordinator", + "message": "Nameera dedicates her time to connecting with the students within the Computer Science community to learn about what type of support they need and advocating for changes that improve their University experience. Feel free to shoot her message if you want to talk about anything - from internships to Earnest Hemmingway to new Marvel movies.", + "discord": "Nameera#2802", + "email": "nameera.azim@mail.utoronto.ca", + "linkedin": "https://www.linkedin.com/in/nameera-azim-1924a21b6/" + }, + { + "name": "Michael Liut", + "imgSrc": "/team/Michael.png", + "position": "Faculty Advisor", + "message": "Michael is a Computer Science educator who prides himself in fostering an environment of educational excellence through active and experiential learning. In recent years he has assisted in the development and implementation of active learning materials/strategies in several Computer Science courses at UTM. Michael enjoys travelling, and is an avid scuba diver.", + "discord": "Mike's Here#5684", + "email": " michael.liut@utoronto.ca", + "linkedin": "https://www.linkedin.com/in/mliut" + } + ] + } + ] +} diff --git a/pages/index.vue b/pages/index.vue index 9b94284f..77363445 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -101,7 +101,7 @@ export default { }, async asyncData({$axios, $content, params, error}) { const teamDataStore = await $content('team').fetch() - const currentTeam = teamDataStore[0].team + const currentTeam = teamDataStore[1].team const contributors = [] await $axios .$get('https://api.github.com/repos/utm-cssc/website/contributors') diff --git a/pages/past-team/index.vue b/pages/past-team/index.vue new file mode 100644 index 00000000..b05009c7 --- /dev/null +++ b/pages/past-team/index.vue @@ -0,0 +1,61 @@ + + + + + From 35d8908105bc7d35ac82f3eebd30cb32104492ac Mon Sep 17 00:00:00 2001 From: Yu Heng Su Date: Sun, 18 Apr 2021 14:32:30 -0400 Subject: [PATCH 2/4] Added past-team page to nav drawer and fixed some css in course pages --- assets/styles/main.css | 2 ++ components/NavDrawer.vue | 4 ++++ components/global/ExamText.vue | 2 ++ 3 files changed, 8 insertions(+) diff --git a/assets/styles/main.css b/assets/styles/main.css index 0cc63140..e2c71611 100644 --- a/assets/styles/main.css +++ b/assets/styles/main.css @@ -12,6 +12,7 @@ --color-utmsam: #f28b05; --color-dsc: #eb07a3; --color-robotics: #0071db; + --filter-exam-text: brightness(0); --bg: #fff; } @@ -28,6 +29,7 @@ --color-utmsam: #f28b05; --color-dsc: #eb07a3; --color-robotics: #0071db; + --filter-exam-text: brightness(0) invert(1); --bg: rgb(24, 26, 27); } diff --git a/components/NavDrawer.vue b/components/NavDrawer.vue index 2e5ec9a7..95c39143 100644 --- a/components/NavDrawer.vue +++ b/components/NavDrawer.vue @@ -52,6 +52,10 @@ export default { title: 'Contributing', link: '/contributing', }, + { + title: 'Past Team', + link: '/past-team', + }, ], } }, diff --git a/components/global/ExamText.vue b/components/global/ExamText.vue index bed6c273..5a682558 100644 --- a/components/global/ExamText.vue +++ b/components/global/ExamText.vue @@ -43,5 +43,7 @@ a { .icon { width: 36px; height: 36px; + background: none !important; + filter: var(--filter-exam-text); } From 1ebc7f44c5dacbe37af4f48fa0eb563101195b93 Mon Sep 17 00:00:00 2001 From: Chris Lim Date: Tue, 20 Apr 2021 18:35:53 -0400 Subject: [PATCH 3/4] Update NavDrawer.vue --- components/NavDrawer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/NavDrawer.vue b/components/NavDrawer.vue index 95c39143..5c15b6d6 100644 --- a/components/NavDrawer.vue +++ b/components/NavDrawer.vue @@ -53,8 +53,8 @@ export default { link: '/contributing', }, { - title: 'Past Team', - link: '/past-team', + title: 'Past Teams', + link: '/past-teams', }, ], } From 7a2a8f4b8d26419904fde31abcfcca52c55266a4 Mon Sep 17 00:00:00 2001 From: Chris Lim Date: Tue, 20 Apr 2021 18:37:26 -0400 Subject: [PATCH 4/4] Rename pages/past-team/index.vue to pages/past-teams/index.vue --- pages/{past-team => past-teams}/index.vue | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pages/{past-team => past-teams}/index.vue (100%) diff --git a/pages/past-team/index.vue b/pages/past-teams/index.vue similarity index 100% rename from pages/past-team/index.vue rename to pages/past-teams/index.vue