feat:add post type memo

bigfa · Nov 13, 2023 · 392f1ba · 392f1ba
1 parent fb93037
commit 392f1ba
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,10 @@ echo "theme = 'notability'" >> hugo.toml
 
 ## Release Note
 
+### 0.2.0
+
+-   增加状态文章格式
+
 ### 0.1.8
 
 -   文章内链短代码

diff --git a/assets/images/avatar.jpeg b/assets/images/avatar.jpeg
diff --git a/assets/scss/app.scss b/assets/scss/app.scss
@@ -881,3 +881,45 @@ a {
         background-color: #fafafa;
     }
 }
+
+.post--item {
+    padding: 25px 0px;
+    //border-bottom: 1px solid #eee;
+    border-radius: 5px;
+    &__status {
+        .avatar {
+            border-radius: 100%;
+            margin-right: 10px;
+        }
+        header {
+            display: flex;
+            align-items: center;
+            margin-bottom: 10px;
+            a {
+                color: var(--text-gray-light);
+                display: flex;
+                align-items: center;
+                font-size: 14px;
+                &:hover {
+                    color: var(--main-hover-color);
+                }
+            }
+        }
+        //background-color: #fafafa;
+        border-radius: 5px;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        .description {
+            margin-bottom: 0;
+        }
+    }
+    display: flex;
+    align-items: center;
+    .description {
+        font-size: 14px;
+        line-height: 1.6;
+        color: var(--text-gray-light);
+        word-break: break-all;
+        margin-bottom: 4px;
+    }
+}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
@@ -8,30 +8,7 @@ <h1 class="post-title">{{.Title}}</h1>
 </header>
 <div class="layoutSingleColumn">
     {{ range .Data.Pages }}
-    <article class="articleItem articleItem__withImage">
-        {{ if .Content }}
-        {{ $urls := findRE "<img src=\"[^\"|\\\"]*\"" .Content }} {{ if $urls }} {{ $url :=index ($urls) 0 }} {{ $url
-            :=(strings.TrimPrefix "<img src=\"" $url) }}
-  {{ $url := strings.TrimRight " \"" $url }} <img src="{{ $url }}" class="cover" /> {{ end }} {{ end }}
-        <div class="content">
-            <h2 class="title">
-                <a href="{{ .Permalink }}">
-                    {{ .Title }}
-                </a>
-            </h2>
-            <div class="summary">{{ .Summary | truncate 60 }}</div>
-            <div class="time">
-                <time datetime='{{.Date.Format "2006-01-02 15:04:01" }}' class="humane--time">{{
-                    .Date | time.Format ":date_long" }}</time>
-                {{ if .Params.categories }}
-                <span class="dot"></span>
-                {{ range (.GetTerms "categories") }}
-                <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
-                {{ end }}
-                {{ end }}
-            </div>
-        </div>
-    </article>
+    {{ partial "post.html" . }}
     {{ end }}
 </div>
 {{ end }}
diff --git a/layouts/category/term.html b/layouts/category/term.html
@@ -7,27 +7,7 @@ <h1 class="post-title">{{.Title}}</h1>
 </header>
 <div class="layoutSingleColumn">
     {{ range .Data.Pages }}
