retoor/searxng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,354 Commits 6 Branches 17 Tags
4dc7d955be08fc7ce107e6c8ec201befadd2935d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser 4f22615259 Merge pull request #538 from return42/eslint 
SearXNG JavaScript Style Guide
 2021-12-14 08:07:22 +01:00
Markus Heiser f287787c44 [simple theme] activate - SearXNG JavaScript Style Guide 
Add the 'SearXNG JavaScript Style Guide' as one quality gate in the build chain
of the simple theme::

    make themes.simple
    make themes.simple.test

In the github CI the `themes.all` target enforce a `themes.simple`.

BTW: Remove 'jshint' left overs from 0ee316f3d

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-14 07:50:53 +01:00
Markus Heiser 34f5e9c7a3 [fix] eslint --fix 
automatically fix some of the problems reported by eslint rules::

    $ ./manage nvm.bash
    nvm-env$ npm --prefix searx/static/themes/simple run eslint-fix

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-14 07:31:58 +01:00
Markus Heiser 32cf24a272 [mod] eslint: add gruntfile.js to the files to lint 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-14 07:26:41 +01:00
Markus Heiser 06730588a6 [mod] SearXNG JavaScript Style Guide (eslint:recommended) 
The SearXNG JavaScript Style Guide is a set of eslint rules [1] based on the
eslint:recommended [2] rules.

    "extends": "eslint:recommended"

The additional rules adopted from the JavaScript Standard Style [3][4].

[1] https://eslint.org/docs/rules/
[2] https://github.com/kunalgolani/eslint-config/tree/master/packages/recommended
[3] https://standardjs.com/rules.html#javascript-standard-style
[4] https://github.com/standard/eslint-config-standard/blob/master/.eslintrc.json

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-14 06:50:26 +01:00
Markus Heiser 07e9d952cf [emacs] .dir-locals.el: in json-mode use indentation of 4 
In JS + JSON we use indentation of 4.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-14 06:50:26 +01:00
Markus Heiser 9fc27088ef Merge pull request #583 from return42/fix-combo-with 
[fix] simple theme: remove width  45% from language and time filters
 2021-12-12 17:02:31 +01:00
Markus Heiser 8cc7c880ae Merge pull request #587 from dalf/fix-gigablast 
[fix] gigablast engine
 2021-12-12 15:58:13 +01:00
Markus Heiser 5307fd841d Merge pull request #591 from searxng/dependabot/pip/master/twine-3.7.1 
Bump twine from 3.7.0 to 3.7.1
 2021-12-10 08:35:06 +01:00
Markus Heiser 4207eea676 Merge pull request #592 from searxng/dependabot/pip/master/pylint-2.12.2 
Bump pylint from 2.12.1 to 2.12.2
 2021-12-10 08:34:43 +01:00
Markus Heiser 055198698a Merge pull request #593 from searxng/translations_update 
Update translations
 2021-12-10 08:34:08 +01:00
Markus Heiser b5c9cc4ff3 Merge pull request #586 from dalf/remove-yggtorrent 
[del] remove yggtorrent
 2021-12-07 07:00:47 +01:00
Markus Heiser 5f902bbb0f [fix] simple theme: remove width 45% from language and time filters 
All three filters (`language`, `time_range` and `safesearch`) are rendered in
one line.  A size of 45% for `language` and `time_range` left only 10% for the
`safesearch` filter.  Solution: drop with from `language` and `time_range`.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-05 14:22:55 +01:00
Markus Heiser d6d6585b26 [build] /static 2021-12-05 11:51:36 +01:00
Markus Heiser 2b26285a73 [fix] simple theme: make autocomplete-js CSP compliant 
The CSP issue is, that the `_Position` function in the autocomplete-js set the
style attributes by `setAttribute("style", ...)`.  Using `setAttribute` to set
the style attribute invokes the HTML parser and CSP is triggered [1].

This patch overwrite the `_Position` function of autocomplete-js.

BTW: remove trailing whitespace

[1] https://stackoverflow.com/a/57633533

Closes: https://github.com/searxng/searxng/issues/352
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-05 11:48:23 +01:00
Markus Heiser f5a4906e3e [build] /static 2021-12-04 11:31:04 +01:00
Markus Heiser 7d6a15a612 [fix] simple theme: make LESS sources available on non build hosts 
Include the LESS source files directly in the `.map` files [1].

