diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a1d10a80..da14b982 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,3 @@ updates: - web-team reviewers: - 'KTH/web-team' - ignore: - - dependency-name: 'kth-style' - versions: ['9.x', '10.x'] diff --git a/i18n/messages.en.js b/i18n/messages.en.js index 73f26fc8..aa99dc7a 100644 --- a/i18n/messages.en.js +++ b/i18n/messages.en.js @@ -41,5 +41,11 @@ module.exports = { template_silent_login_page_heading: 'Silent login page', template_not_found_page_heading: 'Not found', template_back_link: 'Back to start page', + + language_link_lang_sv: 'Svenska', + language_link_not_translated: 'Den här sidan saknar översättning', + language_link_button_close: 'Close', + label_translation_link: 'Svenska (med dialog)', + label_translation_dialog: 'KTH på svenska', }, } diff --git a/i18n/messages.se.js b/i18n/messages.se.js index 54f5e193..4fb403de 100644 --- a/i18n/messages.se.js +++ b/i18n/messages.se.js @@ -41,5 +41,11 @@ module.exports = { template_silent_login_page_heading: 'Sida med tyst inloggning', template_not_found_page_heading: 'Sidan hittades inte ', template_back_link: 'Tillbaka till start-sidan', + + language_link_lang_en: 'English', + language_link_not_translated: 'This page isn’t translated', + language_link_button_close: 'Stäng', + label_translation_link: 'English (with dialog)', + label_translation_dialog: 'KTH:s International Website', }, } diff --git a/package-lock.json b/package-lock.json index b9e31771..b12cf2c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@kth/log": "^4.0.7", "@kth/monitor": "^4.2.1", "@kth/session": "^3.0.9", + "@kth/style": "^0.17.2", "body-parser": "^1.20.2", "cookie-parser": "^1.4.6", "dotenv": "^16.4.5", @@ -29,7 +30,7 @@ "kth-node-express-routing": "^2.2.0", "kth-node-i18n": "^1.0.18", "kth-node-redis": "^3.3.0", - "kth-style": "^9.1.2", + "kth-style": "^10.0.18", "passport": "^0.7.0", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -3369,6 +3370,14 @@ "redis": "^3.1.2" } }, + "node_modules/@kth/style": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/@kth/style/-/style-0.17.2.tgz", + "integrity": "sha512-7FJhCHFixJZJdnlzkgFUoDXm9XrVJsYL27eQDpGfgYJgCZ6mWltg0N2s91EVS8zyIABaYAyYMTpB5aTHvatJxw==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/@microsoft/applicationinsights-web-snippet": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz", @@ -12039,9 +12048,9 @@ } }, "node_modules/kth-style": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/kth-style/-/kth-style-9.1.2.tgz", - "integrity": "sha512-lPYyenB9UJeoJghbzUW+tdhnSu/WFhO5Fcj82DPH3FO3AtdOHZz1WC29xn8/FER8PgpAuBngbSy3XPP9RfXMMw==", + "version": "10.0.18", + "resolved": "https://registry.npmjs.org/kth-style/-/kth-style-10.0.18.tgz", + "integrity": "sha512-ey+eLyaKnOQusXfQUuqunw89jwPRzAdx4M0BPI/BWr5j2abBtmq7OLV805xnxIcZPwDVjNxskeuYfaitz4MxdA==", "dependencies": { "bootstrap": "^5.3.3", "jquery": "^3.6.0", @@ -18841,6 +18850,12 @@ "redis": "^3.1.2" } }, + "@kth/style": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/@kth/style/-/style-0.17.2.tgz", + "integrity": "sha512-7FJhCHFixJZJdnlzkgFUoDXm9XrVJsYL27eQDpGfgYJgCZ6mWltg0N2s91EVS8zyIABaYAyYMTpB5aTHvatJxw==", + "requires": {} + }, "@microsoft/applicationinsights-web-snippet": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz", @@ -25161,9 +25176,9 @@ } }, "kth-style": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/kth-style/-/kth-style-9.1.2.tgz", - "integrity": "sha512-lPYyenB9UJeoJghbzUW+tdhnSu/WFhO5Fcj82DPH3FO3AtdOHZz1WC29xn8/FER8PgpAuBngbSy3XPP9RfXMMw==", + "version": "10.0.18", + "resolved": "https://registry.npmjs.org/kth-style/-/kth-style-10.0.18.tgz", + "integrity": "sha512-ey+eLyaKnOQusXfQUuqunw89jwPRzAdx4M0BPI/BWr5j2abBtmq7OLV805xnxIcZPwDVjNxskeuYfaitz4MxdA==", "requires": { "bootstrap": "^5.3.3", "jquery": "^3.6.0", diff --git a/package.json b/package.json index b8cb4ae5..69fec692 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@kth/log": "^4.0.7", "@kth/monitor": "^4.2.1", "@kth/session": "^3.0.9", + "@kth/style": "^0.17.2", "body-parser": "^1.20.2", "cookie-parser": "^1.4.6", "dotenv": "^16.4.5", @@ -45,7 +46,7 @@ "kth-node-express-routing": "^2.2.0", "kth-node-i18n": "^1.0.18", "kth-node-redis": "^3.3.0", - "kth-style": "^9.1.2", + "kth-style": "^10.0.18", "passport": "^0.7.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/public/css/node-web.scss b/public/css/node-web.scss index 00b52e1c..a2f0c406 100644 --- a/public/css/node-web.scss +++ b/public/css/node-web.scss @@ -1,5 +1,19 @@ -// Scss code goes here! +@use '~@kth/style/scss/utils/reset.scss'; +@use '~@kth/style/scss/utils/mixins.scss'; -#app { - padding: 30px; +@use '~@kth/style/scss/components/logotype.scss'; +@use '~@kth/style/scss/components/search.scss'; +@use '~@kth/style/scss/components/alert.scss'; +@use '~@kth/style/scss/components/footer.scss'; +@use '~@kth/style/scss/components/mega-menu.scss'; +@use '~@kth/style/scss/components/visually-hidden.scss'; +@use '~@kth/style/scss/components/button.scss'; +@use '~@kth/style/scss/components/header.scss'; +@use '~@kth/style/scss/components/menu-item.scss'; +@use '~@kth/style/scss/components/menu-panel.scss'; +@use '~@kth/style/scss/components/translation-panel'; + +.container { + @include mixins.container; + padding-block: 30px; } diff --git a/public/js/app/components/Button.jsx b/public/js/app/components/Button.jsx index 78de7be1..b42571d3 100644 --- a/public/js/app/components/Button.jsx +++ b/public/js/app/components/Button.jsx @@ -7,7 +7,7 @@ function Button({ caption = 'N/A', lang = 'sv', onClick = null }) { const doClick = onClick || setButtonClicked return ( <> - {buttonClicked ?

