config 2/3

This commit is contained in:
babayaga 2025-12-28 20:20:34 +01:00
parent e752af5fc8
commit 313a81f270
4 changed files with 12 additions and 11 deletions

View File

@ -138,7 +138,7 @@
"osr_root": "${OSR_ROOT}" "osr_root": "${OSR_ROOT}"
}, },
"dev": { "dev": {
"file_server": "localhost:5000" "file_server": "localhost:4000"
}, },
"i18n": { "i18n": {
"store": "${OSR_ROOT}/i18n-store/store-${LANG}.json", "store": "${OSR_ROOT}/i18n-store/store-${LANG}.json",

View File

@ -278,6 +278,7 @@ export const gallery = async (
const meta_path_md = `${mediaPath}/${parts.name}.md` const meta_path_md = `${mediaPath}/${parts.name}.md`
const meta_markdown = exists(meta_path_md) ? read(meta_path_md, "string") as string : "" as string 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 imageMeta: any = await loadImage(filePath)
let exifRaw: any = null let exifRaw: any = null
try { try {
@ -320,6 +321,7 @@ export const gallery = async (
)) ))
} }
const fileBuffer = readFileSync(filePath); const fileBuffer = readFileSync(filePath);
const hash = createHash('md5').update(fileBuffer).digest('hex').substring(0, 8); const hash = createHash('md5').update(fileBuffer).digest('hex').substring(0, 8);
const ret: GalleryImage = const ret: GalleryImage =

View File

@ -37,16 +37,16 @@ export interface Props {
const { images, gallerySettings = {}, lightboxSettings = {}, s } = Astro.props; const { images, gallerySettings = {}, lightboxSettings = {}, s } = Astro.props;
const mergedGallerySettings = { const mergedGallerySettings = {
SIZES_REGULAR: gallerySettings.SIZES_REGULAR || IMAGE_SETTINGS.GALLERY.SIZES_REGULAR, SIZES_REGULAR: gallerySettings.SIZES_REGULAR || IMAGE_SETTINGS.gallery.sizes_regular,
SIZES_THUMB: gallerySettings.SIZES_THUMB || IMAGE_SETTINGS.GALLERY.SIZES_THUMB, SIZES_THUMB: gallerySettings.SIZES_THUMB || IMAGE_SETTINGS.gallery.sizes_thumb,
SHOW_TITLE: gallerySettings.SHOW_TITLE ?? IMAGE_SETTINGS.GALLERY.SHOW_TITLE, SHOW_TITLE: gallerySettings.SHOW_TITLE ?? IMAGE_SETTINGS.gallery.show_title,
SHOW_DESCRIPTION: gallerySettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.GALLERY.SHOW_DESCRIPTION, SHOW_DESCRIPTION: gallerySettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.gallery.show_description,
}; };
const mergedLightboxSettings = { const mergedLightboxSettings = {
SIZES_LARGE: lightboxSettings.SIZES_LARGE || IMAGE_SETTINGS.LIGHTBOX.SIZES_LARGE, SIZES_LARGE: lightboxSettings.SIZES_LARGE || IMAGE_SETTINGS.lightbox.sizes_large,
SHOW_TITLE: lightboxSettings.SHOW_TITLE ?? IMAGE_SETTINGS.LIGHTBOX.SHOW_TITLE, SHOW_TITLE: lightboxSettings.SHOW_TITLE ?? IMAGE_SETTINGS.lightbox.show_title,
SHOW_DESCRIPTION: lightboxSettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.LIGHTBOX.SHOW_DESCRIPTION, SHOW_DESCRIPTION: lightboxSettings.SHOW_DESCRIPTION ?? IMAGE_SETTINGS.lightbox.show_description,
}; };
const locale = Astro.currentLocale || "en"; const locale = Astro.currentLocale || "en";
@ -275,7 +275,7 @@ const locale = Astro.currentLocale || "en";
placeholder="blurred" placeholder="blurred"
format="avif" format="avif"
objectFit="contain" objectFit="contain"
sizes={IMAGE_SETTINGS.LIGHTBOX.SIZES_LARGE} sizes={IMAGE_SETTINGS.lightbox.sizes_large}
s={s || image.hash} s={s || image.hash}
attributes={{ attributes={{
img: { class: "max-w-[90vw] max-h-[90vh] object-contain rounded-lg lightbox-main select-none" } img: { class: "max-w-[90vw] max-h-[90vh] object-contain rounded-lg lightbox-main select-none" }

View File

@ -153,7 +153,7 @@ const onItem = async (item: IStoreItem, ctx: ILoaderContextEx) => {
// //
// Item Shared Resources // Item Shared Resources
// //
debugger
let resourcesDefaultPath = await findUp('resources.md', { let resourcesDefaultPath = await findUp('resources.md', {
stopAt: PRODUCT_ROOT(), stopAt: PRODUCT_ROOT(),
cwd: itemDir cwd: itemDir
@ -219,7 +219,6 @@ export function loader(branch: string): Loader {
store.clear(); store.clear();
let products = items(branch) let products = items(branch)
debugger
for (const item of products) { for (const item of products) {
const product: any = item.config const product: any = item.config
const id = product.slug; const id = product.slug;