fix sortby func

NEUIR · Sep 25, 2024 · f53bbc7 · f53bbc7
1 parent 4a75c17
commit f53bbc7
Show file tree

Hide file tree

Showing 29 changed files with 149 additions and 77 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,14 +1,8 @@
 {% assign image = page.footer | default: site.footer | relative_url %}
 {% assign dark = page.footer-dark | is_nil: site.footer-dark | is_nil: true %}
 
-<footer
-  class="background"
-  style="--image: url('{{ image }}')"
-  {% if dark == true or dark == false %}
-    data-dark="{{ dark }}"
-  {% endif %}
-  data-size="wide"
->
+<footer class="background" style="--image: url('{{ image }}')" {% if dark==true or dark==false %} data-dark="{{ dark }}"
+  {% endif %} data-size="wide">
   <!--
     <div>
       Extra details like contact info or address
@@ -17,26 +11,18 @@
 
   <div>
     {% for link in site.links %}
-      {% assign key = link[0] %}
-      {% assign value = link[1] %}
-      {% include button.html type=key text="" link=value style="bare" %}
+    {% assign key = link[0] %}
+    {% assign value = link[1] %}
+    {% include button.html type=key text="" link=value style="bare" %}
     {% endfor %}
   </div>
 
   <div>
     &copy; {{ site.time | date: "%Y" }}
     {{ site.title }}
-    &nbsp; | &nbsp; Built with
-    <a href="https://github.com/greenelab/lab-website-template">
-      Lab Website Template
-    </a>
+    &nbsp; | &nbsp; 辽宁省沈阳市浑南区创新路195号计算机科学与工程学院 &nbsp; | &nbsp; 邮编: 110169
   </div>
 
-  <input
-    type="checkbox"
-    class="dark-toggle"
-    data-tooltip="Dark mode"
-    aria-label="toggle dark mode"
-    oninput="onDarkToggleChange(event)"
-  >
-</footer>
+  <input type="checkbox" class="dark-toggle" data-tooltip="Dark mode" aria-label="toggle dark mode"
+    oninput="onDarkToggleChange(event)">
+</footer>
diff --git a/_includes/list.html b/_includes/list.html
@@ -5,55 +5,43 @@
   | data_filter: include.filters
 %}
 
-{% assign years = data
-  | group_by_exp: "d", "d.date | date: '%Y'"
-  | sort: "name"
-  | reverse
-%}
-
-{% for year in years %}
-  {% assign data = year.items %}
-
-  {% if years.size > 1 %}
-    {{--}}<h3 id="{{ year.name }}">{{ year.name }}</h3>
-    {% assign data = data | sort: "date" | reverse %}
-  {% endif %}
+<!-- 对数据按照 year 字段进行排序 -->
+{% assign sorted_data = data | sort: "year" %}
 
-  {% for d in data %}
-    {% assign style = d.style | default: include.style %}
+{% for d in sorted_data %}
+  {% assign style = d.style | default: include.style %}
 