Drawback: `.map` files grow up in size, but this should not bother, because the
files are only loaded in debug mode.

[1] https://github.com/gruntjs/grunt-contrib-less#outputsourcefiles
[2] https://github.com/searxng/searxng/pull/575#issuecomment-984058868

Suggested-by: @dalf [2]
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-04 11:22:40 +01:00
Markus Heiser 32c5918e4d Merge pull request #577 from searxng/dependabot/pip/master/twine-3.7.0 
Bump twine from 3.6.0 to 3.7.0
 2021-12-03 08:17:16 +01:00
Markus Heiser eb220774a6 Merge pull request #576 from searxng/dependabot/pip/master/sphinx-4.3.1 
Bump sphinx from 4.3.0 to 4.3.1
 2021-12-03 08:11:32 +01:00
Markus Heiser d26a746d7d [build] /static 2021-12-01 21:12:06 +01:00
Markus Heiser f54460a805 [fix] simple theme: make JS sources available on non build hosts 
Include the source files directly in the `.map` files [1] for two reasons:

1. In the simple theme, modules from `./node_modules` are only available on
   developer's build host (a `make node.env` is needed to get the sources).  By
   example; in the `searxng.min.js.map` file, the `autocomplete.js` is linked at
   URL:

      ../node_modules/autocomplete-js/dist/autocomplete.js

2. Later, when client sources has been moved out of the `./static` URL [2] to
   the `<repo-roo>/src` folder, all JS sources are no longer available.

Drawback: `.map` files grow up in size, but this should not bother, because the
files are only loaded in debug mode.

[1] https://github.com/gruntjs/grunt-contrib-uglify#sourcemapincludesources
[2] https://github.com/searxng/searxng/issues/141

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-01 21:09:26 +01:00
Markus Heiser c89d2aab3f [mod] make static.build.commit more robust 
- use single quote in the STATIC_BUILT_PATHS to avoid bash globbing
- don't try to commit if no files have been changed

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-01 20:25:39 +01:00
Markus Heiser 82125862c6 [fix] simple theme: remove static files no longer needed 
remove:

    searx/static/themes/simple/js/searxng.js
    searx/static/themes/simple/js/searxng.head.js
    searx/static/themes/simple/css/searxng-rtl.css
    searx/static/themes/simple/css/searxng.css

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-01 10:38:41 +01:00
Markus Heiser e62733fcf3 Merge pull request #571 from searxng/update_data_update_languages.py 
Update searx.data - update_languages.py
 2021-12-01 07:30:41 +01:00
Markus Heiser 24d04f2854 Merge pull request #570 from searxng/update_data_update_firefox_version.py 
Update searx.data - update_firefox_version.py
 2021-12-01 07:29:56 +01:00
Markus Heiser a3fc1304cc Merge pull request #569 from searxng/update_data_update_currencies.py 
Update searx.data - update_currencies.py
 2021-12-01 07:29:24 +01:00
Markus Heiser 550a47533a Merge pull request #568 from searxng/update_data_update_ahmia_blacklist.py 
Update searx.data - update_ahmia_blacklist.py
 2021-12-01 07:28:48 +01:00
Markus Heiser 3c4f5d9e2f Merge pull request #567 from searxng/need-translators 
README.rst: add translation status
 2021-12-01 07:23:37 +01:00
Markus Heiser 4798acc661 [build] /static 2021-11-30 12:43:18 +01:00
Markus Heiser 7dc9cc91a8 [mod] simple theme, JS: introduce window.searxng.theme namespace 
In window.searxng.theme the theme data can be passed through to JS
implementations.

Initial the window.searxng.theme namespace starts with a value for
`img_load_error`::

    // image that is displayed if load of <img src='...'> failed
    img_load_error: 'img/img_load_error.svg'

The searx/static/themes/__common__/js/image_layout.js is patched to uses the
value, if the theme defines a value for img_load_error in this namespace.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-30 12:42:52 +01:00
Markus Heiser eff0884498 [simple] ImageLayout.watch: img_load_error.svg if img load fails 
Show default image `img/img_load_error.svg` when image can't be loaded.

----
Some words about class ImageLayout:

The https://github.com/searxng/searxng/blob/master/searx/static/themes/simple/js/searxng.js is build by a grunt task ..

