From a890684f59f79770ff9024d72b36822dbc22d752 Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Thu, 12 Sep 2024 17:35:12 +0200 Subject: [PATCH] Update subscriptions page --- res/static/style/layout.css | 2 - svelte/src/admin_panel/PeerTable.svelte | 10 ++-- svelte/src/home_page/ForCreators.svelte | 15 +---- svelte/src/user_home/Subscription.svelte | 57 ++----------------- .../user_home/dashboard/CardAccount.svelte | 17 +++--- 5 files changed, 23 insertions(+), 78 deletions(-) diff --git a/res/static/style/layout.css b/res/static/style/layout.css index 16cde12..2b374ed 100644 --- a/res/static/style/layout.css +++ b/res/static/style/layout.css @@ -269,10 +269,8 @@ section { .highlight_blue, .highlight_yellow, .highlight_red { - position: relative; width: auto; height: auto; - overflow: hidden; text-align: center; padding: 4px; border-radius: 8px; diff --git a/svelte/src/admin_panel/PeerTable.svelte b/svelte/src/admin_panel/PeerTable.svelte index 57a41b5..7474aec 100644 --- a/svelte/src/admin_panel/PeerTable.svelte +++ b/svelte/src/admin_panel/PeerTable.svelte @@ -17,7 +17,7 @@ let update_peers = (peers) => { sort("") } -let sort_field = "address" +let sort_field = "hostname" let asc = true let sort = (field) => { if (field !== "" && field === sort_field) { @@ -54,7 +54,8 @@ let sort = (field) => { - + + @@ -67,7 +68,7 @@ let sort = (field) => { - {#each peers as peer (peer.address)} + {#each peers as peer (peer.ip)} { class:highlight_green={peer.reachable} animate:flip={{duration: 1000}} > - + + diff --git a/svelte/src/home_page/ForCreators.svelte b/svelte/src/home_page/ForCreators.svelte index f073018..9b7837d 100644 --- a/svelte/src/home_page/ForCreators.svelte +++ b/svelte/src/home_page/ForCreators.svelte @@ -19,19 +19,10 @@ import Euro from "../util/Euro.svelte"; Sunrise

Simple and affordable pricing

- - No file expiry: -
- 240 day file expiry: -
diff --git a/svelte/src/user_home/Subscription.svelte b/svelte/src/user_home/Subscription.svelte index de41bd4..6726247 100644 --- a/svelte/src/user_home/Subscription.svelte +++ b/svelte/src/user_home/Subscription.svelte @@ -65,8 +65,7 @@ onMount(() => {

Payment successful!

Thank you for supporting pixeldrain! The credit has been added - to your account balance. Activate a subscription plan below to - finish upgrading your account. + to your account balance.

If your account credit has not been updated, please check the @@ -74,7 +73,8 @@ onMount(() => { href="/user/prepaid/deposit#invoices">the invoices page. Depending on the payment processor you used it can take a while before your credit is deposited. SEPA transfers can take up to - two working days for example. If it takes too long contact + two working days for example. When the deposit is complete you + will receive an e-mail. If it takes too long, contact support@pixeldrain.com.

@@ -92,7 +92,7 @@ onMount(() => { Pixeldrain cannot modify your Patreon membership in any way.

- Prepaid subscriptions are charged daily based on usage. When you reach + The Prepaid plan is charged daily based on usage. When you reach negative balance the subscription will automatically end. You will need a positive balance to activate the subscription again.

@@ -178,63 +178,14 @@ onMount(() => { -
-
- 240 days storage
- {#if subscription === "prepaid_temp_storage_120d"} - Currently active - {:else} - - {/if} -
-
-

- You will need a positive account balance to activate this - plan. -

-
    -
  • Base price of €1 per month
    • -
  • €0.50 per TB per month for storage
    • -
  • - €2 per TB for data transfer (with bandwidth sharing - enabled) -
    • -
  • - Files expire 240 days after they are last viewed or - downloaded -
    • -
  • - Download page branding - options -
    • -
  • - File embedding - control options -
    • -
-
-
Free
{#if subscription === ""} Currently active - {:else} - {/if}
-

- Switching to the free plan with another subscription active - may cause your files to expire! -

  • Standard free plan, files expire after 120 days.
  • Download limit of 5 GB per day
    • diff --git a/svelte/src/user_home/dashboard/CardAccount.svelte b/svelte/src/user_home/dashboard/CardAccount.svelte index 79f6f25..82fe94f 100644 --- a/svelte/src/user_home/dashboard/CardAccount.svelte +++ b/svelte/src/user_home/dashboard/CardAccount.svelte @@ -1,13 +1,16 @@
    • Username: {window.user.username}
      • -
    • - {#if window.user.email === ""} - No e-mail address configured. You will not be able to recover - your account if you lose your password. - {:else} + {#if window.user.email === ""} +
    • + No e-mail address configured. You will not be able to recover your + account if you lose your password. Set an e-mail address on the Settings page. +
      • + {:else} +
    • E-mail address: {window.user.email} - {/if} -
      • + + {/if}
    • settings Account settings
AddressHostnameAddress Err Load Ping
{peer.address}{peer.hostname}{peer.ip} {peer.unreachable_count} {peer.load_1_min.toFixed(1)} / {peer.load_5_min.toFixed(1)} / {peer.load_15_min.toFixed(1)} {(peer.latency/1000).toFixed(3)}