Merge pull request #7 from hmallen99/merge-blog-projects

Merge Blog into Projects
hmallen99 · Aug 4, 2023 · f12333b · f12333b
2 parents 10c334e + a3e233b
commit f12333b
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 278 deletions.
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import Home from './Home';
 
-test('renders learn react link', () => {
+test('renders Projects tab', () => {
   render(<Home />);
-  const linkElement = screen.getByText(/Blog/i);
+  const linkElement = screen.getByText(/Projects/i);
   expect(linkElement).toBeInTheDocument();
 });
diff --git a/src/Blog/Article.tsx b/src/Blog/Article.tsx
diff --git a/src/Blog/ArticleContainer.tsx b/src/Blog/ArticleContainer.tsx
diff --git a/src/Blog/Blog.css b/src/Blog/Blog.css
diff --git a/src/Blog/Blog.tsx b/src/Blog/Blog.tsx
diff --git a/src/Blog/BlogContainer.tsx b/src/Blog/BlogContainer.tsx
diff --git a/src/Blog/BlogContext.ts b/src/Blog/BlogContext.ts
diff --git a/src/Home.tsx b/src/Home.tsx
@@ -13,21 +13,12 @@ export default function Home() {
                 <div className="title">henry.allen</div>
                 <div className="navigator">
                     <div className="columns">
-                        <div className="button-column">
-                            <PlainLink to="/pages/blog" >
-                                <div className={buttonStyle}>Blog</div>
-                            </PlainLink>
-                        </div>
-                        <div className="button-column">
-                            <PlainLink to="/pages/projects">
-                                <div className={buttonStyle}>Projects</div>
-                            </PlainLink>
-                        </div>
-                        <div className="button-column">
-                            <PlainLink to="/pages/resume">
-                                <div className={buttonStyle}>Resume</div>
-                            </PlainLink>
-                        </div>
+                        <PlainLink to="/pages/projects">
+                            <div className={buttonStyle}>Projects</div>
+                        </PlainLink>
+                        <PlainLink to="/pages/resume">
+                            <div className={buttonStyle}>Resume</div>
+                        </PlainLink>
                     </div>
                 </div>
             </div>

diff --git a/src/Projects/ProjectsContainer.tsx b/src/Projects/ProjectsContainer.tsx
@@ -4,7 +4,7 @@ import { ListItem } from "../FilterNavigator/FilterNavigator";
 import Projects from "./Projects";
 import LoadingPage from "../Loading/LoadingPage";
 
-export default function BlogContainer() {
+export default function ProjectsContainer() {
   const [projects, setProjects] = React.useState<ListItem[]>([])
   const [isPending, startTransition] = React.useTransition()
 

diff --git a/src/TopBarContainer.tsx b/src/TopBarContainer.tsx
@@ -23,11 +23,6 @@ export default function TopBarContainer() {
                             </PlainLink>
                             : null
                     }
-                    <PlainLink to="/pages/blog">
-                        <div className="top-bar-button">
-                            Blog
-                        </div>
-                    </PlainLink>
                     <PlainLink to="/pages/projects">
                         <div className="top-bar-button">
                             Projects

diff --git a/src/content/articles.json b/src/content/articles.json
diff --git a/src/content/articles/placeholder.md b/src/content/articles/placeholder.md
diff --git a/src/content/projectblurbs.json b/src/content/projectblurbs.json
@@ -8,5 +8,15 @@
         "id": "fire",
         "text": "## Fluid Fire\nNavier Stokes Fire Simulation",
         "thumbnailUrl": "images/fire.png"
+    },
+    "the-brain-as-computer": {
+        "id": "the-brain-as-computer",
+        "text": "## The Brain as Computer\nHow useful is the computation understanding of mind?",
+        "thumbnailUrl": "images/thesis.png"
+    },
+    "dream-machines": {
+        "id": "dream-machines",
+        "text": "## Dream Machines\nCan we model dreams with algorithms?",
+        "thumbnailUrl": "images/thesis.png"
     }
 }
diff --git a/src/content/projects.json b/src/content/projects.json
@@ -7,6 +7,14 @@
         {
             "id": "fire",
             "title": "Fluid Fire Simulation"
+        },
+        {
+            "id": "the-brain-as-computer",
+            "title": "The Brain as Computer"
+        },
+        {
+            "id": "dream-machines",
+            "title": "Dream Machines"
         }
     ]
 }
diff --git a/src/content/projects/dream-machines.json b/src/content/projects/dream-machines.json
@@ -0,0 +1,8 @@
+{
+  "content": [
+    {
+      "type": "text",
+      "src": "projects/dream-machines.md"
+    }
+  ]
+}
diff --git a/src/content/articles/dream-machines.md → src/content/projects/dream-machines.md b/src/content/articles/dream-machines.md → src/content/projects/dream-machines.md
diff --git a/src/content/projects/the-brain-as-computer.json b/src/content/projects/the-brain-as-computer.json
@@ -0,0 +1,8 @@
+{
+  "content": [
+    {
+      "type": "text",
+      "src": "projects/the-brain-as-computer.md"
+    }
+  ]
+}
diff --git a/...content/articles/the-brain-as-computer.md → ...content/projects/the-brain-as-computer.md b/...content/articles/the-brain-as-computer.md → ...content/projects/the-brain-as-computer.md