Merge branch 'master' into fix_author_field

2023-06-10 10:21:12 +05:30 · 2023-06-10 10:21:12 +05:30 · f65493b8bf
commit f65493b8bf
parent 9d3137f694 3a5a676118
18 changed files with 153 additions and 76 deletions
--- a/.gitignore
+++ b/.gitignore
@ -88,6 +88,6 @@ typings/
 .dynamodb/

 # End of https://www.gitignore.io/api/node
-
 public
+resources
 .hugo_build.lock
--- a/README.md
+++ b/README.md
@ -19,7 +19,7 @@
 - [Found a bug?](#bug)
 - [New cool idea or feature](#feature)
 - [Terminal theme user?](#terminal-theme-user)
- [Licence](#licence)
+- [License](#license)

 ## Features

--- a/USERS.md
+++ b/USERS.md
@ -1,27 +1,20 @@
 # Meet the users of Terminal theme!
+
 - https://xicode.se **magistern** (Teacher)
 - https://devmaster64.com **devmaster64** (Software Developer)
- https://mickie1.gitlab.io/blog/ **mickie** (Engineer)
 - https://calloc.net **Vaibhav Yenamandra** (Software Engineer)
 - https://potatofrom.space **Kevin Liu** (Software)
 - https://horochx.org **horochx** (Software Developer)
 - https://feng.si **Si Feng** (Software Engineer)
 - https://ben-on-vms.com **Benedikt Frenzel** (Technical Support Engineer)
 - https://johngazzini.com **John Gazzini** (Software Engineer)
- https://geekx.tech/ **Sagar Ladla** (Student Developer & Cyber Security Specialist)
 - https://tears.io/ **Alex** (SRE)
 - https://ayushkarn.me/ **Ayush Karn** (Student Developer)
- https://ssgram.dev **Ramaseshan Parthasarathy** (Software Developer)
 - https://zaine.me **Amine Zaine** (Cloud Engineer)
 - https://notes.dmaitre.phyip3.dur.ac.uk/computing-club/ **Ryan Moodie** (Physics PhD student)
- https://thecodecousins.com **Stanley Nguyen** (Software Engineer) & **Hoang Do** (Software & IoT Engineer)
- https://schacherbauer.dev **Markus Schacherbauer** (Student Developer)
- https://rinma.dev **Marvin Dalheimer** (Software Developer)
 - https://lunar.computer **Lunar Computer** (DevOps Engineer)
 - https://naxxfish.net **Chris Roberts** (Broadcast Systems Engineer)
- https://security.jtang.dev **Jonathan Tang** (Student & Software Engineer)
 - https://andreacaravano.net **Andrea Caravano** (Student)
- https://dawsonverboven.com/ **Dawson Verboven** (Student & Software Developer)
 - https://qbunt.com **Jeremy Bunting** (Software Engineer)
 - https://smeik.org **Smeik** (Embedded Developer)
 - https://code.willstocks.co.uk **Will Stocks** (Blogger & Developer)
@ -30,13 +23,9 @@
 - https://bgameiro.me/ **Bernardo Gameiro** (Engineer Physicist student)
 - https://return-to-libc.com/ **elraro** (Cyber Security Specialist)
 - https://pablart.com/ **Pablo Diaz-Gutierrez** (Software Engineer, General Tinkerer)
- https://waterloos.niflheimr.blue/ **cindrmon** (Student and Aspiring Software Engineer)
 - https://monocle.rpod.club/ **classx** (DevOps Engineer)
- https://wjdevschool.com/ **Wojciech Bogócki** (Making Things & Teaching / W&J Dev School)
 - https://erisianrite.com/ **ErisianRite** (Coding, Engineering, Tools for Thought)
- https://dongzhi.me **Joe** (Software Developer)
 - https://isaes.com.tr/ **Isa Es** (Software Engineer)
- https://conight.com **Conight Wang** (Software Engineer)
 - https://blog.m5e.de/ **Christoph Miksche** (Software Developer)
 - https://mpostument.com/ **Maksym Postument** (DevOps Engineer)
 - https://mathiejosh.xyz **Josh Mathie** (Electrical Engineering Technology Student/Sales and Engineering Tech)
@ -44,8 +33,6 @@
 - https://blog.puvvadi.me **KD Puvvadi** (Software Dev & Cloud Orchestrator)
 - https://hidden.land/ **Louisload** (Game Developer & Musician)
 - https://linuxbase.nl **Michael Trip** (DevOps Engineer)
- https://markopolo123.github.io **Markopolo** (DevOps Engineer)
- https://openfoxblog.leven.dev/ **Damon Leven** (Student & Software Developer)
 - https://blog.sethforprivacy.com **Seth For Privacy** (Security, privacy, and cryptocurrency writer, podcaster)
 - https://thesprawl.city **crish** (Software and stuff)
 - https://justinnuwin.com **Justin Nguyen** (Software & Hardware Developer)
@ -55,17 +42,20 @@
 - https://biplav.xyz **Biplav's Blog** (Student)
 - https://santiago.wtf **Nicholas Santiago** (DevOps Engineer)
 - https://2200g.github.io/ **2200g** (Blogger/Student)
- https://cristiioan.me **Cristian Margine** (Student)
 - https://they.mint.lgbt **Joey Aliaga** (Software Developer & Student)
 - https://tatewilhelm.me **Tate Wilhelm** (Student, Programmer & Tinkerer)
 - https://mikefoden.com **Mike Foden** (Software Developer)
 - https://undemalum.github.io/portfolio/ **Mateusz Konat** (Student)
 - https://ku0hn.radio **Ben Kuhn** (Ham Radio Operator, InfoSec Engineer, Tinkerer)
- https://bg117.xyz/projects **bg117** (Student and Hobby Programmer)
 - https://www.grumpymetalguy.com **GrumpyMetalGuy** (General Grumper and Developer)
 - https://blog.jontes.page **Jonte** (general tech geek)
 - https://nazdarthegame.com/ **Michal Skoula** (Software Developer)
 - https://1mup.myorange.house **Antonio Garosi** (Street art gallery)
+- https://kitchvx.github.io **Nathan Kitching** (IT Student)
+- https://dgood.win **Dom Goodwin** (Platform Engineer)
+- https://sir-photch.xyz **Sir-Photch** (ComSci-student. German Blog)
+- https://drewmorris.info **Drew Morris** (Mathematician && Computer Scientist)
+- https://blog.darkiiiiiice.com **MarioMang** (Software Developer)

 <!--
 TEMPLATE:
@ -73,3 +63,4 @@
 - https://radoslawkoziel.pl **Radek Kozieł** (Software Designer and Developer)

 -->
+
--- a/assets/css/buttons.scss
+++ b/assets/css/buttons.scss
@ -12,7 +12,7 @@ a.button {
  align-items: center;
  justify-content: center;
  padding: 8px 18px;
-  margin-bottom: 5px;
+  margin: 5px 0;
  text-decoration: none;
  text-align: center;
  border-radius: 8;
--- a/assets/css/form.scss
+++ b/assets/css/form.scss
@ -4,6 +4,7 @@ input, textarea, select {
  border: 1px solid $accent;
  border-radius: 0;
  padding: 10px;
+  margin: 5px 0;
  font: inherit;
  appearance: none;

@ -28,3 +29,15 @@ select {
 ::placeholder {
  color: transparentize($accent, .5);
 }
+
+input {
+  &[type="checkbox"] {
+    vertical-align: middle;
+    padding: 10px;
+    box-shadow: inset 0 0 0 3px $background;
+
+    &:checked {
+      background: $accent;
+    }
+  }
+}
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@ -263,28 +263,28 @@ ol {
  list-style: none;
  counter-reset: li;

-  li {
+  > li {
    counter-increment: li;
-  }

-  li:before {
-    content: counter(li);
-    position: absolute;
-    right: calc(100% + 10px);
-    color: $accent;
-    display: inline-block;
-    text-align: right;
-  }
-
-  ol {
-    margin-left: 38px;
-
-    li {
-      counter-increment: li;
+    &:before {
+      content: counter(li);
+      position: absolute;
+      right: calc(100% + 10px);
+      color: $accent;
+      display: inline-block;
+      text-align: right;
    }

-    li:before {
-      content: counters(li, ".") " ";
+    > ol {
+      margin-left: 38px;
+
+      > li {
+        counter-increment: li;
+
+        &:before {
+          content: counters(li, ".") " ";
+        }
+      }
    }
  }
 }
--- a/assets/css/post.scss
+++ b/assets/css/post.scss
@ -33,6 +33,14 @@
    font-size: 1rem;
    margin-bottom: 10px;
    color: transparentize($accent, .3);
+
+    & > *:not(:first-child) {
+      &::before {
+        content: "::";
+        display: inline-block;
+        margin: 0 8px;
+      }
+    }
  }

  &-title {
--- a/assets/css/terms.scss
+++ b/assets/css/terms.scss
@ -1,9 +1,22 @@
 .terms {
-  h1 {
-    color: $accent;
-  }
-
  h3 {
    font-size: initial;
  }
+
+  ul {
+    list-style: none;
+
+    li {
+      a {
+        color: $accent;
+      }
+    }
+
+    li:not(:empty):before {
+      content: '-';
+      position: absolute;
+      left: -20px;
+      color: $accent;
+    }
+  }
 }
--- a/assets/css/variables.scss
+++ b/assets/css/variables.scss
@ -6,9 +6,3 @@ $border-color: rgba(255, 255, 255, .1);
 /* MEDIA QUERIES */
 $phone: "max-width: 684px";
 $tablet: "max-width: 900px";
-
-/* variables for js, must be the same as these in @custom-media queries */
-:root {
-  --phoneWidth: (max-width: 684px);
-  --tabletWidth: (max-width: 900px);
-}
--- a/layouts/_default/index.html
+++ b/layouts/_default/index.html
@ -21,14 +21,14 @@
        </h1>

        <div class="post-meta">
-          {{ if .Date }}
+          {{- if .Date -}}
            <time class="post-date">
-              {{ .Date.Format "2006-01-02" }} ::
+              {{- .Date.Format "2006-01-02" -}}
            </time>
-          {{ end }}
-          {{ with $.Param "author" }}
+          {{- end -}}
+          {{- with $.Param "author" -}}
            <span class="post-author">{{ . }}</span>
-          {{ end }}
+          {{- end -}}
        </div>

        {{ if .Params.tags }}
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -11,14 +11,14 @@
          <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
        </h1>
        <div class="post-meta">
-          {{ if .Date }}
+          {{- if .Date -}}
            <time class="post-date">
-              {{ .Date.Format "2006-01-02" }} ::
+              {{- .Date.Format "2006-01-02" -}}
            </time>
-          {{ end }}
-          {{ with $.Param "author" }}
-            <span class="post-author">{{ . }}</span>
-          {{ end }}
+          {{- end -}}
+          {{- with $.Param "author" -}}
+            <span class="post-author">{{- . -}}</span>
+          {{- end -}}
        </div>

        {{ if .Params.tags }}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -4,20 +4,20 @@
    <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
  </h1>
  <div class="post-meta">
-    {{ if .Date }}
+    {{- if .Date -}}
      <time class="post-date">
-        {{ .Date.Format "2006-01-02" }} ::
-        {{ if $.Site.Params.showLastUpdated }}
-          [{{or $.Site.Params.updatedDatePrefix "Updated"}} :: {{ .Lastmod.Format "2006-01-02" }}]
-        {{ end }}
+        {{- .Date.Format "2006-01-02" -}}
+        {{- if $.Site.Params.showLastUpdated -}}
+          [{{- or $.Site.Params.updatedDatePrefix "Updated" -}} :: {{- .Lastmod.Format "2006-01-02" -}}]
+        {{- end -}}
      </time>
-    {{ end }}
-    {{ with $.Param "author" }}
+    {{- end -}}
+    {{- with $.Param "author" -}}
      <span class="post-author">{{ . }}</span>
-    {{ end }}
-    {{ if and (.Param "readingTime") (eq (.Param "readingTime") true) }}
-      <span class="post-reading-time">:: {{ .ReadingTime }} {{ $.Site.Params.minuteReadingTime | default "min read" }} ({{ .WordCount }} {{ $.Site.Params.words | default "words" }})</span>
-    {{ end }}
+    {{- end -}}
+    {{- if and (.Param "readingTime") (eq (.Param "readingTime") true) -}}
+      <span class="post-reading-time">{{ .ReadingTime }} {{ $.Site.Params.minuteReadingTime | default "min read" }} ({{ .WordCount }} {{ $.Site.Params.words | default "words" }})</span>
+    {{- end -}}
  </div>

  {{ if .Params.tags }}
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@ -0,0 +1,57 @@
+{{ define "main" }}
+  <h1>Posts for: #{{ .Title }}</h1>
+  {{ with .Content }}
+    <div class="index-content">
+      {{ . }}
+    </div>
+  {{ end }}
+  <div class="posts">
+    {{ range .Paginator.Pages }}
+      <article class="post on-list">
+        <h1 class="post-title">
+          <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+        </h1>
+        <div class="post-meta">
+          {{- if .Date -}}
+            <time class="post-date">
+              {{- .Date.Format "2006-01-02" -}}
+            </time>
+          {{- end -}}
+          {{- with .Params.Author -}}
+            <span class="post-author">{{- . -}}</span>
+          {{- end -}}
+        </div>
+
+        {{ if .Params.tags }}
+          <span class="post-tags">
+            {{ range .Params.tags }}
+            #<a href="{{ (urlize (printf "tags/%s/" . )) | absLangURL }}">
+              {{- . -}}
+            </a>&nbsp;
+            {{ end }}
+          </span>
+        {{ end }}
+
+        {{ partial "cover.html" . }}
+
+        <div class="post-content">
+          {{ if .Params.showFullContent }}
+            {{ .Content }}
+          {{ else if .Description }}
+            {{ .Description | markdownify }}
+          {{ else }}
+            {{ .Summary }}
+          {{ end }}
+        </div>
+
+        {{ if not .Params.showFullContent }}
+          <div>
+            <a class="read-more button" href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
+          </div>
+        {{ end }}
+      </article>
+    {{ end }}
+
+    {{ partial "pagination.html" . }}
+  </div>
+{{ end }}
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@ -1,6 +1,11 @@
 {{ define "main" }}
  <div class="terms">
    <h1>{{ .Title }}</h1>
+    {{ with .Content }}
+      <div class="index-content">
+        {{ . }}
+      </div>
+    {{ end }}
    <ul>
      {{ $type := .Type }}
      {{ range $key, $value := .Data.Terms.Alphabetical }}
@ -8,7 +13,7 @@
      {{ $count := .Count }}
      {{ with $.Site.GetPage (printf "/%s/%s" $type $name) }}
        <li>
-          <a class="terms-title" href="{{ .Permalink }}">{{ .Name }} ({{ $count }})</a>
+          <a class="terms-title" href="{{ .Permalink }}">{{ .Name }} [{{ $count }}]</a>
        </li>
      {{ end }}
      {{ end }}
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -5,7 +5,7 @@
        <span>{{ $.Site.Copyright | safeHTML }}</span>
    {{ else }}
      <div class="copyright">
-        <span>© {{ now.Year }} Powered by <a href="http://gohugo.io">Hugo</a></span>
+        <span>© {{ now.Year }} Powered by <a href="https://gohugo.io">Hugo</a></span>
    {{ end }}
      <span>:: <a href="https://github.com/panr/hugo-theme-terminal" target="_blank">Theme</a> made by <a href="https://github.com/panr" target="_blank">panr</a></span>
      </div>
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@ -1,3 +1,3 @@
 {{ if .Get "src" }}
-  <img src="{{ .Get "src" | safeURL }}" {{ with .Get "alt" }} alt="{{ . | plainify }}" {{ end }} class="{{ with .Get "position"}}{{ . }}{{ else -}} left {{- end }}" {{ with .Get "style" }} style="{{ . | safeCSS }}" {{ end }} />
+<img src="{{ .Get "src" | safeURL }}" {{ with .Get "alt" }} alt="{{ . | plainify }}" {{ end }} class="{{ with .Get "position"}}{{ . }}{{ else -}} left {{- end }}" {{ with .Get "style" }} style="{{ . | safeCSS }}" {{ end }} {{ with .Get "width" }} width="{{ . | plainify }}" {{ end }} {{ with .Get "height" }} height="{{ . | plainify }}" {{ end }} />
 {{ end }}
--- a/resources/_gen/assets/scss/css/base.scss_06c91705bc48efa09403e08ed1e70fce.content
+++ b/resources/_gen/assets/scss/css/base.scss_06c91705bc48efa09403e08ed1e70fce.content
--- a/resources/_gen/assets/scss/css/base.scss_06c91705bc48efa09403e08ed1e70fce.json
+++ b/resources/_gen/assets/scss/css/base.scss_06c91705bc48efa09403e08ed1e70fce.json
@ -1 +0,0 @@
-{"Target":"style.css","MediaType":"text/css","Data":{}}
				`@ -1 +0,0 @@`
				`{"Target":"style.css","MediaType":"text/css","Data":{}}`