From 411357c5b6ea6d51b106a1421e5c97bb217daa22 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 15:55:41 +0100
Subject: [PATCH 01/11] :sparkles: Adds web search functionality

---
 src/components/Settings/SearchBar.vue | 41 +++++++++++++++++++++++++--
 src/utils/defaults.js                 | 29 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue
index a78976c6..8fbf4877 100644
--- a/src/components/Settings/SearchBar.vue
+++ b/src/components/Settings/SearchBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <form>
+  <form @submit.prevent="searchSubmitted">
     <label for="filter-tiles">{{ $t('search.search-label') }}</label>
     <input
       id="filter-tiles"
@@ -16,12 +16,15 @@
 </template>
 
 <script>
-
+import router from '@/router';
 import ArrowKeyNavigation from '@/utils/ArrowKeyNavigation';
+import ErrorHandler from '@/utils/ErrorHandler';
 import { getCustomKeyShortcuts } from '@/utils/ConfigHelpers';
+import { searchEngineUrls, defaultSearchEngine, defaultSearchOpeningMethod } from '@/utils/defaults';
 
 export default {
   name: 'FilterTile',
+  inject: ['config'],
   props: {
     active: Boolean,
   },
@@ -74,6 +77,40 @@ export default {
         }
       });
     },
+    launchWebSearch(url, method) {
+      switch (method) {
+        case 'newtab':
+          window.open(url, '_blank');
+          break;
+        case 'sametab':
+          window.open(url, '_self');
+          break;
+        case 'workspace':
+          router.push({ name: 'workspace', query: { url } });
+          break;
+        default:
+          ErrorHandler(`Unknown opening method: ${method}`);
+          window.open(url, '_blank');
+      }
+    },
+    searchSubmitted() {
+      // Get search preferences from appConfig
+      const { appConfig } = this.config;
+      const searchPrefs = appConfig.webSearch || {};
+      if (!searchPrefs.disableWebSearch) { // Only proceed if user hasn't disabled web search
+        const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
+        // Get search engine, and make URL
+        const searchEngine = searchPrefs.searchEngine || defaultSearchEngine;
+        let searchUrl = searchEngineUrls[searchEngine];
+        if (!searchUrl) ErrorHandler(`Search engine not found - ${searchEngine}`);
+        if (searchEngine === 'custom' && searchPrefs.customSearchEngine) {
+          searchUrl = searchPrefs.customSearchEngine;
+        }
+        // Append users encoded query onto search URL, and launch
+        searchUrl += encodeURIComponent(this.input);
+        this.launchWebSearch(searchUrl, openingMethod);
+      }
+    },
   },
 };
 </script>
diff --git a/src/utils/defaults.js b/src/utils/defaults.js
index 10d18ad1..6ceb0a41 100644
--- a/src/utils/defaults.js
+++ b/src/utils/defaults.js
@@ -152,6 +152,35 @@ module.exports = {
     localPath: '/item-icons',
     faviconName: 'favicon.ico',
   },
