updated vuetify & fucked everything up

.eslintrc.js

@@ -1,30 +1,25 @@
 module.exports = {
+    root: true,
     env: {
-        browser: true,
-        commonjs: true,
-        es6: true
-    },
-    extends: ['plugin:vue/essential', 'airbnb-base'],
-    globals: {
-        Atomics: 'readonly',
-        SharedArrayBuffer: 'readonly'
+        node: true
     },
+    extends: ['plugin:vue/essential', 'eslint:recommended', '@vue/prettier'],
     parserOptions: {
-        ecmaVersion: 2018
+        parser: 'babel-eslint'
     },
-    plugins: ['vue', 'prettier'],
     rules: {
-        semi: ['warn', 'never'],
-        'no-console': 0,
-        camelcase: 0,
-        'no-restricted-syntax': 0,
-        'no-shadow': 0,
-        'class-methods-use-this': 0,
-        'prefer-promise-reject-errors': 0,
-        'no-underscore-dangle': 0,
-        'no-param-reassign': 0,
-        'no-unused-vars': 0,
-        indent: 0,
-        'comma-dangle': 0
-    }
+        'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    },
+    overrides: [
+        {
+            files: [
+                '**/__tests__/*.{j,t}s?(x)',
+                '**/tests/unit/**/*.spec.{j,t}s?(x)'
+            ],
+            env: {
+                jest: true
+            }
+        }
+    ]
 }

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['@vue/app'],
+    presets: ['@vue/cli-plugin-babel/preset']
 }

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    preset: '@vue/cli-plugin-unit-jest'
+}

package.json

@@ -9,69 +9,44 @@
         "format": "pretty-quick"
     },
     "dependencies": {
+        "@babel/polyfill": "^7.4.4",
+        "core-js": "^3.6.4",
         "apexcharts": "^3.5.0",
         "axios": "^0.18.1",
-        "cors": "^2.8.5",
         "date-fns": "^1.30.1",
-        "dotenv": "^8.2.0",
         "eslint-plugin-prettier": "^3.1.3",
-        "express": "^4.17.1",
-        "filepond": "^4.13.6",
-        "filepond-plugin-file-validate-size": "^2.2.1",
-        "filepond-plugin-file-validate-type": "^1.2.5",
-        "filepond-plugin-image-preview": "^4.6.4",
-        "lodash": "^4.17.15",
         "multer": "^1.4.2",
-        "prettier": "^2.0.5",
-        "pretty-quick": "^2.0.1",
-        "qbittorrent-api-v2": "^1.2.0",
         "register-service-worker": "^1.7.1",
         "vue": "^2.6.11",
         "vue-apexcharts": "^1.3.0",
-        "vue-filepond": "^5.1.3",
+        "vue-context": "^5.1.0",
         "vue-router": "^3.2.0",
         "vue-toastification": "^1.7.1",
-        "vuetify": "^1.5.24",
-        "vuex": "^3.4.0"
+        "vuetify": "^2.2.11",
+        "vuex": "^3.4.0",
+        "vuex-persist": "^2.2.0"
     },
     "devDependencies": {
-        "@vue/cli-plugin-babel": "^3.12.1",
-        "@vue/cli-plugin-eslint": "^3.12.1",
-        "@vue/cli-plugin-pwa": "^3.12.1",
-        "@vue/cli-service": "^3.12.1",
-        "eslint": "^6.8.0",
-        "eslint-config-airbnb-base": "^14.1.0",
-        "eslint-plugin-import": "^2.20.2",
-        "eslint-plugin-vue": "^5.2.3",
-        "stylus": "^0.54.7",
-        "stylus-loader": "^3.0.1",
-        "vue-cli-plugin-vuetify": "^0.4.6",
+        "@vue/cli-plugin-babel": "~4.3.0",
+        "@vue/cli-plugin-eslint": "~4.3.0",
+        "@vue/cli-plugin-pwa": "~4.3.0",
+        "@vue/cli-plugin-router": "~4.3.0",
+        "@vue/cli-plugin-unit-jest": "~4.3.0",
+        "@vue/cli-plugin-vuex": "~4.3.0",
+        "@vue/cli-service": "~4.3.0",
+        "@vue/eslint-config-prettier": "^6.0.0",
+        "@vue/test-utils": "1.0.0-beta.31",
+        "babel-eslint": "^10.1.0",
+        "eslint": "^6.7.2",
+        "eslint-plugin-prettier": "^3.1.1",
+        "eslint-plugin-vue": "^6.2.2",
+        "laravel-mix": "^5.0.4",
+        "prettier": "^1.19.1",
+        "pretty-quick": "^2.0.1",
+        "sass-loader": "^8.0.2",
+        "tailwindcss": "^1.4.2",
+        "vue-cli-plugin-vuetify": "~2.0.5",
         "vue-template-compiler": "^2.6.11",
-        "vuetify-loader": "^1.4.3",
-        "webpack": "^4.43.0",
-        "webpack-cli": "^3.3.11"
-    },
-    "eslintConfig": {
-        "root": true,
-        "env": {
-            "node": true
-        },
-        "extends": [
-            "plugin:vue/essential"
-        ],
-        "rules": {},
-        "parserOptions": {
-            "parser": "babel-eslint"
-        }
-    },
-    "postcss": {
-        "plugins": {
-            "autoprefixer": {}
-        }
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ]
+        "vuetify-loader": "^1.4.3"
+    }
 }

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-    <v-app class="grey lighten-4">
+    <v-app :style="{ background: $vuetify.theme.themes[theme].background }">
         <div v-if="authenticated">
             <Navbar />
             <v-content class="mx-4 mb-4">