{i18n.message('template_button_works', lang)}

: null} diff --git a/public/js/app/components/__snapshots__/Button.test.js.snap b/public/js/app/components/__snapshots__/Button.test.js.snap index 13f416a2..9ae5d04f 100644 --- a/public/js/app/components/__snapshots__/Button.test.js.snap +++ b/public/js/app/components/__snapshots__/Button.test.js.snap @@ -3,7 +3,7 @@ exports[`Component - - - {{{blocks.secondaryMenu}}} - -
{{{blocks.megaMenu}}} {{{blocks.search}}}
- - -
- -
-
- {{breadcrumbs breadcrumbsList lang}} -
+
+ + +
  • + {{{languageLink lang translationLinkMessageKey translationLink translationDialogMessageKey}}} +
    • +
  • + +
    • + \ No newline at end of file diff --git a/test/mock-api/server.js b/test/mock-api/server.js index b3b2e0fb..c5412c3f 100644 --- a/test/mock-api/server.js +++ b/test/mock-api/server.js @@ -7,15 +7,12 @@ const config = require('./config') const app = express() config.paths.forEach(path => { - // console.log('Added path', path.url) app[path.method](path.url, (req, res) => { - // console.log('Responded on path', path.url) res.send(path.response) }) }) app.use((req, res) => { - // console.log('Caught request on path', req.url) res.send('') }) process.on('SIGTERM', () => {