Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| df41aac2b1 |
@@ -6,7 +6,6 @@ import { pageSchema, type Page } from '@/lib/schema/page'
|
|||||||
import { exportPage } from '@/lib/exporter/html'
|
import { exportPage } from '@/lib/exporter/html'
|
||||||
import { AssetManager } from '@/lib/assets/assetManager'
|
import { AssetManager } from '@/lib/assets/assetManager'
|
||||||
import { buildZip } from '@/lib/exporter/zip'
|
import { buildZip } from '@/lib/exporter/zip'
|
||||||
import { buildExtrasForPage } from '@/lib/exporter/extras'
|
|
||||||
import type { Section } from '@/lib/state/store'
|
import type { Section } from '@/lib/state/store'
|
||||||
import { createFormStore, type FormState } from '@/lib/state/formStore'
|
import { createFormStore, type FormState } from '@/lib/state/formStore'
|
||||||
import FormBuilderPanel from '@/components/FormBuilderPanel'
|
import FormBuilderPanel from '@/components/FormBuilderPanel'
|
||||||
@@ -48,9 +47,6 @@ export default function BuilderClientPage() {
|
|||||||
const [ogImage, setOgImage] = useState<string>('')
|
const [ogImage, setOgImage] = useState<string>('')
|
||||||
const [ga4MeasurementId, setGa4MeasurementId] = useState<string>('')
|
const [ga4MeasurementId, setGa4MeasurementId] = useState<string>('')
|
||||||
const [metaPixelId, setMetaPixelId] = useState<string>('')
|
const [metaPixelId, setMetaPixelId] = useState<string>('')
|
||||||
// Export Options (minimal set for tests)
|
|
||||||
const [manifestName, setManifestName] = useState<string>('')
|
|
||||||
const [robotsDisallow, setRobotsDisallow] = useState<string>('')
|
|
||||||
const [viewport, setViewport] = useState<'desktop' | 'mobile'>(() => {
|
const [viewport, setViewport] = useState<'desktop' | 'mobile'>(() => {
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
try {
|
try {
|
||||||
@@ -186,23 +182,10 @@ export default function BuilderClientPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch {}
|
||||||
}, [pageData, am, manifestName, robotsDisallow])
|
}, [pageData, am])
|
||||||
|
|
||||||
const doExport = useCallback(async () => {
|
const doExport = useCallback(async () => {
|
||||||
let valid: Page
|
const valid = pageSchema.parse(pageData)
|
||||||
try {
|
|
||||||
valid = pageSchema.parse(pageData)
|
|
||||||
} catch {
|
|
||||||
const fixed: Page = {
|
|
||||||
...pageData,
|
|
||||||
form: {
|
|
||||||
actionUrl: pageData.form?.actionUrl ?? '',
|
|
||||||
fields: pageData.form?.fields ?? [],
|
|
||||||
spamProtection: pageData.form?.spamProtection ?? { honeypotFieldName: '_hp', minSubmitSeconds: 2 },
|
|
||||||
},
|
|
||||||
} as Page
|
|
||||||
valid = pageSchema.parse(fixed)
|
|
||||||
}
|
|
||||||
const exported = exportPage(valid, { assetManager: am ?? undefined })
|
const exported = exportPage(valid, { assetManager: am ?? undefined })
|
||||||
try {
|
try {
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
@@ -213,19 +196,9 @@ export default function BuilderClientPage() {
|
|||||||
}
|
}
|
||||||
} catch {}
|
} catch {}
|
||||||
const assets = am ? am.toZipStructure() : {}
|
const assets = am ? am.toZipStructure() : {}
|
||||||
// Build minimal overrides for extras
|
const zipBytes = await buildZip({ html: exported.html, css: exported.css, js: exported.js, assets })
|
||||||
const manifestOverride: { name?: string } = {}
|
|
||||||
if (manifestName && manifestName.trim().length > 0) manifestOverride.name = manifestName.trim()
|
|
||||||
const robotsTextOverride = (() => {
|
|
||||||
const lines = (robotsDisallow || '').split(/\n+/).map((s) => s.trim()).filter((s) => s.length > 0)
|
|
||||||
if (lines.length === 0) return undefined
|
|
||||||
const disallowLines = lines.map((l) => (l.startsWith('Disallow:') ? l : `Disallow: ${l}`))
|
|
||||||
return `User-agent: *\n${disallowLines.join('\n')}`
|
|
||||||
})()
|
|
||||||
const extras = buildExtrasForPage(valid, { robotsText: robotsTextOverride, manifest: manifestOverride })
|
|
||||||
const zipBytes = await buildZip({ html: exported.html, css: exported.css, js: exported.js, assets, extras })
|
|
||||||
download('landing.zip', zipBytes)
|
download('landing.zip', zipBytes)
|
||||||
}, [pageData, am, manifestName, robotsDisallow])
|
}, [pageData, am])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="p-6 space-y-6">
|
<div className="p-6 space-y-6">
|
||||||
@@ -293,31 +266,6 @@ export default function BuilderClientPage() {
|
|||||||
right={
|
right={
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<button className="bg-emerald-600 text-white rounded px-4 py-2 w-full" onClick={doExport}>{t('builder.action.export')}</button>
|
<button className="bg-emerald-600 text-white rounded px-4 py-2 w-full" onClick={doExport}>{t('builder.action.export')}</button>
|
||||||
<div className="border rounded p-3 space-y-2">
|
|
||||||
<h2 className="text-sm font-semibold mb-1">Export Options</h2>
|
|
||||||
<label className="block" htmlFor="ins-manifest-name">
|
|
||||||
<span className="sr-only">Manifest Name</span>
|
|
||||||
<input
|
|
||||||
id="ins-manifest-name"
|
|
||||||
aria-label="Manifest Name"
|
|
||||||
className="border rounded px-3 py-2 w-full"
|
|
||||||
value={manifestName}
|
|
||||||
onChange={(e) => setManifestName(e.target.value)}
|
|
||||||
placeholder="My App"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label className="block" htmlFor="ins-robots-disallow">
|
|
||||||
<span className="sr-only">Robots Disallow</span>
|
|
||||||
<textarea
|
|
||||||
id="ins-robots-disallow"
|
|
||||||
aria-label="Robots Disallow"
|
|
||||||
className="border rounded px-3 py-2 w-full"
|
|
||||||
value={robotsDisallow}
|
|
||||||
onChange={(e) => setRobotsDisallow(e.target.value)}
|
|
||||||
placeholder="/admin\n/secret"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div className="border rounded p-3 space-y-2">
|
<div className="border rounded p-3 space-y-2">
|
||||||
<h2 className="text-sm font-semibold mb-1">SEO / Analytics</h2>
|
<h2 className="text-sm font-semibold mb-1">SEO / Analytics</h2>
|
||||||
<label className="block" htmlFor="ins-seo-title">
|
<label className="block" htmlFor="ins-seo-title">
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
import { describe, it, expect, vi } from 'vitest'
|
|
||||||
import { render, screen, fireEvent } from '@testing-library/react'
|
|
||||||
import BuilderClientPage from '@/components/BuilderClientPage'
|
|
||||||
|
|
||||||
vi.mock('next-intl', () => ({
|
|
||||||
useTranslations: () => (key: string) => key,
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Spy buildZip to observe extras passed in
|
|
||||||
vi.mock('@/lib/exporter/zip', async (orig) => {
|
|
||||||
const mod = await (orig as any)()
|
|
||||||
return {
|
|
||||||
...mod,
|
|
||||||
buildZip: vi.fn(async (input: any) => new Uint8Array([1,2,3]) ),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
import { buildZip } from '@/lib/exporter/zip'
|
|
||||||
|
|
||||||
describe('Export Options UI - 기본', () => {
|
|
||||||
it('manifest name과 robots Disallow 입력을 통해 extras에 반영한다', async () => {
|
|
||||||
render(<BuilderClientPage />)
|
|
||||||
|
|
||||||
// open export area is already visible; fill inputs once implemented
|
|
||||||
const nameInput = await screen.findByLabelText('Manifest Name', { exact: false })
|
|
||||||
fireEvent.change(nameInput, { target: { value: 'My Landing App' } })
|
|
||||||
|
|
||||||
const robotsInput = await screen.findByLabelText('Robots Disallow', { exact: false })
|
|
||||||
fireEvent.change(robotsInput, { target: { value: '/secret\n/admin' } })
|
|
||||||
|
|
||||||
const btn = await screen.findByRole('button', { name: /builder.action.export/i })
|
|
||||||
await fireEvent.click(btn)
|
|
||||||
|
|
||||||
expect(buildZip).toHaveBeenCalled()
|
|
||||||
const arg = (buildZip as any).mock.calls[0][0]
|
|
||||||
expect(arg.extras).toBeTruthy()
|
|
||||||
const extras = arg.extras as Record<string, Uint8Array>
|
|
||||||
const robots = Buffer.from(extras['robots.txt']).toString('utf8')
|
|
||||||
expect(robots).toContain('Disallow: /secret')
|
|
||||||
expect(robots).toContain('Disallow: /admin')
|
|
||||||
|
|
||||||
const manifestStr = Buffer.from(extras['site.webmanifest']).toString('utf8')
|
|
||||||
const manifest = JSON.parse(manifestStr)
|
|
||||||
expect(manifest.name).toBe('My Landing App')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
import { describe, it, expect } from 'vitest'
|
|
||||||
import { pageSchema, type Page } from '@/lib/schema/page'
|
|
||||||
import { buildExtrasForPage } from '@/lib/exporter/extras'
|
|
||||||
|
|
||||||
function makePage(): Page {
|
|
||||||
return pageSchema.parse({
|
|
||||||
title: 'Overrides',
|
|
||||||
locale: 'en',
|
|
||||||
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
|
|
||||||
sections: [ { type: 'hero', props: { heading: 'Hello', subheading: 'World', imageUrl: 'https://img/h.png' } } ],
|
|
||||||
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
|
|
||||||
seo: { title: 't', description: 'd' },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('extras 오버라이드', () => {
|
|
||||||
it('robots.txt Disallow 오버라이드가 반영된다', () => {
|
|
||||||
const page = makePage()
|
|
||||||
const extras = buildExtrasForPage(page, { robotsText: 'User-agent: *\nDisallow: /admin\nDisallow: /private' })
|
|
||||||
const robots = Buffer.from(extras['robots.txt']).toString('utf8')
|
|
||||||
expect(robots).toContain('User-agent: *')
|
|
||||||
expect(robots).toContain('Disallow: /admin')
|
|
||||||
expect(robots).toContain('Disallow: /private')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('manifest 필드 오버라이드(name/short_name/start_url/display/theme_color)가 반영된다', () => {
|
|
||||||
const page = makePage()
|
|
||||||
const extras = buildExtrasForPage(page, {
|
|
||||||
manifest: {
|
|
||||||
name: 'My App',
|
|
||||||
short_name: 'MyApp',
|
|
||||||
start_url: '/start',
|
|
||||||
display: 'minimal-ui',
|
|
||||||
theme_color: '#123abc',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
const manifestStr = Buffer.from(extras['site.webmanifest']).toString('utf8')
|
|
||||||
const manifest = JSON.parse(manifestStr)
|
|
||||||
expect(manifest.name).toBe('My App')
|
|
||||||
expect(manifest.short_name).toBe('MyApp')
|
|
||||||
expect(manifest.start_url).toBe('/start')
|
|
||||||
expect(manifest.display).toBe('minimal-ui')
|
|
||||||
expect(manifest.theme_color).toBe('#123abc')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
import type { Page } from '@/lib/schema/page'
|
|
||||||
|
|
||||||
export type ExtrasOverrides = {
|
|
||||||
robotsText?: string
|
|
||||||
manifest?: Partial<{
|
|
||||||
name: string
|
|
||||||
short_name: string
|
|
||||||
start_url: string
|
|
||||||
display: string
|
|
||||||
theme_color: string
|
|
||||||
}>
|
|
||||||
}
|
|
||||||
|
|
||||||
function toBytes(s: string): Uint8Array {
|
|
||||||
return new TextEncoder().encode(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildRobots(base?: string): string {
|
|
||||||
if (base && base.trim().length > 0) return base
|
|
||||||
return 'User-agent: *\n'
|
|
||||||
}
|
|
||||||
|
|
||||||
function deriveManifest(page: Page) {
|
|
||||||
const name = page.title || 'Landing'
|
|
||||||
const short_name = name.length > 12 ? name.slice(0, 12) : name
|
|
||||||
const start_url = '/'
|
|
||||||
const display = 'standalone'
|
|
||||||
const theme_color = page.theme?.primaryColor || '#0ea5e9'
|
|
||||||
return { name, short_name, start_url, display, theme_color }
|
|
||||||
}
|
|
||||||
|
|
||||||
export function buildExtrasForPage(page: Page, overrides?: ExtrasOverrides): Record<string, Uint8Array> {
|
|
||||||
const out: Record<string, Uint8Array> = {}
|
|
||||||
|
|
||||||
// robots.txt
|
|
||||||
const robotsText = buildRobots(overrides?.robotsText)
|
|
||||||
out['robots.txt'] = toBytes(robotsText)
|
|
||||||
|
|
||||||
// site.webmanifest
|
|
||||||
const manifestBase = deriveManifest(page)
|
|
||||||
const manifestMerged = { ...manifestBase, ...(overrides?.manifest || {}) }
|
|
||||||
const manifestJson = JSON.stringify(manifestMerged, null, 2)
|
|
||||||
out['site.webmanifest'] = toBytes(manifestJson)
|
|
||||||
|
|
||||||
// Google Sheets 템플릿: actionUrl 미지정 시 포함
|
|
||||||
const action = page.form?.actionUrl?.trim()
|
|
||||||
const hasAction = !!(action && action.length > 0)
|
|
||||||
if (!hasAction) {
|
|
||||||
const code = `/**
|
|
||||||
* Google Apps Script Web App for form submissions
|
|
||||||
* - Deploy as Web App and set URL as form action if needed.
|
|
||||||
*/
|
|
||||||
function doPost(e){
|
|
||||||
// TODO: handle submission to Google Sheets
|
|
||||||
return ContentService.createTextOutput('OK')
|
|
||||||
}
|
|
||||||
`
|
|
||||||
const readme = `Google Sheets Apps Script Template\n\n1) Apps Script에서 새 프로젝트를 만들고 아래 Code.gs를 붙여넣으세요.\n2) 배포 > 웹 앱으로 배포 후 URL을 복사해 사용하세요.`
|
|
||||||
out['sheets/Code.gs'] = toBytes(code)
|
|
||||||
out['sheets/README.txt'] = toBytes(readme)
|
|
||||||
}
|
|
||||||
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
@@ -13,17 +13,17 @@ function makePage(): Page {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('폰트 최적화', () => {
|
describe('Exporter - 폰트 최적화', () => {
|
||||||
it('head에 Google Fonts preconnect 링크가 포함된다', () => {
|
it('head에 폰트 preconnect 링크가 포함된다(googleapis/gstatic)', () => {
|
||||||
const page = makePage()
|
const out = exportPage(makePage())
|
||||||
const out = exportPage(page)
|
const html = out.html
|
||||||
expect(out.html).toContain('<link rel="preconnect" href="https://fonts.googleapis.com"')
|
expect(html).toMatch(/<link rel="preconnect" href="https:\/\/fonts\.googleapis\.com">/)
|
||||||
expect(out.html).toContain('<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin')
|
expect(html).toMatch(/<link rel="preconnect" href="https:\/\/fonts\.gstatic\.com" crossorigin>/)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('CSS에 system-ui 폴백이 포함된다', () => {
|
it('CSS에 system-ui 폴백이 포함된다', () => {
|
||||||
const page = makePage()
|
const out = exportPage(makePage())
|
||||||
const out = exportPage(page)
|
const css = out.css
|
||||||
expect(out.css).toMatch(/font-family:[^;]*system-ui/i)
|
expect(css).toMatch(/font-family:[^;]*system-ui/i)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -254,7 +254,6 @@ function buildHead(page: Page) {
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<link rel="canonical" href="/" />
|
<link rel="canonical" href="/" />
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
|
||||||
<title>${escapeHtml(page.seo.title)}</title>
|
<title>${escapeHtml(page.seo.title)}</title>
|
||||||
<meta name="description" content="${escapeHtml(page.seo.description)}" />
|
<meta name="description" content="${escapeHtml(page.seo.description)}" />
|
||||||
<meta property="og:title" content="${escapeHtml(page.seo.title)}" />
|
<meta property="og:title" content="${escapeHtml(page.seo.title)}" />
|
||||||
@@ -337,6 +336,7 @@ export function exportPage(page: Page, opts?: ExportOptions): Exported {
|
|||||||
<html lang="${escapeHtml(page.locale)}">
|
<html lang="${escapeHtml(page.locale)}">
|
||||||
<head>
|
<head>
|
||||||
${buildHead(page)}
|
${buildHead(page)}
|
||||||
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
import { describe, it, expect } from 'vitest'
|
|
||||||
import { pageSchema, type Page } from '@/lib/schema/page'
|
|
||||||
import { buildExtrasForPage } from '@/lib/exporter/extras'
|
|
||||||
|
|
||||||
function makePage(): Page {
|
|
||||||
return pageSchema.parse({
|
|
||||||
title: 'Auto Extras',
|
|
||||||
locale: 'en',
|
|
||||||
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
|
|
||||||
sections: [ { type: 'hero', props: { heading: 'Hello', subheading: 'World', imageUrl: 'https://img/h.png' } } ],
|
|
||||||
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
|
|
||||||
seo: { title: 't', description: 'd' },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('extras 자동 생성', () => {
|
|
||||||
it('robots.txt와 site.webmanifest가 extras에 포함된다', () => {
|
|
||||||
const page = makePage()
|
|
||||||
const extras = buildExtrasForPage(page)
|
|
||||||
const keys = Object.keys(extras)
|
|
||||||
expect(keys).toContain('robots.txt')
|
|
||||||
expect(keys).toContain('site.webmanifest')
|
|
||||||
|
|
||||||
const robots = Buffer.from(extras['robots.txt']).toString('utf8')
|
|
||||||
expect(robots).toContain('User-agent: *')
|
|
||||||
|
|
||||||
const manifestStr = Buffer.from(extras['site.webmanifest']).toString('utf8')
|
|
||||||
const manifest = JSON.parse(manifestStr)
|
|
||||||
expect(manifest.start_url).toBeDefined()
|
|
||||||
expect(manifest.display).toBeDefined()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
import { describe, it, expect } from 'vitest'
|
|
||||||
import { buildZip } from '@/lib/exporter/zip'
|
|
||||||
import { exportPage } from '@/lib/exporter/html'
|
|
||||||
import { pageSchema, type Page } from '@/lib/schema/page'
|
|
||||||
import { buildExtrasForPage } from '@/lib/exporter/extras'
|
|
||||||
|
|
||||||
function makePage(): Page {
|
|
||||||
return pageSchema.parse({
|
|
||||||
title: 'ZIP Phase5',
|
|
||||||
locale: 'en',
|
|
||||||
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
|
|
||||||
sections: [ { type: 'hero', props: { heading: 'Hello', subheading: 'World', imageUrl: 'https://img/h.png' } } ],
|
|
||||||
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
|
|
||||||
seo: { title: 't', description: 'd' },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('ZIP 검증 Phase5', () => {
|
|
||||||
it('robots.txt 베이스라인과 site.webmanifest JSON 파싱 검증', async () => {
|
|
||||||
const page = makePage()
|
|
||||||
const extras = buildExtrasForPage(page)
|
|
||||||
|
|
||||||
// baseline robots
|
|
||||||
const robots = Buffer.from(extras['robots.txt']).toString('utf8')
|
|
||||||
expect(robots).toContain('User-agent: *')
|
|
||||||
|
|
||||||
// manifest JSON parseable
|
|
||||||
const manifestStr = Buffer.from(extras['site.webmanifest']).toString('utf8')
|
|
||||||
const manifest = JSON.parse(manifestStr)
|
|
||||||
expect(manifest && typeof manifest === 'object').toBe(true)
|
|
||||||
expect(manifest.start_url).toBeDefined()
|
|
||||||
expect(manifest.display).toBeDefined()
|
|
||||||
|
|
||||||
// ZIP build should succeed
|
|
||||||
const out = exportPage(page)
|
|
||||||
const zipBytes = await buildZip({ html: out.html, css: out.css, js: out.js, assets: {}, extras })
|
|
||||||
expect(zipBytes.byteLength).toBeGreaterThan(0)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
Reference in New Issue
Block a user