refactor: some code refactoring

This commit is contained in:
2026-04-23 12:55:39 +03:00
parent 7b6cbc67e4
commit 0c3c35936e
3 changed files with 58 additions and 55 deletions

19
app.R
View File

@@ -33,14 +33,12 @@ box::use(
box::use(app/forms)
box::use(app/tasks)
# SETTINGS ================================
HEADER_TEXT <- config::get("form_name")
# refactor LATER ---------
vv <- unlist(config::get()$form_schemes)
enabled_schemes <- names(vv)
vvvv <- unname(vv)
names(enabled_schemes) <- vvvv
# ------------------------
# CHECK FOR PANDOC
# TEMP ! NEED TO HANDLE
@@ -54,9 +52,9 @@ schms <- readRDS("scheme.rds")
# UI =======================
ui <- page_sidebar(
# title = HEADER_TEXT,
# title = config::get("form_name"),
title = tagList(
h4(HEADER_TEXT, style = "margin-top: .5rem"),
h4(config::get("form_name"), style = "margin-top: .5rem"),
popover(
span(
config::get("form_app_version"),
@@ -64,7 +62,7 @@ ui <- page_sidebar(
style = "color: #9c9c9c"),
title = "about",
placement = "left",
p("a"), p("b")
tagList(span("здесь пока ничего нет"), br(), span("вот"))
)
),
theme = bs_theme(version = 5, preset = "bootstrap"),
@@ -77,7 +75,7 @@ ui <- page_sidebar(
uiOutput("status_message"),
textOutput("status_message2"),
uiOutput("display_log"),
actionButton("tasks-shieesh", "Задачи: нет активных"),
actionButton("tasks-display_task_modal", "Задачи: нет активных"),
position = "left",
open = list(mobile = "always")
),
@@ -92,7 +90,7 @@ if (AUTH_ENABLED) {
shinymanager::secure_app(
status = "primary",
tags_top = tags$div(
tags$h3(HEADER_TEXT, style = "align:center"),
tags$h3(config::get("form_name"), style = "align:center"),
# tags$img(
# src = "https://www.r-project.org/logo/Rlogo.png", width = 100
# )
@@ -145,6 +143,7 @@ server <- function(input, output, session) {
}
}
# update user name
values$current_user <- ifelse(AUTH_ENABLED, res_auth$user, "anonymous")
if (showing_buttons) {
@@ -168,7 +167,7 @@ server <- function(input, output, session) {
main_key = NULL,
nested_key = NULL,
nested_form_id = NULL,
tasks_id_selector = NULL,
tasks_id = NULL,
current_user = NULL
)
@@ -195,6 +194,8 @@ server <- function(input, output, session) {
selected = scheme()
),
"Для начала работы нужно создать новую запись или загрузить существующую!",
# сво
strong("tasks"),
# загрузка панели для работы с базой данных
uiOutput("admin_buttons_panel")
)