Skip to content

Commit 24ae9d0

Browse files
AntonioVerdiglione1996AntonioVerdiglione1996
authored
Merge branch 'main' into main
2 parents fa78805 + b479ca1 commit 24ae9d0

19 files changed

+89
-62
lines changed

‎dashboard/components/BarCard/Base.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,10 @@ function openExternalLink(link: string) {
125125
</div>
126126
</div>
127127
</div>
128-
129128
<div class="text-text font-semibold text-[.9rem] md:text-[1rem] manrope"> {{
130129
formatNumberK(element.count) }} </div>
131130
</div>
132-
<div v-if="props.data.length == 0" class="flex justify-center text-text-sub font-bold text-[1.1rem]">
131+
<div v-if="props.data.length == 0" class="flex justify-center text-text-sub font-light text-[1.1rem]">
133132
No data yet
134133
</div>
135134
</div>

‎dashboard/components/CVerticalNavigation.vue‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,15 @@ const pricingDrawer = usePricingDrawer();
149149
</div>
150150
</LyxUiButton>
151151

152+
<LyxUiButton v-if="projectList && (projectList.length >= (maxProjects || 1))"
153+
type="outlined" class="w-full py-1 mt-2 text-[.7rem]">
154+
<div class="flex items-center gap-2 justify-center">
155+
<div><i class="text-lyx-text-darker far fa-lock"></i></div>
156+
<div class="text-lyx-text-darker"> Projects limit reached </div>
157+
</div>
158+
</LyxUiButton>
159+
160+
152161
</div>
153162

154163

@@ -203,12 +212,12 @@ const pricingDrawer = usePricingDrawer();
203212
<div v-if="snapshot" class="flex flex-col text-[.7rem] mt-2">
204213
<div class="flex gap-1 items-center justify-center text-lyx-text-dark">
205214
<div class="poppins">
206-
{{ new Date(snapshot.from).toLocaleString('it-IT').split(',')[0].trim().replace(/\//g, '-')
215+
{{ new Date(snapshot.from).toLocaleString().split(',')[0].trim()
207216
}}
208217
</div>
209218
<div class="poppins"> to </div>
210219
<div class="poppins">
211-
{{ new Date(snapshot.to).toLocaleString('it-IT').split(',')[0].trim().replace(/\//g, '-') }}
220+
{{ new Date(snapshot.to).toLocaleString().split(',')[0].trim() }}
212221
</div>
213222
</div>
214223

@@ -243,7 +252,7 @@ const pricingDrawer = usePricingDrawer();
243252

244253
<div v-for="entry of section.entries" :class="{ 'grow flex items-end': entry.grow }">
245254

246-
<div v-if="(!entry.adminOnly || (userRoles.isAdmin && !isAdminHidden))"
255+
<div v-if="(!entry.adminOnly || (userRoles.isAdmin.value && !isAdminHidden))"
247256
class="bg-lyx-background w-full cursor-pointer text-lyx-text-dark py-[.35rem] px-2 rounded-lg text-[.95rem] flex items-center"
248257
:class="{
249258
'!text-lyx-text-darker pointer-events-none': entry.disabled,
@@ -259,7 +268,7 @@ const pricingDrawer = usePricingDrawer();
259268
<div class="manrope grow">
260269
{{ entry.label }}
261270
</div>
262-
<div v-if="entry.premiumOnly && !userRoles.isPremium" class="flex items-center">
271+
<div v-if="entry.premiumOnly && !userRoles.isPremium.value" class="flex items-center">
263272
<i class="fal fa-lock"></i>
264273
</div>
265274
</NuxtLink>
@@ -293,7 +302,8 @@ const pricingDrawer = usePricingDrawer();
293302
class="cursor-pointer hover:text-lyx-text text-lyx-text-dark">
294303
<i class="fab fa-dev"></i>
295304
</NuxtLink> -->
296-
<NuxtLink to="/admin" v-if="userRoles.isAdmin"
305+
306+
<NuxtLink to="/admin" v-if="userRoles.isAdmin.value"
297307
class="cursor-pointer hover:text-lyx-text text-lyx-text-dark">
298308
<i class="fas fa-cat"></i>
299309
</NuxtLink>

‎dashboard/components/FirstInteraction.vue‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,32 @@ function reloadPage() {
7676

7777
<div class="flex items-center justify-center mt-10">
7878
<div class="flex flex-col gap-6">
79-
<div class="flex gap-6">
80-
<div>
81-
<CardTitled class="h-full" title="Tutorial" sub="Coming soon. For now enjoy our launch video.">
82-
<div class="flex items-center justify-center h-full">
83-
<iframe width="560" height="315"
79+
80+
<div class="flex gap-6 xl:flex-row flex-col">
81+
82+
<div class="h-full w-full">
83+
<CardTitled class="h-full w-full xl:min-w-[500px]" title="Tutorial"
84+
sub="Coming soon. For now enjoy our launch video.">
85+
86+
<div class="flex items-center justify-center h-full w-full">
87+
88+
<iframe class="w-full h-full min-h-[400px]"
8489
src="https://www.youtube.com/embed/GntyWMR7jsY?si=YGGkQwrk6-Iqmn8w" title="Litlyx"
8590
frameborder="0"
8691
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
8792
referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
8893
</div>
94+
8995
</CardTitled>
9096
</div>
9197

9298
<div class="flex flex-col gap-6">
9399

94-
<div>
100+
<div class="w-full">
95101
<CardTitled title="Quick Integration"
96102
sub="Start tracking web analytics in one line. (works everywhere js is supported)">
97103
<div class="flex flex-col items-end gap-4">
98-
<div class="w-full">
104+
<div class="w-full xl:text-[1rem] text-[.8rem]">
99105
<pre><code class="language-html">{{ scriptText }}</code></pre>
100106
</div>
101107
<LyxUiButton type="secondary" @click="copyScript()">
@@ -122,7 +128,7 @@ function reloadPage() {
122128
<CardTitled class="w-full h-full" title="Documentation"
123129
sub="Learn how to use Litlyx in every tech stack">
124130
<div class="flex flex-col items-end">
125-
<div class="flex justify-center w-full">
131+
<div class="justify-center w-full hidden xl:flex">
126132
<svg width="680" height="100" viewBox="0 0 680 100" fill="none"
127133
xmlns="http://www.w3.org/2000/svg">
128134
<mask id="path-1-inside-1_473_1361" fill="white">
@@ -263,7 +269,7 @@ function reloadPage() {
263269

264270

265271

266-
<!-- <div class="flex justify-center gap-10 flex-col lg:flex-row items-center lg:items-stretch px-10">
272+
<!-- <div class="flex justify-center gap-10 flex-col xl:flex-row items-center xl:items-stretch px-10">
267273
268274
<div class="bg-menu p-6 rounded-xl flex flex-col gap-2 w-full">
269275
<div class="poppins font-semibold"> Copy your project_id: </div>
@@ -273,7 +279,7 @@ function reloadPage() {
273279
</div>
274280
</div>
275281
276-
<div class="bg-menu p-6 rounded-xl flex flex-col gap-2 w-full lg:max-w-[40vw]">
282+
<div class="bg-menu p-6 rounded-xl flex flex-col gap-2 w-full xl:max-w-[40vw]">
277283
<div class="poppins font-semibold">
278284
Start logging visits in 1 click | Plug anywhere !
279285
</div>

‎dashboard/components/banner/Offer.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ const isPremium = computed(() => {
2020
<div v-if="!isPremium" class="w-full bg-[#5680f822] p-4 rounded-lg text-[.9rem] flex items-center">
2121
<div class="flex flex-col grow">
2222
<div class="poppins font-semibold text-lyx-primary">
23-
Launch offer: 25% off
23+
Launch offer: 25% off forever with code <span class="text-white font-bold text-[1rem]">LIT25</span> at checkout
24+
from Acceleration Plan and beyond.
2425
</div>
25-
<div class="poppins text-lyx-primary">
26+
<!-- <div class="poppins text-lyx-primary">
2627
We're offering an exclusive 25% discount forever on all plans starting from the Acceleration
2728
Plan for our first 100 users who believe in our project.
2829
<br>
2930
Redeem Code: <span class="text-white font-bold text-[1rem]">LIT25</span> at checkout to
3031
claim your discount.
31-
</div>
32+
</div> -->
3233
</div>
3334
<div>
3435
<LyxUiButton type="outline" @click="goToUpgrade()"> Upgrade </LyxUiButton>

‎dashboard/components/dashboard/ActionableChart.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ const legendClasses = ref<string[]>([
251251
</SelectButton>
252252
</template>
253253

254-
<div class="flex gap-6 w-full justify-between">
254+
<div class="flex gap-6 w-full justify-between lg:flex-row flex-col">
255255
<LyxUiButton type="secondary" :to="isLiveDemo ? '#' : '/analyst'" :disabled="isLiveDemo">
256256
<div class="flex items-center gap-2 px-10">
257257
<i class="far fa-sparkles text-yellow-400"></i>

‎dashboard/components/events/EventsFunnelChart.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ async function onEventCheck(eventName: string) {
140140
<template>
141141
<CardTitled title="Funnel"
142142
sub="Monitor and analyze the actions your users are performing on your platform to gain insights into their behavior and optimize the user experience">
143-
<div class="flex gap-2 justify-between">
143+
<div class="flex gap-2 justify-between lg:flex-row flex-col">
144144
<div class="flex flex-col gap-1">
145145
<div class="min-w-[20rem] text-lyx-text-darker">
146146
Select two or more events

‎dashboard/components/events/EventsMetadataAnalyzer.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const canSearch = computed(() => {
104104
</USelectMenu>
105105
</div>
106106

107-
<div class="text-lyx-text-darker poppins mt-4 flex items-center gap-4">
107+
<div class="text-lyx-text-darker poppins mt-4 flex items-center gap-4 lg:flex-row flex-col">
108108
<div class="w-[10rem]">
109109
Search results: {{ metadataFieldGroupedFiltered.length }}
110110
</div>
@@ -119,13 +119,13 @@ const canSearch = computed(() => {
119119
</div>
120120
</div>
121121

122-
<div class="flex flex-wrap gap-2 mt-4">
122+
<div class="flex flex-wrap gap-2 lg:mt-4 mt-10">
123123

124124
<div class="bg-lyx-widget-light text-lyx-text-dark px-3 py-2 rounded-md w-fit"
125125
v-for="item of metadataFieldGroupedFiltered">
126-
<div class="flex gap-2">
126+
<div class="flex gap-2 items-center">
127127
<div> {{ item._id || 'OLD_EVENTS' }} </div>
128-
<div> {{ item.count }} </div>
128+
<div class="px-1"> {{ item.count }} </div>
129129
</div>
130130
</div>
131131

‎dashboard/components/events/EventsUserFlow.vue‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ async function analyzeEvent() {
6262
</div>
6363
</div>
6464

65-
<div v-if="analyzing"> Analyzing... </div>
65+
<div v-if="analyzing">
66+
<div
67+
class="backdrop-blur-[1px] z-[20] w-full h-full flex items-center justify-center font-bold rockmann">
68+
<i
69+
class="fas fa-spinner text-[2rem] text-accent animate-[spin_1s_linear_infinite] duration-500"></i>
70+
</div>
71+
</div>
6672

6773
<div class="flex flex-col gap-2" v-if="userFlowData">
6874
<div class="flex gap-4 items-center bg-bg py-2 px-2 bg-lyx-widget-light rounded-lg"

‎dashboard/components/pricing/PricingCardGeneric.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async function onUpgradeClick() {
4747

4848
<div class="flex flex-col gap-3 text-center pt-3">
4949
<div v-if="data.active"
50-
class="absolute right-6 top-3 poppins text-[.75rem] bg-[#222A42] outline outline-[1px] outline-[#5680F8] px-3 py-[.1rem] rounded-sm">
50+
class="absolute right-6 top-3 poppins text-[.75rem] bg-transparent border-[#262626] border-solid border-[1px] px-3 py-[.1rem] rounded-sm">
5151
Active
5252
</div>
5353
<div v-if="!data.active && data.title === 'Growth'"

‎dashboard/components/settings/General.vue‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,16 @@ function copyProjectId() {
198198
<script defer data-project="${project?._id}"
199199
src="https://cdn.jsdelivr.net/gh/litlyx/litlyx-js/browser/litlyx.js"></script>` }}
200200
</div>
201-
<div><i class="far fa-copy" @click="copyScript()"></i></div>
201+
<div class="hidden lg:flex"><i class="far fa-copy" @click="copyScript()"></i></div>
202202
</LyxUiCard>
203+
<div class="flex justify-end w-full">
204+
<LyxUiButton type="outline" class="flex lg:hidden mt-4">
205+
Copy script
206+
</LyxUiButton>
207+
</div>
203208
</template>
204209
<template #pdelete>
205-
<div class="flex justify-end" v-if="!isGuest">
210+
<div class="flex lg:justify-end" v-if="!isGuest">
206211
<LyxUiButton type="danger" @click="deleteProject()">
207212
Delete project
208213
</LyxUiButton>

0 commit comments

Comments
 (0)