Added new telegram messages page with managers telegram accounts
Deploy Frontend / build-and-deploy (push) Failing after 39s
Details
Deploy Frontend / build-and-deploy (push) Failing after 39s
Details
This commit is contained in:
parent
061438d6c2
commit
cb38218c84
|
|
@ -22,6 +22,7 @@ import FlowTreeGuidePage from './pages/flowNodes/FlowTreeGuidePage'
|
|||
import NotificationsPage from "@/pages/notifications/NotificationsPage.tsx"
|
||||
import AdminLogsPage from './pages/adminLogs/AdminLogsPage'
|
||||
import MonthlyOrdersSettingsPage from "@/pages/monthlyOrders/MonthlyOrdersSettingsPage.tsx";
|
||||
import TelegramManagersPage from "@/pages/telegramManagers/TelegramManagersPage.tsx";
|
||||
|
||||
const Placeholder = ({ title }: { title: string }) => (
|
||||
<div style={{ padding: 40 }}>
|
||||
|
|
@ -73,6 +74,7 @@ function App() {
|
|||
<Route path="/logs" element={<AdminLogsPage />} />
|
||||
<Route path="/approval-tasks" element={<ApprovalTasksPage />} />
|
||||
<Route path="/guide/flow-trees" element={<FlowTreeGuidePage />} />
|
||||
<Route path="/telegram-managers" element={<TelegramManagersPage />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
import axios from 'axios'
|
||||
|
||||
// Изолированный клиент ТОЛЬКО для сервера менеджеров
|
||||
const managerApiClient = axios.create({
|
||||
baseURL: 'https://37.252.5.229.nip.io/tg-api/api',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-API-Key': 'supersecretkey',
|
||||
},
|
||||
})
|
||||
|
||||
export const telegramManagersApi = {
|
||||
getStatus: () =>
|
||||
managerApiClient.get('/managers/status'),
|
||||
|
||||
sendCode: (phone: string, name: string) =>
|
||||
managerApiClient.post('/managers/auth/send-code', { phone, name }),
|
||||
|
||||
verifyCode: (phone: string, code: string, password?: string) =>
|
||||
managerApiClient.post('/managers/auth/verify-code', { phone, code, password }),
|
||||
|
||||
delete: (managerId: number) =>
|
||||
managerApiClient.delete(`/managers/${managerId}`),
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ import {
|
|||
IconCheck,
|
||||
IconBellRinging,
|
||||
IconBlocks,
|
||||
IconHistory, IconChartBar,
|
||||
IconHistory, IconChartBar, IconBrandTelegram,
|
||||
} from '@tabler/icons-react'
|
||||
import { useLocation, useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '@/hooks/useAuth'
|
||||
|
|
@ -43,6 +43,7 @@ const menuItems: MenuItem[] = [
|
|||
adminOnly: true, // Скрываем от наблюдателей
|
||||
// Если нужно скрыть от менеджеров, можно добавить флаг analystOnly: true и фильтровать
|
||||
},
|
||||
{ label: 'Менеджеры Telegram', icon: IconBrandTelegram, path: '/telegram-managers', adminOnly: true },
|
||||
{
|
||||
label: 'Система согласований',
|
||||
icon: IconFileCheck,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import { telegramManagersApi } from '@/api/telegramManagers'
|
||||
|
||||
export function useTelegramManagers() {
|
||||
return useQuery({
|
||||
queryKey: ['telegram-managers-status'],
|
||||
queryFn: async () => {
|
||||
const response = await telegramManagersApi.getStatus()
|
||||
return response.data
|
||||
},
|
||||
refetchInterval: 10000, // Автоматическое обновление статуса каждые 10 секунд
|
||||
})
|
||||
}
|
||||
|
||||
export function useDeleteTelegramManager() {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: (managerId: number) => telegramManagersApi.delete(managerId),
|
||||
onSuccess: () => {
|
||||
notifications.show({
|
||||
title: 'Успешно',
|
||||
message: 'Сессия менеджера завершена',
|
||||
color: 'green',
|
||||
})
|
||||
queryClient.invalidateQueries({ queryKey: ['telegram-managers-status'] })
|
||||
},
|
||||
onError: (error: any) => {
|
||||
notifications.show({
|
||||
title: 'Ошибка',
|
||||
message: error.response?.data?.detail || 'Не удалось удалить сессию',
|
||||
color: 'red',
|
||||
})
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
@ -0,0 +1,133 @@
|
|||
import { useState } from 'react'
|
||||
import {
|
||||
Paper,
|
||||
Table,
|
||||
Badge,
|
||||
Group,
|
||||
ActionIcon,
|
||||
Button,
|
||||
Text,
|
||||
Loader,
|
||||
Center,
|
||||
Tooltip,
|
||||
Stack,
|
||||
Box,
|
||||
} from '@mantine/core'
|
||||
import { IconTrash, IconPlus, IconCircleCheck, IconCircleX } from '@tabler/icons-react'
|
||||
import { modals } from '@mantine/modals'
|
||||
import AddManagerModal from './components/AddManagerModal'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import { formatMsk } from '@/utils/date.ts'
|
||||
import {useDeleteTelegramManager, useTelegramManagers} from "@/features/telegramManagers/useTelegramManagers.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
export default function TelegramManagersPage() {
|
||||
const [createModalOpened, setCreateModalOpened] = useState(false)
|
||||
const { data: managers, isLoading, isFetching } = useTelegramManagers()
|
||||
const deleteManager = useDeleteTelegramManager()
|
||||
|
||||
const handleDelete = (managerId: number, name: string) => {
|
||||
modals.openConfirmModal({
|
||||
title: 'Подтвердите удаление сессии',
|
||||
children: (
|
||||
<Text size="sm">
|
||||
Вы уверены, что хотите отключить сессию менеджера <b>{name}</b>? Скрипт перестанет читать его переписку.
|
||||
</Text>
|
||||
),
|
||||
labels: { confirm: 'Отключить', cancel: 'Отмена' },
|
||||
confirmProps: { color: 'red' },
|
||||
onConfirm: () => deleteManager.mutate(managerId),
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<Stack gap="md">
|
||||
<Group justify="space-between">
|
||||
<div>
|
||||
<Text size="xl" fw={700}>Менеджеры Telegram</Text>
|
||||
<Text size="sm" c="dimmed">Управление активными сессиями пользовательских аккаунтов (Userbot)</Text>
|
||||
</div>
|
||||
<Button leftSection={<IconPlus size={16} />} onClick={() => setCreateModalOpened(true)}>
|
||||
Подключить менеджера
|
||||
</Button>
|
||||
</Group>
|
||||
|
||||
<Paper withBorder>
|
||||
{isLoading ? (
|
||||
<Center p={60}><Loader /></Center>
|
||||
) : (
|
||||
<Table striped highlightOnHover>
|
||||
<Table.Thead>
|
||||
<Table.Tr>
|
||||
<Table.Th>ID</Table.Th>
|
||||
<Table.Th>Имя</Table.Th>
|
||||
<Table.Th>Телефон</Table.Th>
|
||||
<Table.Th>Статус сессии</Table.Th>
|
||||
<Table.Th>Последнее входящее</Table.Th>
|
||||
<Table.Th>Последнее исходящее</Table.Th>
|
||||
<Table.Th style={{ width: 100 }}>Действия</Table.Th>
|
||||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{managers?.length === 0 ? (
|
||||
<Table.Tr>
|
||||
<Table.Td colSpan={7}>
|
||||
<Center p={40}><Text c="dimmed">Подключенные менеджеры не найдены</Text></Center>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
) : (
|
||||
managers?.map((mgr) => (
|
||||
<Table.Tr key={mgr.manager_id}>
|
||||
<Table.Td>{mgr.manager_id}</Table.Td>
|
||||
<Table.Td><Text fw={500}>{mgr.name}</Text></Table.Td>
|
||||
<Table.Td><Text size="sm" ff="monospace">+{mgr.phone}</Text></Table.Td>
|
||||
<Table.Td>
|
||||
<Badge
|
||||
color={mgr.is_online ? 'green' : 'red'}
|
||||
variant="light"
|
||||
leftSection={mgr.is_online ? <IconCircleCheck size={12} /> : <IconCircleX size={12} />}
|
||||
>
|
||||
{mgr.is_online ? 'Онлайн (Активна)' : 'Оффлайн / Слетела'}
|
||||
</Badge>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{mgr.last_incoming_message_at ? formatMsk(mgr.last_incoming_message_at) : '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" c="dimmed">
|
||||
{mgr.last_outgoing_message_at ? formatMsk(mgr.last_outgoing_message_at) : '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Tooltip label="Удалить сессию">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="red"
|
||||
onClick={() => handleDelete(mgr.manager_id, mgr.name)}
|
||||
>
|
||||
<IconTrash size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
))
|
||||
)}
|
||||
</Table.Tbody>
|
||||
</Table>
|
||||
)}
|
||||
</Paper>
|
||||
|
||||
{isFetching && !isLoading && (
|
||||
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>
|
||||
<Loader size="xs" />
|
||||
</Box>
|
||||
)}
|
||||
|
||||
<AddManagerModal opened={createModalOpened} onClose={() => setCreateModalOpened(false)} />
|
||||
</Stack>
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
import { useState } from 'react'
|
||||
import { Modal, Stack, TextInput, Button, Text, Alert, Group } from '@mantine/core'
|
||||
import { useForm } from '@mantine/form'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import { IconDeviceMobile, IconLock } from '@tabler/icons-react'
|
||||
import { useQueryClient } from '@tanstack/react-query'
|
||||
import {telegramManagersApi} from "@/api/telegramManagers.ts";
|
||||
|
||||
interface AddManagerModalProps {
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
export default function AddManagerModal({ opened, onClose }: AddManagerModalProps) {
|
||||
const [step, setStep] = useState<'phone' | 'code'>('phone')
|
||||
const [loading, setLoading] = useState(false)
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
const form = useForm({
|
||||
initialValues: {
|
||||
phone: '',
|
||||
name: '',
|
||||
code: '',
|
||||
password: '',
|
||||
},
|
||||
})
|
||||
|
||||
const handleSendCode = async (values: typeof form.values) => {
|
||||
setLoading(true)
|
||||
try {
|
||||
await telegramManagersApi.sendCode(values.phone, values.name)
|
||||
notifications.show({ title: 'Код отправлен', message: 'Проверьте Telegram-аккаунт менеджера', color: 'green' })
|
||||
setStep('code')
|
||||
} catch (error: any) {
|
||||
notifications.show({ title: 'Ошибка', message: error.response?.data?.detail || 'Не удалось отправить код', color: 'red' })
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleVerifyCode = async (values: typeof form.values) => {
|
||||
setLoading(true)
|
||||
try {
|
||||
await telegramManagersApi.verifyCode(values.phone, values.code, values.password || undefined)
|
||||
notifications.show({ title: 'Успешно', message: 'Менеджер успешно авторизован и добавлен', color: 'green' })
|
||||
queryClient.invalidateQueries({ queryKey: ['telegram-managers-status'] })
|
||||
handleClose()
|
||||
} catch (error: any) {
|
||||
notifications.show({ title: 'Ошибка', message: error.response?.data?.detail || 'Неверный код или ошибка входа', color: 'red' })
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleClose = () => {
|
||||
setStep('phone')
|
||||
form.reset()
|
||||
onClose()
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal opened={opened} onClose={handleClose} title="Подключение менеджера Telegram" size="sm">
|
||||
{step === 'phone' ? (
|
||||
<form onSubmit={form.onSubmit(handleSendCode)}>
|
||||
<Stack gap="md">
|
||||
<TextInput
|
||||
label="Имя менеджера"
|
||||
placeholder="Иван Иванов"
|
||||
required
|
||||
{...form.getInputProps('name')}
|
||||
/>
|
||||
<TextInput
|
||||
label="Номер телефона"
|
||||
placeholder="+79991234567"
|
||||
required
|
||||
description="В международном формате с плюсом"
|
||||
{...form.getInputProps('phone')}
|
||||
/>
|
||||
<Group justify="flex-end" mt="md">
|
||||
<Button variant="default" onClick={handleClose}>Отмена</Button>
|
||||
<Button type="submit" loading={loading}>Далее (Запросить код)</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</form>
|
||||
) : (
|
||||
<form onSubmit={form.onSubmit(handleVerifyCode)}>
|
||||
<Stack gap="md">
|
||||
<Alert icon={<IconDeviceMobile size={16} />} color="blue" variant="light">
|
||||
Код подтверждения отправлен в официальное приложение Telegram на номер {form.values.phone}
|
||||
</Alert>
|
||||
<TextInput
|
||||
label="Код из Telegram"
|
||||
placeholder="12345"
|
||||
required
|
||||
{...form.getInputProps('code')}
|
||||
/>
|
||||
<TextInput
|
||||
label="Облачный пароль 2FA (если установлен)"
|
||||
placeholder="Пароль двухэтапной аутентификации"
|
||||
type="password"
|
||||
{...form.getInputProps('password')}
|
||||
/>
|
||||
<Group justify="flex-end" mt="md">
|
||||
<Button variant="default" onClick={() => setStep('phone')}>Назад</Button>
|
||||
<Button type="submit" loading={loading} color="green">Подтвердить и войти</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</form>
|
||||
)}
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,3 +1,17 @@
|
|||
export interface ManagerSession {
|
||||
manager_id: number
|
||||
name: string
|
||||
phone: string
|
||||
is_online: boolean
|
||||
last_incoming_message_at: string | null
|
||||
last_outgoing_message_at: string | null
|
||||
}
|
||||
|
||||
export interface ManagersStatusResponse {
|
||||
// Если ваш бэкенд возвращает массив напрямую или обертку, скорректируйте по аналогии
|
||||
data: ManagerSession[]
|
||||
}
|
||||
|
||||
export interface User {
|
||||
id?: number
|
||||
telegram_id?: number
|
||||
|
|
|
|||
Loading…
Reference in New Issue