@@ -29,10 +29,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import Navbar from './components/Navbar.vue'
 import Login from './components/Login.vue'
-import qbit from './services/qbit'
 
 export default {
     components: { Navbar, Login },
@@ -41,7 +40,11 @@ export default {
         return {}
     },
     computed: {
-        ...mapState(['authenticated', 'rid', 'mainData', 'preferences'])
+        ...mapState(['authenticated', 'rid', 'mainData', 'preferences']),
+        ...mapGetters(['getTheme']),
+        theme() {
+            return this.getTheme() ? 'dark' : 'light'
+        }
     }
 }
 </script>

src/components/AddTorrent.vue

@@ -1,116 +0,0 @@
-<template>
-  <v-dialog max-width="400px" v-model="dialog">
-    <v-btn flat small fab slot="activator" color="grey" class="mr-0 ml-0">
-      <v-icon color="grey">add</v-icon>
-    </v-btn>
-    <v-card>
-      <v-container :class="`pa-0 project done`">
-        <v-card-title class="justify-center">
-          <h2>Add a new Torrent</h2>
-        </v-card-title>
-        <div class="mr-5 ml-5">
-          <file-pond
-            name="file"
-            ref="pond"
-            label-idle="Drop file here..."
-            accepted-file-types="application/x-bittorrent"
-            data-max-file-size="1MB"
-            server="/upload"
-            v-model="Files"
-          />
-        </div>
-        <v-card-text>
-          <v-form class="px-3" ref="form">
-            <!-- <v-text-field
-            v-model="filename"
-            label="File"
-            prepend-icon="attach_file"
-            :rules="inputRules"
-            ></v-text-field>-->
-            <v-text-field v-model="directory" label="Download Directory" prepend-icon="folder"></v-text-field>
-            <v-spacer></v-spacer>
-            <v-card-actions class="justify-center">
-              <v-btn
-                :loading="loading"
-                flat
-                @click="submit"
-                class="blue_accent white--text mx-0 mt-3"
-              >Add Torrent</v-btn>
-            </v-card-actions>
-          </v-form>
-        </v-card-text>
-      </v-container>
-    </v-card>
-  </v-dialog>
-</template>
-
-
-<script>
-// Import Vue FilePond
-import vueFilePond from 'vue-filepond'
-
-// Import FilePond styles
-import 'filepond/dist/filepond.min.css'
-
-// Import image preview plugin styles
-import 'filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css'
-
-// Import image preview and file type validation plugins
-import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type'
-import FilePondPluginImagePreview from 'filepond-plugin-image-preview'
-import FilePondPluginFileValidateSize from 'filepond-plugin-file-validate-size'
-
-// Create component
-const FilePond = vueFilePond(
-  FilePondPluginFileValidateType,
-  FilePondPluginImagePreview,
-  FilePondPluginFileValidateSize,
-)
-
-export default {
-  data() {
-    return {
-      filename: '',
-      directory: '',
-      inputRules: [
-        (v) => v.indexOf('magnet') > -1
-          || v.indexOf('http') > -1
-          || this.validFile
-          || 'Not a valid magnet link',
-      ],
-      loading: false,
-      dialog: false,
-      Files: [],
-    }
-  },
-  methods: {
-    submit() {
-      if (this.$refs.form.validate()) {
-        this.loading = true
-
-        this.$store.dispatch('ADD_TORRENT', {
-          name: this.filename,
-          dir: this.directory,
-        })
-
-        // reset input
-        this.$refs.form.reset()
-        this.filename = ''
-        this.directory = ''
-
-        this.$refs.pond.removeFiles()
-        this.dialog = false
-        this.loading = false
-      }
-    },
-  },
-  computed: {
-    validFile() {
-      return this.Files.length > 0
-    },
-  },
-  components: {
-    vueFilePond,
-  },
-}
-</script>

