Merge pull request #74 from JGCRI/test-folder

Moves files to final folder
JGCRI · May 31, 2024 · 8608286 · 8608286
2 parents a0216e5 + 5b9ea76
commit 8608286
Show file tree

Hide file tree

Showing 87 changed files with 206 additions and 17,582 deletions.
diff --git a/.github/workflows/pkgdown.yml b/.github/workflows/pkgdown.yml
@@ -2,11 +2,9 @@ on:
   push:
     branches:
       - main
-      - master
   pull_request:
     branches:
       - main
-      - master
 
 name: docs
 

diff --git a/.github/workflows/rcmd.yml b/.github/workflows/rcmd.yml
@@ -19,9 +19,9 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
 
     steps:
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@main
       - uses: actions/checkout@v2
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-r@main
 
       - name: Install dependencies
         env:

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
@@ -22,9 +22,9 @@ jobs:
 
     steps:
 
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@main
       - uses: actions/checkout@v2
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-r@main
 
       - name: Install dependencies
         env:

diff --git a/h2/outfile_area.jpeg b/h2/outfile_area.jpeg
diff --git a/h2/outfile_bar.gif b/h2/outfile_bar.gif
diff --git a/h2/www/images/GCIMS_logo_alt.svg b/h2/www/images/GCIMS_logo_alt.svg
diff --git a/h2/www/images/GitHub-logo.png b/h2/www/images/GitHub-logo.png
diff --git a/h2/www/images/Hector-sm.png b/h2/www/images/Hector-sm.png
diff --git a/h2/www/images/earth-header.png b/h2/www/images/earth-header.png
diff --git a/h2/www/images/hectorcal-doi.svg b/h2/www/images/hectorcal-doi.svg
diff --git a/h2/www/images/line.png b/h2/www/images/line.png
diff --git a/h2/app.r → inst/shinyApp/app.r b/h2/app.r → inst/shinyApp/app.r
@@ -7,7 +7,7 @@ ui <- fluidPage(theme = shinythemes::shinytheme("readable"),
            tags$div(
                a(
                    img(src = "images/GCIMS_logo_alt.svg", class = "logo"), href = "https://gcims.pnnl.gov/", target = "_blank"),
-               h1("HectorUI - BETA", class = "header-text-title"),
+               h1("HectorUI", class = "header-text-title"),
                h2("An Interactive Climate Model", class = "header-text-sub", style = "font-weight:normal; "),
            ),
   ),
@@ -32,7 +32,7 @@ ui <- fluidPage(theme = shinythemes::shinytheme("readable"),
                  ))
              )
     ),
