fixes

Menzorg · Feb 13, 2024 · f24ef3a · f24ef3a
1 parent e6e2666
commit f24ef3a
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 15 deletions.
diff --git a/src/app/contacts/page.tsx b/src/app/contacts/page.tsx
@@ -11,8 +11,8 @@ import data from "./page-data.json";
 export default function Home() {
   return (
   <Flex direction="column">
-    <Header breadcrumbs={[{text: 'Контакты'}]}/>
-    <PageGrid { ...data } />
+    <Header pageName="Контакты"/>
+    <PageGrid { ...data } breadcrumbs={[{text: 'Контакты'}]} />
     <Address/>
     <Footer/>
   </Flex>

diff --git a/src/app/education/page.tsx b/src/app/education/page.tsx
@@ -7,14 +7,29 @@ import EducationCard from '../../components/education-card';
 import Header from '../../components/header';
 import courses from './courses.json';
 
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+} from '@chakra-ui/react'
+
+const breadcrumbs = [{text: 'Коммерческое образование'}];
+
 export default function Home() {
   const [isMax959] = useMediaQuery('(max-width: 959px)')
   return (
   <Flex direction="column">
-    <Header breadcrumbs={[{text: 'Коммерческое образование'}]}/>
-    <VStack align="center" p={isMax959 ? "1rem 1rem" : "3rem 6rem"} spacing="2rem">
+    <Header pageName="Коммерческое образование"/>
+    <VStack align="center" p={isMax959 ? "5rem 1rem" : "7rem 6rem"} spacing="2rem">
       { courses.map((course, i)=> <EducationCard key={i} {...course} /> ) }
     </VStack>
+
+    <Breadcrumb separator='⬤' textAlign="center" fontSize='15px' p={isMax959 ? '0rem 2rem' : "0rem 6rem"}>
+      <BreadcrumbItem>
+        <BreadcrumbLink href='/'>ВШСДТ</BreadcrumbLink>
+      </BreadcrumbItem>
+      {breadcrumbs.map((crumb:any, i:number) => <BreadcrumbItem key={i} isCurrentPage={breadcrumbs.length === i+1}><BreadcrumbLink href={crumb.href}>{crumb.text}</BreadcrumbLink></BreadcrumbItem>)}
+    </Breadcrumb>
     <Footer/>
   </Flex>
   )

diff --git a/src/app/education/style-consultant/page.tsx b/src/app/education/style-consultant/page.tsx
@@ -10,7 +10,7 @@ import data from "./page-data.json";
 export default function Home() {
   return (
   <Flex direction="column">
-    <Header />
+    <Header pageName="Курс: Консультант по стилю" />
     <PageGrid { ...data } breadcrumbs={[{text: 'Коммерческое образование', href: "/education"}, {text: 'Консультант по стилю'}]} />
     <Footer/>
   </Flex>

diff --git a/src/app/enrollment/page.tsx b/src/app/enrollment/page.tsx
@@ -10,8 +10,8 @@ import data from "./page-data.json";
 export default function Home() {
   return (
   <Flex direction="column">
-    <Header breadcrumbs={[{text: 'Поступление'}]}/>
-    <PageGrid { ...data } />
+    <Header pageName="Поступление"/>
+    <PageGrid { ...data } breadcrumbs={[{text: 'Поступление'}]}  />
     <Footer/>
   </Flex>
   )

diff --git a/src/app/intro/page.tsx b/src/app/intro/page.tsx
@@ -1,21 +1,29 @@
 'use client';
 
-import { Flex, Text, Box, Link } from '@chakra-ui/react'
+import { Flex, Text, Box, Link, useMediaQuery } from '@chakra-ui/react'
 import NextLink from 'next/link'
 import Image from 'next/image';
 import Footer from '../../components/footer';
 import Header from '../../components/header';
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+} from '@chakra-ui/react'
+
+const breadcrumbs = [{text: 'Личные кабинеты'}];
 
 export default function Home() {
+  const [isMax959] = useMediaQuery('(max-width: 959px)')
   return (
   <Flex direction="column">
-    <Header breadcrumbs={[{text: 'Личные кабинеты'}]}/>
-    <Flex direction="column" align="center" p="2rem">
+    <Header pageName="Личные кабинеты"/>
+    <Flex direction="column" align="center" p="5rem 2rem">
       <Image src={"Group_72.jpg"} width='200' height="200" alt="logo" />
     </Flex>
     <Flex direction="column" align="center" p="1rem">
-      <Text textStyle="h1" color="black">ВЫСШАЯ ШКОЛА <Text textStyle="Light30" as="span" >СТИЛИСТИКИ</Text></Text>
-      <Text textStyle="h1" color="black"><Text as="span" color="primary">ДИЗАЙНА</Text> И <Text as="span" color="secondary">ТЕХНОЛОГИЙ</Text></Text>
+      <Text textStyle="h1" color="black">ВЫСШАЯ ШКОЛА СТИЛИСТИКИ</Text>
+      <Text textStyle="h1" color="black">ДИЗАЙНА И ТЕХНОЛОГИЙ</Text>
     </Flex>
     <Flex direction="row" mb="1.5rem" justify="center" p="1rem">
       <Flex direction="column">
@@ -33,6 +41,12 @@ export default function Home() {
         </Box>
       </Flex>
     </Flex>
+    <Breadcrumb separator='⬤' textAlign="center" fontSize='15px' p={isMax959 ? '0rem 2rem' : "0rem 6rem"}>
+      <BreadcrumbItem>
+        <BreadcrumbLink href='/'>ВШСДТ</BreadcrumbLink>
+      </BreadcrumbItem>
+      {breadcrumbs.map((crumb:any, i:number) => <BreadcrumbItem key={i} isCurrentPage={breadcrumbs.length === i+1}><BreadcrumbLink href={crumb.href}>{crumb.text}</BreadcrumbLink></BreadcrumbItem>)}
+    </Breadcrumb>
     <Footer/>
   </Flex>
   )

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -13,7 +13,7 @@ export default function Home() {
   return (
   <Flex direction="column">
     <Header/>
-    <Flex direction="column" align="center" p="2rem">
+    <Flex direction="column" align="center" p="5rem 2rem">
       <Image onMouseOut={e=>{setLogo(0)}} onMouseOver={e=>{setLogo(1)}} src={logoObj[logo]} width='200' height="200" alt="logo" />
     </Flex>
     <Flex direction="column" align="center" p="1rem">

diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import { HamburgerIcon, LockIcon } from '@chakra-ui/icons'
+import { HamburgerIcon } from '@chakra-ui/icons'
 import {
   useMediaQuery,
   Flex,
@@ -14,7 +14,8 @@ import {
   IconButton,
   Box,
   useDisclosure,
-  Link
+  Link,
+  Text
 } from '@chakra-ui/react'
 import NextLink from 'next/link'
 import { PiUserFill } from "react-icons/pi";
@@ -27,6 +28,7 @@ export default function Header(props: any) {
       <Flex direction="row" align="center" height="35" bg="#F9F9F9" color="black" p={isMax959 ? 0 : "2rem 6rem"} sx={{position: 'fixed', width: '100%'}}>
         <IconButton aria-label='menu' icon={<HamburgerIcon />} onClick={onOpen}></IconButton>
         <Box color="secondary" m="0 auto">
+          <Text> ВШСДТ{props.pageName ? ` ⬤ ${props.pageName}` : ''}</Text>
         </Box>
         <Link as={NextLink} title="Авторизация" href="/intro"><IconProvider size='1.5rem' icon={<PiUserFill/>} /></Link>
         <Drawer placement="left" onClose={onClose} isOpen={isOpen} size="md">