diff --git a/.github/workflows/ExportNotebooks.yml b/.github/workflows/ExportNotebooks.yml index e1e99242..0e654b32 100644 --- a/.github/workflows/ExportNotebooks.yml +++ b/.github/workflows/ExportNotebooks.yml @@ -2,7 +2,7 @@ name: Export Pluto notebooks & Deploy on: push: branches: - - Fall22 + - main workflow_dispatch: concurrency: group: export @@ -36,18 +36,6 @@ jobs: restore-keys: | ${{ runner.os }}-dotjulia-v1-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }} - # - name: 📅 Checkout Fall 20 output - # uses: actions/checkout@v2 - # with: - # path: Fall20-franklin-output - # ref: Fall20-franklin-output - - - name: 📅 Checkout Fall20 and Spring21 output - uses: actions/checkout@v2 - with: - path: Spring21-franklin-output - ref: Spring21-franklin-output - - name: 🪴 Generate site run: julia --project=pluto-deployment-environment -e ' import Pkg; @@ -55,7 +43,6 @@ jobs: include("./generate.jl")' - - name: 📰 Upload site generation report uses: actions/upload-artifact@v2 if: always() @@ -66,13 +53,11 @@ jobs: run: | mkdir www mv _site www/Fall22 - mv Spring21-franklin-output/Fall20/ www/Fall20 - mv Spring21-franklin-output/Spring21/ www/Spring21 mv extra_outputs/* www - name: 🚀 Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@releases/v3 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: Fall22-output + BRANCH: output FOLDER: www diff --git a/.gitignore b/.gitignore index fee3d973..6b29141e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,6 @@ .DS_Store -reduced_phil.png -notebooks/week9/testCSVwrite.csv - _cache _site -generation_report.html -src/week9/testCSVwrite.csv +generation_report.html \ No newline at end of file diff --git a/PlutoPages.jl b/PlutoPages.jl index 33563155..9d3b4ab3 100644 --- a/PlutoPages.jl +++ b/PlutoPages.jl @@ -1,5 +1,5 @@ ### A Pluto.jl notebook ### -# v0.19.14 +# v0.19.27 using Markdown using InteractiveUtils diff --git a/pluto-deployment-environment/PlutoDeployment.toml b/pluto-deployment-environment/PlutoDeployment.toml index 7641d84b..c47200f0 100644 --- a/pluto-deployment-environment/PlutoDeployment.toml +++ b/pluto-deployment-environment/PlutoDeployment.toml @@ -1,43 +1,13 @@ [Export] baked_state = false -baked_notebookfile = false +baked_notebookfile = true offer_binder = true -slider_server_url="https://computationalthinking-sliderserver-droplet.plutojl.org" ignore_cache = [ "index.jl", ] -create_index = false +create_index = true exclude = [ # these are in the repo but not used on the website - "*/linear_transformation.jl", - "*/OLD_linear_transformation.jl", - "*/simulating_component_failure_live.jl", - "*/discrete_and_continuous_old.jl", - "*/pascal.jl", - "*/snowballearth_original.jl", "tools/*", "PlutoPages.jl", ] - -[SliderServer] -port = 80 -host = "0.0.0.0" -exclude=[ - # these are in the repo but not used on the website - "*/linear_transformation.jl", - "*/OLD_linear_transformation.jl", - "*/simulating_component_failure_live.jl", - "*/discrete_and_continuous_old.jl", - "*/pascal.jl", - "*/snowballearth_original.jl", - "tools/*", - "PlutoPages.jl", - - # not interactive - "*/basic_syntax.jl", - "*/structure.jl", - "*/how_to_collaborate_on_software.jl", - - # don't run homeworks - "*/hw*.jl", -] diff --git a/src/_includes/layout.jlhtml b/src/_includes/layout.jlhtml index 165bb935..58c3bf92 100644 --- a/src/_includes/layout.jlhtml +++ b/src/_includes/layout.jlhtml @@ -1,4 +1,5 @@ $(begin + using MarkdownLiteral: @markdown import Pluto "The contents of `` from a Pluto HTML export." const pluto_head = let @@ -24,6 +25,15 @@ $(begin isnothing(ch) || isnothing(se) ? nothing : "$(ch).$(se)" end + + hyperlink(href, description) = @htl("$(description)") + + function by_authors(authors) + tmp = map(authors) do (; name, url) + hyperlink(url, name) + end + "by " * join(tmp, ", ", " & ") |> HTML + end nothing end) @@ -61,26 +71,35 @@ $(pluto_head)