diff --git a/res/include/md/limits.md b/res/include/md/limits.md
index 0b2eb59..9e1cc5b 100644
--- a/res/include/md/limits.md
+++ b/res/include/md/limits.md
@@ -15,5 +15,4 @@ place on pixeldrain.
| Premium data transfer | No | 10 GB / month | 1 TB / month | Unlimited (€2 / TB) |
| Video streaming | No | Within data cap | Yes | Yes |
| Ad-free file viewing | No | No | Yes | Yes |
-| Kickback fees | No | No | No | Yes |
| File viewer branding | No | No | From €8/month | Yes |
diff --git a/res/static/style/layout.css b/res/static/style/layout.css
index 2ed80f6..edb5d68 100644
--- a/res/static/style/layout.css
+++ b/res/static/style/layout.css
@@ -554,7 +554,6 @@ button>svg,
white-space: nowrap;
text-align: center;
box-shadow: inset 0 -10px 8px -12px var(--shadow_color);
- /* border-bottom: 2px solid var(--input_background); */
}
.tab_bar>button,
diff --git a/svelte/src/admin_panel/Home.svelte b/svelte/src/admin_panel/Home.svelte
index ce20a57..a3d1076 100644
--- a/svelte/src/admin_panel/Home.svelte
+++ b/svelte/src/admin_panel/Home.svelte
@@ -203,7 +203,7 @@ onDestroy(() => {
- Kickback bandwidth is counted when a paying pixeldrain user downloads
- one of your files using their data cap. If you are on a prepaid plan
- this usage will be compensated at a rate of €1 per TB. When this happens
- a positive transaction will be logged on the
- transactions page.
-
diff --git a/svelte/src/user_home/Home.svelte b/svelte/src/user_home/Home.svelte
index b91d94d..dba8d05 100644
--- a/svelte/src/user_home/Home.svelte
+++ b/svelte/src/user_home/Home.svelte
@@ -22,12 +22,10 @@ let load_graphs = async (minutes, interval) => {
let downloads = get_graph_data("downloads", start, end, interval);
let bandwidth = get_graph_data("bandwidth", start, end, interval);
let transfer_paid = get_graph_data("transfer_paid", start, end, interval);
- let transfer_kickback = get_graph_data("transfer_kickback", start, end, interval);
views = await views
downloads = await downloads
bandwidth = await bandwidth
transfer_paid = await transfer_paid
- transfer_kickback = await transfer_kickback
graph_views_downloads.data().labels = views.timestamps;
graph_views_downloads.data().datasets[0].data = views.amounts
@@ -35,7 +33,6 @@ let load_graphs = async (minutes, interval) => {
graph_bandwidth.data().labels = bandwidth.timestamps;
graph_bandwidth.data().datasets[0].data = bandwidth.amounts
graph_bandwidth.data().datasets[1].data = transfer_paid.amounts
- graph_bandwidth.data().datasets[2].data = transfer_kickback.amounts
graph_views_downloads.update()
graph_bandwidth.update()
@@ -52,7 +49,6 @@ let total_views = 0
let total_downloads = 0
let total_bandwidth = 0
let total_transfer_paid = 0
-let total_transfer_kickback = 0
let get_graph_data = async (stat, start, end, interval) => {
let resp = await fetch(
@@ -86,8 +82,6 @@ let get_graph_data = async (stat, start, end, interval) => {
total_bandwidth = total;
} else if (stat == "transfer_paid") {
total_transfer_paid = total;
- } else if (stat == "transfer_kickback") {
- total_transfer_kickback = total;
}
return resp
@@ -169,23 +163,16 @@ onMount(() => {
label: "Total bandwidth",
borderWidth: 2,
pointRadius: 0,
- borderColor: color_by_name("chart_1_color"),
- backgroundColor: color_by_name("chart_1_color"),
+ borderColor: color_by_name("highlight_color"),
+ backgroundColor: color_by_name("highlight_color"),
},
{
label: "Premium bandwidth",
borderWidth: 2,
pointRadius: 0,
- borderColor: color_by_name("chart_2_color"),
- backgroundColor: color_by_name("chart_2_color"),
- },
- {
- label: "Kickback bandwidth",
- borderWidth: 2,
- pointRadius: 0,
- borderColor: color_by_name("chart_3_color"),
- backgroundColor: color_by_name("chart_3_color"),
- },
+ borderColor: color_by_name("danger_color"),
+ backgroundColor: color_by_name("danger_color"),
+ }
];
update_graphs(10080, 60, true);
@@ -343,13 +330,6 @@ onDestroy(() => {
sharing enabled. Bandwidth sharing can be changed on
the subscription page.
- Address
- Pos
+ Role
Alive
Err
1m
@@ -222,7 +222,7 @@ onDestroy(() => {
class:highlight_green={peer.reachable}
>
{peer.address}
- {peer.position}
+ {peer.role}
{peer.reachable}
{peer.unreachable_count}
{peer.load_1_min.toFixed(1)}
diff --git a/svelte/src/user_home/ActivityLog.svelte b/svelte/src/user_home/ActivityLog.svelte
index 1e661fe..a9195d9 100644
--- a/svelte/src/user_home/ActivityLog.svelte
+++ b/svelte/src/user_home/ActivityLog.svelte
@@ -107,6 +107,8 @@ onMount(() => {
Blocked for abuse
{:else if row.event === "file_instance_expired"}
Expired
+ {:else if row.event === "file_instance_lost"}
+ File has been lost
{/if}
{formatDataVolume(total_bandwidth, 3)} bandwidth,
{formatDataVolume(total_transfer_paid, 3)} paid transfers
- {formatDataVolume(total_transfer_kickback, 3)} kickback transfers
Views and downloads
diff --git a/svelte/src/user_home/Transactions.svelte b/svelte/src/user_home/Transactions.svelte
index b7628d9..a5f726d 100644
--- a/svelte/src/user_home/Transactions.svelte
+++ b/svelte/src/user_home/Transactions.svelte
@@ -33,7 +33,6 @@ const load_transactions = async () => {
total_subscription_charge: 0,
total_storage_charge: 0,
total_bandwidth_charge: 0,
- total_kickback_fee: 0,
total_deposited: 0,
total_deducted: 0,
}
@@ -44,7 +43,6 @@ const load_transactions = async () => {
month.total_subscription_charge += row.subscription_charge
month.total_storage_charge += row.storage_charge
month.total_bandwidth_charge += row.bandwidth_charge
- month.total_kickback_fee += row.kickback_fee
month.total_deducted += row.subscription_charge + row.storage_charge + row.bandwidth_charge
})
transactions = month
@@ -248,7 +246,6 @@ onMount(() => {
Subscription
Storage
Bandwidth
- Kickback
Deposit
@@ -272,8 +268,6 @@ onMount(() => {
@@ -287,8 +281,6 @@ onMount(() => {
Usage
Charge
Usage
- Fee
- Amount