diff --git a/app/Filament/Components/Forms/ItemForm/Blocks/HeadingBlock.php b/app/Filament/Components/Forms/ItemForm/Blocks/HeadingBlock.php index e3ace7a..6787896 100644 --- a/app/Filament/Components/Forms/ItemForm/Blocks/HeadingBlock.php +++ b/app/Filament/Components/Forms/ItemForm/Blocks/HeadingBlock.php @@ -14,7 +14,7 @@ class HeadingBlock implements BlockSchema TextInput::make('id') ->hidden() ->integer() - ->default(rand(2335235, 324634264263426)), + ->default('anchor-link-' . base64_encode(rand(2335235, 324634264263426))), TextInput::make('content') ->label('Текст заголовка') ->placeholder('Введите текст заголовка') diff --git a/resources/js/Navbars/MainPageNavbar.vue b/resources/js/Navbars/MainPageNavbar.vue index ba30054..873a82f 100644 --- a/resources/js/Navbars/MainPageNavbar.vue +++ b/resources/js/Navbars/MainPageNavbar.vue @@ -130,7 +130,6 @@ export default { computed: { ...mapGetters(['lastSlider', 'isBviActive']), currentLogo() { - console.log(this.isBviActive) if (this.isBviActive) { return this.logos.default } diff --git a/resources/js/Pages/Client/AcademicJournals/Index.vue b/resources/js/Pages/Client/AcademicJournals/Index.vue index 9285aed..f195a60 100644 --- a/resources/js/Pages/Client/AcademicJournals/Index.vue +++ b/resources/js/Pages/Client/AcademicJournals/Index.vue @@ -5,10 +5,30 @@ import MetaTags from "@/componentss/shared/SEO/MetaTags.vue"; import BasicFooter from "@/footers/BasicFooter.vue"; import AcademicJournalsListBreadcrumbs from "@/componentss/features/academicJournals/components/AcademicJournalsListBreadcrumbs.vue.vue"; +import LevelEduFilter from "@/componentss/features/additionalEducationPrograms/components/LevelEduFilter.vue"; +import CategoryFilter from "@/componentss/shared/filter/filters/CategoryFilter.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import BasicListBadge from "@/componentss/shared/badge/BasicListBadge.vue"; +import AdditionalProgramListBreadcrumbs + from "@/componentss/features/additionalEducationPrograms/components/AdditionalProgramListBreadcrumbs.vue"; +import BasicListFilter from "@/componentss/shared/filter/BasicListFilter.vue"; +import AdditionalProgramTitle + from "@/componentss/features/additionalEducationPrograms/components/AdditionalProgramTitle.vue"; +import FormEducationalFilter from "@/componentss/shared/filter/filters/FormEducationalFilter.vue"; export default { name: "Index", components: { + FormEducationalFilter, + AdditionalProgramTitle, + BasicListFilter, + AdditionalProgramListBreadcrumbs, + BasicListBadge, + BasicPageWrapper, + BasicPageContainer, + CategoryFilter, + LevelEduFilter, AcademicJournalsListBreadcrumbs, BasicFooter, MetaTags, @@ -43,56 +63,39 @@ export default { -
-
-
-
-
- - - -
-
- -
- -
-

Научные периодические издания НТГСПИ

-
- -
- + + +
+
+

Научные периодические издания НТГСПИ

+
+ + +
+ -
- -
- -
-
- -
-
-
-
- - -
+ + + + + + diff --git a/resources/js/Pages/Client/AcademicJournals/Show.vue b/resources/js/Pages/Client/AcademicJournals/Show.vue index 0d491c9..f6e15ed 100644 --- a/resources/js/Pages/Client/AcademicJournals/Show.vue +++ b/resources/js/Pages/Client/AcademicJournals/Show.vue @@ -8,10 +8,30 @@ import AcademicJournalsTitle from "@/componentss/features/academicJournals/compo import BasicPagination from "@/componentss/shared/paginate/BasicPagination.vue"; import AcademicJournalsItemBreadcrumbs from "@/componentss/features/academicJournals/components/AcademicJournalsItemBreadcrumbs.vue"; +import BudgetFilter from "@/componentss/shared/filter/filters/BudgetFilter.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import BasicListFilter from "@/componentss/shared/filter/BasicListFilter.vue"; +import DirectionFilter from "@/componentss/shared/filter/filters/DirectionFilter.vue"; +import ProgramLevelEduFilter from "@/componentss/features/educationalPrograms/components/ProgramLevelEduFilter.vue"; +import ProgramTitle from "@/componentss/features/educationalPrograms/components/ProgramTitle.vue"; +import ProgramListBreadcrumbs from "@/componentss/features/educationalPrograms/components/ProgramListBreadcrumbs.vue"; +import FormEducationalFilter from "@/componentss/shared/filter/filters/FormEducationalFilter.vue"; +import BackButton from "@/componentss/ui/buttons/BackButton.vue"; export default { name: "Show", components: { + BackButton, + FormEducationalFilter, + ProgramListBreadcrumbs, + ProgramTitle, + ProgramLevelEduFilter, + DirectionFilter, + BasicListFilter, + BasicPageWrapper, + BasicPageContainer, + BudgetFilter, AcademicJournalsItemBreadcrumbs, BasicPagination, MetaTags, @@ -62,145 +82,136 @@ export default { -
-
-
-
-
- - - -
- - -
- -
-
-
- -
- + + +
+
- - -
-
-
-
- - -
+ + + diff --git a/resources/js/Pages/Client/Additional-educations/Show.vue b/resources/js/Pages/Client/Additional-educations/Show.vue index b104836..e9d7736 100644 --- a/resources/js/Pages/Client/Additional-educations/Show.vue +++ b/resources/js/Pages/Client/Additional-educations/Show.vue @@ -10,11 +10,15 @@ import BasicFooter from "@/footers/BasicFooter.vue"; import ProgramTitle from "@/componentss/features/educationalPrograms/components/ProgramTitle.vue"; import AdditionalProgramItemBreadcrumbs from "@/componentss/features/additionalEducationPrograms/components/AdditionalProgramItemBreadcrumbs.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import ProgramItemBreadcrumbs from "@/componentss/features/educationalPrograms/components/ProgramItemBreadcrumbs.vue"; export default { name: "Show", components: { + ProgramItemBreadcrumbs, BasicPageWrapper, BasicPageContainer, AdditionalProgramItemBreadcrumbs, BasicFooter, Builder, @@ -59,136 +63,116 @@ export default { diff --git a/resources/js/Pages/Client/Departments/Show.vue b/resources/js/Pages/Client/Departments/Show.vue index efd6316..c653019 100644 --- a/resources/js/Pages/Client/Departments/Show.vue +++ b/resources/js/Pages/Client/Departments/Show.vue @@ -4,139 +4,138 @@ -
-
+ +
-
+ - - + -
-
+
+
-
-
-
-
- -
-
-
-
+
+
+
+
+ +
+
+
+
- + -
-

Сотрудники кафедры

+
+

Сотрудники кафедры

- -

Преподаватели кафедры

- -

Внешние совместители

+ +

Преподаватели кафедры

+ +

Внешние совместители

-

Программы

+

Программы

-
-
- - -
+
+
+ + +
-
+
-

Описание

+

Описание

-
- -
-
+
+ +
+
-
-
+
+
-
+
+ + - - -
@@ -154,6 +153,17 @@ import DepartmentWorkerCard from "@/componentss/features/departments/components/ import DepartmentTeacherCard from "@/componentss/features/departments/components/DepartmentTeacherCard.vue"; import BasicFooter from "@/footers/BasicFooter.vue"; import {helpers} from "@/mixins/Helpers.js"; +import CategoryFilter from "@/componentss/shared/filter/filters/CategoryFilter.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import BasicListBadge from "@/componentss/shared/badge/BasicListBadge.vue"; +import EventArchiveListBreadcrumbs from "@/componentss/features/events/components/EventArchiveListBreadcrumbs.vue"; +import BasicPagination from "@/componentss/shared/paginate/BasicPagination.vue"; +import IsOnlineFilter from "@/componentss/shared/filter/filters/IsOnlineFilter.vue"; +import BasicListFilter from "@/componentss/shared/filter/BasicListFilter.vue"; +import EventListSearch from "@/componentss/features/events/components/EventListSearch.vue"; +import SortingByFilter from "@/componentss/shared/filter/filters/SortingByFilter.vue"; +import NavigateVisor from "@/componentss/shared/visor/NavigateVisor.vue"; export default { @@ -182,6 +192,17 @@ export default { }, components: { + NavigateVisor, + SortingByFilter, + EventListSearch, + BasicListFilter, + IsOnlineFilter, + BasicPagination, + EventArchiveListBreadcrumbs, + BasicListBadge, + BasicPageWrapper, + BasicPageContainer, + CategoryFilter, BasicFooter, DepartmentTeacherCard, DepartmentWorkerCard, diff --git a/resources/js/Pages/Client/Events/Archive.vue b/resources/js/Pages/Client/Events/Archive.vue index 47e9de2..d2a02f0 100644 --- a/resources/js/Pages/Client/Events/Archive.vue +++ b/resources/js/Pages/Client/Events/Archive.vue @@ -14,11 +14,18 @@ import EventArchiveListBreadcrumbs from "@/componentss/features/events/component import EventListSearch from "@/componentss/features/events/components/EventListSearch.vue"; import SortingByFilter from "@/componentss/shared/filter/filters/SortingByFilter.vue"; import BasicPagination from "@/componentss/shared/paginate/BasicPagination.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import BackButton from "@/componentss/ui/buttons/BackButton.vue"; +import Builder from "@/componentss/shared/builder/pageBuilder/Builder.vue"; +import BasicTitle from "@/componentss/ui/titles/BasicTitle.vue"; +import EventItemBreadcrumbs from "@/componentss/features/events/components/EventItemBreadcrumbs.vue"; export default { name: "Archive", components: { + EventItemBreadcrumbs, BasicTitle, Builder, BackButton, BasicPageWrapper, BasicPageContainer, BasicPagination, SortingByFilter, EventListSearch, @@ -75,61 +82,61 @@ export default { -
-
-
-
+ + + +
+ +
+
+

+ Архив мероприятий НТГСПИ +

+ + + + + +
+
+ +
- -
-
-

- Архив мероприятий НТГСПИ -

- - - - - -
-
- -
-
-

Найдено мероприятий: {{ events.meta.total }}

-
- -
-
+

Найдено мероприятий: {{ events.meta.total }}

+
+
-
- -
-
+
+ +
+
-
+ + -
+ + + diff --git a/resources/js/Pages/Client/Faculties/Show.vue b/resources/js/Pages/Client/Faculties/Show.vue index 8519c6a..8ed11fe 100644 --- a/resources/js/Pages/Client/Faculties/Show.vue +++ b/resources/js/Pages/Client/Faculties/Show.vue @@ -1,137 +1,135 @@ diff --git a/resources/js/Pages/Client/Posts/Show.vue b/resources/js/Pages/Client/Posts/Show.vue index a36a224..0c61d28 100644 --- a/resources/js/Pages/Client/Posts/Show.vue +++ b/resources/js/Pages/Client/Posts/Show.vue @@ -11,11 +11,31 @@ import Builder from "@/componentss/shared/builder/pageBuilder/Builder.vue"; import BasicFooter from "@/footers/BasicFooter.vue"; import MainPageNavBar from "@/Navbars/MainPageNavbar.vue"; import MetaTags from "@/componentss/shared/SEO/MetaTags.vue"; +import CategoryFilter from "@/componentss/shared/filter/filters/CategoryFilter.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import BasicListBadge from "@/componentss/shared/badge/BasicListBadge.vue"; +import EventArchiveListBreadcrumbs from "@/componentss/features/events/components/EventArchiveListBreadcrumbs.vue"; +import BasicPagination from "@/componentss/shared/paginate/BasicPagination.vue"; +import IsOnlineFilter from "@/componentss/shared/filter/filters/IsOnlineFilter.vue"; +import BasicListFilter from "@/componentss/shared/filter/BasicListFilter.vue"; +import EventListSearch from "@/componentss/features/events/components/EventListSearch.vue"; +import SortingByFilter from "@/componentss/shared/filter/filters/SortingByFilter.vue"; export default { name: "Show", components: { + SortingByFilter, + EventListSearch, + BasicListFilter, + IsOnlineFilter, + BasicPagination, + EventArchiveListBreadcrumbs, + BasicListBadge, + BasicPageWrapper, + BasicPageContainer, + CategoryFilter, MetaTags, MainPageNavBar, BasicFooter, @@ -64,50 +84,41 @@ export default { - -
-
-
-
-
-
-
- - - -
+ + + +
+
+ + + +
-
-
-
- - - -
-
-
- +
+
+
+ + + +
+
+
+ -
- -
- -
- -
-
- - -
-
- -
+
+ +
+ + + + + \ No newline at end of file diff --git a/resources/js/componentss/ui/templates/BasicPageContainer.vue b/resources/js/componentss/ui/templates/BasicPageContainer.vue new file mode 100644 index 0000000..96afaf2 --- /dev/null +++ b/resources/js/componentss/ui/templates/BasicPageContainer.vue @@ -0,0 +1,27 @@ + + + diff --git a/resources/js/componentss/ui/wrappers/BasicPageWrapper.vue b/resources/js/componentss/ui/wrappers/BasicPageWrapper.vue new file mode 100644 index 0000000..fe89371 --- /dev/null +++ b/resources/js/componentss/ui/wrappers/BasicPageWrapper.vue @@ -0,0 +1,19 @@ + + +