From 820e3eb1d28d8cd20a45834547efb057d9c7cf3a Mon Sep 17 00:00:00 2001
From: Kylart <Kylart.dev@gmail.com>
Date: Mon, 25 Sep 2017 11:00:00 +0200
Subject: [PATCH] Isolated magnet modal in its own component

---
 assets/App.vue              |  2 +
 components/_index.js        |  1 +
 components/magnetsModal.vue | 93 +++++++++++++++++++++++++++++++++++++
 pages/downloader.vue        | 84 ---------------------------------
 pages/releases.vue          |  2 +-
 5 files changed, 97 insertions(+), 85 deletions(-)
 create mode 100644 components/magnetsModal.vue

diff --git a/assets/App.vue b/assets/App.vue
index c721939..f681c03 100644
--- a/assets/App.vue
+++ b/assets/App.vue
@@ -47,6 +47,8 @@
 
     env(v-show='$store.state.NODE_ENV === "development"')
 
+    magnets-modal
+
     info-results(v-show='$store.state.search.info.show')
 
     //- Used for displaying any info
diff --git a/components/_index.js b/components/_index.js
index 92ab675..6a5b1ab 100644
--- a/components/_index.js
+++ b/components/_index.js
@@ -6,3 +6,4 @@ export { default as InfoResults } from './infoResults.vue'
 export { default as Loader } from './loader.vue'
 export { default as News } from './news.vue'
 export { default as Settings } from './settings.vue'
+export { default as MagnetsModal } from './magnetsModal.vue'
diff --git a/components/magnetsModal.vue b/components/magnetsModal.vue
new file mode 100644
index 0000000..9dbb3e1
--- /dev/null
+++ b/components/magnetsModal.vue
@@ -0,0 +1,93 @@
+<template lang="pug">
+  div
+    v-dialog.magnet-modal(v-model='values.show', lazy, absolute, width='800')
+        v-card.secondary.white--text
+          v-card-text
+            h2.title.white--text Magnets for #[strong {{ values.title }}]
+          v-divider
+          v-card-text.subheading.white--text
+            v-layout(row, wrap, justify-center, align-center)
+              v-flex.modal-icon-container(xs4, offset-xs6)
+                v-btn(flat, icon, v-if='values.text.length', v-clipboard="values.text.join(eol)", @success='snack = true')
+                  v-icon.copy-icon content_copy
+              v-flex.subheading.grey--text.modal-text(
+                xs12,
+                v-for='link in values.text',
+                :key='link'
+              ) {{ link.split('&')[0] }}
+          v-card-actions
+            v-spacer
+            v-btn.blue--text.darken-1(flat, @click='values.show = false') Thanks!
+    v-snackbar(
+      :timeout='2500',
+      top,
+      v-model='snack'
+    ) All magnets were copied to clipboard!
+      v-btn.pink--text(flat, @click='snack = false') Thanks!
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        snack: false
+      }
+    },
+    computed: {
+      values () {
+        return this.$store.state.downloader.modal
+      },
+      show () {
+        return this.values.show
+      },
+      eol () {
+        if (this.$store.state.platform === 'win32') {
+          return '\r\n'
+        } else {
+          return '\n'
+        }
+      }
+    },
+    watch: {
+      show () {
+        this.show && this.$store.dispatch('player/play')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .modal-text
+  {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    margin: 0;
+    padding: 0;
+    height: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .magnet-modal .title
+  {
+    padding: 0;
+  }
+
+  .magnet-modal .title h2
+  {
+    padding-bottom: 0;
+  }
+
+  .modal-icon-container
+  {
+    text-align: right;
+  }
+
+  .copy-icon
+  {
+    display: inline-block;
+    cursor: copy;
+  }
+</style>
+
diff --git a/pages/downloader.vue b/pages/downloader.vue
index e7ad3ba..749a0c2 100644
--- a/pages/downloader.vue
+++ b/pages/downloader.vue
@@ -53,26 +53,6 @@
               v-if='!$store.state.downloader.form.loading'
             ) Download!
             v-btn(dark, block, secondary, loading, v-else)
-    v-dialog.magnet-modal(v-model='magnetModal', lazy, absolute, width='800')
-      v-card.secondary.white--text
-        v-card-text.white--text
-          h2.title.white--text
-            | Magnets for #[strong {{ $store.state.downloader.modal.title }}]
-        v-divider
-        v-card-text.subheading.white--text
-          v-layout(row, wrap, justify-center, align-center)
-            v-flex.modal-icon-container(xs4, offset-xs6)
-              v-btn(flat, icon, v-if='links', v-clipboard="links.join(eol)", @success='copiedSnackbar = true')
-                v-icon.copy-icon content_copy
-            v-flex.subheading.grey--text.modal-text(
-              xs12,
-              v-for='link in $store.state.downloader.modal.text',
-              :key='link'
-            ) {{ link.split('&')[0] }}
-        v-card-actions
-          v-spacer
-          v-btn.blue--text.darken-1(flat, @click='$store.state.downloader.modal.show = false')
-            | Thanks!
     v-snackbar(
       :timeout='timeout',
       :top="y === 'top'",
@@ -82,15 +62,6 @@
       v-model='snackbar'
     ) Please, enter a valid name (at least 3 letters...)
       v-btn.pink--text(flat, @click='snackbar = false') ok!
-    v-snackbar(
-      :timeout='copiedTimeout',
-      :top="y === 'top'",
-      :bottom="y === 'bottom'",
-      :right="x === 'right'",
-      :left="x === 'left'",
-      v-model='copiedSnackbar'
-    ) All magnets were copied to clipboard!
-      v-btn.pink--text(flat, @click='copiedSnackbar = false') Thanks!
 </template>
 
 <script>
@@ -100,34 +71,12 @@
         modalText: '',
         snackbar: false,
         timeout: 4000,
-        x: '',
-        y: 'top',
-        copiedSnackbar: false,
-        copiedTimeout: 2500,
         quality: this.$store.state.config.config.quality
       }
     },
     computed: {
       formValues () {
         return this.$store.state.downloader.form
-      },
-      links () {
-        return this.$store.state.downloader.modal.text
-      },
-      magnetModal () {
-        return this.$store.state.downloader.modal.show
-      },
-      eol () {
-        if (this.$store.state.platform === 'win32') {
-          return '\r\n'
-        } else {
-          return '\n'
-        }
-      }
-    },
-    watch: {
-      magnetModal () {
-        this.magnetModal && this.$store.dispatch('player/play')
       }
     },
     methods: {
@@ -224,37 +173,4 @@
   {
     margin-left: 10%;
   }
-
-  .modal-text
-  {
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    margin: 0;
-    padding: 0;
-    height: 22px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .magnet-modal .title
-  {
-    padding: 0;
-  }
-
-  .magnet-modal .title h2
-  {
-    padding-bottom: 0;
-  }
-
-  .modal-icon-container
-  {
-    text-align: right;
-  }
-
-  .copy-icon
-  {
-    display: inline-block;
-    cursor: copy;
-  }
 </style>
diff --git a/pages/releases.vue b/pages/releases.vue
index bad311d..eac106e 100644
--- a/pages/releases.vue
+++ b/pages/releases.vue
@@ -77,7 +77,7 @@
           v-card-text.subheading.white--text {{ modalText }}
           v-card-actions
             v-spacer
-            v-btn.blue--text.darken-1(flat, v-on:click.native='modal = false') Thanks!
+            v-btn.blue--text.darken-1(flat, @click='modal = false') Thanks!
     choice-window(:entry='choiceTitle')
 </template>