minor updates

diff --git a/onyx-pkg.ini b/onyx-pkg.ini
index 496020526b49b3bc3648e62e66dc1a9eed8b0dbc..40ec349cd3f66d497384a8e2d300b944b2319657 100644 (file)
--- a/onyx-pkg.ini
+++ b/onyx-pkg.ini
@@ -18,7 +18,7 @@ library=
 
 [dependencies]
 git://onyxlang.io/repo/http-server=0.2.1
-git://onyxlang.io/repo/otmp=0.0.9
+git://onyxlang.io/repo/otmp=0.0.12
 
 [dependency_folders]
 git://onyxlang.io/repo/http-server=http-server

diff --git a/src/app.onyx b/src/app.onyx
index 49408c592756db42c4a18af4b7f27c9ce994885b..a312e59bb4b18fdc79cb4077018f9018299c9f2b 100644 (file)
--- a/src/app.onyx
+++ b/src/app.onyx
@@ -25,7 +25,10 @@ reg: otmp.TemplateRegistry;
 }
 
 @route.{.GET, "/"}
-(req: &Req, res: &Res) => res->render("pages/homepage", null);
+(req: &Req, res: &Res) {
+    articles := iter.as_iter(news_articles->get() ?? .[])->take(2)->collect();
+    res->render("pages/homepage", &.{ articles = articles });
+}
 
 @route.{.GET, "/ovmwasm"}
 (req: &Req, res: &Res) => res->render("pages/ovmwasm", null);

diff --git a/www/static/vendor/highlight.min.js b/www/static/vendor/highlight.min.js
index 5f9e6668dc3e6938216076b4328d60d465b39cfd..c0dfe5735e9db04bf4d621c24f54d50ba73807d7 100644 (file)
--- a/www/static/vendor/highlight.min.js
+++ b/www/static/vendor/highlight.min.js
@@ -2574,7 +2574,7 @@ var hljs = (function () {
             aliases: [ "onyx "],
             keywords: {
                 keyword: [
-                    "package", "struct", "enum", "use", "global", "macro",
+                    "package", "struct", "union", "enum", "use", "global", "macro",
                     "if", "elseif", "else", "where", "interface",
                     "for", "while", "do",
                     "switch", "case",

diff --git a/www/templates/pages/homepage.html b/www/templates/pages/homepage.html
index 2da5be20bcf8f71cf83de4b8c35a2362201dbce7..7932430bf081b58abc77e8b265815eaae26ef7c0 100644 (file)
--- a/www/templates/pages/homepage.html
+++ b/www/templates/pages/homepage.html
@@ -64,6 +64,12 @@ factorial :: (n: i32) -> i32 {
     </div>
 </div>
 
+<div class="container">
+    <h2 style="margin-bottom: 8px">Recent News</h2>
+    {% partial "partials/news_listing" %}
+</div>
+
+
 {{endblock}}
 
 {{extends "pages/normal_page"}}

diff --git a/www/templates/pages/news.html b/www/templates/pages/news.html
index 1f7ba152594b098677f994c6a9b3d7b35d2ce89a..8842dfc0e5ed14a7acdddf3ee6888bfcd3efc5a0 100644 (file)
--- a/www/templates/pages/news.html
+++ b/www/templates/pages/news.html
@@ -6,15 +6,7 @@
     <h1>News</h1>
 </div>
 
-{{ foreach $article in $articles }}
-<div class="container">
-    <h2><a href="/news/{% $article.path %}">{% $article.name %}</a></h2>
-    <p><em>{% $article.date %}</em></p>
-    <p>
-    {% $article.description %}
-    </p>
-</div>
-{{ endforeach }}
+{% partial "partials/news_listing" %}
 
 {{endblock}}
 

diff --git a/www/templates/partials/news_listing.html b/www/templates/partials/news_listing.html
new file mode 100644 (file)
index 0000000..2ed80be
--- /dev/null
+++ b/www/templates/partials/news_listing.html
@@ -0,0 +1,10 @@
+
+{{ foreach $article in $articles }}
+<div class="container">
+    <h2><a href="/news/{% $article.path %}">{% $article.name %}</a></h2>
+    <p><em>{% $article.date %}</em></p>
+    <p>
+    {% $article.description %}
+    </p>
+</div>
+{{ endforeach }}