Skip to content

Commit f78b9ec

Browse files
slaveeksnikmel2803
andauthored
Fixed copy button path in header.twig, code.twig (#290)
* Fixed copy button path in header.twig * Fixed path of copy button in code.twig, updated version * add more logs * Added overwrite property * update version Co-authored-by: Nikita Melnikov <nikmel2803@gmail.com>
1 parent d3e0cb1 commit f78b9ec

5 files changed

Lines changed: 20 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "codex.docs",
33
"license": "Apache-2.0",
4-
"version": "v2.2.0-rc.1",
4+
"version": "v2.2.0-rc.11",
55
"type": "module",
66
"bin": {
77
"codex.docs": "dist/backend/app.js"

src/backend/build-static.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ export default async function buildStatic(): Promise<void> {
4545
});
4646
}
4747

48-
console.log('Removing old static files');
49-
await fse.remove(distPath);
48+
if (config.overwrite) {
49+
console.log('Removing old static files');
50+
await fse.remove(distPath);
51+
}
5052

5153
console.log('Building static files');
5254
const pagesOrder = await PagesOrder.getAll();
@@ -118,11 +120,22 @@ export default async function buildStatic(): Promise<void> {
118120
console.log('Static files built');
119121

120122
console.log('Copy public directory');
121-
await fse.copy(path.resolve(dirname, '../../public'), distPath);
123+
const publicDir = path.resolve(dirname, '../../public');
124+
125+
console.log(`Copy from ${publicDir} to ${distPath}`);
126+
127+
try {
128+
await fse.copy(publicDir, distPath);
129+
console.log('Public directory copied');
130+
} catch (e) {
131+
console.log('Error while copying public directory');
132+
console.error(e);
133+
}
122134

123135
if (appConfig.uploads.driver === 'local') {
124136
console.log('Copy uploads directory');
125137
await fse.copy(path.resolve(cwd, appConfig.uploads.local.path), path.resolve(distPath, 'uploads'));
138+
console.log('Uploads directory copied');
126139
}
127140
}
128141

src/backend/utils/appConfig.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ const FrontendConfig = z.object({
9090
*/
9191
const StaticBuildConfig = z.object({
9292
outputDir: z.string(), // Output directory for static build
93+
overwrite: z.boolean().optional().default(true),
9394
indexPage: z.object({
9495
enabled: z.boolean(), // Is index page enabled
9596
uri: z.string(), // Index page uri

src/backend/views/pages/blocks/code.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="block-code__content">{{ code | escape }}</div>
44
</div>
55
{%
6-
include 'components/copy-button.twig' with {
6+
include '../../components/copy-button.twig' with {
77
ariaLabel: 'Copy Code to Clipboard',
88
class: 'block-code__copy-button',
99
textToCopy: code | escape,

src/backend/views/pages/blocks/header.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h{{ level }} id="{{ text | urlify }}" class="block-header block-header--{{ level }}">
22
{%
3-
include 'components/copy-button.twig' with {
3+
include '../../components/copy-button.twig' with {
44
ariaLabel: 'Copy Link to the ' ~ text,
55
class: 'block-header__copy-button',
66
textToCopy: '#' ~ text | urlify,

0 commit comments

Comments
 (0)