Merge branch 'main' into fix/Fix_google_analytics

.github/workflows/autoprefixer.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout to latest commit
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
 
       - name: Setup Node
         uses: actions/setup-node@v4

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4.2.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/pull-request.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # checkout to the commit that has been pushed
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.1
 
     - name: Setup Node
       uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.1
 
     - name: Setup Node
       uses: actions/setup-node@v4
@@ -78,6 +78,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # checkout to latest commit
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.1
     # run markdown linter
     - uses: gaurav-nelson/github-action-markdown-link-check@1.0.15

assets/styles/components/cards.scss

@@ -9,6 +9,11 @@
     box-shadow: $box-shadow;
     border: 1px solid get-light-color('bg-primary');
     @include transition();
+    .card-img-top {
+      transform: scale(1.2);
+      object-fit: cover;
+      @include transition();
+    }
   }
 
   .card-head {
@@ -17,6 +22,10 @@
     overflow: hidden;
   }
 
+  .card-title {
+    font-size: large;
+  }
+
   .card-body {
     text-align: left;
   }

exampleSite/hugo.yaml

@@ -93,7 +93,7 @@ params:
 
     # Enable dark theme
     darkMode:
-    
+
     # [Deprecated] Enable dark theme
     # This is a deprecated setting, but has not been removed to maintain backward compatibility
     # If `theme` is set, the `darkMode` setting will be discarded.
@@ -192,7 +192,11 @@ params:
         #   scheme: https
         #   instance: umami.example.com
         #   id: <your umami site id>
-
+        # # Statcounter
+        # statcounter:
+        #   project: 1234567890
+        #   invisible: 1
+        #   security: deadbeef
     # Enable Support
     support:
       enable: false
@@ -287,7 +291,7 @@ params:
         plyr:
           # options doc: https://github.com/sampotts/plyr#options
           # fullscreen: true
-    
+
     # Enables copy code button
     copyCodeButton:
       enable: true

i18n/zh-cn.toml

@@ -124,3 +124,7 @@ other = "免责声明"
 
 [search]
 other = "搜索"
+
+[minute]
+one = "分钟"
+other = "分钟"

i18n/zh-tw.toml

@@ -124,3 +124,7 @@ other = "免責聲明"
 
 [search]
 other = "搜尋"
+
+[minute]
+one = "分鐘"
+other = "分鐘"

layouts/_default/single.html

@@ -1,5 +1,8 @@
 {{ define "header" }}
 <meta name="description" content="{{ if .Description }}{{ .Description }}{{ else }}{{ .Title }}{{ end }}" />
+{{ with .Params.relcanonical }}
+<link rel="canonical" href="{{ . | relLangURL }}" itemprop="url" />
+{{ end }}
 {{ end }}
 
 {{ define "navbar" }}
@@ -45,7 +48,7 @@
         {{ else }}
         <div style="margin-bottom: 80px;"></div>
         {{ end }}
-        
+
         <div class="title">
           <h1>{{ .Page.Title }}</h1>
         </div>

layouts/partials/analytics.html

@@ -55,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 }}

layouts/partials/cards/project.html

@@ -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 }}>
+      <a href="{{ if .repo }}{{ .repo }}{{ else if .url }}{{ .url }}{{ else }}javascript:void(0){{ end }}" {{ if or .repo .url }}target="_blank" rel="noopener"{{ end }}>
-        <div>
+        {{ if .image }}
-          <div class="d-flex">
+        <div class="card-head">
-            {{ if .logo }}
+          {{ $imageImage:= resources.Get .image}}
-
+          {{ if $imageImage }}
-              {{ if eq (len (findRE ".*/.*" .logo) ) 0 }}
+            {{/*  svg don't support "Fit" operation   */}}
-
+            {{ if ne $imageImage.MediaType.SubType "svg" }}
-                <i style="padding-right: 0.25em" class="{{.logo}} h4"></i>
+              {{ $imageImage = $imageImage.Fit "1000x1000" }}
-
-              {{ 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 }}
-            
+            <img class="card-img-top" src="{{ $imageImage.RelPermalink }}" alt="{{ .name }}" />
-            <h5 class="card-title mb-0">{{ .name }}</h5>
+          {{ end }}
-          </div>
+        </div>
-          <div class="sub-title">
+        {{ end }}
-            <span>{{ .role }}</span>
+        <div class="card-header">
-            <span>{{ .timeline }}</span>
+          <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>