From f0847da15f70c3d4b1e277f30a6531b4301ffb32 Mon Sep 17 00:00:00 2001 From: Fornax Date: Thu, 11 May 2023 15:01:29 +0200 Subject: [PATCH] Remove unused buckets and directory_upload pages --- main.go | 2 +- res/template/directory_upload.html | 26 ----- res/template/user_buckets.html | 16 --- svelte/rollup.config.js | 2 - svelte/src/directory_upload.js | 8 -- .../directory_upload/DirectoryUploader.svelte | 52 --------- svelte/src/directory_upload/Uploader.svelte | 61 ---------- svelte/src/file_viewer/EmbedWindow.svelte | 2 +- svelte/src/filesystem/Filesystem.svelte | 2 +- svelte/src/filesystem/FilesystemAPI.js | 84 ++++++++++++++ svelte/src/filesystem/FilesystemAPI.svelte | 107 ------------------ .../filemanager/CreateDirectory.svelte | 12 +- .../filesystem/filemanager/FileManager.svelte | 4 +- .../filemanager/FileUploader.svelte | 9 +- .../filesystem/filemanager/ListView.svelte | 12 +- svelte/src/filesystem/viewers/Audio.svelte | 2 +- svelte/src/filesystem/viewers/Image.svelte | 2 +- svelte/src/filesystem/viewers/PDF.svelte | 2 +- svelte/src/filesystem/viewers/Video.svelte | 2 +- svelte/src/user_buckets.js | 8 -- svelte/src/user_buckets/UserBucket.svelte | 74 ------------ svelte/src/user_buckets/UserBuckets.svelte | 89 --------------- svelte/src/util/Expandable.svelte | 10 +- webcontroller/web_controller.go | 2 - 24 files changed, 121 insertions(+), 469 deletions(-) delete mode 100644 res/template/directory_upload.html delete mode 100644 res/template/user_buckets.html delete mode 100644 svelte/src/directory_upload.js delete mode 100644 svelte/src/directory_upload/DirectoryUploader.svelte delete mode 100644 svelte/src/directory_upload/Uploader.svelte create mode 100644 svelte/src/filesystem/FilesystemAPI.js delete mode 100644 svelte/src/filesystem/FilesystemAPI.svelte delete mode 100644 svelte/src/user_buckets.js delete mode 100644 svelte/src/user_buckets/UserBucket.svelte delete mode 100644 svelte/src/user_buckets/UserBuckets.svelte diff --git a/main.go b/main.go index 20a75cb..91cb162 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ func main() { // systemd's socket, else we'll create our own to serve on if *sock { // Socket activation enabled. Get the provided sockets and serve on them - if listener, err = util.SystemdSocketByName("pd-web.socket"); err != nil { + if listener, err = util.SystemdListenerByName("pd-web.socket"); err != nil { panic("Socket pd-web.socket not found") } } else { diff --git a/res/template/directory_upload.html b/res/template/directory_upload.html deleted file mode 100644 index 3958e78..0000000 --- a/res/template/directory_upload.html +++ /dev/null @@ -1,26 +0,0 @@ -{{define "directory_upload"}} - - - {{template "meta_tags" "Directory upload"}} - - - - - - - - {{template "page_top" .}} - -
-

Directory upload

-
-
- - {{template "page_bottom" .}} - {{template "analytics"}} - - -{{end}} diff --git a/res/template/user_buckets.html b/res/template/user_buckets.html deleted file mode 100644 index 64d45ca..0000000 --- a/res/template/user_buckets.html +++ /dev/null @@ -1,16 +0,0 @@ -{{define "user_buckets"}} - - - {{template "meta_tags" "Buckets"}} - - - - - - - {{template "menu" .}} -
- {{template "analytics"}} - - -{{end}} diff --git a/svelte/rollup.config.js b/svelte/rollup.config.js index fcd9ef0..dafb6a8 100644 --- a/svelte/rollup.config.js +++ b/svelte/rollup.config.js @@ -33,11 +33,9 @@ export default [ "filesystem", "modal", "user_home", - "user_buckets", "user_file_manager", "admin_panel", "home_page", - "directory_upload", "text_upload", ].map((name, index) => ({ input: `src/${name}.js`, diff --git a/svelte/src/directory_upload.js b/svelte/src/directory_upload.js deleted file mode 100644 index b92bfe4..0000000 --- a/svelte/src/directory_upload.js +++ /dev/null @@ -1,8 +0,0 @@ -import App from './directory_upload/Uploader.svelte'; - -const app = new App({ - target: document.getElementById("page_content"), - props: {} -}); - -export default app; diff --git a/svelte/src/directory_upload/DirectoryUploader.svelte b/svelte/src/directory_upload/DirectoryUploader.svelte deleted file mode 100644 index 371ec1c..0000000 --- a/svelte/src/directory_upload/DirectoryUploader.svelte +++ /dev/null @@ -1,52 +0,0 @@ - - -{#if bucket_state !== null } - -{/if} diff --git a/svelte/src/directory_upload/Uploader.svelte b/svelte/src/directory_upload/Uploader.svelte deleted file mode 100644 index 175d663..0000000 --- a/svelte/src/directory_upload/Uploader.svelte +++ /dev/null @@ -1,61 +0,0 @@ - - - { dragging = true }} - on:dragenter|preventDefault|stopPropagation={() => { dragging = true }} - on:dragleave|preventDefault|stopPropagation={() => { dragging = false }} - on:drop={drop} - on:paste={paste} /> - -
-

Directory uploader

- -
-
- Pixeldrain's filesystem feature is still under development. Please - don't upload anything you can't afford to lose -
-
-
- - -
- - - -
- - diff --git a/svelte/src/file_viewer/EmbedWindow.svelte b/svelte/src/file_viewer/EmbedWindow.svelte index 2a0ecf1..f62431a 100644 --- a/svelte/src/file_viewer/EmbedWindow.svelte +++ b/svelte/src/file_viewer/EmbedWindow.svelte @@ -55,7 +55,7 @@ let embed_iframe = () => { embed_html = `` } let embed_hotlink = () => { diff --git a/svelte/src/filesystem/Filesystem.svelte b/svelte/src/filesystem/Filesystem.svelte index 0671263..76e89b9 100644 --- a/svelte/src/filesystem/Filesystem.svelte +++ b/svelte/src/filesystem/Filesystem.svelte @@ -1,7 +1,7 @@ diff --git a/svelte/src/filesystem/filemanager/CreateDirectory.svelte b/svelte/src/filesystem/filemanager/CreateDirectory.svelte index 249d90c..849097c 100644 --- a/svelte/src/filesystem/filemanager/CreateDirectory.svelte +++ b/svelte/src/filesystem/filemanager/CreateDirectory.svelte @@ -1,21 +1,21 @@ diff --git a/svelte/src/filesystem/viewers/Video.svelte b/svelte/src/filesystem/viewers/Video.svelte index da11888..9e5daba 100644 --- a/svelte/src/filesystem/viewers/Video.svelte +++ b/svelte/src/filesystem/viewers/Video.svelte @@ -1,5 +1,5 @@ - - -
- - Bucket icon - {bucket.name} - -
-
-
- - - - - - - - -
Name
- - -
-
-
- - - diff --git a/svelte/src/user_buckets/UserBuckets.svelte b/svelte/src/user_buckets/UserBuckets.svelte deleted file mode 100644 index ec74e53..0000000 --- a/svelte/src/user_buckets/UserBuckets.svelte +++ /dev/null @@ -1,89 +0,0 @@ - - - - -
-

My Buckets

-
-
-
-
- -
- {#if creating_bucket} -
-
- - - - - - - - -
- Name - - -
- -
-
-
- {/if} - - {#each buckets as bucket (bucket.id)} - - {/each} -
-
-