https://github.com/searxng/searxng/blob/d0e21a01b4e14df905f25445a3f6bcbec481671c/searx/static/themes/simple/gruntfile.js#L91-L93

The `/__common__/js/*.js` concats also https://github.com/searxng/searxng/blob/master/searx/static/themes/__common__/js/image_layout.js where a modified copy of the of the "Google-image-layout" (`ImageLayout`) is implemented [1][2][3].

[1] https://ptgamr.github.io/2014-09-12-google-image-layout/
[2] https://ptgamr.github.io/google-image-layout/src/google-image-layout.js
[3] https://github.com/ptgamr/google-image-layout/tree/master
----

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 21:10:13 +01:00
Markus Heiser 0311eba538 Merge pull request #556 from return42/fix-tooltip 
[simple theme] fix tooltip and improve background of an transparent image in the !images results
 2021-11-29 21:07:14 +01:00
Markus Heiser f8c3acd729 [build] /static 2021-11-29 20:48:38 +01:00
Markus Heiser fb5c1ed310 [fix] simple theme: set img background color to wallpaper's color 
The *background color* of an transparent image is the color of the color of
wallpaper on which all images are shown on.

Set variable `--color-result-image-background` and `--color-base-background` to
the same value.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser c7bb6945d1 [fix] simple theme: img tile, shows duplicate information on screen 
Remove global title attribute from img tag[1][2] .  In the image result, the
title is already shown from span class title::

    <span class="title">{{ result.title|striptags }}</span>

See commit: 8fbffb1409

    [fix] simple-theme templates: polish HTML <img> elements

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
[2] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title

Reported-by: @dalf https://github.com/searxng/searxng/pull/545#issuecomment-980531215
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser 935e5ad417 Merge pull request #558 from return42/svg-favicon 
[enh] add SVG favicon href="favicon.svg" type="image/svg+xml"
 2021-11-29 20:46:07 +01:00
Markus Heiser 0afcde071c [build] /static 2021-11-29 20:37:23 +01:00
Markus Heiser 944b73511a [enh] add SVG favicon href="favicon.svg" type="image/svg+xml" 
Add link::

    <link rel="icon" href="favicon.png" sizes="any">
    <link rel="icon" href="favicon.svg" type="image/svg+xml">

Modern browsers should request::

    INFO  werkzeug   : 127.0.0.1 - - [28/Nov/2021 17:03:07] "GET /static/themes/simple/img/favicon.svg HTTP/1.1" 200 -

[1] https://github.com/audreyfeldroy/favicon-cheat-sheet#svg-file
[2] https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:36:31 +01:00
Markus Heiser 989f9e97f0 Merge pull request #561 from return42/fix-README 
[brand] README: add SearXNG logo
 2021-11-29 20:05:54 +01:00
Markus Heiser e2e585319e [build] /static 2021-11-29 19:53:28 +01:00
Markus Heiser 9349c71c54 [mod] themes/simple/img/searxng.svg -> src/brand/searxng.svg 
* move `searx/static/themes/simple/img/searxng.svg` to `src/brand/searxng.svg`

* README.rst can use it without a reference to a theme.

* the simple theme can create `searx/static/themes/simple/img/searxng.png` using
  the svg2png task

Suggested-by: @dalf https://github.com/searxng/searxng/pull/561#issuecomment-981747902
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 19:53:28 +01:00
Markus Heiser fd8982d53d Merge pull request #560 from return42/fix-page-title 
[fix] query_in_title: add missing space in title
 2021-11-29 14:55:32 +01:00
Markus Heiser e12debe9ee [brand] README: add SearXNG logo 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 13:51:18 +01:00
Markus Heiser 1f896ea509 [fix] query_in_title: add missing space in title 
Suggested-by: @unixfox https://github.com/searxng/searxng/pull/485#issuecomment-981406978
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 11:08:21 +01:00
Markus Heiser 0c8ff97d9e [fix] route /autocompleter: escape < and > in the simple theme 
This is a follow up of 9a3253fc escaping `<` and `>` in all themes.  This patch
fix issue in oscar theme

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 07:20:08 +01:00
Markus Heiser d0e21a01b4 Merge pull request #541 from dalf/simple-theme-svg2png 
Simple theme svg2png
 2021-11-28 20:13:53 +01:00
