Move search to _libraries

2019-09-20 23:19:39 +02:00 · 2019-09-20 23:19:39 +02:00 · 57b3848430
commit 57b3848430
--- a/1
+++ b/1
@ -23,7 +23,6 @@ COPY libs/ /daux/libs/
 COPY templates/ /daux/templates/
 COPY themes/ /daux/themes/
 COPY _libraries/ /daux/_libraries/
-COPY search/ /daux/search/
 COPY global.json /daux/global.json
 COPY index.php /daux/index.php

--- a/_libraries/search.css
+++ b/_libraries/search.css
--- a/_libraries/search.min.js
+++ b/_libraries/search.min.js
--- a/_libraries/search.min.js.map
+++ b/_libraries/search.min.js.map
--- a/crafty.config.js
+++ b/crafty.config.js
@ -25,7 +25,7 @@ module.exports = {
        search: {
            runner: "rollup",
            source: "src/js/search/index.js",
-            destination: "search/search.min.js"
+            destination: "_libraries/search.min.js"
        },
        theme_daux: {
            runner: "rollup",
--- a/libs/Format/HTML/Generator.php
+++ b/libs/Format/HTML/Generator.php
@ -78,12 +78,8 @@ class Generator implements \Todaymade\Daux\Format\Base\Generator, LiveGenerator
        );

        if ($params['html']['search']) {
-            GeneratorHelper::copyRecursive(
-                $this->daux->local_base . DIRECTORY_SEPARATOR . 'search' . DIRECTORY_SEPARATOR,
-                $destination . DIRECTORY_SEPARATOR . 'search'
-            );
            file_put_contents(
-                $destination . DIRECTORY_SEPARATOR . 'search' . DIRECTORY_SEPARATOR . 'search_index.json',
+                $destination . DIRECTORY_SEPARATOR . '_search_index.json',
                json_encode(['pages' => $this->indexed_pages])
            );

--- a/search/search.min.js.map
+++ b/search/search.min.js.map
--- a/src/js/search/index.js
+++ b/src/js/search/index.js
@ -30,7 +30,7 @@ class SearchEngine {
            descriptiveWords: 25,
            highlightTerms: true,
            highlightEveryTerm: false,
-            contentLocation: "search/search_index.json",
+            contentLocation: "_search_index.json",
            ...options
        };

--- a/templates/layout/00_layout.php
+++ b/templates/layout/00_layout.php
@ -44,7 +44,7 @@

    <?php if ($params['html']['search']) { ?>
        <!-- Search -->
-        <link href="<?= $base_url; ?>search/search.css" rel="stylesheet">
+        <link href="<?= $base_url; ?>_libraries/search.css" rel="stylesheet">
    <?php } ?>
 </head>
 <body class="<?= $params['html']['float'] ? 'with-float' : ''; ?> <?= $this->section('classes'); ?>">
--- a/templates/partials/search_script.php
+++ b/templates/partials/search_script.php
@ -23,7 +23,7 @@
    </script>

    <!-- Search -->
-    <script type="text/javascript" src="<?php echo $base_url; ?>search/search.min.js"></script>
+    <script type="text/javascript" src="<?php echo $base_url; ?>_libraries/search.min.js"></script>

    <script>
        window.search({'base_url': '<?php echo $base_url?>'})