Skip to content

Commit a551de1

Browse files
authored
chore: ui updated (#245)
1 parent a36eea9 commit a551de1

8 files changed

Lines changed: 308 additions & 317 deletions

File tree

apps/atrium-telegram/app/app.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default defineAppConfig({
99
},
1010
input: {
1111
slots: {
12-
base: '!ring-default placeholder:text-muted/50',
12+
base: '!py-2.5 !rounded-lg !text-lg/5 !font-bold !ring-default !placeholder:text-muted/50',
1313
},
1414
},
1515
inputMenu: {
@@ -19,17 +19,17 @@ export default defineAppConfig({
1919
},
2020
select: {
2121
slots: {
22-
base: '!ring-default placeholder:text-muted/50',
22+
base: '!rounded-lg !text-lg/5 !font-bold !ring-default !placeholder:text-muted/50',
2323
},
2424
},
2525
selectMenu: {
2626
slots: {
27-
base: '!ring-default placeholder:text-muted/50',
27+
base: '!rounded-lg !text-lg/5 !font-bold !ring-default !placeholder:text-muted/50',
2828
},
2929
},
3030
textarea: {
3131
slots: {
32-
base: '!ring-default placeholder:text-muted/50',
32+
base: '!py-2.5 !rounded-lg !text-lg/5 !font-bold !ring-default !placeholder:text-muted/50',
3333
},
3434
},
3535
button: {

apps/atrium-telegram/app/components/PartnerInvoiceCard.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010
class="size-8"
1111
/>
1212
<p class="max-w-22 text-sm/4 font-bold">
13-
Оплачено
13+
Оплачен
1414
</p>
1515
</div>
1616
<div v-else class="flex flex-row items-center gap-1.5 text-muted">
1717
<UIcon
1818
name="i-lucide-loader-circle"
1919
class="size-8 motion-preset-spin motion-duration-4000"
2020
/>
21+
<p class="max-w-22 text-sm/4 font-bold">
22+
Еще не оплачен
23+
</p>
2124
</div>
2225
</div>
2326

apps/atrium-telegram/app/pages/agreement/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
size="xl"
1212
trailing-icon="i-lucide-arrow-down-wide-narrow"
1313
:ui="{
14-
base: 'rounded-lg text-lg/5 font-bold ring-0',
14+
base: '!ring-0',
1515
}"
1616
:items="[
1717
{ label: 'По дате заключения (убывание)', value: 'concludedAtDesc' },
@@ -27,7 +27,7 @@
2727
size="xl"
2828
trailing-icon="i-lucide-funnel"
2929
:ui="{
30-
base: 'rounded-lg text-lg/5 font-bold ring-0',
30+
base: '!ring-0',
3131
}"
3232
:items="[
3333
{ label: 'Все', value: 'all' },

apps/atrium-telegram/app/pages/partner/[partnerId]/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@
9191
</div>
9292

9393
<div v-if="invoices?.length" class="flex flex-col gap-2.5">
94-
<div class="flex flex-row justify-between items-center">
94+
<div class="flex flex-row gap-2.5 items-center">
9595
<SectionTitle title="Счета" />
96+
<CounterBadge v-if="typeof partner?.balance === 'number'" :value="`Баланс ${new Intl.NumberFormat().format(partner?.balance)} ₽`" />
9697
</div>
9798

9899
<div class="flex flex-col gap-4">

apps/atrium-telegram/app/pages/partner/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PageContainer>
33
<div class="flex flex-row gap-2.5 items-center">
44
<SectionTitle title="Партнеры" />
5-
<CounterBadge :value="filteredPartners.length" />
6-
<CounterBadge :value="`${new Intl.NumberFormat().format(totalBalance)} ₽`" />
5+
<CounterBadge v-if="filteredPartners.length" :value="filteredPartners.length" />
6+
<CounterBadge v-if="totalBalance" :value="`${new Intl.NumberFormat().format(totalBalance)} ₽`" />
77
</div>
88

99
<div class="grid grid-cols-1 gap-2.5 items-center">
@@ -13,7 +13,7 @@
1313
trailing-icon="i-lucide-search"
1414
placeholder="Найти..."
1515
:ui="{
16-
base: 'rounded-lg text-lg/5 font-bold ring-0',
16+
base: '!ring-0',
1717
}"
1818
class="motion-preset-slide-down"
1919
/>
@@ -23,7 +23,7 @@
2323
size="xl"
2424
trailing-icon="i-lucide-arrow-down-wide-narrow"
2525
:ui="{
26-
base: 'rounded-lg text-lg/5 font-bold ring-0',
26+
base: '!ring-0',
2727
}"
2828
:items="[
2929
{ label: 'По фамилии (возрастание)', value: 'nameAsc' },
@@ -38,7 +38,7 @@
3838
size="xl"
3939
trailing-icon="i-lucide-funnel"
4040
:ui="{
41-
base: 'rounded-lg text-lg/5 font-bold ring-0',
41+
base: '!ring-0',
4242
}"
4343
:items="[
4444
{ label: 'Все', value: 'all' },
@@ -66,8 +66,6 @@ import type { PartnerWithData } from '~/stores/partner'
6666
6767
const partnerStore = usePartnerStore()
6868
69-
const totalBalance = computed(() => partnerStore.partners.reduce((acc, partner) => acc + partner.balance, 0))
70-
7169
const sortedBy = ref<'nameAsc' | 'balanceAsc' | 'balanceDesc'>('nameAsc')
7270
7371
function sortByNameAsc(a: PartnerWithData, b: PartnerWithData): number {
@@ -127,4 +125,6 @@ const filteredPartners = computed(() => {
127125
return partner.legalEntity?.name?.toLowerCase().includes(search.value.toLowerCase()) ?? false
128126
})
129127
})
128+
129+
const totalBalance = computed(() => filteredPartners.value.reduce((acc, partner) => acc + partner.balance, 0))
130130
</script>

apps/atrium-telegram/app/pages/task/all.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
size="xl"
1212
trailing-icon="i-lucide-arrow-down-wide-narrow"
1313
:ui="{
14-
base: 'rounded-lg text-lg/5 font-bold ring-0',
14+
base: '!ring-0',
1515
}"
1616
:items="[
1717
{ label: 'По дате создания (убывание)', value: 'updatedAtDesc' },
@@ -25,7 +25,7 @@
2525
size="xl"
2626
trailing-icon="i-lucide-funnel"
2727
:ui="{
28-
base: 'rounded-lg text-lg/5 font-bold ring-0',
28+
base: '!ring-0',
2929
}"
3030
:items="[
3131
{ label: 'Все задачи', value: 'all' },
@@ -40,7 +40,7 @@
4040
:items="availablePerformers"
4141
size="xl"
4242
:ui="{
43-
base: 'rounded-lg text-lg/5 font-bold ring-0',
43+
base: '!ring-0',
4444
}"
4545
placeholder="Все исполнители"
4646
class="motion-preset-slide-up"

0 commit comments

Comments
 (0)