From ab791ff0064ab2e24b406810454d2c53a69d9dfd Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Tue, 5 Mar 2024 14:36:15 -0800 Subject: [PATCH 1/8] add new sage logo to favicon.ico --- inst/app/www/favicon.ico | Bin 3774 -> 15086 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/inst/app/www/favicon.ico b/inst/app/www/favicon.ico index 4c0982c026551c9cf45043e2a9ce56f58ef9a817..5cd5cde9706f20d4143b39b26fc29e571447a16b 100644 GIT binary patch literal 15086 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 literal 3774 zcmbVPdr(y872nKcrvJ2QC*wGsRAiTzSg?>?a93a#c7X+#W!dKiG!!9-K;-=tQB24B zjCRt*m|)Ua)YO>z3>9P*6txqRm>Lrwkkqj?lGd6A&{ie}em&`PU%m*_j3tXjwR`&S-$5?iV3ruH0Kv-77nWteuL2Tvk3J369Jwf8iNx?pg_C@Un11n zg#g12#6@X_9j2)Bj>JXbQ(;Rwo-<6^9}w@0DREHU3ECgZgw41bagC{=eChg;Ch9`4U4EoO_qa5%z9u#X7=ovt; z`!ht^Phg(w27=swC(e5^-g^ji-$Crs_mG?SD})Pw7Waa(zJkC06{w>#usA;M4q-2| z8nv^Sm10PDnzWsX20Q!>yPAHz4!<7_se`}5#7Tb%M zn>j-9agBz=dW8|b%JXkAW)Bf@?XD)%4?%iGYhaT^i~KE-_d#j&&Z z;rMwT!tHn-+jHF@t|3oyEDo2ifZMqPb3MZ%HrFOl7(l3-&PTXEu49>F=erZ=`4V9c zsu{%=MDl{H+febo>l&^3Zu#!j6ZX5v^=!kj%3`>aV@GJ9v%VbF*^T&#K;bA`C*4w203P-icl^A%BMKR?@F5UF1erR9CmhT~INE~0s9B~H|p zGvC+D*HK@I_UdAkJ60e(PL=*fq-t`vW$tr*X*y^i?nt8lup3P;M8p{KEe za<0OuRn>Sd+l}zVRW{O}SP5 zFCTGsjPdf!!`o1WSMqZ(KdK5!C-=f2l(tVOr@zv<_L0o@e+d4L&!LVg#IcGMV%(BH z=OAJd)^T5cqkNw2wS2xl4#`%UPc@W5tI3AH{Wby|x3DCC6;g6`BeV1{QkT2{WyTEz zIB&xhFW?NFkK`wx8C%9Tdi)#sdYWpH^kghlj(*Ht`~l{~?t;Jh43w#7@I>tEP}y%G z$kmSmQv%haW`=wf)8^ORSc_*8^$1RA_4Nk#2j5|FaIetc7~K|Z6dYo`<#|c6FTYB@ zFMOVq-}HQZm(H%K!+Jr0()uy=*n@FCCCNdlJ!r|x#_83yQ|88;%*Qq3+I<_J6k~T| zC5r5&2uVGKS;?32gL;bls+0Qq@6p%MhQ9VTeDM0K_|)5h58r6T<^6Bq>d}KZy?z}&errG8Yk3Km_O;^Nw$11u z-*Fs~&le--N8b+jURs`ucB-LQ&dGdRHsIoGE%@loeYke?FnVZx{p}-^?_R?GEqaf) zp=Z;2TyHxja&Zi7Bj;mGzW+N5bNPLApWcD?Omkd!jmL_;D+_Uw&PK}LySk2Y+&~z= zME5V&im{)2ZWG?$^)kBFHR1gBt>W4K@%e2yw|$EkpSP*rcgB<#W9@mS5H)Tq1aq91 zxNQ86PccNzvYB+tvdsEBP1z3W70Q)s!uN$_F!+U@=akpt+hpcqU&bJ;9fbLPIfo?Eo+K*LjoNT) z!ost~HuG@n%H?9L(iu<1$9tU597-e{XEtbZ={xeBwb{j+3+yu$mZY0%mUB{VXPe^G<+&E)_2wl`94IeA*Qy$Eyj4+xXP3IL z%wp^#n@XzDcmAH2_?c7AYu0O2RQJ_+X{Lu8as+J3%|w2hX_R!$v=<=x@hta~>t`a% zed(L^QL4YvnHY0``u32`qz$kd7k;Pz$8fWG0H@;zp!ngysN#DA!-_`+ZYmTN>lBI~ W%_N?g*f7>j!engbU@no9xc>v_w5JCE From f78f395efa7123edad95b19353df642055243734 Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Tue, 5 Mar 2024 15:28:37 -0800 Subject: [PATCH 2/8] remove favicon --- inst/app/www/favicon.ico | Bin 15086 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 inst/app/www/favicon.ico diff --git a/inst/app/www/favicon.ico b/inst/app/www/favicon.ico deleted file mode 100644 index 5cd5cde9706f20d4143b39b26fc29e571447a16b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15086 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 From cff6db2f60a73c4c4952c35143d0c384a2ef9db1 Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Tue, 5 Mar 2024 16:08:42 -0800 Subject: [PATCH 3/8] add new sage icon --- inst/app/www/favicon.ico | Bin 0 -> 15086 bytes inst/app/www/sage_logo_mark_only.png | Bin 0 -> 5723 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 inst/app/www/favicon.ico create mode 100644 inst/app/www/sage_logo_mark_only.png diff --git a/inst/app/www/favicon.ico b/inst/app/www/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5cd5cde9706f20d4143b39b26fc29e571447a16b GIT binary patch literal 15086 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 literal 0 HcmV?d00001 diff --git a/inst/app/www/sage_logo_mark_only.png b/inst/app/www/sage_logo_mark_only.png new file mode 100644 index 0000000000000000000000000000000000000000..127ffadd35014bf8991e601370b3434dda28151f GIT binary patch literal 5723 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 Date: Wed, 6 Mar 2024 10:51:11 -0800 Subject: [PATCH 4/8] update favicon --- R/app_ui.R | 9 ++++++++- R/global.R | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/R/app_ui.R b/R/app_ui.R index 73c04ad..4f52091 100644 --- a/R/app_ui.R +++ b/R/app_ui.R @@ -10,6 +10,13 @@ app_ui <- function() { shiny::tagList( # Leave this function for adding external resources golem_add_external_resources(), + + tags$head( + tags$link( + rel="shortcut icon", + href=FAVICON_URL + ) + ), # initialize shinyjs shinyjs::useShinyjs(), @@ -154,7 +161,7 @@ golem_add_external_resources <- function() { ) tags$head( - favicon(), + favicon(resources_path = app_sys("app/www")), bundle_resources( path = app_sys("app/www"), app_title = "Data Flow" diff --git a/R/global.R b/R/global.R index 49a5bea..6bdc09c 100644 --- a/R/global.R +++ b/R/global.R @@ -65,3 +65,8 @@ api <- httr::oauth_endpoint( # The 'openid' scope is required by the protocol for retrieving user information. scope <- "openid view download modify" +FAVICON_URL <- file.path( + "https://raw.githubusercontent.com/Sage-Bionetworks/data_flow", + "dev", # FIXME: Automate branch via env variable + "inst/app/www/favicon.ico" +) \ No newline at end of file From 762fa41aaae43403954a87166ed2fe20a2fdfd49 Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Wed, 6 Mar 2024 11:11:08 -0800 Subject: [PATCH 5/8] use new sage logo animation --- R/app_server.R | 2 +- R/app_ui.R | 2 +- inst/app/www/sage-loader.svg | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 inst/app/www/sage-loader.svg diff --git a/R/app_server.R b/R/app_server.R index 902f3c5..a11c95b 100644 --- a/R/app_server.R +++ b/R/app_server.R @@ -84,7 +84,7 @@ app_server <- function( input, output, session ) { # show waiter on button click waiter::waiter_show( html = shiny::tagList( - shiny::img(src = "www/loading.gif"), + shiny::img(src = "www/sage-loader.svg"), shiny::h3("Getting data. This may take a moment.", style = "color:white;")), color="#424874" ) diff --git a/R/app_ui.R b/R/app_ui.R index 4f52091..69970f4 100644 --- a/R/app_ui.R +++ b/R/app_ui.R @@ -71,7 +71,7 @@ app_ui <- function() { waiter::use_waiter(), waiter::waiter_preloader( html = shiny::tagList( - shiny::img(src = "www/loading.gif"), + shiny::img(src = "www/sage-loader.svg"), shiny::h4("Retrieving Synapse information...", style = "color:white;") ), color = "#424874" diff --git a/inst/app/www/sage-loader.svg b/inst/app/www/sage-loader.svg new file mode 100644 index 0000000..5c34fe7 --- /dev/null +++ b/inst/app/www/sage-loader.svg @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file From a017db9e1f0be62451803c4c5deb7444ced073dc Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Wed, 6 Mar 2024 11:12:33 -0800 Subject: [PATCH 6/8] clean up inst --- inst/app/www/loading.gif | Bin 57353 -> 0 bytes inst/data_model/dataflow_component.csv | 17 - inst/data_model/dataflow_component.jsonld | 2589 --------------------- 3 files changed, 2606 deletions(-) delete mode 100644 inst/app/www/loading.gif delete mode 100644 inst/data_model/dataflow_component.csv delete mode 100644 inst/data_model/dataflow_component.jsonld diff --git a/inst/app/www/loading.gif b/inst/app/www/loading.gif deleted file mode 100644 index 3d5adabe825dd6251216bada4ad9e1d7fcae637f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57353 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

!z_ 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 Date: Wed, 6 Mar 2024 11:56:23 -0800 Subject: [PATCH 7/8] deploy so po can see --- .github/workflows/shinyapps_deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/shinyapps_deploy.yml b/.github/workflows/shinyapps_deploy.yml index 804c66d..ea67768 100644 --- a/.github/workflows/shinyapps_deploy.yml +++ b/.github/workflows/shinyapps_deploy.yml @@ -9,6 +9,7 @@ on: branches: - main - dev* + - fds* tags: - v[0-9]+.[0-9]+.[0-9]+ From 9d12ef1a84c50e1de8f09fa1a4650dca4b0a8005 Mon Sep 17 00:00:00 2001 From: lakikowolfe Date: Wed, 6 Mar 2024 12:59:09 -0800 Subject: [PATCH 8/8] add branch name to renviron --- .github/workflows/shinyapps_deploy.yml | 1 + R/global.R | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/shinyapps_deploy.yml b/.github/workflows/shinyapps_deploy.yml index ea67768..3a0a71d 100644 --- a/.github/workflows/shinyapps_deploy.yml +++ b/.github/workflows/shinyapps_deploy.yml @@ -64,6 +64,7 @@ jobs: echo 'DFA_CLIENT_SECRET="${{ secrets.OAUTH_CLIENT_SECRET }}"' >> .Renviron echo 'DFA_DCC_CONFIG="https://raw.githubusercontent.com/Sage-Bionetworks/data_flow_config/dev/tenants.json"' >> .Renviron echo 'GITHUB_PAT="${{ secrets.GITHUB_TOKEN }}"' >> .Renviron + echo 'DFA_REF="${{ github.ref }}"' >> .Renviron # deploy app using rsconnect - name: Authorize and deploy app diff --git a/R/global.R b/R/global.R index 6bdc09c..e93d2e4 100644 --- a/R/global.R +++ b/R/global.R @@ -1,3 +1,15 @@ +## SET GLOBAL VARS + +# READ IN BRANCH NAME +ref <- Sys.getenv("DFA_REF") + +# SET FAVICON URL +FAVICON_URL <- file.path( + "https://raw.githubusercontent.com/Sage-Bionetworks/data_flow", + ref, # FIXME: Automate branch via env variable + "inst/app/www/favicon.ico" +) + # READ IN TENANTS.JSON tenants_config_path <- Sys.getenv("DFA_DCC_CONFIG") if (is.null(tenants_config_path) || nchar(tenants_config_path) == 0) stop("missing DFA_DCC_CONFIG environmental variable") @@ -64,9 +76,3 @@ api <- httr::oauth_endpoint( # The 'openid' scope is required by the protocol for retrieving user information. scope <- "openid view download modify" - -FAVICON_URL <- file.path( - "https://raw.githubusercontent.com/Sage-Bionetworks/data_flow", - "dev", # FIXME: Automate branch via env variable - "inst/app/www/favicon.ico" -) \ No newline at end of file