merge mary

styleschool · Mar 30, 2024 · a6f3d79 · a6f3d79
2 parents 1d1f5ca + 724eaef
commit a6f3d79
Show file tree

Hide file tree

Showing 54 changed files with 2,380 additions and 216 deletions.
diff --git a/public/documents/buhgaltersky-otchet-po-itogam-2018-goda.pdf b/public/documents/buhgaltersky-otchet-po-itogam-2018-goda.pdf
diff --git a/public/documents/buhgaltersky-otchet-po-itogam-2019-goda.pdf b/public/documents/buhgaltersky-otchet-po-itogam-2019-goda.pdf
diff --git a/public/documents/buhgaltersky-otchet-po-itogam-2020-goda.pdf b/public/documents/buhgaltersky-otchet-po-itogam-2020-goda.pdf
diff --git a/public/documents/diploms.pdf b/public/documents/diploms.pdf
diff --git a/public/documents/info-ob-objeme-finansirovaniya-obrazovateljnoy-deyateljnosti.xls b/public/documents/info-ob-objeme-finansirovaniya-obrazovateljnoy-deyateljnosti.xls
diff --git a/public/documents/licenziya.pdf b/public/documents/licenziya.pdf
diff --git a/public/documents/obrazets-dogovora-ob-okazanii-platnyh-obrazovateljnyh-uslug-fizlitsu.pdf b/public/documents/obrazets-dogovora-ob-okazanii-platnyh-obrazovateljnyh-uslug-fizlitsu.pdf
diff --git a/public/documents/obrazets-dogovora-ob-okazanii-platnyh-obrazovateljnyh-uslug-urlitsu.pdf b/public/documents/obrazets-dogovora-ob-okazanii-platnyh-obrazovateljnyh-uslug-urlitsu.pdf
diff --git a/public/documents/polozhenie-o-komissii-po-uregulirovaniyu-sporov.pdf b/public/documents/polozhenie-o-komissii-po-uregulirovaniyu-sporov.pdf
diff --git a/public/documents/polozhenie-o-poryadke-obucheniya-po-individualjnomu-uchebnomu-planu.pdf b/public/documents/polozhenie-o-poryadke-obucheniya-po-individualjnomu-uchebnomu-planu.pdf
diff --git a/public/documents/polozhenie-o-poryadke-tekuschego-kontrolya-uspevaemosti-i-attestatsii.pdf b/public/documents/polozhenie-o-poryadke-tekuschego-kontrolya-uspevaemosti-i-attestatsii.pdf
diff --git a/public/documents/polozhenie-o-privlechenii-storonnih-spetsialistov.pdf b/public/documents/polozhenie-o-privlechenii-storonnih-spetsialistov.pdf
diff --git a/public/documents/polozhenie-o-professionaljnoy-etike-pedagogicheskih-rabotnikov.pdf b/public/documents/polozhenie-o-professionaljnoy-etike-pedagogicheskih-rabotnikov.pdf
diff --git a/public/documents/polozhenie-o-vedenii-lichnyh-del-obuchauschihsya.pdf b/public/documents/polozhenie-o-vedenii-lichnyh-del-obuchauschihsya.pdf
diff --git a/public/documents/polozhenie-o-vedenii-lichnyh-del-rabotnikov.pdf b/public/documents/polozhenie-o-vedenii-lichnyh-del-rabotnikov.pdf
diff --git a/public/documents/polozhenie-o-vnutrenney-sisteme-otsenki-kachestva-programm-dpo.pdf b/public/documents/polozhenie-o-vnutrenney-sisteme-otsenki-kachestva-programm-dpo.pdf
diff --git a/public/documents/polozhenie-ob-oplate-truda-i-premirovanii-rabotnikov.pdf b/public/documents/polozhenie-ob-oplate-truda-i-premirovanii-rabotnikov.pdf
diff --git a/public/documents/polozhenie-ob-organizatsii-platnyh-obrazovateljnyh-uslug.pdf b/public/documents/polozhenie-ob-organizatsii-platnyh-obrazovateljnyh-uslug.pdf
diff --git a/public/documents/polozhenie-po-obrabotke-personaljnyh-dannyh-obuchayuschihsya.pdf b/public/documents/polozhenie-po-obrabotke-personaljnyh-dannyh-obuchayuschihsya.pdf
diff --git a/public/documents/polozhenie-po-obrabotke-personaljnyh-dannyh-rabotnikov.pdf b/public/documents/polozhenie-po-obrabotke-personaljnyh-dannyh-rabotnikov.pdf
diff --git a/...documents/poryadok-opredeleniya-i-ucheta-uchebnoy-nagruzki-pedagogicheskih-rabotnikov.pdf b/...documents/poryadok-opredeleniya-i-ucheta-uchebnoy-nagruzki-pedagogicheskih-rabotnikov.pdf
diff --git a/public/documents/pravila-priema-perevoda-otchisleniya-i-vosstanovleniya-obuchayuschihsya.pdf b/public/documents/pravila-priema-perevoda-otchisleniya-i-vosstanovleniya-obuchayuschihsya.pdf
diff --git a/public/documents/pravila-vnutrennego-rasporyadka-obuchayuschihsya.pdf b/public/documents/pravila-vnutrennego-rasporyadka-obuchayuschihsya.pdf
diff --git a/public/documents/pricecurrent_courses.pdf b/public/documents/pricecurrent_courses.pdf
diff --git a/public/documents/pricecurrent_prof.pdf b/public/documents/pricecurrent_prof.pdf
diff --git a/public/documents/programma-prof-podgotovki-design-i-dekorirovanie-interjera.pdf b/public/documents/programma-prof-podgotovki-design-i-dekorirovanie-interjera.pdf
diff --git a/public/documents/programma-prof-podgotovki-image-consulting&fashion-styling.pdf b/public/documents/programma-prof-podgotovki-image-consulting&fashion-styling.pdf
diff --git a/public/documents/publichnaya-oferta.docx b/public/documents/publichnaya-oferta.docx
diff --git a/public/documents/spravka-o-materialjno-tehnicheskom-obespechenii.pdf b/public/documents/spravka-o-materialjno-tehnicheskom-obespechenii.pdf
diff --git a/public/documents/svideteljstvo-o-gosudarstvennoy-registratsii-ano-vshs.pdf b/public/documents/svideteljstvo-o-gosudarstvennoy-registratsii-ano-vshs.pdf
diff --git a/public/documents/ustav-obrazovateljnoy-organizatsii-ANO-VShS.pdf b/public/documents/ustav-obrazovateljnoy-organizatsii-ANO-VShS.pdf
diff --git a/public/documents/zakluchenie-o-pozharnoy-bezopasnosti.pdf b/public/documents/zakluchenie-o-pozharnoy-bezopasnosti.pdf
diff --git a/public/reshenie-1-o-sozdanii-obrazovateljnoy-organizatsii.pdf b/public/reshenie-1-o-sozdanii-obrazovateljnoy-organizatsii.pdf
diff --git a/public/vypiska-iz-egrul.pdf b/public/vypiska-iz-egrul.pdf
diff --git a/src/app/education/courses.json b/src/app/education/courses.json
@@ -3,27 +3,27 @@
       "tags":[
         {
           "text":"нейросети",
-          "href":"#"
+          "href":"?filter=нейросети"
         },
         {
           "text":"дизайн",
-          "href":"#"
+          "href":"?filter=дизайн"
         },
         {
           "text":"стиль",
-          "href":"#"
+          "href":"?filter=стиль"
         },
         {
           "text":"мода",
-          "href":"#"
+          "href":"?filter=мода"
         },
         {
           "text":"дизайнер",
-          "href":"#"
+          "href":"?filter=дизайнер"
         },
         {
           "text":"стилист",
-          "href":"#"
+          "href":"?filter=стилист"
         }
       ],
       "title":"Нейросети для дизайнеров и стилистов (3 месяца)",
