Merge branch 'development'

ImpactMarkets · Apr 6, 2024 · eb70b3e · eb70b3e
2 parents eafd9ac + d70b63c
commit eb70b3e
Show file tree

Hide file tree

Showing 24 changed files with 346 additions and 148 deletions.
diff --git a/components/user/profileInfo.tsx b/components/user/profileInfo.tsx
@@ -405,7 +405,7 @@ export function ProfileInfo({
       <div key={childKey}>
         <Head>
           {/* https://stackoverflow.com/questions/75875037 */}
-          <title>{`${user.name} – AI Safety GiveWiki`}</title>
+          <title>{`${user.name} – GiveWiki`}</title>
         </Head>
 
         <div className="relative flex items-start gap-4 py-8 overflow-hidden">

diff --git a/components/welcome/comparisons.tsx b/components/welcome/comparisons.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 export const Comparisons = () => (
   <>
     <div className="flex justify-center my-12 text-3xl font-display">
-      AI Safety GiveWiki is a …
+      GiveWiki is a …
     </div>
     <div className="max-w-screen-lg m-auto items-center flex my-10 flex-col sm:flex-row">
       <div className="basis-full m-6">
@@ -53,9 +53,9 @@ export const Comparisons = () => (
           as a kind of “impact credit,” a generalized carbon credit. Once our
           scoring algorithm has matured we want to introduce such a playmoney
           “impact credit,” the Wiki Credit, so that top donors can double as
-          evaluators. As AI safety enters the mainstream, it’ll become more and
-          more important to provide a scalable method to render donation
-          recommendations.
+          evaluators. As (say) AI safety enters the mainstream, it’ll become
+          more and more important to provide a scalable method to render
+          donation recommendations.
         </div>
       </div>
     </div>

diff --git a/components/welcome/heroText.tsx b/components/welcome/heroText.tsx
@@ -7,14 +7,15 @@ export function HeroText() {
     <div className="max-w-[1400px] mb-12 text-center">
       <div>
         <h1 className="text-5xl font-display font-medium">
-          The AI Safety
+          Your Crowdsourced{' '}
           <div>
             <span className="text-highlight">Charity Evaluator</span>
           </div>
         </h1>
 
         <div className="my-8 mx-auto text-lg text-center prose">
           <p>
+            The{' '}
             <Tooltip label="AngelList allows newbie angel investors to follow seasoned angel investors">
               <span className="hint">AngelList</span>
             </Tooltip>{' '}

diff --git a/components/welcome/pitches.tsx b/components/welcome/pitches.tsx
@@ -27,13 +27,13 @@ const Feature = ({ icon: Icon, title, children }: FeatureProps) => (
 export const Pitches = () => (
   <div className="w-full mx-auto my-5 py-6">
     <div className="flex justify-center text-3xl font-display">
-      AI Safety GiveWiki is a platform for …
+      GiveWiki is a platform for …
     </div>
     <div className="flex gap-6 flex-col sm:flex-row my-12">
-      <Feature icon={IconShovel} title="AI safety projects" key="projects">
+      <Feature icon={IconShovel} title="Altruistic projects" key="projects">
         <p>
           You’re working on independent research or a{' '}
-          <span className="font-semibold">new AI safety venture</span>? Your
+          <span className="font-semibold">new charity venture</span>? Your
           funding goal is &lt;&nbsp;$100,000 for now?
         </p>
 
@@ -92,7 +92,7 @@ export const Pitches = () => (
         <p>
           You want to support{' '}
           <span className="font-semibold">
-            funding-constrained AI safety projects
+            funding-constrained charity projects
           </span>{' '}
           but don’t know which?
         </p>

diff --git a/lib/emailEvents.tsx b/lib/emailEvents.tsx
@@ -61,7 +61,7 @@ export const createEmail = (
           <MjmlColumn>
             <MjmlImage
               width="200px"
-              src="https://ai.givewiki.org/static/images/logo-light.png"
+              src="https://givewiki.org/static/images/logo-light.png"
             ></MjmlImage>
             <MjmlText>
               <p>
@@ -77,7 +77,7 @@ export const createEmail = (
                 notifications of new projects, new bounties, or activity on your
                 own projects. You can change your notification preferences on
                 your{' '}
-                <a href={`https://ai.givewiki.org/profile/${recipient.id}`}>
+                <a href={`https://givewiki.org/profile/${recipient.id}`}>
                   GiveWiki profile
                 </a>
                 .
@@ -101,7 +101,7 @@ const renderSection = (events: Event[]) => {
       <MjmlText key={objectId}>
         <h2>
           “
-          <a href={`https://ai.givewiki.org/${objectType}/${objectId}`}>
+          <a href={`https://givewiki.org/${objectType}/${objectId}`}>
             {objectTitle}
           </a>
           ”

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "@mantine/next": "^6.0.21",
     "@next-auth/prisma-adapter": "^1.0.7",
     "@paralleldrive/cuid2": "^2.2.2",
-    "@prisma/client": "^5.5.2",
+    "@prisma/client": "^5.12.1",
     "@rollbar/react": "^0.11.2",
     "@sendgrid/mail": "^8.1.1",
     "@tabler/icons-react": "^2.39.0",
@@ -113,7 +113,7 @@
     "postcss-preset-mantine": "^1.8.0",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "^3.1.1",
-    "prisma": "^5.5.2",
+    "prisma": "^5.12.1",
     "tailwindcss": "^3.3.3",
     "typescript": "^5.2.2"
   }

diff --git a/pages/bounties.tsx b/pages/bounties.tsx
@@ -46,7 +46,7 @@ const Home: NextPageWithAuthAndLayout = () => {
     return (
       <div className="max-w-screen-lg mx-auto">
         <Head>
-          <title>Bounties – AI Safety GiveWiki</title>
+          <title>Bounties – GiveWiki</title>
         </Head>
 
         <div className="flex justify-between flex-row-reverse flex-wrap gap-3 mt-3">