diff --git a/project-words.txt b/project-words.txt index 9b7cbc7..f08e445 100644 --- a/project-words.txt +++ b/project-words.txt @@ -16,6 +16,7 @@ dangerousthings Dechorionator dockerization dockerizing +drumheller ebox fhhs flowbite diff --git a/src/assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-battery-box.jpg b/src/assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-battery-box.jpg new file mode 100644 index 0000000..ba8f99f Binary files /dev/null and b/src/assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-battery-box.jpg differ diff --git a/src/assets/about/circ-champions.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/circ-champions.jpg similarity index 100% rename from src/assets/about/circ-champions.jpg rename to src/assets/experience/osu-robotics-club/mars-rover-software-lead/circ-champions.jpg diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/corwin-at-competition.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/corwin-at-competition.jpg new file mode 100644 index 0000000..ef10ecd Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/corwin-at-competition.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/drumheller-team-photo.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/drumheller-team-photo.jpg new file mode 100644 index 0000000..44f8c7a Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/drumheller-team-photo.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/final-ground-station-gui.png b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/final-ground-station-gui.png new file mode 100644 index 0000000..1608d80 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/final-ground-station-gui.png differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/ground-station-at-competition.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/ground-station-at-competition.jpg new file mode 100644 index 0000000..a393dc1 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/ground-station-at-competition.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-assembly-timelapse-converted.mp4 b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-assembly-timelapse-converted.mp4 new file mode 100644 index 0000000..9bd085d Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-assembly-timelapse-converted.mp4 differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-working.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-working.jpg new file mode 100644 index 0000000..04bb696 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-working.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-from-above.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-from-above.jpg new file mode 100644 index 0000000..5f363c2 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-from-above.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-pickup-test.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-pickup-test.jpg new file mode 100644 index 0000000..dd8bf85 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-pickup-test.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-gimbal-test-converted.mp4 b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-gimbal-test-converted.mp4 new file mode 100644 index 0000000..2d1605e Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-gimbal-test-converted.mp4 differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-pose-with-dinosaur.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-pose-with-dinosaur.jpg new file mode 100644 index 0000000..a8697a3 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-pose-with-dinosaur.jpg differ diff --git a/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-with-arm-pose-in-desert.jpg b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-with-arm-pose-in-desert.jpg new file mode 100644 index 0000000..bf38eb7 Binary files /dev/null and b/src/assets/experience/osu-robotics-club/mars-rover-software-lead/rover-with-arm-pose-in-desert.jpg differ diff --git a/src/components/Media/YtVideo.astro b/src/components/Media/YtVideo.astro index 1bf962f..c304538 100644 --- a/src/components/Media/YtVideo.astro +++ b/src/components/Media/YtVideo.astro @@ -1,13 +1,26 @@ --- -import type { videoConfig } from "@interfaces/video.ts"; +import type { videoConfig } from "@interfaces/yt-video.ts"; -const config: videoConfig = Astro.props.videoConfig; +interface Props extends videoConfig {} + +const { + videoPath, + videoTitle, + width = "1920", + height = "1080", + autoPlay = false, +} = Astro.props; + +const aspect = `${width} / ${height}`; --- - +
+ +
diff --git a/src/data/site-layout.ts b/src/data/site-layout.ts index 7c3e1be..2f37bc8 100644 --- a/src/data/site-layout.ts +++ b/src/data/site-layout.ts @@ -74,12 +74,10 @@ export const siteLayout: navLink[] = [ ], }, { - enabled: false, navText: "OSU Robotics Club", path: "osu-robotics-club", children: [ { - enabled: false, navText: "Mars Rover Software Team Lead", path: "mars-rover-software-team-lead", }, diff --git a/src/interfaces/video.ts b/src/interfaces/video.ts deleted file mode 100644 index 05dde3c..0000000 --- a/src/interfaces/video.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface videoConfig { - videoTitle?: string; - videoPath: string; - videoType?: string; -} diff --git a/src/interfaces/yt-video.ts b/src/interfaces/yt-video.ts new file mode 100644 index 0000000..a5ac04e --- /dev/null +++ b/src/interfaces/yt-video.ts @@ -0,0 +1,9 @@ +export interface videoConfig { + videoPath: string; + videoTitle?: string; + + width?: number; // “design” width + height?: number; // “design” height + + autoPlay?: boolean; +} diff --git a/src/pages/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler.astro b/src/pages/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler.astro index 4d7ee29..157575c 100644 --- a/src/pages/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler.astro +++ b/src/pages/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler.astro @@ -22,6 +22,7 @@ import type { timelineEntry } from "@interfaces/timeline.ts"; import electronics_box from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/electronics-box.jpg"; import jet_drive from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/jet-drive.jpg"; +import ross_battery_box from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-battery-box.jpg"; import ross_ebox_4p0 from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-ebox-4p0.jpg"; import ross_on_vessel_at_night from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-on-vessel-at-night.jpg"; import ross_on_vessel from "@assets/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler/ross-on-vessel.jpg"; @@ -42,6 +43,7 @@ const headerCarouselGroup: carouselGroup = { ross_on_vessel_at_night, ross_ebox_4p0, electronics_box, + ross_battery_box, jet_drive, ui, ], diff --git a/src/pages/experience/osu-robotics-club/mars-rover-software-team-lead.astro b/src/pages/experience/osu-robotics-club/mars-rover-software-team-lead.astro index f8c0230..c784130 100644 --- a/src/pages/experience/osu-robotics-club/mars-rover-software-team-lead.astro +++ b/src/pages/experience/osu-robotics-club/mars-rover-software-team-lead.astro @@ -1,279 +1,71 @@ --- +import H2 from "@components/H2.astro"; import Carousel from "@components/Media/CustomCarousel/CustomCarousel.astro"; import YtVideo from "@components/Media/YtVideo.astro"; +import PageGroup from "@components/PageGroup.astro"; import type { carouselGroup } from "@interfaces/image-carousel.ts"; -import type { videoConfig } from "@interfaces/video.ts"; +import type { videoConfig } from "@interfaces/yt-video.ts"; import ExperienceLayout from "@layouts/ExperienceLayout.astro"; +import circ_champions from "@assets/experience/osu-robotics-club/mars-rover-software-lead/circ-champions.jpg"; +import corwin_at_competition from "@assets/experience/osu-robotics-club/mars-rover-software-lead/corwin-at-competition.jpg"; +import drumheller_team_photo from "@assets/experience/osu-robotics-club/mars-rover-software-lead/drumheller-team-photo.jpg"; +import final_ground_station_gui from "@assets/experience/osu-robotics-club/mars-rover-software-lead/final-ground-station-gui.png"; +import ground_station_at_competition from "@assets/experience/osu-robotics-club/mars-rover-software-lead/ground-station-at-competition.jpg"; +import iris_pcb_assembly_timelapse_converted from "@assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-assembly-timelapse-converted.mp4"; +import iris_pcb_working from "@assets/experience/osu-robotics-club/mars-rover-software-lead/iris-pcb-working.jpg"; +import rover_at_competition_from_above from "@assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-from-above.jpg"; +import rover_at_competition_pickup_test from "@assets/experience/osu-robotics-club/mars-rover-software-lead/rover-at-competition-pickup-test.jpg"; +import rover_gimbal_test_converted from "@assets/experience/osu-robotics-club/mars-rover-software-lead/rover-gimbal-test-converted.mp4"; +import rover_pose_with_dinosaur from "@assets/experience/osu-robotics-club/mars-rover-software-lead/rover-pose-with-dinosaur.jpg"; +import rover_with_arm_pose_in_desert from "@assets/experience/osu-robotics-club/mars-rover-software-lead/rover-with-arm-pose-in-desert.jpg"; +import silly_poke from "@assets/experience/osu-robotics-club/mars-rover-software-lead/silly-poke.gif"; +import Video from "@components/Media/Video.astro"; + const headerCarouselGroup: carouselGroup = { animation: "slide", - images: [], + images: [ + circ_champions, + drumheller_team_photo, + rover_with_arm_pose_in_desert, + rover_pose_with_dinosaur, + corwin_at_competition, + rover_at_competition_from_above, + rover_at_competition_pickup_test, + final_ground_station_gui, + ground_station_at_competition, + iris_pcb_working, + silly_poke, + ], }; -const videoList: videoConfig[] = [ - { - videoTitle: "Ground Station Software Quick Overview", - videoPath: "https://www.youtube-nocookie.com/embed/ZjGW-HWapVA", - }, - { - videoTitle: "Rover Software Environment And Full Code Overview", - videoPath: "https://www.youtube-nocookie.com/embed/sceA2ZbEV8Y", - }, +const videos: videoConfig[] = [ + { videoPath: iris_pcb_assembly_timelapse_converted }, + { videoPath: rover_gimbal_test_converted }, + { videoPath: "https://www.youtube-nocookie.com/embed/ZjGW-HWapVA" }, + { videoPath: "https://www.youtube-nocookie.com/embed/sceA2ZbEV8Y0" }, ]; --- -

- Ground Station Readouts & Features -

- -

- Rover Demos and Software Overviews -

- { - videoList.map((video) => ( -
-

{video.videoTitle}

- -
- )) - } + +

Videos

 +
+ { + videos.map((video) => + video.videoPath.startsWith("https://www.youtube") ? ( + + ) : ( +
+ diff --git a/src/pages/experience/spacex/avionics-test-engineering-internship.astro b/src/pages/experience/spacex/avionics-test-engineering-internship.astro index cfd7bb4..4290856 100644 --- a/src/pages/experience/spacex/avionics-test-engineering-internship.astro +++ b/src/pages/experience/spacex/avionics-test-engineering-internship.astro @@ -1,6 +1,7 @@ --- import H2 from "@components/H2.astro"; import H3 from "@components/H3.astro"; +import InlineLink from "@components/InlineLink.astro"; import Li from "@components/Li.astro"; import Carousel from "@components/Media/CustomCarousel/CustomCarousel.astro"; import PageGroup from "@components/PageGroup.astro"; @@ -15,7 +16,6 @@ import ExperienceLayout from "@layouts/ExperienceLayout.astro"; import spring_2019_interns from "@assets/experience/spacex/avionics-test-engineering-internship/spring-2019-interns.jpg"; import swag from "@assets/experience/spacex/avionics-test-engineering-internship/swag.jpg"; -import InlineLink from "@components/InlineLink.astro"; import type { carouselGroup } from "@interfaces/image-carousel.ts"; import type { categorySkills } from "@interfaces/skill-matrix.ts"; import type { timelineEntry } from "@interfaces/timeline.ts"; diff --git a/src/pages/index.astro b/src/pages/index.astro index a2e3550..b950f26 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -11,8 +11,8 @@ import Paragraphs from "@components/Paragraphs.astro"; import type { carouselGroup } from "@interfaces/image-carousel.ts"; import alaska_bike_mountain_ocean from "@assets/about/alaska-bike-mountain-ocean.jpg"; -import circ_champions from "@assets/about/circ-champions.jpg"; import headshot from "@assets/about/headshot.jpg"; +import circ_champions from "@assets/experience/osu-robotics-club/mars-rover-software-lead/circ-champions.jpg"; const headerCarouselGroup: carouselGroup = { animation: "slide",