Skip to content

Commit

Permalink
Merge pull request #33 from SchlossLab/improve-docs
Browse files Browse the repository at this point in the history
Improve docs
  • Loading branch information
kelly-sovacool authored May 11, 2022
2 parents 6b3bb85 + 043e008 commit 89ac7fc
Show file tree
Hide file tree
Showing 14 changed files with 133 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v1

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- New column `label_html` provides HTML to correctly italicize genus names but not OTU labels.
- Added an example the intro vignette to demonstrate using this feature with `ggtext`.
- Changed taxonomy data frame column names to lowercase and reordered them.
- Minor documentation improvements (#33, @kelly-sovacool)

# schtools 0.1.1

Expand Down
17 changes: 17 additions & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@ or the development version from [GitHub](https://github.com/SchlossLab/schtools)
devtools::install_github("SchlossLab/schtools")
```

or install from a terminal using
[conda](https://docs.conda.io/projects/conda/en/latest/index.html)
or [mamba](https://mamba.readthedocs.io/en/latest/):

```{bash conda, eval = FALSE}
mamba install -c conda-forge r-schtools
```


## Usage

Check out the
[introductory vignette](http://www.schlosslab.org/schtools/articles/introduction.html)
for a quick start tutorial or take a look at the
[reference documentation](http://www.schlosslab.org/schtools/reference/index.html)
for a comprehensive list of functions.

## Help & Contributing

If you come across a bug, [open an
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ or the development version from
devtools::install_github("SchlossLab/schtools")
```

or install from a terminal using
[conda](https://docs.conda.io/projects/conda/en/latest/index.html) or
[mamba](https://mamba.readthedocs.io/en/latest/):

``` bash
mamba install -c conda-forge r-schtools
```

## Usage

Check out the [introductory
vignette](http://www.schlosslab.org/schtools/articles/introduction.html)
for a quick start tutorial or take a look at the [reference
documentation](http://www.schlosslab.org/schtools/reference/index.html)
for a comprehensive list of functions.

## Help & Contributing

If you come across a bug, [open an
Expand Down
26 changes: 26 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,29 @@ authors:
href: "https://github.com/NLesniak"
Patrick Schloss:
href: "https://github.com/pschloss"
reference:
- title:
contents:
- schtools
- title: Readers
desc: >
Read microbiome-related files.
contents:
- starts_with('read_')
- starts_with('parse_')
- title: R Markdown helpers
desc: >
Format publication-quality documents.
contents:
- set_knitr_opts
- inline_hook
- paste_oxford_list
- format_number
- title: Everything else
desc: >
Useful tools for miscellaneous tasks.
contents:
- close_enough
- is_nearly_whole
- is_nondesc
- load_deps
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 14 additions & 9 deletions docs/articles/logo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/logo_files/figure-html/logo-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pkgdown_sha: ~
articles:
logo: logo.html
introduction: introduction.html
last_built: 2022-04-27T18:41Z
last_built: 2022-05-11T21:22Z
urls:
reference: http://www.schlosslab.org/schtools/reference
article: http://www.schlosslab.org/schtools/articles
Expand Down
68 changes: 38 additions & 30 deletions docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions vignettes/articles/logo.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@ showtext_auto()

## Emojis

From OpenMoji, [licensed under CC BY SA 4.0](https://github.com/hfg-gmuend/openmoji/blob/master/LICENSE.txt)
From OpenMoji, [licensed under CC BY-SA 4.0](https://github.com/hfg-gmuend/openmoji/blob/master/LICENSE.txt)

- poop: https://openmoji.org/library/#search=poo&emoji=1F4A9
- wrench: https://openmoji.org/library/#search=tool&emoji=1F527
- hammer: https://openmoji.org/library/#search=tool&emoji=1F528

## Schtools Logo

```{r logo, dpi=300}
```{r emojis, dpi=300, out.width='50%'}
poo_file <- here('vignettes', 'articles','1F4A9_color.png')
wrench_file <- here('vignettes', 'articles', '1F527_color.png')
hammer_file <- here('vignettes', 'articles', '1F528_color.png')
Expand All @@ -49,18 +47,26 @@ ggsave2(img,
height = 2,
width = 2,
units = 'in')
img
```


## Schtools Logo

```{r logo, dpi=300, out.width='50%'}
mint <- '#A2EAE0'
pink <- '#FA9DC5'
orange <- '#FFDBAD'
black <- '#000000'
logo_filename <- here('vignettes', 'articles', 'schtools-logo.png')
sticker(img, package = 'schtools',
s_x = 1, s_y = 0.85, s_width = 1.6, s_height = 1.6,
p_x = 1, p_y = 1.55, p_color = black,
p_size = 23, p_family = 'Source Sans Pro',
h_fill = mint, h_color = orange,
url = 'schlosslab.org/schtools', u_size = 3.5,
filename = here('vignettes', 'articles', 'schtools-logo.png'))
filename = logo_filename)
ggdraw() +
draw_image(logo_filename)
```

0 comments on commit 89ac7fc

Please sign in to comment.