-    {%
-      include {{ include.component | append: ".html" }}
-      affiliation=d.affiliation
-      author=d.author
-      authors=d.authors
-      buttons=d.buttons
-      caption=d.caption
-      content=d.content
-      date=d.date
-      description=d.description
-      excerpt=d.excerpt
-      height=d.height
-      icon=d.icon
-      id=d.id
-      image=d.image
-      last_modified_at=d.last_modified_at
-      link=d.link
-      lookup=d.lookup
-      name=d.name
-      publisher=d.publisher
-      repo=d.repo
-      role=d.role
-      slug=d.slug
-      style=style
-      subtitle=d.subtitle
-      tags=d.tags
-      text=d.text
-      title=d.title
-      tooltip=d.tooltip
-      type=d.type
-      url=d.url
-      width=d.width
-    %}
-  {% endfor %}
-{% endfor %}
+  {%
+    include {{ include.component | append: ".html" }}
+    affiliation=d.affiliation
+    author=d.author
+    authors=d.authors
+    buttons=d.buttons
+    caption=d.caption
+    content=d.content
+    date=d.date
+    description=d.description
+    excerpt=d.excerpt
+    height=d.height
+    icon=d.icon
+    id=d.id
+    image=d.image
+    last_modified_at=d.last_modified_at
+    link=d.link
+    lookup=d.lookup
+    name=d.name
+    publisher=d.publisher
+    repo=d.repo
+    role=d.role
+    slug=d.slug
+    style=style
+    subtitle=d.subtitle
+    tags=d.tags
+    text=d.text
+    title=d.title
+    tooltip=d.tooltip
+    type=d.type
+    url=d.url
+    width=d.width
+  %}
+{% endfor %}
diff --git a/_includes/list.html.bak b/_includes/list.html.bak
@@ -0,0 +1,59 @@
+{% assign emptyarray = "" | split: "," %}
+{% assign data = site.data[include.data]
+  | default: site[include.data]
+  | default: emptyarray
+  | data_filter: include.filters
+%}
+
+{% assign years = data
+  | group_by_exp: "d", "d.date | date: '%Y'"
+  | sort: "name"
+  | reverse
+%}
+
+{% for year in years %}
+  {% assign data = year.items %}
+
+  {% if years.size > 1 %}
+    {{--}}<h3 id="{{ year.name }}">{{ year.name }}</h3>
+    {% assign data = data | sort: "date" | reverse %}
+  {% endif %}
+
+  {% for d in data %}
+    {% assign style = d.style | default: include.style %}
+
+    {%
+      include {{ include.component | append: ".html" }}
+      affiliation=d.affiliation
+      author=d.author
+      authors=d.authors
+      buttons=d.buttons
+      caption=d.caption
+      content=d.content
+      date=d.date
+      description=d.description
+      excerpt=d.excerpt
+      height=d.height
+      icon=d.icon
+      id=d.id
+      image=d.image
+      last_modified_at=d.last_modified_at
+      link=d.link
+      lookup=d.lookup
+      name=d.name
+      publisher=d.publisher
+      repo=d.repo
+      role=d.role
+      slug=d.slug
+      style=style
+      subtitle=d.subtitle
+      tags=d.tags
+      text=d.text
+      title=d.title
+      tooltip=d.tooltip
+      type=d.type
+      url=d.url
+      width=d.width
+    %}
+  {% endfor %}
+{% endfor %}
diff --git a/_members/buqiang-xu.md b/_members/buqiang-xu.md
@@ -2,6 +2,7 @@
 name: Buqiang Xu
 image: images/headshots/buqiang_xu.jpg
 role: bs
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/haidong-xin.md b/_members/haidong-xin.md
@@ -2,6 +2,7 @@
 name: Haidong Xin
 image: images/headshots/haidong_xin.png
 role: ms
+year: 2024
 links:
   email: [email protected]
   home-page: https://xinhaidong.top

diff --git a/_members/han-zhang.md b/_members/han-zhang.md
@@ -0,0 +1,7 @@
+---
+name: Han Zhang
+role: graduated
+year: 2021
+---
+
+This is Han Zhang's Personal Page.
diff --git a/_members/hanbin-wang.md b/_members/hanbin-wang.md
@@ -2,6 +2,7 @@
 name: Hanbin Wang
 image: images/headshots/hanbin_wang.jpg
 role: graduated
+year: 2023
 links:
   email: [email protected]
   home-page: https://wanghanbinpanda.github.io/

diff --git a/_members/haolan-wang.md b/_members/haolan-wang.md
@@ -2,6 +2,7 @@
 name: Haolan Wang
 image: images/headshots/haolan_wang.jpg
 role: ms
+year: 2023
 ---
 
 This is Haolan Wang's Personal Page.
diff --git a/_members/mingyan-wu.md b/_members/mingyan-wu.md
@@ -2,6 +2,7 @@
 name: Mingyan Wu
 image: images/headshots/mingyan_wu.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/qiushi-xiong.md b/_members/qiushi-xiong.md
@@ -2,6 +2,7 @@
 name: Qiushi Xiong
 image: images/headshots/qiushi_xiong.jpg
 role: ms
+year: 2023
 links:
   email: [email protected]
   home-page: https://qiushixiong.github.io/

diff --git a/_members/sen-mei.md b/_members/sen-mei.md
@@ -2,6 +2,7 @@
 name: Sen Mei
 image: images/headshots/sen_mei.jpg
 role: ms
+year: 2022
 links:
   email: [email protected]
   home-page: https://mssssss123.github.io/

