Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2nd edition #29

Merged
merged 42 commits into from
Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5c95bc3
big overhaul of linking views without shiny
cpsievert Oct 17, 2018
bba3a62
fix statement about x/y matching matrix rows/columns, closes #23
cpsievert Nov 8, 2018
9803868
progress on linking views with shiny
cpsievert Nov 14, 2018
bf699ac
shiny chapter is taking shape now
cpsievert Dec 6, 2018
60b74a4
better organization of shiny sections:
cpsievert Dec 7, 2018
ea02032
shiny is essentially done now
cpsievert Dec 11, 2018
9ac1516
new JS chapter, RStudio Cloud link, new Google Analytics
cpsievert Dec 21, 2018
15e648a
convert from gif to vimeo
cpsievert Dec 21, 2018
da5f37a
merge conflicts
cpsievert Jan 2, 2019
5084a73
Merge branch 'master' into linking
cpsievert Jan 2, 2019
8d01bd3
new chapter on publishing, various improvements
cpsievert Jan 5, 2019
e5d67f4
a start on a new intro chapter
cpsievert Jan 5, 2019
4641f6d
re-organize content, special topics, better intro to cookbook/creatin…
cpsievert Feb 7, 2019
8284626
flesh out intro to plot_ly
cpsievert Feb 8, 2019
f458a46
finish plot_ly/plotly.js intro; keep re-organizing; new scatter intro
cpsievert Feb 12, 2019
d801a25
flesh out scatter chapter; images topic; move to static wherever poss…
cpsievert Feb 14, 2019
3d75ae5
more on maps; bring in some content from the webinar
cpsievert Feb 22, 2019
0a658c7
more on maps and cartograms
cpsievert Feb 27, 2019
0b13435
a bit more on maps
cpsievert Feb 27, 2019
756de06
flesh out new intro to ggplotly; some other improvements
cpsievert Mar 9, 2019
c9e3850
Merge branch 'master' into linking
cpsievert Mar 9, 2019
8ce02e0
Merge branch 'master' into linking
cpsievert Mar 9, 2019
8f581dd
fix rstudio cloud logo on firefox
cpsievert Mar 11, 2019
44a39ee
take out scaling for now
cpsievert Mar 11, 2019
72db86f
small fixes
cpsievert Mar 11, 2019
6872079
improve top-level intro
cpsievert Mar 16, 2019
746177c
tidy up intro
cpsievert Mar 18, 2019
103d1a4
start updating arranging views; better topic intro on improving ggplotly
cpsievert Mar 19, 2019
c8aecb0
finish updating arranging chapter
cpsievert Mar 20, 2019
64639d5
various improvements for pdf_book
cpsievert Mar 29, 2019
a656fb1
finish up workarounds for mangled TeX, move trelliscope back to arran…
cpsievert Mar 29, 2019
20455ea
special topic on performance
cpsievert Mar 29, 2019
57c3e0a
fix some references
cpsievert Mar 29, 2019
03863f4
start preparing videos for print
cpsievert Mar 30, 2019
385459d
most static images for videos
cpsievert Mar 31, 2019
0cf8f90
update some poor quality videos
cpsievert Apr 1, 2019
4a3fea8
Build docs from scratch; moar small fixes
cpsievert Apr 1, 2019
dcb76f0
fix pdf table; remove developer topics part; better ordering of speci…
cpsievert Apr 1, 2019
5b04d08
fix some html plots not appearing
cpsievert Apr 1, 2019
39f16c0
no need for list of tables/figures; check-in pdf
cpsievert Apr 1, 2019
9e4290b
little finishing touches; maintain popular links from old version
cpsievert Apr 4, 2019
03c47dd
Avoid using add_parcoords() for now
cpsievert Apr 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ crc/*
tmp.*
vignettes/
rsconnect/
plotly_book.*
plotly_book.knit.md
plotly_book.utf8.md
plotly_book.log
screenshots/
videos/
.httr-oauth
crossfilter/
crossfilter-compare/
crossfilter-reactlog/
images/
!docs/images
41 changes: 34 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,20 +1,47 @@
Package: plotlyBook
Title: This is not really an R package, but this is here to list the dependencies for building the output from source.
Version: 0.1
Authors@R: person("First", "Last", email = "first.last@example.com",
Authors@R: person("Carson", "Sievert", email = "cpsievert1@gmail.com",
role = c("aut", "cre"))
Depends: R (>= 3.1.0)
URL: https://github.com/cpsievert/plotly_book
Imports:
tidyverse,
shiny,
plotly,
reactR,
broom,
forecast,
shiny,
dplyr,
quantmod,
rmarkdown,
bookdown,
tidyr,
webshot
sf,
rnaturalearth,
cartogram,
albersusa,
geojsonio,
rsvg,
withr,
USAboundaries,
tidycensus,
nycflights13,
babynames,
trelliscopejs,
ggstat,
ggforce,
ggmosaic,
ggalt,
GGally,
naniar,
leaflet,
colorspace,
idbr,
emo
SystemRequirements: pandoc (>= 1.12.3) - http://johnmacfarlane.net/pandoc
Remotes:
ropensci/plotly
ropensci/plotly,
ramnathv/htmlwidgets,
react-R/reactR,
yihui/knitr#1650,
hadley/ggstat,
hadley/emo,
hrbrmstr/albersusa
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ gitbook:
pdf:
mkdir -p docs/images && cp images/* docs/images
Rscript --quiet _render.R "bookdown::pdf_book"
# copy over final tex/images for thesis
cp docs/plotly_book.tex ../phd-thesis/
mkdir -p ../phd-thesis/images && cp docs/images/*.pdf ../phd-thesis/images

dashboard:
Rscript -e "rmarkdown::render('flexdashboard/index.Rmd')"
cp flexdashboard/index.html docs/flexdashboard.html

clean:
rm -r _bookdown_files/
28 changes: 22 additions & 6 deletions _bookdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,29 @@ chapter_name: ""
repo: https://github.com/cpsievert/plotly_book
output_dir: docs
clean: [packages.bib, bookdown.bbl]
delete_merged_file: true
rmd_files: [
"index.Rmd",
"ggplotly-vs-plotly.Rmd",
"plotly-cookbook.Rmd",
"introduction.Rmd",
"creating-overview.Rmd",
"creating-scatter.Rmd",
"creating-maps.Rmd",
"creating-bars.Rmd",
"creating-other.Rmd",
"publishing.Rmd",
"arranging.Rmd",
"linked-views.Rmd",
"animation.Rmd",
"advanced.Rmd",
"references.Rmd"
]
"linked-views.Rmd",
"linked-views-examples.Rmd",
"linked-views-shiny.Rmd",
#"scaling.Rmd",
"javascript.Rmd",
"topics.Rmd",
#"develop.Rmd",
"references.Rmd",
"figure-refs.Rmd"
]
language:
label:
fig: "FIGURE "
tab: "TABLE "
29 changes: 19 additions & 10 deletions _output.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
bookdown::gitbook:
css: [css/plotly.css, css/style.css]
split_by: section
css: [css/plotly.css, css/style.css, css/summary-fix.css]
split_by: chapter
config:
toc:
collapse: subsection
before: |
<li><a href="https://consulting.cpsievert.me">Need help? Work with Carson!</a></li>
after: |
<li><a href="https://bookdown.org" target="blank">Published with bookdown</a></li>
collapse: section
download: no
edit:
link: https://github.com/cpsievert/plotly_book/edit/master/%s
text: "Edit"
sharing: no
includes:
after_body:
- includes/rstudio-cloud.html
- includes/ga.html

bookdown::html_chapters:
css: [css/style.css, css/toc.css]

bookdown::pdf_book:
includes:
in_header: preamble.tex
keep_tex: yes
in_header: latex/preamble.tex
before_body: latex/before_body.tex
after_body: latex/after_body.tex
keep_tex: true
dev: "cairo_pdf"
latex_engine: xelatex
citation_package: natbib
citation_package: natbib
template: null
pandoc_args: --top-level-division=chapter
toc_depth: 3
toc_unnumbered: false
toc_appendix: true
quote_footer: ["\\VA{", "}{}"]

bookdown::epub_book:
stylesheet: css/style.css
11 changes: 11 additions & 0 deletions _redirects
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
https://plotly-book.cpsievert.me/* https://plotly-r.com/:splat 301!

# redirect some links from from the 1st edition
https://plotly-r.com/plot-ly-for-collaboration.html https://plotly-r.com

https://plotly-r.com/extending-ggplotly.html https://plotly-r.com/improving-ggplotly.html

https://plotly-r.com/the-plotly-cookbook.html https://plotly-r.com/overview.html

https://plotly-r.com/installation.html https://plotly-r.com/introduction.html#run-code-examples

https://plotly-r.com/merging-plotly-objects.html https://plotly-r.com/arranging-views.html#arranging-plotly-objects
88 changes: 0 additions & 88 deletions advanced.Rmd

This file was deleted.

Loading