Skip to content
This repository was archived by the owner on Apr 16, 2023. It is now read-only.

Commit 94797c9

Browse files
nik01010nik01010
authored
Merge pull request #23 from nik01010/rel/v1_1_0
Version 1.1.0
2 parents 55159e1 + ec4a261 commit 94797c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3284
-2242
lines changed

‎.Rbuildignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
^.*\.Rproj$
22
^\.Rproj\.user$
3+
^Makefile$
4+
^Jenkinsfile$
5+
^\.lintr$
6+
^\.travis\.yml$
7+
^codecov\.yml$
8+
^LICENSE\.md$
9+
^cran-comments\.md$

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
inst/doc
21
.Rproj.user
32
.Rhistory
3+
.RData
4+
.Ruserdata
5+
inst/doc
6+
doc
7+
Meta

‎.lintr‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
linters: with_defaults(
2+
object_name_linter(styles = c("CamelCase", "camelCase", "snake_case")),
3+
object_length_linter(30),
4+
line_length_linter(110),
5+
assignment_linter,
6+
object_usage_linter,
7+
open_curly_linter = NULL,
8+
closed_curly_linter(allow_single_line = FALSE),
9+
paren_brace_linter,
10+
commas_linter,
11+
spaces_inside_linter,
12+
spaces_left_parentheses_linter,
13+
commented_code_linter = NULL,
14+
cyclocomp_linter,
15+
equals_na_linter,
16+
function_left_parentheses_linter,
17+
single_quotes_linter = NULL,
18+
pipe_continuation_linter,
19+
seq_linter,
20+
T_and_F_symbol_linter,
21+
trailing_whitespace_linter = NULL,
22+
undesirable_function_linter = NULL,
23+
undesirable_operator_linter = NULL,
24+
todo_comment_linter = NULL
25+
# WIP: add custom lint rules for:
26+
# - parameter names should be specified in functions
27+
# - white space rules for equals signs
28+
# - unit tests should use arrange/act/assert pattern
29+
# - etc
30+
)
31+
exclude: "# Exclude Linting"
32+
exclude_start: "# Begin Exclude Linting"
33+
exclude_end: "# End Exclude Linting"

‎.travis.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
language: r
2+
3+
os:
4+
- linux
5+
- osx
6+
7+
r:
8+
- release
9+
- oldrel
10+
- devel
11+
12+
jobs:
13+
exclude:
14+
- r: devel
15+
os: osx
16+
17+
repos:
18+
CRAN: https://cloud.r-project.org
19+
20+
addons:
21+
apt:
22+
packages:
23+
- libv8-dev
24+
25+
cache: packages
26+
latex: false
27+
warnings_are_errors: true
28+
29+
after_success:
30+
- Rscript -e 'covr::codecov()'

‎DESCRIPTION‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
Package: dashboardthemes
22
Type: Package
33
Title: Customise the appearance of Shiny dashboard applications using themes
4-
Version: 1.0.6
4+
Version: 1.1.0
55
Authors@R: person("Nik", "Lilovski", email = "nik.lilovski@outlook.com",
66
role = c("aut", "cre"))
77
Maintainer: Nik Lilovski <nik.lilovski@outlook.com>
88
Description: Allows manual creation of themes and logos to be used in
99
applications created using the shinydashboard package. Removes the need to
1010
change the underlying css code by wrapping it into a set of convenient R
1111
functions.
12-
Depends: R (>= 3.2.3)
13-
Imports: htmltools (>= 0.3.5)
14-
License: GPL-3
12+
URL: https://github.com/nik01010/dashboardthemes
13+
BugReports: https://github.com/nik01010/dashboardthemes/issues
14+
Depends:
15+
R (>= 3.2.3)
16+
Imports:
17+
htmltools (>= 0.3.5)
18+
Suggests:
19+
testthat,
20+
lintr,
21+
knitr,
22+
rmarkdown,
23+
glue,
24+
covr
25+
License: MIT + file LICENSE
1526
Encoding: UTF-8
1627
LazyData: true
17-
RoxygenNote: 6.1.1
18-
Suggests: knitr,
19-
rmarkdown
28+
RoxygenNote: 7.1.0
2029
VignetteBuilder: knitr

‎Jenkinsfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
pipeline {
2+
agent any
3+
stages {
4+
stage('Build') {
5+
steps {
6+
bat 'make build'
7+
}
8+
}
9+
stage('Check') {
10+
steps {
11+
bat 'make check'
12+
}
13+
}
14+
}
15+
}

‎LICENSE‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
YEAR: 2020
2+
COPYRIGHT HOLDER: Nik Lilovski

‎Makefile‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# h/t to @jimhester and @yihui for this parse block:
2+
# https://github.com/yihui/knitr/blob/dc5ead7bcfc0ebd2789fe99c527c7d91afb3de4a/Makefile#L1-L4
3+
# Note the portability change as suggested in the manual:
4+
# https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Writing-portable-packages
5+
PKGNAME = `sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION`
6+
PKGVERS = `sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION`
7+
8+
9+
all: build check
10+
11+
build:
12+
R CMD build --no-build-vignettes .
13+
14+
check:
15+
R CMD check --as-cran --no-manual $(PKGNAME)_$(PKGVERS).tar.gz
16+
17+
install_deps:
18+
Rscript \
19+
-e 'if (!requireNamespace("remotes")) install.packages("remotes")' \
20+
-e 'remotes::install_deps(dependencies = TRUE)'
21+
22+
install: install_deps build
23+
R CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
24+
25+
clean:
26+
@rm -rf $(PKGNAME)_$(PKGVERS).tar.gz $(PKGNAME).Rcheck

‎NAMESPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export(cssGradientThreeColors)
44
export(logo_blue_gradient)
5-
export(logo_boe_website)
5+
export(logo_flat_red)
66
export(logo_grey_dark)
77
export(logo_grey_light)
88
export(logo_onenote)
@@ -13,7 +13,7 @@ export(shinyDashboardLogoDIY)
1313
export(shinyDashboardThemeDIY)
1414
export(shinyDashboardThemes)
1515
export(theme_blue_gradient)
16-
export(theme_boe_website)
16+
export(theme_flat_red)
1717
export(theme_grey_dark)
1818
export(theme_grey_light)
1919
export(theme_onenote)

‎NEWS.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
### dashboardthemes ----------------------------------------
22

3+
### v1.1.0
4+
* Breaking changes:
5+
- The boe_website theme has been discontinued, please use flat_red instead.
6+
- The following used to be logo objects with hard-coded text, they are now functions, with optional parameters boldText, mainText and badgeText:
7+
8+
logo_blue_gradient, logo_flat_red, logo_grey_light, logo_grey_dark, logo_onenote, logo_poor_mans_flatly, logo_purple_gradient
9+
10+
* Major back-end refactor:
11+
- R source code separated into multiple files.
12+
- Resolved all R CMD CHECK errors, warnings and notes.
13+
- CSS and HTML code generated by functions has been formatted to remove line breaks.
14+
- shinyDashboardLogo function now has boldText, mainText and badgeText optional parameters, rather than hard-coding these values.
15+
16+
* Added back-end quality controls:
17+
- Unit tests for all functions.
18+
- Support for continuous integration on TravisCI and Jenkins.
19+
- Support for test coverage reports on CodeCov.
20+
- Support for linter checks.
21+
322
### v1.0.6
423
* Fixed a UI bug where submenu items would incorrectly receive the "selected" colour by default instead of only on selection. (#19)
524

0 commit comments

Comments
 (0)