fix(deploy): explicit SSR restart after build + defensive props
This commit is contained in:
F4ilji
Vendored
+7
-1
@@ -123,7 +123,13 @@ pipeline {
|
||||
stage('Restart Services') {
|
||||
steps {
|
||||
dir("${APP_DIR}") {
|
||||
sh 'docker restart ntspi-nginx ntspi-php ntspi-php-queue'
|
||||
sh '''
|
||||
docker exec ntspi-php php artisan inertia:stop-ssr || true
|
||||
docker restart ntspi-nginx ntspi-php ntspi-php-queue
|
||||
sleep 5
|
||||
docker exec ntspi-php php artisan inertia:stop-ssr || true
|
||||
docker exec ntspi-php php artisan inertia:start-ssr || true
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,222 +1,72 @@
|
||||
<script>
|
||||
import MainNavbar from "@/Navbars/MainNavbar.vue";
|
||||
import { debounce } from "lodash";
|
||||
import {Link, WhenVisible} from "@inertiajs/vue3";
|
||||
import MainPageNavBar from "@/Navbars/MainPageNavbar.vue";
|
||||
import MainPageNavBar from "@/Navbars/MainPageNavBar.vue";
|
||||
import ScheduleListTitle from "@/componentss/features/schedules/components/ScheduleListTitle.vue";
|
||||
import ScheduleListFilter from "@/componentss/features/schedules/components/ScheduleListFilter.vue";
|
||||
import BasicIcon from "@/componentss/ui/icons/BasicIcon.vue";
|
||||
import BasicFooter from "@/footers/BasicFooter.vue";
|
||||
import BasicListFilter from "@/componentss/shared/filter/BasicListFilter.vue";
|
||||
import FormEducationalFilter from "@/componentss/shared/filter/filters/FormEducationalFilter.vue";
|
||||
import MetaTags from "@/componentss/shared/SEO/MetaTags.vue";
|
||||
import BreadcrumbsItem from "@/componentss/shared/Breadcrumbs/BreadcrumbsItem.vue";
|
||||
import BaseBreadcrumbs from "@/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue";
|
||||
import FavoriteFilter from "@/componentss/features/schedules/components/FavoriteFilter.vue";
|
||||
import FacultyFilter from "@/componentss/features/schedules/components/FacultyFilter.vue";
|
||||
import SearchFilter from "@/componentss/features/schedules/components/SearchFilter.vue";
|
||||
|
||||
import BasicFooter from "@/footers/BasicFooter.vue";
|
||||
import {Link} from "@inertiajs/vue3";
|
||||
|
||||
export default {
|
||||
name: "Index",
|
||||
data() {
|
||||
return {
|
||||
favoriteGroups: typeof window !== 'undefined' ? JSON.parse(localStorage.getItem('favoriteGroups') || '[]') : [],
|
||||
showFavorites: false,
|
||||
loading: false,
|
||||
currentPageLoaded: this.schedules_paginator?.current_page ?? 1,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
SearchFilter,
|
||||
FacultyFilter,
|
||||
FavoriteFilter,
|
||||
BaseBreadcrumbs, BreadcrumbsItem,
|
||||
WhenVisible,
|
||||
MetaTags,
|
||||
FormEducationalFilter,
|
||||
BasicListFilter,
|
||||
BasicFooter,
|
||||
ScheduleListFilter,
|
||||
ScheduleListTitle, BasicIcon, MainPageNavBar, MainNavbar, Link},
|
||||
|
||||
props: {
|
||||
navigation: {
|
||||
type: Object
|
||||
},
|
||||
filters: {
|
||||
type: Object
|
||||
},
|
||||
forms_education: {
|
||||
type: Object
|
||||
},
|
||||
schedulesByFaculty: {
|
||||
type: Object
|
||||
},
|
||||
schedules_paginator: {
|
||||
type: Object
|
||||
},
|
||||
seo: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
},
|
||||
breadcrumbs: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
},
|
||||
faculties: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
},
|
||||
MetaTags,
|
||||
BasicFooter,
|
||||
ScheduleListTitle,
|
||||
MainPageNavBar,
|
||||
Link,
|
||||
},
|
||||
methods: {
|
||||
toggleFavorite(group) {
|
||||
if (!this.favoriteGroups) {
|
||||
this.favoriteGroups = [];
|
||||
}
|
||||
|
||||
const index = this.favoriteGroups.findIndex(g => g === group);
|
||||
if (index === -1) {
|
||||
this.favoriteGroups.push(group);
|
||||
} else {
|
||||
this.favoriteGroups.splice(index, 1);
|
||||
}
|
||||
|
||||
localStorage.setItem('favoriteGroups', JSON.stringify(this.favoriteGroups));
|
||||
},
|
||||
|
||||
isFavorite(group) {
|
||||
// Если favoriteGroups не существует или не является массивом, возвращаем false
|
||||
if (!Array.isArray(this.favoriteGroups)) {
|
||||
return false;
|
||||
}
|
||||
return this.favoriteGroups.some(g => g === group);
|
||||
},
|
||||
},
|
||||
};
|
||||
props: {
|
||||
faculties: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
seo: {
|
||||
type: Object,
|
||||
default: () => ({}),
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<MetaTags :seo="seo" />
|
||||
<MetaTags :seo="seo" />
|
||||
<MainPageNavBar :sections="$page.props?.navigation" />
|
||||
|
||||
<div class="flex flex-col h-screen">
|
||||
<main class="flex-grow">
|
||||
<div class="relative mx-auto mt-[67px] max-w-screen-xl px-4 py-10 md:flex md:flex-row md:py-10">
|
||||
<div class="relative mx-auto mt-[67px] max-w-screen-xl px-4 py-10 md:py-10">
|
||||
<article class="w-full min-w-0 mt-4 px-1 md:px-6">
|
||||
<div class="relative overflow-hidden">
|
||||
<div class="max-w-[40rem] mx-auto sm:px-6 lg:px-8 py-5 sm:pb-12 sm:py-5">
|
||||
<div>
|
||||
<ScheduleListTitle
|
||||
bottom-text="Просто введите название группы"
|
||||
header="Расписание занятий" />
|
||||
<div class="mt-7 sm:mt-12 mx-auto max-w-xl relative space-y-4">
|
||||
<SearchFilter :search_filter="this.filters.search_filter" />
|
||||
<ScheduleListTitle
|
||||
bottom-text="Выберите факультет, чтобы посмотреть расписание"
|
||||
header="Расписание занятий" />
|
||||
|
||||
<div class="mt-10 sm:mt-14 mx-auto max-w-3xl">
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||
<Link
|
||||
v-for="faculty in faculties"
|
||||
:key="faculty.id"
|
||||
:href="route('client.schedule.faculty', faculty.slug)"
|
||||
class="group block rounded-xl border border-gray-200 bg-white p-6 transition-all hover:shadow-md hover:border-primary hover:-translate-y-0.5"
|
||||
>
|
||||
<div class="flex items-center gap-3 mb-3">
|
||||
<div class="flex items-center justify-center size-10 rounded-lg bg-primary/10 text-primary transition-colors group-hover:bg-primary group-hover:text-white">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M4.26 10.147a60.438 60.438 0 0 0-.491 6.347A48.62 48.62 0 0 1 12 20.904a48.62 48.62 0 0 1 8.232-4.41 60.46 60.46 0 0 0-.491-6.347m-15.482 0a50.636 50.636 0 0 0-2.658-.813A59.906 59.906 0 0 1 12 3.493a59.903 59.903 0 0 1 10.399 5.84c-.896.248-1.783.52-2.658.814m-15.482 0A50.717 50.717 0 0 1 12 13.489a50.702 50.702 0 0 1 7.74-3.342M6.75 15a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm0 0v-3.675A55.378 55.378 0 0 1 12 8.443m-7.007 11.55A5.981 5.981 0 0 0 6.75 15.75v-1.5" />
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<FavoriteFilter :favorite_filter="filters.favorite_filter" :loading="loading" :favoriteGroups="favoriteGroups" />
|
||||
<FacultyFilter :faculties="faculties" :faculty_filter="filters.faculty_filter" />
|
||||
<!-- <ScheduleListFilter>-->
|
||||
<!-- <FormEducationalFilter :forms="this.forms_education" :form-edu_filter="this.filters.form_education_filter" />-->
|
||||
<!-- </ScheduleListFilter>-->
|
||||
</div>
|
||||
<h3 class="font-semibold text-gray-800 group-hover:text-primary transition-colors">
|
||||
{{ faculty.title }}
|
||||
</h3>
|
||||
<p class="text-sm text-gray-500">
|
||||
{{ faculty.groups_count }} {{ pluralize(faculty.groups_count, 'группа', 'группы', 'групп') }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<span class="flex justify-center mb-4" v-if="currentPageLoaded > 1">
|
||||
<Link :href="route('client.schedule.index')" class="flex items-center py-2">
|
||||
<button class="bg-transperant text-sm text-gray-600 cursor-pointer hover:text-gray-900 duration-300 block px-2 leading-[1.6] rounded-md">К началу</button>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[17px] text-gray-600">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15 11.25l-3-3m0 0l-3 3m3-3v7.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
</Link>
|
||||
</span>
|
||||
|
||||
|
||||
<div class="mx-auto max-w-2xl hs-accordion-group grid gap-3">
|
||||
<div class="space-y-4">
|
||||
|
||||
<template v-for="(faculty, title) in schedulesByFaculty">
|
||||
<div>
|
||||
<h2 class="text-center text-gray-800 font-medium">{{ title }}</h2>
|
||||
<hr class="mt-2 mb-4">
|
||||
<template v-for="educationalGroup in faculty" :key="educationalGroup.data.id">
|
||||
<div class="hs-accordion hs-accordion-active:border-gray-200 bg-white border border-transparent rounded-xl" :id="'hs-basic-id-' + educationalGroup.data.id">
|
||||
<div class="flex py-4 px-5 gap-x-3 hs-accordion-toggle">
|
||||
<button @click.stop="toggleFavorite(educationalGroup.data.id)">
|
||||
<transition name="heart" mode="out-in">
|
||||
<BasicIcon
|
||||
v-if="isFavorite(educationalGroup.data.id)"
|
||||
name="heart_filled"
|
||||
class="shrink-0 size-4 text-red-500"
|
||||
key="filled"
|
||||
/>
|
||||
<BasicIcon
|
||||
v-else
|
||||
name="heart"
|
||||
class="shrink-0 size-4"
|
||||
key="outline"
|
||||
/>
|
||||
</transition>
|
||||
|
||||
</button>
|
||||
<button class="hs-accordion-active:text-primary inline-flex justify-between items-center gap-x-3 w-full font-semibold text-start text-gray-800 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none" aria-expanded="false" :aria-controls="'hs-basic-' + educationalGroup.data.id">
|
||||
<span class="flex items-center gap-x-2">{{ educationalGroup.data.title }}</span>
|
||||
<svg class="hs-accordion-active:hidden block size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M5 12h14"></path>
|
||||
<path d="M12 5v14"></path>
|
||||
</svg>
|
||||
<svg class="hs-accordion-active:block hidden size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M5 12h14"></path>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div :id="'hs-basic-' + educationalGroup.data.id" class="hs-accordion-content hidden w-full overflow-hidden transition-[height] duration-300" role="region" :aria-labelledby="'hs-basic-id-' + educationalGroup.data.id">
|
||||
<div class="pb-4 px-5 grid gap-3 grid-cols-1">
|
||||
<template v-for="schedule in educationalGroup.data.schedules" :key="schedule.id">
|
||||
<template v-for="file in schedule.file">
|
||||
<a :href="'storage/' + file.path" target="_blank"
|
||||
class="py-3 px-4 inline-flex items-center gap-x-2 text-sm font-medium rounded-lg border border-gray-200 bg-white text-gray-500 shadow-sm hover:bg-gray-50 disabled:opacity-50 disabled:pointer-events-none dark:bg-slate-900 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-800 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600">
|
||||
{{ file.title }}
|
||||
</a>
|
||||
</template>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<div v-if="schedulesByFaculty.length === 0">
|
||||
<div class="h-full flex flex-col items-center justify-center gap-1">
|
||||
<p class="font-light">Извините, ничего не найдено</p>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5 text-gray-700">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 5.25h.008v.008H12v-.008Z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="!(schedules_paginator.current_page >= schedules_paginator.last_page)">
|
||||
<WhenVisible always :params="{
|
||||
data: {
|
||||
page: schedules_paginator.current_page + 1
|
||||
},
|
||||
only: ['schedulesByFaculty', 'schedules_paginator']
|
||||
}"
|
||||
/>
|
||||
<div class="text-center mt-10">
|
||||
<div>
|
||||
<svg aria-hidden="true" class="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
|
||||
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
|
||||
</svg>
|
||||
<span class="sr-only">Loading...</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="faculties.length === 0" class="text-center py-12">
|
||||
<p class="text-gray-500">Факультеты не найдены</p>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
@@ -227,36 +77,17 @@ export default {
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
||||
|
||||
.heart-enter-active,
|
||||
.heart-leave-active {
|
||||
transition: opacity 0.1s ease;
|
||||
<script>
|
||||
export default {
|
||||
methods: {
|
||||
pluralize(n, one, few, many) {
|
||||
const mod10 = n % 10;
|
||||
const mod100 = n % 100;
|
||||
if (mod100 >= 11 && mod100 <= 19) return many;
|
||||
if (mod10 === 1) return one;
|
||||
if (mod10 >= 2 && mod10 <= 4) return few;
|
||||
return many;
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
.heart-enter-from,
|
||||
.heart-leave-to {
|
||||
opacity: 0;
|
||||
}
|
||||
.fade-enter-active,
|
||||
.fade-leave-active {
|
||||
transition: all 0.5s ease;
|
||||
}
|
||||
|
||||
.fade-enter-from,
|
||||
.fade-leave-to {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.gg-enter-active,
|
||||
.gg-leave-active {
|
||||
transition: all 0.5s ease;
|
||||
}
|
||||
|
||||
.gg-enter-from,
|
||||
.gg-leave-to {
|
||||
opacity: 0;
|
||||
transform: translateY(30px);
|
||||
}
|
||||
</style>
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user