From a00a6d539e8df92fc34b4a3621a00a287102b075 Mon Sep 17 00:00:00 2001 From: Tyler Date: Thu, 27 Aug 2020 13:30:51 -0400 Subject: [PATCH 1/2] New Settings modal (#23) * New Settings modal --- .gitignore | 46 ++--- src/App.vue | 8 +- .../{SettingsModal.vue => OldUIModal.vue} | 4 +- src/components/SettingsModal/BitTorrent.vue | 185 ++++++++++++++++++ src/components/SettingsModal/Downloads.vue | 115 +++++++++++ .../SettingsModal/SettingsModal.vue | 75 +++++++ src/components/SettingsModal/WebUI.vue | 88 +++++++++ src/components/Torrent.vue | 23 ++- .../TorrentDetailModal/TorrentDetailModal.vue | 2 +- src/models/torrent.js | 2 +- src/store/index.js | 1 + src/store/mutations.js | 5 +- vue.config.js | 7 + 13 files changed, 526 insertions(+), 35 deletions(-) rename src/components/Modals/{SettingsModal.vue => OldUIModal.vue} (96%) create mode 100644 src/components/SettingsModal/BitTorrent.vue create mode 100644 src/components/SettingsModal/Downloads.vue create mode 100644 src/components/SettingsModal/SettingsModal.vue create mode 100644 src/components/SettingsModal/WebUI.vue diff --git a/.gitignore b/.gitignore index a465f425..27cab542 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ -.DS_Store -node_modules -/dist - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? - -vuetorrent +.DS_Store +node_modules +/dist + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +vuetorrent config \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index c3b58ccd..d82549f1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,22 +1,24 @@ + + diff --git a/src/components/SettingsModal/Downloads.vue b/src/components/SettingsModal/Downloads.vue new file mode 100644 index 00000000..f3077824 --- /dev/null +++ b/src/components/SettingsModal/Downloads.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/src/components/SettingsModal/SettingsModal.vue b/src/components/SettingsModal/SettingsModal.vue new file mode 100644 index 00000000..270fa62c --- /dev/null +++ b/src/components/SettingsModal/SettingsModal.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/components/SettingsModal/WebUI.vue b/src/components/SettingsModal/WebUI.vue new file mode 100644 index 00000000..afa54782 --- /dev/null +++ b/src/components/SettingsModal/WebUI.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/Torrent.vue b/src/components/Torrent.vue index 58f7f6fe..abb5df13 100644 --- a/src/components/Torrent.vue +++ b/src/components/Torrent.vue @@ -175,7 +175,10 @@ export default { diff --git a/src/components/Modals/SettingsModal/Tabs/Downloads.vue b/src/components/Modals/SettingsModal/Tabs/Downloads.vue new file mode 100644 index 00000000..afdfe0db --- /dev/null +++ b/src/components/Modals/SettingsModal/Tabs/Downloads.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/Modals/SettingsModal/Tabs/VueTorrent.vue b/src/components/Modals/SettingsModal/Tabs/VueTorrent.vue new file mode 100644 index 00000000..a8dfd07a --- /dev/null +++ b/src/components/Modals/SettingsModal/Tabs/VueTorrent.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/components/Modals/SettingsModal/Tabs/WebUI.vue b/src/components/Modals/SettingsModal/Tabs/WebUI.vue new file mode 100644 index 00000000..bb9be9be --- /dev/null +++ b/src/components/Modals/SettingsModal/Tabs/WebUI.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components/Modals/SettingsModal/Tabs/index.js b/src/components/Modals/SettingsModal/Tabs/index.js new file mode 100644 index 00000000..cde0e85b --- /dev/null +++ b/src/components/Modals/SettingsModal/Tabs/index.js @@ -0,0 +1,6 @@ +import WebUI from '@/components/Modals/SettingsModal/Tabs/WebUI.vue' +import BitTorrent from '@/components/Modals/SettingsModal/Tabs/BitTorrent.vue' +import Downloads from '@/components/Modals/SettingsModal/Tabs/Downloads.vue' +import VueTorrent from '@/components/Modals/SettingsModal/Tabs/VueTorrent.vue' + +export { WebUI, BitTorrent, Downloads, VueTorrent } diff --git a/src/components/Torrent.vue b/src/components/Torrent.vue index abb5df13..a4fb7180 100644 --- a/src/components/Torrent.vue +++ b/src/components/Torrent.vue @@ -219,11 +219,9 @@ export default { .v-chip.queued { background: #2e5eaa !important; } - .noselect { -webkit-touch-callout: none; /* iOS Safari */ -webkit-user-select: none; /* Safari */ - -khtml-user-select: none; /* Konqueror HTML */ -moz-user-select: none; /* Firefox */ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; /* Non-prefixed version, currently diff --git a/src/components/TorrentDetailModal/Content.vue b/src/components/TorrentDetailModal/Tabs/Content.vue similarity index 100% rename from src/components/TorrentDetailModal/Content.vue rename to src/components/TorrentDetailModal/Tabs/Content.vue diff --git a/src/components/TorrentDetailModal/CreateNewTagDialog.vue b/src/components/TorrentDetailModal/Tabs/CreateNewTagDialog.vue similarity index 100% rename from src/components/TorrentDetailModal/CreateNewTagDialog.vue rename to src/components/TorrentDetailModal/Tabs/CreateNewTagDialog.vue diff --git a/src/components/TorrentDetailModal/DeleteTagDialog.vue b/src/components/TorrentDetailModal/Tabs/DeleteTagDialog.vue similarity index 100% rename from src/components/TorrentDetailModal/DeleteTagDialog.vue rename to src/components/TorrentDetailModal/Tabs/DeleteTagDialog.vue diff --git a/src/components/TorrentDetailModal/Info.vue b/src/components/TorrentDetailModal/Tabs/Info.vue similarity index 100% rename from src/components/TorrentDetailModal/Info.vue rename to src/components/TorrentDetailModal/Tabs/Info.vue diff --git a/src/components/TorrentDetailModal/Peers.vue b/src/components/TorrentDetailModal/Tabs/Peers.vue similarity index 97% rename from src/components/TorrentDetailModal/Peers.vue rename to src/components/TorrentDetailModal/Tabs/Peers.vue index 3135fd57..bd0b18a4 100644 --- a/src/components/TorrentDetailModal/Peers.vue +++ b/src/components/TorrentDetailModal/Tabs/Peers.vue @@ -6,7 +6,7 @@ :items="peers" :items-per-page="-1" :hide-default-footer="true" - style="max-height: 500px; min-height: 400px;" + style="max-height: 500px; min-height: 400px" >