Markus Heiser 8154dd2a2e [build] /static 2021-11-28 20:07:49 +01:00
Markus Heiser 8c4c4259d4 [mod] gruntfile: do some polish (no functional change) 
- remove unused 'path' constant
- fix indentation
- Put all image tasks at the end, where it is easy to list which image is processed.

Suggested -by: @dalf https://github.com/searxng/searxng/pull/541#discussion_r756247157
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-28 20:04:10 +01:00
Markus Heiser 11ba7f294f Merge pull request #554 from return42/fix-google-video 
[fix] google-videos engine: ignore news articles
 2021-11-27 12:59:39 +01:00
Markus Heiser f0db33e14b Merge pull request #555 from return42/fix-autocomplete 
[fix] route /autocompleter: escape '<' and '>' in the response
 2021-11-27 09:24:58 +01:00
Markus Heiser 9a3253fc16 [fix] route /autocompleter: escape '<' and '>' in the response 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-27 08:39:48 +01:00
Markus Heiser e27b1ac57a Merge pull request #549 from searxng/dependabot/pip/master/pylint-2.12.1 
Bump pylint from 2.11.1 to 2.12.1
 2021-11-27 00:40:26 +01:00
Markus Heiser 96cb7123bb Merge pull request #553 from return42/fix-oscar 
[fix] oscar theme: use SearXNG logo and wordmark
 2021-11-27 00:34:22 +01:00
Markus Heiser 27c1b9f660 Merge pull request #551 from dalf/fix-results-lock 
[fix] searx.results: fix pylint issue "useless-with-lock"
 2021-11-27 00:28:22 +01:00
Markus Heiser ab5097d708 Merge pull request #545 from return42/fix-523 
[fix] simple-theme templates: polish HTML <img> elements
 2021-11-27 00:26:19 +01:00
Markus Heiser 6e06618e0c [fix] google-videos engine: ignore news articles 
In the video search, google also sometimes includes news.  E.g. in the DE
language when you search for `!gov paris`, google adds an article from a german
newspaper (FAZ), I assume these are sponsored link (not tagged advertisement?)

Those links do not have an image / this patch ignores *video links* wqithout an
image ID.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 17:11:20 +01:00
Markus Heiser e54a06bae7 [fix] oscar theme: use SearXNG logo and wordmark 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 16:43:18 +01:00
Markus Heiser cfb5eda4d1 Merge pull request #552 from return42/fix-searx.sh 
[fix] searx.sh update: replace git pull by a hard reset
 2021-11-26 15:41:52 +01:00
Markus Heiser ee8b6aac36 [fix] searx.sh update: replace git pull by a hard reset 
If the fetched branch has been rebased a 'git pull' will fails.  To get fetched
branch in the working tree, a git reset is needed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 15:15:17 +01:00
Markus Heiser 1ce09df9aa [fix] google video engine - rework of the HTML parser 
The google video response has been changed slightly, a rework of the parser was
needed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 01:14:17 +01:00
Markus Heiser 488ace1da9 [fix] google engine - suggestion 
BTW: google no longer offers *spelling suggestions*

Closes: https://github.com/searxng/searxng/issues/442
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-25 19:42:03 +01:00
Markus Heiser 8fbffb1409 [fix] simple-theme templates: polish HTML <img> elements 
- <img> [1] element does not have an end tag, no need for a leading `/>`
- add global attribute title[2] to result_templates/images.html (result-images-source)
- in jinja macro 'macro result_header' remove duplicate of class="image"
- in jinja macro 'macro result_header' remove alt attribute (fix [3])::

    alt="{{ result.title|striptags }}"

  the result.title is already shown in::

    <h3>{{ result_link(result.url, result.title|safe) }}</h3>

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
[2] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title
[3] https://github.com/searxng/searxng/issues/523

Closes: https://github.com/searxng/searxng/issues/523
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-25 12:07:57 +01:00
Markus Heiser bd285de48a Merge pull request #543 from return42/fix-485 
[fix] templates: remove unneeded escape \' of single quotation mark
 2021-11-24 20:20:26 +01:00
Markus Heiser 3f3097c772 [fix] templates: remove unneeded escape \' of single quotation mark 
Strings like::

    'Query in the page\'s title'

are hard to read / remove escape sequence by using double quotation marks for
strings ::

    "Query in the page's title"

BTW: remove a leading dot in the simple theme [1].