@@ -36,23 +36,23 @@
       "tags":[
         {
           "text":"имидж",
-          "href":"#"
+          "href":"?filter=имидж"
         },
         {
           "text":"стиль",
-          "href":"#"
+          "href":"?filter=стиль"
         },
         {
           "text":"модные",
-          "href":"#"
+          "href":"?filter=модные"
         },
         {
           "text":"одежда",
-          "href":"#"
+          "href":"?filter=одежда"
         },
         {
           "text":"бесплатно",
-          "href":"#"
+          "href":"?filter=бесплатно"
         }
       ],
       "title":"Консультант по стилю (2 месяца)",
@@ -65,23 +65,23 @@
       "tags":[
         {
           "text":"дизайн",
-          "href":"#"
+          "href":"?filter=дизайн"
         },
         {
           "text":"интерьер",
-          "href":"#"
+          "href":"?filter=интерьер"
         },
         {
           "text":"среда",
-          "href":"#"
+          "href":"?filter=среда"
         },
         {
           "text":"дом",
-          "href":"#"
+          "href":"?filter=дом"
         },
         {
           "text":"бесплатно",
-          "href":"#"
+          "href":"?filter=бесплатно"
         }
       ],
       "title":"Дизайн интерьера (2 месяца)",
@@ -94,19 +94,19 @@
       "tags":[
         {
           "text":"стилист",
-          "href":"#"
+          "href":"?filter=стилист"
         },
         {
           "text":"мода",
-          "href":"#"
+          "href":"?filter=мода"
         },
         {
           "text":"нейросети",
-          "href":"#"
+          "href":"?filter=нейросети"
         },
         {
           "text":"профессия",
-          "href":"#"
+          "href":"?filter=профессия"
         }
       ],
       "title":"Стилист в индустрии моды. Fashion стилист (4 месяца)",
