0.1.1

R4GoodAcademy · Dec 30, 2024 · 802ffb4 · 802ffb4
1 parent 5fff8ff
commit 802ffb4
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 47 deletions.
diff --git 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", , "[email protected]", role = c("aut", "cre", "cph", "fnd"),
            comment = c(ORCID = "0000-0002-4062-055X")),

diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
+Bugfixes
 CMD
 Codecov
 GoodPersonalFinances

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",