Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Teams Page again #487

Merged
merged 22 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* tslint:disable */

/**
* Mock Service Worker (2.0.2).
* Mock Service Worker (2.0.9).
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 frontend/src/assets/team/members/ada-hamosh.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added frontend/src/assets/team/members/chris-chute.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 removed frontend/src/assets/team/members/craig-mcnamara.jpg
Binary file not shown.
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 frontend/src/assets/team/members/daniel-keith.jpg
Binary file not shown.
Binary file not shown.
Binary file removed frontend/src/assets/team/members/deepak-unni.jpg
Binary file not shown.
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 frontend/src/assets/team/members/eric-douglass.jpg
Binary file not shown.
Binary file added frontend/src/assets/team/members/eric-hurwitz.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 not shown.
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 frontend/src/assets/team/members/heidi-rehm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 frontend/src/assets/team/members/jeremy-espino.jpg
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/team/members/justin-reese.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 frontend/src/assets/team/members/katie-mullen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 frontend/src/assets/team/members/kent-shefchek.jpg
Binary file not shown.
Binary file removed frontend/src/assets/team/members/lilly-winfree.jpg
Diff not rendered.
Binary file added frontend/src/assets/team/members/megan-kraus.jpg
Binary file removed frontend/src/assets/team/members/michael-davis.jpg
Diff not rendered.
Binary file modified frontend/src/assets/team/members/nicole-vasilevsky.jpg
Diff not rendered.
Binary file removed frontend/src/assets/team/members/pilar-cacheiro.jpg
Diff not rendered.
Binary file modified frontend/src/assets/team/members/sebastian-kohler.jpg
Binary file modified frontend/src/assets/team/members/seth-carbon.jpg
Binary file added frontend/src/assets/team/members/shawn-oneil.jpg
Binary file removed frontend/src/assets/team/members/suzanna-lewis.jpg
Diff not rendered.
Binary file removed frontend/src/assets/team/members/tim-putman.jpg
Diff not rendered.
Diff not rendered.
Binary file removed frontend/src/assets/team/members/vida-ravanmehr.jpg
Diff not rendered.
Binary file removed frontend/src/assets/team/members/zhou-joe-yuan.jpg
Diff not rendered.
6 changes: 4 additions & 2 deletions frontend/src/components/AppMember.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<template>
<AppLink :to="link || ''" class="member">
<div class="image">
<img class="portrait" :src="src" :alt="name" loading="lazy" />
<div v-if="!noImage" class="image">
<img class="portrait" :src="src" alt="" loading="lazy" />
</div>
<div class="text">
<div class="name">{{ name }}</div>
Expand All @@ -25,6 +25,8 @@ type Props = {
role?: string;
/** link to bio */
link?: string;
/** hide image */
noImage?: true;
};

const props = defineProps<Props>();
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/AppPredicateBadge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const arrowDirection = computed(() =>
? "up"
: "left"
: props.vertical
? "down"
: "right",
? "down"
: "right",
);
</script>

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/AppTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ const widths = computed((): string =>
col.slot === "divider"
? "20px"
: expanded.value
? `minmax(max-content, 99999px)`
: `${col.width || 1}fr`,
? `minmax(max-content, 99999px)`
: `${col.width || 1}fr`,
)
.join(" "),
);
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/about/PageTeam.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
{{ group.name }}
</AppHeading>
<AppGroup :name="group.name" :link="group.link" />
<AppGallery :cols="group.name.includes('Alumni') ? 5 : 4">
<AppGallery :cols="group.name.includes('Alumni') ? 6 : 4">
<template v-if="!group.type">
<AppMember
v-for="(member, memberIndex) in group.members"
:key="memberIndex"
:name="member.name"
:role="'role' in member ? member.role : ''"
:link="member.link"
:link="'link' in member ? member.link : ''"
:no-image="group.name.includes('Alumni') ? true : undefined"
/>
</template>
<template v-else>
Expand Down
Loading