Skip to content

Commit

Permalink
Merge pull request #1 from Robotic-Decision-Making-Lab/fall2024-schedule
Browse files Browse the repository at this point in the history
Added Fall 2024 schedule
  • Loading branch information
evan-palmer authored Sep 28, 2024
2 parents aabd3c2 + 42b46fe commit 7d0c54c
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/speakers/Fall2023.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const Fall2023Speakers = [
{
date: "Nov 17",
name: "Brian Flynn",
affiliation: "UMass Lowell",
affiliation: "University of Massachusetts Lowell",
title:
"Evaluating Robotic Grasping and Manipulation Performance and Generalizability",
location: "Rogers Hall 230",
Expand Down
91 changes: 91 additions & 0 deletions src/speakers/Fall2024.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
export const Fall2024Speakers = [
{
date: "Sep 27",
name: "Cindy Grimm",
affiliation: "Oregon State University",
title: "Robotics State of the Union Address",
location: "Covell Hall 221",
time: "10:00am",
url: "https://engineering.oregonstate.edu/people/cindy-grimm",
},
{
date: "Oct 4",
name: "Mark Yim",
affiliation: "University of Pennsylvania",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://www.grasp.upenn.edu/people/mark-yim/",
},
{
date: "Oct 11",
name: "Zach Beattie",
affiliation: "Oregon Health and Science University",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://www.ohsu.edu/people/zachary-beattie-phd",
},
{
date: "Oct 18",
name: "Melisa Orta Martinez",
affiliation: "Carnegie Mellon University",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://www.ri.cmu.edu/ri-faculty/melisa-orta-martinez/",
},
{
date: "Oct 25",
name: "Vy Nguyen",
affiliation: "Hello Robot",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://hello-robot.com/",
},
{
date: "Nov 1",
name: "Brittany Duncan",
affiliation: "University of Nebraska-Lincoln",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://brittanyduncan.github.io/",
},
{
date: "Nov 8",
name: "Carina Buzo Tipton",
affiliation: "Oregon State University",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
},
{
date: "Nov 15",
name: "David Kaber",
affiliation: "Oregon State University",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://engineering.oregonstate.edu/people/david-kaber",
},
{
date: "Nov 22",
name: "Avik De",
affiliation: "Ghost Robotics",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://www.ghostrobotics.io/",
},
{
date: "Dec 6",
name: "Evan Ackerman",
affiliation: "IEEE",
title: "TBD",
location: "Covell Hall 221",
time: "10:00am",
url: "https://spectrum.ieee.org/u/evan-ackerman",
},
];
4 changes: 2 additions & 2 deletions src/speakers/Spring2024.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const Spring2024Speakers = [
{
date: "May 31",
name: "Paul Robinette",
affiliation: "UMass Lowell",
affiliation: "University of Massachusetts Lowell",
title: "Building Trustworthy, Fieldable Robotics",
location: "Rogers Hall 230",
time: "10:00am",
Expand All @@ -71,5 +71,5 @@ export const Spring2024Speakers = [
location: "Rogers Hall 226",
time: "2:30pm",
url: "https://www.tescafitzgerald.com/",
}
},
];
2 changes: 1 addition & 1 deletion src/speakers/Winter2024.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const Winter2024Speakers = [
{
date: "Jan 26",
name: "Sonia Chernova",
affiliation: "Georgia Tech",
affiliation: "Georgia Institute of Technology",
title:
"Autonomy in the Human World: Developing Robots that Handle the Diversity of Human Lives",
location: "Rogers Hall 230",
Expand Down
11 changes: 11 additions & 0 deletions src/speakers/Winter2025.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const Winter2025Speakers = [
{
date: "Nov 1",
name: "Matthew Gombolay",
affiliation: "Georgia Institute of Technology",
title: "TBD",
location: "Rogers Hall 230",
time: "10:00am",
url: "https://core-robotics.gatech.edu/people/matthew-gombolay/",
},
];
2 changes: 2 additions & 0 deletions src/views/Archive.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import Page from "../components/Page";
import Speakers from "../components/Speakers";
import { Winter2024Speakers } from "../speakers/Winter2024";
import { Fall2023Speakers } from "../speakers/Fall2023";
import { Spring2024Speakers } from "../speakers/Spring2024";

function Archive() {
return (
<Page>
<Flex w="100%" flexDirection="column" margin="0 auto" marginTop="-10px">
<Speakers title="Spring 2024 Schedule" list={Spring2024Speakers} />
<Speakers title="Winter 2024 Schedule" list={Winter2024Speakers} />
<Speakers title="Fall 2023 Schedule" list={Fall2023Speakers} />
</Flex>
Expand Down
4 changes: 2 additions & 2 deletions src/views/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from "react";

import Page from "../components/Page";
import Speakers from "../components/Speakers";
import { Spring2024Speakers } from "../speakers/Spring2024";
import { Fall2024Speakers } from "../speakers/Fall2024";

function ResponsiveText({ children, textColor = "#000000" }) {
return (
Expand Down Expand Up @@ -76,7 +76,7 @@ function Home() {
The seminar is held <i>in person</i> and is open to Oregon State
University faculty, students, and staff.
</ResponsiveText>
<Speakers title="Spring 2024 Schedule" list={Spring2024Speakers} />
<Speakers title="Fall 2024 Schedule" list={Fall2024Speakers} />
</Flex>
</Page>
);
Expand Down

0 comments on commit 7d0c54c

Please sign in to comment.