From e9cbd73715650674e6876d192590e9182bb63180 Mon Sep 17 00:00:00 2001 From: Nick Kosarev Date: Wed, 27 Aug 2025 17:19:52 +0200 Subject: [PATCH] chore: inputs rework --- apps/atrium-telegram/app/app.config.ts | 22 ++++++- apps/atrium-telegram/app/app.vue | 5 +- .../app/components/Navigation.vue | 4 +- .../app/components/form/CompleteTask.vue | 9 +-- .../app/components/form/CreateTask.vue | 60 +++++++++-------- .../app/components/form/CreateTaskList.vue | 8 +-- .../app/components/form/UpdateTask.vue | 64 +++++++++---------- .../app/components/form/UpdateTaskList.vue | 10 +-- .../app/components/form/UploadUserAvatar.vue | 4 +- apps/atrium-telegram/app/pages/index.vue | 1 + 10 files changed, 101 insertions(+), 86 deletions(-) diff --git a/apps/atrium-telegram/app/app.config.ts b/apps/atrium-telegram/app/app.config.ts index 00821b0b..c01c63fb 100644 --- a/apps/atrium-telegram/app/app.config.ts +++ b/apps/atrium-telegram/app/app.config.ts @@ -1,5 +1,25 @@ export default defineAppConfig({ ui: { + input: { + slots: { + base: '!ring-muted', + }, + }, + inputMenu: { + slots: { + base: '!ring-muted', + }, + }, + selectMenu: { + slots: { + base: '!ring-muted', + }, + }, + textarea: { + slots: { + base: '!ring-muted', + }, + }, button: { slots: { base: 'font-semibold', @@ -28,7 +48,7 @@ export default defineAppConfig({ slots: { content: 'divide-y-0 !ring-muted/50', header: 'pb-0 min-h-12', - title: 'text-lg/5 font-semibold', + title: 'font-semibold', }, }, navigationMenu: { diff --git a/apps/atrium-telegram/app/app.vue b/apps/atrium-telegram/app/app.vue index 68ccde2e..46d136a9 100644 --- a/apps/atrium-telegram/app/app.vue +++ b/apps/atrium-telegram/app/app.vue @@ -2,7 +2,10 @@ diff --git a/apps/atrium-telegram/app/components/Navigation.vue b/apps/atrium-telegram/app/components/Navigation.vue index a4a264d1..acd9f9d6 100644 --- a/apps/atrium-telegram/app/components/Navigation.vue +++ b/apps/atrium-telegram/app/components/Navigation.vue @@ -45,8 +45,8 @@ const mainRoutes = computed(() => [ { path: '/epic', name: 'quests', - title: 'Секрет', - icon: 'i-lucide-lock', + title: 'Эпики', + icon: 'i-lucide-crown', }, { path: '/secret1', diff --git a/apps/atrium-telegram/app/components/form/CompleteTask.vue b/apps/atrium-telegram/app/components/form/CompleteTask.vue index fc45e64a..4897590c 100644 --- a/apps/atrium-telegram/app/components/form/CompleteTask.vue +++ b/apps/atrium-telegram/app/components/form/CompleteTask.vue @@ -18,7 +18,7 @@ @@ -27,7 +27,7 @@ type="submit" variant="solid" color="secondary" - size="lg" + size="xl" trailing-icon="i-lucide-flag" block :label="$t('app.update.task.close')" @@ -49,9 +49,7 @@ const { taskId } = defineProps<{ const emit = defineEmits(['success', 'submitted']) -const { t } = useI18n() const { vibrate } = useFeedback() -const actionToast = useActionToast() const userStore = useUserStore() const taskStore = useTaskStore() @@ -63,7 +61,6 @@ const state = ref>({ }) async function onSubmit(event: FormSubmitEvent) { - const toastId = actionToast.start() emit('submitted') try { @@ -80,12 +77,10 @@ async function onSubmit(event: FormSubmitEvent) { userStore.update(), ]) - actionToast.success(toastId, t('toast.task-completed')) vibrate('success') emit('success') } catch (error) { console.error(error) - actionToast.error(toastId) vibrate('error') } } diff --git a/apps/atrium-telegram/app/components/form/CreateTask.vue b/apps/atrium-telegram/app/components/form/CreateTask.vue index a104874d..9afc5faf 100644 --- a/apps/atrium-telegram/app/components/form/CreateTask.vue +++ b/apps/atrium-telegram/app/components/form/CreateTask.vue @@ -13,7 +13,7 @@ @@ -22,7 +22,7 @@ @@ -36,44 +36,42 @@ :content="{ side: 'top', }" - size="lg" + size="xl" class="w-full" /> -
- - - - - - - - - -
+ + + + + + + + + @@ -17,7 +17,7 @@ @@ -32,7 +32,7 @@ side: 'top', }" multiple - size="lg" + size="xl" class="w-full" /> @@ -41,7 +41,7 @@ type="submit" variant="solid" color="secondary" - size="lg" + size="xl" block class="mt-3" :label="$t('common.create')" diff --git a/apps/atrium-telegram/app/components/form/UpdateTask.vue b/apps/atrium-telegram/app/components/form/UpdateTask.vue index f501ece2..ae3c0d09 100644 --- a/apps/atrium-telegram/app/components/form/UpdateTask.vue +++ b/apps/atrium-telegram/app/components/form/UpdateTask.vue @@ -12,7 +12,7 @@ > @@ -21,7 +21,7 @@ @@ -32,45 +32,43 @@ :items="availablePerformersItems" :avatar="selectedPerformer?.avatar" :placeholder="$t('common.select')" - size="lg" + size="xl" class="w-full" /> -
- - - - - - - - - -
+ + + + + + + + + @@ -80,7 +78,7 @@ type="submit" variant="solid" color="secondary" - size="lg" + size="xl" block :label="$t('common.update')" /> @@ -88,7 +86,7 @@ @@ -17,7 +17,7 @@ @@ -32,7 +32,7 @@ side: 'top', }" multiple - size="lg" + size="xl" class="w-full" /> @@ -42,7 +42,7 @@ type="submit" variant="solid" color="secondary" - size="lg" + size="xl" block :label="$t('common.update')" /> @@ -50,7 +50,7 @@ @@ -20,7 +20,7 @@ type="submit" variant="solid" color="secondary" - size="lg" + size="xl" block class="mt-3" :label="$t('common.upload')" diff --git a/apps/atrium-telegram/app/pages/index.vue b/apps/atrium-telegram/app/pages/index.vue index 15ff04b5..a87122cc 100644 --- a/apps/atrium-telegram/app/pages/index.vue +++ b/apps/atrium-telegram/app/pages/index.vue @@ -45,6 +45,7 @@ />