Skip to content

Commit

Permalink
Updating to docsy go module
Browse files Browse the repository at this point in the history
  • Loading branch information
cchesser committed Nov 4, 2022
1 parent c74bcb8 commit 3fb4820
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 41 deletions.
22 changes: 16 additions & 6 deletions docs/config.toml
@@ -1,8 +1,5 @@
baseURL = "https://jvmperf.net"

# Hugo allows theme composition (and inheritance). The precedence is from left to right.
theme = ["docsy"]

# Will give values to .Lastmod etc.
enableGitInfo = true

Expand Down Expand Up @@ -105,9 +102,10 @@ footer_about_disable = false
enable = true

[[menu.main]]
name = "GitHub"
weight = 20
url = "https://github.com/cchesser/java-perf-workshop/"
name = "GitHub"
weight = 20
url = "https://github.com/cchesser/java-perf-workshop/"
pre = "<i class=\"fa-brands fa-github\"></i>"

[params.links]
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
Expand All @@ -116,3 +114,15 @@ enable = true
url = "https://github.com/cchesser/java-perf-workshop"
icon = "fab fa-github"
desc = "Development takes place here!"

[module]
proxy = "direct"
[module.hugoVersion]
extended = true
min = "0.73.0"
[[module.imports]]
path = "github.com/google/docsy"
disable = false
[[module.imports]]
path = "github.com/google/docsy/dependencies"
disable = false
1 change: 1 addition & 0 deletions docs/content/contributors.md
Expand Up @@ -4,6 +4,7 @@ linkTitle: "Contributors"
menu:
main:
weight: 30
pre: "<i class=\"fas fa-user-friends\"></i>"
---
<section class="row">
<div class="container">
Expand Down
1 change: 1 addition & 0 deletions docs/content/docs/_index.md
Expand Up @@ -6,4 +6,5 @@ hide_readingtime: true
menu:
main:
weight: 10
pre: "<i class=\"fas fa-tools\"></i>"
---
5 changes: 5 additions & 0 deletions docs/go.mod
@@ -0,0 +1,5 @@
module github.com/cchesser/java-perf-workshop

go 1.19

require github.com/google/docsy v0.5.1 // indirect
10 changes: 10 additions & 0 deletions docs/go.sum
@@ -0,0 +1,10 @@
github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/google/docsy v0.5.0 h1:ND+6sYJD1VYEEM8olBdJLPIyQrPDeDkC0PhzuZTVZMs=
github.com/google/docsy v0.5.0/go.mod h1:RKikAcSUR3b/40oqYfweD9uiNYTUirEKaCgLiEXMbQo=
github.com/google/docsy v0.5.1 h1:D/ZdFKiE29xM/gwPwQzmkyXhcbQGkReRS6aGrF7lnYk=
github.com/google/docsy v0.5.1/go.mod h1:maoUAQU5H/d+FrZIB4xg1EVWAx7RyFMGSDJyWghm31E=
github.com/google/docsy/dependencies v0.5.0/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo=
github.com/google/docsy/dependencies v0.5.1/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
95 changes: 62 additions & 33 deletions docs/layouts/partials/navbar.html
@@ -1,33 +1,62 @@
{{ $cover := .HasShortcode "blocks/cover" }}
<nav class="js-navbar-scroll navbar navbar-expand navbar-dark {{ if $cover}} td-navbar-cover {{ end }}flex-column flex-md-row td-navbar">
<a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
<span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}{{ with resources.Get "icons/logo.png" }}{{ ( . | minify).Content | safeHTML }}{{ end }}{{ end }}</span><span class="font-weight-bold"><i class="fas fa-cube"></i>&nbsp;&nbsp;jvmperf</span>
</a>
<div class="td-navbar-nav-scroll ml-md-auto" id="main_navbar">
<ul class="navbar-nav mt-2 mt-lg-0">
{{ $p := . }}
{{ range .Site.Menus.main }}
<li class="nav-item mr-4 mb-2 mb-lg-0">
{{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) }}
{{ with .Page }}
{{ $active = or $active ( $.IsDescendant .) }}
{{ end }}
{{ $url := urls.Parse .URL }}
{{ $baseurl := urls.Parse $.Site.Params.Baseurl }}
<a {{ if .Identifier }}id="{{ .Identifier }}"{{ end }} class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }}target="_blank" {{ end }}><span{{if $active }} class="active"{{end}}>{{ .Name }}</span></a>
</li>
{{ end }}
{{ if .Site.Params.versions }}
<li class="nav-item dropdown d-none d-lg-block">
{{ partial "navbar-version-selector.html" . }}
</li>
{{ end }}
{{ if (gt (len .Site.Home.Translations) 0) }}
<li class="nav-item dropdown d-none d-lg-block">
{{ partial "navbar-lang-selector.html" . }}
</li>
{{ end }}
</ul>
</div>
<div class="navbar-nav d-none d-lg-block">{{ partial "search-input.html" . }}</div>
</nav>
{{ $cover := and
(.HasShortcode "blocks/cover")
(not .Site.Params.ui.navbar_translucent_over_cover_disable)
-}}