src/components/Modals/AddModal.vue

@@ -0,0 +1,108 @@
+<template>
+    <v-dialog max-width="400px" v-model="dialog">
+        <v-card>
+            <v-container :class="`pa-0 project done`">
+                <v-card-title class="justify-center">
+                    <h2>Add a new Torrent</h2>
+                </v-card-title>
+                <v-container>
+                    <div ref="fileZone">
+                        <v-file-input
+                            v-show="files.length"
+                            v-model="files"
+                            ref="file"
+                            multiple
+                            chips
+                            outlined
+                            label="files"
+                        />
+                        <v-textarea
+                            v-show="!files.length"
+                            label="URL"
+                            placeholder="add Torrent"
+                            prepend-icon="mdi-link"
+                            append-outer-icon="mdi-attachment"
+                            :rules="[v => !!files.length || !!v]"
+                            :rows="$vuetify.breakpoint.xsOnly ? 1 : 3"
+                            required
+                            :autofocus="!phoneLayout"
+                            :value="params.urls"
+                            @input="setParams('urls', $event)"
+                        />
+                    </div>
+                </v-container>
+                <v-card-text>
+                    <v-form class="px-3" ref="form">
+                        <v-text-field
+                            v-model="directory"
+                            label="Download Directory"
+                            prepend-icon="folder"
+                        ></v-text-field>
+                        <v-spacer></v-spacer>
+                        <v-card-actions class="justify-center">
+                            <v-btn
+                                :loading="loading"
+                                flat
+                                @click="submit"
+                                class="blue_accent white--text mx-0 mt-3"
+                                >Add Torrent</v-btn
+                            >
+                        </v-card-actions>
+                    </v-form>
+                </v-card-text>
+            </v-container>
+        </v-card>
+    </v-dialog>
+</template>
+
+<script>
+import Modal from '@/mixins/Modal'
+export default {
+    name: 'AddModal',
+    mixins: [Modal],
+    data() {
+        return {
+            files: [],
+            directory: '',
+            inputRules: [
+                v =>
+                    v.indexOf('magnet') > -1 ||
+                    v.indexOf('http') > -1 ||
+                    this.validFile ||
+                    'Not a valid magnet link'
+            ],
+            loading: false,
+            params: {}
+        }
+    },
+    methods: {
+        submit() {
+            if (this.$refs.form.validate()) {
+                this.loading = true
+
+                this.$store.dispatch('ADD_TORRENT', {
+                    name: this.filename,
+                    dir: this.directory
+                })
+
+                // reset input
+                this.$refs.form.reset()
+                this.filename = ''
+                this.directory = ''
+
+                this.$refs.pond.removeFiles()
+                this.dialog = false
+                this.loading = false
+            }
+        }
+    },
+    computed: {
+        validFile() {
+            return this.Files.length > 0
+        },
+        phoneLayout() {
+            return this.$vuetify.breakpoint.xsOnly
+        }
+    }
+}
+</script>

