Merge pull request 'wowchemy upgrade' (#3) from wowchemy into master
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
This commit is contained in:
24
.drone.yml
24
.drone.yml
@ -2,28 +2,12 @@ kind: pipeline
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: requirements
|
||||
image: alpine/git
|
||||
commands:
|
||||
- git submodule update --recursive --init
|
||||
|
||||
- name: build
|
||||
image: klakegg/hugo:ext-alpine
|
||||
commands:
|
||||
- hugo mod get -u
|
||||
- hugo-official --minify --gc --cleanDestinationDir
|
||||
|
||||
- name: deploy_beta
|
||||
image: appleboy/drone-scp
|
||||
settings:
|
||||
host: jcktrue.dk
|
||||
target: /home/jct/apps/http/beta.jcktrue.dk/
|
||||
source: public/*
|
||||
strip_components: 1
|
||||
username:
|
||||
from_secret: SSH_USERNAME
|
||||
password:
|
||||
from_secret: SSH_PASSWORD
|
||||
|
||||
- name: deploy
|
||||
image: appleboy/drone-scp
|
||||
settings:
|
||||
@ -35,9 +19,3 @@ steps:
|
||||
from_secret: SSH_USERNAME
|
||||
password:
|
||||
from_secret: SSH_PASSWORD
|
||||
when:
|
||||
event:
|
||||
- promote
|
||||
target:
|
||||
exclude:
|
||||
- beta
|
||||
@ -1,20 +0,0 @@
|
||||
# editorconfig.org
|
||||
|
||||
root = true
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
end_of_line = lf
|
||||
indent_size = 2
|
||||
indent_style = space
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
[*.toml]
|
||||
max_line_length = 100
|
||||
|
||||
[*.md]
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[layouts/shortcodes/*.html]
|
||||
insert_final_newline = false
|
||||
@ -1,50 +0,0 @@
|
||||
---
|
||||
label: Blog post
|
||||
hide_body: false
|
||||
fields:
|
||||
- type: text
|
||||
name: title
|
||||
label: title
|
||||
- type: text
|
||||
name: subtitle
|
||||
label: subtitle
|
||||
- type: datetime
|
||||
name: date
|
||||
label: date
|
||||
- type: list
|
||||
name: authors
|
||||
label: authors
|
||||
- type: list
|
||||
name: tags
|
||||
label: tags
|
||||
- type: text
|
||||
name: summary
|
||||
label: summary
|
||||
- type: field_group
|
||||
name: image
|
||||
label: image
|
||||
fields:
|
||||
- type: number
|
||||
name: placement
|
||||
label: placement
|
||||
- type: text
|
||||
name: caption
|
||||
label: caption
|
||||
- type: text
|
||||
name: focal_point
|
||||
label: focal_point
|
||||
description: Image Focal Point (Smart, Center, TopLeft, Top, TopRight, Left, Right,
|
||||
BottomLeft, Bottom, BottomRight)
|
||||
- name: projects
|
||||
type: list
|
||||
config:
|
||||
use_select: false
|
||||
min:
|
||||
max:
|
||||
label: projects
|
||||
description: Associate this content with a project by entering a project folder
|
||||
name
|
||||
- name: featured
|
||||
type: boolean
|
||||
label: featured
|
||||
description: You can filter by featured content on your homepage
|
||||
@ -1,71 +0,0 @@
|
||||
---
|
||||
label: Event
|
||||
hide_body: true
|
||||
fields:
|
||||
- type: text
|
||||
name: title
|
||||
label: title
|
||||
- name: subtitle
|
||||
type: text
|
||||
config:
|
||||
required: false
|
||||
label: subtitle
|
||||
- type: text
|
||||
name: event
|
||||
label: event
|
||||
description: Name of the event (e.g. Academic Conference)
|
||||
- type: text
|
||||
name: event_url
|
||||
label: Event Link
|
||||
- type: text
|
||||
name: location
|
||||
label: location
|
||||
- type: datetime
|
||||
name: publishDate
|
||||
label: publishDate
|
||||
description: When to publish this page (choose today)
|
||||
- type: datetime
|
||||
name: date
|
||||
label: date
|
||||
description: Start time
|
||||
- type: datetime
|
||||
name: date_end
|
||||
label: date_end
|
||||
description: End time
|
||||
- type: boolean
|
||||
name: all_day
|
||||
label: all_day
|
||||
- type: list
|
||||
name: authors
|
||||
label: Presenters
|
||||
- type: textarea
|
||||
name: abstract
|
||||
label: abstract
|
||||
- type: text
|
||||
name: url_slides
|
||||
label: url_slides
|
||||
- type: text
|
||||
name: url_video
|
||||
label: url_video
|
||||
- type: text
|
||||
name: url_code
|
||||
label: url_code
|
||||
- type: field_group
|
||||
name: image
|
||||
label: image
|
||||
fields:
|
||||
- type: number
|
||||
name: placement
|
||||
label: placement
|
||||
- type: text
|
||||
name: caption
|
||||
label: caption
|
||||
- type: text
|
||||
name: focal_point
|
||||
label: focal_point
|
||||
description: Image Focal Point (Smart, Center, TopLeft, Top, TopRight, Left, Right,
|
||||
BottomLeft, Bottom, BottomRight)
|
||||
- name: featured
|
||||
type: boolean
|
||||
label: featured
|
||||
description: You can filter by featured content on your homepage
|
||||
@ -1,56 +0,0 @@
|
||||
---
|
||||
new_page_extension: md
|
||||
auto_deploy: false
|
||||
admin_path:
|
||||
webhook_url:
|
||||
sections:
|
||||
- type: directory
|
||||
path: content/home
|
||||
label: Home
|
||||
create: all
|
||||
match: "**/*"
|
||||
- type: directory
|
||||
path: content/post
|
||||
label: Blog posts
|
||||
create: all
|
||||
match: "**/*"
|
||||
templates:
|
||||
- blog-post
|
||||
- type: directory
|
||||
path: content/project
|
||||
label: Projects
|
||||
create: all
|
||||
match: "**/*"
|
||||
- type: directory
|
||||
path: content/talk
|
||||
label: Events
|
||||
create: all
|
||||
match: "**/*"
|
||||
templates:
|
||||
- event
|
||||
- type: directory
|
||||
path: content/publication
|
||||
label: Publications
|
||||
create: all
|
||||
match: "**/*"
|
||||
- type: directory
|
||||
path: content
|
||||
label: Pages
|
||||
create: all
|
||||
match: "*"
|
||||
upload_dir: static/img
|
||||
public_path: "/img"
|
||||
front_matter_path: ''
|
||||
use_front_matter_path: false
|
||||
file_template: ":filename:"
|
||||
build:
|
||||
preview_env:
|
||||
- HUGO_ENV=staging
|
||||
- HUGO_VERSION=0.58.2
|
||||
preview_output_directory: public
|
||||
preview_docker_image: forestryio/hugo:latest
|
||||
mount_path: "/srv"
|
||||
working_dir: "/srv"
|
||||
instant_preview_command: hugo server -D -E -F --port 8080 --bind 0.0.0.0 --renderToDisk
|
||||
-d public
|
||||
version: 0.58.2
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "themes/academic"]
|
||||
path = themes/academic
|
||||
url = https://github.com/gcushen/hugo-academic.git
|
||||
46
README.md
46
README.md
@ -1,46 +0,0 @@
|
||||
<p align="center"><a href="https://sourcethemes.com/academic/" target="_blank" rel="noopener"><img src="https://sourcethemes.com/academic/img/logo_200px.png" alt="Academic logo"></a></p>
|
||||
|
||||
# Academic Kickstart: The Template for [Academic Website Builder](https://sourcethemes.com/academic/)
|
||||
|
||||
[**Academic**](https://github.com/gcushen/hugo-academic) makes it easy to create a beautiful website for free using Markdown, Jupyter, or RStudio. Customize anything on your site with widgets, themes, and language packs. [Check out the latest demo](https://academic-demo.netlify.com/) of what you'll get in less than 10 minutes, or [view the showcase](https://sourcethemes.com/academic/#expo).
|
||||
|
||||
**Academic Kickstart** provides a minimal template to kickstart your new website.
|
||||
|
||||
- 👉 [**Get Started**](#install)
|
||||
- 📚 [View the **documentation**](https://sourcethemes.com/academic/docs/)
|
||||
- 💬 [Chat with the **Academic community**](https://spectrum.chat/academic) or [**Hugo community**](https://discourse.gohugo.io)
|
||||
- 🐦 Twitter: [@source_themes](https://twitter.com/source_themes) [@GeorgeCushen](https://twitter.com/GeorgeCushen) [#MadeWithAcademic](https://twitter.com/search?q=%23MadeWithAcademic&src=typd)
|
||||
- 💡 [Request a **feature** or report a **bug**](https://github.com/gcushen/hugo-academic/issues)
|
||||
- ⬆️ **Updating?** View the [Update Guide](https://sourcethemes.com/academic/docs/update/) and [Release Notes](https://sourcethemes.com/academic/updates/)
|
||||
- :heart: **Support development** of Academic:
|
||||
- ☕️ [**Donate a coffee**](https://paypal.me/cushen)
|
||||
- 💵 [Become a backer on **Patreon**](https://www.patreon.com/cushen)
|
||||
- 🖼️ [Decorate your laptop or journal with an Academic **sticker**](https://www.redbubble.com/people/neutreno/works/34387919-academic)
|
||||
- 👕 [Wear the **T-shirt**](https://academic.threadless.com/)
|
||||
- :woman_technologist: [**Contribute**](https://sourcethemes.com/academic/docs/contribute/)
|
||||
|
||||
[](https://github.com/gcushen/hugo-academic/)
|
||||
|
||||
## Install
|
||||
|
||||
You can choose from one of the following four methods to install:
|
||||
|
||||
* [**one-click install using your web browser (recommended)**](https://sourcethemes.com/academic/docs/install/#install-with-web-browser)
|
||||
* [install on your computer using **Git** with the Command Prompt/Terminal app](https://sourcethemes.com/academic/docs/install/#install-with-git)
|
||||
* [install on your computer by downloading the **ZIP files**](https://sourcethemes.com/academic/docs/install/#install-with-zip)
|
||||
* [install on your computer with **RStudio**](https://sourcethemes.com/academic/docs/install/#install-with-rstudio)
|
||||
|
||||
Then [personalize your new site](https://sourcethemes.com/academic/docs/get-started/).
|
||||
|
||||
## Ecosystem
|
||||
|
||||
* **[Academic Admin](https://github.com/sourcethemes/academic-admin):** An admin tool to import publications from BibTeX or import assets for an offline site
|
||||
* **[Academic Scripts](https://github.com/sourcethemes/academic-scripts):** Scripts to help migrate content to new versions of Academic
|
||||
|
||||
## License
|
||||
|
||||
Copyright 2017-present [George Cushen](https://georgecushen.com).
|
||||
|
||||
Released under the [MIT](https://github.com/sourcethemes/academic-kickstart/blob/master/LICENSE.md) license.
|
||||
|
||||
[](https://github.com/igrigorik/ga-beacon)
|
||||
@ -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
|
||||
@ -1,7 +0,0 @@
|
||||
# Academic Website Builder
|
||||
# https://sourcethemes.com/academic/
|
||||
#
|
||||
# The presence of this file is for compatibility with Blogdown and Forestry.
|
||||
# If you are not using those tools, this file may be deleted.
|
||||
#
|
||||
# The actual configuration files are stored in the `config/_default/` folder.
|
||||
@ -19,9 +19,6 @@ copyright = "© {year} Jens True"
|
||||
## Advanced options below ##
|
||||
############################
|
||||
|
||||
# Name of Academic theme folder in `themes/`.
|
||||
theme = "academic"
|
||||
|
||||
# Get last modified date for content from Git?
|
||||
enableGitInfo = false
|
||||
|
||||
@ -69,3 +66,7 @@ ignoreFiles = ["\\.ipynb$", ".ipynb_checkpoints$", "\\.Rmd$", "\\.Rmarkdown$", "
|
||||
category = "categories"
|
||||
publication_type = "publication_types"
|
||||
author = "authors"
|
||||
|
||||
[module]
|
||||
[[module.imports]]
|
||||
path = "github.com/wowchemy/wowchemy-hugo-modules/wowchemy"
|
||||
5
go.mod
Normal file
5
go.mod
Normal file
@ -0,0 +1,5 @@
|
||||
module code.jcktrue.dk/jct/jcktrue.dk
|
||||
|
||||
go 1.15
|
||||
|
||||
require github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20200903212926-73d157ece01d // indirect
|
||||
4
go.sum
Normal file
4
go.sum
Normal file
@ -0,0 +1,4 @@
|
||||
github.com/wowchemy/wowchemy-hugo-modules v0.29.0 h1:tmZeM85lHRB8U0L6xT5bLFgq6p84CqmjM4FMRK1B1jg=
|
||||
github.com/wowchemy/wowchemy-hugo-modules v4.8.0+incompatible h1:bWdYezLML3TZq5H0Rot4Urwl6HBl1uok5xIDOTqcWC8=
|
||||
github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20200903212926-73d157ece01d h1:p/Clz609aMSAnc1udZNznkwlF/OLoxAxhon9Fb5jLRY=
|
||||
github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20200903212926-73d157ece01d/go.mod h1:H22qfH9qj3FWwsk7+bAZpmT24yRGNQURah2/IRwjbn8=
|
||||
26
netlify.toml
26
netlify.toml
@ -1,26 +0,0 @@
|
||||
[build]
|
||||
command = "hugo --gc --minify -b $URL"
|
||||
publish = "public"
|
||||
|
||||
[build.environment]
|
||||
HUGO_VERSION = "0.62.0"
|
||||
HUGO_ENABLEGITINFO = "true"
|
||||
|
||||
[context.production.environment]
|
||||
HUGO_ENV = "production"
|
||||
|
||||
[context.deploy-preview]
|
||||
command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
|
||||
|
||||
[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"
|
||||
@ -1,41 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# WARNING: this will reset the project to the Kickstart template!
|
||||
|
||||
# Update Academic
|
||||
cd ..
|
||||
source update_academic.sh
|
||||
cd scripts/
|
||||
|
||||
#################################################
|
||||
|
||||
# Install demo config
|
||||
rsync -av ../themes/academic/exampleSite/config/ ../config/
|
||||
|
||||
# Install demo user
|
||||
rsync -av ../themes/academic/exampleSite/content/authors/ ../content/authors/
|
||||
|
||||
# Install page sharer button customizer
|
||||
rsync -av ../themes/academic/data/page_sharer.toml ../data/
|
||||
|
||||
# Install an example instance of each widget type
|
||||
rsync -av --exclude gallery/ ../themes/academic/exampleSite/content/home/ ../content/home/
|
||||
|
||||
# Install indices
|
||||
rsync -av ../themes/academic/exampleSite/content/post/_index.md ../content/post/_index.md
|
||||
rsync -av ../themes/academic/exampleSite/content/publication/_index.md ../content/publication/_index.md
|
||||
rsync -av ../themes/academic/exampleSite/content/talk/_index.md ../content/talk/_index.md
|
||||
|
||||
# Skip static dir - do not import the demo's media library
|
||||
|
||||
#################################################
|
||||
|
||||
# Post processing
|
||||
|
||||
# Deactivate Hero
|
||||
sed -i '' -e 's/active = true/active = false/' ../content/home/hero.md
|
||||
|
||||
# Manual Steps:
|
||||
# - content/home/project.md: Re-comment out project filters
|
||||
# - content/home/demo.md: Re-modify content & set gradient background instead of image
|
||||
# - content/home/hero.md: Clear `hero_media` value & set gradient background instead of image
|
||||
Submodule themes/academic deleted from e5e24fc55c
@ -1,51 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Source Themes Academic: Theme updater
|
||||
# Checks for available updates and then asks to install any updates.
|
||||
# https://sourcethemes.com/academic/
|
||||
#
|
||||
# Command: bash ./update_academic.sh
|
||||
|
||||
# Check for prerequisites.
|
||||
if [ ! -d .git ]; then
|
||||
echo "ERROR: This tool is for Git repositories only."
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
function view_update () {
|
||||
echo -e "Checking for updates...\n"
|
||||
cd themes/academic
|
||||
git fetch
|
||||
git log --pretty=oneline --abbrev-commit --decorate HEAD..origin/master
|
||||
cd ../../
|
||||
}
|
||||
|
||||
# Function to update Academic
|
||||
function do_update () {
|
||||
# Apply any updates
|
||||
git submodule update --remote --merge
|
||||
|
||||
# - Update Netlify.toml with required Hugo version
|
||||
if [ -f ./netlify.toml ]; then
|
||||
# Postfix '.0' to Hugo min_version as sadly it doesn't map to a precise semantic version.
|
||||
version=$(sed -n 's/^min_version = //p' themes/academic/theme.toml | tr -d '"')
|
||||
version="${version}.0"
|
||||
echo "Set Netlify Hugo version to v${version}"
|
||||
sed -i.bak -e "s/HUGO_VERSION = .*/HUGO_VERSION = \"$version\"/g" ./netlify.toml && rm -f ./netlify.toml.bak
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "View the release notes at: https://sourcethemes.com/academic/updates"
|
||||
echo "If there are breaking changes, the config and/or front matter of content" \
|
||||
"may need upgrading by following the steps in the release notes."
|
||||
}
|
||||
|
||||
# Display currently installed version (although could be between versions if updated to master rather than tag)
|
||||
version=$(sed -n 's/^version = "//p' themes/academic/data/academic.toml)
|
||||
echo -e "Source Themes Academic v$version\n"
|
||||
|
||||
# Display available updates
|
||||
view_update
|
||||
|
||||
# Apply any updates
|
||||
do_update
|
||||
Reference in New Issue
Block a user