diff --git a/package-lock.json b/package-lock.json index 0e73ad4a..7b5bd093 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nextjs-project", - "version": "0.1.0", + "version": "1.0.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index fc597a5e..9489eecc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nextjs-project", - "version": "1.0.1", + "version": "1.0.2", "private": true, "scripts": { "prepare": "husky install" diff --git a/services/app/package-lock.json b/services/app/package-lock.json index 918ce864..431d4c9f 100644 --- a/services/app/package-lock.json +++ b/services/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "nextjs-project", - "version": "0.1.0", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/services/app/package.json b/services/app/package.json index e238a5d7..1cbbdcd1 100644 --- a/services/app/package.json +++ b/services/app/package.json @@ -1,6 +1,6 @@ { "name": "nextjs-project", - "version": "0.1.0", + "version": "1.0.2", "private": true, "scripts": { "dev": "next dev", diff --git a/services/app/source/02-layouts/Sidebar/sidebar.module.css b/services/app/source/02-layouts/Sidebar/sidebar.module.css index 3c7380b4..d16b75fa 100644 --- a/services/app/source/02-layouts/Sidebar/sidebar.module.css +++ b/services/app/source/02-layouts/Sidebar/sidebar.module.css @@ -12,11 +12,11 @@ > * { flex: 1 1 calc(100% - var(--sidebar-width) - var(--sidebar-gutter) * 2); } - } - @supports (display: grid) { - display: grid; - grid-template-columns: var(--sidebar-width) 1fr; + @supports (display: grid) { + display: grid; + grid-template-columns: var(--sidebar-width) 1fr; + } } } @@ -26,10 +26,10 @@ flex-basis: calc( 100% - var(--sidebar-width) * 2 - var(--sidebar-gutter) * 3 ); - } - @supports (display: grid) { - grid-template-columns: var(--sidebar-width) 1fr var(--sidebar-width); + @supports (display: grid) { + grid-template-columns: var(--sidebar-width) 1fr var(--sidebar-width); + } } } } diff --git a/services/app/source/04-templates/LandingPage/LandingPage.stories.tsx b/services/app/source/04-templates/LandingPage/LandingPage.stories.tsx new file mode 100644 index 00000000..358434ab --- /dev/null +++ b/services/app/source/04-templates/LandingPage/LandingPage.stories.tsx @@ -0,0 +1,23 @@ +import { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; +import { WYSIWYG } from '../../03-components/Wysiwyg/Wysiwyg.stories'; +import LandingPageTemplate from './LandingPage'; + +const meta: Meta = { + title: 'Templates/Landing Page', + component: LandingPageTemplate, +}; + +const LandingPage: StoryObj = { + render: args => ( + + {WYSIWYG.render && } + + ), + args: { + title: 'Landing Page Title', + }, +}; + +export default meta; +export { LandingPage }; diff --git a/services/app/source/04-templates/LandingPage/LandingPage.tsx b/services/app/source/04-templates/LandingPage/LandingPage.tsx index f4659c7e..07c9ee1d 100644 --- a/services/app/source/04-templates/LandingPage/LandingPage.tsx +++ b/services/app/source/04-templates/LandingPage/LandingPage.tsx @@ -2,10 +2,12 @@ import Head from 'next/head'; import { ReactNode } from 'react'; import { MAIN_ID } from '../../00-config/constants'; import Main from '../../02-layouts/Main/Main'; +import PageTitle from '../../03-components/PageTitle/PageTitle'; interface PageProps { mainId?: string; title: string; + hidePageTitle?: boolean; description?: string; children?: ReactNode; } @@ -13,6 +15,7 @@ interface PageProps { function LandingPage({ mainId = MAIN_ID, title, + hidePageTitle, description, children, }: PageProps): JSX.Element { @@ -22,7 +25,10 @@ function LandingPage({ {title} {description && } -
{children}
+
+ {!hidePageTitle && title && } + {children} +
); } diff --git a/services/app/source/05-pages/Homepage.stories.tsx b/services/app/source/05-pages/Homepage.stories.tsx index 27f02639..bea32623 100644 --- a/services/app/source/05-pages/Homepage.stories.tsx +++ b/services/app/source/05-pages/Homepage.stories.tsx @@ -22,7 +22,7 @@ const settings: Meta = { const Homepage: StoryObj = { render: args => ( - +