src/components/Navbar.vue

@@ -1,11 +1,11 @@
 <template>
     <nav>
         <!--title-->
-        <v-toolbar flat app>
-            <v-toolbar-side-icon
+        <v-app-bar flat>
+            <v-app-bar-nav-icon
                 @click="drawer = !drawer"
-                class="grey--text"
-            ></v-toolbar-side-icon>
+                class="grey--text text--darken-5"
+            ></v-app-bar-nav-icon>
             <v-toolbar-title
                 :class="[
                     'grey--text',
@@ -18,20 +18,29 @@
             <v-spacer></v-spacer>
 
             <!--right corner functions-->
-            <AddTorrent @torrentAdded="snackbar = true" />
-            <v-btn small fab flat class="mr-0 ml-0" @click="removeTorrents">
+            <v-btn
+                text
+                small
+                fab
+                color="grey"
+                class="mr-0 ml-0"
+                @click="toggleModal('addmodal')"
+            >
+                <v-icon color="grey">add</v-icon>
+            </v-btn>
+            <v-btn small fab text class="mr-0 ml-0" @click="removeTorrents">
                 <v-icon color="grey">remove</v-icon>
             </v-btn>
-            <v-btn small fab flat class="mr-0 ml-0" @click="resumeTorrents">
+            <v-btn small fab text class="mr-0 ml-0" @click="resumeTorrents">
                 <v-icon color="grey">play_arrow</v-icon>
             </v-btn>
-            <v-btn small fab flat class="mr-0 ml-0" @click="pauseTorrents">
+            <v-btn small fab text class="mr-0 ml-0" @click="pauseTorrents">
                 <v-icon color="grey">pause</v-icon>
             </v-btn>
-            <v-btn small fab flat class="mr-0 ml-0" @click="refreshTorrents">
+            <v-btn small fab text class="mr-0 ml-0" @click="refreshTorrents">
                 <v-icon color="grey">autorenew</v-icon>
             </v-btn>
-        </v-toolbar>
+        </v-app-bar>
         <!--navigation drawer itself -->
         <v-navigation-drawer app v-model="drawer" class="primary allow-spacer">
             <!--current download speeds -->
@@ -135,51 +144,17 @@
                     </v-layout>
                 </v-card>
             </v-flex>
-            <v-spacer></v-spacer>
-            <v-layout class="align-end">
-                <Settings />
-                <v-spacer></v-spacer>
-                <v-tooltip top v-if="paused">
-                    <v-btn
-                        small
-                        fab
-                        flat
-                        class="mr-4"
-                        @click="startInterval"
-                        slot="activator"
-                    >
-                        <v-icon color="green_accent">play_arrow</v-icon>
-                    </v-btn>
-                    <span>Resumes connection to client</span>
-                </v-tooltip>
-                <v-tooltip top v-else>
-                    <v-btn
-                        small
-                        fab
-                        flat
-                        class="mr-4"
-                        @click="clearInterval"
-                        slot="activator"
-                    >
-                        <v-icon color="green_accent">pause</v-icon>
-                    </v-btn>
-                    <span>Pauses connection to client</span>
-                </v-tooltip>
-            </v-layout>
         </v-navigation-drawer>
     </nav>
 </template>
 
 <script>
