Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions alfy-bot-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
## Возможности

- **Задачи**: Inbox, проекты со списками и board-колонками, повторяющиеся задачи, подзадачи.
- **Колонки Agile-проекта**: в меню проекта «Изменить» → вкладка «Колонки» можно добавить, переименовать, переставить и удалить пустую колонку. Изменения сохраняются сразу. Колонку с задачами (включая завершённые и задачи других спринтов) сервер удалить не позволит — сначала перенесите задачи.
- **Календарь**: недельная сетка с drag-create задач по часам, корректные локаль и первый день недели.
- **Цели и привычки**: создание цели, настройка вопросов-привычек, ежедневные отчёты, аналитика ответов и чарты (`chart.js` / `vue-chartjs`).
- **Pomodoro-таймер** с переносом незавершённых интервалов.
Expand Down
4 changes: 2 additions & 2 deletions alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ watch(() => props.projectId, (id) => {
<div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto" />
</div>
<div v-else class="overflow-x-auto pb-4 h-full">
<div class="grid" :style="{ gridTemplateColumns: `repeat(${lanes.length}, ${COLUMN_WIDTH_PX}px)` }">
<div class="grid gap-x-2" :style="{ gridTemplateColumns: `repeat(${lanes.length}, ${COLUMN_WIDTH_PX}px)` }">
<div class="contents">
<div
v-for="lane in lanes"
Expand Down Expand Up @@ -200,7 +200,7 @@ watch(() => props.projectId, (id) => {
</div>
</div>

<div class="col-span-full grid [grid-template-columns:subgrid] border-t-2 border-border">
<div class="col-span-full grid [grid-template-columns:subgrid] mt-2">
<div class="col-span-full px-3 py-2 text-xs font-medium text-muted-foreground uppercase tracking-wide">
Без эпика
</div>
Expand Down
9 changes: 3 additions & 6 deletions alfy-bot-frontend/src/features/projects/ui/AgileCell.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { Task } from '@/features/tasks/model/types'
import draggable from 'vuedraggable'
import TaskCard from '@/features/tasks/ui/TaskCard.vue'
import AgileTaskCard from './AgileTaskCard.vue'

const props = defineProps<{
tasks: Task[]
Expand All @@ -21,7 +21,7 @@ function handleChange(event: any) {
</script>

<template>
<div class="flex min-h-10 flex-col px-1.5 py-1.5 border-l border-border/50 first:border-l-0">
<div class="flex min-h-[88px] flex-col bg-muted/30 p-1.5">
<!-- flex-1 обязателен: без него список принимает drop только на высоту
своего содержимого, и в пустой ячейке это полоска в 20px посреди
88px — карточка отскакивает назад, а выглядит как «не переносится». -->
Expand All @@ -35,11 +35,8 @@ function handleChange(event: any) {
@change="handleChange"
>
<template #item="{ element }">
<TaskCard
<AgileTaskCard
:task="element"
variant="compact"
:dnd-source="false"
@toggle="$emit('toggleTask', $event)"
@open="$emit('openTask', $event)"
/>
</template>
Expand Down
16 changes: 4 additions & 12 deletions alfy-bot-frontend/src/features/projects/ui/AgileEpicBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ const doneCount = computed(() => allEpicTasks.value.filter(t => t.completed).len

const epicTasksByColumn = computed(() => groupTasksByColumn(props.epicTasks))

// Рамка рисуется inset-тенью, а не border/padding: тень не занимает места,
// поэтому subgrid-колонки эпика остаются на одной вертикали с колонками доски.
// Любой отступ на этом блоке сдвинул бы его дорожки относительно заголовков.
const epicFrame = computed(() => ({
boxShadow: `inset 3px 0 0 0 ${props.epic.color || 'var(--primary)'}, inset 0 0 0 1px color-mix(in oklab, var(--border) 70%, transparent)`,
}))

function commitRename(title: string) {
renaming.value = false
emit('renameGroup', props.epic.id, title)
Expand Down Expand Up @@ -81,10 +74,9 @@ function handleCreateStory(title: string) {

<template>
<div
class="col-span-full grid [grid-template-columns:subgrid] mt-4 rounded-lg overflow-hidden bg-muted/20"
:style="epicFrame"
class="col-span-full grid [grid-template-columns:subgrid] mt-3"
>
<div class="col-span-full flex items-center gap-2 pl-4 pr-3 py-2.5 bg-muted/60">
<div class="col-span-full flex items-center gap-2 px-3 py-1.5">
<button
class="shrink-0 -m-1.5 p-1.5 rounded text-muted-foreground hover:text-foreground transition-colors duration-200 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
:aria-label="collapsed ? 'Развернуть эпик' : 'Свернуть эпик'"
Expand Down Expand Up @@ -176,11 +168,11 @@ function handleCreateStory(title: string) {
v-if="epicTasks.length > 0 || addingEpicTask"
class="col-span-full grid [grid-template-columns:subgrid] border-t border-border"
>
<div class="col-span-full flex items-center gap-2 pl-8 pr-3 py-1.5 bg-muted/25">
<div class="col-span-full flex items-center gap-2 pl-8 pr-3 py-1.5">
<span class="text-xs italic text-muted-foreground/80 truncate">Задачи эпика</span>
<span class="text-[11px] text-muted-foreground/60">{{ epicTasks.length }}</span>
</div>
<div v-if="addingEpicTask" class="col-span-full pl-8 pr-3 py-1.5 bg-muted/25">
<div v-if="addingEpicTask" class="col-span-full pl-8 pr-3 py-1.5">
<InlineTitleInput
placeholder="Название задачи"
@submit="handleCreateEpicTask"
Expand Down
12 changes: 3 additions & 9 deletions alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,10 @@ function handleCreateTask(title: string) {
</script>

<template>
<!-- Вложенность читается слоями, а не вдвинутым прямоугольником: отступ или
margin на этом блоке сдвинул бы его subgrid-колонки относительно эпика
и разломал сквозное выравнивание. Поэтому поверхность светлее эпика,
рейл тоньше, подпись с отступом. -->
<div
class="col-span-full grid [grid-template-columns:subgrid] border-t border-border first:border-t-0"
class="col-span-full grid [grid-template-columns:subgrid] mt-1"
>
<!-- Подпись — «хром» поверх панели эпика; область с карточками остаётся
холстом, иначе карточке не на чем проступить. -->
<div class="col-span-full flex items-center gap-2 pl-8 pr-3 py-1.5 bg-muted/35">
<div class="col-span-full flex items-center gap-2 pl-8 pr-3 py-1.5">
<InlineTitleInput
v-if="renaming"
placeholder="Название истории"
Expand Down Expand Up @@ -92,7 +86,7 @@ function handleCreateTask(title: string) {
/>
</div>
</div>
<div v-if="addingTask" class="col-span-full pl-8 pr-3 py-1.5 bg-muted/35">
<div v-if="addingTask" class="col-span-full pl-8 pr-3 py-1.5">
<InlineTitleInput
placeholder="Название задачи"
@submit="handleCreateTask"
Expand Down
60 changes: 60 additions & 0 deletions alfy-bot-frontend/src/features/projects/ui/AgileTaskCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<script setup lang="ts">
import type { Task } from '@/features/tasks/model/types'
import { Calendar, CheckSquare, Flag } from 'lucide-vue-next'
import { computed } from 'vue'
import { computeChecklistProgress } from '@/features/tasks/lib/checklist'
import { DATE_SHORT, formatDate } from '@/features/tasks/lib/formatters'
import { getPriorityColor } from '@/features/tasks/lib/priority'
import { PRIORITY_LABELS } from '@/features/tasks/model/constants'
import { taskKey } from '../lib/task-key'
import { useProjectStore } from '../model/project-store'

const props = defineProps<{ task: Task }>()
const emit = defineEmits<{ open: [task: Task] }>()
const projects = useProjectStore()
const key = computed(() => taskKey(props.task.projectId ? projects.projectMap.get(props.task.projectId) : undefined, props.task))
const checklist = computed(() => computeChecklistProgress(props.task.checklist?.items ?? []))
</script>

<template>
<button
type="button"
:data-task-id="task.id"
class="agile-task-card flex min-h-[100px] w-full flex-col gap-2 rounded-[3px] bg-card p-3 text-left shadow-sm cursor-grab select-none transition-[background-color,box-shadow] duration-150 active:cursor-grabbing hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
:aria-label="[key, task.title].filter(Boolean).join(': ')"
@click="emit('open', task)"
>
<span v-if="key" data-testid="task-key" class="text-xs font-semibold text-muted-foreground">{{ key }}</span>
<span class="w-full whitespace-normal break-words text-sm font-medium leading-snug">{{ task.title }}</span>
<span class="mt-auto flex flex-wrap items-center gap-x-2 gap-y-1 text-[11px] text-muted-foreground">
<span v-if="task.completed" class="inline-flex items-center gap-1 rounded-md bg-green-500/10 px-2 py-0.5 font-medium text-green-700 dark:bg-green-500/15 dark:text-green-400">
Выполнено
</span>
<span v-if="task.priority" class="inline-flex items-center gap-1" :title="PRIORITY_LABELS[task.priority]">
<Flag :size="12" :class="getPriorityColor(task.priority)" aria-hidden="true" />{{ PRIORITY_LABELS[task.priority] }}
</span>
<span v-if="task.dueDate" class="inline-flex items-center gap-1">
<Calendar :size="12" aria-hidden="true" />{{ formatDate(task.dueDate, DATE_SHORT) }}
</span>
<span v-if="checklist.total" class="inline-flex items-center gap-1">
<CheckSquare :size="12" aria-hidden="true" />{{ checklist.completed }}/{{ checklist.total }}
</span>
<span v-if="task.isOverdue" class="text-destructive">Просрочена</span>
<span v-for="tag in task.tags?.slice(0, 2)" :key="tag" class="rounded bg-muted px-1.5 py-0.5">{{ tag }}</span>
</span>
</button>
</template>

<style scoped>
@media (hover: hover) and (pointer: fine) {
.agile-task-card:hover {
background-color: color-mix(in oklab, var(--card), var(--foreground) 7%);
}
}

@media (prefers-reduced-motion: reduce) {
.agile-task-card {
transition: none;
}
}
</style>
153 changes: 153 additions & 0 deletions alfy-bot-frontend/src/features/projects/ui/ProjectColumnSettings.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
<script setup lang="ts">
import type { ProjectColumn } from '../model/types'
import { ArrowDown, ArrowUp, Check, Trash2 } from 'lucide-vue-next'
import { computed, ref, watch } from 'vue'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import * as columnsApi from '../api/columns-api'
import { apiErrorMessage } from '../lib/api-error'
import { useColumnStore } from '../model/column-store'

const props = defineProps<{ projectId: string }>()
const emit = defineEmits<{ busyChange: [busy: boolean]; dirtyChange: [dirty: boolean] }>()
const store = useColumnStore()
const columns = ref<ProjectColumn[]>([])
const titles = ref<Record<string, string>>({})
const newTitle = ref('')
const loading = ref(false)
const busy = ref(false)
const error = ref('')
const loaded = ref(false)
const deleting = ref<string | null>(null)
const dirty = computed(() => !!newTitle.value.trim() || columns.value.some(column => titles.value[column.id]?.trim() !== column.title))
watch(dirty, value => emit('dirtyChange', value), { flush: 'sync' })
let generation = 0
watch(busy, value => emit('busyChange', value), { flush: 'sync' })

function applyColumns(value: ProjectColumn[], sync: boolean) {
columns.value = [...value].sort((a, b) => a.order - b.order)
if (sync && store.currentProjectId === props.projectId)
store.columns = columns.value.map(column => ({ ...column }))
}

async function load() {
const request = ++generation
loading.value = true
loaded.value = false
busy.value = false
error.value = ''
columns.value = []
titles.value = {}
deleting.value = null
newTitle.value = ''
try {
const { data } = await columnsApi.fetchColumns(props.projectId)
if (request !== generation) return
applyColumns(data, false)
titles.value = Object.fromEntries(data.map(column => [column.id, column.title]))
loaded.value = true
} catch (err) {
if (request === generation) error.value = apiErrorMessage(err, 'Не удалось загрузить колонки')
} finally {
if (request === generation) loading.value = false
}
}

async function run(command: (projectId: string) => Promise<() => void>) {
if (busy.value || !loaded.value) return
const request = generation
busy.value = true
error.value = ''
try {
const apply = await command(props.projectId)
if (request === generation) apply()
} catch (err) {
if (request === generation) error.value = apiErrorMessage(err, 'Не удалось сохранить колонки')
} finally {
if (request === generation) busy.value = false
}
}

async function add() {
const title = newTitle.value.trim()
if (!title) return
await run(async (projectId) => {
const { data } = await columnsApi.createColumn(projectId, { title })
return () => {
applyColumns([...columns.value, data], true)
titles.value[data.id] = data.title
newTitle.value = ''
}
})
}

async function rename(column: ProjectColumn) {
const title = titles.value[column.id]?.trim()
if (!title || title === column.title) return
await run(async (projectId) => {
const { data } = await columnsApi.updateColumn(projectId, column.id, { title })
return () => {
applyColumns(columns.value.map(item => item.id === column.id ? data : item), true)
titles.value[column.id] = data.title
}
})
}

async function move(index: number, direction: number) {
const next = index + direction
if (next < 0 || next >= columns.value.length) return
const reordered = [...columns.value]
const [column] = reordered.splice(index, 1)
if (!column) return
reordered.splice(next, 0, column)
await run(async (projectId) => {
await columnsApi.reorderColumns(projectId, reordered.map(item => item.id))
return () => applyColumns(reordered.map((item, order) => ({ ...item, order })), true)
})
}

async function remove(id: string) {
await run(async (projectId) => {
await columnsApi.deleteColumn(projectId, id)
return () => {
applyColumns(columns.value.filter(column => column.id !== id), true)
deleting.value = null
}
})
}

watch(() => props.projectId, load, { immediate: true })
</script>

<template>
<section class="space-y-3" aria-label="Колонки проекта">
<p class="text-xs text-muted-foreground">Изменения сохраняются сразу. Удалить можно только колонку без задач, включая завершённые и задачи других спринтов.</p>
<p v-if="loading" class="text-sm text-muted-foreground" role="status">Загрузка колонок…</p>
<p v-if="error" role="alert" class="text-sm text-destructive">{{ error }}</p>
<Button v-if="!loading && !loaded" type="button" variant="outline" size="sm" @click="load">Повторить загрузку</Button>
<template v-if="loaded">
<p v-if="!columns.length" class="text-sm text-muted-foreground">Пока нет колонок. Добавьте первую.</p>
<div v-for="(column, index) in columns" :key="column.id" class="space-y-2" :data-column-id="column.id">
<form class="flex items-center gap-1" @submit.prevent="rename(column)">
<Input v-model="titles[column.id]" :aria-label="`Название колонки ${column.title}`" :disabled="busy" class="min-w-0 flex-1" />
<Button type="submit" variant="ghost" size="icon" :aria-label="`Сохранить название ${column.title}`" :disabled="busy || !titles[column.id]?.trim() || titles[column.id]?.trim() === column.title"><Check :size="16" /></Button>
<Button type="button" variant="ghost" size="icon" :aria-label="`Переместить ${column.title} выше`" :disabled="busy || index === 0" @click="move(index, -1)"><ArrowUp :size="16" /></Button>
<Button type="button" variant="ghost" size="icon" :aria-label="`Переместить ${column.title} ниже`" :disabled="busy || index === columns.length - 1" @click="move(index, 1)"><ArrowDown :size="16" /></Button>
<Button type="button" variant="ghost" size="icon" :aria-label="`Удалить колонку ${column.title}`" :disabled="busy" @click="deleting = column.id"><Trash2 :size="16" /></Button>
</form>
<div v-if="deleting === column.id" class="rounded-md border p-3 text-sm space-y-2">
<p>Удалить колонку «{{ column.title }}»?</p>
<div class="flex gap-2">
<Button type="button" size="sm" variant="destructive" :disabled="busy" @click="remove(column.id)">Удалить</Button>
<Button type="button" size="sm" variant="ghost" :disabled="busy" @click="deleting = null">Отмена удаления</Button>
</div>
</div>
</div>
<form class="flex gap-2" @submit.prevent="add">
<Input v-model="newTitle" aria-label="Название новой колонки" placeholder="Название колонки" :disabled="busy" class="min-w-0 flex-1" />
<Button type="submit" variant="outline" :disabled="busy || !newTitle.trim()">Добавить</Button>
</form>
<p v-if="busy" role="status" class="text-xs text-muted-foreground">Сохранение…</p>
</template>
</section>
</template>
Loading
Loading