Code refactoring

This commit is contained in:
Hazem Krimi
2023-11-21 17:40:40 +01:00
parent b70e0e9e93
commit 91d691d7c1
29 changed files with 496 additions and 592 deletions
+11 -5
View File
@@ -1,5 +1,8 @@
{{ $styles := resources.Get "css/baseof.css" | toCSS | minify }}
{{ $scripts := resources.Get "js/baseof.js" | js.Build | minify }}
{{ $baseStyles := resources.Get "css/baseof.css" | toCSS | minify }}
{{ $partialsStyles := resources.Get "css/partials.css" | toCSS | minify }}
{{ $baseScripts := resources.Get "js/baseof.js" | js.Build | minify }}
{{ $mobileNavigationScripts := resources.Get "js/mobile-navigation.js" | js.Build | minify }}
{{ $contactFormScripts := resources.Get "js/contact-form.js" | js.Build | minify }}
{{ $androidChromeIcon := resources.Get "android-chrome-192x192.png" }}
{{ $appleTouchIcon := resources.Get "apple-touch-icon.png" }}
@@ -24,7 +27,8 @@
<link rel="icon" type="image/png" sizes="16x16" href="{{ $favIcon16.Permalink }}">
<link rel="icon" type="image/x-icon" href="{{ $favIcon.Permalink }}">
<link rel="stylesheet" href="{{ $styles.Permalink }}">
<link rel="stylesheet" href="{{ $baseStyles.Permalink }}">
<link rel="stylesheet" href="{{ $partialsStyles.Permalink }}">
{{ block "styles" . }}{{ end }}
<title>
@@ -33,11 +37,13 @@
{{ end }}
</title>
<script defer src="{{ $scripts.Permalink }}"></script>
{{ block "scripts" . }}{{ end }}
<script defer src="{{ $baseScripts.Permalink }}"></script>
<script defer src="{{ $mobileNavigationScripts.Permalink }}"></script>
<script defer src="{{ $contactFormScripts.Permalink }}"></script>
</head>
<body>
{{ partial "header.html" . }}
{{ partial "mobile-navigation.html" . }}
<main>
{{ block "main" . }}{{ end }}
-6
View File
@@ -1,9 +1,3 @@
{{ define "styles" }}
{{ $styles := resources.Get "css/contact.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
{{ end }}
{{ define "main" }}
{{ partial "breadcrumb.html" . }}
-4
View File
@@ -1,7 +1,3 @@
{{ $styles := resources.Get "css/partials/about-card.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
{{ $cv := resources.Get "cv.pdf" }}
{{ $faceImage := resources.Get "images/borded-face.png" }}
-4
View File
@@ -1,7 +1,3 @@
{{ $styles := resources.Get "css/partials/breadcrumb.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
<nav aria-label="breadcrumb" class="breadcrumb">
<ol>
{{ range .Ancestors.Reverse }}
-4
View File
@@ -1,7 +1,3 @@
{{ $styles := resources.Get "css/partials/card.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
<article class="card">
<div>
<h3>{{ .Title }}</h3>
-6
View File
@@ -1,9 +1,3 @@
{{ $styles := resources.Get "css/partials/contact-form.css" | toCSS | minify }}
{{ $scripts := resources.Get "js/partials/contact-form.js" | js.Build | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
<script defer src="{{ $scripts.Permalink }}"></script>
<form
action="{{ .Site.Params.formSpreeURL }}"
method="POST"
+1 -5
View File
@@ -1,14 +1,10 @@
{{ $styles := resources.Get "css/partials/footer.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
{{ $faceImage := resources.Get "images/small-face.png" }}
{{ $cv :=resources.Get "cv.pdf" }}
<footer>
<div id="footer-face">
<img src="{{ $faceImage.Permalink }}" alt="Hazem Krimi" />
<h4>Hazem Krimi</h4>
<span>Hazem Krimi</span>
</div>
<div id="links">
<a href="https://www.linkedin.com/in/hazemkrimi" target="_blank">
+1 -30
View File
@@ -1,16 +1,10 @@
{{ $styles := resources.Get "css/partials/header.css" | toCSS | minify }}
{{ $scripts := resources.Get "js/partials/header.js" | js.Build | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}">
<script defer src="{{ $scripts.Permalink }}"></script>
{{ $faceImage := resources.Get "images/small-face.png" }}
{{ $cv := resources.Get "cv.pdf" }}
<header>
<div id="header-face">
<img src="{{ $faceImage.Permalink }}" alt="Hazem Krimi's face" />
<h3>Hazem Krimi</h3>
<span>Hazem Krimi</span>
</div>
<div id="menus">
{{ range site.Menus.main.Sort.ByWeight }}
@@ -39,26 +33,3 @@
{{ readFile "assets/icons/close.svg" | safeHTML }}
</span>
</header>
<nav id="mobile-navigation">
<div id="menus">
{{ range site.Menus.main.Sort.ByWeight }}
<a {{ printf "href=%q" .URL | safeHTMLAttr }}>{{ .Name }}</a>
{{ end }}
</div>
<hr>
<div id="links">
<span
class="theme-toggler"
>
{{ readFile "assets/icons/moon.svg" | safeHTML }}
{{ readFile "assets/icons/sun.svg" | safeHTML }}
</span>
<a href="{{ $cv.Permalink }}" target="_blank"> {{ readFile "assets/icons/cv.svg" | safeHTML }} </a>
<a href="mailto:me@hazemkrimi.tech" target="_blank"> {{ readFile "assets/icons/mail.svg" | safeHTML }} </a>
<a href="{{ urls.JoinPath .Site.BaseURL "index.xml" }}" target="_blank"> {{ readFile "assets/icons/rss.svg" | safeHTML }} </a>
<a href="https://github.com/hazemKrimi" target="_blank"> {{ readFile "assets/icons/github.svg" | safeHTML }} </a>
<a href="https://twitter.com/HazemKrimi" target="_blank"> {{ readFile "assets/icons/twitter.svg" | safeHTML }} </a>
<a href="https://www.linkedin.com/in/hazemkrimi" target="_blank"> {{ readFile "assets/icons/linkedin.svg" | safeHTML }} </a>
</div>
</nav>
+24
View File
@@ -0,0 +1,24 @@
{{ $cv := resources.Get "cv.pdf" }}
<nav id="mobile-navigation">
<div id="menus">
{{ range site.Menus.main.Sort.ByWeight }}
<a {{ printf "href=%q" .URL | safeHTMLAttr }}>{{ .Name }}</a>
{{ end }}
</div>
<hr>
<div id="links">
<span
class="theme-toggler"
>
{{ readFile "assets/icons/moon.svg" | safeHTML }}
{{ readFile "assets/icons/sun.svg" | safeHTML }}
</span>
<a href="{{ $cv.Permalink }}" target="_blank"> {{ readFile "assets/icons/cv.svg" | safeHTML }} </a>
<a href="mailto:me@hazemkrimi.tech" target="_blank"> {{ readFile "assets/icons/mail.svg" | safeHTML }} </a>
<a href="{{ urls.JoinPath .Site.BaseURL "index.xml" }}" target="_blank"> {{ readFile "assets/icons/rss.svg" | safeHTML }} </a>
<a href="https://github.com/hazemKrimi" target="_blank"> {{ readFile "assets/icons/github.svg" | safeHTML }} </a>
<a href="https://twitter.com/HazemKrimi" target="_blank"> {{ readFile "assets/icons/twitter.svg" | safeHTML }} </a>
<a href="https://www.linkedin.com/in/hazemkrimi" target="_blank"> {{ readFile "assets/icons/linkedin.svg" | safeHTML }} </a>
</div>
</nav>
+1 -4
View File
@@ -1,8 +1,5 @@
{{ $styles := resources.Get "css/partials/pagination.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
{{ $paginator := .Paginator }}
{{ if gt $paginator.TotalPages 1 }}
<div class="pagination">
<a class="first {{ if eq $paginator.PageNumber $paginator.First.PageNumber }} active {{ end }}" href="{{ $paginator.First.URL }}">
-4
View File
@@ -1,7 +1,3 @@
{{ $styles := resources.Get "css/partials/table-of-contents.css" | toCSS | minify }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" />
{{ with .TableOfContents }}
<aside id="table-of-contents">
<h3>Table of contents</h3>