Pass charity data to charity page

common/charity.ts

@@ -1,4 +1,14 @@
-export const charities = [
+export interface Charity {
+  slug: string // Note, slugs double as charity IDs
+  name: string
+  website: string
+  ein: string
+  photo: string
+  blurb: string
+  raised?: number
+}
+
+export const charities: Charity[] = [
   {
     name: 'Faunalytics',
     website: 'https://faunalytics.org/',

web/components/charity/charity-card.tsx

@@ -1,23 +1,9 @@
 import Link from 'next/link'
+import { Charity } from '../../../common/charity'
 import { Row } from '../layout/row'
 
-// TODO: type probably belongs elsewhere
+export function CharityCard(props: { charity: Charity }) {
-export interface Charity {
+  const { name, slug, photo, raised, blurb } = props.charity
-  slug: string // Note, slugs double as charity IDs
-  name: string
-  website: string
-  ein: string
-  photo?: string
-  blurb: string
-  raised: number
-}
-
-interface Props {
-  charity: Charity
-}
-
-export default function Card({ charity }: Props) {
-  const { name, slug, photo, raised, blurb } = charity
 
   return (
     <Link href={`/charity/${slug}`} passHref>
@@ -29,7 +15,7 @@ export default function Card({ charity }: Props) {
           <h3 className="card-title line-clamp-3">{name}</h3>
           <div className="line-clamp-4 text-sm text-gray-100">{blurb}</div>
           <Row className="mt-4 items-end justify-center gap-1 text-green-300">
-            <span className="text-3xl">${Math.floor(raised / 100)}</span>
+            <span className="text-3xl">${Math.floor((raised ?? 0) / 100)}</span>
             <span>raised</span>
           </Row>
         </div>

web/pages/charity/[charitySlug].tsx

@@ -1,34 +1,39 @@
 import clsx from 'clsx'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
-import { Charity } from '../../../components/charity/charity-card'
+import { Col } from '../../components/layout/col'
-import { Col } from '../../../components/layout/col'
+import { Row } from '../../components/layout/row'
-import { Row } from '../../../components/layout/row'
+import { Page } from '../../components/page'
-import { Page } from '../../../components/page'
+import { Title } from '../../components/title'
-import { Title } from '../../../components/title'
+import { BuyAmountInput } from '../../components/amount-input'
-import { BuyAmountInput } from '../../../components/amount-input'
+import { Spacer } from '../../components/layout/spacer'
-import { Spacer } from '../../../components/layout/spacer'
+import { User } from '../../../common/user'
-import { User } from '../../../../common/user'
+import { useUser } from '../../hooks/use-user'
-import { useUser } from '../../../hooks/use-user'
+import { Linkify } from '../../components/linkify'
-import { Linkify } from '../../../components/linkify'
+import { transact } from '../../lib/firebase/api-call'
-import { transact } from '../../../lib/firebase/api-call'
+import { charities, Charity } from '../../../common/charity'
+import { useRouter } from 'next/router'
+import Custom404 from '../404'
 
 const manaToUSD = (mana: number) =>
   (mana / 100).toLocaleString('en-US', { style: 'currency', currency: 'USD' })
 
-// TODO: replace with props
+export default function CharityPageWrapper() {
-const data: Charity = {
+  const router = useRouter()
-  name: 'QRI',
+  const { charitySlug } = router.query as { charitySlug: string }
-  slug: 'qri',
+
-  website: 'https://www.google.com',
+  const charity = charities.find(
-  ein: '123456789',
+    (c) => c.slug.toLowerCase() === charitySlug?.toLowerCase()
-  photo: 'https://placekitten.com/200/200',
+  )
-  blurb:
+  if (!router.isReady) return <></>
-    'Lorem Ipsum is simply dummy text of Lorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text ofLorem Ipsum isLorem Ipsum is simply dummy text ofLorem Ipsum is simply dummy text of simply dummy text ofummy text of ',
+  if (!charity) {
-  raised: 23450,
+    return <Custom404 />
+  }
+  return <CharityPage charity={charity} />
 }
 
-export default function CharityPage() {
+function CharityPage(props: { charity: Charity }) {
-  const { name, photo, blurb } = data
+  const { charity } = props
+  const { name, photo, blurb } = charity
 
   // TODO: why not just useUser inside Donation Box rather than passing in?
   const user = useUser()
@@ -41,7 +46,7 @@ export default function CharityPage() {
           {/* TODO: donations over time chart */}
           <Row className="justify-between">
             {photo && <img src={photo} alt="" className="w-40 rounded-2xl" />}
-            <Details userDonated={4} numSupporters={1} />
+            <Details charity={charity} userDonated={4} numSupporters={1} />
           </Row>
           <h2 className="mt-7 mb-2 text-xl text-indigo-700">About</h2>
           <Blurb text={blurb} />
@@ -84,13 +89,17 @@ function Blurb({ text }: { text: string }) {
   )
 }
 
-function Details(props: { userDonated?: number; numSupporters: number }) {
+function Details(props: {
-  const { userDonated, numSupporters } = props
+  charity: Charity
-  const { raised, website } = data
+  userDonated?: number
+  numSupporters: number
+}) {
+  const { charity, userDonated, numSupporters } = props
+  const { raised, website } = charity
   return (
     <Col className="gap-1 text-right">
       <div className="text-primary mb-2 text-4xl">
-        {manaToUSD(raised)} raised
+        {manaToUSD(raised ?? 0)} raised
       </div>
       {userDonated && (
         <div className="text-primary text-xl">

web/pages/charity/index.tsx

@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { useState, useMemo } from 'react'
 import { charities as charityList } from '../../../common/charity'
-import Card from '../../components/charity/charity-card'
+import { CharityCard } from '../../components/charity/charity-card'
 import { Col } from '../../components/layout/col'
 import { Page } from '../../components/page'
 import { Title } from '../../components/title'
@@ -39,7 +39,7 @@ export default function Charity() {
         <div className="grid max-w-xl grid-flow-row grid-cols-1 gap-3 lg:max-w-full lg:grid-cols-2 xl:grid-cols-3">
           {filterCharities.map((charity) => (
             <div key={charity.name}>
-              <Card charity={charity} />
+              <CharityCard charity={charity} />
             </div>
           ))}
         </div>