Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3cbf473
prefill bsn api records, add criteria groups
ateamcms Dec 16, 2025
2298fb2
criteria group refactoring
dev-rminds Dec 19, 2025
31db2da
add children age groups, add prefill errors
ateamcms Dec 25, 2025
2a06f72
Merge remote-tracking branch 'origin/develop' into feature.prefill-bs…
ateamcms Dec 29, 2025
20059cf
show only criteria records in fund request on webshop
ateamcms Dec 29, 2025
fa59224
new file-uploader template for fund-criteria-groups
dev-rminds Dec 31, 2025
ac614de
Merge pull request #903 from teamforus/master
RobinMeles Jan 1, 2026
47888fa
Bump qs in the npm_and_yarn group across 1 directory
dependabot[bot] Jan 1, 2026
9cef340
Bump react-datepicker from 8.0.0 to 9.1.0
dependabot[bot] Jan 1, 2026
c6bf0c8
scss refactoring and cleanup
dev-rminds Jan 5, 2026
dafbf28
fix missing marketplace icon for budget funds
dev-rminds Jan 5, 2026
49d6df7
Merge pull request #909 from teamforus/feature.prefill-bsn-api-record…
ateamcms Jan 5, 2026
25f7f38
Merge pull request #910 from teamforus/scss-cleanup
RobinMeles Jan 5, 2026
5329f41
add prevalidation request csv upload
ateamcms Jan 6, 2026
2e91231
translations for error pages
RobinMeles Jan 7, 2026
759b907
add autotests for prevalidation request csv upload
ateamcms Jan 7, 2026
0382664
Merge pull request #907 from teamforus/dependabot/npm_and_yarn/develo…
RobinMeles Jan 8, 2026
2737ccc
Merge pull request #904 from teamforus/dependabot/npm_and_yarn/npm_an…
RobinMeles Jan 8, 2026
7e09bce
npm audit fix
dev-rminds Jan 8, 2026
ac2c9c4
Merge pull request #913 from teamforus/npm-audit-fix
RobinMeles Jan 8, 2026
94a3921
Merge pull request #915 from teamforus/master
RobinMeles Jan 8, 2026
06a68b4
prevalidation request csv - refactoring
dev-rminds Jan 8, 2026
c9cd627
prevalidation full-file validation, cancel logic, and delete confirma…
dev-rminds Jan 8, 2026
967ff93
Bump react-router in the npm_and_yarn group across 1 directory
dependabot[bot] Jan 8, 2026
a49f779
minor translations for iconnect prevalidations
RobinMeles Jan 9, 2026
2914dec
Merge pull request #911 from teamforus/feature.add-prevalidation-requ…
RobinMeles Jan 9, 2026
bb40162
Merge pull request #916 from teamforus/dependabot/npm_and_yarn/npm_an…
RobinMeles Jan 9, 2026
7a014a2
update translations
dev-rminds Jan 12, 2026
333bae9
Merge branch 'develop' into feature.prefill-bsn-api-records-with-crit…
RobinMeles Jan 12, 2026
82d48a8
Merge pull request #812 from teamforus/feature.prefill-bsn-api-record…
RobinMeles Jan 12, 2026
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
324 changes: 211 additions & 113 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@
"query-string": "^9.1.0",
"react": "^18.1.0",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^8.0.0",
"react-datepicker": "^9.1.0",
"react-dom": "^18.1.0",
"react-error-boundary": "^6.0.0",
"react-gtm-module": "^2.0.11",
"react-i18next": "^16.0.0",
"react-image-crop": "^11.0.6",
"react-range-slider-input": "^3.2.1",
"react-router": "^7.5.2",
"react-router": "^7.12.0",
"react-slider": "^2.0.6",
"summernote": "^0.9.1",
"terser-webpack-plugin": "^5.3.9",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&.block-breadcrumbs {
.block.block-breadcrumbs {
display: flex;
flex-direction: row;
margin: 0 0 15px;
Expand Down

This file was deleted.

169 changes: 169 additions & 0 deletions react/assets/forus-platform/scss/_common/blocks/block-charts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
.block.block-charts {
.chart-row {
display: flex;
margin: 0 -10px 20px;

.card {
width: 25%;
margin: 0 10px;
}

&.chart-row-condensed {
.chart-control {
margin: 0 auto;
}

.chart-radial {
width: 70px;
margin: auto;
}

.chart-value {
min-height: auto;
padding: 10px 0;

.chart-value_label {
color: var(--color-primary);
}

.chart-value_value {
color: var(--color-primary);
}
}
}
}

.chart-control {
margin: -10px 0;
display: flex;
flex-direction: column;
text-align: center;
cursor: default;

.chart-label {
color: #151b26;
font: 500 13px/18px var(--base-font);
margin-bottom: 20px;
}

.chart-value {
padding: 50px 0 20px;
display: flex;
flex-direction: column;
min-height: 180px;

.chart-value_value {
color: #007f96;
font: 500 26px/32px var(--base-font);
}

.chart-value_label {
color: var(--color-primary);
font: 500 11px/18px var(--base-font);
}

.chart-value_value_b {
color: #282b39;
font: 500 14px/22px var(--base-font);
}
}

&.chart-control-provider_overview {
padding: 5px 0;

.chart-label {
margin-bottom: 0;
}

.chart-value {
padding: 25px 0 25px;
min-height: auto;
}
}
}

.chart-body {
padding: 20px 0 0;
margin: 0 -20px -10px -10px;

canvas {
margin: 0 auto;
}
}

.chart-header {
margin: -25px -25px 0;
border-bottom: 1px solid #d4d9dd;
padding: 15px 25px;
display: flex;
cursor: default;

.chart-header-range {
flex-basis: 40%;

.chart-header-item {
color: rgba($color: #151b26, $alpha: 0.5);
font: 500 14px/34px var(--base-font);
display: inline-block;
margin-right: 20px;
transition: 0.4s;
cursor: pointer;

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

&:hover,
&.active {
color: #d91d46;
font-weight: 500;
}
}
}

.chart-header-title {
flex: 1 0;
text-align: center;
font: 500 13px/34px var(--base-font);
color: #151b26;
flex-basis: 20%;
}

.chart-header-actions {
flex-basis: 40%;
display: flex;
flex-direction: row;
justify-content: flex-end;

.flex-row {
flex: 1;
flex-direction: row;
justify-content: flex-end;
flex-wrap: nowrap;
}

.form-group {
margin: 0 10px 0 0;
}

.form-control {
max-width: 200px;
}
}
}

@media screen and (max-width: 1000px) {
.chart-row {
flex-wrap: wrap;

.card {
width: 100%;
margin: 0 0 20px;

&:last-child {
margin-bottom: 0;
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&.block-chat {
.block.block-chat {
display: flex;
flex-direction: column;
cursor: default;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
.block.block-compact-datalist {
display: grid;

.datalist-row {
border-bottom: 1px dashed #ccc;
display: grid;
grid-template-columns: 200px 1fr;

.datalist-key {
@extend .text-wrap;
font: 500 14px/20px var(--base-font);
color: #646f79;
padding: 7.5px 15px 7.5px 0;
}

.datalist-value {
@extend .text-wrap;
font: 500 14px/20px var(--base-font);
color: #646f79;
padding: 7.5px 0;
}
}

&.compact-datalist-outline {
padding: 5px 20px;
border: 1px dashed #ccc;
border-radius: var(--border-radius);

.datalist-row {
.datalist-key {
color: var(--color-primary);
}

.datalist-value {
color: var(--text-color);
}

&:last-child {
border-bottom: 0;
}
}
}

&.compact-datalist-vertical {
grid-auto-flow: column;
gap: 20px;

.datalist-row {
grid-template-columns: 1fr;
border: none;

.datalist-key,
.datalist-value {
margin: 0;
padding: 0;
}

.datalist-key {
color: var(--color-primary);
font: 600 11px/20px var(--base-font);
}

.datalist-value {
color: var(--text-color);
font: 500 13px/20px var(--base-font);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&.block-criteria-editor {
.block.block-criteria-editor {
display: flex;
flex-direction: column;
gap: 20px;
Expand Down
Loading