From 2736a46cfe0333ba332c7cbaa6b2c04c6b1a0fee Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 25 May 2021 17:30:05 +0200
Subject: [PATCH] Revert "Kiwix Serve welcome page dynamic and subset loading
 (OPDS based)"

---
 .gitignore                    |   1 -
 src/server/internalServer.cpp |   2 +-
 static/resources_list.txt     |   1 -
 static/skin/index.js          |  76 -----------------
 static/templates/index.html   | 154 ++++++++++++++--------------------
 5 files changed, 63 insertions(+), 171 deletions(-)
 delete mode 100644 static/skin/index.js

diff --git a/.gitignore b/.gitignore
index 4f46d8e43..1a8f75003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ subprojects/googletest-release*
 *.class
 build/
 .vscode/
-builddir/
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index 3d9739f63..f28c3df03 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -658,7 +658,7 @@ std::vector<std::string>
 InternalServer::search_catalog(const RequestContext& request,
                                kiwix::OPDSDumper& opdsDumper)
 {
-    auto filter = kiwix::Filter().valid(true).local(true);
+    auto filter = kiwix::Filter().valid(true).local(true).remote(true);
     string query("<Empty query>");
     size_t count(10);
     size_t startIndex(0);
diff --git a/static/resources_list.txt b/static/resources_list.txt
index 6c0570442..d31c323ba 100644
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -19,7 +19,6 @@ skin/jquery-ui/jquery-ui.theme.min.css
 skin/jquery-ui/jquery-ui.min.css
 skin/caret.png
 skin/taskbar.js
-skin/index.js
 skin/taskbar.css
 skin/block_external.js
 templates/search_result.html
diff --git a/static/skin/index.js b/static/skin/index.js
deleted file mode 100644
index 1865c65b6..000000000
--- a/static/skin/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-(function() {
-    const root = $(`link[type='root']`).attr('href');
-    let isFetching = false;
-    const incrementalLoadingParams = {
-        start: 0,
-        count: viewPortToCount()
-    };
-
-    function queryUrlBuilder() {
-        let url = `${root}/catalog/search?`;
-        url += Object.keys(incrementalLoadingParams).map(key => `${key}=${incrementalLoadingParams[key]}`).join("&");
-        return url;
-    }
-
-    function viewPortToCount(){
-        return Math.floor(window.innerHeight/100 + 1)*(window.innerWidth>1000 ? 3 : 2);
-    }
-
-    function getInnerHtml(node, query) {
-        return node.querySelector(query).innerHTML;
-    }
-
-    function generateBookHtml(book) {
-        const link = book.querySelector('link').getAttribute('href');
-        const title =  getInnerHtml(book, 'title');
-        const description = getInnerHtml(book, 'summary');
-        const id = getInnerHtml(book, 'id');
-        const iconUrl = getInnerHtml(book, 'icon');
-        const articleCount = getInnerHtml(book, 'articleCount');
-        const mediaCount = getInnerHtml(book, 'mediaCount');
-
-        return `<a href='${link}' data-id='${id}'><div class='book'>
-            <div class='book__background' style="background-image: url('${iconUrl}');">
-            <div class='book__title' title='${title}'>${title}</div>
-            <div class='book__description' title='${description}'>${description}</div>
-            <div class='book__info'>${articleCount} articles, ${mediaCount} medias</div>
-            </div>
-        </div></a>`;
-    }
-
-    async function loadAndDisplayBooks() {
-        isFetching = true;
-        fetch(queryUrlBuilder()).then(async (resp) => {
-            const data = new window.DOMParser().parseFromString(await resp.text(), 'application/xml');
-            const books = data.querySelectorAll('entry');
-            let bookHtml = '';
-            books.forEach((book) => {bookHtml += generateBookHtml(book)});
-            document.querySelector('.book__list').innerHTML += bookHtml;
-            incrementalLoadingParams.start += books.length;
-            if (books.length < incrementalLoadingParams.count) {
-                incrementalLoadingParams.count = 0;
-            }
-            isFetching = false;
-        });
-    }
-
-    async function loadSubset() {
-        if (!isFetching &&
-            incrementalLoadingParams.count &&
-            window.innerHeight + window.scrollY >= document.body.offsetHeight
-        ) {
-            loadAndDisplayBooks();
-        }
-    }
-
-    window.addEventListener('resize', async () => {
-        incrementalLoadingParams.count = incrementalLoadingParams.count && viewPortToCount();
-        loadSubset();
-    });
-
-    window.addEventListener('scroll', loadSubset);
-
-    window.onload = async () => {
-        loadAndDisplayBooks();
-    }
-})();
diff --git a/static/templates/index.html b/static/templates/index.html
index 09ac8068c..dc355aa63 100644
--- a/static/templates/index.html
+++ b/static/templates/index.html
@@ -1,96 +1,66 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Welcome to Kiwix Server</title>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/external/jquery/jquery.js"
-    ></script>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/jquery-ui.min.js"
-    ></script>
-    <link
-      type="text/css"
-      href="{{root}}/skin/jquery-ui/jquery-ui.min.css"
-      rel="Stylesheet"
-    />
-    <link
-      type="text/css"
-      href="{{root}}/skin/jquery-ui/jquery-ui.theme.min.css"
-      rel="Stylesheet"
-    />
-    <style>
-      body {
-        background: radial-gradient(#eeeeee 15%, transparent 16%) 0 0,
-          radial-gradient(#eeeeee 15%, transparent 16%) 8px 8px,
-          radial-gradient(rgba(255, 255, 255, 0.1) 15%, transparent 20%) 0 1px,
-          radial-gradient(rgba(255, 255, 255, 0.1) 15%, transparent 20%) 8px 9px;
-        background-color: #e8e8e8;
-        background-size: 16px 16px;
-        margin-left: auto;
-        margin-right: auto;
-        max-width: 1100px;
-      }
-      .book__list {
-        text-align: center;
-      }
-      .book {
-        display: inline-block;
-        vertical-align: bottom;
-        margin: 8px;
-        padding: 12px 15px;
-        width: 300px;
-        border: 1px solid #ccc;
-        border-radius: 8px;
-        text-align: left;
-        color: #000;
-        font-family: sans-serif;
-        font-size: 13px;
-        background-color: #f1f1f1;
-        box-shadow: 2px 2px 5px 0px #ccc;
-      }
-      .book:hover {
-        background-color: #f9f9f9;
-        box-shadow: none;
-      }
-      .book__background {
-        background-repeat: no-repeat;
-        background-size: 48px 48px;
-        background-position: top right;
-      }
-      .book__title {
-        padding: 0 55px 0 0;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-size: 18px;
-        color: #0645ad;
-        line-height: 1em;
-      }
-      .book__description {
-        padding: 5px 55px 5px 0px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-size: 15px;
-        line-height: 1em;
-      }
-      .book__info {
-        color: #777;
-        font-weight: bold;
-        font-size: 13px;
-        line-height: 1em;
-      }
-    </style>
-    <script type="text/javascript" src="{{root}}/skin/index.js" async></script>
-  </head>
-  <body class="kiwix">
-    <div class="kiwix">
-      <div class="book__list"></div>
-    </div>
+<head>
+  <meta charset="UTF-8" />
+  <title>Welcome to Kiwix Server</title>
+  <script type="text/javascript" src="{{root}}/skin/jquery-ui/external/jquery/jquery.js"></script>
+  <script type="text/javascript" src="{{root}}/skin/jquery-ui/jquery-ui.min.js"></script>
+  <link type="text/css" href="{{root}}/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
+  <link type="text/css" href="{{root}}/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
+  <style>
+        body {
+                background:
+                radial-gradient(#EEEEEE 15%, transparent 16%) 0 0,
+                radial-gradient(#EEEEEE 15%, transparent 16%) 8px 8px,
+                radial-gradient(rgba(255,255,255,.1) 15%, transparent 20%) 0 1px,
+                radial-gradient(rgba(255,255,255,.1) 15%, transparent 20%) 8px 9px;
+                background-color:#E8E8E8;
+                background-size:16px 16px;
+                margin-left: auto;
+                margin-right: auto;
+                max-width: 1100px;
+        }
+        .book__list { text-align: center; }
+        .book {
+                display: inline-block; vertical-align: bottom; margin: 8px; padding: 12px 15px; width: 300px;
+                border: 1px solid #ccc; border-radius: 8px;
+                text-align: left; color: #000; font-family: sans-serif; font-size: 13px;
+                background-color:#F1F1F1;
+                box-shadow: 2px 2px 5px 0px #ccc;
+        }
+        .book:hover { background-color: #F9F9F9; box-shadow: none;}
+        .book__background { background-repeat: no-repeat; background-size: 48px 48px; background-position: top right; }
+        .book__title {
+                padding: 0 55px 0 0;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+                font-size: 18px; color: #0645ad; line-height: 1em;
+        }
+        .book__description {
+                padding: 5px 55px 5px 0px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+                font-size: 15px; line-height: 1em;
+        }
+        .book__info { color: #777; font-weight: bold; font-size: 13px; line-height: 1em; }
+  </style>
+  <script type="text/javascript" src="{{root}}/skin/taskbar.js" async></script>
+</head>
+<body class="kiwix">
 
-    <div id="kiwixfooter">Powered by <a href="https://kiwix.org">Kiwix</a></div>
-  </body>
+<div class="kiwix">
+  <div class='book__list'>
+    {{#books}}
+    <a href="{{root}}/{{name}}"><div class='book'>
+        <div class='book__background' style="background-image: url('{{root}}/meta?content={{#urlencoded}}{{{name}}}{{/urlencoded}}&name=favicon');">
+          <div class='book__title' title='{{title}}'>{{title}}</div>
+          <div class='book__description' title='{{description}}'>{{description}}</div>
+          <div class='book__info'>{{articleCount}} articles, {{mediaCount}} medias</div>
+        </div>
+    </div></a>
+    {{/books}}
+  </div>
+</div>
+
+<div id="kiwixfooter">
+  Powered by <a href="https://kiwix.org">Kiwix</a>
+</div>
+
+</body>
 </html>