-    tabPanel(title = "Run Hector",
+    tabPanel(title = "Explore Hector",
              fluidRow(
                run_ui("run_1")
              )
@@ -69,13 +69,10 @@ ui <- fluidPage(theme = shinythemes::shinytheme("readable"),
                      tabPanel
                      (
                          p(icon("info-circle", "fa-2x"), "Hector Information", value="infoTab"),
-                         h5("Background Information"), tags$hr(class="hrNav"),
                          tags$table(
                              tags$tr(
                                  tags$td(width = "50%",
-                                         h5("Explore the Hector Product Family", style="text-align: left"),
-                                         br(),
-                                         h6("Source code and contribution is available on the ",
+                                         h5("Source code and contribution is available on the ",
                                             a("HectorUI Github page", href = "https://github.com/JGCRI/hector", target = "_blank")),
                                  ),
                              )
@@ -199,8 +196,10 @@ ui <- fluidPage(theme = shinythemes::shinytheme("readable"),
                      tabPanel
                      (
                          p(icon("comment", "fa-2x"), "Support", value="feedbackTab"),
-                         h5("To contact the Hector team regarding any questions, concerns, suggestions, or problems, please use",
-                           a("Github issues.", href = "https://github.com/JGCRI/hectorui/issues/new/choose"))
+                         h5("To contact the Hector model team regarding any questions, concerns, suggestions, or problems, please submit a Hector",
+                           a("Github issues.", href = "https://github.com/JGCRI/hector/issues/new/choose")),
+                         h5("For HectorUI questions, concerns, suggestions, or problems, please submit a HectorUI",
+                            a("Github issues.", href = "https://github.com/JGCRI/hectorui/issues/new/choose"))
                      )
                  )
              )
@@ -214,7 +213,7 @@ server <- function(input, output, session) {
   r6 <- HectorInputs$new() # r6 class
   r6_tracking <- HectorInputs$new() # separate r6 class for carbon tracking
   r6_custom <- HectorInputs$new()
-  observeEvent(input$launch_scenario, updateTabsetPanel(session, "nav", selected = "Run Hector"), ignoreInit = TRUE)
+  observeEvent(input$launch_scenario, updateTabsetPanel(session, "nav", selected = "Explore Hector"), ignoreInit = TRUE)
 
   run_server("run_1", r6 = r6)
   summary_server("summary_1", r6 = r6)

diff --git a/...ponents/functions/func_custom_emissions.R → ...ponents/functions/func_custom_emissions.R b/...ponents/functions/func_custom_emissions.R → ...ponents/functions/func_custom_emissions.R
diff --git a/h2/components/functions/func_graph_plots.R → ...p/components/functions/func_graph_plots.R b/h2/components/functions/func_graph_plots.R → ...p/components/functions/func_graph_plots.R
diff --git a/h2/components/layout/footer.html → inst/shinyApp/components/layout/footer.html b/h2/components/layout/footer.html → inst/shinyApp/components/layout/footer.html
diff --git a/h2/components/layout/homepage.html → .../shinyApp/components/layout/homepage.html b/h2/components/layout/homepage.html → .../shinyApp/components/layout/homepage.html
diff --git a/h2/components/layout/style copy.css → ...shinyApp/components/layout/style copy.css b/h2/components/layout/style copy.css → ...shinyApp/components/layout/style copy.css
@@ -6,14 +6,20 @@ h5 {
 body
 {
 	font-family:"Barlow Regular", Sans-Serif !important;
+	font-size: 16px;
 }
 
 /* * {
     font-family:"Barlow Regular", Sans-Serif !important;
 }*/
 .about-info
 {
-    font-size: 12px;
+    font-size: 16px;
+}
+
+.popover
+{
+    font-family:"Barlow Regular", Sans-Serif !important;
 }
 
 .c-emissions
@@ -29,7 +35,7 @@ body
 .header-text-title
 {
     position: absolute;
-    color: #8B0000;
+    color: white;
     top: 40%;
     left: 50%;
     text-align: center;!important

diff --git a/h2/components/modules/mod_custom.r → .../shinyApp/components/modules/mod_custom.r b/h2/components/modules/mod_custom.r → .../shinyApp/components/modules/mod_custom.r
@@ -27,9 +27,31 @@ custom_ui <- function(id) {
                                                                           "SSP 5-8.5"="input/hector_ssp585.ini"),
                                                            width=150, selected = "SSP 2-4.5"))
                 ),
+                tags$tr(width = "100%",
+                        tags$td(width = "145", "Output Variable:"),
+                        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()),
+                                                                "Concentrations" = list("N2O Concentration" = CONCENTRATIONS_N2O()),
+                                                                "Emissions" = list("Black Carbon Emissions" = EMISSIONS_BC(),
+                                                                                   "Organic Carbon Emissions" = EMISSIONS_OC()),
+                                                                "Forcings" = list("RF - Total" = RF_TOTAL(),
+                                                                                  "RF - Albedo" = RF_ALBEDO(),
+                                                                                  "RF - CO2" = RF_CO2(),
+                                                                                  "RF - N2O" = RF_N2O(),
+                                                                                  "RF - Black Carbon" = RF_BC(),
+                                                                                  "RF - Organic Carbon" = RF_OC(),
+                                                                                  "RF - Total SO2" = RF_SO2(),
+                                                                                  "RF - Volcanic Activity" = RF_VOL(),
+                                                                                  "RF - CH4" = RF_CH4())),
+                                                           selected = "Atmospheric CO2", multiple = FALSE)
+
+                        )
+                ),
                 tags$tr(width = "100%",
                         tags$td(width = "145", "Your Scenario Name:"),
-                        tags$td(width = "200",  textInput(ns("input_custom_scenarioName"), label = NULL, width=195, value = ""))
+                        tags$td(width = "200",  textInput(ns("input_custom_scenarioName"), label = NULL, value = ""))
                 )
             ),
             div(
@@ -86,25 +108,6 @@ custom_ui <- function(id) {
             )
         ),
         mainPanel(
-            fluidRow(
-                       selectInput(ns("variable"), "Output Variable:",
-                                   list("Carbon Cycle" = list("Atmospheric CO2" = CONCENTRATIONS_CO2(),
-                                                              "FFI Emissions" = FFI_EMISSIONS(),
-                                                              "LUC Emissions" = LUC_EMISSIONS()),
-                                        "Concentrations" = list("N2O Concentration" = CONCENTRATIONS_N2O()),
-                                        "Emissions" = list("Black Carbon Emissions" = EMISSIONS_BC(),
-                                                           "Organic Carbon Emissions" = EMISSIONS_OC()),
-                                        "Forcings" = list("RF - Total" = RF_TOTAL(),
-                                                          "RF - Albedo" = RF_ALBEDO(),
-                                                          "RF - CO2" = RF_CO2(),
-                                                          "RF - N2O" = RF_N2O(),
-                                                          "RF - Black Carbon" = RF_BC(),
-                                                          "RF - Organic Carbon" = RF_OC(),
-                                                          "RF - Total SO2" = RF_SO2(),
-                                                          "RF - Volcanic Activity" = RF_VOL(),
-                                                          "RF - CH4" = RF_CH4())),
-                                   selected = "Atmospheric CO2", multiple = FALSE)
-            ),
             fluidRow(
                 actionButton(ns("input_load_emissions"), label="Create Scenario", width = '150px', style = "background: #0B3F8F; color: white;"),
                 downloadButton(ns("downloadData"), label="Download Data", style = "background: #B8B8B8; color: black;")

diff --git a/h2/components/modules/mod_download.R → ...hinyApp/components/modules/mod_download.R b/h2/components/modules/mod_download.R → ...hinyApp/components/modules/mod_download.R