Merge pull request #457 from StampyAI/sundry-fixes

fix copy
StampyAI · Feb 28, 2024 · 7cbdf34 · 7cbdf34
2 parents 6b7fea0 + bc52fab
commit 7cbdf34
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/app/components/Article/Contents.tsx b/app/components/Article/Contents.tsx
@@ -125,7 +125,7 @@ const insertGlossary = (pageid: string, glossary: Glossary) => {
         `<div class="glossary-popup flex-container black small">
               <div class="contents col-8">
                    <div class="small-bold">${entry.term}</div>
-                   <div class="defintion">${entry.contents}</div>
+                   <div class="defintion small">${entry.contents}</div>
                    ${link || ''}
               </div>
               ${image || ''}

diff --git a/app/components/Article/KeepGoing/index.tsx b/app/components/Article/KeepGoing/index.tsx
@@ -17,9 +17,9 @@ type NextArticleProps = {
 const NextArticle = ({section, next, first}: NextArticleProps) =>
   next && (
     <>
-      <h2 className="padding-bottom-40">Keep going! &#128073;</h2>
+      <h2 className="padding-bottom-40">Keep reading! &#128073;</h2>
       <div className="padding-bottom-24">
-        {first ? 'Start' : 'Continue'} with the {first ? 'first' : 'next'} article in "
+        {first ? 'Start' : 'Continue'} with the {first ? 'first' : 'next'} entry in "
         {section?.title}"
       </div>
       <div className={`${styles.container} flex-container bordered ${styles.flex_dynamic}`}>

diff --git a/app/components/Article/article.css b/app/components/Article/article.css
@@ -88,6 +88,7 @@ article .link-popup .glossary-popup > .contents {
   padding: var(--spacing-24) var(--spacing-40) var(--spacing-24);
 }
 article .defintion {
+  height: 160px;
   display: -webkit-box;
   /* These are webkit specific things, so might not work in all browsers (firefox handles them fine) */
   -webkit-box-orient: vertical;

diff --git a/app/components/Article/index.tsx b/app/components/Article/index.tsx
@@ -33,7 +33,7 @@ const ArticleFooter = (question: Question) => {
             <EditIcon className="no-fill" />
           </Button>
         </div>
-        <span>Did this page help you?</span>
+        <span>Was this page helpful?</span>
 
         <CompositeButton className="flex-container">
           <Action pageid={question.pageid} showText={true} actionType={ActionType.HELPFUL} />

diff --git a/app/components/ContentBox/index.tsx b/app/components/ContentBox/index.tsx
@@ -42,16 +42,13 @@ export const ContentBoxMain = () => (
     title={
       <>
         <div className="white">New to AI Safety?</div>
-        <div className="teal-200">
-          Something about <br />
-          reading and quick
-        </div>
+        <div className="teal-200">Jump into the basics.</div>
       </>
     }
     action={questionUrl({pageid: '9OGZ'})}
     actionTitle={
       <>
-        Start here
+        Start reading
         <ArrowRight />
       </>
     }
@@ -69,9 +66,9 @@ export const ContentBoxSecond = () => {
   const article = {pageid: '9TDI', title: 'Not convinced? Explore the arguments.'}
   return (
     <ContentBox
-      title="Explore the arguments"
+      title="Not convinced?"
       action={questionUrl(article)}
-      actionTitle="Browse all arguments"
+      actionTitle="Explore the arguments"
     >
       <ListTable
         elements={[
@@ -92,9 +89,9 @@ export const ContentBoxThird = () => {
   const article = {pageid: '8TJV', title: 'Get involved with AI safety'}
   return (
     <ContentBox
-      title="Get involved with AI safety"
+      title="Want to help with AI safety?"
       action={questionUrl(article)}
-      actionTitle="Learn how"
+      actionTitle="Get involved"
       classNameTable={'content-box-table main'}
     >
       <SvgGroup />

diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx
@@ -21,13 +21,13 @@ export const FooterBar: FunctionComponent = () => {
             <a href="/">AISafety.info</a>
           </p>
           <div>
-            We're a global team of volunteers from various disciplines who believe AI poses a grave
-            risk of extinction to humanity.
+            We’re a global team of specialists supported by volunteers from various backgrounds who
+            are concerned about the possibility of human extinction from future AI.
           </div>
         </div>
 
         <div className="col-3 small">
-          <p className="small-bold">Help out</p>
+          <p className="small-bold">Get involved</p>
           <Link to="https://www.every.org/stampy?utm_campaign=donate-link#/donate" title="Donate" />
           <Link to="https://github.com/StampyAI/stampy-ui" title="Code" />
           <Link to="https://get_involved.aisafety.info/" title="Write" />

diff --git a/app/components/Grid/index.tsx b/app/components/Grid/index.tsx
@@ -14,11 +14,15 @@ interface GridProps {
   gridBoxes: TOCItem[]
 }
 export const Grid = ({gridBoxes}: GridProps) => {
+  console.log(gridBoxes)
   return (
     <div className="grid">
-      {gridBoxes.slice(0, 6).map((gridBoxProps) => (
-        <GridBox key={gridBoxProps.title} {...gridBoxProps} />
-      ))}
+      {gridBoxes
+        .filter(({category}) => category)
+        .slice(0, 6)
+        .map((gridBoxProps) => (
+          <GridBox key={gridBoxProps.title} {...gridBoxProps} />
+        ))}
     </div>
   )
 }

diff --git a/app/components/SearchResults/dropdown.css b/app/components/SearchResults/dropdown.css
@@ -17,4 +17,5 @@
 }
 .search-result svg {
   margin-top: var(--spacing-4);
+  flex-shrink: 0;
 }
diff --git a/app/components/Widget/Stampy.tsx b/app/components/Widget/Stampy.tsx
@@ -18,7 +18,7 @@ export const WidgetStampy = () => {
     <div className="centered col-9 padding-bottom-128">
       <div className="col-6 padding-bottom-56">
         <h2 className="teal-500">Questions?</h2>
-        <h2>Ask Stampy any question about AI Safety</h2>
+        <h2>Ask Stampy, our chatbot, any question about AI safety</h2>
       </div>
 
       <div className="sample-messages-container padding-bottom-24">

diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
@@ -32,19 +32,16 @@ export default function App() {
   return (
     <Page>
       <div className="page-body">
-        <h1 className="padding-bottom-80">
-          Educational content <br />
-          on all things AI Safety
-        </h1>
+        <h1 className="padding-bottom-80">Answers on all things AI safety</h1>
 
-        <h3 className="grey padding-bottom-40">Introductory content</h3>
+        <h3 className="grey padding-bottom-40">Beginner sections</h3>
         <ContentBoxMain />
         <ContentBoxSecond />
         <ContentBoxThird />
 
         <WidgetStampy />
 
-        <h3 className="grey large-bold padding-bottom-32">Advanced content</h3>
+        <h3 className="grey large-bold padding-bottom-32">Advanced sections</h3>
         <Grid gridBoxes={toc} />
       </div>
     </Page>

diff --git a/app/routes/questions.toc.ts b/app/routes/questions.toc.ts
@@ -72,7 +72,7 @@ export const loadToC = async (request: any): Promise<LoaderResp> => {
     })
   return {
     data: data
-      .filter(({parents, children}) => parents && parents.length === 0 && children)
+      .filter(({parents, children}) => (!parents || parents.length === 0) && children)
       .map(formatQuestion(1)),
     timestamp,
   }