Merge branch 'development' into 133-reflect-tabs-and-filters-in-url

.github/workflows/node.js.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      - run: npm install prettier @trivago/prettier-plugin-sort-imports
+      - run: npm install prettier@3.1 @trivago/prettier-plugin-sort-imports@4.3
       - run: npx prettier --check '**/*.{ts,tsx,json,html,css}'
 
   test-e2e:

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2022 PlanetScale
+Initial commit: Copyright (c) 2022 PlanetScale
+Later commits: Copyright (c) 2022 Good Exchange, PBC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

components/comment/addCommentForm.tsx

@@ -67,6 +67,7 @@ export function AddCommentForm({
             onChange={field.onChange}
             onTriggerSubmit={handleSubmit(onSubmit)}
             placeholder="Type your comment here."
+            name="content"
             minRows={4}
             data-testid={`comment-form-${category}`}
             required

components/comment/addReplyForm.tsx

@@ -64,10 +64,11 @@ export function AddReplyForm({
             value={field.value}
             onChange={field.onChange}
             onTriggerSubmit={handleSubmit(onSubmit)}
-            required
             placeholder="Reply"
+            name="content"
             minRows={4}
             autoFocus
+            required
           />
         )}
       />

components/comment/editCommentForm.tsx

@@ -65,10 +65,11 @@ export function EditCommentForm({
             value={field.value}
             onChange={field.onChange}
             onTriggerSubmit={handleSubmit(onSubmit)}
-            required
             placeholder="Comment"
+            name="content"
             minRows={4}
             autoFocus
+            required
           />
         )}
       />

components/likeButton.tsx

@@ -117,7 +117,7 @@ export function LikeButton({
     </Button>
   )
   if (disabled) {
-    button = button = (
+    button = (
       <div className="inline-flex items-center justify-center font-semibold px-3 h-8 text-xs sm:px-4 sm:text-sm sm:h-button space-x-1.5">
         {content}
       </div>

components/navbar.tsx

@@ -122,13 +122,6 @@ export const Navbar = ({
         icon={IconLifebuoy}
       />
     </div>
-    <Image
-      src="https://www.facebook.com/tr?id=144902331947551&ev=PageView&noscript=1"
-      alt=""
-      height={1}
-      width={1}
-      unoptimized
-    />
     <div>
       <User />
     </div>

components/welcome/heroText.tsx

@@ -1,6 +1,5 @@
 import { Tooltip } from '@/lib/mantine'
 
-import { buttonClasses } from '../button'
 import { ButtonLink } from '../buttonLink'
 
 export function HeroText() {
@@ -16,32 +15,23 @@ export function HeroText() {
 
         <div className="my-8 mx-auto text-lg text-center prose">
           <p>
-            The{' '}
-            <Tooltip label="Yelp … publishes crowd-sourced reviews about businesses. —Wikipedia">
-              <span className="hint">Yelp</span>
+            <Tooltip label="AngelList allows newbie angel investors to follow seasoned angel investors">
+              <span className="hint">AngelList</span>
             </Tooltip>{' '}
-            for charities: Find or{' '}
-            <span className="text-highlight">promote</span> the best AI safety
-            projects.
-            <br />
-            <span className="text-highlight">
-              Regrant $600,000 from almost 50 donors.
-            </span>
+            for philanthropy: Follow expert grantmakers with your donations.
           </p>
         </div>
 
         <div className="inline-flex flex-wrap gap-1 justify-center">
           <ButtonLink href="/projects" variant="highlight">
             Explore the projects
           </ButtonLink>
-          <a
-            href="https://airtable.com/shr1eRlbcr43os6SX"
-            className={buttonClasses({ variant: 'primary' })}
-            target="_blank"
-            rel="noreferrer"
+          <ButtonLink
+            className="mr-2"
+            href="https://impactmarkets.substack.com/"
           >
-            Proclaim your interest
-          </a>
+            Read the blog
+          </ButtonLink>
         </div>
       </div>
     </div>

components/welcome/pitches.tsx

@@ -11,7 +11,7 @@ interface FeatureProps extends React.ComponentPropsWithoutRef<'div'> {
 
 const Feature = ({ icon: Icon, title, children }: FeatureProps) => (
   <div>
-    <div className="h-22 p-3 mb-3 w-full bg-gray-100">
+    <div className="h-22 p-3 mb-3 w-full bg-gray-100 whitespace-nowrap">
       <Icon
         size={20}
         className="inline stroke-blue-500 stroke-[2] mr-3 align-text-bottom"
@@ -59,8 +59,10 @@ export const Pitches = () => (
       <Feature icon={IconTelescope} title="Scouts & regrantors" key="scouts">
         <p>
           You’re a seasoned donor or grantmaker? You want to{' '}
-          <span className="font-semibold">regrant some of the $600,000</span> of
-          our donors and funders?
+          <span className="font-semibold">
+            regrant some of the annual $700,000
+          </span>{' '}
+          of our donors and funders?
         </p>
 
         <p className="my-3">
@@ -124,7 +126,7 @@ export const Pitches = () => (
     </div>
     <iframe
       className="w-full max-w-[800px] aspect-video my-12 mx-auto"
-      src="https://www.youtube.com/embed/MInKrUV9TVY?si=w9W6tW5b_P4d465x"
+      src="https://www.youtube.com/embed/2RzCv9m4fV8?si=9g4xj6sV4UqMvXSs"
       title="YouTube video player"
       allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
     ></iframe>

package.json

@@ -87,7 +87,7 @@
     "@playwright/test": "^1.39.0",
     "@tailwindcss/forms": "^0.5.6",
     "@tailwindcss/typography": "^0.5.10",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
+    "@trivago/prettier-plugin-sort-imports": "4.3",
     "@types/dompurify": "^3.0.3",
     "@types/lodash": "^4.14.199",
     "@types/marked": "^5.0.2",

pages/support.tsx

@@ -20,7 +20,7 @@ const HelpAndSupportPage: NextPageWithAuthAndLayout = () => {
       </p>
       <p className="mt-6">
         Please use the support button, email us at{' '}
-        <Link className="link" href="hi@givewiki.org">
+        <Link className="link" href="mailto:hi@givewiki.org">
           hi@givewiki.org
         </Link>
         , or join our{' '}