more data fun

.gitignore

@@ -1,3 +1,4 @@
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache

404.html

@@ -19,6 +19,6 @@
 <div class="container">
   <h1>404</h1>
 
-  <p><strong>页面未找到 :(</strong></p>
-  <p>此处不适宜访问</p>
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
 </div>

Gemfile

@@ -8,23 +8,25 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.8.4"
+gem "jekyll", "~> 4.2.0"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
+gem "minima", "~> 2.5.1"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.15.1"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
+gem "wdm", "~> 0.1.1" if Gem.win_platform?
 
+
+gem "webrick", "~> 1.7"

Gemfile.lock

@@ -1,78 +1,86 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7-x64-mingw32)
-    ffi (1.14.2-x64-mingw32)
+    ffi (1.15.3-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.7.1)
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.5)
     rouge (3.26.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.4.0-x64-mingw32)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
+    unicode-display_width (1.7.0)
     wdm (0.1.1)
+    webrick (1.7.0)
 
 PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.8.4)
-  jekyll-feed (~> 0.6)
-  minima (~> 2.0)
+  jekyll (~> 4.2.0)
+  jekyll-feed (~> 0.15.1)
+  minima (~> 2.5.1)
   tzinfo-data
-  wdm (~> 0.1.0)
+  wdm (~> 0.1.1)
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.2.1
+   2.2.32

README.md

@@ -1,4 +1,5 @@
-# 东南大学吴院健雄杯足球赛网站
+# 超业余足球联赛网站生成器
+# Super Unprofessional League Website Generator
 
 By shrekshao狄学长
 
@@ -81,18 +82,21 @@ By shrekshao狄学长
                 "number": 1,
                 "name": "布尔基",
                 "img": "placeholder-player.jpg",
+                "locator": "GK",
                 "position": "门将"
             }
             ,{
                 "number": 28,
                 "name": "维特塞尔",
                 "img": "placeholder-player.jpg",
+                "locator": "CDM",
                 "position": "中场"
             }
             ,{
                 "number": 11,
                 "name": "罗伊斯",
                 "img": "placeholder-player.jpg",
+                "locator": "CAM",
                 "position": "中场"
             }
         ],
@@ -105,11 +109,6 @@ By shrekshao狄学长
             }
 
         ]
-    },
-    "squad": {
-        "GK": 1,
-        "CDM": 28,
-        "CF": 11
     }
 }
 ```
@@ -123,6 +122,7 @@ By shrekshao狄学长
 {
     "date": "2018/11/10/9:30",
     "type": "group-r1",
+    "schedule": false,
     "home": {
         "key": "dortmund",
         "score": 3,

_data/seasons/11/config.json

@@ -0,0 +1,25 @@
+{
+  "display_name": "11赛季",
+  "type": "group + knockout",
+  "rules": "*大一球队直接进入淘汰赛\n*各小组前两名出线",
+  "knockout_stage": [
+    [
+      ["610092", "", ""],
+
+      ["", "", ""],
+
+      ["", "", ""],
+
+      ["613111", "610111", "4"]
+    ],
+    [
+      ["610092", "611101", "1"],
+
+      ["610101", "613111", "2"]
+    ],
+    [
+      ["610092","613111", "final"]
+    ]
+  ],
+  "winner": "610092"
+}

_data/seasons/11/games/1.json

@@ -0,0 +1,19 @@
+{
+    "date": "2011/10/12/14:00",
+    "type": "1/2",
+    "schedule": true,
+    "images": [
+    ],
+    "home": {
+        "key": "610092",
+        "score": 0,
+        "events": [
+        ]
+    },
+    "away": {
+        "key": "611101",
+        "score": 0,
+        "events": [
+        ]
+    }
+}

_data/seasons/11/games/2.json

@@ -0,0 +1,19 @@
+{
+    "date": "2011/10/12/12:00",
+    "type": "1/2",
+    "images": [
+    ],
+    "home": {
+        "key": "610101",
+        "score": 0,
+        "events": [
+        ]
+    },
+    "away": {
+        "key": "613111",
+        "score": 0,
+        "events": [
+        ]
+    },
+    "extra": "(点球 0:3)"
+}

_data/seasons/11/games/4.json

@@ -0,0 +1,23 @@
+{
+    "date": "2011/09/25/12:00",
+    "type": "1/4",
+    "images": [
+    ],
+    "home": {
+        "key": "613111",
+        "score": 5,
+        "events": [
+            {"type": "goal", "time": 10, "player": "潘登"},
+            {"type": "goal", "time": 20, "player": "沙奔"},
+            {"type": "goal", "time": 25, "player": "潘登"},
+            {"type": "goal", "time": 30, "player": "沙奔"},
+            {"type": "goal", "time": 45, "player": "吉相冰"}
+        ]
+    },
+    "away": {
+        "key": "610111",
+        "score": 0,
+        "events": [
+        ]
+    }
+}

_data/seasons/11/games/final.json

@@ -0,0 +1,34 @@
+{
+    "date": "2011/10/19/12:00",
+    "type": "final",
+    "images": [
+        "2011-10-19-1/0.jpg",
+        "2011-10-19-1/2.jpg",
+        "2011-10-19-1/3.jpg",
+        "2011-10-19-1/4.jpg",
+        "2011-10-19-1/5.jpg",
+        "2011-10-19-1/6.jpg",
+        "2011-10-19-1/7.jpg",
+        "2011-10-19-1/8.jpg",
+        "2011-10-19-1/9.jpg",
+        "2011-10-19-1/10.jpg",
+        "2011-10-19-1/11.jpg",
+        "2011-10-19-1/sc.jpg",
+        "2011-10-19-1/12.jpg"
+    ],
+    "home": {
+        "key": "610092",
+        "score": 1,
+        "events": [
+            {"type": "goal", "time": 36, "player": "李茂"}
+        ],
+        "squad": "default"
+    },
+    "away": {
+        "key": "613111",
+        "score": 0,
+        "events": [
+        ],
+        "squad": "default"
+    }
+}