Icon
diff --git a/app/admin/add-document/document-form.tsx b/app/admin/add-document/document-form.tsx
index b7a5f39e..991b3b3c 100644
--- a/app/admin/add-document/document-form.tsx
+++ b/app/admin/add-document/document-form.tsx
@@ -7,14 +7,13 @@ import { useTransition } from 'react'
import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
import { z } from 'zod'
-import { MultiSelect, RequiredFieldMark } from '@/components/elements'
+import { FormImageUpload, MultiSelect, RequiredFieldMark } from '@/components/elements'
import * as UI from '@/components/ui'
import { imageStorage } from '@/constants/globals'
import type { AllBarometersDTO } from '@/server/barometers/queries'
import type { ConditionsDTO } from '@/server/conditions/queries'
import { createDocument } from '@/server/documents/actions'
import { getThumbnailBase64 } from '@/utils'
-import { FileUpload } from '../add-barometer/file-upload'
dayjs.extend(utc)
@@ -415,7 +414,7 @@ export function DocumentForm({ conditions, allBarometers }: Props) {
)}
/>
-
+
}
export const dynamic: DynamicOptions = 'force-static'
@@ -38,7 +38,8 @@ const getBarometersByManufacturer = withPrisma(async (prisma, slug: string) =>
}),
)
-export async function generateMetadata({ params: { slug } }: Props): Promise {
+export async function generateMetadata(props: Props): Promise {
+ const { slug } = await props.params
const manufacturer = await getBrand(slug)
return {
title: `${title} - Manufacturer: ${manufacturer.name}`,
@@ -51,7 +52,8 @@ export const generateStaticParams = withPrisma(async prisma =>
}),
)
-export default async function Manufacturer({ params: { slug } }: Props) {
+export default async function Manufacturer(props: Props) {
+ const { slug } = await props.params
const manufacturer = await getBrand(slug)
const barometers = await getBarometersByManufacturer(slug)
const fullName = `${manufacturer.firstName ?? ''} ${manufacturer.name}`
diff --git a/app/brands/brand-edit.tsx b/app/brands/brand-edit.tsx
index 09715bae..37063a7f 100644
--- a/app/brands/brand-edit.tsx
+++ b/app/brands/brand-edit.tsx
@@ -150,7 +150,7 @@ export function BrandEdit({ brand, countries, brands }: Props) {
images: brandImages,
successors: brand.successors.map(({ id }) => id),
countries: brand.countries.map(({ id }) => id),
- icon: brand.icon ? Buffer.from(brand.icon).toString('base64') : null,
+ icon: brand.icon,
})
}, [openBrandDialog, brand, brandImages, form.reset, cleanUpOnClose])
diff --git a/app/brands/page.tsx b/app/brands/page.tsx
index f9e78cd6..efbfde80 100644
--- a/app/brands/page.tsx
+++ b/app/brands/page.tsx
@@ -26,7 +26,7 @@ export const metadata: Metadata = {
}
const width = 32
-const BrandsOfCountry = ({
+const BrandByCountry = ({
country,
countries,
allBrands,
@@ -43,8 +43,6 @@ const BrandsOfCountry = ({
{country.manufacturers.map(brand => {
const { id, firstName, name, slug, icon } = brand
- const base64 = icon ? Buffer.from(icon).toString('base64') : null
- const image = base64 ? `data:image/png;base64,${base64}` : null
return (
@@ -52,14 +50,14 @@ const BrandsOfCountry = ({
- {image ? (
+ {icon ? (
) : (
@@ -100,7 +98,7 @@ export default async function Brands() {
{firstColumn.map(country => (
-
{secondColumn.map(country => (
-
}
-export async function generateMetadata({
- params: { category },
-}: CollectionProps): Promise {
+export async function generateMetadata(props: CollectionProps): Promise {
+ const { category } = await props.params
const [categoryName] = category
const { description } = await getCategory(categoryName)
const { barometers } = await getBarometersByParams(categoryName, 1, 5, 'date')
@@ -57,7 +56,11 @@ export async function generateMetadata({
}
}
-export default async function Collection({ params: { category } }: CollectionProps) {
+export default async function Collection(props: CollectionProps) {
+ const params = await props.params
+
+ const { category } = params
+
const [categoryName, sort, page] = category
const pageNo = Math.max(parseInt(page, 10) || 1, 1)
const { barometers, totalPages } = await getBarometersByParams(
diff --git a/app/collection/items/[slug]/components/edit-fields/edit-category.tsx b/app/collection/items/[slug]/components/edit-fields/category-edit.tsx
similarity index 95%
rename from app/collection/items/[slug]/components/edit-fields/edit-category.tsx
rename to app/collection/items/[slug]/components/edit-fields/category-edit.tsx
index 0ea24c1a..c8c7bd61 100644
--- a/app/collection/items/[slug]/components/edit-fields/edit-category.tsx
+++ b/app/collection/items/[slug]/components/edit-fields/category-edit.tsx
@@ -39,7 +39,7 @@ const Schema = z.object({
type Form = z.infer
-export function EditCategory({ barometer, categories }: Props) {
+export function CategoryEdit({ barometer, categories }: Props) {
const [open, setOpen] = useState(false)
const [isPending, startTransition] = useTransition()
@@ -74,8 +74,8 @@ export function EditCategory({ barometer, categories }: Props) {
// reset form on open
useEffect(() => {
if (!open) return
- form.reset()
- }, [open, form.reset])
+ form.reset({ categoryId: barometer.categoryId })
+ }, [open, form.reset, barometer.categoryId])
return (