Merge branch 'main' of github.com:maiani/toha
This commit is contained in:
commit
82b08ccd5e
53 changed files with 3093 additions and 1069 deletions
|
@ -4,9 +4,7 @@
|
|||
{{ with .services }}
|
||||
<!-- Google Analytics -->
|
||||
{{ with .google }}
|
||||
{{ $privacyConfig:= dict (slice "Site" "Config" "Privacy" "GoogleAnalytics") $.Site.Config.Privacy.GoogleAnalytics }}
|
||||
{{ $analyticsConfig := dict (slice "Site" "Config" "Services" "GoogleAnalytics" "ID") .id }}
|
||||
{{ template "_internal/google_analytics.html" (merge $privacyConfig $analyticsConfig) }}
|
||||
{{ partial "google_analytics.html" . }}
|
||||
{{ end }}
|
||||
|
||||
<!-- Counter.dev -->
|
||||
|
@ -57,6 +55,25 @@
|
|||
<script defer src='{{ or .scheme "https" }}://{{ or .instance "analytics.eu.umami.is" }}/script.js' data-website-id="{{ .id }}"></script>
|
||||
<!-- End Umami analytics -->
|
||||
{{end}}
|
||||
|
||||
{{ with .statcounter }}
|
||||
<!-- Statcounter analytics -->
|
||||
<script type="text/javascript" src="https://www.statcounter.com/counter/counter.js" async></script>
|
||||
<script type="text/javascript">
|
||||
var sc_project = {{ .project }};
|
||||
var sc_invisible = {{ .invisible }};
|
||||
var sc_security = "{{ .security }}";
|
||||
var scJsHost = (("https:" == document.location.protocol) ?
|
||||
"https://www.statcounter.com/js/" : "https://www.statcounter.com/js/");
|
||||
</script>
|
||||
<noscript>
|
||||
<div class="statcounter"><a title="web counter" href="https://statcounter.com/" target="_blank"><img
|
||||
class="statcounter" src="https://c.statcounter.com/{{ .project }}/0/{{ .security }}/{{ .invisible }}/"
|
||||
alt="web counter" referrerPolicy="no-referrer-when-downgrade"></a></div>
|
||||
<!-- End of Statcounter Code -->
|
||||
</noscript>
|
||||
<!-- End Statcounter analytics -->
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<div class="card-body">
|
||||
<a href="{{ .RelPermalink | relLangURL }}" class="post-card-link">
|
||||
<h5 class="card-title">{{ .Title }}</h5>
|
||||
<p class="card-text post-summary">{{ .Summary }}</p>
|
||||
<p class="card-text post-summary">{{ .Summary | plainify }}</p>
|
||||
</a>
|
||||
{{ if and site.Params.features.tags.enable site.Params.features.tags.on_card }}
|
||||
{{ partial "misc/tags.html" .Params.tags }}
|
||||
|
|
|
@ -4,34 +4,48 @@
|
|||
>
|
||||
<div class="card mt-1">
|
||||
<div class="card">
|
||||
<a class="card-header" href="{{ if .repo }}{{ .repo }}{{ else if .url }}{{ .url }}{{ else }}javascript:void(0){{ end }}" {{ if or .repo .url }}target="_blank" rel="noopener"{{ end }}>
|
||||
<div>
|
||||
<div class="d-flex">
|
||||
{{ if .logo }}
|
||||
|
||||
{{ if eq (len (findRE ".*/.*" .logo) ) 0 }}
|
||||
|
||||
<i style="padding-right: 0.25em" class="{{.logo}} h4"></i>
|
||||
|
||||
{{ else }}
|
||||
|
||||
{{ $logoImage:= resources.Get .logo}}
|
||||
{{ if $logoImage }}
|
||||
{{/* svg don't support "Fit" operation */}}
|
||||
{{ if ne $logoImage.MediaType.SubType "svg" }}
|
||||
{{ $logoImage = $logoImage.Fit "24x24" }}
|
||||
{{ end }}
|
||||
<img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
<a href="{{ if .repo }}{{ .repo }}{{ else if .url }}{{ .url }}{{ else }}javascript:void(0){{ end }}" {{ if or .repo .url }}target="_blank" rel="noopener"{{ end }}>
|
||||
{{ if .image }}
|
||||
<div class="card-head">
|
||||
{{ $imageImage:= resources.Get .image}}
|
||||
{{ if $imageImage }}
|
||||
{{/* svg don't support "Fit" operation */}}
|
||||
{{ if ne $imageImage.MediaType.SubType "svg" }}
|
||||
{{ $imageImage = $imageImage.Fit "1000x1000" }}
|
||||
{{ end }}
|
||||
|
||||
<h5 class="card-title mb-0">{{ .name }}</h5>
|
||||
</div>
|
||||
<div class="sub-title">
|
||||
<span>{{ .role }}</span>
|
||||
<span>{{ .timeline }}</span>
|
||||
<img class="card-img-top" src="{{ $imageImage.RelPermalink }}" alt="{{ .name }}" />
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ end }}
|
||||
<div class="card-header">
|
||||
<div>
|
||||
<div class="d-flex">
|
||||
{{ if .logo }}
|
||||
|
||||
{{ if eq (len (findRE ".*/.*" .logo) ) 0 }}
|
||||
|
||||
<i style="padding-right: 0.25em" class="{{.logo}} h4"></i>
|
||||
|
||||
{{ else }}
|
||||
|
||||
{{ $logoImage:= resources.Get .logo}}
|
||||
{{ if $logoImage }}
|
||||
{{/* svg don't support "Fit" operation */}}
|
||||
{{ if ne $logoImage.MediaType.SubType "svg" }}
|
||||
{{ $logoImage = $logoImage.Fit "24x24" }}
|
||||
{{ end }}
|
||||
<img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
{{ end }}
|
||||
|
||||
<h5 class="card-title mb-0">{{ .name }}</h5>
|
||||
</div>
|
||||
<div class="sub-title">
|
||||
<span>{{ .role }}</span>
|
||||
<span>{{ .timeline }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<div class="col-xs-12 col-sm-6 col-lg-4 pt-2">
|
||||
<div class="col-xs-12 col-sm-6 col-lg-4 pt-2 filtr-item"
|
||||
data-category='all, {{ with .categories }}{{ delimit . ","}}{{ end }}'
|
||||
>
|
||||
<a class="text-decoration-none" {{ if .url }}href="{{ .url }}" title="{{ .name }}" target="_blank" rel="noopener"{{ end }}>
|
||||
<div class="card">
|
||||
<div class="card-head d-flex">
|
||||
|
@ -18,7 +20,7 @@
|
|||
<h5 class="card-title">{{ .name }}</h5>
|
||||
{{ end }}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="card-body text-justify pt-1 pb-1">
|
||||
<p class="card-text">{{ .summary | markdownify }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
22
layouts/partials/google_analytics.html
Normal file
22
layouts/partials/google_analytics.html
Normal file
|
@ -0,0 +1,22 @@
|
|||
{{ if site.Params.features.analytics.enabled }}
|
||||
{{- with site.Params.features.analytics.services.google.id }}
|
||||
{{- if strings.HasPrefix (lower .) "ua-" }}
|
||||
{{- warnf "Google Analytics 4 (GA4) replaced Google Universal Analytics (UA) effective 1 July 2023. See https://support.google.com/analytics/answer/11583528. Create a GA4 property and data stream, then replace the Google Analytics ID in your site configuration with the new value." }}
|
||||
{{- else }}
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
|
||||
<script>
|
||||
var doNotTrack = false;
|
||||
if ({{ site.Params.features.analytics.services.google.respectDoNotTrack }}) {
|
||||
var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
|
||||
var doNotTrack = (dnt == "1" || dnt == "yes");
|
||||
}
|
||||
if (!doNotTrack) {
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag('js', new Date());
|
||||
gtag('config', '{{ . }}');
|
||||
}
|
||||
</script>
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
|
@ -69,15 +69,26 @@ params:
|
|||
# id: foo
|
||||
# name: bar
|
||||
|
||||
# The `darkMode` feature
|
||||
darkmode:
|
||||
# [Deprecated] The `darkMode` feature
|
||||
# This is a deprecated setting, but has not been removed to maintain backward compatibility
|
||||
# If `theme` is set, the `darkMode` setting will be discarded.
|
||||
darkMode:
|
||||
enable: true
|
||||
|
||||
# The `theme` feature
|
||||
theme:
|
||||
enable: true
|
||||
services:
|
||||
light: true # enable light theme. default "true"
|
||||
dark: true # enable dark theme. default "true"
|
||||
default: system # can be either light, dark or system. default "system"
|
||||
|
||||
This helper will convert the above config into the following env vars:
|
||||
|
||||
* `FEATURE_ANALYTICS=1`
|
||||
* `FEATURE_ANALYTICS_GOOGLE=1`
|
||||
* `FEATURE_DARKMODE=1`
|
||||
* `FEATURE_THEME=1`
|
||||
|
||||
In JS, you can use it like this:
|
||||
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
{{- $scss := $template | resources.ExecuteAsTemplate "styles/application.scss" . -}}
|
||||
|
||||
{{/* Bundle application.scss */}}
|
||||
{{- $bundle := $scss | resources.ToCSS $options | fingerprint -}}
|
||||
{{- $bundle := $scss | css.Sass $options | fingerprint -}}
|
||||
<link rel="stylesheet" href="{{ $bundle.RelPermalink }}" integrity="{{ $bundle.Data.Integrity }}" />
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
<a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
{{ if ne site.Params.features.flags.enable false }}
|
||||
{{ $countryCode := partial "helpers/country-code.html" . }}
|
||||
<span class="flag-icon flag-icon-{{$countryCode}}"></span>
|
||||
<span class="fi fi-{{$countryCode}}"></span>
|
||||
{{ end }}
|
||||
{{ site.Language.LanguageName }}
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="languageSelector">
|
||||
{{ range site.Home.AllTranslations }}
|
||||
<a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang $.Sites.First.Language.Lang) "" .Language.Lang) $pageURL }}">
|
||||
<a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang $.Sites.Default.Language.Lang) "" .Language.Lang) $pageURL }}">
|
||||
{{ if ne site.Params.features.flags.enable false }}
|
||||
{{ $countryCode := partial "helpers/country-code.html" . }}
|
||||
<span class="flag-icon flag-icon-{{$countryCode}}"></span>
|
||||
<span class="fi fi-{{$countryCode}}"></span>
|
||||
{{ end }}
|
||||
{{ .Language.LanguageName }}
|
||||
</a>
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
{{ if .IsTranslated }}
|
||||
{{ partial "navigators/lang-selector.html" . }}
|
||||
{{ end }}
|
||||
{{ if site.Params.features.darkMode.enable }}
|
||||
{{ if or site.Params.features.darkMode.enable site.Params.features.theme.enable }}
|
||||
{{ partial "navigators/theme-selector.html" . }}
|
||||
{{ end }}
|
||||
</ul>
|
||||
|
|
|
@ -1,17 +1,31 @@
|
|||
{{/* variables for enabling/disabling various features */}}
|
||||
{{ $darkEnabled := true }}
|
||||
{{ $lightEnabled := true }}
|
||||
{{ if site.Params.features.theme.enable }}
|
||||
{{ $darkEnabled = site.Params.features.theme.services.dark | default true }}
|
||||
{{ $lightEnabled = site.Params.features.theme.services.light | default true }}
|
||||
{{ end }}
|
||||
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="themeSelector" role="button"
|
||||
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<img id="navbar-theme-icon-svg" class="theme-icon" src="{{ "icons/moon-svgrepo-com.svg" | relURL }}" width=20 alt="Dark Theme">
|
||||
</a>
|
||||
<div id="themeMenu" class="dropdown-menu dropdown-menu-icons-only" aria-labelledby="themeSelector">
|
||||
{{ if $lightEnabled }}
|
||||
<a class="dropdown-item nav-link" href="#" data-scheme="light">
|
||||
<img class="theme-icon" src="{{ "icons/sun-svgrepo-com.svg" | relURL }}" width=20 alt="Light Theme">
|
||||
</a>
|
||||
{{ end }}
|
||||
{{ if $darkEnabled }}
|
||||
<a class="dropdown-item nav-link" href="#" data-scheme="dark">
|
||||
<img class="theme-icon" src="{{ "icons/moon-svgrepo-com.svg" | relURL }}" width=20 alt="Dark Theme">
|
||||
</a>
|
||||
{{ end }}
|
||||
{{ if and $lightEnabled $darkEnabled }}
|
||||
<a class="dropdown-item nav-link" href="#" data-scheme="system">
|
||||
<img class="theme-icon" src="{{ "icons/computer-svgrepo-com.svg" | relURL }}" width=20 alt="System Theme">
|
||||
</a>
|
||||
{{ end }}
|
||||
</div>
|
||||
</li>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{{ $sectionID = .section.id }}
|
||||
{{ end }}
|
||||
|
||||
<div class="container-fluid anchor pb-5 skills-section">
|
||||
<div class="container-fluid anchor pb-5 skills-section" id="{{ $sectionID }}">
|
||||
{{ if not (.section.hideTitle) }}
|
||||
<h1 class="text-center">
|
||||
<span id="{{ $sectionID }}"></span>{{ .section.name }}</h1>
|
||||
|
@ -11,11 +11,25 @@
|
|||
<h1 class="text-center" style="display: none">
|
||||
<span id="{{ $sectionID }}"></span>{{ .section.name }}</h1>
|
||||
{{ end }}
|
||||
<div class="container d-flex-block">
|
||||
<div class="row" id="primary-skills">
|
||||
{{ range .skills }}
|
||||
{{ partial "cards/skill.html" . }}
|
||||
{{ if .section.filter }}
|
||||
<div class="container ms-auto text-center">
|
||||
<div class="btn-group flex-wrap" role="group" id="skill-filter-buttons">
|
||||
{{ range .buttons }}
|
||||
<button type="button" class="btn btn-dark skill-filtr-control" data-filter="{{ .filter }}">
|
||||
{{ .name }}
|
||||
</button>
|
||||
{{ end }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="container d-flex-block filtr-skills">
|
||||
<div class="row" id="skill-card-holder" style="margin-left:unset">
|
||||
{{ else }}
|
||||
<div class="container d-flex-block">
|
||||
<div class="row" id="primary-skills">
|
||||
{{ end }}
|
||||
{{ range .skills }}
|
||||
{{ partial "cards/skill.html" . }}
|
||||
{{ end }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue