Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
143ca73
update webshop top menu styles
ateamcms Jan 30, 2025
9c122f6
Merge branch 'develop' into feature.update-webshop-top-menu-styles
dev-rminds Feb 7, 2025
e660896
Merge branch 'develop' into feature.update-webshop-top-menu-styles
RobinMeles Feb 10, 2025
94c4950
minor translations service refactoring
dev-rminds Feb 11, 2025
dfc22ce
fix reservation extra ammount translations
dev-rminds Feb 12, 2025
48d4a70
update language style on mobile
ateamcms Feb 12, 2025
881e0e7
add more records to identity profiles
dev-rminds Feb 13, 2025
ea65b19
Merge branch 'translations-service-optimization' into extend-profile-…
dev-rminds Feb 13, 2025
55a4499
Merge branch 'develop' into translations-service-optimization
dev-rminds Feb 13, 2025
009d4c4
Merge branch 'translations-service-optimization' into extend-profile-…
dev-rminds Feb 13, 2025
5abcd54
add export to profiles page
dev-rminds Feb 13, 2025
0b4cddd
Update mollie-connection.js
RobinMeles Feb 14, 2025
9d14341
Update FundProvider.tsx
RobinMeles Feb 14, 2025
42b15a8
Bump the npm_and_yarn group across 1 directory with 2 updates
dependabot[bot] Feb 15, 2025
6dd9d8e
fix start page back button
dev-rminds Feb 17, 2025
19ef145
mobile language selector refactoring
dev-rminds Feb 17, 2025
3f51154
add translations
dev-rminds Feb 17, 2025
3409bfc
fix fund top-ups
dev-rminds Feb 17, 2025
531e7ad
Merge branch 'develop' into feature.update-webshop-top-menu-styles
dev-rminds Feb 17, 2025
a6e0043
update mobile language items color
dev-rminds Feb 17, 2025
7dc46e1
Merge pull request #589 from teamforus/fixes.fund-top-ups
RobinMeles Feb 18, 2025
7a8f4e9
Merge branch 'develop' into change_ideal_transaction_amount
RobinMeles Feb 18, 2025
8ef58cb
Merge pull request #586 from teamforus/change_ideal_transaction_amount
RobinMeles Feb 18, 2025
4e00acc
Merge pull request #587 from teamforus/dependabot/npm_and_yarn/npm_an…
RobinMeles Feb 18, 2025
a7626a9
Merge branch 'develop' into feature.update-webshop-top-menu-styles
RobinMeles Feb 18, 2025
e838e6c
Merge pull request #557 from teamforus/feature.update-webshop-top-men…
RobinMeles Feb 18, 2025
68388db
Merge branch 'develop' into fixes.start-page-back-button
RobinMeles Feb 18, 2025
9f2db1b
Merge pull request #588 from teamforus/fixes.start-page-back-button
RobinMeles Feb 18, 2025
ba9a41c
Merge branch 'develop' into translations-service-optimization
RobinMeles Feb 18, 2025
df8b643
profiles, add last activity time
dev-rminds Feb 18, 2025
a23403f
update profiles table and webshop details
dev-rminds Feb 18, 2025
0046735
update translations
dev-rminds Feb 18, 2025
d9ec086
update profile table tooltips
dev-rminds Feb 18, 2025
1969b16
Merge branch 'translations-service-optimization' into extend-profile-…
dev-rminds Feb 18, 2025
ac0557d
merge extend-profile-records into profiles.last-login and fix conflicts
dev-rminds Feb 18, 2025
6a5727a
fix sessions start at date
dev-rminds Feb 18, 2025
7abb415
Merge pull request #578 from teamforus/translations-service-optimization
RobinMeles Feb 19, 2025
abf0f9f
Merge branch 'develop' into extend-profile-records
RobinMeles Feb 19, 2025
9379a14
fix meapp page translations and update profile age record
dev-rminds Feb 19, 2025
b55bb41
fix translations for external voucher webshop
ateamcms Feb 19, 2025
c951e40
update translations and add profile link to menu on webshop
dev-rminds Feb 19, 2025
1a4f6d0
update translations
dev-rminds Feb 19, 2025
008c29d
update texts
dev-rminds Feb 19, 2025
9ecf7c5
Merge pull request #584 from teamforus/extend-profile-records
RobinMeles Feb 19, 2025
7491bb2
Merge branch 'develop' into profiles.last-login
RobinMeles Feb 19, 2025
0b2c286
merge develop into fixes.translations-for-external-voucher-webshop
dev-rminds Feb 19, 2025
ef736c1
Merge pull request #591 from teamforus/fixes.translations-for-externa…
RobinMeles Feb 19, 2025
a0fa21c
Merge branch 'develop' into profiles.last-login
RobinMeles Feb 19, 2025
a2d1c53
Merge pull request #590 from teamforus/profiles.last-login
RobinMeles Feb 19, 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
1 change: 1 addition & 0 deletions docker/docker-compose/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN apk update \
iputils \
net-tools \
mc \
nano \
wget

