- {#if isScaleDowngrade}
- You'll continue using the {currentOrgPlan.name} plan until your current cycle ends on
- {!selectedPlan.trialDays
- ? toLocaleDate(billingPayDate.toString())
- : toLocaleDate(trialEndDate.toString())}. Starting the next cycle, your plan will switch to {selectedPlan.name}, and you'll be
- charged
- {formatCurrency(grossCost)}
- every 30 days.
- {:else}
- You'll pay
- {formatCurrency(estimatedTotal)}
- now, with our first billing cycle starting on
- {!selectedPlan.trialDays
- ? toLocaleDate(billingPayDate.toString())
- : toLocaleDate(trialEndDate.toString())}. Once your credits run out, you'll be charged
- {formatCurrency(selectedPlan.price)} plus usage fees every 30
- days.
- {/if}
+ You'll pay {formatCurrency(estimatedTotal)} now, with your first
+ billing cycle starting on
+ {!currentPlan.trialDays
+ ? toLocaleDate(billingPayDate.toString())
+ : toLocaleDate(trialEndDate.toString())}. Once your credits run out, you'll be charged
+ {formatCurrency(currentPlan.price)} plus usage fees every 30 days.
diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte
index 940380613..87f6b0028 100644
--- a/src/lib/components/billing/usageRates.svelte
+++ b/src/lib/components/billing/usageRates.svelte
@@ -67,7 +67,7 @@
following rates. Next billing period: {toLocaleDate(nextDate)}.
{/if}
-
+
ResourceLimit
diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte
index 92dd4e13d..f008ba598 100644
--- a/src/lib/components/collapsibleItem.svelte
+++ b/src/lib/components/collapsibleItem.svelte
@@ -7,12 +7,15 @@
export let noContent = false;
export let isInfo = false;
export let gap = 16;
+
+ export let style = null;
+ export let wrapperStyle = null;
{#if noContent}
-
-
+
+
@@ -58,7 +61,7 @@
// TODO: remove once pink is updated
.collapsible-item:not(.is-info) {
.collapsible-wrapper {
- padding-left: 0.5rem;
+ padding: 0;
}
.collapsible-wrapper.is-disabled {
cursor: not-allowed;
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index c043fc1dc..cf70c44a6 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -8,6 +8,7 @@
export let show = false;
export let size: 'small' | 'big' | 'huge' = null;
export let icon: string = null;
+ export let iconNotMobile: boolean = false;
export let state: 'success' | 'warning' | 'error' | 'info' = null;
export let error: string = null;
export let closable = true;
@@ -39,6 +40,7 @@
{#if icon}
import { Button } from '$lib/elements/forms';
- import { app } from '$lib/stores/app';
import { wizard } from '$lib/stores/wizard';
import SupportWizard from '$routes/(console)/supportWizard.svelte';
- import { showSupportModal } from '$routes/(console)/wizard/support/store';
- import { isCloud } from '$lib/system';
+ import { isSupportOnline, showSupportModal } from '$routes/(console)/wizard/support/store';
import { trackEvent } from '$lib/actions/analytics';
- import { localeTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
+ import { localeShortTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
import { upgradeURL } from '$lib/stores/billing';
+ import { Card } from '$lib/components/index';
+ import { app } from '$lib/stores/app';
import { currentPlan } from '$lib/stores/organization';
+ import { isCloud } from '$lib/system';
export let show = false;
+ export let showHeader = true;
+
$: hasPremiumSupport = $currentPlan?.premiumSupport ?? false;
- $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeTimezoneName()}`;
+ $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeShortTimezoneName()}`;
+
+ type SupportOption = {
+ cta?: string;
+ icon: string;
+ label: string;
+ link?: string;
+ description: string;
+ showSupport: boolean;
+ };
+
+ const supportOptions: SupportOption[] = [
+ {
+ showSupport: true,
+ icon: 'support',
+ label: 'Premium support',
+ description: 'Get priority email support from the Appwrite team'
+ },
+
+ {
+ icon: 'discord',
+ cta: 'Discord',
+ showSupport: false,
+ label: 'Community support',
+ link: 'https://appwrite.io/discord',
+ description: 'Get support from our community through Discord'
+ },
+ {
+ icon: 'github',
+ cta: 'Open issue',
+ showSupport: false,
+ label: 'Open GitHub issue',
+ link: 'https://github.com/appwrite/appwrite/issues/new/choose',
+ description: 'Report a bug or pitch a new feature'
+ }
+ ];
+
+ const showCloudSupport = (index) => {
+ return (index === 0 && isCloud) || index > 0;
+ };
-{#if isCloud}
-
-
-
Premium support
- {#if hasPremiumSupport}
-
- Get personalized support from the Appwrite team from {supportTimings}
-