Skip to content

Commit 6d4136b

Browse files
massimoariamassimoaria
authored
Merge pull request #359 from massimoaria/develop
Minor fix
2 parents 6bfaaf4 + 64d1941 commit 6d4136b

File tree

2 files changed

+62
-28
lines changed

2 files changed

+62
-28
lines changed

‎inst/biblioshiny/libraries.R

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,41 @@
22
libraries <- function(){
33
if (!(require(bibliometrix))){install.packages("bibliometrix"); require(bibliometrix)}
44
#if (!(require(badger, quietly=TRUE))){install.packages("badger"); require(badger, quietly=TRUE)}
5-
if (!(require(shiny, quietly=TRUE))){install.packages("shiny"); require(shiny, quietly=TRUE)}
6-
if (!(require(igraph, quietly=TRUE))){install.packages("igraph"); require(igraph, quietly=TRUE)}
7-
if (!(require(DT, quietly=TRUE))){install.packages("DT")};require(DT, quietly =TRUE)
8-
if (!(require(ggplot2, quietly=TRUE))){install.packages("ggplot2"); require(ggplot2, quietly=TRUE)}
9-
if (!(require(shinycssloaders, quietly=TRUE))){install.packages("shinycssloaders")}
10-
if (!(require(wordcloud2, quietly=TRUE))){install.packages("wordcloud2")}
11-
if (!require(ggmap, quietly=TRUE)){install.packages("ggmap"); require(ggmap, quietly=TRUE)}
12-
if (!require(maps, quietly=TRUE)){install.packages("maps"); require(maps, quietly=TRUE)}
13-
if (!require(visNetwork, quietly=TRUE)){install.packages("visNetwork"); require(visNetwork, quietly=TRUE)}
14-
if (!require(plotly, quietly=TRUE)){install.packages("plotly"); require(plotly, quietly=TRUE)}
15-
if (!require(fontawesome, quietly=TRUE)){install.packages("fontawesome"); require(fontawesome, quietly=TRUE)}
16-
if (!require(shinydashboardPlus, quietly=TRUE)){install.packages("shinydashboardPlus"); require(shinydashboardPlus, quietly=TRUE)}
17-
if (!require(shinydashboard, quietly=TRUE)){install.packages("shinydashboard"); require(shinydashboard, quietly=TRUE)}
18-
if (!require(shinyjs, quietly=TRUE)){install.packages("shinyjs"); require(shinyjs, quietly=TRUE)}
19-
#if (!require(shinyscreenshot, quietly=TRUE)){install.packages("shinyscreenshot"); require(shinyscreenshot, quietly=TRUE)}
20-
if (!require(openxlsx, quietly=TRUE)){install.packages("openxlsx"); require(openxlsx, quietly=TRUE)}
21-
if (!require(shinyWidgets, quietly=TRUE)){install.packages("shinyWidgets"); require(shinyWidgets, quietly=TRUE)}
22-
if (!require(webshot2)){install.packages("webshot2")}
23-
require(Matrix, quietly = TRUE)
24-
require(dimensionsR, quietly = TRUE)
25-
require(pubmedR, quietly = TRUE)
26-
require(dplyr, quietly = TRUE)
27-
require(tidyr, quietly = TRUE)
28-
29-
# packages not automatically downloaded by visNetwork
30-
if (!require(sparkline, quietly=TRUE)){install.packages("sparkline")}#; require(sparkline, quietly=TRUE)}
31-
if (!require(tidygraph, quietly=TRUE)){install.packages("tidygraph")}#; require(tidygraph, quietly=TRUE)}
32-
if (!require(ggraph, quietly=TRUE)){install.packages("ggraph")}#; require(tidygraph, quietly=TRUE)}
5+
suppressPackageStartupMessages({
6+
if (!(require(shiny, quietly=TRUE))){install.packages("shiny"); require(shiny, quietly=TRUE)}
7+
if (!(require(igraph, quietly=TRUE))){install.packages("igraph"); require(igraph, quietly=TRUE)}
8+
if (!(require(DT, quietly=TRUE))){install.packages("DT")};require(DT, quietly =TRUE)
9+
if (!(require(ggplot2, quietly=TRUE))){install.packages("ggplot2"); require(ggplot2, quietly=TRUE)}
10+
if (!(require(shinycssloaders, quietly=TRUE))){install.packages("shinycssloaders")}
11+
if (!(require(wordcloud2, quietly=TRUE))){install.packages("wordcloud2")}
12+
if (!require(ggmap, quietly=TRUE)){install.packages("ggmap"); require(ggmap, quietly=TRUE)}
13+
if (!require(maps, quietly=TRUE)){install.packages("maps"); require(maps, quietly=TRUE)}
14+
if (!require(visNetwork, quietly=TRUE)){install.packages("visNetwork"); require(visNetwork, quietly=TRUE)}
15+
if (!require(plotly, quietly=TRUE)){install.packages("plotly"); require(plotly, quietly=TRUE)}
16+
if (!require(fontawesome, quietly=TRUE)){install.packages("fontawesome"); require(fontawesome, quietly=TRUE)}
17+
if (!require(shinydashboardPlus, quietly=TRUE)){install.packages("shinydashboardPlus"); require(shinydashboardPlus, quietly=TRUE)}
18+
if (!require(shinydashboard, quietly=TRUE)){install.packages("shinydashboard"); require(shinydashboard, quietly=TRUE)}
19+
if (!require(shinyjs, quietly=TRUE)){install.packages("shinyjs"); require(shinyjs, quietly=TRUE)}
20+
#if (!require(shinyscreenshot, quietly=TRUE)){install.packages("shinyscreenshot"); require(shinyscreenshot, quietly=TRUE)}
21+
if (!require(openxlsx, quietly=TRUE)){install.packages("openxlsx"); require(openxlsx, quietly=TRUE)}
22+
if (!require(shinyWidgets, quietly=TRUE)){install.packages("shinyWidgets"); require(shinyWidgets, quietly=TRUE)}
23+
if (!require(webshot2,quietly=TRUE)){install.packages("webshot2")}
24+
if (!(require(chromote, quietly=TRUE))){install.packages("chromote"); require(chromote, quietly=TRUE)}
25+
26+
### workaround for webshot2 on shinyapps.io
27+
if (!(require(curl, quietly=TRUE))){install.packages("curl"); require(curl, quietly=TRUE)}
28+
if (!(require(pagedown, quietly=TRUE))){install.packages("pagedown"); require(pagedown, quietly=TRUE)}
29+
require(Matrix, quietly = TRUE)
30+
require(dimensionsR, quietly = TRUE)
31+
require(pubmedR, quietly = TRUE)
32+
require(dplyr, quietly = TRUE)
33+
require(tidyr, quietly = TRUE)
34+
35+
# packages not automatically downloaded by visNetwork
36+
if (!require(sparkline, quietly=TRUE)){install.packages("sparkline")}#; require(sparkline, quietly=TRUE)}
37+
if (!require(tidygraph, quietly=TRUE)){install.packages("tidygraph")}#; require(tidygraph, quietly=TRUE)}
38+
if (!require(ggraph, quietly=TRUE)){install.packages("ggraph")}#; require(tidygraph, quietly=TRUE)}
39+
})
3340
}
3441

