diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 25b10aa..7ec9ec5 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -5,19 +5,15 @@ interface CardProps { image?: string title: string name: string - address?: string - phone?: string - email?: string + institution: string } -const Card: React.FC = ({ position, image, title, name, address, phone, email }) => { +const Card: React.FC = ({ position, image, title, name, institution }) => { // strip 'public/' from the avatar string since astro's public folder is available without this in the link const link = image?.replace("/public", "") return (
{image && (
@@ -28,20 +24,12 @@ const Card: React.FC = ({ position, image, title, name, address, phon />
)} -
-
-

{name}

-

{title}

-
-
- {address &&

{address}

} - {phone &&

{phone}

} - {email && ( - - {email} - - )} -
+
+ + {name} + +

{title}

+

{institution}

) diff --git a/src/components/CardContainer.astro b/src/components/CardContainer.astro index e05a285..6f85a1e 100644 --- a/src/components/CardContainer.astro +++ b/src/components/CardContainer.astro @@ -7,9 +7,7 @@ interface PersonProps { title: string name: string avatar?: string - email?: string - address?: string - phone?: string + institution: string } } --- @@ -22,13 +20,12 @@ interface PersonProps { return ( <> ) diff --git a/src/components/DownloadModal.tsx b/src/components/DownloadModal.tsx index dc05679..d9bbf72 100644 --- a/src/components/DownloadModal.tsx +++ b/src/components/DownloadModal.tsx @@ -44,12 +44,18 @@ const DownloadModal: React.FC = ({ filesToDownload }) => { onClick={() => setIsOpen(false)} /> - -
- - - Close - + +
+
+ + + Close + +
+ Download Data +

+ By downloading these data, you agree to the usage guidelines +

Download Data:

{message}

diff --git a/src/components/HeaderLink.astro b/src/components/HeaderLink.astro index d8c310a..4ec5a21 100644 --- a/src/components/HeaderLink.astro +++ b/src/components/HeaderLink.astro @@ -14,8 +14,9 @@ const isActive = href === pathname || href === "/" + subpath?.[0] href={href} class:list={[ className, + "hover:underline underline-offset-8", { - "text-neutral-900 font-semibold hover:text-gray-600 underline underline-offset-8": isActive, + "text-neutral-900 font-semibold underline": isActive, }, ]} {...props} diff --git a/src/content/config.ts b/src/content/config.ts index ca4ecb9..488de75 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -30,9 +30,7 @@ const people = defineCollection({ name: z.string(), title: z.string(), avatar: z.string().optional(), - email: z.string().optional(), - phone: z.string().optional(), - address: z.string().optional(), + institution: z.string(), }), }) export const collections = { news: news, data: files, people: people } diff --git a/src/content/people/advisor.md b/src/content/people/advisor.md index b1db9f6..317bbc4 100644 --- a/src/content/people/advisor.md +++ b/src/content/people/advisor.md @@ -3,12 +3,7 @@ type: Leadership name: David Lindstrom title: Advisor avatar: /public/images/david-lindstrom-1-.jpg -org: Brown University -address: |- - 206 Maxcy Hall - Providence, Rhode Island 02912-1916 -phone: (401) 863-3765 -email: David_Lindstrom@Brown.edu +institution: Brown University startDate: "2024" endDate: "2024" --- diff --git a/src/content/people/co-director-1.md b/src/content/people/co-director-1.md index fafa9e4..701dcc7 100644 --- a/src/content/people/co-director-1.md +++ b/src/content/people/co-director-1.md @@ -3,10 +3,7 @@ type: Leadership name: Douglas S. Massey title: Co-Director avatar: /public/images/douglasmassey.jpeg -org: Princeton University -address: Princeton, NJ 08544 -phone: 609-258-4949 -email: dmassey@princeton.edu +institution: Princeton University startDate: "2024" endDate: "2024" --- diff --git a/src/content/people/co-director.md b/src/content/people/co-director.md index 362f441..79ce962 100644 --- a/src/content/people/co-director.md +++ b/src/content/people/co-director.md @@ -3,13 +3,7 @@ type: Leadership name: Jorge Durand Arp-Nisen title: Co-Director avatar: /public/images/jorgedurand.jpg -org: Universidad de Guadalajara -address: |- - Av. Maestros y Alcalde, Puerta Num. 1 - Guadalajara, CP 44269 - Jalisco, México -phone: 333-819-3327 -email: j.durand.mmp@gmail.com +institution: Universidad de Guadalajara startDate: "2024" endDate: "2024" --- diff --git a/src/content/people/data-entry-specialist.md b/src/content/people/data-entry-specialist.md index 695d5f3..1ef7321 100644 --- a/src/content/people/data-entry-specialist.md +++ b/src/content/people/data-entry-specialist.md @@ -3,13 +3,7 @@ type: Supporting Staff name: Verónica Lozano title: Data Entry Specialist avatar: /public/images/vero.jpg -org: Universidad de Guadalajara -address: |- - Av. Maestros y Alcalde, Puerta Num. 1 - Guadalajara, CP 44269 - Jalisco, México -phone: 011-52-333-819-3327 -email: "" +institution: Universidad de Guadalajara startDate: "2024" endDate: "2024" --- diff --git a/src/content/people/professor-and-researcher-sni-nivel-iii.md b/src/content/people/professor-and-researcher-sni-nivel-iii.md index 3657534..bd5ef35 100644 --- a/src/content/people/professor-and-researcher-sni-nivel-iii.md +++ b/src/content/people/professor-and-researcher-sni-nivel-iii.md @@ -3,12 +3,7 @@ type: Advisors name: M. Patricia Arias title: Professor and Researcher (SNI nivel III) avatar: /public/images/patricia-arias.jpg -org: Universidad de Guadalajara -address: |- - Argentina 374. C.P. 44160, - Guadalajara, Jalisco, Mexico -phone: 113-826-1499 -email: mparias@princeton.edu +institution: Universidad de Guadalajara startDate: "2024" endDate: "2024" --- diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index df0cae8..cef9be7 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -15,7 +15,7 @@ const { title, description, lede } = Astro.props - +
diff --git a/src/pages/people.astro b/src/pages/people.astro index c153eb6..71f1433 100644 --- a/src/pages/people.astro +++ b/src/pages/people.astro @@ -6,6 +6,7 @@ const people = await getCollection("people") const leadership = people.filter((person) => person.data.type === "Leadership") const advisors = people.filter((person) => person.data.type === "Advisors") const support = people.filter((person) => person.data.type === "Supporting Staff") +console.log(people) --- diff --git a/src/styles/global.css b/src/styles/global.css index ea33692..2c0ce53 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -33,7 +33,7 @@ @apply text-2xl; } - p { + p, a { @apply text-xl; @apply text-neutral-700; } @@ -52,24 +52,24 @@ @apply bg-white; @apply rounded-full; @apply shadow-inner; - @apply w-60; - @apply flex; - @apply items-center; + @apply min-w-60; @apply py-5; @apply px-8; } - - input[placeholder] { + + input::placeholder { @apply text-neutral-300; } + input:focus { + @apply outline-none; + @apply shadow-inner-focus; + } + input.disabled, select.disabled { @apply bg-gray; } - input:focus { - @apply shadow-inner-focus; - } nav { @apply flex; @@ -78,13 +78,6 @@ @apply uppercase; } - main { - @apply flex; - @apply flex-col; - @apply items-center; - @apply gap-6; - } - header { @apply flex; @apply justify-between; diff --git a/tailwind.config.js b/tailwind.config.js index 22b8258..b288748 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -118,6 +118,8 @@ module.exports = { lg: "0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1)", xl: "0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1)", "2xl": "0 25px 50px -12px rgb(0 0 0 / 0.25)", + "book-shadow": + "4px 4px 12px 4px rgba(167, 153, 139, 0.35), 12px 12px 4px 0px rgba(167, 153, 139, 0.35);", inner: "-1px -1px 4px 0px rgba(167, 153, 139, 0.35) inset, 1px 1px 4px 0px rgba(167, 153, 139, 0.35) inset", "inner-focus":