diff --git a/res/include/script/file_viewer/Viewer.js b/res/include/script/file_viewer/Viewer.js index 46da26a..6a1df74 100644 --- a/res/include/script/file_viewer/Viewer.js +++ b/res/include/script/file_viewer/Viewer.js @@ -95,6 +95,27 @@ function Viewer(type, viewToken, data) { // Show introduction popup new IntroPopup() + // Delete all the garbage that advertisers leave behind in my cookies and + // localstorage + // window.addEventListener("beforeunload", () => { + // document.cookie.split("; ").forEach(cookie => { + // let name = cookie.split("=")[0] + // if (name !== "pd_auth_key" && name !== "style") { + // document.cookie = name + "=; Max-Age=0; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=Lax; path=/;" + // } + // }) + + // let keys = [] + // for (let i = 0; i < localStorage.length; i++) { + // keys.push(localStorage.key(i)) + // } + // keys.forEach(key => { + // if (key !== "viewer_intro_popup_dismissed" && key !== "uploaded_files") { + // localStorage.removeItem(key) + // } + // }) + // }) + this.initialized = true } diff --git a/res/include/style/layout.css b/res/include/style/layout.css index 9662530..feb1ac5 100644 --- a/res/include/style/layout.css +++ b/res/include/style/layout.css @@ -89,7 +89,6 @@ body, .checkers { background: var(--input_color); border-radius: 0; border-bottom-right-radius: 90%; - box-shadow: 2px 2px 8px -3px #000000; box-shadow: 2px 2px 8px -3px var(--shadow_color); } .button_toggle_navigation:active { @@ -111,8 +110,7 @@ body, .checkers { overflow-y: auto; overflow-x: hidden; text-align: left; - box-shadow: inset -10px 0px 10px -10px #000000; - box-shadow: inset -10px 0px 10px -10px var(--shadow_color); + box-shadow: inset -8px 0px 8px -8px var(--shadow_color); transition: left 0.5s; } .page_body { @@ -148,8 +146,7 @@ body, .checkers { padding: 0 0 20px 0; background-color: #212121; background-color: var(--layer_2_color); - box-shadow: 1px 1px 20px 0 #000000; - box-shadow: 1px 1px 20px 0 var(--shadow_color); + box-shadow: 1px 1px 12px 0 var(--shadow_color); box-sizing: border-box; clear: both; } @@ -207,6 +204,7 @@ body, .checkers { .highlight_lighter, .highlight_green, .highlight_blue, +.highlight_yellow, .highlight_red, .highlight_1, .highlight_2, @@ -222,27 +220,31 @@ body, .checkers { } .highlight_dark, .highlight_1 { background-color: var(--layer_1_color); - box-shadow: 1px 1px var(--layer_1_shadow) 0 var(--shadow_color); + box-shadow: 1px 1px 6px -2px var(--shadow_color); } .highlight_middle, .highlight_2 { background-color: var(--layer_2_color); - box-shadow: 1px 1px var(--layer_2_shadow) 0 var(--shadow_color); + box-shadow: 1px 1px 6px -2px var(--shadow_color); } .highlight_light, .highlight_3 { background-color: var(--layer_3_color); - box-shadow: 1px 1px var(--layer_3_shadow) 0 var(--shadow_color); + box-shadow: 1px 1px 6px -2px var(--shadow_color); } .highlight_lighter, .highlight_4 { background-color: var(--layer_4_color); - box-shadow: 1px 1px var(--layer_4_shadow) 0 var(--shadow_color); + box-shadow: 1px 1px 6px -2px var(--shadow_color); } .highlight_green { background-color: rgba(0, 255, 0, 0.05); - border-color: #00d000; + border-color: #00D000; } .highlight_blue { background-color: rgba(32, 32, 255, 0.2); - border-color: rgb(54, 54, 255); + border-color: #3636FF; +} +.highlight_yellow { + background-color: rgba(255, 255, 0, 0.05); + border-color: #A0A000; } .highlight_red { background-color: rgba(255, 0, 0, 0.1); @@ -251,6 +253,7 @@ body, .checkers { .highlight_green, .highlight_blue, +.highlight_yellow, .highlight_red { border-top-width: 1px; border-top-style: solid; @@ -262,8 +265,7 @@ body, .checkers { h1, h2, h3, h4, h5, h6 { line-height: 1em; - margin-left: 10px; - margin-right: 10px; + margin: 0.5em 10px; font-weight: normal; } @@ -508,22 +510,26 @@ select:disabled , select.disabled { .round { border-radius: 32px; } -.tab { - margin: 0 0 10px 8px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} -.tab:last-child { - margin-right: 8px; -} .tab_bar { display: block; width: 100%; + margin: 0 0 16px 0; overflow-x: auto; overflow-y: hidden; white-space: nowrap; box-sizing: border-box; text-align: center; + background-color: var(--layer_1_color); + box-shadow: inset 0 -10px 8px -12px var(--shadow_color); +} +.tab_bar > button, +.tab_bar > .button { + margin: 10px 0 0 10px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +.tab_bar > *:last-child { + margin-right: 10px; } /* Dropdown list of the select tag */ diff --git a/res/include/style/viewer.css b/res/include/style/viewer.css index 8e2a3ae..916c0a7 100644 --- a/res/include/style/viewer.css +++ b/res/include/style/viewer.css @@ -161,7 +161,7 @@ overflow-y: scroll; overflow-x: hidden; float: left; - box-shadow: inset 1px 1px var(--layer_1_shadow) var(--shadow_color); + box-shadow: inset 1px 1px 5px var(--shadow_color); background-color: var(--layer_1_color); border-radius: 16px; text-align: center; @@ -211,7 +211,7 @@ } .pannable { cursor: move; } -.drop_shadow { box-shadow: 1px 1px var(--layer_3_shadow) var(--shadow_color); } +.drop_shadow { box-shadow: 1px 1px 5px var(--shadow_color); } /* ======================== || TOOLBAR COMPONENTS || @@ -317,7 +317,7 @@ table {width: auto !important;} max-width: 80%; height: auto; background-color: var(--layer_4_color); - box-shadow: 1px 1px var(--layer_4_shadow) var(--shadow_color); + box-shadow: 1px 1px 10px var(--shadow_color); border-radius: 20px; z-index: 50; transition: opacity .4s, left .5s, top .5s; diff --git a/svelte/src/admin_panel.js b/svelte/src/admin_panel.js index 0f30536..2a03ca7 100644 --- a/svelte/src/admin_panel.js +++ b/svelte/src/admin_panel.js @@ -1,4 +1,4 @@ -import App from './admin_panel/AdminPanel.svelte'; +import App from './admin_panel/Router.svelte'; const app = new App({ target: document.getElementById("page_content"), diff --git a/svelte/src/admin_panel/AbuseReporters.svelte b/svelte/src/admin_panel/AbuseReporters.svelte index 3d07593..2ba4879 100644 --- a/svelte/src/admin_panel/AbuseReporters.svelte +++ b/svelte/src/admin_panel/AbuseReporters.svelte @@ -153,7 +153,7 @@ onMount(get_reporters); {formatDate(reporter.last_used, true, true, false)} {formatDate(reporter.created, false, false, false)} - diff --git a/svelte/src/admin_panel/Home.svelte b/svelte/src/admin_panel/Home.svelte index 55a691c..54c8187 100644 --- a/svelte/src/admin_panel/Home.svelte +++ b/svelte/src/admin_panel/Home.svelte @@ -155,42 +155,44 @@ onDestroy(() => {

Pixelstore peers

- - - - - - - - - - - - - - - - - {#each status.peers as peer} - - - - - - - - - - - - - {/each} - -
AddressPosAliveErr1m5m15mPingFreeMin free
{peer.address}{peer.position}{peer.reachable}{peer.unreachable_count}{peer.load_1_min.toFixed(1)}{peer.load_5_min.toFixed(1)}{peer.load_15_min.toFixed(1)}{formatDuration(peer.latency, 3)}{formatDataVolume(peer.free_space, 4)}{formatDataVolume(peer.min_free_space, 3)}
+
+ + + + + + + + + + + + + + + + + {#each status.peers as peer} + + + + + + + + + + + + + {/each} + +
AddressPosAliveErr1m5m15mPingFreeMin free
{peer.address}{peer.position}{peer.reachable}{peer.unreachable_count}{peer.load_1_min.toFixed(1)}{peer.load_5_min.toFixed(1)}{peer.load_15_min.toFixed(1)}{formatDuration(peer.latency, 3)}{formatDataVolume(peer.free_space, 4)}{formatDataVolume(peer.min_free_space, 3)}
+

Pixelstore stats

@@ -236,32 +238,34 @@ onDestroy(() => {

Query statistics

- - - - - - - - - - - - {#each status.query_statistics as q} +
+
{ getStats('query_name') }}>Query { getStats('calls') }}>Calls { getStats('average_duration') }}>Average Duration { getStats('total_duration') }}>Total DurationCallers
+ - - - - - + + + + + - {/each} - -
{q.query_name}{q.calls}{formatDuration(q.average_duration, 3)}{formatDuration(q.total_duration, 0)} - {#each q.callers as caller} - {caller.count}x {caller.name}
- {/each} - 		{ getStats('query_name') }}>Query { getStats('calls') }}>Calls { getStats('average_duration') }}>Avg dur { getStats('total_duration') }}>Total durCallers
+ + + {#each status.query_statistics as q} + + {q.query_name} + {q.calls} + {q.average_duration}ms + {formatDuration(q.total_duration, 0)} + + {#each q.callers as caller} + {caller.count}x {caller.name}
+ {/each} + + + {/each} + + + diff --git a/svelte/src/admin_panel/AdminPanel.svelte b/svelte/src/admin_panel/Router.svelte similarity index 90% rename from svelte/src/admin_panel/AdminPanel.svelte rename to svelte/src/admin_panel/Router.svelte index a024bcd..f76d665 100644 --- a/svelte/src/admin_panel/AdminPanel.svelte +++ b/svelte/src/admin_panel/Router.svelte @@ -26,44 +26,43 @@ onMount(() => {
- {navigate("status", "Status")}}> home Status - + block Block files - {navigate("abuse_reports", "Abuse reports")}}> flag User abuse reports - {navigate("abuse_reporters", "Abuse reporters")}}> report E-mail abuse reporters - {navigate("ip_bans", "IP bans")}}> remove_circle IP bans - + edit Update global settings
-
{#if page === "status"} diff --git a/svelte/src/filesystem/Sharebar.svelte b/svelte/src/filesystem/Sharebar.svelte index 780f4d0..3b29a5f 100644 --- a/svelte/src/filesystem/Sharebar.svelte +++ b/svelte/src/filesystem/Sharebar.svelte @@ -73,7 +73,7 @@ const share_tumblr = () => { overflow-x: hidden; float: left; background-color: var(--layer_1_color); - box-shadow: inset 1px 1px var(--layer_1_shadow) var(--shadow_color); + box-shadow: inset 1px 1px 5px var(--shadow_color); text-align: center; z-index: 48; overflow: hidden; diff --git a/svelte/src/filesystem/filemanager/FileManager.svelte b/svelte/src/filesystem/filemanager/FileManager.svelte index b39d048..40c3679 100644 --- a/svelte/src/filesystem/filemanager/FileManager.svelte +++ b/svelte/src/filesystem/filemanager/FileManager.svelte @@ -236,7 +236,7 @@ const toggle_select = () => { margin: 16px 0 16px 0; text-align: left; background-color: var(--layer_2_color); - box-shadow: 1px 1px var(--layer_2_shadow) var(--shadow_color); + box-shadow: 1px 1px 5px var(--shadow_color); box-sizing: border-box; border-collapse: collapse; } diff --git a/svelte/src/filesystem/filemanager/FileUploader.svelte b/svelte/src/filesystem/filemanager/FileUploader.svelte index b59f70b..a5ccaa3 100644 --- a/svelte/src/filesystem/filemanager/FileUploader.svelte +++ b/svelte/src/filesystem/filemanager/FileUploader.svelte @@ -197,7 +197,7 @@ const paste = (e) => { margin: 6px 0 0 0; padding: 0; background-color: var(--layer_2_color); - box-shadow: 1px 1px var(--layer_2_shadow) var(--shadow_color); + box-shadow: 1px 1px 5px var(--shadow_color); } .upload_progress_bar { diff --git a/svelte/src/filesystem/viewers/Image.svelte b/svelte/src/filesystem/viewers/Image.svelte index 2448a33..62b0697 100644 --- a/svelte/src/filesystem/viewers/Image.svelte +++ b/svelte/src/filesystem/viewers/Image.svelte @@ -76,7 +76,7 @@ const mouseup = (e) => { top: 50%; cursor: pointer; transform: translateY(-50%); - box-shadow: 1px 1px var(--layer_3_shadow) var(--shadow_color); + box-shadow: 1px 1px 5px var(--shadow_color); } .image.zoom { max-width: none; diff --git a/svelte/src/filesystem/viewers/Video.svelte b/svelte/src/filesystem/viewers/Video.svelte index 4b9095a..e785213 100644 --- a/svelte/src/filesystem/viewers/Video.svelte +++ b/svelte/src/filesystem/viewers/Video.svelte @@ -63,6 +63,6 @@ onMount(() => { max-height: 100%; top: 50%; transform: translateY(-50%); - box-shadow: 1px 1px var(--layer_3_shadow) var(--shadow_color); + box-shadow: 1px 1px 5px var(--shadow_color); } diff --git a/svelte/src/user_buckets/UserBucket.svelte b/svelte/src/user_buckets/UserBucket.svelte index 13345c3..8ead198 100644 --- a/svelte/src/user_buckets/UserBucket.svelte +++ b/svelte/src/user_buckets/UserBucket.svelte @@ -73,7 +73,7 @@ const delete_bucket = async () => { text-decoration: none; background-color: var(--layer_3_color); transition: box-shadow 0.5s; - box-shadow: 1px 1px var(--layer_3_shadow) 0 var(--shadow_color); + box-shadow: 1px 1px 5px 0 var(--shadow_color); margin: 1em 0; border-radius: 8px; overflow: hidden; diff --git a/svelte/src/user_home/APIKeys.svelte b/svelte/src/user_home/APIKeys.svelte index 83f3613..e44ec8e 100644 --- a/svelte/src/user_home/APIKeys.svelte +++ b/svelte/src/user_home/APIKeys.svelte @@ -84,7 +84,7 @@ const logout = async (key) => { {/if}
{#if !loaded} -
+

Warning

API keys are sensitive information. They can be used to gain diff --git a/svelte/src/user_home/Home.svelte b/svelte/src/user_home/Home.svelte index ed92575..c692ac0 100644 --- a/svelte/src/user_home/Home.svelte +++ b/svelte/src/user_home/Home.svelte @@ -183,7 +183,7 @@ onDestroy(() => { refresh the page.

-
+