-import { mapMutations, mapGetters, mapState } from 'vuex'
+import { mapMutations, mapState } from 'vuex'
 import { setInterval } from 'timers'
 import VueApexCharts from 'vue-apexcharts'
-import ApexCharts from 'apexcharts'
-import AddTorrent from './AddTorrent'
-import Settings from './Settings'
 
 export default {
-    components: { AddTorrent, Settings, apexcharts: VueApexCharts },
+    components: { apexcharts: VueApexCharts },
     data() {
         return {
             drawer: false,
@@ -244,6 +219,9 @@ export default {
         refreshTorrents() {},
         updateChart() {
             this.$refs.chart.updateSeries(this.series, true)
+        },
+        toggleModal(name) {
+            this.$store.commit('TOGGLE_MODAL', name)
         }
     },
     computed: {

src/components/Settings.vue

@@ -1,19 +0,0 @@
-<template>
-  <v-dialog max-width="600px" max-height="800px">
-    <v-btn flat small fab slot="activator" color="grey" class="mr-0 ml-0">
-      <v-icon color="blue_accent">settings</v-icon>
-    </v-btn>
-    <v-container class="grey lighten-4">
-      <v-card class="pa-3">
-        <div>Nothing here yet!</div>
-      </v-card>
-      <div class="mt-3">
-        <v-card-actions class="justify-center">
-          <v-btn target="blank" href="https://paypal.me/Dwijns" class="blue_accent white--text">
-            <v-icon>attach_money</v-icon>support me on paypal (or dont)
-          </v-btn>
-        </v-card-actions>
-      </div>
-    </v-container>
-  </v-dialog>
-</template>

src/main.js

@@ -1,19 +1,33 @@
 import Vue from 'vue'
-import './plugins/vuetify'
-import Toast from 'vue-toastification'
-import App from './App.vue'
-import router from './router'
-import store from './services/store'
-import './registerServiceWorker'
+import App from '@/App.vue'
+import '@/registerServiceWorker'
+import router from '@/router'
+import store from '@/store'
+import vuetify from '@/plugins/vuetify'
+import '@babel/polyfill'
 
+import Toast from 'vue-toastification'
 import 'vue-toastification/dist/index.css'
 
 Vue.use(Toast)
 
 Vue.config.productionTip = false
 
+// register modals
+const files = require.context('@/components/Modals', true, /\.vue$/i)
+files.keys().map(key =>
+    Vue.component(
+        key
+            .split('/')
+            .pop()
+            .split('.')[0],
+        files(key).default
+    )
+)
+
 new Vue({
     router,
     store,
+    vuetify,
     render: h => h(App)
 }).$mount('#app')

src/mixins/Modal.js

@@ -0,0 +1,17 @@
+import { mapGetters } from 'vuex'
+export default {
+    computed: {
+        ...mapGetters(['getAvailableTiles', 'getModalState']),
+        availableTiles() {
+            return this.getAvailableTiles()
+        },
+        dialog: {
+            get() {
+                return this.getModalState(this.$options.name)
+            },
+            set() {
+                this.$store.commit('TOGGLE_MODAL', this.$options.name)
+            }
+        }
+    }
+}

src/models/sessionStat.js

@@ -1,21 +1,20 @@
 export default class Stat {
     constructor(data) {
-      if (data != undefined && data != null) {
-        this.status = data.connection_status
-        this.downloaded = this.formatBytes(data.dl_info_data, 1)
-        this.uploaded = this.formatBytes(data.up_info_data, 1)
-        this.dlspeed = this.formatBytes(data.dl_info_speed, 1)
-        this.upspeed = this.formatBytes(data.up_info_speed, 1)
-      }
+        if (data != undefined && data != null) {
+            this.status = data.connection_status
+            this.downloaded = this.formatBytes(data.dl_info_data, 1)
+            this.uploaded = this.formatBytes(data.up_info_data, 1)
+            this.dlspeed = this.formatBytes(data.dl_info_speed, 1)
+            this.upspeed = this.formatBytes(data.up_info_speed, 1)
+        }
     }
 
     formatBytes(a, b) {
-      if (a == 0) return '0 Bytes'
-      const c = 1024
+        if (a == 0) return '0 Bytes'
+        const c = 1024
         const d = b || 2
         const e = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
         const f = Math.floor(Math.log(a) / Math.log(c))
-      return `${parseFloat((a / Math.pow(c, f)).toFixed(d))} ${e[f]}`
+        return `${parseFloat((a / Math.pow(c, f)).toFixed(d))} ${e[f]}`
     }
-
 }

src/plugins/vuetify.js

@@ -1,18 +1,37 @@
 import Vue from 'vue'
 import Vuetify from 'vuetify/lib'
-import 'vuetify/src/stylus/app.styl'
+import 'vuetify/dist/vuetify.min.css'
 
-Vue.use(Vuetify, {
-  iconfont: 'md',
-  theme: {
-    primary: '#35495e',
-    secondary: '#3e556d',
-    secondary_lighter: '#56718c',
-    blue_accent: '#3cd1c2',
-    info: '#ffaa2c',
-    error: '#f83e70',
-    green_accent: '#3cd1c2',
-    download: '#64CEAA',
-    upload: '#00b3fa',
-  },
+Vue.use(Vuetify)
+
+export default new Vuetify({
+    iconfont: 'md',
+    theme: {
+        themes: {
+            light: {
+                primary: '#35495e',
+                secondary: '#3e556d',
+                secondary_lighter: '#56718c',
+                blue_accent: '#3cd1c2',
+                info: '#ffaa2c',
+                error: '#f83e70',
+                green_accent: '#3cd1c2',
+                download: '#64CEAA',
+                upload: '#00b3fa',
+                background: '#0000'
+            },
+            dark: {
+                primary: '#35495e',
+                secondary: '#3e556d',
+                secondary_lighter: '#56718c',
+                blue_accent: '#3cd1c2',
+                info: '#ffaa2c',
+                error: '#f83e70',
+                green_accent: '#3cd1c2',
+                download: '#64CEAA',
+                upload: '#00b3fa',
+                background: '#0000'
+            }
+        }
+    }
 })

src/services/qbit.js

@@ -62,7 +62,7 @@ class Qbit {
         } else {
             data = new URLSearchParams(params)
         }
-        return this.axios.post('/torrents/add', data).then(Api.handleResponse)
+        return this.axios.post('/torrents/add', data)
     }
 
     switchToOldUi() {
@@ -90,9 +90,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios
-            .post('/torrents/filePrio', data)
-            .then(Api.handleResponse)
+        return this.axios.post('/torrents/filePrio', data)
     }
 
     getLogs(lastId) {
@@ -100,11 +98,9 @@ class Qbit {
             last_known_id: lastId
         }
 
-        return this.axios
-            .get('/log/main', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/log/main', {
+            params
+        })
     }
 
     toggleSpeedLimitsMode() {
@@ -140,11 +136,9 @@ class Qbit {
             hash
         }
 
-        return this.axios
-            .get('/torrents/trackers', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/torrents/trackers', {
+            params
+        })
     }
 
     getTorrentPeers(hash, rid) {
@@ -153,11 +147,9 @@ class Qbit {
             rid
         }
 
-        return this.axios
-            .get('/sync/torrentPeers', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/sync/torrentPeers', {
+            params
+        })
     }
 
     editTracker(hash, origUrl, newUrl) {
@@ -173,11 +165,9 @@ class Qbit {
             hash
         }
 
-        return this.axios
-            .get('/torrents/properties', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/torrents/properties', {
+            params
+        })
     }
 
     getTorrentPieceStates(hash) {
@@ -185,11 +175,9 @@ class Qbit {
             hash
         }
 
-        return this.axios
-            .get('/torrents/pieceStates', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/torrents/pieceStates', {
+            params
+        })
     }
 
     getTorrentFiles(hash) {
@@ -197,11 +185,9 @@ class Qbit {
             hash
         }
 
-        return this.axios
-            .get('/torrents/files', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/torrents/files', {
+            params
+        })
     }
 
     getRssItems() {
@@ -209,11 +195,9 @@ class Qbit {
             withData: true
         }
 
-        return this.axios
-            .get('/rss/items', {
-                params
-            })
-            .then(Api.handleResponse)
+        return this.axios.get('/rss/items', {
+            params
+        })
     }
 
     addRssFeed(url, path = '') {
@@ -223,7 +207,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios.post('/rss/addFeed', data).then(Api.handleResponse)
+        return this.axios.post('/rss/addFeed', data)
     }
 
     removeRssFeed(path) {
@@ -232,7 +216,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios.post('/rss/removeItem', data).then(Api.handleResponse)
+        return this.axios.post('/rss/removeItem', data)
     }
 
     refreshRssFeed(path) {
@@ -241,9 +225,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios
-            .post('/rss/refreshItem', data)
-            .then(Api.handleResponse)
+        return this.axios.post('/rss/refreshItem', data)
     }
 
     moveRssFeed(path, newPath) {
@@ -253,11 +235,11 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios.post('/rss/moveItem', data).then(Api.handleResponse)
+        return this.axios.post('/rss/moveItem', data)
     }
 
     getRssRules() {
-        return this.axios.get('/rss/rules').then(Api.handleResponse)
+        return this.axios.get('/rss/rules')
     }
 
     setRssRule(name, def) {
@@ -267,7 +249,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios.post('/rss/setRule', data).then(Api.handleResponse)
+        return this.axios.post('/rss/setRule', data)
     }
 
     removeRssRule(name) {
@@ -276,7 +258,7 @@ class Qbit {
         }
 
         const data = new URLSearchParams(params)
-        return this.axios.post('/rss/removeRule', data).then(Api.handleResponse)
+        return this.axios.post('/rss/removeRule', data)
     }
 
     actionTorrents(action, hashes, extra) {
@@ -285,9 +267,7 @@ class Qbit {
             ...extra
         }
         const data = new URLSearchParams(params)
-        return this.axios
-            .post(`/torrents/${action}`, data)
-            .then(Api.handleResponse)
+        return this.axios.post(`/torrents/${action}`, data)
     }
 }
 

