Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c192991
add tests for product page actions, login scenarios, fund request con…
ateamcms Feb 13, 2025
f1c5625
Merge branch 'develop' into feature.add-tests-for-product-page-actions
dev-rminds Mar 6, 2025
1a9ba3b
add reservation fields autotest
ateamcms Mar 23, 2025
edff250
Bump pdfjs-dist from 4.2.67 to 5.1.91
dependabot[bot] Apr 1, 2025
6a39e39
Merge pull request #649 from teamforus/auto/master_to_develop_update-…
RobinMeles Apr 3, 2025
657d97e
Merge pull request #651 from teamforus/auto/master_to_develop_update-…
RobinMeles Apr 4, 2025
d46f154
Merge branch 'develop' into feature.add-tests-for-product-page-actions
dev-rminds Apr 4, 2025
3abfbfc
Merge pull request #644 from teamforus/dependabot/npm_and_yarn/develo…
RobinMeles Apr 7, 2025
472427c
Merge branch 'develop' into feature.add-reservation-fields-autotest
dev-rminds Apr 7, 2025
95cc41f
Merge branch 'develop' into feature.add-tests-for-product-page-actions
RobinMeles Apr 8, 2025
6e5dd93
Merge pull request #585 from teamforus/feature.add-tests-for-product-…
RobinMeles Apr 8, 2025
91da55a
Merge branch 'develop' into feature.add-reservation-fields-autotest
RobinMeles Apr 9, 2025
3005166
remove custom css
dev-rminds Apr 10, 2025
11f3a01
update precheck mobile version design and fix translations
dev-rminds Apr 11, 2025
f9a944c
update implementations css variables, minor fixes and feedback
dev-rminds Apr 12, 2025
6167661
Merge branch 'epic.custom-css' into update-precheck-mobile-and-transl…
dev-rminds Apr 14, 2025
62574ad
Merge branch 'develop' into epic.custom-css
dev-rminds Apr 14, 2025
b9581f2
Merge branch 'epic.custom-css' into update-precheck-mobile-and-transl…
dev-rminds Apr 14, 2025
d4f4665
Merge pull request #654 from teamforus/update-precheck-mobile-and-tra…
RobinMeles Apr 14, 2025
c22cd28
css cleanup feedback
dev-rminds Apr 14, 2025
066af11
fix faq-block width on mobile
dev-rminds Apr 15, 2025
bddeccd
Merge pull request #653 from teamforus/epic.custom-css
RobinMeles Apr 15, 2025
6c0c300
update browserslist-db
dev-rminds Apr 15, 2025
d12d882
Merge pull request #655 from teamforus/update-browserlist
RobinMeles Apr 15, 2025
c61d0bb
fix wrong translation attributes
ateamcms Apr 17, 2025
00547e5
update translations
dev-rminds Apr 17, 2025
7a4f388
Merge pull request #656 from teamforus/fixes.wrong-translation-attrib…
RobinMeles Apr 17, 2025
f4a0bf4
add webshop payment options filter
dev-rminds Apr 17, 2025
585906b
merge develop into feature.payment-options-filter and fix conflicts
dev-rminds Apr 17, 2025
3f97038
update translations
dev-rminds Apr 17, 2025
b408c5a
add employee email to vouchers page
ateamcms Apr 17, 2025
1d1ad9d
add implementation name to fund forms page
ateamcms Apr 17, 2025
d0d49c4
Merge branch 'develop' into feature.add-reservation-fields-autotest
ateamcms Apr 17, 2025
5f8b3b0
change datepicker style position
ateamcms Apr 17, 2025
f189e4a
split identity contact section to contact and address on webshop
ateamcms Apr 17, 2025
eb8e9d1
fix vouchers upload skip modal
dev-rminds Apr 18, 2025
3ac7d76
add employee email to vouchers page minor visual update
dev-rminds Apr 19, 2025
44dba9b
Merge pull request #630 from teamforus/feature.add-reservation-fields…
RobinMeles Apr 21, 2025
38a29c5
Merge branch 'develop' into feature.add-implementation-name-to-fund-f…
RobinMeles Apr 21, 2025
9f30c1c
Merge pull request #659 from teamforus/feature.add-implementation-nam…
RobinMeles Apr 21, 2025
d585a0a
Merge branch 'develop' into feature.split-identity-contact-section-to…
RobinMeles Apr 21, 2025
1801cdb
Merge pull request #660 from teamforus/feature.split-identity-contact…
RobinMeles Apr 21, 2025
1225667
Merge branch 'develop' into feature.add-employee-email-to-vouchers-page
RobinMeles Apr 21, 2025
e33b0f4
Merge pull request #658 from teamforus/feature.add-employee-email-to-…
RobinMeles Apr 21, 2025
4c26191
Merge branch 'develop' into fixes.voucher-upload-skip-modal
RobinMeles Apr 22, 2025
c537cee
Merge pull request #661 from teamforus/fixes.voucher-upload-skip-modal
RobinMeles Apr 22, 2025
f5a330f
Merge branch 'develop' into feature.payment-options-filter
RobinMeles Apr 22, 2025
0f87957
minor visual fix
dev-rminds Apr 22, 2025
3fc5c1c
Update i18n-nl.mjs
RobinMeles Apr 23, 2025
c144efa
Update modal_product_payment_options_info.mjs
RobinMeles Apr 23, 2025
642f1c3
Update cache.json
RobinMeles Apr 23, 2025
86364ee
Merge pull request #664 from teamforus/payment-options-filter-transla…
RobinMeles Apr 23, 2025
cc2b7e0
Merge pull request #657 from teamforus/feature.payment-options-filter
RobinMeles Apr 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
762 changes: 257 additions & 505 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"main": "main.js",
"scripts": {
"start": "webpack serve --mode development",
"start-all": "webpack serve --mode development --env enable='webshop*,dashboard*,backend'",
"start-dusk": "webpack serve --mode development --env enable='webshop.general,dashboard*'",
"start-webshops": "webpack serve --mode development --env disable='dashboard*,backend' enable='webshop*'",
"start-dashboards": "webpack serve --mode development --env disable='webshop*,backend' enable='dashboard*'",
Expand Down Expand Up @@ -42,6 +43,7 @@
"@types/qrcode": "^1.4.1",
"@types/react": "^18.1.0",
"@types/react-dom": "^18.0.6",
"@types/react-slider": "^1.3.6",
"@types/turndown": "^5.0.1",
"@typescript-eslint/eslint-plugin": "^8.18",
"@typescript-eslint/parser": "^8.8",
Expand Down Expand Up @@ -104,7 +106,7 @@
"libphonenumber-js": "^1.10.41",
"lodash": "^4.17.21",
"papaparse": "^5.4.1",
"pdfjs-dist": "4.2",
"pdfjs-dist": "5.1",
"qrcode.react": "^4.1.0",
"query-string": "^9.1.0",
"react": "^18.1.0",
Expand All @@ -115,7 +117,9 @@
"react-gtm-module": "^2.0.11",
"react-i18next": "^15.0.1",
"react-image-crop": "^11.0.6",
"react-range-slider-input": "^3.2.1",
"react-router-dom": "^6.27.0",
"react-slider": "^2.0.6",
"summernote": "^0.9.1",
"terser-webpack-plugin": "^5.3.9",
"turndown": "^7.1.2",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,23 @@
text-align: left;
}

h1,
h2,
h3,
h4 {
&:first-child {
margin-top: 0;
}
}

p {
margin-bottom: 15px;
text-align: left;
font: inherit;

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

ul,
Expand Down
12 changes: 8 additions & 4 deletions react/assets/forus-platform/scss/_common/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
@import 'blocks/block-sessions';
@import 'blocks/block-breadcrumbs';
@import 'blocks/block-notifications';
@import '../../../forus-webshop/scss/_common/components/ui-controls';
@import '../../../forus-webshop/scss/includes/components/ui-controls';
}

@import '../../../forus-webshop/scss/_common/components/table-pagination';
@import '../../../forus-webshop/scss/_common/sections/blocks/block-sign_up';
@import '../../../forus-webshop/scss/_common/sections/blocks/block-exception';
@import '../../../forus-webshop/scss/includes/components/table-pagination';
@import '../../../forus-webshop/scss/includes/blocks/block-sign_up';
@import '../../../forus-webshop/scss/includes/blocks/block-exception';

.block {
@import 'blocks/block-fund_types';
Expand Down Expand Up @@ -1594,6 +1594,10 @@ body {
}
}
}

&.keyvalue-value-gap-sm {
gap: 5px;
}
}

.keyvalue-link {
Expand Down
Loading