From 790414bced8e07bee95af1e7e6a1afd2e32ada8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mo=C3=AFse=20KM?= Date: Thu, 6 Apr 2023 04:13:51 -0400 Subject: [PATCH] Complete initial branding work --- README.rst | 3 + searx/infopage/__init__.py | 3 +- searx/infopage/en/about.md | 23 +- searx/infopage/en/donate.md | 40 ++ searx/infopage/en/privacy-policy.md | 45 ++ searx/infopage/en/search-syntax.md | 6 +- searx/settings.yml | 12 +- searx/static/themes/simple/css/custom.css | 400 +++++++++++++++++- searx/templates/simple/base.html | 45 +- .../templates/simple/messages/no_results.html | 2 +- searx/templates/simple/page_with_header.html | 4 +- searx/templates/simple/preferences.html | 12 +- searx/templates/simple/results.html | 9 +- searx/templates/simple/search.html | 5 +- utils/brand.env | 4 +- 15 files changed, 559 insertions(+), 54 deletions(-) create mode 100644 searx/infopage/en/donate.md create mode 100644 searx/infopage/en/privacy-policy.md diff --git a/README.rst b/README.rst index 4365c4491..c459457a4 100644 --- a/README.rst +++ b/README.rst @@ -148,6 +148,9 @@ Help translate SearXNG at `Weblate`_ Donations ========= +Support the Fufusoup project by clicking the donation page: +https://www.buymeacoffee.com/mkmtechnology + Support the SearXNG project by clicking the donation page: https://docs.searxng.org/donate.html diff --git a/searx/infopage/__init__.py b/searx/infopage/__init__.py index 6b8fd9133..6f1d14332 100644 --- a/searx/infopage/__init__.py +++ b/searx/infopage/__init__.py @@ -134,7 +134,8 @@ class InfoPageSet: # pylint: disable=too-few-public-methods self.toc: typing.List[str] = [ 'search-syntax', 'about', - 'donate', + 'privacy-policy', + 'donate' ] """list of articles in the online documentation""" diff --git a/searx/infopage/en/about.md b/searx/infopage/en/about.md index b868813a3..48bbd814f 100644 --- a/searx/infopage/en/about.md +++ b/searx/infopage/en/about.md @@ -1,13 +1,12 @@ -# About SearXNG +# About Fufusoup -SearXNG is a [metasearch engine], aggregating the results of other -{{link('search engines', 'preferences')}} while not storing information about -its users. +Fufusoup is a privacy-respecting open source metasearch engine based on [SearXNG], built, deployed, and operated by [Moïse KM]. It aggregates the results of other search engines while not storing information about +its users. ([Fufusoup Source Code]) -The SearXNG project is driven by an open community, come join us on Matrix if +SearXNG is project driven by an open community, come join us on Matrix if you have questions or just want to chat about SearXNG at [#searxng:matrix.org] -Make SearXNG better. +Make Fufusoup and SearXNG better. - You can improve SearXNG translations at [Weblate], or... - Track development, send contributions, and report issues at [SearXNG sources]. @@ -16,15 +15,15 @@ Make SearXNG better. ## Why use it? -- SearXNG may not offer you as personalized results as Google, but it doesn't +- Fufusoup may not offer you as personalized results as Google, but it doesn't generate a profile about you. -- SearXNG doesn't care about what you search for, never shares anything with a +- Fufusoup doesn't care about what you search for, never shares anything with a third-party, and it can't be used to compromise you. -- SearXNG is free software, the code is 100% open, and everyone is welcome to +- Fufusoup is free software, the code is 100% open, and everyone is welcome to make it better. If you do care about privacy, want to be a conscious user, or otherwise believe -in digital freedom, make SearXNG your default search engine or run it on your +in digital freedom, make Fufusou or SearXNG your default search engine or run it on your own server! ## How do I set it as the default search engine? @@ -66,6 +65,7 @@ reclaim their privacy and make the internet freer. The more decentralized the internet is, the more freedom we have! + [SearXNG sources]: {{GIT_URL}} [#searxng:matrix.org]: https://matrix.to/#/#searxng:matrix.org [SearXNG docs]: {{get_setting('brand.docs_url')}} @@ -77,3 +77,6 @@ internet is, the more freedom we have! [Firefox]: https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox [Microsoft Edge]: https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine [Chromium]: https://www.chromium.org/tab-to-search +[SearXNG]: https://github.com/searxng/searxng/ +[Moïse KM]: https://mkm.technology/ +[Fufusoup Source Code]: https://github.com/mkmtech7/fufusoup/ diff --git a/searx/infopage/en/donate.md b/searx/infopage/en/donate.md new file mode 100644 index 000000000..67a96dc37 --- /dev/null +++ b/searx/infopage/en/donate.md @@ -0,0 +1,40 @@ +# Donate + +Fufusoup is a privacy-respecting open source metasearch engine based on [SearXNG], built, deployed, and operated by [Moïse KM]. It aggregates the results of other search engines while not storing information about +its users. ([Fufusoup Source Code]). If you would like to support the work and the resources behind Fufusoup and SearXNG with donations please read below. + +## Donate to Fufusoup + +You can donate to Fufusoup to support [Moïse KM] with all the work and IT ressources required to build, improve, maintain, and operate the metasearch engine. +
+
+https://www.buymeacoffee.com/mkmtechnology. +
+ +## Donate to SearXNG + +You can also donate to the wider SearXNG community to support all the the developers, engineers, designers, writers, and more, that contribute to the SearXNG source code. Please find the link to donate below: +
+
+https://docs.searxng.org/donate.html. +
+ +Thank you! + + + + +[SearXNG sources]: {{GIT_URL}} +[#searxng:matrix.org]: https://matrix.to/#/#searxng:matrix.org +[SearXNG docs]: {{get_setting('brand.docs_url')}} +[searx]: https://github.com/searx/searx +[metasearch engine]: https://en.wikipedia.org/wiki/Metasearch_engine +[Weblate]: https://translate.codeberg.org/projects/searxng/ +[Seeks project]: https://beniz.github.io/seeks/ +[OpenSearch]: https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md +[Firefox]: https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox +[Microsoft Edge]: https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine +[Chromium]: https://www.chromium.org/tab-to-search +[SearXNG]: https://github.com/searxng/searxng/ +[Moïse KM]: https://mkm.technology/ +[Fufusoup Source Code]: https://github.com/mkmtech7/fufusoup/ diff --git a/searx/infopage/en/privacy-policy.md b/searx/infopage/en/privacy-policy.md new file mode 100644 index 000000000..7b6f741dd --- /dev/null +++ b/searx/infopage/en/privacy-policy.md @@ -0,0 +1,45 @@ +# Privacy Policy + +Last updated: April 7, 2023 + +## Who we are + +This web application/site is owned and operated by Moïse KM. To learn more about Fufusoup visit the {{link('about', 'about')}} page. + +## Data + +This web application has a built-in rate limiter plugin that will collect your IP address in a one-way hashed format. One-Way Hashing Format is a one-way encryption method that allows data to be encrypted, but not decrypted. This means that the application does not collect or store your real IP address, but only a one-way encrypted version of it so that it can detect IP addresses that behave maliciously and rate limit connections from them. Furthermore, the hashed IP addresses are stored in memory only, and are not used for any other purpose than rate limiting. A single hashed IP address is stored for a maximum of 10 minutes after the last request from it. + +## Cookies + +No cookies are used on this web application/site. However, your browser’s local storage is used to save your color scheme preference if you ever change it manually. Fufusoup can optionally use cookies to store settings if you choose to change them from the default {{link('settings/preferences', 'preferences')}}. Your {{link('settings/preferences', 'preferences')}} can alternatively be stored in a custom URL instead. + + +## Embedded third party content + +Currently no third party content is embedded on this web application/site. + +## Analytics + +No analytics are used on this site. Fufusoup measures aggregate statistics on how upstream search engines perform, but this does not include any user data. + +## Changes to this privacy policy + +I reserve the right to update this privacy policy from time to time. I constantly keep it up to date with the latest changes. If this policy is changed substantially, I will put a clear notice on the front page for at least 7 days. + + + +[SearXNG sources]: {{GIT_URL}} +[#searxng:matrix.org]: https://matrix.to/#/#searxng:matrix.org +[SearXNG docs]: {{get_setting('brand.docs_url')}} +[searx]: https://github.com/searx/searx +[metasearch engine]: https://en.wikipedia.org/wiki/Metasearch_engine +[Weblate]: https://translate.codeberg.org/projects/searxng/ +[Seeks project]: https://beniz.github.io/seeks/ +[OpenSearch]: https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md +[Firefox]: https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox +[Microsoft Edge]: https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine +[Chromium]: https://www.chromium.org/tab-to-search +[SearXNG]: https://github.com/searxng/searxng/ +[Moïse KM]: https://mkm.technology/ +[Fufusoup Source Code]: https://github.com/mkmtech7/fufusoup/ diff --git a/searx/infopage/en/search-syntax.md b/searx/infopage/en/search-syntax.md index 99e1e5fd8..b90ffde98 100644 --- a/searx/infopage/en/search-syntax.md +++ b/searx/infopage/en/search-syntax.md @@ -1,6 +1,6 @@ # Search syntax -SearXNG comes with a search syntax by with you can modify the categories, +Fufusoup comes with a search syntax by with you can modify the categories, engines, languages and more. See the {{link('preferences', 'preferences')}} for the list of engines, categories and languages. @@ -35,7 +35,7 @@ To select language filter use a `:` prefix. To give an example: ## `!!` external bangs -SearXNG supports the external bangs from [DuckDuckGo]. To directly jump to a +Fufusoup supports the external bangs from [DuckDuckGo]. To directly jump to a external search page use the `!!` prefix. To give an example: - search Wikipedia by a custom language @@ -43,7 +43,7 @@ external search page use the `!!` prefix. To give an example: - {{search('!!wfr Wau Holland')}} Please note, your search will be performed directly in the external search -engine, SearXNG cannot protect your privacy on this. +engine, Fufusoup cannot protect your privacy on this. [DuckDuckGo]: https://duckduckgo.com/bang diff --git a/searx/settings.yml b/searx/settings.yml index 841457b5e..35bfe0796 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -2,7 +2,7 @@ general: # Debug mode, only for development. Is overwritten by ${SEARXNG_DEBUG} debug: false # displayed name - instance_name: "SearXNG" + instance_name: "Fufusoup" # For example: https://example.com/privacy privacypolicy_url: false # use true to use your own donation page written in searx/info/en/donate.md @@ -26,7 +26,7 @@ search: # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "yandex", # "seznam", "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off # by default. - autocomplete: "" + autocomplete: "google" # minimun characters to type before autocompleter starts autocomplete_min: 4 # Default search language - leave blank to detect from browser information or @@ -72,20 +72,20 @@ server: bind_address: "127.0.0.1" # public URL of the instance, to ensure correct inbound links. Is overwritten # by ${SEARXNG_URL}. - base_url: false # "http://example.com/location" + base_url: https://fufusoup.com # "http://example.com/location" default: false limiter: false # rate limit the number of request on the instance, block some bots # If your instance owns a /etc/searxng/settings.yml file, then set the following # values there. - secret_key: "ultrasecretkey" # Is overwritten by ${SEARXNG_SECRET} + secret_key: "3wsiIsksH7BsOwUxa9" # Is overwritten by ${SEARXNG_SECRET} # Proxying image results through searx image_proxy: false # 1.0 and 1.1 are supported http_protocol_version: "1.0" # POST queries are more secure as they don't show up in history but may cause # problems when using Firefox containers - method: "POST" + method: "GET" default_http_headers: X-Content-Type-Options: nosniff X-XSS-Protection: 1; mode=block @@ -106,7 +106,7 @@ ui: templates_path: "" # query_in_title: When true, the result page's titles contains the query # it decreases the privacy, since the browser can records the page titles. - query_in_title: false + query_in_title: true # infinite_scroll: When true, automatically loads the next page when scrolling to bottom of the current page. infinite_scroll: false # ui theme diff --git a/searx/static/themes/simple/css/custom.css b/searx/static/themes/simple/css/custom.css index d22969837..211d2db35 100644 --- a/searx/static/themes/simple/css/custom.css +++ b/searx/static/themes/simple/css/custom.css @@ -1,4 +1,402 @@ +.result .content, .result .stat, #sidebar .infobox, #infoboxes .infobox .url a, #suggestions input[type=submit], p { + font-size: 1em; +} + +footer p { + font-size: 95%; +} + +small { + font-size: 90%; +} + .theme-light { - background-color: azure !important; + background-color: rgb(245, 245, 245) !important; +} + +footer, #search_header { + background-color: transparent !important; +} + + + + +@media screen and (min-width: 50em) and (max-width: 79.75em) { + .center-aligment-no #links_on_top span { + display: inherit !important; + } +} + +@media screen and (max-width: 50em) { + #links_on_top span { + display: inherit !important; + } +} + + +@media screen and (max-width: 50em) { + #main_index #links_on_top { + top: 1rem; + right: 1rem; + } +} + +@media screen and (max-width: 79.75em) { + #main_index { + margin-top: 17em !important; + } +} + +@media screen and (max-width: 50em) { + .search_box { + width: 40rem; + display: flex; + margin: 0 auto; + } +} + +@media screen and (max-width: 42em) { + .search_box { + width: 35rem; + display: flex; + margin: 0 auto; + } +} + +@media screen and (max-width: 34em) { + .search_box { + width: 30rem; + display: flex; + margin: 0 auto; + } +} + +@media screen and (max-width: 29em) { + .search_box { + width: 95%; + display: flex; + margin: 0 auto; + } +} + + +@media screen and (min-width: 0em) and (max-width: 79.75em) { + #search_logo { + display: none !important; + } +} + +.search_filters { + padding-left: 0.3rem; +} + + +#result_count { + padding-top: 0 !important; + padding-bottom: 1.1rem !important; + padding-left: 1.1rem; +} + +#results { + margin-top: 0.2rem; + margin-right: 2rem; + margin-bottom: 0; + margin-left: 10rem; + display: grid; + grid-template-columns: 45rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: + "corrections sidebar" + "answers sidebar" + "urls sidebar" + "pagination sidebar"; +} + +#pagination { + margin-top: 2rem; +} + +@media screen and (min-width: 71em) and (max-width: 79.75em) { + + .center-aligment-no #main_results div#results.only_template_default { + margin: inherit; + margin-left: 2.7rem; + margin-right: 1rem; + justify-content:flex-start; + display: grid; + grid-template-columns: 45rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: + "corrections sidebar" + "answers sidebar" + "urls sidebar" + "pagination sidebar"; + } + +} +@media screen and (min-width: 65em) and (max-width: 71em) { + + .center-aligment-no #main_results div#results.only_template_default { + margin: inherit; + margin-left: 2.7rem; + margin-right: 1rem; + justify-content:flex-start; + display: grid; + grid-template-columns: 41rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: + "corrections sidebar" + "answers sidebar" + "urls sidebar" + "pagination sidebar"; + } + +} +@media screen and (min-width: 60em) and (max-width: 65em) { + + .center-aligment-no #main_results div#results.only_template_default { + margin: inherit; + margin-left: 2.7rem; + margin-right: 1rem; + justify-content:flex-start; + display: grid; + grid-template-columns: 37rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: + "corrections sidebar" + "answers sidebar" + "urls sidebar" + "pagination sidebar"; + } + +} +@media screen and (min-width: 50em) and (max-width: 60em) { + + #main_results .link_on_top_about, #main_results .link_on_top_donate { + display: none !important; + } + + .center-aligment-no #main_results div#results.only_template_default { + margin: 0 auto 0 auto; + padding-left: 3.8rem; + justify-content:stretch; + display: grid; + grid-template-columns: 45rem; + grid-template-rows: min-content min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: + "corrections" + "answers" + "sidebar" + "urls" + "pagination"; + } + + #results.only_template_default { + margin-top: 1rem; + margin-right: 0; + margin-bottom: 0; + } + + .only_template_default .result { + padding-left: 0; + } + + #result_count { + padding-top: 0 !important; + padding-bottom: 1rem !important; + padding-left: 0; + } + + #infoboxes { + margin-top: 0.7rem !important; + } + +} +@media screen and (max-width: 50em) { + + #search_header { + padding-top: 0.5rem; + } + + #main_results #search_view { + grid-area:initial; + padding-left: 1rem; + } + + #main_results .search_box { + margin: 0; + } + + #links_on_top a { + padding-top: 0.5rem; + } + + #search_logo { + display: none; + } + + .search_filters { + margin-left: 0.4rem; + } + + #results { + margin-top: 0.2rem !important; + } + + #result_count { + padding-top: 0 !important; + padding-bottom: 0.5rem !important; + padding-left: 0.9rem; + } + + #infoboxes { + margin-top: 0.7rem !important; + } + + #sidebar { + margin-bottom: 1rem; + } + +} +@media screen and (max-width: 40em) { + + #main_results .search_box { + width: 35rem; + margin: 0; + } +} +@media screen and (max-width: 35.5em) { + + #main_results .search_box { + width: 32rem; + margin: 0; + } +} + +@media screen and (max-width: 32.5em) { + + #main_results .search_box { + width: 29rem; + margin: 0; + } +} + +@media screen and (max-width: 30em) { + + #main_results .search_box { + width: 27rem; + margin: 0; + } +} + +@media screen and (max-width: 28em) { + + #main_results .search_box { + width: 25rem; + margin: 0; + } +} + +@media screen and (max-width: 26em) { + + #main_results .search_box { + width: 23rem; + margin: 0; + } +} + +@media screen and (max-width: 24em) { + + #main_results .search_box { + width: 21rem; + margin: 0; + } +} + +@media screen and (max-width: 22.5em) { + + #main_results .search_box { + width: 19rem; + margin: 0; + } +} + +@media screen and (max-width: 21em) { + + #main_results .search_box { + width: 17rem; + margin: 0; + } +} + +@media screen and (max-width: 19em) { + + #main_results .search_box { + width: 16rem; + margin: 0; + } +} + +@media screen and (max-width: 18em) { + + #main_results .search_box { + width: 14rem; + margin: 0; + } +} + +@media screen and (max-width: 17em) { + + #main_results .search_box { + width: 13rem; + margin: 0; + } +} + +@media screen and (max-width: 16em) { + + #main_results .search_box { + width: 12rem; + margin: 0; + } +} + + +#sidebar { + grid-area: sidebar; + word-wrap: break-word; + color: var(--color-sidebar-font); +} + + +@media screen and (min-width: 50em) and (max-width: 79.75em) { + .center-aligment-no #sidebar { + margin: initial !important; + padding: initial !important; + float: initial !important; + border: initial !important; + width: initial !important; + } +} + +@media screen and (min-width: 49.99em) and (max-width: 49.99em) { + .center-aligment-no #sidebar { + margin: 0 0.5rem 0.125rem 0.5rem; + padding: 0; + float: none; + border: none; + width: auto; + } +} + + + +.tabs { + } \ No newline at end of file diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index 30d228c10..bf4c12524 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -2,8 +2,8 @@ - - + + @@ -17,6 +17,7 @@ {% else %} {% endif %} + {% block styles %}{% endblock %} @@ -24,8 +25,8 @@ {% block head %} {% endblock %} - - + +
@@ -43,15 +44,15 @@ {% block header %} @@ -61,20 +62,30 @@
diff --git a/searx/templates/simple/messages/no_results.html b/searx/templates/simple/messages/no_results.html index 7bb708b8c..1ae4e618c 100644 --- a/searx/templates/simple/messages/no_results.html +++ b/searx/templates/simple/messages/no_results.html @@ -12,7 +12,7 @@ ){{- '' -}}

