From 802ffb44060a7196a6b6bc5e12cd020f59ce0fcd Mon Sep 17 00:00:00 2001 From: Kamil Wais Date: Mon, 30 Dec 2024 11:06:52 +0100 Subject: [PATCH] 0.1.1 --- DESCRIPTION | 2 +- NEWS.md | 6 +++ R/sysdata.rda | Bin 1403 -> 1448 bytes R/utils-shiny.R | 2 +- devel/deploy.R | 12 ++++-- inst/CITATION | 2 +- inst/WORDLIST | 1 + inst/apps/purchasing-power/server.R | 2 +- inst/apps/purchasing-power/ui.R | 2 +- inst/apps/risk-adjusted-returns/server.R | 2 +- inst/apps/risk-adjusted-returns/ui.R | 2 +- renv.lock | 49 ++++++----------------- 12 files changed, 35 insertions(+), 47 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f833242..3d71636 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: R4GoodPersonalFinances Title: Make Better Financial Decisions -Version: 0.1.0 +Version: 0.1.1 Authors@R: c( person("Kamil", "Wais", , "kamil.wais@gmail.com", role = c("aut", "cre", "cph", "fnd"), comment = c(ORCID = "0000-0002-4062-055X")), diff --git a/NEWS.md b/NEWS.md index 54279ed..8affb8b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# R4GoodPersonalFinances 0.1.1 + +## Bugfixes + +* Fixed apps errors while executing locally. + # R4GoodPersonalFinances 0.1.0 Initial release of the package includes functions designed to diff --git a/R/sysdata.rda b/R/sysdata.rda index 9232b3d6d6d551547cd774f02a7c314825e58f1f..c0b68862b348e212c253ee148627b145456d1a2e 100644 GIT binary patch literal 1448 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 JBr!{X#Q=abyJ-Lb diff --git a/R/utils-shiny.R b/R/utils-shiny.R index 7902d6d..15da4c6 100644 --- a/R/utils-shiny.R +++ b/R/utils-shiny.R @@ -1,4 +1,4 @@ -sidebar_footer <- function(hex_size = "110px") { +sidebar_footer <- function() { package_version <- utils::packageVersion("R4GoodPersonalFinances") app_version <- apps$package_version diff --git a/devel/deploy.R b/devel/deploy.R index becba90..334db28 100644 --- a/devel/deploy.R +++ b/devel/deploy.R @@ -9,10 +9,18 @@ usethis::use_version() # usethis::use_version(which = "patch") # usethis::use_version(which = "minor") + +rstudioapi::restartSession() +pak::local_install(upgrade = FALSE) source("data-raw/internal.R") +R4GoodPersonalFinances:::apps$package_version rstudioapi::restartSession() -# pak::local_install(upgrade = FALSE, ask = FALSE) +pak::local_install(upgrade = FALSE) +R4GoodPersonalFinances:::apps$package_version +R4GoodPersonalFinances::run_app(shinylive = TRUE) +R4GoodPersonalFinances::run_app() +R4GoodPersonalFinances::run_app(which = "purchasing-power") devtools::document() devtools::build_readme() @@ -24,8 +32,6 @@ pkgdown::preview_site() spelling::spell_check_package() spelling::update_wordlist() -citation("R4GoodPersonalFinances") - urlchecker::url_check() urlchecker::url_update() diff --git a/inst/CITATION b/inst/CITATION index 54d762c..e7e6765 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -3,6 +3,6 @@ bibentry( title = "R4GoodPersonalFinances: Make Better Financial Decisions", author = c(person("Kamil", "Wais"), person("Olesia", "Wais")), year = 2025, - note = "R package version 0.1.0, https://r4goodacademy.github.io/R4GoodPersonalFinances/ ", + note = "R package version 0.1.1, https://r4goodacademy.github.io/R4GoodPersonalFinances/ ", url = "https://www.r4good.academy/" ) diff --git a/inst/WORDLIST b/inst/WORDLIST index eb6b090..21a408c 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,3 +1,4 @@ +Bugfixes CMD Codecov GoodPersonalFinances diff --git a/inst/apps/purchasing-power/server.R b/inst/apps/purchasing-power/server.R index 49e8769..dfa9679 100644 --- a/inst/apps/purchasing-power/server.R +++ b/inst/apps/purchasing-power/server.R @@ -5,7 +5,7 @@ server <- function(input, output, session) { plot_res <- input$res output$purchasing_power_plot <- shiny::renderPlot({ - plot_purchasing_power( + asNamespace("R4GoodPersonalFinances")$plot_purchasing_power( x = input$x , real_interest_rate = input$real_interest_rate / 100, years = input$years diff --git a/inst/apps/purchasing-power/ui.R b/inst/apps/purchasing-power/ui.R index a2481c9..5e0d441 100644 --- a/inst/apps/purchasing-power/ui.R +++ b/inst/apps/purchasing-power/ui.R @@ -32,7 +32,7 @@ ui <- max = 100, value = 50 ), - sidebar_footer() + asNamespace("R4GoodPersonalFinances")$sidebar_footer() ), bslib::card( diff --git a/inst/apps/risk-adjusted-returns/server.R b/inst/apps/risk-adjusted-returns/server.R index 097a761..18b4f53 100644 --- a/inst/apps/risk-adjusted-returns/server.R +++ b/inst/apps/risk-adjusted-returns/server.R @@ -6,7 +6,7 @@ server <- function(input, output, session) { output$rar_plot <- shiny::renderPlot({ - plot_risk_adjusted_returns( + asNamespace("R4GoodPersonalFinances")$plot_risk_adjusted_returns( current_risky_asset_allocation = input$current_risky_asset_allocation / 100, safe_asset_return = input$safe_asset_return / 100, diff --git a/inst/apps/risk-adjusted-returns/ui.R b/inst/apps/risk-adjusted-returns/ui.R index 6bfbf2f..5670016 100644 --- a/inst/apps/risk-adjusted-returns/ui.R +++ b/inst/apps/risk-adjusted-returns/ui.R @@ -42,7 +42,7 @@ ui <- step = 0.1, value = 2 ), - sidebar_footer() + asNamespace("R4GoodPersonalFinances")$sidebar_footer() ), bslib::card( diff --git a/renv.lock b/renv.lock index a5b2375..4be2205 100644 --- a/renv.lock +++ b/renv.lock @@ -1187,16 +1187,6 @@ ], "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2" }, - "lazyeval": { - "Package": "lazyeval", - "Version": "0.2.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "d908914ae53b04d4c0c0fd72ecc35370" - }, "lifecycle": { "Package": "lifecycle", "Version": "1.0.4", @@ -1361,6 +1351,18 @@ ], "Hash": "5bfe2927efa9f87766ca9605301ea48f" }, + "pak": { + "Package": "pak", + "Version": "0.8.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "tools", + "utils" + ], + "Hash": "019d4d5634410800a96b69737fb2dbac" + }, "pillar": { "Package": "pillar", "Version": "1.10.0", @@ -1707,16 +1709,6 @@ ], "Hash": "97b1d5361a24d9fb588db7afe3e5bcbf" }, - "rex": { - "Package": "rex", - "Version": "1.2.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "lazyeval" - ], - "Hash": "ae34cd56890607370665bee5bd17812f" - }, "rlang": { "Package": "rlang", "Version": "1.1.4", @@ -1777,23 +1769,6 @@ ], "Hash": "6ee25f9054a70f44d615300ed531ba8d" }, - "roxygen2md": { - "Package": "roxygen2md", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "brio", - "cli", - "desc", - "devtools", - "rex", - "rlang", - "tibble", - "usethis" - ], - "Hash": "19d14ec004acb78dbdaa4c5be33430ec" - }, "rprojroot": { "Package": "rprojroot", "Version": "2.0.4",