Skip to content

Commit

Permalink
Populate Team Members (#67)
Browse files Browse the repository at this point in the history
* populate the rest of the members

* reorder members to prioritize team leads and people with photos

* adjust spacing for responsiveness

* update the year number to ordinal numbers

* update the rest of tech team

* remove competition's team roster and update finance team

* Prettified Code!

* remove debugging logs

* Prettified Code!

---------

Co-authored-by: IcedTea2K <[email protected]>
  • Loading branch information
IcedTea2K and IcedTea2K authored Jan 9, 2024
1 parent e398501 commit d02997d
Show file tree
Hide file tree
Showing 16 changed files with 403 additions and 46 deletions.
Binary file added src/assets/profile_pictures/Catherine_Zhu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Daniel_Pan.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Enda_Çakmak.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Grace_Wang.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Kendrick_Cooke.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Melanie_Cheng.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Minh_Au.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/Rowel_Sabahat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/profile_pictures/Whitney_Demetriou.heif
Binary file not shown.
Binary file added src/assets/profile_pictures/Whitney_Demetriou.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/empty_male_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profile_pictures/female_empty_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
430 changes: 388 additions & 42 deletions src/components/Member.ts

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion src/components/ProfileCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ const handleImgErr = (e: Event) => {
const target = e.target as HTMLImageElement
target.src = emptyPic
}
const turnOrdinal = (year : number) => {
switch(year % 10) {
case 1:
return year + 'st'
case 2:
return year + 'nd'
case 3:
return year + 'rd'
default:
return year + 'th'
}
}
</script>

<template>
Expand Down Expand Up @@ -58,7 +71,7 @@ const handleImgErr = (e: Event) => {
<div class="flex flex-col items-center content-start gap-0 p-[0.5rem] max-h-full">
<div class="text-lg font-bold text-white">{{ member?.name }}</div>
<div class="text-xs font-normal relative bottom-1">
{{ member?.major }} · {{ member?.year }}th
{{ member?.major }} · {{ turnOrdinal(member?.year) }}
</div>
<p class="text-justify px-[1.6rem] overflow-y-scroll invisible-scroller">
{{ member?.description }}
Expand Down
1 change: 0 additions & 1 deletion src/components/lab-notebook/TableOfContents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ onMounted(() => {
entries.forEach((entry) => {
if (entry.isIntersecting) {
activeElementId.value = entry.target.innerHTML.trim()
console.log(activeElementId.value)
}
})
}
Expand Down
3 changes: 1 addition & 2 deletions src/views/TeamView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const handleClick = (inc: number) => {
finalState.value = inc < 0 ? 'translate-x-full opacity-0' : '-translate-x-full opacity-0'
changingTeam.value = false
}
console.log(initialState)
}
let currTeam: Ref<string> = ref('All')
Expand Down Expand Up @@ -114,7 +113,7 @@ const { isSwiping, direction, lengthX, lengthY } = useSwipe(swipeableContainer,

<!-- Desktop -->
<div
class="hidden min-[866px]:gap-x-[1rem] min-[866px]:py-[2rem] min-[866px]:flex min-[866px]:flex-row lg:gap-x-[3rem]"
class="hidden w-full gap-x-[1rem] min-[866px]:flex min-[866px]:flex-row min-[866px]:justify-center min-[866px]:py-[2rem]"
>
<TransparentButton
v-for="(team, i) in teams"
Expand Down

0 comments on commit d02997d

Please sign in to comment.