Skip to content

Commit

Permalink
Update to latest Hugo Blox theme (#234)
Browse files Browse the repository at this point in the history
  • Loading branch information
choldgraf authored Apr 24, 2024
1 parent a6551ec commit 015230b
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
16 changes: 0 additions & 16 deletions academic.Rproj

This file was deleted.

2 changes: 1 addition & 1 deletion assets/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/*"
]
}
}
Expand Down
13 changes: 1 addition & 12 deletions config/_default/config.yaml → config/_default/hugo.yaml
Original file line number Diff line number Diff line change
@@ -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/

Expand All @@ -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
############################
Expand Down
2 changes: 1 addition & 1 deletion config/_default/languages.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 10 additions & 0 deletions config/_default/module.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions config/_default/params.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -114,7 +114,7 @@ features:
index_name: ''
show_logo: false
map:
provider: ''
provider: 'mapnik'
api_key: ''
zoom: 15

Expand Down
2 changes: 1 addition & 1 deletion data/themes/2i2c.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
)
14 changes: 8 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 1 addition & 1 deletion layouts/partials/functions/get_featured_image.html
Original file line number Diff line number Diff line change
@@ -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 */}}
Expand Down
15 changes: 5 additions & 10 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
publish = "public"

[build.environment]
HUGO_VERSION = "0.109.0"
HUGO_VERSION = "0.125.3"
HUGO_ENABLEGITINFO = "true"

[context.production.environment]
Expand All @@ -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

0 comments on commit 015230b

Please sign in to comment.