BUGFIX

- error express sever is offline
- difference between loading & no torrents active in dashboard
- animation when clicking refresh

.dockerignore

@@ -0,0 +1,6 @@
+nodemodules
+src
+LICENSE.md
+package-lock.json
+package.json
+README.md

package.json

@@ -6,7 +6,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "start" : "nodemon server.js"
+    "start" : "nodemon server/server.js"
   },
   "dependencies": {
     "apexcharts": "^3.6.5",

server/config/config.example.json

@@ -1,8 +1,8 @@
 {
   "qbit_user": "admin",
   "qbit_pass": "adminadmin",
-  "qbit_host": "https://qbit.mydomain.com",
+  "qbit_host": "https://qbittorrent.mydomain.com",
   "web_user": "username",
   "web_pass": " password",
-  "web_host": "https://vuetr.mydomain.me"
+  "web_host": "https://vuetorrent.mydomain.com"
 }

server/server.js

@@ -18,7 +18,7 @@ const upload = multer({
 const app = express();
 
 app.use(express.json());
-app.use(express.static('./src/dist'));
+app.use(express.static('dist'));
 
 app.use(function(req, res, next) {
   res.header('Access-Control-Allow-Origin', '*');
@@ -119,7 +119,7 @@ app.delete('/upload', upload.single('file'), (req, res) => {
   return res.send('deleted file');
 });
 
-app.listen(3000, () => console.log(`Server listening on port 3000!`));
+app.listen(3009, () => console.log(`Server listening on port 3009!`));
 
 //clear the tmp directory on every boot
 const directory = path.resolve(__dirname + '/tmp');

src/components/Navbar.vue

@@ -3,9 +3,7 @@
     <!--title-->
     <v-toolbar flat app>
       <v-toolbar-side-icon @click="drawer = !drawer" class="grey--text"></v-toolbar-side-icon>
-      <v-toolbar-title
-        :class="['grey--text', {'subheading ml-0': $vuetify.breakpoint.smAndDown}]"
-      >
+      <v-toolbar-title :class="['grey--text', {'subheading ml-0': $vuetify.breakpoint.smAndDown}]">
         <span class="font-weight-light">Vue</span>
         <span>Torrent</span>
       </v-toolbar-title>
@@ -22,7 +20,7 @@
       <v-btn small fab flat 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="REFRESH_TORRENTS">
+      <v-btn small fab flat class="mr-0 ml-0" @click="refreshTorrents">
         <v-icon color="grey">autorenew</v-icon>
       </v-btn>
     </v-toolbar>
@@ -187,6 +185,10 @@ export default {
     removeTorrents() {
       this.$store.dispatch("REMOVE_TORRENTS");
     },
+    refreshTorrents() {
+      this.$store.state.init_torrents = false;
+      this.$store.dispatch("REFRESH_TORRENTS");
+    },
     closeSnackbar() {
       this.$store.state.snackbar = false;
     }

src/config/config.example.json

@@ -1,8 +1,8 @@
 {
   "qbit_user": "admin",
   "qbit_pass": "adminadmin",
-  "qbit_host": "https://qbit.mydomain.com",
+  "qbit_host": "https://qbittorrent.mydomain.com",
   "web_user": "username",
   "web_pass": " password",
-  "web_host": "https://vuetr.mydomain.me"
+  "web_host": "https://vuetorrent.mydomain.com"
 }

src/services/qbit.js

@@ -1,6 +1,6 @@
 const axios = require('axios');
 
-const info = require('./config/config.json');
+const info = require('../config/config.json');
 
 class Qbit {
   constructor() {
@@ -45,13 +45,17 @@ class Qbit {
   }
 
   async remove_torrents(torrents) {
-    let res = await this._axios.post('/remove', torrents);
+    let res = await this._axios.post('/remove', torrents)
     return res.data;
   }
 
   async login(credentials) {
-    let res = await this._axios.post('/login', credentials);
-    return res.data;
+    let timeout = false;
+    let res = await this._axios.post('/login', credentials).catch(error => {
+      if (error.code === 'ECONNABORTED') timeout = true;
+      else throw error;
+    });
+     return timeout ? 'timeout' : res.data;
   }
 }
 

src/services/store.js

@@ -18,6 +18,7 @@ export default new Vuex.Store({
     upload_data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     download_data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     torrents: [],
+    init_torrents : false,
     selected_torrents: [],
     network_error: false,
     snackbar_error: false,
@@ -40,7 +41,8 @@ export default new Vuex.Store({
         state.error_msg = 'Lost connection with server, reload page';
         state.snackbar_error = true;
       });
-      state.torrents = torrents.map(a => ({...a}));
+      state.torrents = torrents.map(a => ({ ...a }));
+      state.init_torrents = true;
     },
     REFRESH_SESSION_STATS: async state => {
       let _stats = await qbit.get_sessions_stats();
@@ -122,38 +124,47 @@ export default new Vuex.Store({
     },
     LOGIN: async (state, payload) => {
       let res = await qbit.login(payload);
-      switch (res) {
-        case 'No such user':
-          state.snackbar_error = true;
-          state.error_msg = 'No such user!';
-          setTimeout(() => {
-            state.snackbar_error = false;
-          }, 4000);
-          break;
-        case 'Wrong password!':
-          state.snackbar_error = true;
-          state.error_msg = 'Wrong password!';
-          setTimeout(() => {
-            state.snackbar_error = false;
-          }, 4000);
-          break;
-        case 'SUCCES':
-          state.snackbar = true;
-          state.succes_msg = 'Succesfully logged in!';
-          state.authenticated = true;
-          setTimeout(() => {
-            state.snackbar = false;
-          }, 4000);
-          break;
-        default:
-          state.snackbar_error = true;
-          state.error_msg = 'Something went wrong';
-          setTimeout(() => {
-            state.snackbar_error = false;
-          }, 4000);
-          break;
+      if (res == 'timeout') {
+        state.loading = false;
+        state.snackbar_error = true;
+        state.error_msg = 'Express server timed out!';
+        setTimeout(() => {
+          state.snackbar_error = false;
+        }, 4000);
+      } else {
+        switch (res) {
+          case 'No such user':
+            state.snackbar_error = true;
+            state.error_msg = 'No such user!';
+            setTimeout(() => {
+              state.snackbar_error = false;
+            }, 4000);
+            break;
+          case 'Wrong password!':
+            state.snackbar_error = true;
+            state.error_msg = 'Wrong password!';
+            setTimeout(() => {
+              state.snackbar_error = false;
+            }, 4000);
+            break;
+          case 'SUCCES':
+            state.snackbar = true;
+            state.succes_msg = 'Succesfully logged in!';
+            state.authenticated = true;
+            setTimeout(() => {
+              state.snackbar = false;
+            }, 4000);
+            break;
+          default:
+            state.snackbar_error = true;
+            state.error_msg = 'Something went wrong';
+            setTimeout(() => {
+              state.snackbar_error = false;
+            }, 4000);
+            break;
+        }
+        state.loading = false;
       }
-      state.loading = false;
     }
   },
   actions: {

src/views/Dashboard.vue

@@ -16,8 +16,15 @@
           @keyup.enter.native="sortBy"
         ></v-text-field>
       </v-flex>
-
-      <div v-if="torrents.length >= 1">
+      <v-container v-if="!init_torrents" fill-height>
+        <div style="margin: 150px auto;">
+          <v-progress-circular :size="100" indeterminate color="green_accent"></v-progress-circular>
+        </div>
+      </v-container>
+      <div v-if="torrents.length === 0 && init_torrents" class="mt-5 text-xs-center">
+        <p class="grey--text">No active Torrents!</p>
+      </div>
+      <div v-else>
         <v-card
           ripple
           flat
@@ -108,11 +115,6 @@
           <v-divider></v-divider>
         </v-card>
       </div>
-      <v-container v-else fill-height>
-        <div style="margin: 150px auto;">
-          <v-progress-circular :size="100" indeterminate color="green_accent"></v-progress-circular>
-        </div>
-      </v-container>
     </v-container>
   </div>
 </template>
@@ -127,7 +129,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["torrents"])
+    ...mapState(["torrents", "init_torrents"])
   },
   methods: {
     ...mapMutations(["SORT_TORRENTS"]),