Skip to content

Commit

Permalink
OTR:VKT(Frontend): Take new LangSelector into use
Browse files Browse the repository at this point in the history
  • Loading branch information
pkoivisto committed Nov 8, 2023
1 parent 6968e4b commit 1aa57de
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion frontend/packages/akr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"akr:tslint": "yarn g:tsc --pretty --noEmit"
},
"dependencies": {
"shared": "npm:@opetushallitus/[email protected].1"
"shared": "npm:@opetushallitus/[email protected].0"
}
}
2 changes: 1 addition & 1 deletion frontend/packages/otr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"otr:tslint": "yarn g:tsc --pretty --noEmit"
},
"dependencies": {
"shared": "npm:@opetushallitus/[email protected].1"
"shared": "npm:@opetushallitus/[email protected].2"
}
}
2 changes: 2 additions & 0 deletions frontend/packages/otr/src/components/layouts/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const Header = (): JSX.Element => {
{isPhone && (
<Toolbar className="header__toolbar header__toolbar__mobile-lang-select">
<LangSelector
usage="header"
changeLang={changeLang}
getCurrentLang={getCurrentLang}
langDict={langDict}
Expand Down Expand Up @@ -83,6 +84,7 @@ export const Header = (): JSX.Element => {
{isAuthenticated && <ClerkHeaderButtons />}
{!isPhone && (
<LangSelector
usage="header"
changeLang={changeLang}
getCurrentLang={getCurrentLang}
langDict={langDict}
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/vkt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
},
"dependencies": {
"reduxjs-toolkit-persist": "^7.2.1",
"shared": "npm:@opetushallitus/[email protected].1"
"shared": "npm:@opetushallitus/[email protected].2"
}
}
2 changes: 2 additions & 0 deletions frontend/packages/vkt/src/components/layouts/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const Header = (): JSX.Element => {
{isPhone && (
<Toolbar className="header__toolbar header__toolbar__mobile-lang-select">
<LangSelector
usage="header"
changeLang={changeLang}
getCurrentLang={getCurrentLang}
langDict={langDict}
Expand Down Expand Up @@ -88,6 +89,7 @@ export const Header = (): JSX.Element => {
{isAuthenticated && <ClerkHeaderButtons />}
{!isPhone && (
<LangSelector
usage="header"
changeLang={changeLang}
getCurrentLang={getCurrentLang}
langDict={langDict}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ Array [
>
<nav
aria-label="header.accessibility.langSelectorAriaLabel"
className="lang-selector"
className="lang-selector__header"
>
<svg
aria-hidden={true}
className="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall lang-selector__icon css-ptiqhd-MuiSvgIcon-root"
className="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall lang-selector__header__icon css-ptiqhd-MuiSvgIcon-root"
data-testid="LanguageOutlinedIcon"
focusable="false"
viewBox="0 0 24 24"
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/yki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"yki:tslint": "yarn g:tsc --pretty --noEmit"
},
"dependencies": {
"shared": "npm:@opetushallitus/[email protected].1"
"shared": "npm:@opetushallitus/[email protected].0"
},
"devDependencies": {
"multer": "^1.4.5-lts.1"
Expand Down
17 changes: 12 additions & 5 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2520,15 +2520,15 @@ __metadata:
version: 0.0.0-use.local
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.akr@workspace:packages/akr"
dependencies:
shared: "npm:@opetushallitus/[email protected].1"
shared: "npm:@opetushallitus/[email protected].0"
languageName: unknown
linkType: soft

"@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr":
version: 0.0.0-use.local
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr"
dependencies:
shared: "npm:@opetushallitus/[email protected].1"
shared: "npm:@opetushallitus/[email protected].2"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -2620,7 +2620,7 @@ __metadata:
languageName: unknown
linkType: soft

"@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared, shared@npm:@opetushallitus/[email protected].1":
"@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared, shared@npm:@opetushallitus/[email protected].2":
version: 0.0.0-use.local
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared"
languageName: unknown
Expand All @@ -2631,7 +2631,7 @@ __metadata:
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.vkt@workspace:packages/vkt"
dependencies:
reduxjs-toolkit-persist: ^7.2.1
shared: "npm:@opetushallitus/[email protected].1"
shared: "npm:@opetushallitus/[email protected].2"
languageName: unknown
linkType: soft

Expand All @@ -2640,7 +2640,7 @@ __metadata:
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.yki@workspace:packages/yki"
dependencies:
multer: ^1.4.5-lts.1
shared: "npm:@opetushallitus/[email protected].1"
shared: "npm:@opetushallitus/[email protected].0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -11662,6 +11662,13 @@ __metadata:
languageName: node
linkType: hard

"shared@npm:@opetushallitus/[email protected]":
version: 1.10.0
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.shared@npm:1.10.0::__archiveUrl=https%3A%2F%2Fnpm.pkg.github.com%2Fdownload%2F%40Opetushallitus%2Fkieli-ja-kaantajatutkinnot.shared%2F1.10.0%2Face1e7f7286a95ff7939913b976f429cd487d0c9"
checksum: c9cb35390d441e2f0a28d1b8c27f0444b8832509e03b79bd6060ed6090fe251e4ccac88702a10c6b98ba92fcfc92e5c267435570450f1aad0686ec011b46cb36
languageName: node
linkType: hard

"shebang-command@npm:^2.0.0":
version: 2.0.0
resolution: "shebang-command@npm:2.0.0"
Expand Down

0 comments on commit 1aa57de

Please sign in to comment.