diff --git a/_members/shaohua-duan.md b/_members/shaohua-duan.md
@@ -2,6 +2,7 @@
 name: Shaohua Duan
 image: images/headshots/shaohua_duan.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/shuliang-liu.md b/_members/shuliang-liu.md
@@ -2,6 +2,7 @@
 name: Shuliang Liu
 image: images/headshots/shuliang_liu.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/sijia-yao.md b/_members/sijia-yao.md
@@ -2,6 +2,7 @@
 name: Sijia Yao
 image: images/headshots/sijia_yao.jpg
 role: ms
+year: 2023
 ---
 
 This is Sijia Yao's Personal Page.
diff --git a/_members/tianshuo-zhou.md b/_members/tianshuo-zhou.md
@@ -2,6 +2,7 @@
 name: Tianshuo Zhou
 image: images/headshots/tianshuo_zhou.png
 role: ms
+year: 2022
 links:
   email: [email protected]
   home-page: https://whale-z.github.io/

diff --git a/_members/tingran-zhang.md b/_members/tingran-zhang.md
@@ -2,6 +2,7 @@
 name: Tingran Zhang
 image: images/headshots/tingran_zhang.jpg
 role: bs
+year: 2023
 links:
   email: [email protected]
 ---

diff --git a/_members/weiqing-yang.md b/_members/weiqing-yang.md
@@ -2,6 +2,7 @@
 name: Weiqing Yang
 image: images/headshots/weiqing_yang.jpg
 role: ms
+year: 2023
 ---
 
 This is Weiqing Yang's Personal Page.
diff --git a/_members/xingsheng-zhu.md b/_members/xingsheng-zhu.md
@@ -2,6 +2,7 @@
 name: Xingsheng Zhu
 image: images/headshots/xingsheng_zhu.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/xinze-li.md b/_members/xinze-li.md
@@ -2,6 +2,7 @@
 name: Xinze Li
 image: images/headshots/xinze_li.jpg
 role: phd
+year: 2024
 links:
   email: [email protected]
   home-page: https://eureka336.github.io/

diff --git a/_members/yibin-liu.md b/_members/yibin-liu.md
@@ -2,6 +2,7 @@
 name: Yibin Liu
 image: images/headshots/yibin_liu.jpg
 role: bs
+year: 2023
 links:
   email: [email protected]
   home-page: https://10-oasis-01.github.io/

diff --git a/_members/yifan-ji.md b/_members/yifan-ji.md
@@ -2,6 +2,7 @@
 name: Yifan Ji
 image: images/headshots/yifan_ji.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---

diff --git a/_members/yuanhuiyi-lyu.md b/_members/yuanhuiyi-lyu.md
@@ -2,6 +2,7 @@
 name: Yuanhuiyi Lyu
 image: images/headshots/yuanhuiyi_lyu.png
 role: graduated
+year: 2021
 links:
   email: [email protected]
   home-page: https://qc-ly.github.io/

diff --git a/_members/yuqing-lan.md b/_members/yuqing-lan.md
@@ -2,6 +2,7 @@
 name: Yuqing Lan
 image: images/headshots/yuqing_lan.jpg
 role: phd
+year: 2020
 links:
   email: [email protected]
   home-page: https://yuqinglanok.github.io/

diff --git a/_members/zhenghao-liu.md b/_members/zhenghao-liu.md
@@ -2,6 +2,7 @@
 name: Zhenghao Liu
 image: images/headshots/zhenghao_liu.jpg
 role: pi
+year: 2021
 links:
   email: [email protected]
   home-page: https://edwardzh.github.io

diff --git a/_members/zhipeng-xu.md b/_members/zhipeng-xu.md
@@ -2,6 +2,7 @@
 name: Zhipeng Xu
 image: images/headshots/zhipeng_xu.png
 role: ms
+year: 2023
 links:
   email: [email protected]
   home-page: https://pab1x.github.io/

diff --git a/_members/zhuoyang-wu.md b/_members/zhuoyang-wu.md
@@ -2,6 +2,7 @@
 name: Zhuoyang Wu
 image: images/headshots/zhuoyang_wu.jpg
 role: ms
+year: 2024
 links:
   email: [email protected]
 ---