Merge branch 'main' into bug-disconnect

JGCRI · Sep 4, 2024 · 472e844 · 472e844
2 parents 80982e6 + 1d11114
commit 472e844
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-fix.md b/.github/ISSUE_TEMPLATE/bug-fix.md
@@ -0,0 +1,42 @@
+---
+name: Bug Fix
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+If you have a question or comment, please use our community discussion forum at <https://github.com/JGCRI/hectorui/discussions> instead.
+
+Submitter:
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/new-feature.md b/.github/ISSUE_TEMPLATE/new-feature.md
@@ -0,0 +1,24 @@
+---
+name: New Feature
+about: Suggest a new feature for HectorUI
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+If you have a question or comment, please use our community discussion forum at <https://github.com/JGCRI/hectorui/discussions> instead.
+
+Submitter:
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe the importance of this new feature**
+How will this help enable research or understanding? How will this make HectorUI more useful?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/templates/PULL_REQUEST_TEMPLATE.md → .github/PR_TEMPLATE/PULL_REQUEST_TEMPLATE.md b/.github/templates/PULL_REQUEST_TEMPLATE.md → .github/PR_TEMPLATE/PULL_REQUEST_TEMPLATE.md
diff --git a/inst/shinyApp/components/modules/mod_custom.r b/inst/shinyApp/components/modules/mod_custom.r
@@ -32,7 +32,11 @@ custom_ui <- function(id) {
                         tags$td(width = "155", selectInput(ns("variable"), label = NULL,
                                                            list("Carbon Cycle" = list("Atmospheric CO2" = CONCENTRATIONS_CO2(),
                                                                                       "FFI Emissions" = FFI_EMISSIONS(),
-                                                                                      "LUC Emissions" = LUC_EMISSIONS()),
+                                                                                      "LUC Emissions" = LUC_EMISSIONS(),
+                                                                                      "Methane Concentrations" = CONCENTRATIONS_CH4()),
+                                                                "Temperature" = list("Global Temperature" = GLOBAL_TAS(),
+                                                                                     "Ocean Temperature" = OCEAN_TAS(),
+                                                                                     "Ocean Surface Temperature" = SST()),
                                                                 "Concentrations" = list("N2O Concentration" = CONCENTRATIONS_N2O()),
                                                                 "Emissions" = list("Black Carbon Emissions" = EMISSIONS_BC(),
                                                                                    "Organic Carbon Emissions" = EMISSIONS_OC()),

diff --git a/inst/shinyApp/components/modules/mod_run.R b/inst/shinyApp/components/modules/mod_run.R
@@ -55,10 +55,14 @@ run_ui <- function(id) {
             ),
             fluidRow(
                 br(),
-                selectInput(ns("variable"), "Output Variable:",
+                selectInput(ns("variable"), "Output Variable (please choose after clicking Load Graph):",
                             list("Carbon Cycle" = list("Atmospheric CO2" = CONCENTRATIONS_CO2(),
                                                        "FFI Emissions" = FFI_EMISSIONS(),
-                                                       "LUC Emissions" = LUC_EMISSIONS()),
+                                                       "LUC Emissions" = LUC_EMISSIONS(),
+                                                       "Methane Concentrations" = CONCENTRATIONS_CH4()),
+                                 "Temperature" = list("Global Temperature" = GLOBAL_TAS(),
+                                                      "Ocean Temperature" = OCEAN_TAS(),
+                                                      "Ocean Surface Temperature" = SST()),
                                  "Concentrations" = list("N2O Concentration" = CONCENTRATIONS_N2O()),
                                  "Emissions" = list("Black Carbon Emissions" = EMISSIONS_BC(),
                                                     "Organic Carbon Emissions" = EMISSIONS_OC()),

diff --git a/inst/shinyApp/components/modules/mod_tracking.R b/inst/shinyApp/components/modules/mod_tracking.R
@@ -58,7 +58,7 @@ tracking_ui <- function(id) {
             downloadButton(ns("download"),"Download Plot", style = "background: #B8B8B8; color: black;")
         ),
         fluidRow(
-            withSpinner(plotOutput(ns("fig"), width = "80%"))#,
+            plotOutput(ns("fig"), width = "80%")#,
             # imageOutput(ns("gif"), width = "80%")
         )
     )