Merge branch 'main' into adelle/more-updates

# Conflicts:
#	app/pages/4_Additional_Resources.py

README.md

@@ -1,6 +1,47 @@
-# ohw24_proj_HAB_FE_us
+# P.A.C.E.: People Accessing Cool Examples
 
-### Set up
+## Collaborators
+| Name                | Location   | Role                |
+|---------------------|------------|---------------------|
+| Adelle              | Bigelow    | Participant         |
+| Adam                | Bigelow    | Participant         |
+| Kasandra            | Bigelow    | Participant         |
+
+## Project Description
+The goal is to create an app that will use Streamlit to make it easy to view and explore PACE (Plankton, Aerosol, Cloud, ocean Ecosystem) data, with a focus on algal blooms. The app will let users interact with the data through simple controls like sliders and date selection, and see some updates in real time. It will be easy to use, gathering data from different sources and showing it in a clear way. We worked on building and testing the app, using Streamlit and other libraries, while making sure the data fits together well.
+
+## Planning
+* Initial idea: Create an app to help showcase PACE data
+* Final idea: Create an app to help showcase the culmination of data from the three PACE data teams.
+* Ideation Presentation: [Link](https://docs.google.com/presentation/d/1SR6d_zO2U5_nc25R4WQ_o4BMq0qJhAeIvwECZf4PzvU/edit#slide=id.p)
+* Slack channel: ohw24_proj_hab_fe_us
+* Final presentation: TBD
+
+## Resources
+* streamlit.com
+* https://github.com/oceanhackweek/ohw24_proj_pace_us
+
+#### To run this application: `streamlit run --server.runOnSave true app/app.py`
+
+## This README includes instructions on how to spin up your very own Streamlit app locally. 
+#### Unfortunately, we were not able to figure out how to run this in JupyterHub
+
+#### Instructions using conda (please note this workflow has not been extensively tested so please get assistance from someone familiar with setting up local environments)
+1. Install conda/miniconda/anaconda: https://docs.anaconda.com/
+There are two options:
+2. In your computer's terminal
+   a. `git clone repo`
+   b. `conda create --name env-name`
+   c. `conda activate env-name`
+   d. `pip install -r requirements.txt` which can be copied from this repo and customized to include the packages you need
+or 
+2. In your computer's terminal
+   a. `git clone repo`
+   b. `conda env create -f environment.yml`
+   c. `conda activate ohw-streamlit`
+3. Create `streamlit.py` which you can name whatever you want
+4. Examples in the tutorial here: https://github.com/oceanhackweek/ohw24_proj_HAB_FE_us/tree/main/tutorial
+5. Add your code!
+6. Run `streamlit run streamlit.py` or update to use your file name
+   If you would like the app to update every time you save (this is good for debugging) run `streamlit run --server.runOnSave true streamlit.py`
 
-### Run streamlit app locally
-`streamlit run --server.runOnSave true app/app.py`

app/pages/4_Additional_Resources.py

@@ -2,18 +2,26 @@
 import time
 import numpy as np
 
+
+st.set_page_config(page_title="Additional Resources", page_icon=":books:")
+
 st.markdown("# Additional Resources")
 st.sidebar.header("Additional Resources")
 st.write("""
 This page provides you with additional resources that you may find useful for further exploration and learning.
 Feel free to browse through the various categories of resources listed below.
 """)
 
+st.image("https://pace.oceansciences.org/images/data-06.png", use_column_width=True)
 st.subheader("About PACE")
 st.write("""
     - [About PACE](https://pace.oceansciences.org/about.htm)
     - [About PACE Data](https://pace.oceansciences.org/access_pace_data.htm)
 """)
+
+
+st.image("https://cmg-cmg-tv-10070-prod.cdn.arcpublishing.com/resizer/ndXbn2gVvq8q_Wg7lM9LcH-A8sg=/800x0/filters:format(jpg):quality(70)/cloudfront-us-east-1.images.arcpublishing.com/cmg/U4PBIYEZKJDU3GJ4K2E576K6GY.jpg")
+
 # progress_bar = st.sidebar.progress(0)
 # status_text = st.sidebar.empty()
 # last_rows = np.random.randn(1, 1)