diff --git a/packages/polymech/app-config.json b/packages/polymech/app-config.json index 28069ab..b029834 100644 --- a/packages/polymech/app-config.json +++ b/packages/polymech/app-config.json @@ -138,7 +138,7 @@ "osr_root": "${OSR_ROOT}" }, "dev": { - "file_server": "localhost:5000" + "file_server": "localhost:4000" }, "i18n": { "store": "${OSR_ROOT}/i18n-store/store-${LANG}.json", diff --git a/packages/polymech/src/base/media.ts b/packages/polymech/src/base/media.ts index 1d0051e..9637114 100644 --- a/packages/polymech/src/base/media.ts +++ b/packages/polymech/src/base/media.ts @@ -278,6 +278,7 @@ export const gallery = async ( const meta_path_md = `${mediaPath}/${parts.name}.md` const meta_markdown = exists(meta_path_md) ? read(meta_path_md, "string") as string : "" as string + console.log('filePath', filePath) let imageMeta: any = await loadImage(filePath) let exifRaw: any = null try { @@ -320,6 +321,7 @@ export const gallery = async ( )) } + const fileBuffer = readFileSync(filePath); const hash = createHash('md5').update(fileBuffer).digest('hex').substring(0, 8); const ret: GalleryImage = diff --git a/packages/polymech/src/components/GalleryK.astro b/packages/polymech/src/components/GalleryK.astro index 1651aed..574d97c 100644 --- a/packages/polymech/src/components/GalleryK.astro +++ b/packages/polymech/src/components/GalleryK.astro @@ -37,16 +37,16 @@ export interface Props { const { images, gallerySettings = {}, lightboxSettings = {}, s } = Astro.props; const mergedGallerySettings = { - SIZES_REGULAR: gallerySettings.SIZES_REGULAR || IMAGE_SETTINGS.GALLERY.SIZES_REGULAR, - SIZES_THUMB: gallerySettings.SIZES_THUMB || IMAGE_SETTINGS.GALLERY.SIZES_THUMB, - SHOW_TITLE: gallerySettings.SHOW_TITLE ?? IMAGE_SETTINGS.GALLERY.SHOW_TITLE, - SHOW_DESCRIPTION: gallerySettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.GALLERY.SHOW_DESCRIPTION, + SIZES_REGULAR: gallerySettings.SIZES_REGULAR || IMAGE_SETTINGS.gallery.sizes_regular, + SIZES_THUMB: gallerySettings.SIZES_THUMB || IMAGE_SETTINGS.gallery.sizes_thumb, + SHOW_TITLE: gallerySettings.SHOW_TITLE ?? IMAGE_SETTINGS.gallery.show_title, + SHOW_DESCRIPTION: gallerySettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.gallery.show_description, }; const mergedLightboxSettings = { - SIZES_LARGE: lightboxSettings.SIZES_LARGE || IMAGE_SETTINGS.LIGHTBOX.SIZES_LARGE, - SHOW_TITLE: lightboxSettings.SHOW_TITLE ?? IMAGE_SETTINGS.LIGHTBOX.SHOW_TITLE, - SHOW_DESCRIPTION: lightboxSettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.LIGHTBOX.SHOW_DESCRIPTION, + SIZES_LARGE: lightboxSettings.SIZES_LARGE || IMAGE_SETTINGS.lightbox.sizes_large, + SHOW_TITLE: lightboxSettings.SHOW_TITLE ?? IMAGE_SETTINGS.lightbox.show_title, + SHOW_DESCRIPTION: lightboxSettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.lightbox.show_description, }; const locale = Astro.currentLocale || "en"; @@ -275,7 +275,7 @@ const locale = Astro.currentLocale || "en"; placeholder="blurred" format="avif" objectFit="contain" - sizes={IMAGE_SETTINGS.LIGHTBOX.SIZES_LARGE} + sizes={IMAGE_SETTINGS.lightbox.sizes_large} s={s || image.hash} attributes={{ img: { class: "max-w-[90vw] max-h-[90vh] object-contain rounded-lg lightbox-main select-none" } diff --git a/packages/polymech/src/model/component.ts b/packages/polymech/src/model/component.ts index 457bd83..b8c7e29 100644 --- a/packages/polymech/src/model/component.ts +++ b/packages/polymech/src/model/component.ts @@ -153,7 +153,7 @@ const onItem = async (item: IStoreItem, ctx: ILoaderContextEx) => { // // Item Shared Resources // - debugger + let resourcesDefaultPath = await findUp('resources.md', { stopAt: PRODUCT_ROOT(), cwd: itemDir @@ -219,7 +219,6 @@ export function loader(branch: string): Loader { store.clear(); let products = items(branch) - debugger for (const item of products) { const product: any = item.config const id = product.slug;