revert: remove deploy UI, controller, actions, tasks, and routes
- Remove Deploy/Index.vue, DeployController, DeploySiteAction, DeployTask - Remove deploy routes from web.php - Remove deploy menu item from menuConfig - Remove deploy button and methods from Main.vue - Remove deploy logging channel from logging.php - Keep _deploy/ folder for future CI/CD setup
This commit is contained in:
F4ilji
@@ -121,13 +121,6 @@ export const menuItems = [
|
||||
{ label: 'Все пользователи', route: 'dashboard.users.index' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'deploy',
|
||||
label: 'Деплой',
|
||||
icon: 'arrow-up-tray',
|
||||
route: 'dashboard.deploy.index',
|
||||
activePrefixes: ['dashboard.deploy'],
|
||||
},
|
||||
{
|
||||
key: 'vikon-updates',
|
||||
label: 'Обновления VIKON',
|
||||
|
||||
@@ -1,266 +0,0 @@
|
||||
<script setup>
|
||||
import { ref, onMounted, onUnmounted } from 'vue'
|
||||
import { router } from '@inertiajs/vue3'
|
||||
import DashboardLayout from '../Components/DashboardLayout.vue'
|
||||
import FlashMessages from '../Components/shared/FlashMessages.vue'
|
||||
|
||||
const props = defineProps({
|
||||
history: { type: Array, default: () => [] },
|
||||
status: { type: Object, default: () => ({}) },
|
||||
})
|
||||
|
||||
const deployStatus = ref(props.status)
|
||||
const deployLog = ref('')
|
||||
const isDeploying = ref(false)
|
||||
const isPolling = ref(false)
|
||||
let pollInterval = null
|
||||
|
||||
const statusColors = {
|
||||
idle: 'text-gray-500',
|
||||
running: 'text-blue-600',
|
||||
completed: 'text-green-600',
|
||||
failed: 'text-red-600',
|
||||
unknown: 'text-yellow-600',
|
||||
disabled: 'text-gray-400',
|
||||
}
|
||||
|
||||
const statusLabels = {
|
||||
idle: 'Ожидание',
|
||||
running: 'Выполняется',
|
||||
completed: 'Завершён',
|
||||
failed: 'Ошибка',
|
||||
unknown: 'Неизвестно',
|
||||
disabled: 'Отключено',
|
||||
}
|
||||
|
||||
const statusBgColors = {
|
||||
idle: 'bg-gray-100',
|
||||
running: 'bg-blue-100',
|
||||
completed: 'bg-green-100',
|
||||
failed: 'bg-red-100',
|
||||
unknown: 'bg-yellow-100',
|
||||
disabled: 'bg-gray-100',
|
||||
}
|
||||
|
||||
async function startDeploy() {
|
||||
if (!confirm('Запустить деплой? Приложение будет обновлено.')) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(route('dashboard.deploy'), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content,
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
})
|
||||
|
||||
const data = await response.json()
|
||||
|
||||
if (data.success) {
|
||||
isDeploying.value = true
|
||||
deployStatus.value = { status: 'running', message: 'Деплой запущен...' }
|
||||
startPolling()
|
||||
} else {
|
||||
alert(data.message || 'Ошибка запуска деплоя')
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Deploy error:', error)
|
||||
alert('Ошибка соединения с сервером: ' + error)
|
||||
}
|
||||
}
|
||||
|
||||
function startPolling() {
|
||||
if (isPolling.value) return
|
||||
isPolling.value = true
|
||||
|
||||
pollInterval = setInterval(async () => {
|
||||
try {
|
||||
const statusRes = await fetch(route('dashboard.deploy.status'), {
|
||||
headers: { 'Accept': 'application/json' },
|
||||
})
|
||||
const statusData = await statusRes.json()
|
||||
deployStatus.value = statusData
|
||||
|
||||
const logRes = await fetch(route('dashboard.deploy.log') + '?lines=100', {
|
||||
headers: { 'Accept': 'application/json' },
|
||||
})
|
||||
const logData = await logRes.json()
|
||||
deployLog.value = logData.full_log || logData.log || ''
|
||||
|
||||
if (statusData.status !== 'running') {
|
||||
stopPolling()
|
||||
isDeploying.value = false
|
||||
router.reload({ only: ['history'] })
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Polling error:', error)
|
||||
}
|
||||
}, 2000)
|
||||
}
|
||||
|
||||
function stopPolling() {
|
||||
if (pollInterval) {
|
||||
clearInterval(pollInterval)
|
||||
pollInterval = null
|
||||
}
|
||||
isPolling.value = false
|
||||
}
|
||||
|
||||
async function clearLog() {
|
||||
try {
|
||||
await fetch(route('dashboard.deploy.clear'), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content,
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
})
|
||||
deployLog.value = ''
|
||||
deployStatus.value = { status: 'idle', message: 'Деплой не запущен' }
|
||||
} catch (error) {
|
||||
console.error('Clear error:', error)
|
||||
}
|
||||
}
|
||||
|
||||
function formatDate(dateStr) {
|
||||
if (!dateStr) return '—'
|
||||
const d = new Date(dateStr)
|
||||
return d.toLocaleString('ru-RU', {
|
||||
day: '2-digit',
|
||||
month: '2-digit',
|
||||
year: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (deployStatus.value.status === 'running') {
|
||||
startPolling()
|
||||
}
|
||||
if (deployStatus.value.log) {
|
||||
deployLog.value = deployStatus.value.log
|
||||
}
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
stopPolling()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<DashboardLayout>
|
||||
<div class="py-6">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<FlashMessages />
|
||||
|
||||
<div class="mb-6">
|
||||
<h1 class="text-2xl font-bold text-gray-900">Деплой сайта</h1>
|
||||
<p class="mt-1 text-sm text-gray-600">
|
||||
Управление обновлением сайта на production сервере
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-6">
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<h3 class="text-sm font-medium text-gray-500 mb-2">Статус</h3>
|
||||
<span
|
||||
:class="[
|
||||
'inline-flex items-center px-3 py-1 rounded-full text-sm font-medium',
|
||||
statusBgColors[deployStatus.status] || 'bg-gray-100',
|
||||
statusColors[deployStatus.status] || 'text-gray-500',
|
||||
]"
|
||||
>
|
||||
{{ statusLabels[deployStatus.status] || deployStatus.status }}
|
||||
</span>
|
||||
<p class="mt-2 text-sm text-gray-600">{{ deployStatus.message }}</p>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<h3 class="text-sm font-medium text-gray-500 mb-2">Действия</h3>
|
||||
<div class="flex gap-3">
|
||||
<button
|
||||
@click="startDeploy"
|
||||
:disabled="isDeploying || deployStatus.status === 'running'"
|
||||
class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
<svg v-if="isDeploying" class="animate-spin -ml-1 mr-2 h-4 w-4 text-white" fill="none" viewBox="0 0 24 24">
|
||||
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
|
||||
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" />
|
||||
</svg>
|
||||
{{ isDeploying ? 'Выполняется...' : 'Запустить деплой' }}
|
||||
</button>
|
||||
<button
|
||||
@click="clearLog"
|
||||
class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
|
||||
>
|
||||
Очистить лог
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<h3 class="text-sm font-medium text-gray-500 mb-2">Информация</h3>
|
||||
<dl class="space-y-1">
|
||||
<div class="flex justify-between text-sm">
|
||||
<dt class="text-gray-500">Деплоев выполнено:</dt>
|
||||
<dd class="font-medium text-gray-900">{{ history.length }}</dd>
|
||||
</div>
|
||||
<div v-if="history.length > 0" class="flex justify-between text-sm">
|
||||
<dt class="text-gray-500">Последний деплой:</dt>
|
||||
<dd class="font-medium text-gray-900">{{ formatDate(history[0]?.timestamp) }}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="deployLog" class="bg-white shadow rounded-lg mb-6">
|
||||
<div class="px-6 py-4 border-b border-gray-200">
|
||||
<h3 class="text-lg font-medium text-gray-900">Лог деплоя</h3>
|
||||
</div>
|
||||
<div class="p-6">
|
||||
<pre class="bg-gray-900 text-green-400 rounded-lg p-4 overflow-auto max-h-96 text-sm font-mono whitespace-pre-wrap">{{ deployLog }}</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg">
|
||||
<div class="px-6 py-4 border-b border-gray-200">
|
||||
<h3 class="text-lg font-medium text-gray-900">История деплоев</h3>
|
||||
</div>
|
||||
<div v-if="history.length === 0" class="p-6 text-center text-gray-500">
|
||||
Деплои ещё не выполнялись
|
||||
</div>
|
||||
<table v-else class="min-w-full divide-y divide-gray-200">
|
||||
<thead class="bg-gray-50">
|
||||
<tr>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Дата</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Статус</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Коммит</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Запущен</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="bg-white divide-y divide-gray-200">
|
||||
<tr v-for="(item, index) in history" :key="index">
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900">{{ formatDate(item.timestamp) }}</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap">
|
||||
<span
|
||||
:class="[
|
||||
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium',
|
||||
item.status === 'success' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
|
||||
]"
|
||||
>
|
||||
{{ item.status === 'success' ? 'Успешно' : 'Ошибка' }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 font-mono">{{ item.commit }}</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ item.triggered_by }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</DashboardLayout>
|
||||
</template>
|
||||
@@ -6,43 +6,6 @@
|
||||
<!-- Flash Messages (shared component) -->
|
||||
<FlashMessages />
|
||||
|
||||
<!-- Deploy Button -->
|
||||
<div v-if="isProduction" class="mb-6 bg-gradient-to-r from-primary/10 to-info/10 border border-primary/20 rounded-lg p-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex items-center gap-3">
|
||||
<div class="w-10 h-10 rounded-lg bg-primary/20 flex items-center justify-center">
|
||||
<DashboardIcon name="arrow-path" size="5" class="text-primary" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 class="text-sm font-semibold text-foreground">Обновление сайта</h3>
|
||||
<p class="text-xs text-muted-foreground-1">Запуск скрипта деплоя и пересборка сервера</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
@click="deploySite"
|
||||
:disabled="deploying"
|
||||
class="inline-flex items-center gap-2 px-5 py-2.5 bg-amber-500 text-white text-sm font-medium rounded-lg hover:bg-amber-600 transition-all disabled:opacity-50 disabled:cursor-not-allowed shadow-sm hover:shadow-md"
|
||||
>
|
||||
<svg v-if="deploying" class="animate-spin w-4 h-4" fill="none" viewBox="0 0 24 24">
|
||||
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
|
||||
</svg>
|
||||
<DashboardIcon v-else name="rocket-launch" size="4" />
|
||||
{{ deploying ? 'Обновление...' : 'Обновить сайт' }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Deploy Output -->
|
||||
<div v-if="deployOutput" class="mt-4 p-3 bg-surface border border-layer-line rounded-lg">
|
||||
<div class="flex items-start gap-2 mb-2">
|
||||
<DashboardIcon :name="deploySuccess ? 'check-circle' : 'exclamation-circle'" size="4" :class="deploySuccess ? 'text-success' : 'text-rose-500'" />
|
||||
<span class="text-sm font-medium" :class="deploySuccess ? 'text-success' : 'text-rose-500'">{{ deployMessage }}</span>
|
||||
</div>
|
||||
<pre v-if="deployOutput" class="mt-2 p-2 bg-muted/30 rounded text-xs text-foreground overflow-auto max-h-48">{{ deployOutput }}</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Stats Overview -->
|
||||
<StatsOverview :stats="stats" class="mb-6" />
|
||||
|
||||
@@ -124,11 +87,6 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
deploying: false,
|
||||
deployOutput: null,
|
||||
deploySuccess: false,
|
||||
deployStatus: null,
|
||||
deployPolling: null,
|
||||
domainSections: [
|
||||
{
|
||||
title: 'Контент сайта',
|
||||
@@ -167,80 +125,7 @@ export default {
|
||||
mounted() {
|
||||
this.SET_DOCUMENT_TITLE('Главная');
|
||||
},
|
||||
beforeUnmount() {
|
||||
if (this.deployPolling) {
|
||||
clearInterval(this.deployPolling);
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
isProduction() {
|
||||
return this.$page.props.app?.env === 'production';
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
async deploySite() {
|
||||
if (!confirm('Вы уверены, что хотите обновить сайт? Это запустит скрипт деплоя.')) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.deploying = true;
|
||||
this.deployOutput = null;
|
||||
this.deploySuccess = false;
|
||||
|
||||
try {
|
||||
const response = await fetch(route('dashboard.deploy'), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content,
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
});
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
this.deploySuccess = result.success;
|
||||
this.deployOutput = result.message;
|
||||
|
||||
// Если деплой запущен — начинаем polling статуса
|
||||
if (result.success) {
|
||||
this.startDeployPolling();
|
||||
}
|
||||
} catch (error) {
|
||||
this.deploySuccess = false;
|
||||
this.deployOutput = 'Ошибка при выполнении запроса: ' + error.message;
|
||||
} finally {
|
||||
this.deploying = false;
|
||||
}
|
||||
},
|
||||
|
||||
startDeployPolling() {
|
||||
// Проверяем статус каждые 3 секунды
|
||||
this.deployPolling = setInterval(async () => {
|
||||
try {
|
||||
const response = await fetch(route('dashboard.deploy.status'));
|
||||
const status = await response.json();
|
||||
|
||||
this.deployStatus = status;
|
||||
|
||||
if (status.status === 'completed' || status.status === 'failed' || status.status === 'idle') {
|
||||
clearInterval(this.deployPolling);
|
||||
this.deployPolling = null;
|
||||
this.deployOutput = status.message || 'Деплой завершён';
|
||||
this.deploySuccess = status.status === 'completed';
|
||||
|
||||
if (status.log) {
|
||||
this.deployOutput += '\n\n' + status.log;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error polling deploy status:', error);
|
||||
}
|
||||
}, 3000);
|
||||
},
|
||||
get deployMessage() {
|
||||
if (!this.deployOutput) return '';
|
||||
return this.deploySuccess ? 'Сайт успешно обновлён!' : 'Ошибка при обновлении сайта';
|
||||
},
|
||||
getBgClass(color) {
|
||||
const map = {
|
||||
primary: 'bg-primary/10',
|
||||
|
||||
Reference in New Issue
Block a user