@@ -110,11 +110,10 @@ export const copy_link = () => {
overflow-x: hidden;
overflow-y: hidden;
transition: max-height 0.3s;
- border-top: 1px solid var(--separator);
background: var(--shaded_background);
position: sticky;
- bottom: 0;
+ bottom: 4px;
}
.grid {
display: grid;
diff --git a/svelte/src/filesystem/edit_window/AccessControl.svelte b/svelte/src/filesystem/edit_window/AccessControl.svelte
index 1f8896b..fdc8cda 100644
--- a/svelte/src/filesystem/edit_window/AccessControl.svelte
+++ b/svelte/src/filesystem/edit_window/AccessControl.svelte
@@ -1,6 +1,6 @@
+
+
@@ -222,7 +223,7 @@ import OtherPlans from "./OtherPlans.svelte";
Free
+
+
+
+ {/if}
+
+
+
diff --git a/svelte/src/filesystem/upload_widget/UploadFunc.ts b/svelte/src/filesystem/upload_widget/UploadFunc.ts
index 74dad3a..d9d4797 100644
--- a/svelte/src/filesystem/upload_widget/UploadFunc.ts
+++ b/svelte/src/filesystem/upload_widget/UploadFunc.ts
@@ -9,7 +9,7 @@
//
// on_error is called when the upload has failed. The parameters are the error
-import { fs_path_url, type GenericResponse } from "lib/FilesystemAPI.svelte"
+import { fs_path_url, type GenericResponse } from "lib/FilesystemAPI"
// code and an error message
export const upload_file = (
diff --git a/svelte/src/filesystem/viewers/Audio.svelte b/svelte/src/filesystem/viewers/Audio.svelte
index 87c5b97..e8a4081 100644
--- a/svelte/src/filesystem/viewers/Audio.svelte
+++ b/svelte/src/filesystem/viewers/Audio.svelte
@@ -1,6 +1,6 @@
diff --git a/svelte/src/filesystem/viewers/Text.svelte b/svelte/src/filesystem/viewers/Text.svelte
index b066471..dd3bdbb 100644
--- a/svelte/src/filesystem/viewers/Text.svelte
+++ b/svelte/src/filesystem/viewers/Text.svelte
@@ -1,6 +1,6 @@
+
+
+ {#if error}
+ delete Trash
+
+
+ {#if entries.length > 0}
+
+ {/if}
+
+ {error}
+ {:else if loaded && entries.length === 0} +The trash is empty.
+ {:else if entries.length > 0} +| + | Name | +Original location | +Deleted | +Size | ++ |
|
+ |
+ + + {entry.node.name} + + | ++ {entry.original_path || "—"} + | ++ {entry.deletion_date ? formatDate(entry.deletion_date) : "—"} + | ++ {#if entry.node.type === "file"} + {formatDataVolume(entry.node.file_size, 3)} + {/if} + | +
+
+
+
+
+ |
+
- {#if window.user.subscription.id === "patreon_1"}
+ {#if $user !== null && $user.subscription.id === "patreon_1"}
You have this plan
Thank you for supporting Nova! {:else} @@ -240,7 +241,7 @@ import OtherPlans from "./OtherPlans.svelte"; {/if}
Thank you for supporting Nova! {:else} @@ -240,7 +241,7 @@ import OtherPlans from "./OtherPlans.svelte"; {/if}
- {#if window.user.username === ""}
+ {#if $user === null}
Account required
@@ -257,16 +258,16 @@ import OtherPlans from "./OtherPlans.svelte"; No recurring payments {:else} - {#if window.user.subscription.type === ""} + {#if $user.subscription.type === ""} Deposit credit to activate Prepaid - {:else if window.user.subscription.type === "patreon"} + {:else if $user.subscription.type === "patreon"} Patreon subscription active. Prepaid cannot be activated - {:else if window.user.subscription.type === "prepaid"} + {:else if $user.subscription.type === "prepaid"} Prepaid subscription is active
- Current balance
+ Current balance
Top up my credit diff --git a/svelte/src/home_page/GetStarted.svelte b/svelte/src/home_page/GetStarted.svelte index d40b782..9f8120a 100644 --- a/svelte/src/home_page/GetStarted.svelte +++ b/svelte/src/home_page/GetStarted.svelte @@ -1,28 +1,28 @@ - -{#if window.user.username !== ""} +{#if $user !== null}
- {#if window.user.subscription.type === "patreon"}
+ {#if $user.subscription.type === "patreon"}
@@ -107,6 +87,11 @@ let upload_widget
+@@ -257,16 +258,16 @@ import OtherPlans from "./OtherPlans.svelte"; No recurring payments {:else} - {#if window.user.subscription.type === ""} + {#if $user.subscription.type === ""} Deposit credit to activate Prepaid - {:else if window.user.subscription.type === "patreon"} + {:else if $user.subscription.type === "patreon"} Patreon subscription active. Prepaid cannot be activated - {:else if window.user.subscription.type === "prepaid"} + {:else if $user.subscription.type === "prepaid"} Prepaid subscription is active
- Current balance
Top up my credit diff --git a/svelte/src/home_page/GetStarted.svelte b/svelte/src/home_page/GetStarted.svelte index d40b782..9f8120a 100644 --- a/svelte/src/home_page/GetStarted.svelte +++ b/svelte/src/home_page/GetStarted.svelte @@ -1,28 +1,28 @@ - -{#if window.user.username !== ""} +{#if $user !== null}
You already have a Patreon subscription active. You cannot use Prepaid while that subscription is active.
- - {:else if window.user.subscription.type === "prepaid"} + {:else if $user.subscription.type === "prepaid"}
You already have a Prepaid subscription active. Your account
- balance is
- You are currently logged in as '{window.user.username}'. Use the + You are currently logged in as '{$user.username}'. Use the form below to activate prepaid on this account.
-
-
-
- Storage pricing
- € 4 / TB / month
-
-
- Egress pricing
- € 1 / TB
- What Nova is good at
--
-
- - Serving large files to millions of people worldwide - -
- - Storing files for less money than all the competition - -
Subscription plans
+Get started
-
-
-
diff --git a/svelte/src/home_page/SubscriptionPlans.svelte b/svelte/src/home_page/SubscriptionPlans.svelte
new file mode 100644
index 0000000..096c59f
--- /dev/null
+++ b/svelte/src/home_page/SubscriptionPlans.svelte
@@ -0,0 +1,226 @@
+
+
+
-
-
- Persistence
- {#if window.user.subscription.id === "patreon_2"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 8 - - / month - {/if} -
- - {#if window.user.subscription.id === "patreon_2"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 8 - - / month - {/if} -
-
- 100 GB max file size
- Files never expire
- 8 TB transfer limit
- 4 TB storage space
-
- File viewer
- branding: Set a custom theme and header,
- footer and background images on the download pages
- for your files
-
-
-
-
- Tenacity
- {#if window.user.subscription.id === "patreon_3"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 16 - - / month - {/if} -
- - {#if window.user.subscription.id === "patreon_3"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 16 - - / month - {/if} -
-
- 100 GB max file size
- Files never expire
- 16 TB transfer limit
- 8 TB storage space
- File viewer branding
-
-
-
- Eternity
- {#if window.user.subscription.id === "patreon_4"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 32 - - / month - {/if} -
- - {#if window.user.subscription.id === "patreon_4"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 32 - - / month - {/if} -
-
- 100 GB max file size
- Files never expire
- 32 TB transfer limit
- 16 TB storage space
- File viewer branding
-
-
-
- Infinity
- {#if window.user.subscription.id === "patreon_6"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 64 - - / month - {/if} -
- - {#if window.user.subscription.id === "patreon_6"} - You have this plan
- Thank you for supporting Nova! - {:else} - - € 64 - - / month - {/if} -
-
- 100 GB max file size
- Files never expire
- 64 TB transfer limit
- 32 TB storage space
- File viewer branding
-
+
+
+
diff --git a/svelte/src/layout/IconBlock.svelte b/svelte/src/layout/IconBlock.svelte
index 65e5191..62ad77a 100644
--- a/svelte/src/layout/IconBlock.svelte
+++ b/svelte/src/layout/IconBlock.svelte
@@ -1,7 +1,7 @@
-
+ {#each plans as plan (plan.title)}
+
+
+
+ {/each}
+
+ {plan.title}
+
+ / month
+
+ +
+
+
+ {formatDataVolume(plan.storage, 0)}
+ storage space
+
+
+ {formatDataVolume(plan.egress, 0)}
+ egress traffic per month
+
+
+ {#if plan.checkout_cadence_1 !== undefined}
+
+ / month
+
+ {:else}
+ Monthly plan not available
+ {/if}
+ {#if plan.checkout_cadence_6 !== undefined}
+
+ / 6 months
+
+ {:else}
+ Bi-yearly plan not available
+ {/if}
+ {#if plan.checkout_cadence_12 !== undefined}
+
+ / year
+
+ {:else}
+ Yearly plan not available
+ {/if}
+
+ Monthly
+ Bi-yearly (save 10%)
+ Yearly (save 20%)
+
- {@render children?.()}
+
+
diff --git a/svelte/src/util/ProgressBar.svelte b/svelte/src/util/ProgressBar.svelte
index 3c3bcdc..7bef300 100644
--- a/svelte/src/util/ProgressBar.svelte
+++ b/svelte/src/util/ProgressBar.svelte
@@ -1,6 +1,4 @@
+ {@render children?.()}
+