Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2809a6d
unify exports
ateamcms Mar 28, 2025
73aaad3
add transactions filter by bulk execution date
ateamcms Mar 29, 2025
fa8ea68
add exports autotest
ateamcms Apr 1, 2025
ba8eb9b
Merge branch 'develop' into feature.add-transactions-filter-by-bulk-e…
dev-rminds Apr 7, 2025
bcc5bd5
Merge branch 'develop' into feature.unify-exports
dev-rminds Apr 7, 2025
1c24659
exports minor refactoring
dev-rminds Apr 7, 2025
1edded4
Merge pull request #642 from teamforus/feature.add-exports-autotest
ateamcms Apr 7, 2025
72d319e
Merge branch 'develop' into feature.unify-exports
ateamcms Apr 10, 2025
58f3f8f
Merge branch 'develop' into feature.add-transactions-filter-by-bulk-e…
RobinMeles Apr 11, 2025
5b87b3e
add email logs to identity page
ateamcms Apr 12, 2025
f8deeb9
Merge branch 'develop' into feature.add-transactions-filter-by-bulk-e…
RobinMeles Apr 15, 2025
be4d925
Merge branch 'develop' into feature.unify-exports
dev-rminds Apr 18, 2025
487c37a
Merge branch 'develop' into feature.unify-exports
dev-rminds Apr 23, 2025
83d53eb
Merge branch 'develop' into feature.unify-exports
dev-rminds Apr 25, 2025
794cedb
Merge remote-tracking branch 'refs/remotes/origin/feature.add-voucher…
ateamcms Apr 26, 2025
bdcdd0a
refactor on feedback
ateamcms Apr 26, 2025
90742cd
Merge remote-tracking branch 'origin/feature.add-transactions-filter-…
ateamcms Apr 26, 2025
d01e115
add hide filters dusk attribute
ateamcms Apr 28, 2025
990a4cc
redesign of translation statistics and filters
dev-rminds May 1, 2025
83f1270
add copy button to reservation emails
dev-rminds May 1, 2025
a319281
Merge branch 'develop' into reservations-copy-button
dev-rminds May 2, 2025
fd85573
add bulk actions to reservations
dev-rminds May 2, 2025
f827aef
Merge branch 'develop' into reservations-copy-button
dev-rminds May 2, 2025
c1147fb
Merge branch 'reservations-copy-button' into reservations-bulk-actions
dev-rminds May 2, 2025
179aeea
Bump i18next from 24.0.2 to 25.0.2
dependabot[bot] May 5, 2025
c41243b
Merge branch 'develop' into feature.add-email-logs-to-identity-page
dev-rminds May 5, 2025
ffa20b1
Merge branch 'develop' into feature.unify-exports
dev-rminds May 6, 2025
2235210
Merge pull request #685 from teamforus/reservations-bulk-actions
RobinMeles May 8, 2025
58a1b79
exports refactoring
dev-rminds May 8, 2025
bbb1875
Merge pull request #686 from teamforus/feature.unify-exports.test
dev-rminds May 8, 2025
ca0c4f3
Merge pull request #680 from teamforus/reservations-copy-button
RobinMeles May 9, 2025
1d84913
merge develop into feature.unify-exports and fix conflicts
dev-rminds May 12, 2025
d829295
Merge pull request #637 from teamforus/feature.unify-exports
RobinMeles May 12, 2025
2f2db1d
Merge branch 'develop' into redesign-translation-statistics
RobinMeles May 13, 2025
bbd2398
Merge pull request #684 from teamforus/dependabot/npm_and_yarn/develo…
RobinMeles May 13, 2025
a4962a0
fix import path
dev-rminds May 13, 2025
0a04531
visual fix for custom notification identities table
dev-rminds May 14, 2025
d6d569e
Merge pull request #688 from teamforus/fixes.notifications-identities…
RobinMeles May 14, 2025
3a95faf
Merge branch 'develop' into redesign-translation-statistics
RobinMeles May 14, 2025
44adcde
Merge pull request #678 from teamforus/redesign-translation-statistics
RobinMeles May 14, 2025
3d08f61
Merge remote-tracking branch 'origin/develop' into feature.add-email-…
ateamcms May 14, 2025
2f31991
Merge pull request #652 from teamforus/feature.add-email-logs-to-iden…
RobinMeles May 14, 2025
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
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"easyqrcodejs": "^4.4.13",
"file-saver": "^2.0.5",
"i18n-iso-countries": "^7.13.0",
"i18next": "^24.0.2",
"i18next": "^25.0.2",
"jquery": "^3.6.3",
"jszip": "^3.10.1",
"libphonenumber-js": "^1.10.41",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.block.block-inline-copy {
display: inline-flex;
flex-direction: row;
align-items: center;
gap: 4px;
cursor: pointer;

.inline-copy-icon {
display: inline-flex;
font-size: 16px;
line-height: 18px;
height: 18px;
transition: 0.4s;
color: #646f79;
}

&:hover {
.inline-copy-icon {
color: var(--color-primary);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.block.block-translation-stats {
display: flex;
flex-direction: row;
margin-bottom: 20px;
gap: 20px;

.translation-stats-col {
display: flex;
flex-direction: column;
flex: 0 0 calc(50% - 10px);
background: #ffffff;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
padding: 15px;
gap: 15px;

.translation-stats-col-label {
display: inline-flex;
font: 500 14px/20px var(--base-font);

.translation-stats-col-label-period {
color: #646F79;
display: flex;
flex: 1 1 auto;
justify-content: flex-end;
}
}

.translation-stats-col-value {
font: 600 18px/26px var(--base-font);
}
}
}
99 changes: 0 additions & 99 deletions react/assets/forus-platform/scss/_common/components/modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@
.modal-text {
font: 500 14px/22px var(--base-font);
color: #646f79;
text-align: center;
margin: 0 0 20px;

small {
Expand Down Expand Up @@ -582,104 +581,6 @@
}
}

&.modal-voucher-export-type {
.modal-window {
width: 940px;

.modal-body {
.voucher-export-type {
text-align: center;
cursor: default;
padding: 10px 0;

.voucher-export-type-row {
display: flex;
justify-content: center;
justify-items: center;
}

.voucher-export-type-item {
margin-right: 30px;
flex-grow: 1;
padding: 25px 20px;
font: 500 14px var(--base-font);
color: #282b39;
border: 1px solid #d4d9dd;
border-radius: calc(var(--border-radius));
position: relative;
transition: 0.4s;
background: transparent;
cursor: pointer;
flex-basis: 25%;

.voucher-export-type-item-check {
position: absolute;
top: 10px;
right: 10px;
border-radius: 22px;
width: 22px;
height: 22px;
line-height: 22px;
text-align: center;
background: #2cc678;
color: #fff;
opacity: 0;
transition: 0.4s;
}

.voucher-export-type-item-icon {
margin-bottom: 15px;
width: 100%;

.voucher-export-type-item-icon-img {
display: block;
margin: 0 auto 0;
width: 100%;
}

.mdi {
font-size: 64px;
text-align: center;
line-height: 60px;
padding: 10px 0 0 0;
display: block;
color: var(--color-primary);
}
}

&:hover {
color: #009ef4;
background: #fff;
border-color: #fff;
box-shadow: 2px 10px 15px rgba($color: #000000, $alpha: 0.075);
}

&.active {
background: #fff;
color: #282b39;
border: 1px solid #d4d9dd;
box-shadow: 1px 5px 7.5px rgba($color: #000000, $alpha: 0.075);

.voucher-export-type-item-check {
opacity: 1;
}
}

&:last-child {
margin-right: 0;
}
}
}
}
}

&.modal-voucher-export-narrow {
.modal-window {
width: 640px;
}
}
}

&.modal-lg {
.modal-window {
width: 960px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,14 @@
&.selected {
background: #f8fbf7;
}

&.tr-totals {
border-top: 2px solid var(--color-primary);

td {
background-color: #fafbfc;
}
}
}

& > tbody:last-child > tr {
Expand Down
6 changes: 4 additions & 2 deletions react/assets/forus-platform/scss/_common/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,12 @@
@import 'blocks/block-approve-fund-request.scss';
@import 'blocks/block-provider-products-required.scss';
@import 'blocks/block-push-notifications.scss';
@import 'blocks/block-inline-copy.scss';
@import 'blocks/block-collapsable.scss';
@import 'blocks/block-fund-request-assigned.scss';
@import 'blocks/block-product.scss';
@import 'blocks/block-label-tabs.scss';
@import 'blocks/block-translation-stats.scss';

// Select controls
@import 'select-controls/select-control-funds';
Expand Down Expand Up @@ -1345,7 +1347,7 @@ body {
}

&.card-outline {
border: 1px solid #8ca3a6;
border: 1px solid var(--border-color);
}

&.card-collapsable {
Expand Down Expand Up @@ -5171,7 +5173,7 @@ body {

.inline-filters-dropdown-content {
width: 260px;
min-height: 100px;
min-height: 75px;
position: absolute;
top: 100%;
margin-top: 15px;
Expand Down
12 changes: 12 additions & 0 deletions react/assets/forus-platform/scss/_common/includes/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ img {
transition: color 0.3s;
}

.text-default {
font: 400 13px/20px var(--base-font);
}

.text-muted {
color: #a1a1a1 !important;
transition: color 0.3s;
Expand Down Expand Up @@ -211,6 +215,14 @@ img {
font-weight: 600 !important;
}

.text-decoration-link {
text-decoration: underline;

&:hover {
text-decoration: none;
}
}

.text-medium,
.text-strong-half {
font-weight: 500 !important;
Expand Down
4 changes: 4 additions & 0 deletions react/src/dashboard/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import i18nEN from './i18n/i18n-en';
import i18nNL from './i18n/i18n-nl';
import { FrameDirectorProvider } from './modules/frame_director/context/FrameDirectorContext';
import ProviderNotificationProductRequired from './modules/provider_notification_product_required/ProviderNotificationProductRequired';
import { setDefaultOptions } from 'date-fns';
import { nl } from 'date-fns/locale';

setDefaultOptions({ weekStartsOn: 1, locale: nl });

i18n.use(initReactI18next)
.init({
Expand Down
Loading