@mrfylke/contact-form 0.1.28 → 0.1.30

package/lib/components/icon/generated-icons.d.ts

@@ -1288,7 +1288,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        "logo/RichLogo": {
+        Crash: {
             relative: string;
             absolute: string;
             assetType: string;
@@ -1296,7 +1296,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        Crash: {
+        DashboardBackground: {
             relative: string;
             absolute: string;
             assetType: string;
@@ -1304,7 +1304,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        DashboardBackground: {
+        Onboarding4: {
             relative: string;
             absolute: string;
             assetType: string;
@@ -1312,7 +1312,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        Onboarding4: {
+        Onboarding5: {
             relative: string;
             absolute: string;
             assetType: string;
@@ -1320,7 +1320,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        Onboarding5: {
+        TicketSplash: {
             relative: string;
             absolute: string;
             assetType: string;
@@ -1328,7 +1328,7 @@ export declare const icons: {
             darkable: boolean;
             id: string;
         };
-        TicketSplash: {
+        "logo/RichLogo": {
             relative: string;
             absolute: string;
             assetType: string;

package/lib/components/icon/generated-icons.js

@@ -1294,14 +1294,6 @@ exports.icons = {
             "darkable": false,
             "id": "favicon"
         },
-        "logo/RichLogo": {
-            "relative": "colors/logo/RichLogo.svg",
-            "absolute": "/home/runner/work/mrfylke-contact-form/mrfylke-contact-form/packages/contact-form/.tmp-icon-assets/colors/logo/RichLogo.svg",
-            "assetType": "colors",
-            "colorType": "images",
-            "darkable": false,
-            "id": "logo/RichLogo"
-        },
         "Crash": {
             "relative": "colors/images/Crash.svg",
             "absolute": "/home/runner/work/mrfylke-contact-form/mrfylke-contact-form/packages/contact-form/.tmp-icon-assets/colors/images/Crash.svg",
@@ -1342,6 +1334,14 @@ exports.icons = {
             "darkable": false,
             "id": "TicketSplash"
         },
+        "logo/RichLogo": {
+            "relative": "colors/logo/RichLogo.svg",
+            "absolute": "/home/runner/work/mrfylke-contact-form/mrfylke-contact-form/packages/contact-form/.tmp-icon-assets/colors/logo/RichLogo.svg",
+            "assetType": "colors",
+            "colorType": "images",
+            "darkable": false,
+            "id": "logo/RichLogo"
+        },
         "BackgroundIllustration-OnBehalfOf": {
             "relative": "colors/images/light/BackgroundIllustration-OnBehalfOf.svg",
             "absolute": "/home/runner/work/mrfylke-contact-form/mrfylke-contact-form/packages/contact-form/.tmp-icon-assets/colors/images/light/BackgroundIllustration-OnBehalfOf.svg",

package/lib/layouts/contact-page-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contact-page-layout.d.ts","sourceRoot":"","sources":["../../src/layouts/contact-page-layout.tsx"],"names":[],"mappings":"AAkBA,MAAM,CAAC,OAAO,UAAU,iBAAiB,6UA6ExC"}
+{"version":3,"file":"contact-page-layout.d.ts","sourceRoot":"","sources":["../../src/layouts/contact-page-layout.tsx"],"names":[],"mappings":"AAmBA,MAAM,CAAC,OAAO,UAAU,iBAAiB,6UAiFxC"}

package/lib/layouts/contact-page-layout.js

@@ -33,7 +33,12 @@ function ContactPageLayout() {
     if (pathname === errorPath) {
         return layout?.errorContent ?? (0, jsx_runtime_1.jsx)(error_content_1.ErrorContent, {});
     }
-    const activePage = (0, contact_pages_1.findMatchedPage)(pathname, basePath, visiblePages);
+    const isBasePath = (0, contact_pages_1.stripTrailingSlashes)(pathname) === basePath;
+    const activePage = isBasePath
+        ? undefined
+        : (0, contact_pages_1.findMatchedPage)(pathname, basePath, visiblePages);
+    if (!isBasePath && !activePage)
+        (0, navigation_1.notFound)();
     const externalUrl = activePage
         ? pages.externalUrlByPageId?.[activePage.id]
         : undefined;
@@ -43,7 +48,7 @@ function ContactPageLayout() {
         href: '/',
         label: pageText.Contact.contactPageLayout.homeLink,
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { className: layout_module_css_1.default.layout, children: [(0, jsx_runtime_1.jsxs)("div", { children: [backLink && ((0, jsx_runtime_1.jsx)("div", { className: layout_module_css_1.default.homeLink__container, children: (0, jsx_runtime_1.jsx)(button_1.ButtonLink, { mode: "transparent", href: backLink.href, title: t(backLink.label), icon: { left: (0, jsx_runtime_1.jsx)(icon_1.MonoIcon, { icon: "navigation/ArrowLeft" }) } }) })), (0, jsx_runtime_1.jsxs)("div", { className: layout_module_css_1.default.layout__container, children: [(0, jsx_runtime_1.jsx)(typography_1.Typo.h2, { textType: "heading__2xl", children: t(pageText.Contact.contactPageLayout.title) }), (0, jsx_runtime_1.jsx)("nav", { className: layout_module_css_1.default.contact_page_navigator__container, children: visiblePages.map((contactPage) => ((0, jsx_runtime_1.jsx)(ContactPageNavLink, { icon: contactPage.icon, title: contactPage.title, href: `${basePath}/${contactPage.slug}`, isActive: pathname.includes(`${basePath}/${contactPage.slug}`), externalUrl: pages.externalUrlByPageId?.[contactPage.id] }, contactPage.id))) })] })] }), body, (0, contact_pages_1.displayPrivacyAndTerms)(activePage) && ((0, jsx_runtime_1.jsx)("div", { className: layout_module_css_1.default.privacyAndTerms, children: (0, jsx_runtime_1.jsx)(typography_1.Typo.p, { textType: "body__s__strong", children: t(pageText.Contact.contactPageLayout.privacyAndTerms) }) }))] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { className: layout_module_css_1.default.layout, children: [(0, jsx_runtime_1.jsxs)("div", { children: [backLink && ((0, jsx_runtime_1.jsx)("div", { className: layout_module_css_1.default.homeLink__container, children: (0, jsx_runtime_1.jsx)(button_1.ButtonLink, { mode: "transparent", href: backLink.href, title: t(backLink.label), icon: { left: (0, jsx_runtime_1.jsx)(icon_1.MonoIcon, { icon: "navigation/ArrowLeft" }) } }) })), (0, jsx_runtime_1.jsxs)("div", { className: layout_module_css_1.default.layout__container, children: [(0, jsx_runtime_1.jsx)(typography_1.Typo.h2, { textType: "heading__2xl", children: t(pageText.Contact.contactPageLayout.title) }), (0, jsx_runtime_1.jsx)("nav", { className: layout_module_css_1.default.contact_page_navigator__container, children: visiblePages.map((contactPage) => ((0, jsx_runtime_1.jsx)(ContactPageNavLink, { icon: contactPage.icon, title: contactPage.title, href: `${basePath}/${contactPage.slug}`, isActive: activePage?.slug === contactPage.slug, externalUrl: pages.externalUrlByPageId?.[contactPage.id] }, contactPage.id))) })] })] }), body, (0, contact_pages_1.displayPrivacyAndTerms)(activePage) && ((0, jsx_runtime_1.jsx)("div", { className: layout_module_css_1.default.privacyAndTerms, children: (0, jsx_runtime_1.jsx)(typography_1.Typo.p, { textType: "body__s__strong", children: t(pageText.Contact.contactPageLayout.privacyAndTerms) }) }))] }));
 }
 function ContactPageNavLink({ icon, title, href, isActive, externalUrl, }) {
     const { t } = (0, translations_1.useTranslation)();

package/lib/layouts/contact-pages.d.ts

@@ -7,6 +7,7 @@ import type { ContactFormConfig, ContactPage } from '../modules/config';
 export declare const getContactPages: (PageText?: typeof StaticPageText) => ContactPage[];
 export declare function useVisiblePages(): ContactPage[];
 export declare function getVisiblePages(pages: ContactFormConfig['pages'], pageText: typeof StaticPageText): ContactPage[];
+export declare const stripTrailingSlashes: (pathname: string) => string;
 export declare function findMatchedPage(pathname: string, basePath: string, visiblePages: ContactPage[]): ContactPage | undefined;
 export declare function getPageTitleForPathname(pathname: string, config: ContactFormConfig): TranslatedString | undefined;
 /**

package/lib/layouts/contact-pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contact-pages.d.ts","sourceRoot":"","sources":["../../src/layouts/contact-pages.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,IAAI,cAAc,EAC1B,gBAAgB,EAGjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAUxE;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAU,OAAO,cAA+B,KAC/C,WAAW,EAyDb,CAAC;AAEF,wBAAgB,eAAe,IAAI,WAAW,EAAE,CAI/C;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,QAAQ,EAAE,OAAO,cAAc,GAC9B,WAAW,EAAE,CAMf;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,GAC1B,WAAW,GAAG,SAAS,CAIzB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,GACxB,gBAAgB,GAAG,SAAS,CAO9B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,iBAAiB,GACxB,gBAAgB,GAAG,SAAS,CAG9B;AAID,eAAO,MAAM,sBAAsB,GAAI,cAAc,WAAW,YAG/D,CAAC"}
+{"version":3,"file":"contact-pages.d.ts","sourceRoot":"","sources":["../../src/layouts/contact-pages.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,IAAI,cAAc,EAC1B,gBAAgB,EAGjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAUxE;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAU,OAAO,cAA+B,KAC/C,WAAW,EAyDb,CAAC;AAEF,wBAAgB,eAAe,IAAI,WAAW,EAAE,CAI/C;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,QAAQ,EAAE,OAAO,cAAc,GAC9B,WAAW,EAAE,CAMf;AAED,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,WACvB,CAAC;AAE/B,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,GAC1B,WAAW,GAAG,SAAS,CAGzB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,GACxB,gBAAgB,GAAG,SAAS,CAO9B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,iBAAiB,GACxB,gBAAgB,GAAG,SAAS,CAG9B;AAID,eAAO,MAAM,sBAAsB,GAAI,cAAc,WAAW,YAG/D,CAAC"}

package/lib/layouts/contact-pages.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayPrivacyAndTerms = exports.getContactPages = void 0;
+exports.displayPrivacyAndTerms = exports.stripTrailingSlashes = exports.getContactPages = void 0;
 exports.useVisiblePages = useVisiblePages;
 exports.getVisiblePages = getVisiblePages;
 exports.findMatchedPage = findMatchedPage;
@@ -94,8 +94,11 @@ function getVisiblePages(pages, pageText) {
         .map((id) => allPages.find((page) => page.id === id))
         .filter((page) => page !== undefined);
 }
+const stripTrailingSlashes = (pathname) => pathname.replace(/\/+$/, '');
+exports.stripTrailingSlashes = stripTrailingSlashes;
 function findMatchedPage(pathname, basePath, visiblePages) {
-    return visiblePages.find((page) => pathname.includes(`${basePath}/${page.slug}`));
+    const path = (0, exports.stripTrailingSlashes)(pathname);
+    return visiblePages.find((page) => path === `${basePath}/${page.slug}`);
 }
 function getPageTitleForPathname(pathname, config) {
     const basePath = config.layout?.basePath ?? '/contact';

package/lib/translations/pages/contact.js

@@ -212,8 +212,8 @@ exports.Contact = {
     ticketing: {
         title: (0, commons_1.translation)('Billetter og app', 'Tickets and app', 'Billettar og app'),
         additionalTicketingInfo: {
-            detail: (0, commons_1.translation)('For informasjon om betaling på ferje, sjå', 'For information on payment on the ferry, see', 'For informasjon om betaling på ferje, sjå'),
-            linkText: (0, commons_1.translation)('betaling for ferje', 'payment on the ferry', 'betaling for ferje'),
+            detail: (0, commons_1.translation)('For informasjon om betaling på ferge, se', 'For information on payment on the ferry, see', 'For informasjon om betaling på ferje, sjå'),
+            linkText: (0, commons_1.translation)('betaling for ferge', 'payment on the ferry', 'betaling for ferje'),
             href: (0, commons_1.translation)('', '', ''),
         },
         priceAndTicketTypes: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrfylke/contact-form",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "license": "EUPL-1.2",
   "private": false,
   "main": "./lib/index.js",