Merge pull request #13 from Real-Currents/main

Deploy site updates

.github/workflows/build.yml

@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - 'dev/**'
       - main
+      - 'dev/**'
 
 permissions:
   contents: read
@@ -27,8 +27,18 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Print GITHUB_TOKEN
+        run: echo ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Print GITHUB_WORKSPACE
+        run: echo ${GITHUB_WORKSPACE}
+
+      - name: Print working directory
+        run: echo $(pwd)
+
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
+
       # From https://github.com/r-lib/actions/tree/v2-branch/setup-r
       - name: Setup R
         uses: r-lib/actions/setup-r@v2
@@ -44,27 +54,10 @@ jobs:
             any::renv
             any::rmarkdown
 
-#      - name: Install R dependencies with renv
-#        uses: r-lib/actions/setup-renv@v2
-#        with:
-#          cache-version: 1
-
-      - name: Print GITHUB_TOKEN
-        run: echo ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Print GITHUB_WORKSPACE
-        run: echo ${GITHUB_WORKSPACE}
-
-#      - name: Render and Publish
-#        uses: quarto-dev/quarto-actions/publish@v2
-#        with:
-#          target: gh-pages
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-#      - name: List outputs after quarto render
-#        run: |
-#          ls -l "${GITHUB_WORKSPACE}/_site"
+      #      - name: Install R dependencies with renv
+      #        uses: r-lib/actions/setup-renv@v2
+      #        with:
+      #          cache-version: 1
 
       - name: Setup Node.js
         uses: ./.github/workflows/node.js

.github/workflows/quarto.yml

@@ -1,4 +1,4 @@
-name: Quarto Publish
+name: Quarto Render
 
 on:
   workflow_dispatch:
@@ -15,9 +15,21 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Print GITHUB_TOKEN
+        run: echo ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Print GITHUB_WORKSPACE
+        run: echo ${GITHUB_WORKSPACE}
+
+      - name: Print working directory
+        run: echo $(pwd)
 
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
+
       # From https://github.com/r-lib/actions/tree/v2-branch/setup-r
       - name: Setup R
         uses: r-lib/actions/setup-r@v2
@@ -29,18 +41,20 @@ jobs:
         with:
           cache-version: 2
           packages: |
+            any::quarto
             any::renv
+            any::rmarkdown
 
 #      - name: Install R dependencies with renv
 #        uses: r-lib/actions/setup-renv@v2
 #        with:
 #          cache-version: 1
 
-      - name: Print GITHUB_TOKEN
-        run: echo ${{ secrets.GITHUB_TOKEN }}
+      - name: Render with Quarto
+        run: quarto render
 
-      - name: Print GITHUB_WORKSPACE
-        run: echo ${GITHUB_WORKSPACE}
+      - name: List site outputs
+        run: ls -lA _site/
 
 #      - name: Render and Publish
 #        uses: quarto-dev/quarto-actions/publish@v2

_quarto.yml

@@ -20,9 +20,8 @@ website:
 format:
   html:
     theme:
-      - cosmo
+      - darkly
       - src/custom.scss
-    css: src/styles.css
+    css: src/app/globals.css
     toc: true
 
-

content/posts/visualize-r.md

@@ -17,7 +17,7 @@ format:
 
 
 <div id="vizr-app" role="main"
-style="width: 100%; min-width: 800px; margin-left: -100px;">
+style="width: 100%; min-width: 800px; margin-left: -86px;">
 
 
 

content/posts/visualize-r.qmd

@@ -15,7 +15,7 @@ format:
     variant: +yaml_metadata_block
 ---
 
-<div id="vizr-app" role="main" style="width: 100%; min-width: 800px; margin-left: -100px;">
+<div id="vizr-app" role="main" style="width: 100%; min-width: 800px; margin-left: -86px;">
 &nbsp;
 </div>
 

package.json

@@ -34,10 +34,10 @@
     "lint": "next lint",
     "next": "next",
     "preview": "quarto preview",
-    "render:markdown": "cd content && quarto render README.qmd --to gfm --output index.md && npm run render:about && npm run render:dev && npm run render:js-demos && npm run render:posts",
+    "render:markdown": "cd content && quarto render README.qmd --to gfm --output index.md && npm run render:about && npm run render:dev && npm run render:posts && npm run render:js-demos && cd ../ && ls -l ./ && cp -LR site_libs public/ && rm -rf site_libs && rm search.json",
     "render:about": "cd content/about && quarto render index.qmd --to gfm --output index.md --output-dir .",
     "render:dev": "cd content/dev && quarto render --output-dir . && quarto render index.qmd --to gfm --output README.md --output-dir .",
-    "render:js-demos": "cd content/js-demos && quarto render --output-dir . && quarto render index.qmd --to gfm --output README.md --output-dir .",
+    "render:js-demos": "cd content/js-demos && quarto render --output-dir . && quarto render index.qmd --to gfm --output README.md --output-dir . && quarto render index.qmd --to html --output index.html --output-dir . ",
     "render:posts": "cd content/posts && quarto render --output-dir .",
     "render:readme": "quarto render content/README.qmd --to gfm --output README.md"
   },

public/content/js-demos

@@ -0,0 +1 @@
+../../content/js-demos