{%- endfor %} -

{{ _('Please, try again later or find another SearXNG instance.') }} ({{ _('Public instances') }})

+

{{ _('Please, try again later or find another Fufusoup/SearXNG instance.') }} ({{ _('Public instances') }})

{% else %} diff --git a/searx/templates/simple/page_with_header.html b/searx/templates/simple/page_with_header.html index d4466b612..327b3a4f6 100644 --- a/searx/templates/simple/page_with_header.html +++ b/searx/templates/simple/page_with_header.html @@ -1,5 +1,7 @@ {% set body_class = "page_with_header" %} {% extends "simple/base.html" %} {% block header %} - + + Fufusoup {% endblock %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 9626b04d4..ba53906e1 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -123,7 +123,7 @@ {{- '' -}}

- {{- _('What language do you prefer for search?') }} {{ _('Choose Auto-detect to let SearXNG detect the language of your query.') -}} + {{- _('What language do you prefer for search?') }} {{ _('Choose Auto-detect to let Fufusoup detect the language of your query.') -}}
{% endif %} @@ -203,7 +203,7 @@ {%- endfor -%}

-
{{ _('Change SearXNG layout') }}
+
{{ _('Change Fufusoup layout') }}
{{ _('Theme style') }} @@ -276,7 +276,7 @@

-
{{ _('Proxying image results through SearXNG') }}
+
{{ _('Proxying image results through Fufusoup') }}
{% endif %} {% if 'query_in_title' not in locked_preferences %} @@ -365,7 +365,7 @@ {{ _('Examples') }} - {{ _("This is the list of SearXNG's instant answering modules.") }} + {{ _("This is the list of Fufusoup's instant answering modules.") }} {% for answerer in answerers %} @@ -395,8 +395,8 @@ {{ tab_header('maintab', 'cookies', _('Cookies')) }}

{{- "" -}} - {{- _('This is the list of cookies and their values SearXNG is storing on your computer.') }}
{{- "" -}} - {{- _('With that list, you can assess SearXNG transparency.') }}
{{- "" -}} + {{- _('This is the list of cookies and their values Fufusoup is storing on your computer.') }}
{{- "" -}} + {{- _('With that list, you can assess Fufusoup transparency.') }}
{{- "" -}}

{% if cookies %} diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index f73a25d09..23a862281 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -19,6 +19,11 @@ {% endif %}
+ + {% if number_of_results != '0' -%} +
{{ _('Number of results') }}: {{ number_of_results }}
+ {%- endif %} + {% if answers -%}