[1] https://github.com/searxng/searxng/pull/485/files/80fb77476fad4b229418c530f3ffda67f357a15a#r756112716

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-24 17:40:03 +01:00
Markus Heiser dae165eaa0 Merge pull request #537 from return42/moz-warnings 
[simple theme] remove '-moz-border-radius' property
 2021-11-23 20:25:17 +01:00
Markus Heiser 167e374ee1 Merge pull request #539 from searxng/fix-pr-535 
fix PR #535
 2021-11-23 20:24:49 +01:00
Markus Heiser 3364a15b3a [build] /static 2021-11-23 20:04:27 +01:00
Markus Heiser 28a597e43e [simple theme] remove '-webkit-border-radius' property 
[1] https://github.com/searxng/searxng/pull/537#issuecomment-976582675

Suggested-by: @dalf [1]
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-23 20:02:39 +01:00
Markus Heiser 8935b1d8a2 [simple theme] remove '-moz-border-radius' property 
Support for the prefixed version (-moz-border-radius) was removed in Gecko
13.0 (Firefox 13.0 / Thunderbird 13.0 / SeaMonkey 2.10) [1].

[1] https://developer.mozilla.org/pt-BR/docs/Web/CSS/border-radius

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-23 20:02:39 +01:00
Markus Heiser 02391cc892 [build] /static 2021-11-23 15:28:26 +01:00
Markus Heiser f57a9f425d [simple template] format default string 'italic' 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-23 15:28:08 +01:00
Markus Heiser fbd8afb93d Merge pull request #536 from return42/jinja2-mode.el 
[emacs] .dir-locals.el: use jinja2-mode to format html files
 2021-11-23 14:05:01 +01:00
Markus Heiser 611f145a4a [emacs] .dir-locals.el: use jinja2-mode to format html files 
The jinja2-mode [1] can be installed from melpa [2]::

    M-x package-install / jinja2-mode

[1] https://github.com/paradoxxxzero/jinja2-mode
[2] https://melpa.org/#/jinja2-mode

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-23 13:56:31 +01:00
Markus Heiser 0e27578e35 Merge pull request #527 from dalf/fix-simple-modal 
[fix] simple theme: fix modal dialog
 2021-11-23 12:44:49 +01:00
Markus Heiser 339838f9f5 [build] /static 2021-11-23 12:37:43 +01:00
Markus Heiser ef3f084c49 Merge pull request #516 from return42/searxng/filtron 
[mod] filtron.sh - install github.com/searxng/filtron
 2021-11-23 00:23:23 +01:00
Markus Heiser deca799e9f Merge pull request #529 from return42/nvm-improve 
Various improvements of the NVM environment
 2021-11-21 23:49:05 +01:00
Markus Heiser 93e933278a [fix] filtron.sh & morty.sh: quote "$GO_ENV" 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-21 17:13:34 +01:00
Markus Heiser ac5cce69cc [doc] filtron.sh - install github.com/searxng/filtron 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-21 17:13:34 +01:00
Markus Heiser c1bee0d96f [mod] filtron.sh - install github.com/searxng/filtron 
SearXNG maintains a fork of filtron at [1]

[1] https://github.com/searxng/filtron

Related: https://github.com/searxng/searxng/issues/507#issuecomment-970254027
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-21 17:13:34 +01:00
Markus Heiser d51298177a Merge pull request #528 from return42/brand 
[brand] initial - folder src/brand for searxng-wordmark
 2021-11-21 11:46:24 +01:00
Markus Heiser 5b28c9109f [fix] google images: @href index 0 not found 
Sometimes there is no href in the `<a ..>` tag of a *link_node* [1].

[1] https://github.com/searxng/searxng/issues/532

Reported-by: @TheEssem
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-21 09:55:59 +01:00
Markus Heiser 5242a841a5 [mod] NVM: dev-tools pre-installed in NVM's node installation 
The Node.js installation in the NVM environment can be used by IDEs and other
developer tasks.  The required developer packagaes are added to the file
./.nvm_packages and will be installed when Node.js is installed.  Initial we
start with:

- eslint

Having a dedicated developer enviroment, provided by nvm makes it easy to
integrate Node.js packages into various IDEs.  One example is shown in the
.dir-locals.el which is used by emacs.

