Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ede69396 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch '60-rename-theme' into 'master' 

Renaming theme, folder name and templates

Closes #60

See merge request e/cloud/my-spot!64
parents dfc5b6c3 b4f58da3

.env

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ SEARX_MORTY_URL=https://localhost:8089 
SEARX_SECRET=":@)%NN0+OqNdy:{prWQlZ{p9|oO9p-UyJq@%V!~G:arrSx6fXz.{jd%=XF44ncj"

SEARX_SECRET=":@)%NN0+OqNdy:{prWQlZ{p9|oO9p-UyJq@%V!~G:arrSx6fXz.{jd%=XF44ncj"

SEARX_MORTY_KEY="taKB1WGTa63LEI6RdjWWKshS4oYSHQWGu9Eyjr1OlpQ="

SEARX_MORTY_KEY="taKB1WGTa63LEI6RdjWWKshS4oYSHQWGu9Eyjr1OlpQ="

SEARX_REDIS_HOST=redis

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=eelo

SEARX_UI_DEFAULT_THEME=etheme

SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150

SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150

SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150

SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150

FILTRON_PORT=8088

FILTRON_PORT=8088

.env.prod

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ SEARX_MORTY_URL=https://localhost:8089 
SEARX_SECRET="SECRET2BEREPLACED"

SEARX_SECRET="SECRET2BEREPLACED"

SEARX_MORTY_KEY="KEY2BEREPLACED"

SEARX_MORTY_KEY="KEY2BEREPLACED"

SEARX_REDIS_HOST=redis

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=eelo

SEARX_UI_DEFAULT_THEME=etheme

SEARX_PROXY_HTTP=http://proxy01.ecloud.global:1099

SEARX_PROXY_HTTP=http://proxy01.ecloud.global:1099

SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099

SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099

WIREGUARD_IP=127.0.0.1 

WIREGUARD_IP=127.0.0.1

.gitlab-ci.yml

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ build:web: 
    - ./manage.sh update_dev_packages

    - ./manage.sh update_dev_packages

  script:

  script:

    - ./manage.sh locales

    - ./manage.sh locales

    - make V=1 themes.eelo

    - make V=1 themes.etheme





.build:docker:

.build:docker:

  stage: build

  stage: build

Makefile

+7 −7
Original line number Original line Diff line number Diff line
@@ -121,14 +121,14 @@ node.clean: 
	  ./searx/static/themes/oscar/node_modules \

	  ./searx/static/themes/oscar/node_modules \

	  ./searx/static/themes/simple/package-lock.json \

	  ./searx/static/themes/simple/package-lock.json \

	  ./searx/static/themes/simple/node_modules \

	  ./searx/static/themes/simple/node_modules \

	  ./searx/static/themes/eelo/package-lock.json \

	  ./searx/static/themes/etheme/package-lock.json \

	  ./searx/static/themes/eelo/node_modules

	  ./searx/static/themes/etheme/node_modules





# build themes

# build themes

# ------------

# ------------





PHONY += themes themes.oscar themes.simple themes.eelo

PHONY += themes themes.oscar themes.simple themes.etheme

themes: buildenv themes.oscar themes.simple themes.eelo

themes: buildenv themes.oscar themes.simple themes.etheme





quiet_cmd_lessc = LESSC     $3

quiet_cmd_lessc = LESSC     $3

      cmd_lessc = PATH="$$(npm bin):$$PATH" \

      cmd_lessc = PATH="$$(npm bin):$$PATH" \
@@ -146,9 +146,9 @@ themes.simple: node.env 
	$(Q)echo '[!] build simple theme'

	$(Q)echo '[!] build simple theme'

	$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)

	$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)





themes.eelo: node.env

themes.etheme: node.env

	$(Q)echo '[!] build eelo theme'

	$(Q)echo '[!] build etheme theme'

	$(call cmd,grunt,searx/static/themes/eelo/gruntfile.js)

	$(call cmd,grunt,searx/static/themes/etheme/gruntfile.js)





# docker

# docker

# ------

# ------

README.md

+2 −2
Original line number Original line Diff line number Diff line 
# spot for [/e/](https://e.foundation)

# spot for [/e/](https://e.foundation)





![logo](searx/static/themes/eelo/img/favicon.png)

![logo](searx/static/themes/etheme/img/favicon.png)





A privacy-respecting, hackable [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine).

A privacy-respecting, hackable [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine).
@@ -8,7 +8,7 @@ Spot was forked from searx: read [documentation](https://asciimoo.github.io/sear 




## Changes between Spot and Searx

## Changes between Spot and Searx





* eelo theme

* /e/ theme

* redis cache on http requests (TTL 1 day)

* redis cache on http requests (TTL 1 day)

* docker packaging thinking to be production ready

* docker packaging thinking to be production ready