diff --git a/program/shinyApp/R/C.R b/program/shinyApp/R/C.R index b053fec0..99e1551b 100644 --- a/program/shinyApp/R/C.R +++ b/program/shinyApp/R/C.R @@ -220,21 +220,21 @@ CUSTOM_THEME <<- theme_bw(base_size = 15) + plot.title = element_text(size = 17, face = "bold") # Plot title ) - - -LOADING_SCREEN <<- tagList( +LOADING_SCREEN <- tagList( div( - style = "position: relative; display: flex; justify-content: center; align-items: center;", - div( - style = "display: flex;", - img(src = "bored_panda_11.png", style = "max-width: 100%; height: auto;"), - img(src = "bored_panda_12.png", style = "max-width: 100%; height: auto;") - ), + style = "position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; display: flex; justify-content: center; align-items: center; padding: 0; margin: 0; box-sizing: border-box; overflow: hidden; background-color: rgba(225, 225, 225, 0.5);", # Light background color div( - style = "position: absolute; top: 20%; left: 60%; transform: translate(-50%, -50%); display: flex; flex-direction: column; align-items: center; color: white; font-size: 24px; font-weight: bold;", - spin_flower(), - span("Computing...") + style = "display: flex; flex-direction: column; align-items: center; width: auto; height: auto; padding: 20px; margin: 0; box-sizing: border-box; background-color: rgba(225, 225, 225, 0); border-radius: 10px;", # Slightly darker background behind images + # Centered Images + img(src = "bored_panda_11.png", style = "width: 50%; height: auto; object-fit: contain; margin-bottom: 10px; padding: 0;"), + img(src = "bored_panda_12.png", style = "width: 50%; height: auto; object-fit: contain; margin: 0; padding: 0;"), + + # Centered Spinner and Text + div( + style = "position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); display: flex; flex-direction: column; align-items: center; color: white; font-size: 24px; font-weight: bold;", + spin_flower(), + span("Computing...") + ) ) ) -) - +) \ No newline at end of file diff --git a/program/shinyApp/R/enrichment_analysis/server.R b/program/shinyApp/R/enrichment_analysis/server.R index 89532f44..e46d2e39 100644 --- a/program/shinyApp/R/enrichment_analysis/server.R +++ b/program/shinyApp/R/enrichment_analysis/server.R @@ -489,7 +489,6 @@ enrichment_analysis_Server <- function(id, data, params, updates){ observeEvent(input$enrichmentGO,{ ea_reactives$ea_info <- "Enrichment is running..." waiter <- Waiter$new( - id=ns("EnrichmentTabs"), html = LOADING_SCREEN, color="#70BF4F47" ) diff --git a/program/shinyApp/R/heatmap/server.R b/program/shinyApp/R/heatmap/server.R index 7e355439..292192e7 100644 --- a/program/shinyApp/R/heatmap/server.R +++ b/program/shinyApp/R/heatmap/server.R @@ -136,7 +136,6 @@ heatmap_server <- function(id, data, params, updates){ ) req(selectedData_processed()) waiter <- Waiter$new( - id=ns("HeatmapPlot"), html = LOADING_SCREEN, color="#70BF4F47" ) diff --git a/program/shinyApp/R/pca/server.R b/program/shinyApp/R/pca/server.R index 72c5dc34..05c5bf70 100644 --- a/program/shinyApp/R/pca/server.R +++ b/program/shinyApp/R/pca/server.R @@ -158,7 +158,6 @@ pca_Server <- function(id, data, params, row_select){ req(data$data) req(input$Do_PCA[1] > 0) waiter <- Waiter$new( - id="plot_panels_pca", html = LOADING_SCREEN, color="#70BF4F47" ) diff --git a/program/shinyApp/R/sample_correlation/server.R b/program/shinyApp/R/sample_correlation/server.R index f7c6d6dd..88e15bc1 100644 --- a/program/shinyApp/R/sample_correlation/server.R +++ b/program/shinyApp/R/sample_correlation/server.R @@ -50,7 +50,6 @@ sample_correlation_server <- function(id, data, params){ req(input$SampleAnnotationChoice) req(input$Do_SampleCorrelation > 0) waiter <- Waiter$new( - id=ns("SampleCorrelationPlot"), html = LOADING_SCREEN, color="#A208BA35" ) diff --git a/program/shinyApp/R/significance_analysis/server.R b/program/shinyApp/R/significance_analysis/server.R index e3374ca3..9533adad 100644 --- a/program/shinyApp/R/significance_analysis/server.R +++ b/program/shinyApp/R/significance_analysis/server.R @@ -196,7 +196,6 @@ significance_analysis_server <- function(id, data, params){ observeEvent(sig_ana_reactive$start_analysis,{ req(sig_ana_reactive$start_analysis > 0) waiter <- Waiter$new( - id=ns("significance_analysis_results"), html = LOADING_SCREEN, color="#70BF4F47", hide_on_render=F diff --git a/program/shinyApp/server.R b/program/shinyApp/server.R index 08d835e1..a27b0b57 100644 --- a/program/shinyApp/server.R +++ b/program/shinyApp/server.R @@ -913,9 +913,9 @@ server <- function(input,output,session){ # only enter this when you actually click data req(input$Do_preprocessing > 0) waiter <- Waiter$new( - id="data_summary", html = LOADING_SCREEN, - color="#3897F147", + #color="#3897F147", + color = "rgba(255,255,255,0)", hide_on_render=FALSE ) waiter$show()