[1] https://github.com/nvm-sh/nvm#default-global-packages-from-file-while-installing
[2] https://eslint.org

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 17:08:22 +01:00
Markus Heiser 69dd025da9 [mod] nvm.cmd ... : run command ... in NVM environment 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 15:40:18 +01:00
Markus Heiser 61af147849 [emacs] use NVM environment installed at nvm-dir <repo>/.nvm 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 15:21:35 +01:00
Markus Heiser 6b4cad768d [mod] NVM: pin Node.js to v16.13.0 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 15:19:17 +01:00
Markus Heiser 3e2f3900b8 [fix] nvm.install: add missing popd / node.env exit with error (254) 
Issue::

    $ make clean node.env
    ...
    CLEAN     [NVM] drop .nvm/
    ...
    INFO:  install Node.js by NVM
    ...
    Now using node v16.13.0 (npm v8.1.0)
    ...
    INSTALL   searx/static/themes/oscar/package.json
    npm ERR! code ENOENT
    npm ERR! syscall open
        # Here now comes the issue, caused by the missing 'popd' ..
    npm ERR! path SearXNG/.nvm/searx/static/themes/oscar/package.json
    npm ERR! errno -2
    npm ERR! enoent ENOENT: no such file or directory, open 'SearXNG/.nvm/searx/static/themes/oscar/package.json'
    ERROR: node.env exit with error (254)
    make: *** [Makefile:99: node.env] Error 254

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 15:16:14 +01:00
Markus Heiser 1c8b731791 Merge pull request #526 from dalf/fix-npm 
[fix] npm engine: don't ignore the first result
 2021-11-20 12:16:17 +01:00
Markus Heiser 4330d7cf5d [mod] gruntfile.js - define grunt.template _brand & _templates 
[1] https://gruntjs.com/api/grunt.template

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 10:49:21 +01:00
Markus Heiser c68c53acd8 [brand] initial - folder src/brand for searxng-wordmark 
Folder src/brand is intended to place logo, wordmark and more in.  This commit
moves the origin (source) of searxng-wordmark.svg from the simple theme into
this folder

About the new created src/ folder:

On the long term we can move all the files from static/themes/<name>/src/* into
a src/themes/<name>/* folder.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-20 10:14:55 +01:00
Markus Heiser 256ccc4a55 Merge pull request #524 from return42/fix-digg 
[drop] engine digg - https://digg.com/api is no longer available
 2021-11-19 16:27:36 +01:00
Markus Heiser 86090e13d3 [mod] enable reddit - to have at least one in category social-media 
Since digg no longer works, we do nat have a active engine in the social-media
category.  Enable reddit by default to have at least one engine back in this
category.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-19 15:06:42 +01:00
Markus Heiser 4c82ac7670 [drop] engine digg - https://digg.com/api is no longer available 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-19 15:00:22 +01:00
Markus Heiser 2cc40ea06e Merge pull request #522 from return42/fix-master 
[fix] brand - partial revert of e82e37ce6
 2021-11-19 14:06:18 +01:00
Markus Heiser c681570bb9 [fix] brand - partial revert of e82e37ce6 
In commit e82e37ce6 accidentally the brand file was touched / partial
revert::

  export GIT_URL='https://github.com/searxng/searxng'
  export GIT_BRANCH='master'

Related: https://github.com/searxng/searxng/pull/515

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-19 14:01:58 +01:00
Markus Heiser 95c296646c Merge pull request #520 from return42/fix-genesis-http 
[fix] enigne library genesis - remove 'enable_http: true'
 2021-11-19 13:47:59 +01:00
Markus Heiser be793f7612 Merge pull request #519 from return42/fix-make-clean 
[fix] make nvm.clean - don't raise error when NVM is not installed
 2021-11-19 13:28:51 +01:00
Markus Heiser 4c2df9358a [fix] enigne library genesis - remove 'enable_http: true' 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-19 13:25:08 +01:00
Markus Heiser 48752815ed [fix] make nvm.clean - don't raise error when NVM is not installed 
Issue was::

    $ LANG=C make nvm.clean
    INFO:  NVM is not installed
    make: *** [Makefile:99: nvm.clean] Error 42

Now::

    $ LANG=C make nvm.clean
    CLEAN     [NVM] not installed

BTW: change info_msg to build_msg

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-19 13:19:54 +01:00
Markus Heiser e82e37ce6d Merge pull request #515 from return42/doc-theme 
Various modification of the documentation and the theme sphinx-theme
 2021-11-19 11:46:29 +01:00