-    <article class="articleItem articleItem__withImage">
-        {{ if .Content }}
-        {{ $urls := findRE "<img src=\"[^\"|\\\"]*\"" .Content }} {{ if $urls }} {{ $url :=index ($urls) 0 }} {{ $url
-            :=(strings.TrimPrefix "<img src=\"" $url) }}
-  {{ $url := strings.TrimRight " \"" $url }} <img src="{{ $url }}" class="cover" /> {{ end }} {{ end }}
-        <div class="content">
-            <h2 class="title">
-                <a href="{{ .Permalink }}">
-                    {{ .Title }}
-                </a>
-            </h2>
-            <div class="summary">{{ .Summary | truncate 60 }}</div>
-            <div class="time">
-                <time datetime='{{.Date.Format "2006-01-02 15:04:01" }}' class="humane--time">
-                    {{ .Date |
-                    time.Format
-                    ":date_long" }}
-                </time>
-            </div>
-        </div>
-    </article>
+    {{ partial "post.html" . }}
     {{ end }}
 </div>
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
@@ -5,32 +5,11 @@
         {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
         {{ $paginator := .Paginate ($pages) }}
         {{ range $paginator.Pages }}
-        <article class="articleItem articleItem__withImage">
-            {{ if .Content }}
-            {{ $urls := findRE "<img src=\"[^\"|\\\"]*\"" .Content }} {{ if $urls }} {{ $url :=index ($urls) 0 }} {{
-                $url :=(strings.TrimPrefix "<img src=\"" $url) }}
-      {{ $url := strings.TrimRight " \"" $url }} <img src="{{ $url }}" class="cover" /> {{ end }} {{ end }}
-            <div class="content">
-                <h2 class="title">
-                    <a href="{{ .Permalink }}">
-                        {{ .Title }}
-                    </a>
-                </h2>
-                <div class="summary">{{ .Summary | truncate 60 }}</div>
-                <div class="time"><time datetime='{{.Date.Format "2006-01-02 15:04:01" }}' class="humane--time">{{ .Date
-                        | time.Format
-                        ":date_long"
-                        }}</time>
-                    {{ if .Params.categories }}
-                    <span class="dot"></span>
-                    {{ range (.GetTerms "categories") }}
-                    <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
-                    {{ end }}
-                    {{ end }}
-                </div>
-            </div>
-        </article>
-        {{ end }}
+        {{ if eq .Type "memo" }}
+        {{ partial "memo.html" . }}
+        {{ else }}
+        {{ partial "post.html" . }}
+        {{ end }} {{ end }}
     </div>
     {{ if or ($paginator.HasPrev) ($paginator.HasNext) }}
     <div class="pagination">

diff --git a/layouts/partials/memo.html b/layouts/partials/memo.html
@@ -0,0 +1,16 @@
+<article class="post--item post--item__status" itemtype="http://schema.org/Article" itemscope="itemscope">
+    <div class="content">
+        <header>
+            {{ $logo := resources.Get "images/avatar.jpeg" }}
+            <img src="{{ $logo.RelPermalink }}" class="avatar" width="48" height="48" />
+            <a datetime='{{.Date.Format "2006-01-02 15:04:01" }}' class="humane--time" href="{{ .Permalink }}"
+                itemprop="datePublished">{{
+                .Date |
+                time.Format ":date_long"
+                }}</a>
+        </header>
+        <div class="description" itemprop="about">
+            <p>{{ .Summary | truncate 60 }}</p>
+        </div>
+    </div>
+</article>
diff --git a/layouts/partials/post.html b/layouts/partials/post.html
@@ -0,0 +1,25 @@
+<article class="articleItem articleItem__withImage">
+    {{ if .Content }}
+    {{ $urls := findRE "<img src=\"[^\"|\\\"]*\"" .Content }} {{ if $urls }} {{ $url :=index ($urls) 0 }} {{ $url
+        :=(strings.TrimPrefix "<img src=\"" $url) }}
+{{ $url := strings.TrimRight " \"" $url }} <img src="{{ $url }}" class="cover" /> {{ end }} {{ end }}
+    <div class="content">
+        <h2 class="title">
+            <a href="{{ .Permalink }}">
+                {{ .Title }}
+            </a>
+        </h2>
+        <div class="summary">{{ .Summary | truncate 60 }}</div>
+        <div class="time"><time datetime='{{.Date.Format "2006-01-02 15:04:01" }}' class="humane--time">{{ .Date
+                | time.Format
+                ":date_long"
+                }}</time>
+            {{ if .Params.categories }}
+            <span class="dot"></span>
+            {{ range (.GetTerms "categories") }}
+            <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
+            {{ end }}
+            {{ end }}
+        </div>
+    </div>
+</article>