5171a789e9
✅ COMPLETED: 1. Dockerfile uses port 80 (astro preview) 2. BaseLayout imports globals.css 3. globals.css with Tailwind v4 @theme syntax 4. index.astro has Header, Footer, FixedContact 5. All image references fixed to existing files 6. Hero uses hdpe_pipe_main.jpg 7. Product cards use hdpe001.jpg 8. pt-20 on main for fixed header ✅ TESTED LOCALLY: - Build: 15 pages in 1.27s - Docker build successful - Port 80 working - Images load - CSS works Ready for Easypanel deployment.
28 lines
607 B
JavaScript
28 lines
607 B
JavaScript
/**
|
|
* @import {Info, Space} from 'property-information'
|
|
*/
|
|
|
|
import {Schema} from './schema.js'
|
|
|
|
/**
|
|
* @param {ReadonlyArray<Schema>} definitions
|
|
* Definitions.
|
|
* @param {Space | undefined} [space]
|
|
* Space.
|
|
* @returns {Schema}
|
|
* Schema.
|
|
*/
|
|
export function merge(definitions, space) {
|
|
/** @type {Record<string, Info>} */
|
|
const property = {}
|
|
/** @type {Record<string, string>} */
|
|
const normal = {}
|
|
|
|
for (const definition of definitions) {
|
|
Object.assign(property, definition.property)
|
|
Object.assign(normal, definition.normal)
|
|
}
|
|
|
|
return new Schema(property, normal, space)
|
|
}
|