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
104 changes: 60 additions & 44 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/assets/css/shadcn.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--muted-foreground: var(--semantic-base-text-secondary);
--accent: oklch(97% 0 0deg);
--accent-foreground: oklch(20.5% 0 0deg);
--destructive: var(--semantic-critic-weak);
--destructive: var(--critic-red-middle-dark);
--destructive-foreground: var(--semantic-critic-text);
--border: oklch(92.2% 0 0deg);
--input: var(--semantic-base-line);
Expand Down
4 changes: 4 additions & 0 deletions src/app/assets/css/vibetype.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
--accent-weak: #dcf9ea;
--base-white: #fafafc;
--critic-red-middle: #ff1453;
--critic-red-middle-dark: #c20034;
--critic-string: #e00000;
--critic-weak: #ffebeb;
--complement-fancy: #ff3167;
Expand All @@ -19,6 +20,8 @@
--faint-mid: #e6e6e6;
--faint-strong: #d8d4d5;
--faint-weak: #f2f2f2;
--neutral-level-1: #eff0ef;
--neutral-level-5: #737874;
--semantic-accent-icon: #12683a;
--semantic-accent-line: #dcf9ea;
--semantic-accent-text: #12683a;
Expand Down Expand Up @@ -58,6 +61,7 @@
--faint-mid: #898284;
--faint-strong: #b6afb1;
--faint-weak: #3e3e38;
--neutral-level-1: #191a19;
--semantic-accent-icon: #0a841e;
--semantic-accent-line: #044a0f;
--semantic-accent-text: #129f2a;
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/account/block/AccountBlockDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ const blockUser = async () => {
},
})

if (result.error) {
error.value = result.error
if (!getResultData(result)) {
error.value = result.error ?? new Error(t('globalErrorNoData'))
return
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/components/account/block/AccountBlockRemoveDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ const unblockUser = async () => {
},
})

if (result.error) {
error.value = result.error
if (!getResultData(result)) {
error.value = result.error ?? new Error(t('globalErrorNoData'))
return
}

Expand Down
106 changes: 0 additions & 106 deletions src/app/components/app/AppForm.vue

This file was deleted.

5 changes: 2 additions & 3 deletions src/app/components/app/AppTipTap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,10 @@
import { useEditor, EditorContent } from '@tiptap/vue-3'
import { TextAlign } from '@tiptap/extension-text-align'
import { StarterKit } from '@tiptap/starter-kit'
import type { BaseValidation } from '@vuelidate/core'
import { debounce } from 'lodash-es'

const { value } = defineProps<{
value: BaseValidation<string | undefined>
value: string | undefined
}>()

const emit = defineEmits<{
Expand All @@ -294,7 +293,7 @@ const emit = defineEmits<{
const host = useHost()
const { t } = useI18n()
const editor = useEditor({
content: value.$model,
content: value,
editorProps: {
attributes: {
class:
Expand Down
Loading
Loading