Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Blog into Projects #7

Merged
merged 2 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
19 changes: 0 additions & 19 deletions src/Blog/Article.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/Blog/ArticleContainer.tsx

This file was deleted.

62 changes: 0 additions & 62 deletions src/Blog/Blog.css

This file was deleted.

44 changes: 0 additions & 44 deletions src/Blog/Blog.tsx

This file was deleted.

32 changes: 0 additions & 32 deletions src/Blog/BlogContainer.tsx

This file was deleted.

4 changes: 0 additions & 4 deletions src/Blog/BlogContext.ts

This file was deleted.

21 changes: 6 additions & 15 deletions src/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Projects/ProjectsContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
5 changes: 0 additions & 5 deletions src/TopBarContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions src/content/articles.json

This file was deleted.

2 changes: 0 additions & 2 deletions src/content/articles/placeholder.md

This file was deleted.

10 changes: 10 additions & 0 deletions src/content/projectblurbs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
8 changes: 8 additions & 0 deletions src/content/projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
8 changes: 8 additions & 0 deletions src/content/projects/dream-machines.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"content": [
{
"type": "text",
"src": "projects/dream-machines.md"
}
]
}
8 changes: 8 additions & 0 deletions src/content/projects/the-brain-as-computer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"content": [
{
"type": "text",
"src": "projects/the-brain-as-computer.md"
}
]
}
Loading