src/services/qbitOld.js

@@ -1,64 +0,0 @@
-const axios = require('axios')
-
-class Qbit {
-    constructor() {
-        this._axios = axios.create({
-            timeout: 1000
-        })
-    }
-
-    async getAll(sort) {
-        const res = await this._axios.post('/all', sort)
-        return res.data
-    }
-
-    async get_sessions_stats() {
-        const res = await this._axios.get('/session')
-        return res.data
-    }
-
-    async pause_torrents(torrents) {
-        const res = await this._axios.post('/pause', torrents)
-        return res.data
-    }
-
-    async pause_all() {
-        const res = await this._axios.post('/pause_all')
-        return res.data
-    }
-
-    async resume_torrents(torrents) {
-        const res = await this._axios.post('/resume', torrents)
-        return res.data
-    }
-
-    async resume_all() {
-        const res = await this._axios.post('/resume_all')
-        return res.data
-    }
-
-    async add_torrent(torrent) {
-        const res = await this._axios.post('/add', torrent)
-        return res
-    }
-
-    async remove_torrents(torrents) {
-        const res = await this._axios.post('/remove', torrents)
-        return res.data
-    }
-
-    async login(credentials) {
-        let timeout = false
-        const res = await this._axios
-            .post('/login', credentials)
-            .catch(error => {
-                if (error.code === 'ECONNABORTED') timeout = true
-                else throw error
-            })
-        return timeout ? 'timeout' : res.data
-    }
-}
-
-const qbit = new Qbit()
-
-export default qbit

