Skip to content

Commit 788ed63

Browse files
committed
Small fixes and improvements
1 parent 63059b6 commit 788ed63

File tree

8 files changed

+45
-34
lines changed

8 files changed

+45
-34
lines changed

assets/css/main.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,8 @@ body {
6666

6767
.min-w-64 {
6868
min-width: 16rem;
69+
}
70+
71+
.modal {
72+
@apply z-40;
6973
}

components/modal/transaction/create/internal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
</div>
128128

129129
<div class="modal-action flex justify-between items-center">
130-
<nuxt-link to="/bulk" class="btn btn-sm disabled">
130+
<nuxt-link to="/bulk" class="btn btn-sm invisible lg:visible">
131131
{{ $t('modals.newTransaction.buttons.bulkMode') }}
132132
</nuxt-link>
133133

components/modal/user/sessions.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<modal-base :title="$t('modals.sessions.title')" :opened="opened" :name="'sessions-modal'"
33
:modal-class="'modal-top sm:modal-middle'"
44
:modal-box-class="'sm:w-fit sm:max-w-5xl'">
5-
<div class="overflow-x-auto">
6-
<div class="alert alert-warning">
7-
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
8-
<span>{{ $t("modals.sessions.warning") }}</span>
9-
</div>
5+
<div class="alert alert-warning">
6+
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
7+
<span>{{ $t("modals.sessions.warning") }}</span>
8+
</div>
109

10+
<div class="overflow-x-auto">
1111
<table class="table table-xs mt-4">
1212
<thead>
1313
<tr>

components/nav/user/user.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
</a>
6262
</li>
6363

64-
<li @click="handleClick(); callAi()" class="lg:hidden">
65-
<a v-if="aiAvailable" class="lg:hidden" >
64+
<li v-if="aiAvailable" @click="handleClick(); callAi()" class="lg:hidden">
65+
<a class="lg:hidden" >
6666
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
6767
<path stroke-linecap="round" stroke-linejoin="round" d="M12 18v-5.25m0 0a6.01 6.01 0 0 0 1.5-.189m-1.5.189a6.01 6.01 0 0 1-1.5-.189m3.75 7.478a12.06 12.06 0 0 1-4.5 0m3.75 2.383a14.406 14.406 0 0 1-3 0M14.25 18v-.192c0-.983.658-1.823 1.508-2.316a7.5 7.5 0 1 0-7.517 0c.85.493 1.509 1.333 1.509 2.316V18" />
6868
</svg>

components/select/account.vue

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ const props = defineProps({
2525
2626
currencyFilter: {
2727
type: Number
28+
},
29+
30+
overrideHidden: {
31+
type: Boolean,
32+
default: false
2833
}
2934
})
3035
@@ -45,21 +50,23 @@ const options = computed(() => {
4550
const resultArray = [];
4651
4752
folders.value.forEach((t) => {
48-
const options = getFolderAccounts(t).map((a) => {
49-
if (props.excludeAccount && props.excludeAccount === a.accountId)
50-
return null;
51-
52-
return {
53-
label: a.name,
54-
value: a.accountId
55-
}
56-
});
57-
58-
resultArray.push({
59-
label: t.name,
60-
options: options.filter(a => a !== null)
61-
});
62-
53+
const options = getFolderAccounts(t)
54+
.map((a) => {
55+
if (props.excludeAccount && props.excludeAccount === a.accountId || !props.overrideHidden && a.hidden)
56+
return null;
57+
58+
return {
59+
label: a.name,
60+
value: a.accountId
61+
}
62+
})
63+
.filter(a => a !== null);
64+
65+
if (options.length > 0)
66+
resultArray.push({
67+
label: t.name,
68+
options: options
69+
});
6370
});
6471
6572
return resultArray;

components/transactions/filter.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@
88
:close-on-select="false"
99
:categories-tree="categoriesTree"
1010
:can-be-without-parent="false"
11-
>
12-
13-
</select-transaction-category>
11+
/>
1412

1513
<select-account class="flex-1 h-10 min-w-48"
1614
mode="tags"
1715
v-model="filterAccounts"
1816
:searchable="true"
1917
:placeholder='$t("transactionsPage.placeholders.filters.accounts")'
20-
:close-on-select="false">
21-
</select-account>
18+
:close-on-select="false"
19+
:override-hidden="true"
20+
/>
2221

2322
<select-currency class="flex-1 h-10 min-w-48"
2423
mode="tags"
2524
v-model="filterCurrencies"
2625
:searchable="true"
2726
:placeholder='$t("transactionsPage.placeholders.filters.currencies")'
28-
:close-on-select="false">
29-
</select-currency>
27+
:close-on-select="false"
28+
/>
3029

3130
<Datepicker class="flex-1 min-w-64 dp-h-10"
3231
v-model="filterTime"
3332
:max-range="calendarMaxRange"
3433
:enable-time-picker="false"
3534
:placeholder='$t("transactionsPage.placeholders.filters.time")'
3635
:locale="locale"
37-
range />
36+
range
37+
/>
3838

3939
<input type="text"
4040
class="input input-bordered flex-1 h-10 text-sm font-bold min-w-48"

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pages/login.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const singIn = async () => {
105105
106106
const {data, error} = await useApi('auth/login', {
107107
method: "POST",
108-
query: {login: login.value, password: password.value}
108+
query: {login: login.value, password: password.value, description: navigator.userAgent.slice(0, configs.maxSessionDescriptionLength)}
109109
})
110110
111111
if (error.value !== null) {

0 commit comments

Comments
 (0)