3542
messageItem2 <- function (from, message, icon = shiny::icon("user"), time = NULL,

‎inst/biblioshiny/server.R

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,33 @@ server <- function(input, output,session){
99
## suppress warnings
1010
options(warn = -1)
1111

12+
## chrome configration for shinyapps server
13+
#message(curl::curl_version()) # check curl is installed
14+
if (identical(Sys.getenv("R_CONFIG_ACTIVE"), "shinyapps")) {
15+
chromote::set_default_chromote_object(
16+
chromote::Chromote$new(chromote::Chrome$new(
17+
args = c("--disable-gpu",
18+
"--no-sandbox",
19+
"--disable-dev-shm-usage", # required bc the target easily crashes
20+
c("--force-color-profile", "srgb"))
21+
))
22+
)
23+
}
24+
## end configuration
25+
26+
## Check if Chrome browser is installed on the computer
27+
if(is.null(chromote::find_chrome())){
28+
showModal(modalDialog(
29+
title = strong("Warning message!"),
30+
HTML("Chrome or a Chromium-based browser is not installed on your computer.<br>
31+
If you do not have either of these browsers installed, TALL will be unable to export graphs.<br>
32+
To ensure the functionality of TALL,
33+
please download Chrome by <a href='https://www.google.com/intl/it_it/chrome/' target='_blank' > <b>clicking here</b></a>."),
34+
footer = modalButton("Dismiss"),
35+
easyClose = TRUE
36+
))
37+
}
38+
1239
## file upload max size
1340
maxUploadSize <- 200 # default value
1441
maxUploadSize <- getShinyOption("maxUploadSize", maxUploadSize)

0 commit comments

Comments
 (0)