-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into hide_main_panelOptions
# Conflicts: # program/shinyApp/server.R
- Loading branch information
Showing
32 changed files
with
384 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
help_tab_sidebar_panel <- sidebarPanel( | ||
id = "sidebar_help_tab", | ||
h4("Sidebar"), | ||
div(id="firstQ",p("Here you can select parameters which are important for your analysis.") %>% helper(type = "markdown", content = "helpTab_question")), | ||
br(), | ||
div( | ||
id = "ImageSelectArea", | ||
shinyWidgets::virtualSelectInput( | ||
inputId = "ImageSelect", | ||
label = "Select Image", | ||
choices = c("nothing selected", "WelcomePage", "YouTube Tutorial"), | ||
selected = "nothing selected" | ||
) | ||
), | ||
# Horizontal line | ||
actionButton( | ||
inputId = "get_help", | ||
label = "GO!", | ||
icon = icon('paper-plane'), | ||
style = "color: #fffff; background-color: #90DBF4; border-color: #000000" | ||
), | ||
div( | ||
id = "horizontalLine", | ||
hr(style = "border-top: 1px solid #858585;") | ||
), | ||
div( | ||
id = "options", | ||
sliderInput("ImageWidth", | ||
label="image width", | ||
min = 50, | ||
max = 100, | ||
post = " %", | ||
value = 100), | ||
radioButtons( | ||
inputId = "ImageHeight", | ||
label = "image height", | ||
choices = c("300px","400px", "500px"), | ||
selected = "400px", | ||
) | ||
) | ||
# Add some option that renders the | ||
) | ||
|
||
|
||
|
||
help_tab_main_panel <- mainPanel( | ||
id = "mainPanel_help_tab", | ||
h4("Main Panel",id = "Test"), | ||
actionButton("start_tour", span(icon("hand-pointer"),"Tour around cOmicsArt"),style = "background-color: #00c6ff; color: white; padding: 10px 20px; border-radius: 10px; transition: transform 0.2s;"), | ||
div( | ||
id = "help_tab_info", | ||
htmlOutput(outputId = "help_tab_info", container = pre), | ||
), | ||
uiOutput(outputId = "WelcomePage_ui"), | ||
# Line break for additional spacing | ||
br(), | ||
div( | ||
# Action button | ||
actionButton( | ||
inputId = "NextPanel", | ||
label = "Take me to the Analysis Start", | ||
width = "100%", | ||
icon = icon('rocket'), | ||
style = "color: #050505; background-color: #70BF4F47; border-color: #000000" | ||
) | ||
) | ||
|
||
) | ||
|
||
|
||
help_tab_panel <- tabPanel( | ||
title = "Welcome to comicsArt ", | ||
id = "help_tab", | ||
fluid = T, | ||
h4("User Help"), | ||
################################################################################ | ||
# Data Selection | ||
################################################################################ | ||
help_tab_sidebar_panel, | ||
help_tab_main_panel | ||
) |
1 change: 1 addition & 0 deletions
1
program/shinyApp/helpfiles/DataSelection_DataUploadFileInput.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.