<nav class="js-navbar-scroll navbar navbar-expand navbar-dark
{{- if $cover }} td-navbar-cover {{- end }} flex-column flex-md-row td-navbar">
<a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
{{- /**/ -}}
<span class="navbar-brand__logo navbar-logo">
{{- if ne .Site.Params.ui.navbar_logo false -}}
{{ with resources.Get "icons/logo.png" }}
{{ ( . | minify).Content | safeHTML -}}
{{ end -}}
{{ end -}}
</span>
{{- /**/ -}}
<span class="navbar-brand__name">
<i class="fas fa-cube"></i>&nbsp;&nbsp;jvmperf
</span>
{{- /**/ -}}
</a>
<div class="td-navbar-nav-scroll ml-md-auto" id="main_navbar">
<ul class="navbar-nav mt-2 mt-lg-0">
{{ $p := . -}}
{{ range .Site.Menus.main -}}
<li class="nav-item mr-4 mb-2 mb-lg-0">
{{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) -}}
{{ with .Page }}{{ $active = or $active ( $.IsDescendant .) }}{{ end -}}
{{ $pre := .Pre -}}
{{ $post := .Post -}}
{{ $url := urls.Parse .URL -}}
{{ $baseurl := urls.Parse $.Site.Params.Baseurl -}}
<a {{/**/ -}}
class="nav-link {{- if $active }} active {{- end }}" {{/**/ -}}
href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}"
{{- if ne $url.Host $baseurl.Host }} target="_blank" {{- end -}}
>
{{- with .Pre }}{{ $pre }}{{ end -}}
<span {{- if $active }} class="active" {{- end }}>
{{- .Name -}}
</span>
{{- with .Post }}{{ $post }}{{ end -}}
</a>
</li>
{{ end -}}
{{ if .Site.Params.versions -}}
<li class="nav-item dropdown mr-4 d-none d-lg-block">
{{ partial "navbar-version-selector.html" . -}}
</li>
{{ end -}}
{{ if (gt (len .Site.Home.Translations) 0) -}}
<li class="nav-item dropdown mr-4 d-none d-lg-block">
{{ partial "navbar-lang-selector.html" . -}}
</li>
{{ end -}}
</ul>
</div>
<div class="navbar-nav d-none d-lg-block">
{{ partial "search-input.html" . }}
</div>
</nav>
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -15,8 +15,8 @@
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
<dropwizard.version>1.3.14</dropwizard.version>
<metrics.version>4.0.0</metrics.version>
<jackson.version>2.9.9</jackson.version>
<jackson.databind.version>2.9.10.7</jackson.databind.version>
<jackson.version>2.13.4</jackson.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version>
<!-- scm info -->
<scm.connection>scm:git:git://github.com:cchesser/java-perf-workshop.git</scm.connection>
<scm.developerConnection>scm:git:git@github.com:cchesser/java-perf-workshop.git</scm.developerConnection>
Expand Down

0 comments on commit 3fb4820

Please sign in to comment.