From e7d2b2322c55c545e449abb75bb68292f2cc5601 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Wed, 3 Mar 2021 11:31:09 +0000 Subject: modules: update - get workaround for Hugo remote figure error And convert remaining Demo config from TOML to YAML --- exampleSite/config/_default/languages.toml | 20 -- exampleSite/config/_default/languages.yaml | 22 +++ exampleSite/config/_default/menus.toml | 46 ----- exampleSite/config/_default/menus.yaml | 27 +++ exampleSite/config/_default/params.toml | 289 ----------------------------- exampleSite/config/_default/params.yaml | 160 ++++++++++++++++ exampleSite/go.mod | 4 +- exampleSite/go.sum | 8 +- 8 files changed, 215 insertions(+), 361 deletions(-) delete mode 100644 exampleSite/config/_default/languages.toml create mode 100644 exampleSite/config/_default/languages.yaml delete mode 100644 exampleSite/config/_default/menus.toml create mode 100644 exampleSite/config/_default/menus.yaml delete mode 100644 exampleSite/config/_default/params.toml create mode 100644 exampleSite/config/_default/params.yaml (limited to 'exampleSite') diff --git a/exampleSite/config/_default/languages.toml b/exampleSite/config/_default/languages.toml deleted file mode 100644 index f7c6da68..00000000 --- a/exampleSite/config/_default/languages.toml +++ /dev/null @@ -1,20 +0,0 @@ -# Languages -# Create a `[X]` block for each language you want, where X is the language ID. -# Refer to https://sourcethemes.com/academic/docs/language/ - -# Configure the English version of the site. -[en] - languageCode = "en-us" - # contentDir = "content/en" # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. - -# Uncomment the lines below to configure your website in a second language. -#[zh] -# languageCode = "zh-Hans" -# contentDir = "content/zh" -# title = "Chinese website title..." -# [zh.params] -# description = "Site description in Chinese..." -# [[zh.menu.main]] -# name = "Wo" -# url = "#about" -# weight = 1 diff --git a/exampleSite/config/_default/languages.yaml b/exampleSite/config/_default/languages.yaml new file mode 100644 index 00000000..40884cc1 --- /dev/null +++ b/exampleSite/config/_default/languages.yaml @@ -0,0 +1,22 @@ +# Languages +# Create a section for each of your site's languages. +# Documentation: https://wowchemy.com/docs/guide/language/ + +# Default language +en: + languageCode: en-us + # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. + #contentDir: content/en + +# Uncomment the lines below to configure your website in a second language. +#zh: +# languageCode: zh-Hans +# contentDir: content/zh +# title: Chinese website title... +# params: +# description: Site description in Chinese... +# menu: +# main: +# - name: δΌ  +# url: '#about' +# weight: 1 diff --git a/exampleSite/config/_default/menus.toml b/exampleSite/config/_default/menus.toml deleted file mode 100644 index e090a91f..00000000 --- a/exampleSite/config/_default/menus.toml +++ /dev/null @@ -1,46 +0,0 @@ -# Navigation Links -# To link a homepage widget, specify the URL as a hash `#` followed by the filename of the -# desired widget in your `content/home/` folder. -# The weight parameter defines the order that the links will appear in. - -[[main]] - name = "Demo" - url = "#about" - weight = 10 - -[[main]] - name = "Posts" - url = "#posts" - weight = 20 - -[[main]] - name = "Projects" - url = "#projects" - weight = 30 - -[[main]] - name = "Talks" - url = "#talks" - weight = 40 - -[[main]] - name = "Publications" - url = "#featured" - weight = 50 - -[[main]] - name = "Courses" - url = "courses/" - weight = 60 - -[[main]] - name = "Contact" - url = "#contact" - weight = 70 - -# Link to a PDF of your resume/CV from the menu. -# To enable, copy your resume/CV to `static/media/resume.pdf` and uncomment the lines below. -# [[main]] -# name = "CV" -# url = "media/resume.pdf" -# weight = 70 diff --git a/exampleSite/config/_default/menus.yaml b/exampleSite/config/_default/menus.yaml new file mode 100644 index 00000000..702026d0 --- /dev/null +++ b/exampleSite/config/_default/menus.yaml @@ -0,0 +1,27 @@ +# Navigation Links +# To link a homepage widget, specify the URL as a hash `#` followed by the filename of the +# desired widget in your `content/home/` folder. +# The weight parameter defines the order that the links will appear in. + +main: + - name: Demo + url: '#about' + weight: 10 + - name: Posts + url: '#posts' + weight: 20 + - name: Projects + url: '#projects' + weight: 30 + - name: Talks + url: '#talks' + weight: 40 + - name: Publications + url: '#featured' + weight: 50 + - name: Courses + url: courses/ + weight: 60 + - name: Contact + url: '#contact' + weight: 70 diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml deleted file mode 100644 index efaddb59..00000000 --- a/exampleSite/config/_default/params.toml +++ /dev/null @@ -1,289 +0,0 @@ -# SITE SETUP -# Guide: https://wowchemy.com/docs/get-started/ -# Documentation: https://wowchemy.com/docs/ -# -# This file is formatted using TOML syntax - learn more at https://learnxinyminutes.com/docs/toml/ -# Each config section after this section is defined by a name in square brackets (e.g. `[search]`). - -############################ -## Theme -############################ - -# Choose a theme. -# Guide to color themes: https://wowchemy.com/docs/customization/#color-themes -# Browse the latest built-in font sets at https://github.com/wowchemy/wowchemy-hugo-modules/tree/master/wowchemy/themes/ -# Browse user installed themes in `data/themes/` -theme = "minimal" - -# Enable users to switch between day and night mode? -day_night = true - -# Override the theme's font set (optional). -# Guide to font sets: https://wowchemy.com/docs/customization/#fonts -# Browse the latest built-in font sets at https://github.com/wowchemy/wowchemy-hugo-modules/tree/master/wowchemy/data/fonts -# Browse user installed font sets in `data/fonts/` -font = "" - -# Choose a font size. -# Sizes: XS (extra small), S (small), M (medium), L (large - DEFAULT), XL (extra large) -font_size = "L" - -############################ -## Basic Info -############################ - -# Website type -# Improve how search engines understand your site. -# For personal sites, choose "Person". -# For organizations and projects, choose from https://schema.org/Organization#subtypes -# E.g. Person, Organization, LocalBusiness, Project, EducationalOrganization -site_type = "Person" - -# Local business type (optional) -# If you entered "LocalBusiness" above, choose the type of business from https://schema.org/LocalBusiness#subtypes -local_business_type = "" - -# Organization name (optional) -# Enter an organization or project name. Defaults to the site title from `config.toml`. -org_name = "" - -# Description for social sharing and search engines. If undefined, superuser role is used in place. -description = "" - -############################ -## Site Features -############################ - -# Enable source code highlighting? true/false -# Documentation: https://wowchemy.com/docs/writing-markdown-latex/#highlighting-options -highlight = true -highlight_languages = ["r", "python", "latex"] # Add support for highlighting additional languages -# highlight_style = "github" # For supported styles, see https://cdnjs.com/libraries/highlight.js/ - -# Enable LaTeX math rendering? true/false -# If false, you can enable math on a per page basis as needed. -math = false - -# Enable diagram rendering? true/false -# If false, you can enable diagrams on a per page basis as needed. -diagram = false - -# Privacy pack -# Show a cookie consent message to visitors -# Anonymize IP in Google Analytics (if enabled) -privacy_pack = false - -# Enable visitors to edit pages? -# `repo` defines the repository URL. `editable` defines which page types can be edited. -edit_page = {repo_url = "", content_dir = "", repo_branch = "main", editable = {page = false, post = false, book = false}} - -# Show related content at the bottom of pages? -show_related = {book = true, page = false, post = true, project = true, publication = true, talk = true} - -############################ -## Contact details -## -## These details power the Contact widget (if enabled). -## Additionally, for organizations, these details may be used to enrich search engine results. -############################ - -# Enter contact details (optional). To hide a field, clear it to "". -email = "test@example.org" -phone = "888 888 88 88" - -# Address -# For country_code, use the 2-letter ISO code (see https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ) -address = {street = "450 Serra Mall", city = "Stanford", region = "CA", postcode = "94305", country = "United States", country_code = "US"} - -# Geographic coordinates -# To get your coordinates, right-click on Google Maps and choose "What's here?". The coords will show up at the bottom. -coordinates = {latitude = "37.4275", longitude = "-122.1697"} - -# Directions for visitors to locate you. -directions = "Enter Building 1 and take the stairs to Office 200 on Floor 2" - -# Office hours -# A list of your office hours. To remove, set to an empty list `[]`. -office_hours = ["Monday 10:00 to 13:00", "Wednesday 09:00 to 10:00"] - -# Enter an optional link for booking appointments (e.g. calendly.com). -appointment_url = "https://calendly.com" - -# Contact links -# Set to `[]` to disable, or comment out unwanted lines with a hash `#`. -contact_links = [ - {icon = "twitter", icon_pack = "fab", name = "DM Me", link = "https://twitter.com/Twitter"}, - {icon = "skype", icon_pack = "fab", name = "Skype Me", link = "skype:echo123?call"}, - {icon = "keybase", icon_pack = "fab", name = "Chat on Keybase", link = "https://keybase.io/"}, - {icon = "comments", icon_pack = "fas", name = "Discuss on Forum", link = "https://discourse.gohugo.io"}, - # {icon = "telegram", icon_pack = "fab", name = "Telegram Me", link = "https://telegram.me/@Telegram"}, - ] - -############################ -## Social -############################ - -# Default image for social sharing and search engines. Place image in `static/media/` folder and specify image name here. -sharing_image = "" - -# Twitter username (without @). Used when a visitor shares your site on Twitter. -twitter = "" - -############################ -## Regional Settings -############################ - -# Date and time format (refer to https://wowchemy.com/docs/customization/#date-format ) -# Examples: "Mon, Jan 2, 2006" or "2006-01-02" -date_format = "Jan 2, 2006" -# Examples: "3:04 pm" or "15:04" -time_format = "3:04 PM" - -# Address format (en-us, en-gb, de, fr-fr, zh). -address_format = "en-us" - -############################ -## Advanced -############################ - -# Main menu alignment (l = left, c = center, r = right) and logo options. -main_menu = {enable = true, align = "l", show_logo = true, highlight_active_link = true, show_language = false, show_day_night = true, show_search = true} - -# Show estimated reading time for posts? (true/false) -reading_time = true - -# Display next/previous section pager? (true/false) -section_pager = false -docs_section_pager = true # Display pager in Docs layout (e.g. tutorials)? - -# Enable in-built social sharing buttons? (true/false) -sharing = true - -# Show a copyright license from creativecommons.org in the site footer? -# Page specific copyright licenses are also possible by adding this option to a page's front matter. -copyright_license = {enable = false, allow_derivatives = false, share_alike = true, allow_commercial = false, notice = "This work is licensed under {license}"} - -# Abstract length (characters) in the Compact and Portfolio Card list views. Also, see `summaryLength` in `config.toml`. -abstract_length = 135 - -# Load JS plugins -# E.g. To load `/assets/js/custom.js`, set `plugins_js = ["custom"]`. -plugins_js = [] - -# Avatars. -# An avatar is an image that appears next to a user's name. -# An avatar can be uploaded as an image named `avatar` to each user's profile or fetched from Gravatar.com. -[avatar] - # Get user avatars from Gravatar.com? (true/false) - gravatar = false - - # Choose a shape for avatar images. Options: circle, square. - shape = "circle" - -# Configuration of publication pages. -[publications] - # Date format (refer to https://wowchemy.com/docs/customization/#date-format ) - # Examples: "Mon, Jan 2, 2006" or "2006-01-02" - date_format = "January 2006" - - # Citation style ("apa" or "mla") - citation_style = "apa" - -# Configuration of project pages. -[projects] - # Views for associated content. - # 1: List - # 2: Compact - # 3: Card - # 4: Citation (publications only) - post_view = 2 - publication_view = 2 - talk_view = 2 - -# Breadcrumb navigation -[breadcrumb] - page_types = {book = true} - -############################ -## Comments -############################ -[comments] - # Comment provider: - # "": Disabled - # "disqus": Disqus (https://disqus.com) - # "commento": Commento (https://commento.io) - provider = "" - - # Which page types are commentable? - commentable = {page = true, post = true, docs = true, project = true, publication = true, talk = true} - - # Configuration of Disqus. - [comments.disqus] - shortname = "" # Paste the shortname from your Disqus dashboard. - show_count = true # Show comment count in page header? (true/false) - - # Configuration of Commento. - [comments.commento] - # If self-hosting Commento, enter its URL here (e.g. "https://commento.?.com"), otherwise leave empty. - url = "" - -############################ -## Search -############################ -[search] - # Search provider: - # "": No search engine - # "wowchemy": Built-in search engine - # "algolia": Algolia (https://www.algolia.com) - provider = "wowchemy" - - # Configuration of Algolia search engine. - # Paste the values from your Algolia dashboard. - [search.algolia] - app_id = "" - api_key = "" - index_name = "" - show_logo = false - -############################ -## Maps -############################ -[map] - # To show your address on a map in the Contact widget, enter your latitude and longitude (above) - # and choose a map provider below. - # - # To use Google Maps, set `engine` to 1 and enter your API key that can be obtained here: - # https://developers.google.com/maps/documentation/javascript/get-api-key - # To use OpenStreetMap tiles, set `engine` to 2. - # To use OpenStreetMap on a high traffic site, set `engine` to 3 and enter your API key that can be obtained here: - # https://www.mapbox.com/studio/account/tokens - # - # Map provider: - # "": No map - # "google": Google Maps - # "mapnik": OpenStreetMap (Mapnik) - # "mapbox": OpenStreetMap (Mapbox) - provider = "mapnik" - api_key = "" - zoom = 15 - -############################ -## Marketing -############################ -[marketing] - google_analytics = "" - google_tag_manager = "" - google_site_verification = "" - -############################ -## Content Management System -############################ -[cms] - branch = "master" - local_backend = false - -############################ -## Icon Pack Extensions -############################ -[icon.pack] - ai = false # Academicons icon pack https://jpswalsh.github.io/academicons/ diff --git a/exampleSite/config/_default/params.yaml b/exampleSite/config/_default/params.yaml new file mode 100644 index 00000000..7de432bf --- /dev/null +++ b/exampleSite/config/_default/params.yaml @@ -0,0 +1,160 @@ +# SITE SETUP +# Guide: https://wowchemy.com/docs/getting-started/ +# Documentation: https://wowchemy.com/docs/ +# This file is formatted using YAML syntax - learn more at https://learnxinyminutes.com/docs/yaml/ + +# Appearance + +theme: minimal +day_night: true +font: '' +font_size: L + +# SEO + +site_type: Person +local_business_type: '' +org_name: '' +description: '' +twitter: '' + +# Contact (edit or remove options as required) + +email: test@example.org +phone: 888 888 88 88 +address: + street: 450 Serra Mall + city: Stanford + region: CA + postcode: '94305' + country: United States + country_code: US +coordinates: + latitude: '37.4275' + longitude: '-122.1697' +directions: Enter Building 1 and take the stairs to Office 200 on Floor 2 +office_hours: + - 'Monday 10:00 to 13:00' + - 'Wednesday 09:00 to 10:00' +appointment_url: 'https://calendly.com' +contact_links: + - icon: twitter + icon_pack: fab + name: DM Me + link: 'https://twitter.com/Twitter' + - icon: skype + icon_pack: fab + name: Skype Me + link: 'skype:echo123?call' + - icon: keybase + icon_pack: fab + name: Chat on Keybase + link: 'https://keybase.io/' + - icon: comments + icon_pack: fas + name: Discuss on Forum + link: 'https://discourse.gohugo.io' + +# Site header + +main_menu: + enable: true + align: l + show_logo: true + show_language: false + show_day_night: true + show_search: true + highlight_active_link: true + +# Localization + +date_format: 'Jan 2, 2006' +time_format: '3:04 PM' +address_format: en-us + +# Site features + +highlight: true +highlight_languages: + - r + - python + - latex +math: false +diagram: false +privacy_pack: false +edit_page: + repo_url: '' + content_dir: '' + repo_branch: main + editable: + page: false + post: false + book: false +show_related: + book: true + page: false + post: true + project: true + publication: true + event: true +reading_time: true +section_pager: false +docs_section_pager: true +sharing: true +copyright_license: + enable: false + allow_derivatives: false + share_alike: true + allow_commercial: false + notice: 'This work is licensed under {license}' +abstract_length: 135 +plugins_js: [] +avatar: + gravatar: false + shape: circle +publications: + date_format: January 2006 + citation_style: apa +projects: + post_view: 2 + publication_view: 2 + talk_view: 2 +breadcrumb: + page_types: + book: true +comments: + provider: '' + commentable: + post: true + book: true + project: true + publication: true + event: true + disqus: + shortname: '' + show_count: true + commento: + url: '' +search: + provider: wowchemy + algolia: + app_id: '' + api_key: '' + index_name: '' + show_logo: false +map: + provider: mapnik + api_key: '' + zoom: 15 +marketing: + google_analytics: '' + google_tag_manager: '' + google_site_verification: '' + baidu_site_verification: '' + baidu_tongji: '' +cms: + branch: master + local_backend: false +icon: + pack: + ai: false diff --git a/exampleSite/go.mod b/exampleSite/go.mod index eaf54f64..60fd27ff 100644 --- a/exampleSite/go.mod +++ b/exampleSite/go.mod @@ -3,6 +3,6 @@ module github.com/wowchemy/starter-academic/exampleSite go 1.15 require ( - github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210226164504-3952bfc85cee // indirect - github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210226164504-3952bfc85cee // indirect + github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210303111450-5529404d1942 // indirect + github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210303111450-5529404d1942 // indirect ) diff --git a/exampleSite/go.sum b/exampleSite/go.sum index d3e7c473..9d573b6b 100644 --- a/exampleSite/go.sum +++ b/exampleSite/go.sum @@ -1,4 +1,4 @@ -github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210226164504-3952bfc85cee h1:fzgNvnmzCL2gjkMPme48DVakKsRw/iWKJIRgXyYI/bg= -github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210226164504-3952bfc85cee/go.mod h1:H22qfH9qj3FWwsk7+bAZpmT24yRGNQURah2/IRwjbn8= -github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210226164504-3952bfc85cee h1:NMXbMGtvC1+JMYFceNLhin1Or002v0/aGfQ/WlUhD1o= -github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210226164504-3952bfc85cee/go.mod h1:AKpYbqUVlj0VYsc7Jsxe1o8Ko2yV31A5ZPdfpACcXJw= +github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210303111450-5529404d1942 h1:MFjvEbycszSaAQaOM3R7DSmc46C6eRBF5CORSig5n0I= +github.com/wowchemy/wowchemy-hugo-modules/wowchemy v0.0.0-20210303111450-5529404d1942/go.mod h1:H22qfH9qj3FWwsk7+bAZpmT24yRGNQURah2/IRwjbn8= +github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210303111450-5529404d1942 h1:WPQAMza9/HwD0EfGG/fwIfl3sDK8gdncEKrMv22WrlE= +github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms v0.0.0-20210303111450-5529404d1942/go.mod h1:AKpYbqUVlj0VYsc7Jsxe1o8Ko2yV31A5ZPdfpACcXJw= -- cgit v1.2.3