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

Arm dev #29

Merged
merged 2 commits into from
Oct 5, 2024
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
Binary file added src/assets/image/AgroponicsAutomation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/image/AgroponicsPlants.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/image/AgroponicsStorage.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/components/home/HomeProjects.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import { useSpring, animated } from 'react-spring'
import { useState, useEffect, useRef } from 'react'
import { FaChevronRight } from 'react-icons/fa'
import {
AgrobotModelView,
AgroponicModelView,
Expand Down Expand Up @@ -70,7 +69,7 @@ const projects = [
},
]

function Project({ ProjectName, Text, background, ModelComponent, href }) {
function Project({ ProjectName, Text, background, ModelComponent, MobileImg, href }) {
const containerRef = useRef(null)

function useFadeIn(containerRef) {
Expand Down Expand Up @@ -130,7 +129,7 @@ function Project({ ProjectName, Text, background, ModelComponent, href }) {
</div>
</animated.div>
<div className="w-[47.5%] h-[50vh] bg-[#2e1b0f1f] relative top-[50vh] rounded-full">
{ModelComponent}
<img src={MobileImg} />
</div>
</div>
)
Expand Down
6 changes: 6 additions & 0 deletions src/components/projects/agroponics/AgroponicSubteams.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import ProjectSubteam from '../ProjectSubteam.tsx'
import AgroponicsAutomation from "../../../assets/image/AgroponicsAutomation.png"
import AgroponicsPlants from "../../../assets/image/AgroponicsPlants.jpeg"
import AgroponicsStorage from "../../../assets/image/AgroponicsStorage.jpeg"

const AgroponicSubteams = () => {
return (
Expand All @@ -7,16 +10,19 @@ const AgroponicSubteams = () => {
title="Automation"
text="The automation sub-team is an Internet of Things (IoT) project that focuses on designing and implementing autonomous farming, real-time monitoring, auto-regulated environments, and remote updates for hydroponic systems. The team’s goal is to use resources in agriculture (land, water, fertilizers, manpower) more efficiently to help improve our environment. Modern irrigation practices are exacerbating water scarcity, drying up entire water systems, and causing extensive land clearance for agriculture. To address these challenges, we leverage a wide variety of technologies to collect and communicate data from hydroponic systems, enabling us to simulate and optimize different preferred growing environments."
text_pos="left"
img={AgroponicsAutomation}
/>
<ProjectSubteam
title="Plants"
text="The Plants sub-team is dedicated to ensuring the successful growth and harvest of staple crops. The team works at the intersection of various disciplines, blending engineering principles with techniques from chemistry, applied/plant biology, and food, nutrition, and health. Its focus includes designing innovative methods for crop cultivation and optimizing growth conditions through experimentation and data collection. Members of the Plants sub-team are actively involved in research, utilizing analytical techniques, and contributing to all aspects of the team’s efforts."
text_pos="right"
img={AgroponicsPlants}
/>
<ProjectSubteam
title="Structure"
text="The Structure sub-team integrates the needs of the Automation and Plants sub-teams to create optimal environments for crop growth. Currently, the team is renovating an old 16-foot trailer by adding insulation, heating, electrical systems, a rainwater collection system, and structural reinforcement to support a controlled environment for hydroponic systems. The work is diverse and evolves with the project’s needs, presenting new and unexpected challenges. This hands-on team addresses multi-scale problems through collaborative and innovative solutions."
text_pos="left"
img={AgroponicsStorage}
/>
</section>
)
Expand Down
Loading