diff --git a/dashboard/components/dashboard/TopSection.vue b/dashboard/components/dashboard/TopSection.vue
index 4df04bb..4b7ef50 100644
--- a/dashboard/components/dashboard/TopSection.vue
+++ b/dashboard/components/dashboard/TopSection.vue
@@ -2,7 +2,7 @@
const activeProject = useActiveProject();
const { onlineUsers, stopWatching, startWatching } = useOnlineUsers();
-onMounted(()=> startWatching());
+onMounted(() => startWatching());
onUnmounted(() => stopWatching());
@@ -18,24 +18,26 @@ function copyProjectId() {
-
+
{{ onlineUsers }} Online users
-
+
Project:
{{ activeProject?.name || 'Loading...' }}
-
+
Project id:
-
- {{ activeProject?._id || 'Loading...' }}
-
-
-
+
+
+ {{ activeProject?._id || 'Loading...' }}
+
+
+
+
diff --git a/dashboard/components/pricing/PricingDrawer.vue b/dashboard/components/pricing/PricingDrawer.vue
index ce6c46e..8ff0d0e 100644
--- a/dashboard/components/pricing/PricingDrawer.vue
+++ b/dashboard/components/pricing/PricingDrawer.vue
@@ -62,18 +62,28 @@ const expansionTierCardData = ref
({
planId: 2
});
+
+const emits = defineEmits<{
+ (evt: 'onCloseClick'): void
+}>();
+
-
+
-
+
+
+
+
+
-
+
Do you need help ?
@@ -82,10 +92,12 @@ const expansionTierCardData = ref
({
We respond in max. 1-2 days
-
diff --git a/dashboard/layouts/dashboard.vue b/dashboard/layouts/dashboard.vue
index 0fabedb..03f3302 100644
--- a/dashboard/layouts/dashboard.vue
+++ b/dashboard/layouts/dashboard.vue
@@ -38,7 +38,7 @@ const sections: Section[] = [
label: 'Github', to: 'https://github.com/litlyx/litlyx', icon: 'fab fa-github', external: true,
action() { Lit.event('git_clicked') },
},
- { label: 'Plans', to: '/plans', icon: 'far fa-wallet' },
+ { label: 'Billing', to: '/plans', icon: 'far fa-wallet' },
{ label: 'Book a demo', to: '/book_demo', icon: 'far fa-calendar' },
]
},
diff --git a/dashboard/pages/index.vue b/dashboard/pages/index.vue
index d8fae40..8159305 100644
--- a/dashboard/pages/index.vue
+++ b/dashboard/pages/index.vue
@@ -107,7 +107,7 @@ const selectLabelsEvents = [
-
+
diff --git a/dashboard/pages/plans.vue b/dashboard/pages/plans.vue
index fdba3c8..dc37677 100644
--- a/dashboard/pages/plans.vue
+++ b/dashboard/pages/plans.vue
@@ -27,7 +27,7 @@ const leftPercent = computed(() => {
if (!planData.value) return 0;
const left = dayjs().diff(planData.value.billing_expire_at, 'days');
const total = dayjs(planData.value.billing_start_at).diff(planData.value.billing_expire_at, 'days');
- const percent = 100 / total * left;
+ const percent = 100 - (100 / total * left);
return percent;
});
@@ -48,6 +48,14 @@ function openInvoice(link: string) {
window.open(link, '_blank');
}
+function getPremiumName(type: number) {
+ if (type === 0) return 'FREE';
+ if (type === 1) return 'ACCELERATION';
+ if (type === 2) return 'EXPANSION';
+ return 'CUSTOM';
+
+}
+
@@ -55,7 +63,7 @@ function openInvoice(link: string) {
-
@@ -67,12 +75,14 @@ function openInvoice(link: string) {
Billing
+
Manage your billing cycle for the project
{{ activeProject?.name || '' }}
+
@@ -87,7 +97,7 @@ function openInvoice(link: string) {
- {{ planData.premium ? 'PREMIUM ' + planData.premium_type : 'FREE' }}
+ {{ planData.premium ? getPremiumName(planData.premium_type) : 'FREE' }}
@@ -101,8 +111,8 @@ function openInvoice(link: string) {
Billing period:
-
-
+
+
{{ daysLeft }} days left
@@ -141,8 +151,8 @@ function openInvoice(link: string) {
Usage:
-
-
+
+
@@ -171,17 +181,20 @@ function openInvoice(link: string) {
-
+
-
+
-
{{ new Date(invoice.date).toLocaleString() }}
-
€ {{ invoice.cost / 100 }}
-
{{ invoice.id }}
-
- {{ invoice.status }}
+
+
{{ new Date(invoice.date).toLocaleString() }}
+
€ {{ invoice.cost / 100 }}
+
{{ invoice.id }}
+
+ {{ invoice.status }}
+
+
diff --git a/dashboard/pages/project_selector.vue b/dashboard/pages/project_selector.vue
index 528b493..5106420 100644
--- a/dashboard/pages/project_selector.vue
+++ b/dashboard/pages/project_selector.vue
@@ -49,10 +49,12 @@ async function onProjectClick(pid: string) {
-
-
Projects
-
- {{ projects?.length ?? '-' }} / 3
+
+
+
Projects
+
+ {{ projects?.length ?? '-' }} / 3
+
diff --git a/dashboard/pages/report.vue b/dashboard/pages/report.vue
index dc0db9e..418a7f6 100644
--- a/dashboard/pages/report.vue
+++ b/dashboard/pages/report.vue
@@ -24,7 +24,7 @@ async function generatePDF() {
-
+
@@ -32,16 +32,15 @@ async function generatePDF() {
Project Report
-
+
One-Click, Comprehensive KPI PDF for Your Investors or Team.
-
+
Relative to:
{{ activeProject.name }}
- ( {{ activeProject._id }} )