From 1d898a39a8bc7996720b6f41deb5e77c43273a5f Mon Sep 17 00:00:00 2001
From: Andrea <andrea@avris.it>
Date: Wed, 19 Jan 2022 23:46:28 +0100
Subject: [PATCH] [pl][blog] display most important posts prominently

---
 components/BlogEntriesList.vue |  5 +++--
 locale/pl/config.suml          |  4 ++--
 nuxt.config.js                 | 10 ++++++----
 routes/blog.vue                |  2 +-
 routes/homepage.vue            | 17 +++++++++++++++--
 routes/links.vue               |  2 +-
 server/routes/blog.js          | 19 ++++++++++++++++---
 7 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/components/BlogEntriesList.vue b/components/BlogEntriesList.vue
index daad0749..afdef110 100644
--- a/components/BlogEntriesList.vue
+++ b/components/BlogEntriesList.vue
@@ -8,7 +8,7 @@
                 <nuxt-link :to="generateLink(post.slug)" class="card-body text-center h4 p-3 mb-0">
                     <Spelling :text="post.title"/>
                 </nuxt-link>
-                <div class="card-footer small">
+                <div v-if="details" class="card-footer small">
                     <ul class="list-inline mb-0">
                         <li class="list-inline-item small">
                             <Icon v="calendar"/>
@@ -36,6 +36,7 @@
     export default {
         props: {
             posts: { required: true },
+            details: { type: Boolean },
         },
         data() {
             const shortcuts = {};
@@ -58,7 +59,7 @@
                     ? `/${this.shortcuts[slug]}`
                     : `/blog/${slug}`;
             }
-        }
+        },
     };
 </script>
 
diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index 6ffdfea5..92a254ec 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -1724,13 +1724,13 @@ census:
 blog:
     shortcuts:
         manifest: 'manifest'
+        grupy: 'jak-zwracać-się-do-grup'
+        formularze: 'rekomendacja-formularze'
         ktosio: 'zaimki-nie-tylko-osobowe'
         tłumaczenie: 'ściągawka-tłumaczenie'
         autokorekta: 'autokorekta'
-        grupy: 'jak-zwracać-się-do-grup'
         liczebniki: 'inkluzywne-liczebniki'
         zaimki-postpłciowe: 'zaimki-postpłciowe'
-        formularze: 'rekomendacja-formularze'
 
 redirects:
     - { from: '^/slowniki/neutratywy$', to: '/neutratywy' }
diff --git a/nuxt.config.js b/nuxt.config.js
index 2b650bf8..fa918e39 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -231,10 +231,12 @@ export default {
             if (config.links.blog) {
                 routes.push({ path: '/' + encodeURIComponent(config.links.blogRoute), component: resolve(__dirname, 'routes/blog.vue'), name: 'blog' });
                 routes.push({ path: '/' + encodeURIComponent(config.links.blogRoute) + '/:slug', component: resolve(__dirname, 'routes/blogEntry.vue'), name: 'blogEntry' });
-                for (let shortcut in config.blog.shortcuts) {
-                    if (!config.blog.shortcuts.hasOwnProperty(shortcut)) { continue; }
-                    const slug = config.blog.shortcuts[shortcut];
-                    routes.push({ path: '/' + encodeURIComponent(shortcut), component: resolve(__dirname, 'routes/blogEntry.vue'), meta: {slug}, name: 'blogEntryShortcut:' + shortcut });
+                if (config.blog && config.blog.shortcuts) {
+                    for (let shortcut in config.blog.shortcuts) {
+                        if (!config.blog.shortcuts.hasOwnProperty(shortcut)) { continue; }
+                        const slug = config.blog.shortcuts[shortcut];
+                        routes.push({ path: '/' + encodeURIComponent(shortcut), component: resolve(__dirname, 'routes/blogEntry.vue'), meta: {slug}, name: 'blogEntryShortcut:' + shortcut });
+                    }
                 }
             }
 
diff --git a/routes/blog.vue b/routes/blog.vue
index 8349bd6b..4b2392de 100644
--- a/routes/blog.vue
+++ b/routes/blog.vue
@@ -5,7 +5,7 @@
             <Icon v="pen-nib"/>
             <T>links.blog</T>
         </h2>
-        <BlogEntriesList :posts="posts"/>
+        <BlogEntriesList :posts="posts" details/>
         <Separator icon="heart"/>
         <Support/>
         <section>
diff --git a/routes/homepage.vue b/routes/homepage.vue
index b590098e..e07bf084 100644
--- a/routes/homepage.vue
+++ b/routes/homepage.vue
@@ -60,6 +60,13 @@
             </div>
         </section>
 
+        <template v-if="posts.length">
+            <Separator icon="pen-nib" class="mb-5"/>
+            <section>
+                <BlogEntriesList :posts="posts"/>
+            </section>
+        </template>
+
         <Separator icon="heart"/>
         <section>
             <Support/>
@@ -100,7 +107,13 @@
                 })
             }
 
-            return { mainLinks };
-        }
+            return {
+                mainLinks,
+                posts: [],
+            };
+        },
+        async mounted() {
+            this.posts = await this.$axios.$get(`/blog?shortcuts`);
+        },
     }
 </script>
diff --git a/routes/links.vue b/routes/links.vue
index 7d72ac21..ffab37db 100644
--- a/routes/links.vue
+++ b/routes/links.vue
@@ -7,7 +7,7 @@
                 <Icon v="pen-nib"/>
                 <T>links.blog</T>
             </h2>
-            <BlogEntriesList :posts="posts"/>
+            <BlogEntriesList :posts="posts" details/>
         </section>
         <Links/>
         <Recommended/>
diff --git a/server/routes/blog.js b/server/routes/blog.js
index 737942cb..996dbe18 100644
--- a/server/routes/blog.js
+++ b/server/routes/blog.js
@@ -6,7 +6,7 @@ import { caches } from "../../src/cache";
 const router = Router();
 
 router.get('/blog', handleErrorAsync(async (req, res) => {
-    return res.json(await caches.blog.fetch(async () => {
+    const posts = await caches.blog.fetch(async () => {
         const dir = __dirname + '/../../data/blog';
         const posts = [];
         fs.readdirSync(dir).forEach(file => {
@@ -57,12 +57,25 @@ router.get('/blog', handleErrorAsync(async (req, res) => {
             posts.push({slug, title, date, authors, hero});
         });
 
-        return posts.sort((a, b) => {
+        posts.sort((a, b) => {
             if (a.date < b.date) { return 1; }
             if (a.date > b.date) { return -1; }
             return 0;
         });
-    }));
+
+        return posts;
+    })
+
+    if (req.query.shortcuts !== undefined && global.config.blog && global.config.blog.shortcuts) {
+        const postsShortcuts = [];
+        for (let slug of Object.values(global.config.blog.shortcuts)) {
+            postsShortcuts.push(posts.filter(p => p.slug === slug)[0])
+        }
+
+        return res.json(postsShortcuts);
+    }
+
+    return res.json(posts);
 }));
 
 export default router;