+  /* URLs for web search engines */
+  searchEngineUrls: {
+    // Common
+    duckduckgo: 'https://duckduckgo.com/?q=',
+    google: 'https://google.com/search?q=',
+    whoogle: 'https://whoogle.sdf.org/search?q=',
+    qwant: 'https://www.qwant.com/?q=',
+    startpage: 'https://www.startpage.com/do/search?query=',
+    // Niche
+    'searx-bar': 'https://searx.bar/search?q=',
+    'searx-info': 'https://searx.info/search?q=',
+    'searx-tiekoetter': 'https://searx.tiekoetter.com/search?q=',
+    'searx-bissisoft': 'https://searx.bissisoft.com/search?q=',
+    ecosia: 'https://www.ecosia.org/search?q=',
+    metager: 'https://metager.org/meta/meta.ger3?eingabe=',
+    swisscows: 'https://swisscows.com/web?query=',
+    mojeek: 'https://www.mojeek.com/search?q=',
+    peekier: 'https://peekier.com/#!',
+    // Specific
+    wikipedia: 'https://en.wikipedia.org/w/?search=',
+    stackoverflow: 'https://stackoverflow.com/search?q=',
+    wolframalpha: 'https://www.wolframalpha.com/input/?i=',
+    reddit: 'https://www.reddit.com/search/?q=',
+    youtube: 'https://youtube.com/results?q=',
+    github: 'https://github.com/search?q=',
+    bbc: 'https://www.bbc.co.uk/search?q=',
+  },
+  defaultSearchEngine: 'duckduckgo',
+  defaultSearchOpeningMethod: 'newtab',
   /* Available built-in colors for the theme builder */
   swatches: [
     ['#eb5cad', '#985ceb', '#5346f3', '#5c90eb'],

From 438693c8db1c7ee5caf2bccd2fd7dfc22a9f1f5b Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 16:19:51 +0100
Subject: [PATCH 02/11] :sparkles: Adds web search to Minimal View

---
 src/components/MinimalView/MinimalSearch.vue | 91 +++++++++++++++++---
 1 file changed, 81 insertions(+), 10 deletions(-)

diff --git a/src/components/MinimalView/MinimalSearch.vue b/src/components/MinimalView/MinimalSearch.vue
index 1fae2a45..74c8311b 100644
--- a/src/components/MinimalView/MinimalSearch.vue
+++ b/src/components/MinimalView/MinimalSearch.vue
@@ -1,13 +1,19 @@
 <template>
-  <form>
-    <input
-      id="filter-tiles"
-      v-model="input"
-      ref="filter"
-      class="minimal-search"
-      :placeholder="$t('search.search-placeholder')"
-      v-on:input="userIsTypingSomething"
-      @keydown.esc="clearFilterInput" />
+  <form @submit.prevent="searchSubmitted">
+    <div class="minimal-search-wrap">
+      <input
+        id="filter-tiles"
+        v-model="input"
+        ref="filter"
+        class="minimal-search"
+        :placeholder="$t('search.search-placeholder')"
+        v-on:input="userIsTypingSomething"
+        @keydown.esc="clearFilterInput"
+      />
+      <p v-if="webSearchEnabled && input.length > 0" class="web-search-note">
+        {{ $t('search.enter-to-search-web') }}
+      </p>
+    </div>
       <i v-if="input.length > 0"
         class="clear-search"
         :title="$t('search.clear-search-tooltip')"
@@ -17,11 +23,19 @@
 
 <script>
 
+import router from '@/router';
 import ArrowKeyNavigation from '@/utils/ArrowKeyNavigation';
+import ErrorHandler from '@/utils/ErrorHandler';
 import { getCustomKeyShortcuts } from '@/utils/ConfigHelpers';
+import {
+  searchEngineUrls,
+  defaultSearchEngine,
+  defaultSearchOpeningMethod,
+} from '@/utils/defaults';
 
 export default {
   name: 'MinimalSearch',
+  inject: ['config'],
   props: {
     active: Boolean,
   },
@@ -32,6 +46,15 @@ export default {
       getCustomKeyShortcuts,
     };
   },
+  computed: {
+    webSearchEnabled() {
+      const { appConfig } = this.config;
+      if (appConfig && appConfig.webSearch) {
+        return !appConfig.webSearch.disableWebSearch;
+      }
+      return true;
+    },
+  },
   methods: {
     /* Emmits users's search term up to parent */
     userIsTypingSomething() {
@@ -44,6 +67,7 @@ export default {
       document.activeElement.blur(); // Remove focus
       this.akn.resetIndex(); // Reset current element index
     },
+    /* Launches a given app when hotkey pressed */
     handleHotKey(key) {
       const usersHotKeys = this.getCustomKeyShortcuts();
       usersHotKeys.forEach((hotkey) => {
@@ -52,6 +76,7 @@ export default {
         }
       });
     },
+    /* Filter results as user types */
     startFiltering(event) {
       const currentElem = document.activeElement.id;
       const { key, keyCode } = event;
@@ -72,6 +97,42 @@ export default {
         this.clearFilterInput();
       }
     },
+    /* Open web search results in users desired method */
+    launchWebSearch(url, method) {
+      switch (method) {
+        case 'newtab':
+          window.open(url, '_blank');
+          break;
+        case 'sametab':
+          window.open(url, '_self');
+          break;
+        case 'workspace':
+          router.push({ name: 'workspace', query: { url } });
+          break;
+        default:
+          ErrorHandler(`Unknown opening method: ${method}`);
+          window.open(url, '_blank');
+      }
+    },
+    /* If web search enabled, then launch search results when enter is pressed */
+    searchSubmitted() {
+      // Get search preferences from appConfig
+      const { appConfig } = this.config;
+      const searchPrefs = appConfig.webSearch || {};
+      if (this.webSearchEnabled) { // Only proceed if user hasn't disabled web search
+        const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
+        // Get search engine, and make URL
+        const searchEngine = searchPrefs.searchEngine || defaultSearchEngine;
+        let searchUrl = searchEngineUrls[searchEngine];
+        if (!searchUrl) ErrorHandler(`Search engine not found - ${searchEngine}`);
+        if (searchEngine === 'custom' && searchPrefs.customSearchEngine) {
+          searchUrl = searchPrefs.customSearchEngine;
+        }
+        // Append users encoded query onto search URL, and launch
+        searchUrl += encodeURIComponent(this.input);
+        this.launchWebSearch(searchUrl, openingMethod);
+      }
+    },
   },
   mounted() {
     window.addEventListener('keydown', this.startFiltering);
@@ -89,6 +150,17 @@ export default {
   form {
     display: flex;
     align-items: center;
+    .minimal-search-wrap {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      width: 100%;
+      p.web-search-note {
+        margin: 0;
+        color: var(--minimal-view-search-color);
+        opacity: var(--dimming-factor);
+      }
+    }
     input {
       display: inline-block;
       width: 80%;
@@ -107,7 +179,6 @@ export default {
       }
     }
     .clear-search {
-      //position: absolute;
       color: var(--minimal-view-search-color);
       padding: 0.15rem 0.5rem 0.2rem 0.5rem;
       font-style: normal;

From 30bb4fdf5f276b719e197059eabc5d3333c91d58 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 16:58:07 +0100
Subject: [PATCH 03/11] :globe_with_meridians: Adds note for web search

---
 src/assets/locales/en.json            |  3 +-
 src/components/Settings/SearchBar.vue | 45 +++++++++++++++++++++------
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index 2fd79825..e5adcce1 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -6,7 +6,8 @@
   "search": {
     "search-label": "Search",
     "search-placeholder": "Start typing to filter",
-    "clear-search-tooltip": "Clear Search"
+    "clear-search-tooltip": "Clear Search",
+    "enter-to-search-web": "Press enter to search the web"
   },
   "login": {
     "title": "Dashy",
diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue
index 8fbf4877..7979e3b3 100644
--- a/src/components/Settings/SearchBar.vue
+++ b/src/components/Settings/SearchBar.vue
@@ -1,13 +1,18 @@
 <template>
   <form @submit.prevent="searchSubmitted">
     <label for="filter-tiles">{{ $t('search.search-label') }}</label>
-    <input
-      id="filter-tiles"
-      v-model="input"
-      ref="filter"
-      :placeholder="$t('search.search-placeholder')"
-      v-on:input="userIsTypingSomething"
-      @keydown.esc="clearFilterInput" />
+    <div class="search-wrap">
+      <input
+        id="filter-tiles"
+        v-model="input"
+        ref="filter"
+        :placeholder="$t('search.search-placeholder')"
+        v-on:input="userIsTypingSomething"
+        @keydown.esc="clearFilterInput" />
+        <p v-if="webSearchEnabled && input.length > 0" class="web-search-note">
+          {{ $t('search.enter-to-search-web') }}
+        </p>
+      </div>
       <i v-if="input.length > 0"
         class="clear-search"
         :title="$t('search.clear-search-tooltip')"
@@ -35,6 +40,15 @@ export default {
       getCustomKeyShortcuts,
     };
   },
+  computed: {
+    webSearchEnabled() {
+      const { appConfig } = this.config;
+      if (appConfig && appConfig.webSearch) {
+        return !appConfig.webSearch.disableWebSearch;
+      }
+      return true;
+    },
+  },
   mounted() {
     window.addEventListener('keydown', (event) => {
       const currentElem = document.activeElement.id;
@@ -97,7 +111,7 @@ export default {
       // Get search preferences from appConfig
       const { appConfig } = this.config;
       const searchPrefs = appConfig.webSearch || {};
-      if (!searchPrefs.disableWebSearch) { // Only proceed if user hasn't disabled web search
+      if (this.webSearchEnabled) { // Only proceed if user hasn't disabled web search
         const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
         // Get search engine, and make URL
         const searchEngine = searchPrefs.searchEngine || defaultSearchEngine;
@@ -131,6 +145,17 @@ export default {
     border-radius: 0 0 var(--curve-factor-navbar) 0;
     padding: 0 0.2rem 0.2rem 0;
     background: var(--search-container-background);
+    .search-wrap {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      p.web-search-note {
+        margin: 0 0.5rem;
+        font-size: 0.8rem;
+        color: var(--minimal-view-search-color);
+        opacity: var(--dimming-factor);
+      }
+    }
     label {
         display: inline;
         color: var(--search-label-color);
@@ -157,7 +182,7 @@ export default {
     .clear-search {
       //position: absolute;
       color: var(--settings-text-color);
-      padding: 0 0.4rem;
+      padding: 0 0.3rem 0.1rem 0.3rem;
       font-style: normal;
       font-size: 1rem;
       opacity: var(--dimming-factor);
@@ -167,7 +192,7 @@ export default {
       top: 1rem;
       border: 1px solid var(--settings-text-color);
       font-size: 1rem;
-      margin: 0.5rem;
+      margin: 0.25rem;
       &:hover {
         opacity: 1;
         background: var(--background-darker);

From 8337fd39c12e18ff99bda076d44a6cdb9cc5cc06 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 16:58:58 +0100
Subject: [PATCH 04/11] :card_file_box: Adds webSearch into config

---
 docs/configuring.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/configuring.md b/docs/configuring.md
index b08a995f..49a10974 100644
--- a/docs/configuring.md
+++ b/docs/configuring.md
@@ -60,6 +60,7 @@ To disallow any changes from being written to disk via the UI config editor, set
 **`startingView`** | `enum` | _Optional_ | Which page to load by default, and on the base page or domain root. You can still switch to different views from within the UI. Can be either `default`, `minimal` or `workspace`. Defaults to `default`
 **`statusCheck`** | `boolean` | _Optional_ | When set to `true`, Dashy will ping each of your services and display their status as a dot next to each item. This can be overridden by setting `statusCheck` under each item. Defaults to `false`
 **`statusCheckInterval`** | `boolean` | _Optional_ | The number of seconds between checks. If set to `0` then service will only be checked on initial page load, which is usually the desired functionality. If value is less than `10` you may experience a hit in performance. Defaults to `0`
+**`webSearch`** | `object` | _Optional_ | Configuration options for the web search feature, set your default search engine, opening method or disable web search. See [`webSearch`](#appconfigwebsearch-optional)
 **`backgroundImg`** | `string` | _Optional_ | Path to an optional full-screen app background image. This can be either remote (http) or local (/). Note that this will slow down initial load
 **`enableFontAwesome`** | `boolean` | _Optional_ | Where `true` is enabled, if left blank font-awesome will be enabled only if required by 1 or more icons
 **`fontAwesomeKey`** | `string` | _Optional_ | If you have a font-awesome key, then you can use it here and make use of premium icons. It is a 10-digit alpha-numeric string from you're FA kit URL  (e.g. `13014ae648`)
@@ -115,6 +116,17 @@ For more info, see the **[Authentication Docs](/docs/authentication.md)**
 
 **[⬆️ Back to Top](#configuring)**
 
+### `appConfig.webSearch` _(optional)_
+
+**Field** | **Type** | **Required**| **Description**
+--- | --- | --- | ---
+**`disableWebSearch`** | `string` | _Optional_ | Web search is enabled by default, but can be disabled by setting this property to `true`
+**`searchEngine`** | `string` | _Optional_ | Set the key name for your search engine. Can also use a custom engine by setting this property to `custom`. Currently supported: `duckduckgo`, `google`, `whoogle`, `qwant`, `startpage`, `searx-bar` and `searx-info`. Defaults to `duckduckgo`
+**`customSearchEngine`** | `string` | _Optional_ | You can also use a custom search engine, or your own self-hosted instance. This requires `searchEngine: custom` to be set. Then add the URL of your service, with GET query string included here
+**`openingMethod`** | `string` | _Optional_ | Set your preferred opening method for search results: `newtab`, `sametab`, `workspace`. Defaults to `newtab`
+
+
+**[⬆️ Back to Top](#configuring)**
 
 ### `appConfig.hideComponents` _(optional)_
 

From c76838e3432682a53743fa768c10093843cd4672 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 17:00:08 +0100
Subject: [PATCH 05/11] :octocat: Adds @EVOTk as owner of fr.json

---
 .github/CODEOWNERS | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index baf42f9f..d90839fe 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,12 +4,11 @@
 # Each line starts with file pattern, followed by one or more owners
 # Codeowners Docs: https://github.blog/2017-07-06-introducing-code-owners/
 
-# Repo Owner
+# Repo Owners
 *   @lissy93
 
 # Translations
-src/assets/locales/de.json    @niklashere
-src/assets/locales/nl.json    @evroon
+src/assets/locales/fr.json    @EVOTk
 
 # Bot PR Permissions
 docs/assets/CONTRIBUTORS.svg  @liss-bot

From b88ddd97eb42c1370496d8ad1bd1203a2a97331f Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 17:00:45 +0100
Subject: [PATCH 06/11] :memo: WIP: Docs for web search

---
 docs/searching.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/searching.md b/docs/searching.md
index b8540e86..588735e1 100644
--- a/docs/searching.md
+++ b/docs/searching.md
@@ -47,6 +47,35 @@ For apps that you use regularly, you can set a custom keybinding. Use the `hotke
 
 In the above example, pressing <kbd>2</kbd> will launch Bookstack. Or hitting <kbd>3</kbd> will open Git in the workspace view.
 
+## Web Search
+It's possible to search the web directly from Dashy, which might be useful if you're using Dashy as your start page. This can be done by pressing <kbd>⏎</kbd> after typing your query into the search bar. Web search options are configured under `appConfig.webSearch`.
+
+#### Setting Search Engine
+By default, DuckDuckGo is used as the search engine, but you can change this by setting `webSearch.searchEngine` to the key of your favorite search provider. Currently supported providers:
+- Main: `duckduckgo`, `google`, `whoogle`, `qwant`, `startpage`, `searx-bar`, `searx-info`
+- Nice: `searx-tiekoetter`, `searx-bissisoft`, `ecosia`, `metager`, `swisscows`, `mojeek`, `peekier`
+- Specific: `wikipedia`, `wolframalpha`, `stackoverflow`, `github`, `reddit`, `youtube`, `bbc`
+
+#### Using Custom Search Engine
+If you're self-hosting your own search engine (like [Whoogle](https://github.com/benbusby/whoogle-search) or [Searx](https://searx.github.io/searx/)) or you'd like to use a provider not included in this list, then just set `searchEngine: custom` and put the URL of your engine, along with the GET parameter for query string, into `customSearchEngine`
+
+#### Setting Opening Method
+By default, results are opened in a new tab, but `sametab`, `newtab` and `workspace` are all supported
+
+#### Disabling Web Search
+Web search can be disabled, by setting `disableWebSearch: true`
+
+
+```yaml
+appConfig:
+  theme: dashy-docs
+  webSearch:
+    disableWebSearch: false
+    searchEngine: 'duckduckgo'
+    customSearchEngine: ''
+    openingMethod: 'newtab'
+```
+
 
 ## Clearing Search
 You can clear your search term at any time, by pressing <kbd>Esc</kbd>.

From 72e5cf2b460f07f78b1e5641e01660a33b5bf108 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 28 Aug 2021 17:01:24 +0100
Subject: [PATCH 07/11] :bookmark: Bumps to V 1.6.9 and updates changelog

---
 .github/CHANGELOG.md | 5 +++++
 package.json         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index f0ffa193..b36eee02 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## ✨ 1.6.9 - Web Search Feature [PR #185](https://github.com/Lissy93/dashy/pull/185)
+- Adds ability to search the web directly from Dashy by pressing enter on the search bar
+- Adds configuration options, for setting default search engine, opening method and disabling
+- Adds text under search bar, implements into minimal view also
+
 ## ⚡️ 1.6.8 - Improved Loading Experience [PR #183](https://github.com/Lissy93/dashy/pull/183)
 - During app initialization, show the build progress and status message
 - While requests are being made, show loader at top of screen
diff --git a/package.json b/package.json
index 2eca2612..8da5b8f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Dashy",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "license": "MIT",
   "main": "server",
   "scripts": {

From ef89d932fb36d40cf0c6a33697fa48d9e3be34e8 Mon Sep 17 00:00:00 2001
From: EVOTk <45015615+EVOTk@users.noreply.github.com>
Date: Sat, 28 Aug 2021 19:22:27 +0200
Subject: [PATCH 08/11] Update fr.json for 1.6.9

---
 src/assets/locales/fr.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/assets/locales/fr.json b/src/assets/locales/fr.json
index ab38f30a..fe7b7fdf 100644
--- a/src/assets/locales/fr.json
+++ b/src/assets/locales/fr.json
@@ -6,7 +6,8 @@
   "search": {
     "search-label": "Recherche",
     "search-placeholder": "Commencez à taper pour filtrer",
-    "clear-search-tooltip": "Effacer la recherche"
+    "clear-search-tooltip": "Effacer la recherche",
+    "enter-to-search-web": "Appuyez sur entrée pour rechercher sur le Web"
   },
   "login": {
     "title": "Dashy",
@@ -60,6 +61,11 @@
     "css-note-l2": "Les modifications ne sont stockés que localement, il est donc recommandé de faire une copie de votre CSS.",
     "css-note-l3": "Pour supprimer tous les styles personnalisés, supprimez le contenu et appuyez sur Enregistrer."
   },
+  "alternate-views": {
+    "default": "Défaut",
+    "workspace": "Plein écran",
+    "minimal": "Minimale"
+  },
   "settings": {
     "theme-label": "Thème",
     "layout-label": "Disposition",
@@ -162,4 +168,4 @@
     "modal": "Ouvrir en mode fenêtré",
     "workspace": "Ouvrir en plein écran"
   }
-}
+}
\ No newline at end of file

From 6422f21572123556db80cb4e80053323391df218 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@futr.ai>
Date: Sun, 29 Aug 2021 15:39:18 +0100
Subject: [PATCH 09/11] :memo: Adds docs for configuring web search

---
 README.md         |  12 ++++
 docs/searching.md | 164 +++++++++++++++++++++++-----------------------
 2 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/README.md b/README.md
index 01f2bdbf..39738a3c 100644
--- a/README.md
+++ b/README.md
@@ -327,6 +327,8 @@ You can change the view from the UI, using the switch icon in the top-right corn
 
 ## Searching and Shortcuts 🔎
 
+> For full documentation on searching, see: [**Searching & Shortcuts**](./docs/searching.md)
+
 Quickly finding and launching applications is the primary aim of Dashy. To that end instant search and customizable keyboard shortcuts are built-in.
 
 To start filtering, just start typing. No need to select the search bar or use any special key. You can then use either the tab key or arrow keys to select and move between results, and hit enter to launch the currently selected application. You can also use `Alt + Enter` on a selected app to launch it in a popup modal, `Ctrl + Enter` to open in new tab, or right-click on it to see all opening methods.
@@ -353,6 +355,16 @@ Example:
   hotkey: 8
 ```
 
+To search the web directly through Dashy, just press enter after typing your query. Options for web search are set under `appConfig.webSearch`. There is built in support for [10+ search engines](./docs/searching.md#setting-search-engine), or [use your own custom provider](./docs/searching.md#using-custom-search-engine) or self-hosted instance.
+To disable web search all together, set: `webSearch: { disableWebSearch: true }`
+
+```yaml
+appConfig:
+  webSearch:
+    searchEngine: duckduckgo
+    openingMethod: newtab
+```
+
 Hit `Esc` at anytime to close any open apps, clear the search field, or hide any modals.
 
 **[⬆️ Back to Top](#dashy)**
diff --git a/docs/searching.md b/docs/searching.md
index 588735e1..205008f1 100644
--- a/docs/searching.md
+++ b/docs/searching.md
@@ -1,82 +1,82 @@
-# Keyboard Shortcuts
-
-## Searching
-One of the primary purposes of Dashy is to allow you to quickly find and launch a given app. To make this as quick as possible, there is no need to touch the mouse, or press a certain key to begin searching - just start typing. Results will be filtered in real-time. No need to worry about case, special characters or small typos, these are taken care of, and your results should appear.
-
-## Navigating
-You can navigate through your items or search results using the keyboard. You can use <kbd>Tab</kbd> to cycle through results, and <kbd>Shift</kbd> + <kbd>Tab</kbd> to go backwards. Or use the arrow keys, <kbd>↑</kbd>, <kbd>→</kbd>, <kbd>↓</kbd> and <kbd>←</kbd>.
-
-## Launching Apps
-You can launch a elected app by hitting <kbd>Enter</kbd>. This will open the app using your default opening method, specified in `target` (either `newtab`, `sametab`, `modal` or `workspace`). You can also use <kbd>Alt</kbd> + <kbd>Enter</kbd> to open the app in a pop-up modal, or <kbd>Ctrl</kbd> + <kbd>Enter</kbd> to open it in a new tab. For all available opening methods, just right-click on an item, to bring up the context menu.
-
-## Tags
-By default, items are filtered by the `title` attribute, as well as the hostname (extracted from `url`), the `provider` and `description`. If you need to find results based on text which isn't included in these attributes, then you can add `tags` to a given item. 
-
-```yaml
-  items:
-  - title: Plex
-    description: Media library
-    icon: favicon
-    url: https://plex.lab.local
-    tags: [ movies, videos, music ]
-  - title: FreshRSS
-    description: RSS Reader
-    icon: favicon
-    url: https://freshrss.lab.local
-    tags: [ news, updates, blogs ]
-
-```
-
-In the above example, Plex will be visible when searching for 'movies', and FreshRSS with 'news'
-
-
-## Custom Hotkeys
-For apps that you use regularly, you can set a custom keybinding. Use the `hotkey` parameter on a certain item to specify a numeric key, between `0 - 9`. You can then launch that app, by just pressing that key, which is much quicker than searching for it, if it's an app you use frequently.
-
-```yaml
-- title: Bookstack
-  icon: far fa-books
-  url: https://bookstack.lab.local/
-  hotkey: 2
-- title: Git Tea
-  icon: fab fa-git
-  url: https://git.lab.local/
-  target: workspace
-  hotkey: 3
-```
-
-In the above example, pressing <kbd>2</kbd> will launch Bookstack. Or hitting <kbd>3</kbd> will open Git in the workspace view.
-
-## Web Search
-It's possible to search the web directly from Dashy, which might be useful if you're using Dashy as your start page. This can be done by pressing <kbd>⏎</kbd> after typing your query into the search bar. Web search options are configured under `appConfig.webSearch`.
-
-#### Setting Search Engine
-By default, DuckDuckGo is used as the search engine, but you can change this by setting `webSearch.searchEngine` to the key of your favorite search provider. Currently supported providers:
-- Main: `duckduckgo`, `google`, `whoogle`, `qwant`, `startpage`, `searx-bar`, `searx-info`
-- Nice: `searx-tiekoetter`, `searx-bissisoft`, `ecosia`, `metager`, `swisscows`, `mojeek`, `peekier`
-- Specific: `wikipedia`, `wolframalpha`, `stackoverflow`, `github`, `reddit`, `youtube`, `bbc`
-
-#### Using Custom Search Engine
-If you're self-hosting your own search engine (like [Whoogle](https://github.com/benbusby/whoogle-search) or [Searx](https://searx.github.io/searx/)) or you'd like to use a provider not included in this list, then just set `searchEngine: custom` and put the URL of your engine, along with the GET parameter for query string, into `customSearchEngine`
-
-#### Setting Opening Method
-By default, results are opened in a new tab, but `sametab`, `newtab` and `workspace` are all supported
-
-#### Disabling Web Search
-Web search can be disabled, by setting `disableWebSearch: true`
-
-
-```yaml
-appConfig:
-  theme: dashy-docs
-  webSearch:
-    disableWebSearch: false
-    searchEngine: 'duckduckgo'
-    customSearchEngine: ''
-    openingMethod: 'newtab'
-```
-
-
-## Clearing Search
-You can clear your search term at any time, by pressing <kbd>Esc</kbd>.
-This can also be used to close an open pop-up modal.
+# Keyboard Shortcuts
+
+## Searching
+One of the primary purposes of Dashy is to allow you to quickly find and launch a given app. To make this as quick as possible, there is no need to touch the mouse, or press a certain key to begin searching - just start typing. Results will be filtered in real-time. No need to worry about case, special characters or small typos, these are taken care of, and your results should appear.
+
+## Navigating
+You can navigate through your items or search results using the keyboard. You can use <kbd>Tab</kbd> to cycle through results, and <kbd>Shift</kbd> + <kbd>Tab</kbd> to go backwards. Or use the arrow keys, <kbd>↑</kbd>, <kbd>→</kbd>, <kbd>↓</kbd> and <kbd>←</kbd>.
+
+## Launching Apps
+You can launch a elected app by hitting <kbd>Enter</kbd>. This will open the app using your default opening method, specified in `target` (either `newtab`, `sametab`, `modal` or `workspace`). You can also use <kbd>Alt</kbd> + <kbd>Enter</kbd> to open the app in a pop-up modal, or <kbd>Ctrl</kbd> + <kbd>Enter</kbd> to open it in a new tab. For all available opening methods, just right-click on an item, to bring up the context menu.
+
+## Tags
+By default, items are filtered by the `title` attribute, as well as the hostname (extracted from `url`), the `provider` and `description`. If you need to find results based on text which isn't included in these attributes, then you can add `tags` to a given item. 
+
+```yaml
+  items:
+  - title: Plex
+    description: Media library
+    icon: favicon
+    url: https://plex.lab.local
+    tags: [ movies, videos, music ]
+  - title: FreshRSS
+    description: RSS Reader
+    icon: favicon
+    url: https://freshrss.lab.local
+    tags: [ news, updates, blogs ]
+
+```
+
+In the above example, Plex will be visible when searching for 'movies', and FreshRSS with 'news'
+
+
+## Custom Hotkeys
+For apps that you use regularly, you can set a custom keybinding. Use the `hotkey` parameter on a certain item to specify a numeric key, between `0 - 9`. You can then launch that app, by just pressing that key, which is much quicker than searching for it, if it's an app you use frequently.
+
+```yaml
+- title: Bookstack
+  icon: far fa-books
+  url: https://bookstack.lab.local/
+  hotkey: 2
+- title: Git Tea
+  icon: fab fa-git
+  url: https://git.lab.local/
+  target: workspace
+  hotkey: 3
+```
+
+In the above example, pressing <kbd>2</kbd> will launch Bookstack. Or hitting <kbd>3</kbd> will open Git in the workspace view.
+
+## Web Search
+It's possible to search the web directly from Dashy, which might be useful if you're using Dashy as your start page. This can be done by typing your query as normal, and then pressing <kbd>⏎</kbd>. Web search options are configured under `appConfig.webSearch`.
+
+#### Setting Search Engine
+Set your default search engine using the `webSearch.searchEngine` property. This defaults to DuckDuckGo. Search engine must be referenced by their key, the following providers are supported:
+- `duckduckgo`, `google`, `whoogle`, `qwant`, `startpage`, `searx-bar`, `searx-info`
+- `searx-tiekoetter`, `searx-bissisoft`, `ecosia`, `metager`, `swisscows`, `mojeek`, `peekier`
+- `wikipedia`, `wolframalpha`, `stackoverflow`, `github`, `reddit`, `youtube`, `bbc`
+
+#### Using Custom Search Engine
+You can also use a custom search engine, that isn't included in the above list (like a self-hosted instance of [Whoogle](https://github.com/benbusby/whoogle-search) or [Searx](https://searx.github.io/searx/)). Set `searchEngine: custom`, and then specify the URL (plus query params) to you're search engine under `customSearchEngine`.
+
+For example: 
+```yaml
+appConfig:
+  webSearch:
+    searchEngine: custom
+    customSearchEngine: 'https://searx.local/search?q='
+```
+
+#### Setting Opening Method
+In a similar way to opening apps, you can specify where you would like search results to be opened. This is done under the `openingMethod` attribute, and can be set to either  `newtab`, `sametab` or `workspace`. By default results are opened in a new tab.
+
+#### Disabling Web Search
+Web search can be disabled, by setting `disableWebSearch`, for example:
+
+```yaml
+appConfig:
+  webSearch: { disableWebSearch: true }
+```
+
+## Clearing Search
+You can clear your search term at any time, resting the UI to it's initial state, by pressing <kbd>Esc</kbd>. This can also be used to close any open pop-up modals.

From bf2755e6c56d499154da2bde4decbde8f3711032 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@futr.ai>
Date: Sun, 29 Aug 2021 15:39:54 +0100
Subject: [PATCH 10/11] :card_file_box: Updates schema with WebSearh properties

---
 src/utils/ConfigSchema.json | 49 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/utils/ConfigSchema.json b/src/utils/ConfigSchema.json
index 12a85dcc..1216a871 100644
--- a/src/utils/ConfigSchema.json
+++ b/src/utils/ConfigSchema.json
@@ -216,6 +216,53 @@
           "default": 0,
           "description": "How often to recheck statuses. If set to 0, status will only be checked on page load"
         },
+        "webSearch": {
+          "type": "object",
+          "description": "Configure options for web search",
+          "additionalProperties": false,
+          "properties": {
+            "disableWebSearch": {
+              "type": "boolean",
+              "default": "false",
+              "description": "If set to true, web search will be disabled all together"
+            },
+            "searchEngine": {
+              "type": "string",
+              "default": "duckduckgo",
+              "description": "Set your default search engine. Reference provider by key, see docs for all supported search engines, or set to custom to use your own",
+              "examples": [
+                "duckduckgo",
+                "google",
+                "whoogle",
+                "qwant",
+                "startpage",
+                "searx-bar",
+                "searx-info",
+                "ecosia",
+                "metager",
+                "wikipedia",
+                "wolframalpha",
+                "stackoverflow",
+                "bbc",
+                "custom"
+              ]
+            },
+            "customSearchEngine": {
+              "type": "string",
+              "description": "Set the URL of a self-hosted or custom search engine, including GET query params. You must also set searchEngine: custom"
+            },
+            "openingMethod": {
+              "enum": [
+                "newtab",
+                "sametab",
+                "modal",
+                "workspace"
+              ],
+              "default": "newtab",
+              "description": "Set where you would like search results to open to"
+            }
+          }
+        },
         "auth": {
           "type": "object",
           "description": "Settings for enabling authentication",
@@ -512,4 +559,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From 171c2e5c9c61225070dcc543008e1a9e877d403f Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@futr.ai>
Date: Sun, 29 Aug 2021 15:49:51 +0100
Subject: [PATCH 11/11] :memo: Updates list of supported search engines

---
 docs/searching.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/searching.md b/docs/searching.md
index 205008f1..1b8b6843 100644
--- a/docs/searching.md
+++ b/docs/searching.md
@@ -52,9 +52,9 @@ It's possible to search the web directly from Dashy, which might be useful if yo
 
 #### Setting Search Engine
 Set your default search engine using the `webSearch.searchEngine` property. This defaults to DuckDuckGo. Search engine must be referenced by their key, the following providers are supported:
-- `duckduckgo`, `google`, `whoogle`, `qwant`, `startpage`, `searx-bar`, `searx-info`
-- `searx-tiekoetter`, `searx-bissisoft`, `ecosia`, `metager`, `swisscows`, `mojeek`, `peekier`
-- `wikipedia`, `wolframalpha`, `stackoverflow`, `github`, `reddit`, `youtube`, `bbc`
+- [`duckduckgo`](https://duckduckgo.com), [`google`](https://google.com), [`whoogle`](https://whoogle.sdf.org), [`qwant`](https://www.qwant.com), [`startpage`](https://www.startpage.com), [`searx-bar`](https://searx.bar), [`searx-info`](https://searx.info)
+- [`searx-tiekoetter`](https://searx.tiekoetter.com), [`searx-bissisoft`](https://searx.bissisoft.com), [`ecosia`](https://www.ecosia.org), [`metager`](https://metager.org/meta), [`swisscows`](https://swisscows.com), [`mojeek`](https://www.mojeek.com)
+- [`wikipedia`](https://en.wikipedia.org), [`wolframalpha`](https://www.wolframalpha.com), [`stackoverflow`](https://stackoverflow.com), [`github`](https://github.com), [`reddit`](https://www.reddit.com), [`youtube`](https://youtube.com), [`bbc`](https://www.bbc.co.uk)
 
 #### Using Custom Search Engine
 You can also use a custom search engine, that isn't included in the above list (like a self-hosted instance of [Whoogle](https://github.com/benbusby/whoogle-search) or [Searx](https://searx.github.io/searx/)). Set `searchEngine: custom`, and then specify the URL (plus query params) to you're search engine under `customSearchEngine`.
@@ -79,4 +79,5 @@ appConfig:
 ```
 
 ## Clearing Search
-You can clear your search term at any time, resting the UI to it's initial state, by pressing <kbd>Esc</kbd>. This can also be used to close any open pop-up modals.
+You can clear your search term at any time, resting the UI to it's initial state, by pressing <kbd>Esc</kbd>.
+This can also be used to close any open pop-up modals.