Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2406 - payment table UI issue #2410

Merged
merged 2 commits into from
Nov 25, 2024
Merged

#2406 - payment table UI issue #2410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caa9d2a
add custom desktop bp for payment-table
SebinSong Oct 31, 2024
091647d
make sure todo-table looks good
SebinSong Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/assets/style/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@
}
}

$payment-table-desktop-bp: 1290px;
@mixin payment-table-desktop {
@media screen and (min-width: $payment-table-desktop-bp) {
@content;
}
}

%unselectable {
-webkit-touch-callout: none;
-webkit-user-select: none;
Expand Down
2 changes: 1 addition & 1 deletion frontend/views/containers/payments/PaymentRowReceived.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default ({
.c-relative-to {
display: none;

@include desktop {
@include payment-table-desktop {
display: block;
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/views/containers/payments/PaymentRowSent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default ({
.c-relative-to {
display: none;

@include desktop {
@include payment-table-desktop {
display: block;
}
}
Expand Down
55 changes: 45 additions & 10 deletions frontend/views/containers/payments/PaymentsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,33 +150,51 @@ export default ({
text-align: right;
}

@include desktop {
@include payment-table-desktop {
min-width: 4.5rem;
}
}

th.c-th-method {
@include desktop {
@include payment-table-desktop {
min-width: 7.25rem;
}
}

th.c-th-date {
@include desktop {
@include payment-table-desktop {
min-width: 6.25rem;
}
}

th.c-th-relative-to {
@include desktop {
@include payment-table-desktop {
min-width: 5.25rem;
}
}

::v-deep td.c-td-user {
@include desktop {
@include tablet {
padding-right: 0.5rem;
}

@include desktop {
max-width: 12rem;
min-width: 10rem;
overflow: hidden;

.c-user {
max-width: inherit;

.c-twrapper {
width: 100%;
}
}
}

@include from (1360px) {
max-width: 16rem;
}
}

&.c-is-todo {
Expand All @@ -193,19 +211,31 @@ export default ({
width: 40%;

@include tablet {
width: 27%;
width: 35%;
}
}

th.c-th-method {
width: 20%;

@include tablet {
padding-right: 0.5rem;
min-width: 8rem;
}
}

th.c-th-amount {
width: 55%;

@include tablet {
width: 24%;
width: 16%;
}
}

th.c-th-date {
@include desktop {
padding-right: 1.5rem;
min-width: 4.25rem;
}
}
}
Expand Down Expand Up @@ -234,23 +264,28 @@ export default ({
th.c-th-method {
@include tablet {
width: 24%;
padding-right: 0.5rem;
}

@include desktop {
@include payment-table-desktop {
width: 19%;
}
}

th.c-th-date {
width: 18%;
padding-right: 0.5rem;

@include desktop {
width: 22%;
}
}

th.c-th-relative-to {
display: none;
padding-right: 0;

@include desktop {
@include payment-table-desktop {
display: table-cell;
width: 14%;
}
Expand All @@ -259,7 +294,7 @@ export default ({
th.c-th-action {
display: none;

@include desktop {
@include payment-table-desktop {
display: table-cell;
width: 5%;
}
Expand Down
8 changes: 7 additions & 1 deletion frontend/views/containers/payments/payment-row/PaymentRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
td(v-if='$slots["cellRelativeTo"]')
slot(name='cellRelativeTo')

td
td.c-td-actions
.cpr-actions
slot(name='cellActions')

Expand Down Expand Up @@ -111,4 +111,10 @@ export default ({
margin-left: 0;
}
}

td.c-td-actions {
@include desktop {
padding-right: 1.5rem;
}
}
</style>
25 changes: 7 additions & 18 deletions frontend/views/pages/Payments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,13 @@ page(

.tab-section
.c-container(v-if='paymentsFiltered.length')
.c-payments-table-container
payments-list(
ref='paymentList'
:titles='tableTitles'
:paymentsList='paginateList(paymentsFiltered)'
:paymentsType='ephemeral.activeTab'
:selectedTodoItems.sync='ephemeral.selectedTodoItems'
)
payments-list(
ref='paymentList'
:titles='tableTitles'
:paymentsList='paginateList(paymentsFiltered)'
:paymentsType='ephemeral.activeTab'
:selectedTodoItems.sync='ephemeral.selectedTodoItems'
)

.c-footer
.c-payment-record(v-if='ephemeral.activeTab === "PaymentRowTodo"')
Expand Down Expand Up @@ -658,16 +657,6 @@ export default ({
}
}

.c-payments-table-container {
position: relative;

@include desktop {
width: 100%;
overflow-x: auto;
overflow-y: hidden;
}
}

.c-container-empty {
max-width: 25rem;
margin: 0 auto;
Expand Down