Skip to content

Commit

Permalink
'Headless' main page and use renv for CI/CD, added section dividers (
Browse files Browse the repository at this point in the history
  • Loading branch information
fontikar authored Dec 10, 2024
1 parent ac9ee28 commit a4c3952
Show file tree
Hide file tree
Showing 19 changed files with 3,495 additions and 128 deletions.
1 change: 1 addition & 0 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
source("renv/activate.R")
11 changes: 9 additions & 2 deletions .github/workflows/quarto-publish.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
on:
workflow_dispatch:
push:
branches: main
branches: master
pull_request:
branches: master

name: Quarto Publish

jobs:
build-deploy:
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2

- name: Setup renv
uses: r-lib/actions/setup-renv@v2
with:
cache-version: 1

- name: Render and Publish
uses: quarto-dev/quarto-actions/publish@v2
Expand Down
2 changes: 1 addition & 1 deletion 3568417.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ This repository contains the source code to create the austraits.org website htt
1. Install the [Quarto](https://quarto.org/docs/download/) software
2. Clone this repository to your local computer
3. Open the .Rproj file using RStudio
4. Click on any .qmd files and click on Render.
4. Install [renv](https://rstudio.github.io/renv/articles/renv.html) the R package
5. `renv::restore()` (This may take a while if it is your first time rendering the website)
6. Click on any .qmd files and click on Render.

Alternatively,
Alternatively, once you have completed steps 1-5

1. Navigate to the 'Terminal' pane and type `quarto render` and hit enter
2. Once the book has been rendered and the terminal is free, type `quarto preview` and hit enter
Expand Down
19 changes: 19 additions & 0 deletions _freeze/contact/execute-results/html.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"hash": "443d9999afc5edb901533461bfca9485",
"result": {
"engine": "knitr",
"markdown": "---\ncomments:\n utterances:\n repo: traitecoevo/austraits.org\n---\n\n\n\nWe would love to hear from you to: \n\n- answer any questions you have about AusTraits\n- discuss potential collaborations\n- receive any feedback you might have\n\nYou can leave a comment below or directly reach us at [[email protected]](mailto:[email protected])\n\n\n\n::: {.cell}\n::: {.cell-output-display}\n\n```{=html}\n<div class=\"leaflet html-widget html-fill-item\" id=\"htmlwidget-c8df09d4e9cabddd599b\" style=\"width:100%;height:464px;\"></div>\n<script type=\"application/json\" data-for=\"htmlwidget-c8df09d4e9cabddd599b\">{\"x\":{\"options\":{\"crs\":{\"crsClass\":\"L.CRS.EPSG3857\",\"code\":null,\"proj4def\":null,\"projectedBounds\":null,\"options\":{}}},\"calls\":[{\"method\":\"addTiles\",\"args\":[\"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png\",null,null,{\"minZoom\":0,\"maxZoom\":18,\"tileSize\":256,\"subdomains\":\"abc\",\"errorTileUrl\":\"\",\"tms\":false,\"noWrap\":false,\"zoomOffset\":0,\"zoomReverse\":false,\"opacity\":1,\"zIndex\":1,\"detectRetina\":false,\"attribution\":\"&copy; <a href=\\\"https://openstreetmap.org/copyright/\\\">OpenStreetMap<\\/a>, <a href=\\\"https://opendatacommons.org/licenses/odbl/\\\">ODbL<\\/a>\"}]},{\"method\":\"addMarkers\",\"args\":[-33.9173,151.2313,null,null,null,{\"interactive\":true,\"draggable\":false,\"keyboard\":true,\"title\":\"\",\"alt\":\"\",\"zIndexOffset\":0,\"opacity\":1,\"riseOnHover\":false,\"riseOffset\":250},\"UNSW Sydney\",null,null,null,null,{\"interactive\":false,\"permanent\":false,\"direction\":\"auto\",\"opacity\":1,\"offset\":[0,0],\"textsize\":\"10px\",\"textOnly\":false,\"className\":\"\",\"sticky\":true},null]}],\"limits\":{\"lat\":[-33.9173,-33.9173],\"lng\":[151.2313,151.2313]}},\"evals\":[],\"jsHooks\":[]}</script>\n```\n\n:::\n:::\n",
"supporting": [],
"filters": [
"rmarkdown/pagebreak.lua"
],
"includes": {
"include-in-header": [
"<link href=\"site_libs/htmltools-fill-0.5.8.1/fill.css\" rel=\"stylesheet\" />\n<script src=\"site_libs/htmlwidgets-1.6.4/htmlwidgets.js\"></script>\n<script src=\"site_libs/jquery-3.6.0/jquery-3.6.0.min.js\"></script>\n<link href=\"site_libs/leaflet-1.3.1/leaflet.css\" rel=\"stylesheet\" />\n<script src=\"site_libs/leaflet-1.3.1/leaflet.js\"></script>\n<link href=\"site_libs/leafletfix-1.0.0/leafletfix.css\" rel=\"stylesheet\" />\n<script src=\"site_libs/proj4-2.6.2/proj4.min.js\"></script>\n<script src=\"site_libs/Proj4Leaflet-1.0.1/proj4leaflet.js\"></script>\n<link href=\"site_libs/rstudio_leaflet-1.3.1/rstudio_leaflet.css\" rel=\"stylesheet\" />\n<script src=\"site_libs/leaflet-binding-2.2.2/leaflet.js\"></script>\n"
]
},
"engineDependencies": {},
"preserve": {},
"postProcess": true
}
}
15 changes: 15 additions & 0 deletions _freeze/index/execute-results/html.json

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,26 @@ website:

navbar:
left:
- href: access.qmd
- href: index.html#access-and-usage
text: Access and Usage
- href: outputs.qmd
- href: index.html#structure
text: Structure
- href: index.html#software-and-outputs
text: Software and Outputs
- href: efforts.qmd
- href: index.html#ongoing-efforts
text: Ongoing Efforts
- href: structure.qmd
text: Structure
- href: team/team-partners.qmd
text: Our Team
- href: impact.qmd
text: Our Impact
- href: team/team-partners.qmd
text: Our Team
- href: contributors.qmd
text: Data Contributors
- href: contact.qmd
text: Contact Us
right:
- href: https://github.com/traitecoevo/austraits.org
icon: github

search:
location: navbar

Expand Down
15 changes: 0 additions & 15 deletions access.qmd

This file was deleted.

7 changes: 0 additions & 7 deletions contact.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,3 @@ We would love to hear from you to:

You can leave a comment below or directly reach us at [[email protected]](mailto:[email protected])

```{r, warning=FALSE, echo=FALSE}
library(leaflet)
leaflet() |>
addTiles() |> # Add default OpenStreetMap map tiles
addMarkers(lng=151.2313, lat=-33.9173, popup="UNSW Sydney")
```

31 changes: 0 additions & 31 deletions efforts.qmd

This file was deleted.

1 change: 1 addition & 0 deletions images/AusTraits_relational_tables.svg
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 images/austraits_hex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions index.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,11 @@
filter: none; /* Removes grayscale on hover */
transform: scale(1.1); /* Slightly enlarges the logo */
}

.divider {
border: none;
height: 3px;
background: linear-gradient(to right, #4caf50, #2196f3);
margin: 50px 0; /* Adds 50px space above and below */
}

Loading

0 comments on commit a4c3952

Please sign in to comment.