src/store/index.js

@@ -1,15 +1,22 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { cloneDeep, merge, map, groupBy, sortBy } from 'lodash'
+import VuexPersist from 'vuex-persist'
+
 import Torrent from '../models/torrent'
 import Stat from '../models/sessionStat'
+import qbit from '../services/qbit'
 
-import qbit from './qbit'
+const vuexPersist = new VuexPersist({
+    key: 'vuetorrent',
+    storage: window.localStorage
+})
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
+    plugins: [vuexPersist.plugin],
     state: {
+        darkTheme: false,
         intervals: [],
         stats: null,
         upload_data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -22,16 +29,29 @@ export default new Vuex.Store({
         rid: 0,
         mainData: undefined,
         preferences: null,
-        pasteUrl: null
+        pasteUrl: null,
+        modals: {
+            addmodal: false,
+            deletemodal: false,
+            settingsmodal: false
+        }
     },
     getters: {
         CONTAINS_TORRENT: state => hash =>
-            state.selected_torrents.includes(hash)
+            state.selected_torrents.includes(hash),
+        getTheme: state => () => state.darkTheme,
+        getModalState: state => name => state.modals[name.toLowerCase()]
     },
+
     mutations: {
         REMOVE_INTERVALS: state => {
             state.intervals.forEach(el => clearInterval(el))
         },
+        TOGGLE_MODAL(state, modal) {
+            state.modals[modal.toLowerCase()] = !state.modals[
+                modal.toLowerCase()
+            ]
+        },
         ADD_SELECTED: (state, payload) => {
             state.selected_torrents.push(payload)
         },
@@ -45,19 +65,17 @@ export default new Vuex.Store({
             state.selected_torrents = []
         },
         PAUSE_TORRENTS: async state => {
-            let res
             if (state.selected_torrents.length === 0) {
-                res = await qbit.pause_all()
+                qbit.pause_all()
             } else {
-                res = await qbit.pause_torrents(state.selected_torrents)
+                qbit.pause_torrents(state.selected_torrents)
             }
         },
         RESUME_TORRENTS: async state => {
-            let res
             if (state.selected_torrents.length === 0) {
-                res = await qbit.resume_all()
+                await qbit.resume_all()
             } else {
-                res = await qbit.resume_torrents(state.selected_torrents)
+                await qbit.resume_torrents(state.selected_torrents)
             }
         },
         ADD_TORRENT: async (state, payload) => {
@@ -78,7 +96,7 @@ export default new Vuex.Store({
         },
         REMOVE_TORRENTS: async state => {
             if (state.selected_torrents.length !== 0) {
-                const res = await qbit.remove_torrents(state.selected_torrents)
+                qbit.remove_torrents(state.selected_torrents)
             }
         },
         LOGIN: async (state, payload) => {

src/views/Dashboard.vue

@@ -126,7 +126,9 @@
                             <div class="right">
                                 <v-chip
                                     small
-                                    :class="`${torrent.state} white--text my-2 caption`"
+                                    :class="
+                                        `${torrent.state} white--text my-2 caption`
+                                    "
                                     >{{ torrent.state }}</v-chip
                                 >
                             </div>
@@ -148,7 +150,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapGetters } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 
 export default {
     data() {
@@ -249,8 +251,12 @@ export default {
 
             this.$store.state.sort_options = { name, reverse }
         },
-        selectTorrent(hash) {},
-        containsTorrent(hash) {},
+        selectTorrent(hash) {
+            return hash
+        },
+        containsTorrent(hash) {
+            return hash
+        },
         resetSelected() {}
     },
     created() {
@@ -262,7 +268,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .project.done {
     border-left: 4px solid #3cd1c2;
 }
@@ -291,4 +297,5 @@ export default {
 .pointer {
     cursor: pointer;
 }
+
 </style>