CMD tail -f /dev/null
16 changes: 9 additions & 7 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 @@ -93,7 +93,7 @@
"date-fns": "^4.1.0",
"deepl-node": "^1.15.0",
"diff": "^7.0.0",
"dompurify": "^3.2.1",
"dompurify": "^3.2.4",
"easyqrcodejs": "^4.4.13",
"file-saver": "^2.0.5",
"i18n-iso-countries": "^7.13.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
background: #fff;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
z-index: 2;
width: 230px;
max-width: 90vw;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ $footer_base_font: 'Open Sans', arial, sans-serif;
--item-height: 44px;
--item-line-height: 18px;
position: fixed;
top: 50px;
top: 68px;
bottom: 0;
z-index: 10;
width: 100%;
transition: transform 0.2s;
background: #fff;
box-shadow: 0px -1px 0px 0px #E5E5E5 inset;
box-shadow: 0px -1px 0px 0px #e5e5e5 inset;
border-top: 1px solid var(--border-color);
overflow: auto;

Expand All @@ -20,7 +20,7 @@ $footer_base_font: 'Open Sans', arial, sans-serif;
.mobile-menu-group-header {
display: flex;
padding: 16px 20px 16px 15px;
background: #FBFBFB;
background: #fbfbfb;
border-top: 1px solid transparent;
border-bottom: 1px solid var(--border-color);
color: #222222;
Expand All @@ -33,17 +33,117 @@ $footer_base_font: 'Open Sans', arial, sans-serif;
}
}

.mobile-menu-languages {
.mobile-menu-languages-header {
display: flex;
padding: 16px 10px 16px 15px;
background: #fbfbfb;
border-top: 1px solid transparent;
border-bottom: 1px solid var(--border-color);
color: #282b39;
font: 600 14px/20px var(--base-font);
outline-offset: -2px !important;
gap: 5px;

.mobile-menu-languages-header-icon {
display: flex;
flex: 0 0 auto;
margin-left: -2px;

.mdi {
font-size: 18px;
color: #848484;
}
}

.mobile-menu-languages-header-name {
flex: 1 1 auto;
display: flex;
gap: 3px;

.mobile-menu-languages-header-name-prefix {
color: #282b39;
transition: 0.4s color;
}
}

.mobile-menu-languages-header-toggle {
display: flex;
justify-content: center;
flex: 0 0 30px;
align-items: center;

.mdi {
height: 20px;
line-height: 20px;
display: block;
width: 30px;
font-size: 28px;
color: #9e9e9e;
}
}

&.mobile-menu-languages-header-active {
.mobile-menu-languages-header-toggle {
.mdi {
color: #282b39;
}
}

.mobile-menu-languages-header-name {
.mobile-menu-languages-header-name-prefix {
color: #646464;
}
}
}
}

.mobile-menu-item-language {
display: flex;
flex-direction: row;
gap: 8px;
color: #282b39;
align-items: center;
justify-content: flex-start;
font: 600 14px / var(--item-line-height) var(--base-font);
border-bottom: 1px solid var(--border-color);
padding: calc((var(--item-height) - var(--item-line-height)) / 2) 15px;
outline-offset: -2px !important;

.mobile-menu-item-language-separator {
width: 1px;
height: 8px;
background: var(--border-color);
}

.mobile-menu-item-language-name {
flex: 1 1 auto;
}

.mobile-menu-item-language-check {
flex: 0 0 20px;
font-size: 18px;
line-height: var(--item-line-height);
height: var(--item-line-height);
}

&.mobile-menu-item-language-active {
color: #000;
}
}
}

