Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
luciabarboza committed Apr 10, 2024
1 parent 7a0167d commit 1425b7a
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"files": {
"main.css": "/static/css/main.af0220d4.css",
"main.js": "/static/js/main.cdd1588f.js",
"main.js": "/static/js/main.70b7ffb7.js",
"static/js/787.2667ce32.chunk.js": "/static/js/787.2667ce32.chunk.js",
"static/media/acs.jpeg": "/static/media/acs.9fe81be4ad1d75875ca0.jpeg",
"static/media/news.csv": "/static/media/news.24af8c5007bd576db902.csv",
"static/media/logo.png": "/static/media/logo.dc104983539196e01750.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.afa13cf679032bc5af72.csv",
"static/media/events.csv": "/static/media/events.ddb4b15ccd1ff611f258.csv",
"static/media/events.csv": "/static/media/events.16b97bd5d6450895f5e5.csv",
"index.html": "/index.html",
"static/media/students.csv": "/static/media/students.b13c1d70a72427fcec30.csv",
"static/media/alumni.csv": "/static/media/alumni.08bf12b06839bcf7aa6e.csv",
"main.af0220d4.css.map": "/static/css/main.af0220d4.css.map",
"main.cdd1588f.js.map": "/static/js/main.cdd1588f.js.map",
"main.70b7ffb7.js.map": "/static/js/main.70b7ffb7.js.map",
"787.2667ce32.chunk.js.map": "/static/js/787.2667ce32.chunk.js.map"
},
"entrypoints": [
"static/css/main.af0220d4.css",
"static/js/main.cdd1588f.js"
"static/js/main.70b7ffb7.js"
]
}
Binary file added images/events/Bobcat_Day.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/events/hack_valley_2.png
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="" data-rh="true"/><link rel="manifest" href="/manifest.json"/><title>VISTA</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.cdd1588f.js"></script><link href="/static/css/main.af0220d4.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="" data-rh="true"/><link rel="manifest" href="/manifest.json"/><title>VISTA</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.70b7ffb7.js"></script><link href="/static/css/main.af0220d4.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
6 changes: 3 additions & 3 deletions static/js/main.cdd1588f.js → static/js/main.70b7ffb7.js

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ id,title,start,end,location,time,summary,description,tags,coverImageFile,imageFi
13, HackMerced IX, 03/08/2024, 03/10/2024, UC Merced,,"A hackathon is an event where anyone with an interest in technology can attend to learn about technology, build a project, and share it over the course of a weekend to win prizes and more! HackMerced welcomes people of all experience levels. We will also have beginner-friendly workshops, events, and prize categories for those unacquainted with hackathons.",,Hackathon,hack-merced-ix.png,,https://hackmerced.com/,,,,"Hack-Merced-IX"
14,Open ET Applications Conference,02/27/2024,02/27/2024,Albuquerque New Mexico,11:00 AM,"Join this in person discussion at the OpenET Applications Conference at Albuquerque, New Mexico about the use of OpenET's datasets in evaluating water use, using water balance modeling (e.g. rain + irrigation, evaporation, transpiration, runoff to rivers, streams, and groundwater recharge)","",Discussion,OpenET_Conference.png,,,,,,open-et-conference
15,Technology Translation Workshop,05/03/2024, 05/03/2024, UC Merced,11:00 AM - 4:00 PM,"The VINE, VISTA, and F3 are hosting a focused and hands-on workshop on tech translation and commercialization!","The VINE, VISTA, and F3 are hosting a focused and hands-on workshop on tech translation and commercialization!",Workshop,Technology-Translation-Workshop-UC-Merced.jpg,,,,,,Technology-Translation-Workshop-UC-Merced
15,Appy Hour,04/17/24,04/17/24,California Room UC Merced Campus,5:00 PM - 7:00 PM,"Join us for an evening filled with resources designed to jumpstart your entry into the professional workforce! Receive personalized advice on your resume and LinkedIn profile, connect with mentors, and leave with a professional headshot.","",Workshop,Appy_Hour.png,,,,,,appy-hour
16, Hack the Valley, 04/23/24,04/23/24, UC Merced Conference Center Ballroom, 5:00 - 7:00 PM,"Upgrade your resume with generative AI and algorithm skills, earn a LinkedIn badge, and join us for a fun evening of learning, tacos, and a raffle prize draw. Bring a laptop and a friend.","",Workshop,hack-the-valley-2.png,,,,,,hack-the-valley-2
15,Appy Hour,04/17/24,04/17/24,California Room UC Merced Campus,5:00 PM - 7:00 PM,"Join us for an evening filled with resources designed to jumpstart your entry into the professional workforce! Receive personalized advice on your resume and LinkedIn profile, connect with mentors, and leave with a professional headshot.","",Workshop,Appy_Hour.png,,https://forms.office.com/r/qY8Q26w6De,,,,appy-hour
16, Hack the Valley, 04/23/24,04/23/24, UC Merced Conference Center Ballroom, 5:00 - 7:00 PM,"Upgrade your resume with generative AI and algorithm skills, earn a LinkedIn badge, and join us for a fun evening of learning, tacos, and a raffle prize draw. Bring a laptop and a friend.","",Workshop,hack_valley_2.png,,https://forms.office.com/pages/responsepage.aspx?id=o-nf9HjKmEm3p-bQaS6s5vFOq2uMw0BPpn7S543HVaBUNE5PVFZVS0RaUlhYTzFQNzZKSTZHRzgyUC4u,,,,hack-the-valley-2
17,Bobcat Day, 04/20/24,04/20/24, Booth 805 and 806 in Science & Engineering 1 Lobby,8:00 AM - 3:00 PM,"Come see us at Bobcat Day and check out our drones and robots!","Come see us at Bobcat Day and check out our drones and robots!",Discussion,Bobcat_Day.png,,,,,,bobcat-day

0 comments on commit 1425b7a

Please sign in to comment.