diff --git a/package-lock.json b/package-lock.json index 5fd19c3..47a9bd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,8 @@ "react-dom": "^18.2.0", "react-i18next": "^12.3.1", "react-redux": "^8.0.5", - "react-router-dom": "^6.11.2" + "react-router-dom": "^6.11.2", + "unique-names-generator": "^4.7.1" }, "devDependencies": { "@chargebee/chargebee-js-types": "^1.0.1", @@ -3242,6 +3243,14 @@ "node": ">=12.20" } }, + "node_modules/unique-names-generator": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/unique-names-generator/-/unique-names-generator-4.7.1.tgz", + "integrity": "sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==", + "engines": { + "node": ">=8" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", @@ -5566,6 +5575,11 @@ "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", "dev": true }, + "unique-names-generator": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/unique-names-generator/-/unique-names-generator-4.7.1.tgz", + "integrity": "sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==" + }, "update-browserslist-db": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", diff --git a/package.json b/package.json index 6f05c1c..4c44719 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "react-dom": "^18.2.0", "react-i18next": "^12.3.1", "react-redux": "^8.0.5", - "react-router-dom": "^6.11.2" + "react-router-dom": "^6.11.2", + "unique-names-generator": "^4.7.1" }, "devDependencies": { "@chargebee/chargebee-js-types": "^1.0.1", diff --git a/public/check-mark-1.png b/public/check-mark-1.png new file mode 100644 index 0000000..a0ed218 Binary files /dev/null and b/public/check-mark-1.png differ diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx index a90dc34..f91e151 100644 --- a/src/components/App/index.tsx +++ b/src/components/App/index.tsx @@ -5,7 +5,7 @@ import { import { useAuth } from '@/auth' import { useSelector } from 'react-redux' import { selectors } from '@/store' -import routes, { hasNavigation, getRouteBy, hasNoFooter } from '@/routes' +import routes, { hasNavigation, getRouteBy, hasNoFooter, hasNoHeader } from '@/routes' import BirthdayPage from '../BirthdayPage' import BirthtimePage from '../BirthtimePage' import CreateProfilePage from '../CreateProfilePage' @@ -23,6 +23,9 @@ import DidYouKnowPage from '../DidYouKnowPage' import FreePeriodInfoPage from '../FreePeriodInfoPage' import AttentionPage from '../AttentionPage' import FeedbackPage from '../FeedbackPage' +import CompatibilityPage from '../Compatibility' +import BreathPage from '../BreathPage' +import PriceListPage from '../PriceListPage' function App(): JSX.Element { const [isSpecialOfferOpen, setIsSpecialOfferOpen] = useState(false) @@ -46,6 +49,9 @@ function App(): JSX.Element { } /> } /> } /> + } /> + } /> + } /> }> } /> } /> @@ -65,11 +71,12 @@ function Layout({ setIsSpecialOfferOpen }: LayoutProps): JSX.Element { const location = useLocation() const showNavbar = hasNavigation(location.pathname) const showFooter = hasNoFooter(location.pathname) + const showHeader = hasNoHeader(location.pathname) const [isMenuOpen, setIsMenuOpen] = useState(false) const changeIsSpecialOfferOpen = () => setIsSpecialOfferOpen(true) return (
-
setIsMenuOpen(true)} clickCross={changeIsSpecialOfferOpen}/> + { showHeader ?
setIsMenuOpen(true)} clickCross={changeIsSpecialOfferOpen}/> : null }
{ showFooter ?