diff --git a/README.md b/README.md
index 37ed1944..33bc8892 100644
--- a/README.md
+++ b/README.md
@@ -6,80 +6,58 @@ The sleekest looking WEBUI for qBittorrent made with Vuejs!
## Screenshots
-
+
-
+| | | |
+| :--------------------------------: | :--------------------------------: | :--------------------------------: |
+|  |  |  |
+|  |  |  |
+
+
-| | | |
-| :------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------: |
-|
|
|
|
-|
|
|
|
-
-
-
-
-
-
-
## Installation
-- ### manual
+### manual
- - Visit the releases page!
+- Visit the releases page!
+- Download the latest release.zip
+- Unzip this folder
+- Point your Alternate WEBUI location to the 'vuetorrent' folder
- - Download the latest release.zip
+### 'automatic'
- - Unzip this folder
-
- - Point your Alternate WEBUI location to the 'vuetorrent' folder
-
-- ### 'automatic'
-
- - head over to the 'latest_release' branch
- - clone it
- - pull every once in a while
+- head over to the 'latest_release' branch
+- clone it
+ - `git clone --single-branch --branch latest-release https://github.com/WDaan/VueTorrent.git`
+- pull every once in a while
## Development
-- clone the repo
-
-- npm install
-
-- npm run serve
-
-- docker-compose up -d (to start qbittorrent docker)
+- clone the repo
+- npm install
+- npm run serve
+- docker-compose up -d (to start qbittorrent docker)
## Features
-- viewing sessions status ( down / upload speed, session uploaded / downloaded )
-
-- adding / removing / pausing / resuming / renaming torrents
-
-- selectively downloading torrents
-
-- filtering powered by Fuse.js!
-
-- mobile friendly! (can be installed as a PWA)
-
-- torrent info / trackers / peers / content
-
-- searching for new torrents straight from the WEBUI!
-
-- changing the most common settings
-
-- tag & category support
-
+- viewing sessions status ( down / upload speed, session uploaded / downloaded )
+- adding / removing / pausing / resuming / renaming torrents
+- selectively downloading torrents
+- filtering powered by Fuse.js!
+- mobile friendly! (can be installed as a PWA)
+- torrent info / trackers / peers / content
+- searching for new torrents straight from the WEBUI!
+- changing the most common settings
+- tag & category support
- Keyboard shortcuts!
- - select all torrents with ctrl+A
- - delete selected with delete button
- - select with ctrl+click or from right-click-menu (regular tap on mobile still works)
- - shift + click to select from one torrent until another
-
+ - select all torrents with ctrl+A
+ - delete selected with delete button
+ - select with ctrl+click or from right-click-menu (regular tap on mobile still works)
+ - shift + click to select from one torrent until another
- Which torrent properties are shown is configurable in the dashboard (for both busy and completed torrents)
-
-- works on QBittorrent V4.2 and later
+- works on QBittorrent V4.2 and later
## Contributing
@@ -87,14 +65,12 @@ I'll gladly accept help/pull requests & advice!
## Support
-* Open up an issue 😛
+- Open up an issue 😛
-[
](https://www.buymeacoffee.com/wdaan 'Buy me a coffee')
+
## Credits
- Dashboard design heavily inspired by: '[Net Ninja - Vuetify](https://github.com/iamshaunjp/vuetify-playlist)'.
-
- This repo '[CzBiX qb-web ](https://github.com/CzBiX/qb-web)'
-
- Muertocaloh's [fork](https://github.com/muertocaloh/VueTorrent)
diff --git a/package.json b/package.json
index ee9e340c..f586a9f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vuetorrent",
- "version": "0.4.3",
+ "version": "0.4.4",
"private": true,
"scripts": {
"start" : "npm run serve",
diff --git a/src/assets/styles.scss b/src/assets/styles.scss
index 193146b8..277a09e0 100644
--- a/src/assets/styles.scss
+++ b/src/assets/styles.scss
@@ -45,6 +45,9 @@
.sideborder.metadata {
border-left: 4px solid #{$torrent-metadata};
}
+.sideborder.moving {
+ border-left: 4px solid #{$torrent-moving};
+}
.v-chip.done {
background: #{$torrent-done} !important;
}
@@ -72,6 +75,9 @@
.v-chip.metadata {
background: #{$torrent-metadata} !important;
}
+.v-chip.moving {
+ background: #{$torrent-moving} !important;
+}
.noselect {
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none; /* Safari */
@@ -100,3 +106,14 @@
overflow: hidden;
text-overflow: ellipsis;
}
+
+body {
+ &::-webkit-scrollbar {
+ width: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #E2E8F0;
+ border-radius: 20px;
+ }
+}
diff --git a/src/components/Modals/AddModal.vue b/src/components/Modals/AddModal.vue
index 2138bd6c..953b96a2 100644
--- a/src/components/Modals/AddModal.vue
+++ b/src/components/Modals/AddModal.vue
@@ -131,9 +131,12 @@ export default {
skip_checking: false,
fileInputRules: [
v => {
- const result = v.every(f => f.type === 'application/x-bittorrent' )
+ const result = v.every(f => {
+ if (f.type) return f.type === 'application/x-bittorrent'
+ else return /^.*\.torrent$/.test(f.name)
+ })
return result ? result : 'One or more files is not a valid torrent'
- }
+ }
],
loading: false,
urls: null,
diff --git a/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue b/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue
index 4853a018..39d81a84 100644
--- a/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue
+++ b/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue
@@ -82,6 +82,14 @@
{{ version }}
+
+
+ QBittorrent Version:
+
+
+ {{ Qbitversion }}
+
+
@@ -92,11 +100,13 @@
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Content.vue b/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
index 509ed25e..108b47b9 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue b/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
index 02f760a7..6172b921 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
@@ -6,7 +6,7 @@
:items="peers"
:items-per-page="-1"
:hide-default-footer="true"
- :style="{ minHeight: phoneLayout ? '' : '75vh'}"
+ :style="{ minHeight: phoneLayout ? '' : '75vh', maxHeight: '75vh'}"
>
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue b/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
index ee9cec1f..ff8a84e7 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
@@ -5,7 +5,7 @@
:headers="headers"
:items="trackers"
:hide-default-footer="true"
- :style="{ minHeight: phoneLayout ? '' : '75vh'}"
+ :style="{ minHeight: phoneLayout ? '' : '75vh', maxHeight: '75vh'}"
>
diff --git a/src/components/Navbar/FilterSelect.vue b/src/components/Navbar/FilterSelect.vue
index 2d328126..2d62494a 100644
--- a/src/components/Navbar/FilterSelect.vue
+++ b/src/components/Navbar/FilterSelect.vue
@@ -62,7 +62,7 @@ export default {
{ value: 'stalled', name: 'Stalled' },
{ value: 'stalled_uploading', name: 'Stalled Uploading' },
{ value: 'stalled_downloading', name: 'Stalled Downloading' },
- { value: 'errored', name: 'Erorred' }
+ { value: 'errored', name: 'Errored' }
],
selectedState: { value: 'all', name: 'All' },
selectedCategory: null
diff --git a/src/components/Navbar/Navbar.vue b/src/components/Navbar/Navbar.vue
index 5b4b26e2..ef0ed14c 100644
--- a/src/components/Navbar/Navbar.vue
+++ b/src/components/Navbar/Navbar.vue
@@ -25,11 +25,10 @@
-
+
+
\ No newline at end of file
diff --git a/src/models/torrent.js b/src/models/torrent.js
index 67999005..95862869 100644
--- a/src/models/torrent.js
+++ b/src/models/torrent.js
@@ -47,8 +47,9 @@ export default class Torrent {
case 'checkingDL':
case 'checkingUP':
case 'checkingResumeData':
- case 'moving':
return 'Checking'
+ case 'moving':
+ return 'Moving'
case 'unknown':
case 'missingFiles':
return 'Fail'
diff --git a/src/services/qbit.js b/src/services/qbit.js
index 3c12b885..3edd31a8 100644
--- a/src/services/qbit.js
+++ b/src/services/qbit.js
@@ -12,6 +12,7 @@ class Qbit {
getAppVersion() {
return this.axios.get('/app/version')
+ .then(res => res.data)
}
getApiVersion() {
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 96ba91e3..fac1791e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -7,6 +7,7 @@ $torrent-seeding: #26a69a;
$torrent-checking: #ff7043;
$torrent-stalled: #81c784;
$torrent-metadata: #7e57c2;
+$torrent-moving: #ffaa2c;
:export {
torrent-done-color: $torrent-done;
@@ -18,4 +19,5 @@ $torrent-metadata: #7e57c2;
torrent-checking-color: $torrent-checking;
torrent-stalled-color: $torrent-stalled;
torrent-metadata-color: $torrent-metadata;
+ torrent-moving-color: $torrent-moving;
}
\ No newline at end of file