.mobile-menu-items {
width: 100%;
overflow: scroll;

.mobile-menu-item {
font: 600 14px/var(--item-line-height) var(--base-font);
font: 600 14px / var(--item-line-height) var(--base-font);
border-bottom: 1px solid var(--border-color);
padding: calc(calc(var(--item-height) - var(--item-line-height)) / 2) 15px;
display: flex;
outline-offset: -2px !important;

.mobile-menu-item-icon {
font-size: 22px;
line-height: var(--item-line-height);
Expand Down Expand Up @@ -71,21 +171,21 @@ $footer_base_font: 'Open Sans', arial, sans-serif;
background-color: var(--btn-auth-bg);
border: solid 1px var(--btn-auth-border);
color: var(--tc-auth-btn);

.mdi {
color: var(--tc-auth-btn);
}

&:hover {
border: solid 1px var(--btn-auth-border);

.mdi {
color: var(--tc-auth-btn);
}
}
}
}

&.active {
color: var(--color-primary);

Expand All @@ -95,14 +195,15 @@ $footer_base_font: 'Open Sans', arial, sans-serif;

&:after {
position: absolute;
right: 20px;
content: "\F012C";
font: normal normal normal 24px/1 "Material Design Icons";
right: 15px;
content: '\F012C';
font: normal normal normal 24px/1 'Material Design Icons';
font-size: 18px;
color: #282B39;
color: #282b39;
width: 20px;
}
}

&:hover {
color: var(--color-primary);
}
Expand All @@ -117,10 +218,10 @@ $footer_base_font: 'Open Sans', arial, sans-serif;
.mobile-menu-items {
.mobile-menu-item:not(.active) {
.mobile-menu-item-icon {
color: #CDCED2;
color: #cdced2;
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,42 @@
align-items: center;

& > .navbar-mobile-auth-buttons {
padding-top: 5px;
padding: 10px;
}
}

.navbar-mobile-button {
flex: 0 0 60px;
height: 50px;
height: 68px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
font: 600 9px / 14px var(--base-font);
font: 500 12px / 14px var(--base-font);
outline-offset: -2px !important;
border-radius: 6px;
gap: 2px;

.navbar-mobile-button-icon {
font-size: 16px;
font-size: 26px;
line-height: 26px;
}

&.active {
font-weight: 700;
}
}

.navbar-mobile-logo {
display: flex;
height: 30px;
flex: 1 1 auto;
flex-direction: row;
justify-content: center;

img {
max-width: 140px;
max-height: 36px;
}
}

.navbar-mobile-lang {
Expand All @@ -60,8 +69,8 @@
gap: 10px;

.navbar-mobile-auth-button {
padding-top: 7px;
padding-bottom: 7px;
padding-top: 9px;
padding-bottom: 9px;
margin: 0 0;
flex: 0 0 calc(50% - 5px);
box-shadow: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export default function FundProvider() {
<em className="mdi mdi-information" />
<div className="tooltip-content">
<div className="tooltip-text">
Per transactie betaalt u 0,29 cent (excl. btw)
Per transactie betaalt u 0,32 cent (excl. btw)
</div>
</div>
</div>
Expand Down Expand Up @@ -164,7 +164,7 @@ export default function FundProvider() {
<div className="card-footer card-footer-warning card-footer-sm">
<div className="card-title">
<div className="text-small">
Wij gebruiken uitsluitend Ideal. Per transactie betaalt u 0,29 cent (excl. btw).
Wij gebruiken uitsluitend Ideal. Per transactie betaalt u 0,32 cent (excl. btw).
</div>
</div>
</div>
Expand Down
Loading