diff --git a/svelte/src/home_page/FeatureTable.svelte b/svelte/src/home_page/FeatureTable.svelte index c4e3211..14430b8 100644 --- a/svelte/src/home_page/FeatureTable.svelte +++ b/svelte/src/home_page/FeatureTable.svelte @@ -6,9 +6,11 @@ import OtherPlans from "./OtherPlans.svelte";

Pixeldrain features two different payment modes. We offer a monthly - subscription which is managed by Patreon, and a prepaid service which - supports a dozen different payment providers. For low usage Prepaid is - usually better as there's no monthly fee. + subscription which is managed by Patreon, and a Prepaid subscription + which supports a dozen different payment providers. With Prepaid you pay + in advance to charge your credit, then usage will be subtracted from + your account credit. For low usage Prepaid is usually better as the + monthly fee is much lower.

@@ -26,10 +28,10 @@ import OtherPlans from "./OtherPlans.svelte";
- Price + Recurring price
- Free + None
€4 / month or @@ -38,7 +40,7 @@ import OtherPlans from "./OtherPlans.svelte";
€1 / month minimum
- Only charged when total usage is below €1 + Only charged when usage is less than €1
@@ -50,7 +52,7 @@ import OtherPlans from "./OtherPlans.svelte";
6 GB per day
- Download speed is reduced to 1 MiB/s when exceeded. Max 5 concurrent + Download speed is reduced to 1 MiB/s when exceeded. Max 3 concurrent downloads
@@ -108,7 +110,7 @@ import OtherPlans from "./OtherPlans.svelte";
Files do not expire
- While prepaid plan is active + While prepaid subscription plan is active
@@ -128,12 +130,13 @@ import OtherPlans from "./OtherPlans.svelte"; None
- PayPal, Credit card + PayPal, Credit/debit
- PayPal, SEPA, - Credit card
- And many more + PayPal, + Credit/debit, + iDEAL
+ And many regional providers
@@ -162,12 +165,12 @@ import OtherPlans from "./OtherPlans.svelte"; {#if window.user.username === ""} Account required
- + login Log in or - + how_to_reg Register @@ -184,7 +187,7 @@ import OtherPlans from "./OtherPlans.svelte"; {:else if window.user.subscription.type === "patreon"} Patreon subscription active. Prepaid cannot be activated {:else if window.user.subscription.type === "prepaid"} - Prepaid plan is active.
+ Prepaid subscription is active
Current balance
@@ -224,6 +227,7 @@ import OtherPlans from "./OtherPlans.svelte"; .grid > div { justify-content: center; align-items: center; + align-content: center; text-align: center; padding: 0.25em; min-height: 3em; diff --git a/svelte/src/home_page/ForCreators.svelte b/svelte/src/home_page/ForCreators.svelte deleted file mode 100644 index 9a32f12..0000000 --- a/svelte/src/home_page/ForCreators.svelte +++ /dev/null @@ -1,121 +0,0 @@ - - -
-
-
- -
-

Prepaid

-

- Whether you're working with large video files, high quality photography - or a different kind of media. Pixeldrain is the best way to transfer - files to your customers! With prepaid you only pay for what you use. No - money wasted. -

-
- - Sunrise -

Simple and affordable pricing

-
    -
  • €4.00 per TB per month for storage
    • -
  • €1.00 per TB for downloading and sharing files
    • -
- -
-
- - Download page branding -

Customizable

-

- Downloading files doesn't have to be - dull. Pixeldrain allows you to customize the look of - your download pages. Transfer files to your customers in - style! We also allow you to link directly to the file itself - and circumvent the download page completely. -

-
-

Get started

- {#if window.user.username !== ""} - {#if window.user.subscription.type === "patreon"} -

- You already have a Patreon subscription active. You cannot use - Prepaid while that subscription is active. -

- - {:else if window.user.subscription.type === "prepaid"} -

- You already have a Prepaid subscription active. Your account - balance is . Use - the form below to top up your balance. -

- - {:else} -

- You are currently logged in as {window.user.username}. Use the - form below to activate a prepaid subscription on this account. -

- - {/if} - {:else} -

- You are currently not logged in to a pixeldrain account. Log in to - get started. -

-

- - login - Log in - - or - - how_to_reg - Register - -

- {/if} -
- - - diff --git a/svelte/src/home_page/HomePage.svelte b/svelte/src/home_page/HomePage.svelte index ef7ed51..4282e90 100644 --- a/svelte/src/home_page/HomePage.svelte +++ b/svelte/src/home_page/HomePage.svelte @@ -83,13 +83,12 @@ let upload_widget
€ 1 / TB
-
Account inactivity
+
Minimum fee *
€1 / month

- Inactivity pricing is only applied when monthly usage is less than - €1 + * The minimum fee is only charged when usage is less than €1

What you get

@@ -150,7 +149,7 @@ let upload_widget
-

Premium plans

+

Subscription plans

diff --git a/svelte/src/user_home/BandwidthSharing.svelte b/svelte/src/user_home/BandwidthSharing.svelte index f071079..73ed8b2 100644 --- a/svelte/src/user_home/BandwidthSharing.svelte +++ b/svelte/src/user_home/BandwidthSharing.svelte @@ -118,10 +118,10 @@ onMount(() => {

- The billshock limit limits how much bandwidth your account can use - in a 30 day window. When this limit is reached files will show ads - again and can only be downloaded from the file viewer page. This is - mostly useful for prepaid plans, but it works for patreon plans too. + The billshock limit limits how much bandwidth your account can use in a + 30 day window. When this limit is reached hotlinking will be disabled + and you will no longer be charged for bandwidth usage. This is mostly + useful for the Prepaid subscription, but it works for Patreon plans too. Set to 0 to disable the limit.

diff --git a/svelte/src/user_home/DepositCredit.svelte b/svelte/src/user_home/DepositCredit.svelte index a09679f..904eb8c 100644 --- a/svelte/src/user_home/DepositCredit.svelte +++ b/svelte/src/user_home/DepositCredit.svelte @@ -81,13 +81,12 @@ onMount(() => {

Deposit credit

- Pixeldrain credit can be used for our prepaid plans, which are different - from the Patreon plans. With prepaid you only pay for what you use, at a - rate of €4 per TB per month for storage and €1 per TB for data transfer. - See the Subscriptions tab for more information about the perks. -

-

- Current account balance: + Pixeldrain credit can be used for our Prepaid subscription plan, which + is different from the Patreon plans. Instead of monthly limits, with + Prepaid there are no limits. You pay for what you use, at a rate of €4 + per TB per month for storage and €1 per TB for data transfer. Your + current account balance is

diff --git a/svelte/src/user_home/OTPSetup.svelte b/svelte/src/user_home/OTPSetup.svelte index b1b02f5..93ee983 100644 --- a/svelte/src/user_home/OTPSetup.svelte +++ b/svelte/src/user_home/OTPSetup.svelte @@ -11,17 +11,21 @@ let uri = "" let qr = "" let reveal_key = false const generate_key = async () => { - let form = new FormData() - form.set("action", "generate") - const resp = await check_response(await fetch( - get_endpoint() + "/user/totp", - {method: "POST", body: form}, - )) + try { + let form = new FormData() + form.set("action", "generate") + const resp = await check_response(await fetch( + get_endpoint() + "/user/totp", + {method: "POST", body: form}, + )) - secret = resp.secret - uri = resp.uri - qr = get_endpoint()+"/misc/qr?text=" +encodeURIComponent(resp.uri) - console.log(resp) + secret = resp.secret + uri = resp.uri + qr = get_endpoint()+"/misc/qr?text=" +encodeURIComponent(resp.uri) + console.log(resp) + } catch (err) { + alert("Verification failed: "+err.value+"\n"+err.message) + } } let otp = "" @@ -34,7 +38,7 @@ const verify = async (e: SubmitEvent) => { form.set("secret", secret) try { - const resp = await check_response(await fetch( + await check_response(await fetch( get_endpoint() + "/user/totp", {method: "POST", body: form}, )) @@ -51,6 +55,8 @@ const verify = async (e: SubmitEvent) => { "might be incorrect. Please enable time synchronization in "+ "your operating system." ) + } else { + alert("Verification failed: "+err.value+"\n"+err.message) } } } diff --git a/svelte/src/user_home/Router.svelte b/svelte/src/user_home/Router.svelte index 1e942da..9054847 100644 --- a/svelte/src/user_home/Router.svelte +++ b/svelte/src/user_home/Router.svelte @@ -42,12 +42,12 @@ let pages: Tab[] = [ subpages: [ { path: "/user/subscription", - title: "Manage subscription", + title: "Manage", icon: "shopping_cart", component: Subscription, }, { path: "/user/prepaid/deposit", - title: "Prepaid", + title: "Deposit Credit", icon: "account_balance_wallet", component: DepositCredit, }, { diff --git a/svelte/src/user_home/Subscription.svelte b/svelte/src/user_home/Subscription.svelte index 5253c79..6c9ac58 100644 --- a/svelte/src/user_home/Subscription.svelte +++ b/svelte/src/user_home/Subscription.svelte @@ -94,12 +94,12 @@ onMount(() => { target="_blank">on Patreon.

- The Prepaid plan is charged daily based on usage. When you reach - negative balance the subscription will automatically end. Need at least - account credit to activate prepaid. Your current - prepaid credit is . You - can deposit credit on the credit deposit - page. + The Prepaid subscription is charged daily based on usage. When you reach + negative balance the subscription will automatically end. You need at + least account credit to activate prepaid. Your + current credit amount is . You can deposit credit on the + credit deposit page.

Available subscription plans

@@ -165,8 +165,8 @@ onMount(() => {

  • - €1 / month minimum price (only charged when monthly - total is below €1) + €1 / month minimum price (only charged when usage is + below €1)
  • €4 per TB per month for storage