Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucia Barboza authored and Lucia Barboza committed Jan 18, 2024
1 parent 3da3565 commit 6d65722
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 17 deletions.
18 changes: 9 additions & 9 deletions asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"files": {
"main.css": "/static/css/main.0cbd12f2.css",
"main.js": "/static/js/main.b866ea46.js",
"main.css": "/static/css/main.00073f7e.css",
"main.js": "/static/js/main.5b67e154.js",
"static/js/787.4420cbb4.chunk.js": "/static/js/787.4420cbb4.chunk.js",
"static/media/Future_of_Food.jpeg": "/static/media/Future_of_Food.311960377f4dc720c3ec.jpeg",
"static/media/tractor(compressed)-Trim.mp4": "/static/media/tractor(compressed)-Trim.7446a61f813e89bf54b1.mp4",
"static/media/small_farmer.jpg": "/static/media/small_farmer.8fa0de085989230b21f3.jpg",
"static/media/Rooted_in_Growth.jpeg": "/static/media/Rooted_in_Growth.c51a42cfab6c09b94afa.jpeg",
"static/media/ucmerced_aerial.jpg": "/static/media/ucmerced_aerial.03eb5e830d6be9761627.jpg",
"static/media/amigabot.jpg": "/static/media/amigabot.470b73661139e14f7470.jpg",
"static/media/UCM+VISTA_LogoHorizontal.png": "/static/media/UCM+VISTA_LogoHorizontal.390225281a7d743f5cc8.png",
"static/media/F3_MainLogo_Horizontal.jpg": "/static/media/F3_MainLogo_Horizontal.46972804cf7af15512f4.jpg",
"static/media/Slide7.jpg": "/static/media/Slide7.c6cc8d9f876468a55501.jpg",
"static/media/F3_Logo.png": "/static/media/F3_Logo.498df994e6859ffda509.png",
"static/media/news.csv": "/static/media/news.65502dcfa198423459d5.csv",
"static/media/news.csv": "/static/media/news.62650c76f6894c063825.csv",
"static/media/gobiz-logo-transparent.png": "/static/media/gobiz-logo-transparent.a897208c09278f826a3d.png",
"static/media/VISTA-Logo-Final-PNG-Color.png": "/static/media/VISTA-Logo-Final-PNG-Color.843c989caf050fbf65ef.png",
"static/media/staff.csv": "/static/media/staff.6246df1cdf11299aa29d.csv",
Expand All @@ -25,12 +25,12 @@
"static/media/slick.ttf": "/static/media/slick.c94f7671dcc99dce43e2.ttf",
"static/media/slick.woff": "/static/media/slick.295183786cd8a1389865.woff",
"index.html": "/index.html",
"main.0cbd12f2.css.map": "/static/css/main.0cbd12f2.css.map",
"main.b866ea46.js.map": "/static/js/main.b866ea46.js.map",
"main.00073f7e.css.map": "/static/css/main.00073f7e.css.map",
"main.5b67e154.js.map": "/static/js/main.5b67e154.js.map",
"787.4420cbb4.chunk.js.map": "/static/js/787.4420cbb4.chunk.js.map"
},
"entrypoints": [
"static/css/main.0cbd12f2.css",
"static/js/main.b866ea46.js"
"static/css/main.00073f7e.css",
"static/js/main.5b67e154.js"
]
}
Binary file added images/news/Biochar.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 images/news/Future_of_Farming.jpg
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 images/projects/about_us_left.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 images/projects/about_us_right.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioneering sustainable food production through cutting-edge research and development. Training the next generation for the future of food workforce." data-rh="true"/><link rel="manifest" href="/manifest.json"/><title>F3 - Farms, Food, Future</title><meta name="keywords" content="Climate-Smart Agriculture, Climate Change, Fresno, Merced, UC ANR, Central Valley, Agtech, Smart Farm, Autonomous Ag"/><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="/static/js/main.b866ea46.js"></script><link href="/static/css/main.0cbd12f2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioneering sustainable food production through cutting-edge research and development. Training the next generation for the future of food workforce." data-rh="true"/><link rel="manifest" href="/manifest.json"/><title>F3 - Farms, Food, Future</title><meta name="keywords" content="Climate-Smart Agriculture, Climate Change, Fresno, Merced, UC ANR, Central Valley, Agtech, Smart Farm, Autonomous Ag"/><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="/static/js/main.5b67e154.js"></script><link href="/static/css/main.00073f7e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
4 changes: 2 additions & 2 deletions static/css/main.0cbd12f2.css → static/css/main.00073f7e.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions static/js/main.b866ea46.js → static/js/main.5b67e154.js

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed static/media/amigabot.470b73661139e14f7470.jpg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
title,author,position,fileName,link,description,date,externalLink

"Biochar-composting substantially reduces methane and air pollutant emissions from dairy manure","Brendan P Harrison et al.",,Biochar.png,https://iopscience.iop.org/article/10.1088/1748-9326/ad1ad2,"Livestock manure is a leading source of anthropogenic methane (CH4) emissions and air pollution from agriculture [1–6]. In the U.S., manure accounts for 9% of total CH4 emissions and is responsible for 43% of all premature deaths from food-related air pollution—nearly 7000 people per year [7, 8]. As the global demand for animal products rises, there is an increasing need for novel strategies that mitigate emissions from manure as governments work to fight climate change and improve rural air quality [8–10].",01/11/24,true,

"In California’s San Joaquin Valley, the future of farming is in tech" ,Esther Quintanilla,KVPR,Future_of_Farming.jpg,https://www.kvpr.org/local-news/2023-12-07/in-californias-san-joaquin-valley-the-future-of-farming-is-in-tech,"FRESNO, Calif. – Smart farms, electric tractors, and remote-controlled wheelbarrows. Those are just some of the new technologies that could soon be hitting the agriculture industry in the San Joaquin Valley in the upcoming year. The latest inventions created by researchers and students across the Valley were displayed at Fresno State earlier this week. They are being developed as part of a project called the Food, Farm and Future (F3) initiative. It’s a partnership among Valley community colleges, Fresno State, UC Merced, community organizations and industry associations representing growers and workers.",12/07/23,true

Innovation Harvest workshop cultivates tech futures in agriculture,Alli Sweigard, VISTA F3 Communications Coordinator,Barley.png,,"Over 30 attendees filled the Grand Ballroom at the University of California, Merced on November 16 for the second workshop of the Innovation Harvest series. This particular workshop, focused on database applications and real-life applications, highlighting the new AI software made to easily program the Farm ng Amiga robot.
Keynote speakers Daniel Sabzehzar and Phoenix Skeahan, representing Tesserakt Ventures, and Dr. Guilherme De Moura Araujo, a seasoned software engineer from Farm ng, unveiled the groundbreaking AmigaGPT software—a tool that brought about a seismic shift in the realm of AI-driven coding for the Farm ng Amiga robot. The room sparked excitement as students received the first public viewing of the software and witnessed how this innovation could revolutionize programming.
“It is the first time we have seen mass deployment of multi robotic systems in agriculture." Sabzehzar noted, “You are going to be the first to see this release because we really believe that UC Merced has something that all the other UCs lacked and as an investor, it is something that excites me.”
Expand Down
Binary file removed static/media/small_farmer.8fa0de085989230b21f3.jpg
Binary file not shown.

0 comments on commit 6d65722

Please sign in to comment.