UI changes, storing search engine prefs

sarbikbetal · Aug 8, 2020 · ef0a0f6 · ef0a0f6
1 parent 4bee12f
commit ef0a0f6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/components/FavBar.vue b/src/components/FavBar.vue
@@ -13,7 +13,7 @@
       </fab>
 
       <!-- Site thumbs -->
-      <section id="fav-bar" class="flex overflow-x-auto overflow-y-hidden no-scrollbar">
+      <section id="fav-bar" class="flex overflow-x-auto overflow-y-hidden no-scrollbar mx-6">
         <draggable
           v-model="sites"
           group="sites"
@@ -118,7 +118,7 @@ export default {
 }
 .fav-thumb-container {
   @apply flex;
-  @apply justify-center;
+  @apply justify-start;
   @apply pb-2;
   @apply rounded-md;
   @apply relative;

diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
@@ -71,24 +71,29 @@ export default {
         {
           name: "Yandex",
           url: "https://yandex.com/search/?text=",
-          icon: "https://yastatic.net/iconostasis/_/KKii9ECKxo3QZnchF7ayZhbzOT8.png",
+          icon:
+            "https://yastatic.net/iconostasis/_/KKii9ECKxo3QZnchF7ayZhbzOT8.png",
         },
       ],
-      selected: undefined,
     };
   },
   computed: {
     selectedEngine() {
-      return this.selected || this.searchEngines[0];
+      return this.$store.state.searchEngine || this.searchEngines[0];
     },
   },
   methods: {
     search() {
-      var win = window.open(this.selectedEngine.url + this.terms, "_blank");
-      win.focus();
+      try {
+        var win = window.open(this.selectedEngine.url + this.terms, "_blank");
+        win.focus();
+      } catch (error) {
+        // show a popup and allow opening new sites
+        // window.location.href = this.selectedEngine.url + this.terms;
+      }
     },
     setEngine(item) {
-      this.selected = item;
+      this.$store.commit("setSearchEngine", item);
     },
   },
 };

diff --git a/src/store/index.js b/src/store/index.js
@@ -40,7 +40,12 @@ export default new Store({
         ],
         counters: [4, 8],
         columns: [0, 1, 2],
-        theme: "Dark"
+        theme: "Dark",
+        searchEngine: {
+            name: "DuckDuckGo",
+            url: "https://duckduckgo.com/?q=",
+            icon: "https://duckduckgo.com/favicon.ico",
+        }
     },
     mutations: {
         //Overwrite app state
@@ -53,6 +58,10 @@ export default new Store({
         setTheme(state, theme) {
             state.theme = theme;
         },
+        // Set search engine
+        setSearchEngine(state, searchEngine) {
+            state.searchEngine = searchEngine;
+        },
         // Columns
         increaseCols(state) {
             if (state.columns.length < 5)