Skip to content

Commit

Permalink
Added logo again
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulJonasJost committed Sep 6, 2023
1 parent 0e63de7 commit 7462fcf
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 19 deletions.
Binary file added program/shinyApp/Logo_cOmicsArt.pdf
Binary file not shown.
3 changes: 0 additions & 3 deletions program/shinyApp/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ server <- function(input,output,session){

## create data object ----
data_input_shiny <- eventReactive(input$refresh1,{
browser()
if(!isTruthy(input$data_preDone) & !FLAG_TEST_DATA_SELECTED()){
# Include here, that the sample anno can be replaced by metadatasheet
# potentially this will be extended to all of the fields
Expand Down Expand Up @@ -481,7 +480,6 @@ server <- function(input,output,session){
)
#TODO make the copy and tab show process dependent if we get here a results object or 'simple' rds
}
browser()
# TODO SumExp only needed hence more restructuring needed
res_tmp[['data_original']] <<- data_input[[paste0(input$omicType,"_SumExp")]]
# Make a copy, to leave original data untouched
Expand Down Expand Up @@ -530,7 +528,6 @@ server <- function(input,output,session){
isTruthy(res_tmp$data)
# Row
output$providedRowAnnotationTypes_ui=renderUI({
browser()
req(data_input_shiny())
shinyWidgets::virtualSelectInput(
inputId = "providedRowAnnotationTypes",
Expand Down
44 changes: 28 additions & 16 deletions program/shinyApp/ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,31 +89,34 @@ ui <- shiny::fluidPage(
color: black
}
.tabbable > .nav > li[class=active] > a {
background-color: #90DBF4; color:black
background-color: #7a7e80; color:black
}
#sidebar_data_selection {
background-color: #90DBF4;
background-color: #EC001447;
}
#sidebar_pre_processing {
background-color: #8EECF5;
background-color: #FD8D3347;
}
#sidebar_pca {
background-color: #F1C0E8;
#sidebar_sampleCorrelation {
background-color: #FFD33547;
}
#sidebar_significance_analysis {
background-color: #FDE4CF;
background-color: #70BF4F47;
}
#sidebar_pca {
background-color: #3897F147;
}
#sidebar_volcano_plot {
background-color: #FFCFD2;
background-color: #A208BA47;
}
#sidebar_heatmap {
background-color: #F1C0E8;
background-color: #EC001447;
}
#sidebar_single_gene_visualisation {
background-color: #B9FBC0;
background-color: #FD8D3347;
}
#sidebar_enrichment_analysis {
background-color: #CFBAF0;
background-color: #FFD33547;
}
"))
),
Expand Down Expand Up @@ -151,11 +154,15 @@ ui <- shiny::fluidPage(
"element",
label = "PrideMonth?",
choices = c(0, 1),
selected = ifelse(format(as.POSIXct(Sys.time()), "%m") == "06", 1, 0)
selected = ifelse(format(as.POSIXct(Sys.time()), "%m") == "07", 1, 0)
)),
conditionalPanel(
condition = "input.element == 0",
div(id = "TitleID_normal",titlePanel("ShinyOmics")),
div(
id = "TitleID_normal",
column(width=1, tags$img(src = "Logo_cOmicsArt_clear.png", height="100%", width="100%")),
h1(HTML('<span style="color:#EC0014">c</span><span style="color:#FD8D33">O</span><span style="color:#3897F1">m</span><span style="color:#FFD335">i</span><span style="color:#A208BA">c</span><span style="color:#EF0089">s</span><span style="color:#EC0014">A</span><span style="color:#FD8D33">r</span><span style="color:#3897F1">t</span>'))
),
),
conditionalPanel(
condition = "input.element == 1",
Expand Down Expand Up @@ -198,10 +205,15 @@ ui <- shiny::fluidPage(
})),
conditionalPanel(
condition = "input.element_02 == 0",
div(
id = "foot_normal",
absolutePanel("Brought to you by Lea Seep & Paul Jonas Jost", bottom = 0, left = 10, fixed = TRUE)
)
absolutePanel("Brought to you by Lea Seep & Paul Jonas Jost",
bottom = 0, left = 10, fixed = TRUE)
## TODO Discuss this placement
# div(
# id = "foot_normal",
# absolutePanel(column(width=1, tags$img(src = "Logo_cOmicsArt_clear.png", height="100%", width="100%")),
# h5(HTML("Brought to you by Lea Seep & Paul Jonas Jost")),
# bottom = 0, left = 10, fixed = TRUE)
# )
),
conditionalPanel(
condition = "input.element_02 == 1",
Expand Down

0 comments on commit 7462fcf

Please sign in to comment.