diff --git a/R/mod_footer.R b/R/mod_footer.R
index 4e81596..2a4e9d4 100644
--- a/R/mod_footer.R
+++ b/R/mod_footer.R
@@ -96,9 +96,9 @@ mod_footer_ui <- function(
id = NULL,
align = "center",
class = "footer",
- app_info = gmhdatahub::app_info,
- client_info = client_info,
- developer_info = developer_info,
+ app_info = getFromNamespace("app_info", envir = rlang::pkg_env("gmhdatahub")),
+ client_info = getFromNamespace("client_info", envir = rlang::pkg_env("gmhdatahub")),
+ developer_info = getFromNamespace("developer_info", envir = rlang::pkg_env("gmhdatahub")),
copyright_holder = "No Clocks, LLC",
year = format(Sys.Date(), "%Y"),
...
@@ -114,15 +114,6 @@ mod_footer_ui <- function(
stop("The 'www' directory was not found in the 'gmhdatahub' package.")
}
- # Include the CSS file from the package's 'www' directory
- css_file <- system.file("www/styles/css/footer.css", package = "gmhdatahub")
- if (file.exists(css_file)) {
- css_content <- shiny::includeCSS(css_file)
- } else {
- warning("CSS file 'footer.css' not found in the 'gmhdatahub' package.")
- css_content <- NULL
- }
-
# Set default copyright holder if not provided
if (is.null(copyright_holder)) {
copyright_holder <- developer_info$name
@@ -137,12 +128,11 @@ mod_footer_ui <- function(
developer_info$symbol <- validate_image(developer_info$symbol)
# Entrata
- entrata_info <- .entrata_info
+ entrata_info <- getFromNamespace("entrata_info", envir = rlang::pkg_env("gmhdatahub"))
entrata_info$logo <- validate_image(entrata_info$logo)
bslib::card_footer(
class = class,
- css_content,
htmltools::tags$footer(
style = paste0("text-align: ", align, ";"),
htmltools::tags$hr(),
@@ -383,7 +373,7 @@ validate_image <- function(img_path) {
return(img_path)
} else {
warning(paste("Image not found:", img_path, "- using placeholder image."))
- return("www/img/placeholders/default-image.png")
+ return("www/images/shared/placeholders/default-image.png")
}
}
diff --git a/R/sysdata.rda b/R/sysdata.rda
index 0427100..f67981f 100644
Binary files a/R/sysdata.rda and b/R/sysdata.rda differ
diff --git a/data-raw/assets.R b/data-raw/assets.R
index fb702c6..722cdc2 100644
--- a/data-raw/assets.R
+++ b/data-raw/assets.R
@@ -9,7 +9,7 @@
files <- fs::dir_ls("inst/www", recurse = TRUE, type = "file")
-img_files <- fs::dir_ls("inst/www/img", recurse = TRUE, type = "file")
+img_files <- fs::dir_ls("inst/www/images", recurse = TRUE, type = "file")
style_files <- fs::dir_ls("inst/www/styles", recurse = TRUE, type = "file")
js_files <- fs::dir_ls("inst/www/scripts", recurse = TRUE, type = "file")
font_files <- fs::dir_ls("inst/www/fonts", recurse = TRUE, type = "file")
@@ -35,18 +35,18 @@ registry <- list(
noclocks = list(
logos = list(
primary = list(
- default = "noclocks/logos/logo.svg",
- dark = "noclocks/logos/logo-dark.svg",
- light = "noclocks/logos/logo-light.svg"
+ default = "noclocks/logos/noclocks-logo-black.svg",
+ dark = "noclocks/logos/noclocks-logo-white.svg",
+ light = "noclocks/logos/noclocks-logo-black.svg"
)
)
),
entrata = list(
logos = list(
primary = list(
- default = "entrata/logos/logo.svg",
- dark = "entrata/logos/logo-dark.svg",
- light = "entrata/logos/logo-light.svg"
+ default = "entrata/logos/entrata-logo-square-red.svg",
+ dark = "entrata/logos/entrata-logo-dark.svg",
+ light = "entrata/logos/entrata-logo-light.svg"
)
)
),
@@ -71,31 +71,31 @@ registry <- list(
favicon = "shared/favicons/favicon.ico"
)
)
- )
+ ),
images = list(
entrata = list(
- banner = "img/entrata/entrata-banner.jpeg",
+ banner = "images/entrata/entrata-banner.jpeg",
logo = list(
- dark = "img/entrata/entrata-logo-dark.png",
- light = "img/entrata/entrata-logo-light.png",
- square = "img/entrata/entrata-logo-square-red.jpg",
- white = "img/entrata/entrata-logo-white.svg",
- default = "img/entrata/entrata.png"
+ dark = "images/entrata/entrata-logo-dark.png",
+ light = "images/entrata/entrata-logo-light.png",
+ square = "images/entrata/entrata-logo-square-red.jpg",
+ white = "images/entrata/entrata-logo-white.svg",
+ default = "images/entrata/entrata.png"
)
),
icons = list(
- app = "img/icons/app-icon.webp",
- gmh = "img/icons/gmh-icon.png",
- noclocks = "img/icons/noclocks-icon-circular.png"
+ app = "images/icons/app-icon.webp",
+ gmh = "images/icons/gmh-icon.png",
+ noclocks = "images/icons/noclocks-icon-circular.png"
),
logos = list(
- app = "img/logos/app-logo.svg",
- entrata = "img/logos/entrata-logo.png",
- gmh = "img/logos/gmh-logo.svg",
- noclocks = "img/logos/noclocks-logo.svg"
+ app = "images/logos/app-logo.svg",
+ entrata = "images/logos/entrata-logo.png",
+ gmh = "images/logos/gmh-logo.svg",
+ noclocks = "images/logos/noclocks-logo.svg"
),
placeholders = list(
- default = "img/placeholders/default-image.png"
+ default = "images/placeholders/default-image.png"
)
),
scripts = list(
diff --git a/data-raw/internal.R b/data-raw/internal.R
index f27ffa6..85faef6 100644
--- a/data-raw/internal.R
+++ b/data-raw/internal.R
@@ -29,8 +29,8 @@
app_info <- list(
name = "GMH Data Hub",
version = "1.0",
- logo = "www/img/logos/app-logo.svg",
- symbol = "www/img/icons/app-icon.webp",
+ logo = "www/images/shared/app/logos/app-logo.svg",
+ symbol = "www/images/shared/app/icons/app-icon.webp",
repo_url = "https://github.com/noclocks/gmhdatahub",
docs_url = "https://docs.noclocks.dev/gmhdatahub"
)
@@ -40,8 +40,8 @@ app_info <- list(
client_info <- list(
name = "GMH Communities",
url = "https://gmhcommunities.com",
- logo = "www/img/logos/gmh-logo.svg",
- symbol = "www/img/icons/gmh-icon.png"
+ logo = "www/images/gmh/logos/gmh-logo.svg",
+ symbol = "www/images/gmh/icons/gmh-icon.png"
)
# noclocks_info -----------------------------------------------------------
@@ -49,8 +49,8 @@ client_info <- list(
developer_info <- list(
name = "No Clocks, LLC",
url = "https://noclocks.dev",
- logo = "www/img/logos/noclocks-logo.svg",
- symbol = "www/img/icons/noclocks-icon-circular.png"
+ logo = "www/images/noclocks/logos/noclocks-logo-black.svg",
+ symbol = "www/images/noclocks/icons/noclocks-icon-circular.png"
)
# entrata_info ------------------------------------------------------------
@@ -58,15 +58,22 @@ developer_info <- list(
entrata_info <- list(
name = "Entrata",
url = "https://gmhcommunities.entrata.com/api/v1/documentation",
- logo = "www/img/logos/entrata-logo.png",
+ logo = "www/images/entrata/logos/entrata-logo-light.png",
symbol = NULL
)
# input_choices -------------------------------------------------------------
+portfolios <- readr::read_csv("data-raw/working/investment_partners.csv")
+portfolio_choices <- portfolios$investment_partner
+
+properties <- readr::read_csv("data-raw/working/properties_ids_names.csv")
+property_choices <- properties$property_id
+names(property_choices) <- properties$entrata_name
+
app_choices <- list(
- portfolios = c("All", "CBRE"),
- properties = c()
+ portfolios = portfolio_choices,
+ properties = property_choices
)
usethis::use_data(
diff --git a/data-raw/working/properties_ids_names.csv b/data-raw/working/properties_ids_names.csv
new file mode 100644
index 0000000..2c1c293
--- /dev/null
+++ b/data-raw/working/properties_ids_names.csv
@@ -0,0 +1,21 @@
+property_id,entrata_id,property_name,entrata_name
+739076,739076,Campustown 1008 S. 4th,1008 S. 4th
+739085,739085,1047 Commonwealth Avenue,1047 Commonwealth Avenue
+739079,739079,Campustown 307 E. Daniel,307 E. Daniel
+739080,739080,Campustown 501 S. 6th,501 S. 6th
+739084,739084,Campustown 908 S. 1st,908 S. 1st
+641240,641240,Academy 65,Academy 65
+676055,676055,Academy Lincoln,Academy Lincoln
+1115679,1115679,ANOVA uCity Square,ANOVA uCity Square
+1161867,1161867,NA,Courts at Spring Mill Station
+518044,518044,Shortbread Lofts,Shortbread Lofts
+952515,952515,SOVA,SOVA
+577897,577897,Station Nine,Station Nine
+518041,518041,The Academy at Frisco,The Academy at Frisco
+518042,518042,The Academy on Charles,The Academy on Charles
+1197886,1197886,The Caswell at Runnymeade,The Caswell at Runnymeade
+833617,833617,The Dean Campustown,The Dean Campustown
+1197887,1197887,The Dean Reno,The Dean Reno
+518046,518046,The Rise at Northgate,The Rise at Northgate
+1143679,1143679,Torre,Torre
+1311849,1311849,The Venue at North Campus,Venue at North Campus
diff --git a/data/app_choices.rda b/data/app_choices.rda
deleted file mode 100644
index ba169f3..0000000
Binary files a/data/app_choices.rda and /dev/null differ
diff --git a/data/app_info.rda b/data/app_info.rda
deleted file mode 100644
index b37d4c4..0000000
Binary files a/data/app_info.rda and /dev/null differ
diff --git a/data/client_info.rda b/data/client_info.rda
deleted file mode 100644
index fcdf20f..0000000
Binary files a/data/client_info.rda and /dev/null differ
diff --git a/data/developer_info.rda b/data/developer_info.rda
deleted file mode 100644
index f415ff8..0000000
Binary files a/data/developer_info.rda and /dev/null differ
diff --git a/data/entrata_default_methods_tbl.rda b/data/entrata_default_methods_tbl.rda
deleted file mode 100644
index c4b30dd..0000000
Binary files a/data/entrata_default_methods_tbl.rda and /dev/null differ
diff --git a/data/entrata_endpoints.rda b/data/entrata_endpoints.rda
deleted file mode 100644
index 26fde85..0000000
Binary files a/data/entrata_endpoints.rda and /dev/null differ
diff --git a/data/entrata_info.rda b/data/entrata_info.rda
deleted file mode 100644
index 3a7e538..0000000
Binary files a/data/entrata_info.rda and /dev/null differ
diff --git a/data/entrata_method_versions.rda b/data/entrata_method_versions.rda
deleted file mode 100644
index 692b08f..0000000
Binary files a/data/entrata_method_versions.rda and /dev/null differ
diff --git a/data/entrata_methods_tbl.rda b/data/entrata_methods_tbl.rda
deleted file mode 100644
index aeafae4..0000000
Binary files a/data/entrata_methods_tbl.rda and /dev/null differ
diff --git a/data/entrata_params_tbl.rda b/data/entrata_params_tbl.rda
deleted file mode 100644
index eec4220..0000000
Binary files a/data/entrata_params_tbl.rda and /dev/null differ
diff --git a/data/entrata_used_methods_tbl.rda b/data/entrata_used_methods_tbl.rda
deleted file mode 100644
index 85494ef..0000000
Binary files a/data/entrata_used_methods_tbl.rda and /dev/null differ
diff --git a/inst/www/html/favicons.html b/inst/www/content/html/favicons.html
similarity index 100%
rename from inst/www/html/favicons.html
rename to inst/www/content/html/favicons.html
diff --git a/inst/www/html/html_code.html b/inst/www/content/html/html_code.html
similarity index 100%
rename from inst/www/html/html_code.html
rename to inst/www/content/html/html_code.html
diff --git a/inst/www/images/gmh/logos/logo.svg b/inst/www/images/gmh/logos/gmh-logo.svg
similarity index 100%
rename from inst/www/images/gmh/logos/logo.svg
rename to inst/www/images/gmh/logos/gmh-logo.svg
diff --git a/inst/www/images/noclocks/logos/noclocks-logo-black.svg b/inst/www/images/noclocks/logos/noclocks-logo-black.svg
new file mode 100644
index 0000000..370091c
--- /dev/null
+++ b/inst/www/images/noclocks/logos/noclocks-logo-black.svg
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/inst/www/images/noclocks/logos/noclocks-logo-white.svg b/inst/www/images/noclocks/logos/noclocks-logo-white.svg
new file mode 100644
index 0000000..ba983b2
--- /dev/null
+++ b/inst/www/images/noclocks/logos/noclocks-logo-white.svg
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/inst/www/img/.gitignore b/inst/www/img/.gitignore
deleted file mode 100644
index a6d7ecd..0000000
--- a/inst/www/img/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-temp/
diff --git a/inst/www/img/entrata/entrata-logo-dark.png b/inst/www/img/entrata/entrata-logo-dark.png
deleted file mode 100644
index f36cc2e..0000000
Binary files a/inst/www/img/entrata/entrata-logo-dark.png and /dev/null differ
diff --git a/inst/www/img/entrata/entrata-logo-light.png b/inst/www/img/entrata/entrata-logo-light.png
deleted file mode 100644
index 48fde2b..0000000
Binary files a/inst/www/img/entrata/entrata-logo-light.png and /dev/null differ
diff --git a/inst/www/img/entrata/entrata-logo-square-red.jpg b/inst/www/img/entrata/entrata-logo-square-red.jpg
deleted file mode 100644
index 0d5a2fb..0000000
Binary files a/inst/www/img/entrata/entrata-logo-square-red.jpg and /dev/null differ
diff --git a/inst/www/img/entrata/entrata-logo-white.svg b/inst/www/img/entrata/entrata-logo-white.svg
deleted file mode 100644
index 61d6823..0000000
--- a/inst/www/img/entrata/entrata-logo-white.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/inst/www/img/entrata/entrata.png b/inst/www/img/entrata/entrata.png
deleted file mode 100644
index a846649..0000000
Binary files a/inst/www/img/entrata/entrata.png and /dev/null differ
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
index 4678ce6..6aa3f9e 100644
--- a/tests/testthat/setup.R
+++ b/tests/testthat/setup.R
@@ -9,17 +9,17 @@
library(httr2, warn.conflicts = FALSE)
library(httptest2, warn.conflicts = FALSE)
-library(withr, warn.conflicts = FALSE)
+# library(withr, warn.conflicts = FALSE)
Sys.setlocale("LC_COLLATE", "C")
options(warn = 1)
-test_config <- list(
- username = "testuser",
- password = "testpass",
- base_url = "https://api.entrata.com"
-)
+# test_config <- list(
+# username = "testuser",
+# password = "testpass",
+# base_url = "https://api.entrata.com"
+# )
test_prop_ids <- c(
"739084",
@@ -34,12 +34,12 @@ test_prop_ids <- c(
"1311849"
)
-if (is_github()) {
- withr::defer(
- {
- file.remove(cfg_decrypted)
- Sys.unsetenv("R_CONFIG_FILE")
- },
- testthat::teardown_env()
- )
-}
+# if (is_github()) {
+# withr::defer(
+# {
+# file.remove(cfg_decrypted)
+# Sys.unsetenv("R_CONFIG_FILE")
+# },
+# testthat::teardown_env()
+# )
+# }
diff --git a/tests/testthat/test-mod_footer.R b/tests/testthat/test-mod_footer.R
index 1d5d87b..e544e16 100644
--- a/tests/testthat/test-mod_footer.R
+++ b/tests/testthat/test-mod_footer.R
@@ -15,11 +15,8 @@ test_that("mod_footer_ui includes required elements", {
# Check for the presence of the footer element
expect_true(grepl("