diff --git a/yoga-app/package-lock.json b/yoga-app/package-lock.json index 137cbd3..2bd160c 100644 --- a/yoga-app/package-lock.json +++ b/yoga-app/package-lock.json @@ -12,6 +12,7 @@ "@types/aos": "^3.0.7", "@types/bcrypt": "^5.0.2", "@types/bcryptjs": "^2.4.6", + "@types/bootstrap": "^5.2.10", "@types/pg": "^8.11.10", "aos": "^2.3.4", "bcryptjs": "^2.4.3", @@ -1076,6 +1077,16 @@ "node": ">=0.10" } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -1121,6 +1132,15 @@ "integrity": "sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==", "dev": true }, + "node_modules/@types/bootstrap": { + "version": "5.2.10", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.10.tgz", + "integrity": "sha512-F2X+cd6551tep0MvVZ6nM8v7XgGN/twpdNDjqS1TUM7YFNEtQYWk+dKAnH+T1gr6QgCoGMPl487xw/9hXooa2g==", + "license": "MIT", + "dependencies": { + "@popperjs/core": "^2.9.2" + } + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", diff --git a/yoga-app/package.json b/yoga-app/package.json index 876b7e3..3cacca7 100644 --- a/yoga-app/package.json +++ b/yoga-app/package.json @@ -13,9 +13,9 @@ "@types/aos": "^3.0.7", "@types/bcrypt": "^5.0.2", "@types/bcryptjs": "^2.4.6", + "@types/bootstrap": "^5.2.10", "@types/pg": "^8.11.10", "aos": "^2.3.4", - "bcryptjs": "2.4.3", "bcryptjs": "^2.4.3", "bootstrap": "^4.6.2", "clsx": "^2.1.1", diff --git a/yoga-app/src/app/about/page.tsx b/yoga-app/src/app/about/page.tsx index 3583560..5c465e0 100644 --- a/yoga-app/src/app/about/page.tsx +++ b/yoga-app/src/app/about/page.tsx @@ -9,10 +9,13 @@ import QuotesComponent from "@/components/quotes.component"; import BlogPostsComponent from "@/components/blog.posts.component"; import FooterComponent from "@/components/footer.component"; import SubscribeComponent from "@/components/subscribe.component"; +import SubHeaderComponent from "@/components/subHeader.component"; +import BootstrapComponent from "@/components/bootstrap.component"; export default function About() { return ( <> + @@ -23,6 +26,8 @@ export default function About() { + + ); diff --git a/yoga-app/src/app/faq/page.tsx b/yoga-app/src/app/faq/page.tsx new file mode 100644 index 0000000..3583560 --- /dev/null +++ b/yoga-app/src/app/faq/page.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import AosComponent from "@/components/aos.component"; +import OurServicesComponent from "@/components/our.services.component"; +import AboutUsComponent from "@/components/about.us.component"; +import OurSpecialitiesComponent from "@/components/our.specialities.component"; +import ContactUsComponent from "@/components/contact.us.component"; +import PricingComponent from "@/components/pricing.component"; +import QuotesComponent from "@/components/quotes.component"; +import BlogPostsComponent from "@/components/blog.posts.component"; +import FooterComponent from "@/components/footer.component"; +import SubscribeComponent from "@/components/subscribe.component"; + +export default function About() { + return ( + <> + + + + + + + + + + + + + ); +} diff --git a/yoga-app/src/app/layout.tsx b/yoga-app/src/app/layout.tsx index aad85a8..3cec9cd 100644 --- a/yoga-app/src/app/layout.tsx +++ b/yoga-app/src/app/layout.tsx @@ -1,8 +1,6 @@ import type {Metadata, Viewport} from "next"; import "./globals.scss"; import {IconDescriptor} from "next/dist/lib/metadata/types/metadata-types"; -import MainHeaderComponent from "@/components/mainHeaderComponent"; - const generateIconDescriptor = (rel: string, sizes: string, url: string): IconDescriptor => { // + ); diff --git a/yoga-app/src/app/prices/page.tsx b/yoga-app/src/app/prices/page.tsx new file mode 100644 index 0000000..3583560 --- /dev/null +++ b/yoga-app/src/app/prices/page.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import AosComponent from "@/components/aos.component"; +import OurServicesComponent from "@/components/our.services.component"; +import AboutUsComponent from "@/components/about.us.component"; +import OurSpecialitiesComponent from "@/components/our.specialities.component"; +import ContactUsComponent from "@/components/contact.us.component"; +import PricingComponent from "@/components/pricing.component"; +import QuotesComponent from "@/components/quotes.component"; +import BlogPostsComponent from "@/components/blog.posts.component"; +import FooterComponent from "@/components/footer.component"; +import SubscribeComponent from "@/components/subscribe.component"; + +export default function About() { + return ( + <> + + + + + + + + + + + + + ); +} diff --git a/yoga-app/src/app/services/page.tsx b/yoga-app/src/app/services/page.tsx new file mode 100644 index 0000000..3583560 --- /dev/null +++ b/yoga-app/src/app/services/page.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import AosComponent from "@/components/aos.component"; +import OurServicesComponent from "@/components/our.services.component"; +import AboutUsComponent from "@/components/about.us.component"; +import OurSpecialitiesComponent from "@/components/our.specialities.component"; +import ContactUsComponent from "@/components/contact.us.component"; +import PricingComponent from "@/components/pricing.component"; +import QuotesComponent from "@/components/quotes.component"; +import BlogPostsComponent from "@/components/blog.posts.component"; +import FooterComponent from "@/components/footer.component"; +import SubscribeComponent from "@/components/subscribe.component"; + +export default function About() { + return ( + <> + + + + + + + + + + + + + ); +} diff --git a/yoga-app/src/components/bootstrap.component.tsx b/yoga-app/src/components/bootstrap.component.tsx new file mode 100644 index 0000000..f930ba3 --- /dev/null +++ b/yoga-app/src/components/bootstrap.component.tsx @@ -0,0 +1,11 @@ +"use client"; + +import { useEffect } from "react"; +export default function BootstrapComponent() +{ + useEffect(()=>{ + // @ts-ignore + import( "bootstrap/dist/js/bootstrap.bundle") + },[]) + return <> +} diff --git a/yoga-app/src/components/nav.component.tsx b/yoga-app/src/components/nav.component.tsx index 286c90e..43eb4cd 100644 --- a/yoga-app/src/components/nav.component.tsx +++ b/yoga-app/src/components/nav.component.tsx @@ -1,6 +1,8 @@ +"use client" import {FC} from "react"; import YogaImageComponent from "@/components/yoga.image.component"; import clsx from "clsx"; +import exp from "node:constants"; export interface MenuItem{ href?: string; @@ -14,6 +16,8 @@ export interface Props{ const Nav: FC = ({menuItems}:Props) => { + + return (
@@ -43,9 +47,10 @@ const Nav: FC = ({menuItems}:Props) => { } interface MenuItemProps{ - menuItem: MenuItem + menuItem: MenuItem, + dropdownItem?: boolean, } -const MenuItemComponent: FC = ({menuItem}: MenuItemProps) => { +const MenuItemComponent: FC = ({menuItem, dropdownItem}: MenuItemProps) => { if ( !menuItem ){ return (<>); } @@ -53,7 +58,7 @@ const MenuItemComponent: FC = ({menuItem}: MenuItemProps) => { return ( //
  • - {menuItem.label} + {menuItem.label}
    • ); } @@ -62,14 +67,17 @@ const MenuItemComponent: FC = ({menuItem}: MenuItemProps) => {
  • + aria-expanded="false">{menuItem.label}
      { - menuItem.children.map(item => ) + menuItem.children.map(item => ) }
    • ); } + + +export default Nav; diff --git a/yoga-app/src/components/subHeader.component.tsx b/yoga-app/src/components/subHeader.component.tsx index 24227c1..e36e45d 100644 --- a/yoga-app/src/components/subHeader.component.tsx +++ b/yoga-app/src/components/subHeader.component.tsx @@ -1,90 +1,11 @@ import YogaImageComponent from "@/components/yoga.image.component"; +import Nav from "@/components/nav.component"; +import {MAIN_MENU} from "@/util/const"; const SubHeaderComponent = () =>{ return (
    -
    -
    -
    - -
    -
    -
    +