Compare commits

..
7 Commits
Author SHA1 Message Date
vadim c96ef32fe9 tags
Gitea Actions / Deploy (push) Successful in 32s
2026-11-01 11:19:50 +03:00
vadim 10ad1569fb favicon
Gitea Actions / Deploy (push) Successful in 8s
2026-10-29 09:57:17 +03:00
vadim 609fe517d7 wip 2026-10-26 21:48:43 +03:00
vadim 76bababa91 ui
Gitea Actions / Deploy (push) Failing after 35s
2026-10-25 21:49:56 +03:00
vadim 696166d68a fix imports
Gitea Actions / Deploy (push) Successful in 28s
2026-10-25 21:12:27 +03:00
vadim b9c5f64989 ui fixes
Gitea Actions / Deploy (push) Successful in 1m4s
2026-10-25 20:59:28 +03:00
vadim f0706432d4 avatar fix
Gitea Actions / Deploy (push) Successful in 29s
sessions fix
password change
sign-in fix
2026-10-23 19:25:11 +03:00
40 changed files with 1958 additions and 361 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
<html lang="">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<link rel="icon" href="/favicon_.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
+812 -190
View File
File diff suppressed because it is too large. Load diff
+8 -2
View File
@@ -16,8 +16,14 @@
},
"dependencies": {
"@fontsource/roboto": "^5.3.0",
"@tiptap/extension-list": "^3.32.0",
"@tiptap/extensions": "^3.32.0",
"@tiptap/markdown": "^3.32.0",
"@tiptap/pm": "^3.32.0",
"@tiptap/starter-kit": "^3.32.0",
"@tiptap/vue-3": "^3.32.0",
"@vueuse/core": "^14.4.0",
"better-auth": "^1.7.1",
"better-auth": "^1.7.13",
"chart.js": "^4.5.1",
"firebase": "^13.0.0",
"pinia": "^4.0.3",
@@ -44,7 +50,7 @@
"sass-embedded": "^1.103.1",
"typescript": "^6.0.3",
"unplugin-fonts": "^2.0.0",
"vite": "^8.2.2",
"vite": "^8.3.5",
"vite-plugin-vue-devtools": "^8.2.1",
"vue-eslint-parser": "^10.4.1",
"vue-tsc": "^3.3.11"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 627 B

+3 -2
View File
@@ -2,9 +2,10 @@ import { apiClient } from '@/lib/api-client.ts'
import type { User } from '@/api/user.api.ts'
/** created — a pseudo-field: the issue creation record, both values are null */
export type IssueChangeField = 'created' | 'title' | 'content' | 'status' | 'priority' | 'assignee' | 'dueDate' | 'type'
export type IssueChangeField =
'created' | 'title' | 'content' | 'status' | 'priority' | 'assignee' | 'dueDate' | 'type' | 'tag'
/** Values are serialized: priority — number, dueDate — ISO date, assignee — user id */
/** Values are serialized: priority — number, dueDate — ISO date, assignee — user id, tag — one change per tag name */
export interface IssueFieldChange {
field: IssueChangeField
oldValue: string | null
+10
View File
@@ -2,9 +2,16 @@ import { apiClient, toQuery } from '@/lib/api-client.ts'
import type { User } from '@/api/user.api.ts'
import type { IssueType } from '@/api/issue-type.api.ts'
export interface IssueTag {
id: string
name: string
color: string
}
export interface Issue {
id: number
key: string
projectId: string
title: string
content: string
status: 'OPEN' | 'IN_PROGRESS' | 'DONE' | 'CANCELLED'
@@ -14,6 +21,7 @@ export interface Issue {
reporterId: string
assignee?: User
reporter?: User
tags: IssueTag[]
dueDate: string | null
createdAt: string
updatedAt: string
@@ -35,6 +43,8 @@ export interface CreateIssueInput {
priority?: Issue['priority']
assignee?: string
dueDate?: string | null
/** Names, the full new list; names missing from the project's tags are created */
tags?: string[]
}
export type UpdateIssueInput = Partial<CreateIssueInput>
+21
View File
@@ -0,0 +1,21 @@
import { apiClient, toQuery } from '@/lib/api-client.ts'
export const TAG_NAME_MAX_LENGTH = 50
/** Upper bound of the backend's list limit */
export const TAGS_LIST_MAX_LIMIT = 500
export interface Tag {
id: string
projectId: string
name: string
color: string
createdAt: string
updatedAt: string
}
// CLIENT REQUEST
/** Sorted by name; q — case-insensitive substring of the name */
export async function tagsList(projectId: string, params: { q?: string; limit?: number } = {}) {
return apiClient.get<Tag[]>(`/api/projects/${projectId}/tags${toQuery(params)}`)
}
+9
View File
@@ -20,3 +20,12 @@ export async function itemsList(params: { page: number; limit: number }) {
export async function itemGetById(id: string) {
return apiClient.get<User>(`/api/users/${id}`)
}
/** fileId — картинка, загруженная через fileUpload; прежний аватар сервер отдаст GC */
export async function avatarSet(fileId: string) {
return apiClient.put<User>('/api/users/me/avatar', { fileId })
}
export async function avatarRemove() {
return apiClient.delete('/api/users/me/avatar')
}
-1
View File
@@ -99,7 +99,6 @@ const select = (value: unknown) => {
rounded="circle"
density="compact"
border
color="primary"
/>
<div>{{ user.name || user.email }}</div>
</div>
@@ -1,34 +1,51 @@
<script setup lang="ts">
import { ref } from 'vue'
import { computed, ref, watch } from 'vue'
interface Props {
text?: string
/** Shown instead of empty text, so there is still something to click */
placeholder?: string
/** Empty (or whitespace-only) text is not saved, the field stays open with an error */
required?: boolean
}
const props = defineProps<Props>()
const props = withDefaults(defineProps<Props>(), { placeholder: 'click to write text', required: false })
const isEmpty = computed(() => !props.text?.trim())
const emit = defineEmits<{ changed: [text: string] }>()
const editing = ref(false)
const draft = ref(props.text ?? '')
const error = ref('')
watch(draft, () => {
error.value = ''
})
const startEdit = () => {
draft.value = props.text ?? ''
error.value = ''
editing.value = true
}
const save = () => {
if (props.required && !draft.value.trim()) {
error.value = 'This field is required'
return
}
emit('changed', draft.value)
editing.value = false
}
const cancel = () => {
draft.value = props.text ?? ''
error.value = ''
editing.value = false
}
</script>
<template>
<div class="issue-title">
<div class="editable-text">
<template v-if="!editing">
<v-hover #default="{ isHovering, props }">
<v-sheet
@@ -37,17 +54,26 @@ const cancel = () => {
class="cursor-pointer d-flex align-center ga-1"
@click="startEdit"
>
<div class="text-uppercase text-title-large">
{{ text ?? 'click to write text' }}
<div class="text-uppercase text-title-large" :class="{ 'text-medium-emphasis': isEmpty }">
{{ isEmpty ? placeholder : text }}
</div>
<v-icon v-if="isHovering" icon="mdi-pencil" size="small" />
<v-icon v-if="isHovering || isEmpty" icon="mdi-pencil" size="small" />
</v-sheet>
</v-hover>
</template>
<template v-else>
<div class="d-flex ga-1 align-center">
<v-text-field autofocus class="mb-1" hide-details v-model="draft" variant="outlined" @keyup.enter="save" />
<v-text-field
autofocus
class="mb-1"
hide-details="auto"
:error-messages="error"
v-model="draft"
variant="outlined"
@keyup.enter="save"
@keyup.esc="cancel"
/>
<v-btn density="compact" icon variant="text" @click="cancel">
<v-icon icon="mdi-cancel" />
+2 -1
View File
@@ -21,6 +21,7 @@ const FIELD_LABELS: Record<IssueFieldChange['field'], string> = {
assignee: 'Assignee',
dueDate: 'Due Date',
type: 'Type',
tag: 'Tag',
}
const PRIORITY_LABELS: Record<string, string> = {
@@ -145,7 +146,7 @@ function toggle(key: string) {
<span class="text-medium-emphasis text-body-small ms-auto">{{ item.time }}</span>
</div>
<div v-for="change in item.changes" :key="change.field" class="history__change">
<div v-for="(change, idx) in item.changes" :key="idx" class="history__change">
<div class="text-medium-emphasis">{{ FIELD_LABELS[change.field] }}:</div>
<div v-if="change.field === 'content'">
+5 -19
View File
@@ -30,19 +30,13 @@ const cancel = () => {
<template>
<div class="issue-content">
<template v-if="!editing">
<v-hover #default="{ isHovering, props }">
<v-sheet
v-bind="props"
:class="isHovering ? 'px-0' : 'px-0'"
class="cursor-pointer d-flex ga-1"
@click="startEdit"
>
<v-sheet v-bind="props" border class="cursor-pointer d-flex ga-1 pa-4" @click="startEdit">
<div class="content-sheet">
{{ text ?? 'click to add content' }}
</div>
<v-icon v-if="isHovering" icon="mdi-pencil" size="small" />
</v-sheet>
</v-hover>
</template>
<template v-else>
@@ -58,12 +52,8 @@ const cancel = () => {
/>
<div class="d-flex justify-end ga-1">
<v-btn density="compact" icon variant="text" @click="cancel">
<v-icon icon="mdi-cancel" />
</v-btn>
<v-btn density="compact" icon color="primary" variant="flat" @click="save">
<v-icon icon="mdi-check" />
</v-btn>
<v-btn density="compact" prepend-icon="mdi-cancel" text="Cancel" variant="text" @click="cancel" />
<v-btn density="compact" prepend-icon="mdi-check" color="primary" variant="flat" @click="save" text="Save" />
</div>
</template>
</div>
@@ -75,10 +65,6 @@ const cancel = () => {
overflow-wrap: anywhere;
}
//.content-sheet:hover {
//background-color: rgba(var(--v-theme-on-surface), 0.06);
//}
.v-sheet {
transition: padding 0.2s ease-in-out;
}
+61 -21
View File
@@ -1,13 +1,14 @@
<script setup lang="ts">
import { computed, ref, useTemplateRef, watchEffect } from 'vue'
import { useIssueStore } from '@/stores/issue.js'
import { useSnackbarStore } from '@/stores/snackbar.ts'
import ExpansionPanel from '@/components/ExpansionPanel.vue'
import IssueContent from '@/components/IssueContent.vue'
import type { Issue } from '@/api/issue.api.ts'
import StatusMenu from '@/components/StatusMenu.vue'
import AssigneeMenu from '@/components/AssigneeMenu.vue'
import ReporterInfo from '@/components/ReporterInfo.vue'
import IssueTitle from '@/components/IssueTitle.vue'
import EditableText from '@/components/EditableText.vue'
import IssueDate from '@/components/IssueDate.vue'
import CommentsList from '@/components/CommentsList.vue'
import HistoryList from '@/components/HistoryList.vue'
@@ -16,6 +17,8 @@ import { useSplitPane } from '@/composables/useSplitPane.ts'
import FileUpload from '@/components/FileUpload.vue'
import PriorityMenu from '@/components/PriorityMenu.vue'
import IssueType from '@/components/IssueType.vue'
import ObserversList from '@/components/ObserversList.vue'
import TagsSelector from '@/components/TagsSelector.vue'
interface Props {
ckey: string
@@ -31,8 +34,10 @@ const emit = defineEmits<{
}>()
const issueStore = useIssueStore()
const snackbarStore = useSnackbarStore()
const issue = ref<Issue>()
const activity = ref()
const tagsSaving = ref(false)
const { ckey } = defineProps<Props>()
@@ -119,6 +124,19 @@ const onAssigneeChanged = async (assignee: string) => {
}
}
const onTagsChanged = async (tags: string[]) => {
if (!issue.value) return
tagsSaving.value = true
try {
const updated = await issueStore.update(issue.value.id, { tags })
if (updated) issue.value = updated
else snackbarStore.add({ title: 'Failed to update tags', text: issueStore.error ?? '', color: 'error' })
} finally {
tagsSaving.value = false
}
}
defineExpose({
applyUpdate: (updated: Issue) => {
if (issue.value && issue.value.id === updated.id) {
@@ -133,32 +151,54 @@ defineExpose({
<div class="d-flex flex-column ga-4 details__main">
<div>{{ ckey }}</div>
<issue-title :text="issue.title" @changed="onTitleChanged" />
<div class="d-flex ga-2">
<div class="text-medium-emphasis">Status:</div>
<status-menu :value="issue.status" @changed="onStatusChanged" />
</div>
<v-card elevation="0" border>
<v-card-text class="u-grid">
<div class="text-medium-emphasis">Status:</div>
<status-menu :value="issue.status" @changed="onStatusChanged" />
<editable-text :text="issue.title" @changed="onTitleChanged" />
<div class="text-medium-emphasis">Type:</div>
<issue-type :value="issue.type" :compact="false" @changed="onTypeChanged" />
<expansion-panel title="Info">
<v-card elevation="0" border>
<v-card-text class="u-grid">
<div class="text-medium-emphasis">Reporter:</div>
<reporter-info :user="issue.reporter" />
<div class="text-medium-emphasis">Priority:</div>
<priority-menu :value="issue.priority" :compact="false" @changed="onPriorityChanged" />
<div class="text-medium-emphasis">Assignee:</div>
<assignee-menu :value="issue.assignee" :compact="false" @changed="onAssigneeChanged" />
<div class="text-medium-emphasis">Reporter:</div>
<reporter-info :user="issue.reporter" />
<div class="text-medium-emphasis">Type:</div>
<issue-type :value="issue.type" :compact="false" @changed="onTypeChanged" />
<div class="text-medium-emphasis">Assignee:</div>
<assignee-menu :value="issue.assignee" :compact="false" @changed="onAssigneeChanged" />
<div class="text-medium-emphasis">Priority:</div>
<priority-menu :value="issue.priority" :compact="false" @changed="onPriorityChanged" />
</v-card-text>
<div class="text-medium-emphasis">Created At:</div>
<div>{{ createdAtFormatted }}</div>
<v-divider />
<div class="text-medium-emphasis">Due Date:</div>
<issue-date :date="issue.dueDate" @changed="onDueDateChanged" />
</v-card-text>
</v-card>
<v-card-text class="u-grid">
<div class="text-medium-emphasis">Observers:</div>
<observers-list />
</v-card-text>
<v-divider />
<v-card-text class="u-grid">
<div class="text-medium-emphasis">Tags:</div>
<tags-selector
:value="issue.tags"
:project-id="issue.projectId"
:saving="tagsSaving"
@changed="onTagsChanged"
/>
<div class="text-medium-emphasis">Created At:</div>
<div>{{ createdAtFormatted }}</div>
<div class="text-medium-emphasis">Due Date:</div>
<issue-date :date="issue.dueDate" @changed="onDueDateChanged" />
</v-card-text>
</v-card>
</expansion-panel>
<expansion-panel title="Details" class="details__content">
<issue-content :text="issue.content" @changed="onContentChanged" />
@@ -242,6 +282,6 @@ defineExpose({
grid-template-columns: auto 1fr;
align-items: center;
column-gap: 1rem;
row-gap: 1.5rem;
row-gap: 0.5rem;
}
</style>
+2 -2
View File
@@ -50,8 +50,8 @@ const select = (value: unknown) => {
v-bind="activatorProps"
/>
<v-btn v-else density="compact" class="px-1" variant="text" v-bind="activatorProps">
<div class="d-flex align-center ga-1">
<v-btn v-else density="comfortable" slim v-bind="activatorProps">
<div class="d-flex align-center ga-2">
<v-icon :color="currentColor" :icon="currentIcon" />
<span>{{ currentName }}</span>
</div>
+282
View File
@@ -0,0 +1,282 @@
<script setup lang="ts">
import { watch } from 'vue'
import { EditorContent, useEditor, type Editor } from '@tiptap/vue-3'
import StarterKit from '@tiptap/starter-kit'
import { TaskItem, TaskList } from '@tiptap/extension-list'
import { Placeholder } from '@tiptap/extensions'
import { Markdown } from '@tiptap/markdown'
interface Props {
placeholder?: string
/** false renders the markdown read-only, without the toolbar */
editable?: boolean
autofocus?: boolean
}
const props = withDefaults(defineProps<Props>(), { placeholder: 'Write something…', editable: true, autofocus: false })
/** Markdown text */
const model = defineModel<string>({ default: '' })
const editor = useEditor({
content: model.value,
contentType: 'markdown',
editable: props.editable,
autofocus: props.autofocus ? 'end' : false,
extensions: [
// Markdown has no underline, so it would be lost on save
StarterKit.configure({ underline: false, link: { openOnClick: !props.editable } }),
TaskList,
TaskItem.configure({ nested: true }),
Placeholder.configure({ placeholder: () => props.placeholder }),
Markdown,
],
onUpdate: ({ editor }) => {
model.value = editor.getMarkdown()
},
})
// External changes only: skip when the value came from the editor itself
watch(model, (value) => {
if (!editor.value || value === editor.value.getMarkdown()) return
editor.value.commands.setContent(value, { contentType: 'markdown', emitUpdate: false })
})
watch(
() => props.editable,
(editable) => editor.value?.setEditable(editable),
)
interface ToolbarButton {
icon: string
title: string
run: (editor: Editor) => void
active?: (editor: Editor) => boolean
disabled?: (editor: Editor) => boolean
}
const toolbar: ToolbarButton[][] = [
[
{
icon: 'mdi-format-bold',
title: 'Bold',
run: (e) => e.chain().focus().toggleBold().run(),
active: (e) => e.isActive('bold'),
},
{
icon: 'mdi-format-italic',
title: 'Italic',
run: (e) => e.chain().focus().toggleItalic().run(),
active: (e) => e.isActive('italic'),
},
{
icon: 'mdi-format-strikethrough',
title: 'Strikethrough',
run: (e) => e.chain().focus().toggleStrike().run(),
active: (e) => e.isActive('strike'),
},
{
icon: 'mdi-code-tags',
title: 'Inline code',
run: (e) => e.chain().focus().toggleCode().run(),
active: (e) => e.isActive('code'),
},
],
[
{
icon: 'mdi-format-header-2',
title: 'Heading',
run: (e) => e.chain().focus().toggleHeading({ level: 2 }).run(),
active: (e) => e.isActive('heading', { level: 2 }),
},
{
icon: 'mdi-format-header-3',
title: 'Subheading',
run: (e) => e.chain().focus().toggleHeading({ level: 3 }).run(),
active: (e) => e.isActive('heading', { level: 3 }),
},
],
[
{
icon: 'mdi-format-list-bulleted',
title: 'Bullet list',
run: (e) => e.chain().focus().toggleBulletList().run(),
active: (e) => e.isActive('bulletList'),
},
{
icon: 'mdi-format-list-numbered',
title: 'Numbered list',
run: (e) => e.chain().focus().toggleOrderedList().run(),
active: (e) => e.isActive('orderedList'),
},
{
icon: 'mdi-format-list-checks',
title: 'Task list',
run: (e) => e.chain().focus().toggleTaskList().run(),
active: (e) => e.isActive('taskList'),
},
],
[
{
icon: 'mdi-format-quote-close',
title: 'Quote',
run: (e) => e.chain().focus().toggleBlockquote().run(),
active: (e) => e.isActive('blockquote'),
},
{
icon: 'mdi-code-block-braces',
title: 'Code block',
run: (e) => e.chain().focus().toggleCodeBlock().run(),
active: (e) => e.isActive('codeBlock'),
},
{
icon: 'mdi-minus',
title: 'Horizontal rule',
run: (e) => e.chain().focus().setHorizontalRule().run(),
},
],
[
{
icon: 'mdi-undo',
title: 'Undo',
run: (e) => e.chain().focus().undo().run(),
disabled: (e) => !e.can().undo(),
},
{
icon: 'mdi-redo',
title: 'Redo',
run: (e) => e.chain().focus().redo().run(),
disabled: (e) => !e.can().redo(),
},
],
]
</script>
<template>
<v-sheet class="markdown-editor" :class="{ 'markdown-editor--editable': editable }">
<div v-if="editable && editor" class="toolbar d-flex flex-wrap align-center ga-1 pa-1">
<template v-for="(group, i) in toolbar" :key="i">
<v-divider v-if="i > 0" vertical class="mx-1" />
<v-btn
v-for="button in group"
:key="button.icon"
:title="button.title"
:icon="button.icon"
:active="button.active?.(editor) ?? false"
:disabled="button.disabled?.(editor) ?? false"
density="comfortable"
size="small"
variant="text"
@click="button.run(editor)"
/>
</template>
</div>
<EditorContent :editor="editor" class="content" />
</v-sheet>
</template>
<style scoped lang="scss">
.markdown-editor--editable {
&:focus-within {
border-color: rgb(var(--v-theme-primary));
}
.toolbar {
border-bottom: 1px solid rgba(var(--v-border-color), var(--v-border-opacity));
}
.content :deep(.tiptap) {
min-height: 6rem;
max-height: 30rem;
overflow-y: auto;
padding: 8px 12px;
}
}
.content :deep(.tiptap) {
outline: none;
overflow-wrap: anywhere;
> * + * {
margin-top: 0.5em;
}
h2 {
font-size: 1.25rem;
font-weight: 500;
}
h3 {
font-size: 1.1rem;
font-weight: 500;
}
ul,
ol {
padding-left: 1.5rem;
}
ul[data-type='taskList'] {
list-style: none;
padding-left: 0.25rem;
li {
display: flex;
align-items: flex-start;
gap: 0.5rem;
> label {
user-select: none;
}
> div {
flex: 1;
}
}
}
blockquote {
border-left: 3px solid rgba(var(--v-border-color), var(--v-border-opacity));
padding-left: 0.75rem;
opacity: 0.8;
}
code {
background-color: rgba(var(--v-theme-on-surface), 0.08);
border-radius: 4px;
padding: 0.1em 0.3em;
font-size: 0.9em;
}
pre {
background-color: rgba(var(--v-theme-on-surface), 0.08);
border-radius: 4px;
padding: 0.75rem;
overflow-x: auto;
code {
background: none;
padding: 0;
}
}
hr {
border: none;
border-top: 1px solid rgba(var(--v-border-color), var(--v-border-opacity));
margin: 1rem 0;
}
a {
color: rgb(var(--v-theme-primary));
}
p.is-editor-empty:first-child::before {
content: attr(data-placeholder);
float: left;
height: 0;
pointer-events: none;
color: rgba(var(--v-theme-on-surface), var(--v-medium-emphasis-opacity));
}
}
</style>
+1
View File
@@ -151,6 +151,7 @@ onMounted(async () => {
<v-btn
class="mt-2"
variant="tonal"
density="comfortable"
prepend-icon="mdi-bell-ring-outline"
:loading="testSending"
@click="sendTestPush"
+27
View File
@@ -0,0 +1,27 @@
<script setup lang="ts">
const observers = [{ name: 'A' }, { name: 'B' }]
const remove = () => {
console.log('remove')
}
</script>
<template>
<div class="d-flex ga-1">
<template v-for="(o, id) in observers" :key="id">
<v-avatar :text="o.name" size="28" color="primary" rounded="circle" density="compact" border />
</template>
<v-menu>
<template v-slot:activator="{ props: activatorProps }">
<v-btn rounded="circle" density="compact" icon="mdi-plus" variant="tonal" v-bind="activatorProps" />
</template>
<v-list>
<v-list-item>a</v-list-item>
<v-list-item>b</v-list-item>
</v-list>
</v-menu>
</div>
</template>
<style scoped lang="scss"></style>
+122 -15
View File
@@ -1,34 +1,141 @@
<script setup lang="ts">
import { reactive } from 'vue'
import { computed, reactive, ref, watch } from 'vue'
import { authClient } from '@/lib/auth-client.js'
import { useSnackbarStore } from '@/stores/snackbar.ts'
const passwordData = reactive({
const session = authClient.useSession()
const snackbarStore = useSnackbarStore()
const email = computed(() => session.value.data?.user.email ?? '')
const err = ref('')
const loading = ref(false)
const reset = reactive({
newPassword: '',
currentPassword: '',
OTP: '',
showOTP: false,
showPassword: false,
})
const changePassword = async () => {
await authClient.changePassword({
newPassword: passwordData.newPassword,
currentPassword: passwordData.currentPassword,
revokeOtherSessions: true,
const canReset = computed(() => reset.newPassword.length > 0 && reset.OTP.length === 6)
watch(
() => reset.OTP,
(val) => {
if (val.length >= 1) err.value = ''
},
)
const sendOTP = async () => {
if (!email.value) return
loading.value = true
const { data, error } = await authClient.emailOtp.requestPasswordReset({
email: email.value,
})
loading.value = false
if (data?.success) {
reset.showOTP = true
err.value = ''
}
if (error) err.value = error.message ?? 'Failed to send code'
}
const confirmPasswordReset = async () => {
if (!canReset.value) return
loading.value = true
const { data, error } = await authClient.emailOtp.resetPassword({
email: email.value,
otp: reset.OTP,
password: reset.newPassword,
})
loading.value = false
if (data?.success) {
snackbarStore.add({ title: 'Password changed', text: '', color: 'success' })
reset.newPassword = ''
reset.OTP = ''
reset.showOTP = false
err.value = ''
}
if (error) {
err.value = error.message ?? 'Failed to reset password'
reset.OTP = ''
}
}
const cancel = () => {
reset.newPassword = ''
reset.OTP = ''
reset.showOTP = false
err.value = ''
}
</script>
<template>
<v-sheet border class="pa-4 d-flex flex-column ga-2">
<div class="text-uppercase text-title-large">Change password</div>
<div class="d-flex flex-column ga-2">
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase text-title-large">Change password</div>
<v-chip v-if="err" size="small" variant="flat" color="error" density="compact">{{ err }}</v-chip>
</div>
<div v-if="reset.showOTP" class="d-flex flex-column ga-2">
<div class="text-body-medium">Enter the code sent to {{ email }} and a new password</div>
<v-text-field
class="w-50"
clearable
bg-color="background"
placeholder="current password"
v-model="passwordData.currentPassword"
density="comfortable"
placeholder="New password"
prepend-inner-icon="mdi-lock"
:type="reset.showPassword ? 'text' : 'password'"
:append-inner-icon="reset.showPassword ? 'mdi-eye-off' : 'mdi-eye'"
@click:append-inner="reset.showPassword = !reset.showPassword"
v-model="reset.newPassword"
/>
<v-text-field clearable bg-color="background" placeholder="new password" v-model="passwordData.newPassword" />
<div>
<v-btn variant="tonal" prepend-icon="mdi-check" text="Update" @click="changePassword" />
<div class="d-flex ga-2 align-center">
<div>CODE from E-mail:</div>
<v-otp-input
class="justify-start pa-0"
color="background"
density="comfortable"
pattern="numeric"
v-model="reset.OTP"
@finish="confirmPasswordReset"
/>
</div>
<div class="d-flex ga-1">
<v-btn density="comfortable" text="Cancel" @click="cancel" />
<v-btn
prepend-icon="mdi-autorenew"
density="comfortable"
text="Resend Code"
:disabled="loading"
@click="sendOTP"
/>
<v-btn
variant="tonal"
density="comfortable"
prepend-icon="mdi-check-circle"
text="Reset password"
:loading="loading"
:disabled="!canReset"
@click="confirmPasswordReset"
/>
</div>
</div>
<div v-else class="d-flex flex-column ga-2">
<div class="text-body-medium">A confirmation code will be sent to {{ email }}</div>
<div class="d-flex ga-1">
<v-btn
prepend-icon="mdi-email-fast-outline"
density="comfortable"
text="Send Code"
:loading="loading"
:disabled="!email"
@click="sendOTP"
/>
</div>
</div>
</v-sheet>
+6 -5
View File
@@ -46,7 +46,7 @@ const select = (value: unknown) => {
</script>
<template>
<div class="">
<div>
<v-menu>
<template v-slot:activator="{ props: activatorProps }">
<v-btn
@@ -54,14 +54,15 @@ const select = (value: unknown) => {
density="compact"
:icon="currentIcon"
:color="currentColor"
:title="currentLabel"
variant="text"
v-bind="activatorProps"
/>
<v-btn v-else density="compact" class="px-1" variant="text" v-bind="activatorProps">
<div class="d-flex align-center ga-1">
<v-icon :color="currentColor" size="x-large" :icon="currentIcon"></v-icon>
<span>{{ currentLabel }}</span>
<v-btn v-else density="comfortable" slim v-bind="activatorProps">
<div class="d-flex align-center ga-2">
<v-icon :color="currentColor" :icon="currentIcon" />
{{ currentLabel }}
</div>
</v-btn>
</template>
+1 -1
View File
@@ -16,7 +16,7 @@ const currentInitials = computed(() => (user ? initials(user) : '?'))
</script>
<template>
<div class="">
<div>
<div class="d-flex align-center ga-2">
<v-btn rounded="circle" density="compact" icon variant="text">
<v-avatar
+23 -8
View File
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { authClient } from '@/lib/auth-client.ts'
import { ref, watchEffect } from 'vue'
import { onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
interface Session {
id: string
@@ -13,6 +14,8 @@ interface Session {
userAgent?: string | null | undefined
}
const router = useRouter()
const currentSession = authClient.useSession()
const sessions = ref<Session[]>([])
const listSessions = async () => {
@@ -24,23 +27,32 @@ const listSessions = async () => {
sessions.value = result.data
}
// signOut also clears the session cookie and the cached useSession state
const signOutToSignIn = async () => {
await authClient.signOut()
router.push({ name: 'sign-in' })
}
const revokeSession = async (token: string) => {
await authClient.revokeSession({
if (token === currentSession.value.data?.session.token) return signOutToSignIn()
const { error } = await authClient.revokeSession({
token: token,
})
if (!error) await listSessions()
}
const revokeOtherSessions = async () => {
await authClient.revokeOtherSessions()
const { error } = await authClient.revokeOtherSessions()
if (!error) await listSessions()
}
const revokeAllSessions = async () => {
await authClient.revokeSessions()
await signOutToSignIn()
}
watchEffect(async () => {
await listSessions()
})
onMounted(listSessions)
</script>
<template>
@@ -62,8 +74,11 @@ watchEffect(async () => {
</template>
</v-list-item>
</v-list>
<div class="mb-2">
<v-btn prepend-icon="mdi-skull" @click="revokeOtherSessions()">Revoke other sessions</v-btn>
<div class="d-flex ga-2">
<v-btn density="comfortable" @click="revokeOtherSessions">Revoke other sessions</v-btn>
<v-btn color="error" variant="flat" density="comfortable" prepend-icon="mdi-skull" @click="revokeAllSessions">
Revoke all sessions
</v-btn>
</div>
</v-sheet>
</template>
+11
View File
@@ -0,0 +1,11 @@
<script setup lang="ts"></script>
<template>
<v-row justify="center">
<v-col cols="12" lg="4" md="6" sm="8">
<slot />
</v-col>
</v-row>
</template>
<style scoped lang="scss"></style>
+9
View File
@@ -0,0 +1,9 @@
<script setup lang="ts"></script>
<template>
<v-sheet class="pa-4">
<slot />
</v-sheet>
</template>
<style scoped lang="scss"></style>
+54 -11
View File
@@ -1,8 +1,9 @@
<script setup lang="ts">
import { reactive } from 'vue'
import { reactive, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { authClient } from '@/lib/auth-client.js'
import { redirectTarget } from '@/lib/redirect.ts'
import SignForm from '@/components/SignForm.vue'
const REMEMBERED_EMAIL_KEY = 'rememberedEmail'
const router = useRouter()
@@ -14,6 +15,7 @@ const signInData = reactive({
rememberMe: true,
callbackURL: 'https://madsky.ru',
})
const err = ref('')
const signIn = async () => {
const { data, error } = await authClient.signIn.email({
@@ -31,22 +33,63 @@ const signIn = async () => {
}
router.push(redirectTarget(route.query.redirect))
}
if (error) {
if (error.message) {
err.value = error.message
}
}
}
</script>
<template>
<div class="d-flex flex-column ga-2">
<div class="text-uppercase">sign in</div>
<v-text-field prepend-inner-icon="mdi-email" placeholder="E-mail" v-model="signInData.email" />
<v-text-field prepend-inner-icon="mdi-lock" placeholder="Password" v-model="signInData.password" />
<div class="d-flex ga-2 align-center">
<v-switch color="info" v-model="signInData.rememberMe" label="Remember me" />
<v-spacer />
<div>
<v-btn prepend-icon="mdi-login" density="comfortable" color="primary" @click="signIn">SIGN IN</v-btn>
<sign-form>
<div class="d-flex flex-column ga-2">
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase">Sign In</div>
<v-chip v-if="err" size="small" variant="flat" color="error" density="compact">{{ err }}</v-chip>
</div>
<v-text-field
bg-color="background"
clearable
prepend-inner-icon="mdi-email"
placeholder="E-mail"
v-model="signInData.email"
/>
<v-text-field
bg-color="background"
clearable
prepend-inner-icon="mdi-lock"
type="password"
placeholder="Password"
v-model="signInData.password"
/>
<div class="d-flex ga-2 align-center">
<v-switch
true-icon="mdi-check"
false-icon="mdi-close"
inset="material"
color="info"
hide-details
size="x-small"
v-model="signInData.rememberMe"
label="Remember me"
/>
<v-spacer />
<div>
<v-btn
prepend-icon="mdi-login"
density="comfortable"
variant="flat"
color="primary"
@click="signIn"
text="Sign In"
/>
</div>
</div>
</div>
</div>
</sign-form>
</template>
<style scoped lang="scss"></style>
+28 -19
View File
@@ -3,12 +3,13 @@ import { reactive, ref, watch } from 'vue'
import { authClient } from '@/lib/auth-client.js'
import { redirectTarget } from '@/lib/redirect.ts'
import { useRoute, useRouter } from 'vue-router'
import SignForm from '@/components/SignForm.vue'
const REMEMBERED_EMAIL_KEY = 'rememberedEmail'
const router = useRouter()
const route = useRoute()
const otpError = ref('')
const err = ref('')
const signIn = reactive({
email: localStorage.getItem(REMEMBERED_EMAIL_KEY) ?? '',
OTP: '',
@@ -25,7 +26,7 @@ const sendOTP = async () => {
if (data?.success) {
if (signIn.rememberMe) localStorage.setItem(REMEMBERED_EMAIL_KEY, signIn.email)
signIn.showOTP = true
otpError.value = ''
err.value = ''
}
if (error) {
@@ -36,7 +37,7 @@ const sendOTP = async () => {
watch(
() => signIn.OTP,
(val) => {
if (val.length >= 1) otpError.value = ''
if (val.length >= 1) err.value = ''
},
)
@@ -47,9 +48,9 @@ const checkOTP = async () => {
})
if (data) router.push(redirectTarget(route.query.redirect))
if (error) {
if (error.status === 400 && error.message) otpError.value = error.message
if (error.status === 400 && error.message) err.value = error.message
if (error.status === 403 && error.message) {
otpError.value = error.message
err.value = error.message
signIn.showOTP = false
}
signIn.OTP = ''
@@ -58,22 +59,30 @@ const checkOTP = async () => {
</script>
<template>
<div class="d-flex flex-column ga-2">
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase">Sign In</div>
<v-chip v-if="otpError" size="small" variant="flat" color="error" density="compact">{{ otpError }}</v-chip>
</div>
<v-text-field prepend-inner-icon="mdi-email" density="comfortable" placeholder="E-mail" v-model="signIn.email" />
<div v-if="signIn.showOTP">
<v-otp-input density="comfortable" autofocus pattern="numeric" v-model="signIn.OTP" @finish="checkOTP" />
<div class="d-flex ga-1 justify-end">
<v-btn prepend-icon="mdi-autorenew" density="comfortable" text="Resend Code" @click="sendOTP" />
<sign-form>
<div class="d-flex flex-column ga-2">
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase">Sign In</div>
<v-chip v-if="err" size="small" variant="flat" color="error" density="compact">{{ err }}</v-chip>
</div>
<v-text-field
clearable
prepend-inner-icon="mdi-email"
bg-color="background"
placeholder="E-mail"
v-model="signIn.email"
/>
<div v-if="signIn.showOTP">
<v-otp-input density="comfortable" autofocus pattern="numeric" v-model="signIn.OTP" @finish="checkOTP" />
<div class="d-flex ga-1 justify-end">
<v-btn prepend-icon="mdi-autorenew" density="comfortable" text="Resend Code" @click="sendOTP" />
</div>
</div>
<div class="d-flex ga-1 justify-end" v-else>
<v-btn prepend-icon="mdi-email-fast-outline" density="comfortable" @click="sendOTP" text="Send Code" />
</div>
</div>
<div class="d-flex ga-1 justify-end" v-else>
<v-btn prepend-icon="mdi-email-fast-outline" density="comfortable" @click="sendOTP" text="Send Code" />
</div>
</div>
</sign-form>
</template>
<style scoped lang="scss"></style>
+23
View File
@@ -0,0 +1,23 @@
<script setup lang="ts">
import type { IssueTag } from '@/api/issue.api.ts'
interface Props {
tag?: Pick<IssueTag, 'name' | 'color'>
name?: string
}
const { tag, name } = defineProps<Props>()
</script>
<template>
<!-- 'default' is the backend's "no color", it is not a theme color -->
<v-chip
:color="tag?.color === 'default' ? undefined : tag?.color"
:text="tag?.name ?? name"
density="compact"
variant="flat"
label
/>
</template>
<style scoped lang="scss"></style>
+80
View File
@@ -0,0 +1,80 @@
<script setup lang="ts">
import { computed, ref } from 'vue'
import { watchDebounced } from '@vueuse/core'
import type { IssueTag } from '@/api/issue.api.ts'
import { TAG_NAME_MAX_LENGTH, tagsList } from '@/api/tag.api.ts'
import TagChip from '@/components/TagChip.vue'
interface Props {
value: IssueTag[]
projectId: string
/** The list is sent as a whole, so a change made during a save would overwrite it */
saving?: boolean
}
const props = defineProps<Props>()
const emit = defineEmits<{ changed: [names: string[]] }>()
const search = ref('')
const options = ref<string[]>([])
const selected = computed(() => props.value.map((tag) => tag.name))
let requestId = 0
async function load() {
// Ignore responses that arrive after the search has changed again
const id = ++requestId
try {
const tags = await tagsList(props.projectId, { q: search.value.trim() })
if (id === requestId) options.value = tags.map((tag) => tag.name)
} catch (e) {
console.error('Failed to load tags', e)
}
}
// Also after a save: the issue may have just created a tag or released one back to the list
watchDebounced([search, () => props.projectId, () => props.value], load, { debounce: 200, immediate: true })
const tagOf = (name: string) => props.value.find((tag) => tag.name === name)
const onSelected = (names: string[]) => {
if (!props.saving) emit('changed', names)
}
// A name missing from the project's tags is created by the backend; names differ by case only — it's the same tag
const onEnter = (e: KeyboardEvent) => {
const name = search.value.trim()
if (e.isComposing || !name || props.saving) return
search.value = ''
if (!selected.value.some((el) => el.toLowerCase() === name.toLowerCase())) {
emit('changed', [...selected.value, name])
}
}
</script>
<template>
<v-autocomplete
v-model:search="search"
:model-value="selected"
:items="options"
:loading="saving"
:maxlength="TAG_NAME_MAX_LENGTH"
no-data-text="Press Enter to create"
density="compact"
variant="outlined"
hide-details
hide-selected
clear-on-select
multiple
closable-chips
@keydown.enter="onEnter"
@update:model-value="onSelected"
>
<template #chip="{ item, props: chipProps }">
<tag-chip v-bind="chipProps" :tag="tagOf(item)" :name="item" />
</template>
</v-autocomplete>
</template>
<style scoped lang="scss"></style>
+111 -5
View File
@@ -1,5 +1,11 @@
<script setup lang="ts">
import { computed } from 'vue'
import { computed, ref, useTemplateRef } from 'vue'
import { authClient } from '@/lib/auth-client.ts'
import { resizeImage } from '@/lib/image-resize.ts'
import { fileUpload } from '@/api/file.api.ts'
import { avatarRemove, avatarSet } from '@/api/user.api.ts'
import { useSnackbarStore } from '@/stores/snackbar.ts'
import EditableText from '@/components/EditableText.vue'
interface Props {
user?: {
@@ -13,22 +19,122 @@ interface Props {
}
}
/** The largest avatar is 128px in the profile, so 512px covers HiDPI screens */
const AVATAR_MAX_SIZE = 512
/** The server shows only these types inline */
const AVATAR_TYPES = 'image/png,image/jpeg,image/gif,image/webp'
const { user } = defineProps<Props>()
const snackbarStore = useSnackbarStore()
const input = useTemplateRef<HTMLInputElement>('input')
const avatarSaving = ref(false)
const avatar = computed(() => {
return user?.image ?? undefined
})
const createdAt = computed(() => {
return user?.createdAt ? new Date(user.createdAt).toLocaleString('ru-RU') : ''
})
function showError(text: string, e: unknown) {
snackbarStore.add({ title: text, text: e instanceof Error ? e.message : '', color: 'error' })
}
// The avatar is changed by our API, not better-auth, so its 30s session cookie cache
// is stale: re-read the session from the DB, then let useSession() consumers refetch
async function refreshSession() {
await authClient.getSession({ query: { disableCookieCache: true } })
authClient.$store.notify('$sessionSignal')
}
async function saveName(name: string) {
const trimmed = name.trim()
if (!trimmed || trimmed === user?.name) return
const { error } = await authClient.updateUser({ name: trimmed })
if (error) showError('Failed to change name', new Error(error.message))
}
function openPicker() {
input.value?.click()
}
async function onInputChange(event: Event) {
const target = event.target as HTMLInputElement
const file = target.files?.[0]
// Allow picking the same file again
target.value = ''
if (!file) return
avatarSaving.value = true
try {
const stored = await fileUpload(await resizeImage(file, AVATAR_MAX_SIZE))
await avatarSet(stored.id)
await refreshSession()
} catch (e) {
showError('Failed to change avatar', e)
} finally {
avatarSaving.value = false
}
}
async function removeAvatar() {
avatarSaving.value = true
try {
await avatarRemove()
await refreshSession()
} catch (e) {
showError('Failed to remove avatar', e)
} finally {
avatarSaving.value = false
}
}
</script>
<template>
<v-sheet border class="pa-4 d-flex flex-column ga-2">
<div v-if="user" class="d-flex ga-4">
<v-avatar size="x-large" color="info" :image="avatar" />
<v-menu>
<template #activator="{ props: menuProps }">
<v-hover #default="{ isHovering, props: hoverProps }">
<v-avatar v-bind="{ ...menuProps, ...hoverProps }" size="128" color="background" class="cursor-pointer">
<!-- With a default slot v-avatar ignores its image prop, so the image goes in the slot -->
<v-img v-if="avatar" :src="avatar" alt="" cover />
<v-icon v-else icon="mdi-account" size="64" />
<v-overlay
:model-value="isHovering || avatarSaving"
contained
persistent
scrim="black"
class="align-center justify-center"
>
<v-progress-circular v-if="avatarSaving" indeterminate size="40" width="3" color="white" />
<v-icon v-else icon="mdi-camera" size="40" color="white" />
</v-overlay>
</v-avatar>
</v-hover>
</template>
<div>
<div>Name: {{ user.name }}</div>
<v-list density="compact">
<v-list-item prepend-icon="mdi-upload" title="Upload photo" :disabled="avatarSaving" @click="openPicker" />
<v-list-item
v-if="avatar"
prepend-icon="mdi-trash-can"
title="Remove photo"
base-color="error"
:disabled="avatarSaving"
@click="removeAvatar"
/>
</v-list>
</v-menu>
<input ref="input" type="file" :accept="AVATAR_TYPES" hidden @change="onInputChange" />
<div class="flex-grow-1">
<editable-text class="mb-2" :text="user.name" placeholder="Enter your name" required @changed="saveName" />
<div>E-mail: {{ user.email }}</div>
<div>Created At: {{ user.createdAt }}</div>
<div>Created At: {{ createdAt }}</div>
</div>
</div>
<v-skeleton-loader v-else type="avatar, list-item-three-line" />
+9 -1
View File
@@ -21,6 +21,12 @@ const title = 'Ulitka'
const isAuth = computed(() => !!session.value.data)
/** Shown in the avatar until the user uploads a picture */
const initial = computed(() => {
const user = session.value.data?.user
return (user?.name.trim() || user?.email || '?').charAt(0).toUpperCase()
})
function goToSignIn() {
router.push({ path: '/sign-in' })
}
@@ -66,6 +72,7 @@ const fluid = computed(() => {
<div v-if="!session.data">
<v-btn @click="goToSignIn">Sign In</v-btn>
<v-btn @click="goToSignUp">Sign Up</v-btn>
</div>
<div v-if="session.data" class="d-flex align-center">
@@ -84,7 +91,8 @@ const fluid = computed(() => {
<v-list nav density="compact" class="pa-1">
<v-list-item density="compact">
<v-sheet border class="d-flex align-center ga-2 pa-2">
<v-avatar rounded="circle" color="primary">A</v-avatar>
<!-- No slot content: with a default slot v-avatar ignores image; text is used only without image -->
<v-avatar rounded="circle" border :image="session.data.user.image ?? undefined" :text="initial" />
<div>
<div>{{ session.data.user.name }}</div>
<div class="text-label-medium">{{ session.data.user.email }}</div>
+18
View File
@@ -1,9 +1,21 @@
import router from '@/router'
import { authClient } from '@/lib/auth-client.ts'
interface ApiEnvelope<T> {
data: T | null
code: number
message?: string | string[]
}
async function redirectToSignIn() {
// Refetch so useSession() consumers drop the stale user
authClient.$store.notify('$sessionSignal')
const route = router.currentRoute.value
if (route.name === 'sign-in') return
await router.push({ name: 'sign-in', query: { redirect: route.fullPath } })
}
async function request<T>(path: string, init?: RequestInit): Promise<T> {
// FormData needs the browser to set multipart Content-Type with its boundary
const isForm = init?.body instanceof FormData
@@ -15,6 +27,12 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
if (res.status === 204) return undefined as T
// Session expired or was revoked from another device
if (res.status === 401) {
await redirectToSignIn()
throw new Error('Unauthorized')
}
// A proxy (e.g. nginx 413) may answer with a non-JSON body
const body = (await res.json().catch(() => ({}))) as Partial<ApiEnvelope<T>>
+29
View File
@@ -0,0 +1,29 @@
/**
* Shrinks an image so its longest side is at most `maxSize` px before upload.
* GIFs are kept as is (canvas would drop the animation), as are images the
* browser cannot decode — the server decides what to do with those.
*/
export async function resizeImage(file: File, maxSize: number): Promise<File> {
if (file.type === 'image/gif') return file
let bitmap: ImageBitmap
try {
bitmap = await createImageBitmap(file)
} catch {
return file
}
const scale = Math.min(1, maxSize / Math.max(bitmap.width, bitmap.height))
const canvas = document.createElement('canvas')
canvas.width = Math.round(bitmap.width * scale)
canvas.height = Math.round(bitmap.height * scale)
canvas.getContext('2d')?.drawImage(bitmap, 0, 0, canvas.width, canvas.height)
bitmap.close()
// Browsers without WebP encoding (Safari) fall back to PNG
const blob = await new Promise<Blob | null>((resolve) => canvas.toBlob(resolve, 'image/webp', 0.9))
if (!blob || blob.size >= file.size) return file
const ext = blob.type === 'image/webp' ? 'webp' : 'png'
return new File([blob], `${file.name.replace(/\.[^.]+$/, '')}.${ext}`, { type: blob.type })
}
+1
View File
@@ -38,6 +38,7 @@ const router = createRouter({
{
path: '/sign-up',
component: SignUpView,
meta: { breadcrumb: 'Sign-up' },
},
{
path: '/verify-email',
+7
View File
@@ -2,6 +2,7 @@ import type { RouteRecordRaw } from 'vue-router'
import ProjectsListView from '@/views/project/ProjectsListView.vue'
import SettingsView from '@/views/settings/SettingsView.vue'
import GeneralSettingsView from '@/views/settings/GeneralSettingsView.vue'
import TagsSettingsView from '@/views/settings/TagsSettingsView.vue'
export const settingsRoutes: RouteRecordRaw = {
path: '/settings',
@@ -21,5 +22,11 @@ export const settingsRoutes: RouteRecordRaw = {
component: ProjectsListView,
meta: { breadcrumb: 'Projects' },
},
{
path: 'tags',
name: 'settings-tags',
component: TagsSettingsView,
meta: { breadcrumb: 'Tags' },
},
],
}
+1 -1
View File
@@ -127,7 +127,7 @@ export const useIssueStore = defineStore('item', () => {
error.value = null
}
return { stats, dailyStats, list, calendar, getByKey, create, update, remove, getStat, getDailyStat, reset }
return { stats, dailyStats, error, list, calendar, getByKey, create, update, remove, getStat, getDailyStat, reset }
})
/** Local YYYY-MM-DD `days` days before today */
+1
View File
@@ -12,6 +12,7 @@ const tab = ref(0)
<v-tabs v-model="tab">
<v-tab value="common" to="/settings">General</v-tab>
<v-tab value="projects" to="/settings/projects">Projects</v-tab>
<v-tab value="tags" to="/settings/tags">Tags</v-tab>
</v-tabs>
<div class="pa-4">
+62
View File
@@ -0,0 +1,62 @@
<script setup lang="ts">
import { ref, watch } from 'vue'
import { storeToRefs } from 'pinia'
import { useProjectStore } from '@/stores/project.ts'
import { type Tag, TAGS_LIST_MAX_LIMIT, tagsList } from '@/api/tag.api.ts'
import TagChip from '@/components/TagChip.vue'
const { currentProjectId } = storeToRefs(useProjectStore())
const items = ref<Tag[]>([])
const loading = ref(false)
const error = ref<string | null>(null)
async function load(projectId: string | null) {
items.value = []
error.value = null
if (!projectId) return
loading.value = true
try {
const res = await tagsList(projectId, { limit: TAGS_LIST_MAX_LIMIT })
// The project may have changed while the request was in flight
if (projectId === currentProjectId.value) items.value = res
} catch (e) {
if (projectId === currentProjectId.value) error.value = e instanceof Error ? e.message : 'error get list of tags'
} finally {
if (projectId === currentProjectId.value) loading.value = false
}
}
watch(currentProjectId, load, { immediate: true })
</script>
<template>
<div class="d-flex flex-column ga-2">
<v-alert v-if="error" type="error" density="compact" variant="flat">{{ error }}</v-alert>
<v-data-table
density="compact"
hide-default-footer
:loading="loading"
:headers="[
{ key: 'name', title: 'Name', sortable: false },
{ key: 'createdAt', title: 'Created', sortable: false },
]"
:items="items"
:items-per-page="-1"
:no-data-text="currentProjectId ? 'No tags yet' : 'Select a project'"
item-value="id"
>
<template #[`item.name`]="{ item }">
<tag-chip :tag="item" />
</template>
<template #[`item.createdAt`]="{ item }">
{{ new Date(item.createdAt).toLocaleDateString('ru-RU') }}
</template>
</v-data-table>
</div>
</template>
<style scoped lang="scss"></style>
-4
View File
@@ -11,13 +11,9 @@ const session = authClient.useSession()
<template>
<div class="d-flex flex-column ga-2">
<div class="text-headline-medium text-uppercase">profile</div>
<user-profile :user="session.data?.user" />
<password-change />
<notification-settings />
<sessions-list />
</div>
</template>
+17 -22
View File
@@ -2,34 +2,29 @@
import { ref } from 'vue'
import SignInOtp from '@/components/SignInOtp.vue'
import SignInEmail from '@/components/SignInEmail.vue'
import SignBlock from '@/components/SignBlock.vue'
const tab = ref('otp')
</script>
<template>
<v-row justify="center">
<v-col cols="12" lg="4" md="4" sm="8">
<v-sheet>
<v-tabs v-model="tab" color="primary" density="compact" align-tabs="center">
<v-tab value="otp">OTP</v-tab>
<v-tab value="email">Email</v-tab>
</v-tabs>
<sign-block>
<v-sheet>
<v-tabs v-model="tab" color="primary" density="compact" align-tabs="center">
<v-tab prepend-icon="mdi-key" value="otp">OTP</v-tab>
<v-tab prepend-icon="mdi-mail" value="email">Email</v-tab>
</v-tabs>
<v-tabs-window v-model="tab">
<v-tabs-window-item value="otp">
<v-sheet class="pa-4">
<sign-in-otp />
</v-sheet>
</v-tabs-window-item>
<v-tabs-window-item value="email">
<v-sheet class="pa-4">
<sign-in-email />
</v-sheet>
</v-tabs-window-item>
</v-tabs-window>
</v-sheet>
</v-col>
</v-row>
<v-tabs-window v-model="tab">
<v-tabs-window-item value="otp">
<sign-in-otp />
</v-tabs-window-item>
<v-tabs-window-item value="email">
<sign-in-email />
</v-tabs-window-item>
</v-tabs-window>
</v-sheet>
</sign-block>
</template>
<style scoped lang="scss"></style>
+41 -14
View File
@@ -1,12 +1,15 @@
<script setup lang="ts">
import { authClient } from '@/lib/auth-client.js'
import { reactive } from 'vue'
import { reactive, ref } from 'vue'
import SignForm from '@/components/SignForm.vue'
import SignBlock from '@/components/SignBlock.vue'
const signUpData = reactive({
name: '',
email: '',
email: '', //vadim.olonin@gmail.com
password: '',
})
const err = ref('')
const signUp = async () => {
const { data, error } = await authClient.signUp.email({
@@ -14,32 +17,56 @@ const signUp = async () => {
email: signUpData.email,
password: signUpData.password,
// image: 'https://example.com/image.png',
callbackURL: 'https://madsky.ru',
callbackURL: window.location.origin,
})
console.log(data)
console.log(error)
if (error) {
if (error.message) {
err.value = error.message
}
}
}
</script>
<template>
<v-row>
<v-col cols="12" md="4" sm="8" offset-sm="2" offset-md="4" offset="0">
<sign-block>
<sign-form>
<div class="d-flex flex-column ga-2">
<div class="text-uppercase">sign up</div>
<v-text-field placeholder="Name" prepend-inner-icon="mdi-account" v-model="signUpData.name" />
<v-text-field placeholder="E-mail" prepend-inner-icon="mdi-email" v-model="signUpData.email" />
<v-text-field placeholder="Password" prepend-inner-icon="mdi-lock" v-model="signUpData.password" />
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase">sign up</div>
<v-chip v-if="err" size="small" variant="flat" color="error" density="compact">{{ err }}</v-chip>
</div>
<v-text-field
bg-color="background"
clearable
placeholder="Name"
prepend-inner-icon="mdi-account"
v-model="signUpData.name"
/>
<v-text-field
bg-color="background"
clearable
placeholder="E-mail"
prepend-inner-icon="mdi-email"
v-model="signUpData.email"
/>
<v-text-field
bg-color="background"
clearable
placeholder="Password"
prepend-inner-icon="mdi-lock"
v-model="signUpData.password"
/>
<div class="d-flex ga-2 align-center">
<div>
<v-btn @click="signUp" color="primary" density="comfortable">SIGN UP</v-btn>
<v-btn @click="signUp" variant="flat" color="primary" density="comfortable">SIGN UP</v-btn>
</div>
<v-spacer />
<router-link to="/verify-email" class="text-warning text-decoration-none"> Verify Email </router-link>
</div>
</div>
</v-col>
</v-row>
</sign-form>
</sign-block>
</template>
<style scoped lang="scss"></style>
+27 -9
View File
@@ -1,35 +1,53 @@
<script setup lang="ts">
import { authClient } from '@/lib/auth-client.js'
import { reactive } from 'vue'
import { reactive, ref } from 'vue'
import SignForm from '@/components/SignForm.vue'
import SignBlock from '@/components/SignBlock.vue'
const verifyData = reactive({
email: '',
})
const err = ref('')
const verify = async () => {
const { data, error } = await authClient.sendVerificationEmail({
email: verifyData.email,
callbackURL: 'https://madsky.ru',
callbackURL: window.location.origin,
})
console.log(data)
console.log(error)
if (error) {
if (error.message) {
err.value = error.message
}
}
}
</script>
<template>
<v-row>
<v-col cols="12" md="6" sm="8" offset-sm="2" offset-md="3" offset="0">
<sign-block>
<sign-form>
<div class="d-flex flex-column ga-2">
<div class="text-uppercase">verify email</div>
<div class="d-flex ga-2 align-center justify-space-between">
<div class="text-uppercase">verify email</div>
<v-chip v-if="err" size="small" variant="flat" color="error" density="compact">{{ err }}</v-chip>
</div>
<v-text-field placeholder="email" prepend-inner-icon="mdi-email" v-model="verifyData.email" />
<v-text-field
clearable
placeholder="email"
bg-color="background"
prepend-inner-icon="mdi-email"
v-model="verifyData.email"
/>
<div>
<v-btn @click="verify" color="primary" density="comfortable">VERIFY</v-btn>
<v-btn @click="verify" color="primary" variant="flat" density="comfortable">VERIFY</v-btn>
</div>
</div>
</v-col>
</v-row>
</sign-form>
</sign-block>
</template>
<style scoped lang="scss"></style>