diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 461fdb5a7..51b1b3cde 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: uses: peaceiris/actions-hugo@v2 with: # This should be the same version that we use in .netlify.toml - hugo-version: '0.109.0' + hugo-version: '0.125.3' extended: true - name: Build diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index bd30823f2..52b74225e 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -19,7 +19,7 @@ jobs: uses: peaceiris/actions-hugo@v2 with: # This should be the same version that we use in .netlify.toml - hugo-version: '0.109.0' + hugo-version: '0.125.3' extended: true - name: Build diff --git a/README.md b/README.md index 8af311e04..1b3b9b30e 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This website is **hosted** by GitHub Pages, and we use Netlify to display previe ## Build this website locally -We currently build this site with [**Wowchemy v5.7.0**](https://github.com/wowchemy/wowchemy-hugo-themes/releases/tag/v5.7.0). -This version recommends [**Hugo v0.109.0**](https://github.com/gohugoio/hugo/releases/v0.109.0/). +We currently build this site with [**Hugo Blox-Bootstrap v5.9.6**](https://github.com/HugoBlox/hugo-blox-builder/releases/tag/modules%2Fblox-bootstrap%2Fv5.9.6). +This version recommends [**Hugo v0.125.3**](https://github.com/gohugoio/hugo/releases/v0.125.3/). * Install the Hugo extended listed above from [the latest releases page](https://github.com/gohugoio/hugo/releases) - Ensure that you have the *extended version* @@ -104,7 +104,7 @@ In general, when team members do work associated with other open source projects ### Make an internal blog post -The way to make a regular blog post is by following the standard Hugo documentation for internal blog posts. Check out [the WowChemy theme documentation](https://wowchemy.com/docs/content/blog-posts/) for one way to do this. +The way to make a regular blog post is by following the standard Hugo documentation for internal blog posts. Check out [the Hug Blox theme documentation](https://hugoblox.com/docs/content/blog-posts/) for one way to do this. ### Make an external blog post @@ -135,7 +135,7 @@ We have some custom Hugo templates created for posting new jobs and a summary of ## This website's theme -We are using the latest version of the [Wowchemy theme](https://wowchemy.com/docs/) (used to be the "Academic Theme"). See its documentation for information about customization and usage. +We are using the latest version of the [Hugo Blox theme](https://hugoblox.com/docs/) (used to be the "Wowchemy Academic Theme"). See its documentation for information about customization and usage. ## Optimize images diff --git a/academic.Rproj b/academic.Rproj deleted file mode 100644 index e83436a3e..000000000 --- a/academic.Rproj +++ /dev/null @@ -1,16 +0,0 @@ -Version: 1.0 - -RestoreWorkspace: Default -SaveWorkspace: Default -AlwaysSaveHistory: Default - -EnableCodeIndexing: Yes -UseSpacesForTab: Yes -NumSpacesForTab: 2 -Encoding: UTF-8 - -RnwWeave: Sweave -LaTeX: pdfLaTeX - -AutoAppendNewline: Yes -StripTrailingWhitespace: Yes diff --git a/assets/jsconfig.json b/assets/jsconfig.json index 77ef443c6..94205a38f 100644 --- a/assets/jsconfig.json +++ b/assets/jsconfig.json @@ -3,7 +3,7 @@ "baseUrl": ".", "paths": { "*": [ - "../../../../../../../../tmp/hugo_cache/modules/filecache/modules/pkg/mod/github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy/v5@v5.7.1-0.20221127215619-58b270a3e103/assets/*" + "../../../../Library/Caches/hugo_cache/modules/filecache/modules/pkg/mod/github.com/!hugo!blox/hugo-blox-builder/modules/blox-bootstrap/v5@v5.9.7/assets/*" ] } } diff --git a/config/_default/config.yaml b/config/_default/hugo.yaml similarity index 75% rename from config/_default/config.yaml rename to config/_default/hugo.yaml index ce6280551..bbb1e82f0 100644 --- a/config/_default/config.yaml +++ b/config/_default/hugo.yaml @@ -1,5 +1,5 @@ # Configuration of Hugo -# Guide: https://wowchemy.com/docs/getting-started/ +# Guide: https://docs.hugoblox.com/tutorial/ # Hugo Documentation: https://gohugo.io/getting-started/configuration/#all-configuration-settings # This file is formatted using YAML syntax - learn more at https://learnxinyminutes.com/docs/yaml/ @@ -15,17 +15,6 @@ hasCJKLanguage: false defaultContentLanguageInSubdir: false removePathAccents: true -############################ -## MODULES -############################ - -module: - imports: - - path: github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify-cms - - path: github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify - - path: github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-reveal - - path: github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy/v5 - ############################ ## ADVANCED ############################ diff --git a/config/_default/languages.yaml b/config/_default/languages.yaml index 40884cc12..88fa733d4 100644 --- a/config/_default/languages.yaml +++ b/config/_default/languages.yaml @@ -1,6 +1,6 @@ # Languages # Create a section for each of your site's languages. -# Documentation: https://wowchemy.com/docs/guide/language/ +# Documentation: https://docs.hugoblox.com/reference/language/ # Default language en: diff --git a/config/_default/module.yaml b/config/_default/module.yaml new file mode 100644 index 000000000..d6d5a8fe1 --- /dev/null +++ b/config/_default/module.yaml @@ -0,0 +1,10 @@ +############################ +## HUGO MODULES +## Install or uninstall themes and plugins here. +## Docs: https://gohugo.io/hugo-modules/ +############################ + +imports: + - path: github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-netlify + - path: github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-reveal + - path: github.com/HugoBlox/hugo-blox-builder/modules/blox-bootstrap/v5 diff --git a/config/_default/params.yaml b/config/_default/params.yaml index 293ed8953..f1dfe1660 100644 --- a/config/_default/params.yaml +++ b/config/_default/params.yaml @@ -1,6 +1,6 @@ # SITE SETUP -# Guide: https://wowchemy.com/docs/getting-started/ -# Documentation: https://wowchemy.com/docs/ +# Guide: https://docs.hugoblox.com/tutorial/ +# Documentation: https://docs.hugoblox.com/ # This file is formatted using YAML syntax - learn more at https://learnxinyminutes.com/docs/yaml/ # Appearance @@ -114,7 +114,7 @@ features: index_name: '' show_logo: false map: - provider: '' + provider: 'mapnik' api_key: '' zoom: 15 diff --git a/data/themes/2i2c.toml b/data/themes/2i2c.toml index b868934d6..d63c04803 100644 --- a/data/themes/2i2c.toml +++ b/data/themes/2i2c.toml @@ -1,5 +1,5 @@ # Copied from the Wowchemy Minimal Theme -# ref: https://github.com/wowchemy/wowchemy-hugo-themes/blob/a042ab6e603ebaf275ed03271ffb6ec7333281f7/modules/wowchemy/data/themes/minimal.toml +# ref: https://github.com/HugoBlox/hugo-blox-builder/blob/a042ab6e603ebaf275ed03271ffb6ec7333281f7/modules/wowchemy/data/themes/minimal.toml name = "2i2c" [light] diff --git a/go.mod b/go.mod index ae178869c..eaadadaf1 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ -module github.com/wowchemy/starter-hugo-academic +module github.com/HugoBlox/theme-academic-cv go 1.15 require ( - github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify v1.0.0 // indirect - github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify-cms v1.0.0 // indirect - github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-reveal v1.0.0 // indirect - github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy/v5 v5.7.1-0.20221127215619-58b270a3e103 + github.com/HugoBlox/hugo-blox-builder/modules/blox-bootstrap/v5 v5.9.7 + github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-netlify v1.1.2-0.20231108141515-0478cf6921f9 + github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-reveal v1.1.2 ) diff --git a/go.sum b/go.sum index d81b6a8d9..9d6645325 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.1.0/go.mod h1:kJwI9H8dicHQCnP8G9EvUDI+oNg/yXcGsjGjwjXuM8I= -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify v1.0.0/go.mod h1:s40UgLsWfVyCLQ2F4F3dBcNfZOXcPGld7KxsKhZdzvM= -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-netlify-cms v1.0.0/go.mod h1:X1mETJo6Lkv9tEgfU0UYFRiRInf0RbgW+s1RKXB4GMA= -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-reveal v1.0.0/go.mod h1:u2hgU45C6Oi3CwMzSNvTwuRTsKs7O46EG3MTjNKu7gE= -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-seo v0.1.0/go.mod h1:R01vz++1i/KR2n00aWGcs6m/L7ky1klbrpqA2KXjMCk= -github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy/v5 v5.7.1-0.20221127215619-58b270a3e103/go.mod h1:pxtkh2Fw4Vdwh2NvIYpCqhR0g7MgwVAxFN1lW9Rep44= +github.com/HugoBlox/hugo-blox-builder/modules/blox-bootstrap/v5 v5.9.7 h1:QPek2BL723n+uM4DjyV97qNIoPsmt/vnKAQyaGJbgvQ= +github.com/HugoBlox/hugo-blox-builder/modules/blox-bootstrap/v5 v5.9.7/go.mod h1:xZiTEEurbEwj/NhZohozvlyLCGVCT2wARHDAJeqKG/c= +github.com/HugoBlox/hugo-blox-builder/modules/blox-core v0.3.1/go.mod h1:So8+V2U+TNxlXmcpZfdDX0muLh3PdJ7z92h30sv3bZg= +github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-netlify v1.1.2-0.20231108141515-0478cf6921f9 h1:tGPIc1B6W43X1SXx+ahBCwYnDp3Ll6SEa5mEdABzxAE= +github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-netlify v1.1.2-0.20231108141515-0478cf6921f9/go.mod h1:C7jfxMLv1bEUqbM9XDSmEpfOpS8w06OgqNDEcbuRgL4= +github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-reveal v1.1.2 h1:AyH1pungA2xQDHOrXiIssKOVMY1/qoJUgwrGiK7TzJM= +github.com/HugoBlox/hugo-blox-builder/modules/blox-plugin-reveal v1.1.2/go.mod h1:F7quX1aEkV2pToTpmDBXOSTkytAnCKkqv/JFLclqa2g= +github.com/HugoBlox/hugo-blox-builder/modules/blox-seo v0.2.2/go.mod h1:NsESu6cEms1DgH84icCyylElg2Zu8A0f7Fma5JR0LZE= diff --git a/layouts/partials/functions/get_featured_image.html b/layouts/partials/functions/get_featured_image.html index 9f0e51b13..410f2c491 100644 --- a/layouts/partials/functions/get_featured_image.html +++ b/layouts/partials/functions/get_featured_image.html @@ -1,7 +1,7 @@ {{/* Modification of the Minimal theme function in order to add social media-generated cards. - ref: https://github.com/wowchemy/wowchemy-hugo-themes/blob/549d2cd12615c425ee962ce93fbe8b21094f1b0f/modules/wowchemy-core/layouts/partials/functions/get_featured_image.html#L4 + ref: https://github.com/HugoBlox/hugo-blox-builder/blob/549d2cd12615c425ee962ce93fbe8b21094f1b0f/modules/wowchemy-core/layouts/partials/functions/get_featured_image.html#L4 */}} {{/* Function to retrieve the featured image */}} diff --git a/netlify.toml b/netlify.toml index f7d653b4a..6e102d190 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ publish = "public" [build.environment] - HUGO_VERSION = "0.109.0" + HUGO_VERSION = "0.125.3" HUGO_ENABLEGITINFO = "true" [context.production.environment] @@ -15,12 +15,7 @@ [context.branch-deploy] command = "hugo --gc --minify -b $DEPLOY_PRIME_URL" -[[headers]] - for = "*.webmanifest" - [headers.values] - Content-Type = "application/manifest+json; charset=UTF-8" - -[[headers]] - for = "index.xml" - [headers.values] - Content-Type = "application/rss+xml" +[[plugins]] + package = "netlify-plugin-hugo-cache-resources" + [plugins.inputs] + debug = true