diff --git a/bo/src/App.vue b/bo/src/App.vue index 6bc0c10..df9f0b4 100644 --- a/bo/src/App.vue +++ b/bo/src/App.vue @@ -7,3 +7,37 @@ import { RouterView } from 'vue-router' + + + diff --git a/bo/src/app.config.ts b/bo/src/app.config.ts index 0089c78..245e575 100644 --- a/bo/src/app.config.ts +++ b/bo/src/app.config.ts @@ -8,9 +8,9 @@ export const uiOptions: NuxtUIOptions = { } }, button: { - slots: { - base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!', - }, + // slots: { + // base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!', + // }, }, input: { slots: { @@ -40,9 +40,10 @@ export const uiOptions: NuxtUIOptions = { }, selectMenu: { slots: { - base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!', - content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80 text-(--black)! dark:text-white!', - itemLeadingIcon: 'text-(--black)! dark:text-white!' + // base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!', + // content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80', + // content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80 text-(--black)! dark:text-white!', + // itemLeadingIcon: 'text-(--black)! dark:text-white!' } }, diff --git a/bo/src/assets/error.svg b/bo/src/assets/error.svg new file mode 100644 index 0000000..b2f2c75 --- /dev/null +++ b/bo/src/assets/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bo/src/assets/main.css b/bo/src/assets/main.css index 77bddb8..6d9ebce 100644 --- a/bo/src/assets/main.css +++ b/bo/src/assets/main.css @@ -9,7 +9,7 @@ body { font-family: "Inter", sans-serif; } -.container{ +.container { max-width: 2100px; } @@ -30,7 +30,7 @@ body { /* text */ --accent-blue-dark: #3B82F6; - --accent-blue-light:#2563EB; + --accent-blue-light: #2563EB; --text-dark: #FFFEFB; /* placeholder */ @@ -52,22 +52,25 @@ body { --ui-bg-elevated: var(--color-gray-500); --ui-error: var(--dark-red); --border: var(--border-dark); - --tw-border-style: var(--border-dark); + --tw-border-style: var(--border-dark); } - .label-form { - @apply text-(--gray) dark:text-(--gray-dark) pl-0 md:pl-6 leading-none; - } +.label-form { + @apply text-(--gray) dark:text-(--gray-dark) pl-0 md:pl-6 leading-none; +} - .title { - @apply font-medium text-[19px] sm:text-xl md:text-[22px] leading-none text-(--black) dark:text-(--main-light); - } +.title { + @apply font-medium text-[19px] sm:text-xl md:text-[22px] leading-none text-(--black) dark:text-(--main-light); +} - .column-title { - @apply md:ml-[25px] mb-[25px] sm:mb-[30px]; - } +.column-title { + @apply md:ml-[25px] mb-[25px] sm:mb-[30px]; +} - .form-title { - @apply text-(--accent-green) dark:text-(--accent-green-dark) font-medium; - } +.form-title { + @apply text-(--accent-green) dark:text-(--accent-green-dark) font-medium; +} +.blue-button { + @apply bg-info! text-white! +} \ No newline at end of file diff --git a/bo/src/components/TopBar.vue b/bo/src/components/TopBar.vue index 6f15a2f..d009bd0 100644 --- a/bo/src/components/TopBar.vue +++ b/bo/src/components/TopBar.vue @@ -1,32 +1,32 @@ @@ -173,6 +173,7 @@ const UInput = resolveComponent('UInput') const UButton = resolveComponent('UButton') const UIcon = resolveComponent('UIcon') +import errorImg from '@/assets/error.svg' const columns: TableColumn[] = [ { accessorKey: 'product_id', @@ -209,9 +210,13 @@ const columns: TableColumn[] = [ cell: ({ row }) => { return h('img', { src: row.getValue('image_link') as string, - style: 'width:40px;height:40px;object-fit:cover;' + style: 'width:40px;height:40px;object-fit:cover;', + onError: (e: Event) => { + const target = e.target as HTMLImageElement + target.src = errorImg + } }) - } + }, }, { accessorKey: 'name', @@ -272,8 +277,9 @@ const columns: TableColumn[] = [ onClick: () => { goToProduct(row.original.product_id) }, - color: 'primary', - variant: 'solid' + class: 'cursor-pointer', + color: 'info', + variant: 'soft' }, () => 'Show product') }, } diff --git a/bo/src/components/admin/ProductDetailView.vue b/bo/src/components/admin/ProductDetailView.vue index 830fedf..fbbec2b 100644 --- a/bo/src/components/admin/ProductDetailView.vue +++ b/bo/src/components/admin/ProductDetailView.vue @@ -1,22 +1,19 @@