@@ -119,23 +119,23 @@
       "tags":[
         {
           "text":"дизайнер",
-          "href":"#"
+          "href":"?filter=дизайнер"
         },
         {
           "text":"интерьер",
-          "href":"#"
+          "href":"?filter=интерьер"
         },
         {
           "text":"среда",
-          "href":"#"
+          "href":"?filter=среда"
         },
         {
           "text":"нейросети",
-          "href":"#"
+          "href":"?filter=нейросети"
         },
         {
           "text":"профессия",
-          "href":"#"
+          "href":"?filter=профессия"
         }
       ],
       "title":"Интерьерный стилист (4 месяца)",
@@ -148,23 +148,23 @@
       "tags":[
         {
           "text":"нейросети",
-          "href":"#"
+          "href":"?filter=нейросети"
         },
         {
           "text":"интеллект",
-          "href":"#"
+          "href":"?filter=интеллект"
         },
         {
           "text":"продукт",
-          "href":"#"
+          "href":"?filter=продукт"
         },
         {
           "text":"управление",
-          "href":"#"
+          "href":"?filter=управление"
         },
         {
           "text":"профессия",
-          "href":"#"
+          "href":"?filter=профессия"
         }
       ],
       "title":"AI продукт менеджер: создание продуктов с использованием нейросетей (2 месяца)",

diff --git a/src/app/education/page.tsx b/src/app/education/page.tsx
@@ -1,35 +1,71 @@
-'use client';
+"use client";
 
-import { Flex, VStack, useMediaQuery } from '@chakra-ui/react';
+import {
+  Flex,
+  VStack,
+  useMediaQuery,
+  HStack,
+  Tag,
+  TagLabel,
+  TagCloseButton,
+  Link,
+} from "@chakra-ui/react";
 
-import Footer from '../../components/footer';
-import EducationCard from '../../components/education-card';
-import Header from '../../components/header';
-import courses from './courses.json';
+import Footer from "../../components/footer";
+import EducationCard from "../../components/education-card";
+import Header from "../../components/header";
+import courses from "./courses.json";
+import NextLink from "next/link";
+import { useSearchParams } from "next/navigation";
 
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-} from '@chakra-ui/react'
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from "@chakra-ui/react";
 
-const breadcrumbs = [{text: 'Каталог курсов'}];
+const breadcrumbs = [{ text: "Каталог курсов" }];
 
 export default function Home() {
-  const [isMax959] = useMediaQuery('(max-width: 959px)')
+  const [isMax959] = useMediaQuery("(max-width: 959px)");
+  const filter = useSearchParams().get("filter");
+
   return (
-  <Flex direction="column">
-    <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>
-  )
+    <Flex direction="column">
+      <Header pageName="Каталог курсов" />
+      <HStack p={isMax959 ? "5rem 1rem 1rem 1rem" : "7rem 6rem 1rem 6rem"} spacing={4}>
+        { filter ?
+        <Tag borderRadius="full" variant="solid" bg="secondary" p="0rem 1rem">
+          <Link as={NextLink} title="удалить фильтр" href="/education">
+            <TagLabel textStyle="Regular16" color="white">{filter}</TagLabel>
+          </Link> 
+          <Link as={NextLink} title="удалить фильтр" href="/education">
+          <TagCloseButton />
+          </Link> 
+        </Tag> : null
+        }
+
+      </HStack>
+      <VStack align="center" spacing="2rem">
+        {courses.map((course, i) =>
+          !filter ||
+          (filter && course.tags.find((tag) => tag.text == filter)) ? (
+            <EducationCard key={i} {...course} />
+          ) : null
+        )}
+      </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/intro/page.tsx b/src/app/intro/page.tsx
@@ -38,7 +38,7 @@ export default function Home() {
           <Link as={NextLink} title="Образование" href="https://edu.styleschool.ru/login/index.php">
             <Text textStyle="Regular20">ПК и ПП ВШСДТ</Text>
           </Link>
-          <Link as={NextLink} title="" href="#">
+          <Link as={NextLink} title="ПК и ПП в рамках Содействия занятости" href="#">
             <Text textStyle="Regular20">ПК и ПП в рамках Содействия занятости</Text>
           </Link>
         </Box>