@daz4126/swifty 2.4.0 → 2.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/init.js +1 -1
- package/src/pages.js +0 -16
package/package.json
CHANGED
package/src/init.js
CHANGED
|
@@ -42,7 +42,7 @@ dateFormat:
|
|
|
42
42
|
<link rel="apple-touch-icon" href="path/to/apple-touch-icon.png">
|
|
43
43
|
<link rel="icon" sizes="192x192" href="android-chrome-192x19.png">
|
|
44
44
|
<link rel="icon" sizes="512x512" href="android-chrome-512x512.png">
|
|
45
|
-
<title>{{sitename}}</title>
|
|
45
|
+
<title>{{ sitename }} || {{ title }}</title>
|
|
46
46
|
</head>
|
|
47
47
|
<body>
|
|
48
48
|
<header>
|
package/src/pages.js
CHANGED
|
@@ -48,10 +48,6 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
|
|
|
48
48
|
: capitalize(file.name.replace(/\.md$/, "").replace(/-/g, " "));
|
|
49
49
|
const stats = await fs.stat(filePath);
|
|
50
50
|
const isDirectory = file.isDirectory();
|
|
51
|
-
<<<<<<< HEAD
|
|
52
|
-
const layoutFileExists = parent && await fsExtra.pathExists(`${dirs.layouts}/${parent.filename}.html`);
|
|
53
|
-
const layout = layoutFileExists ? parent.filename : parent ? parent.layout : config.default_layout_name || "site";
|
|
54
|
-
=======
|
|
55
51
|
const layoutFileExists =
|
|
56
52
|
parent &&
|
|
57
53
|
(await fsExtra.pathExists(`${dirs.layouts}/${parent.filename}.html`));
|
|
@@ -60,7 +56,6 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
|
|
|
60
56
|
: parent
|
|
61
57
|
? parent.layout
|
|
62
58
|
: config.default_layout_name;
|
|
63
|
-
>>>>>>> 61ad6f94b646a80d5857c84b58250ea7f00f2758
|
|
64
59
|
|
|
65
60
|
const page = {
|
|
66
61
|
name,
|
|
@@ -231,16 +226,6 @@ const addLinks = async (pages, parent) => {
|
|
|
231
226
|
for (const page of pages) {
|
|
232
227
|
page.data ||= {};
|
|
233
228
|
page.data.links_to_tags = page?.data?.tags?.length
|
|
234
|
-
<<<<<<< HEAD
|
|
235
|
-
? page.data.tags.map(tag => `<a class="${defaultConfig.tag_class}" href="/tags/${tag}">${tag}</a>`).join`` : "";
|
|
236
|
-
const crumb = page.root ? "" : ` ${defaultConfig.breadcrumb_separator || "»"} <a class="${defaultConfig.breadcrumb_class}" href="${page.url}">${page.name}</a>`;
|
|
237
|
-
page.data.breadcrumbs = parent ? parent.data.breadcrumbs + crumb
|
|
238
|
-
: `<a class="${defaultConfig.breadcrumb_class}" href="/">Home</a>` + crumb;
|
|
239
|
-
page.data.links_to_children = page.pages ? await generateLinkList(page.filename, page.pages) : "";
|
|
240
|
-
page.data.links_to_siblings = await generateLinkList(page.parent?.filename || "pages", pages.filter(p => p.url !== page.url));
|
|
241
|
-
page.data.links_to_self_and_siblings = await generateLinkList(page.parent?.filename || "pages", pages);
|
|
242
|
-
page.data.nav_links = await generateLinkList("nav", pageIndex.filter(p => p.nav));
|
|
243
|
-
=======
|
|
244
229
|
? page.data.tags.map(
|
|
245
230
|
(tag) =>
|
|
246
231
|
`<a class="${defaultConfig.tag_class}" href="/tags/${tag}">${tag}</a>`,
|
|
@@ -268,7 +253,6 @@ const addLinks = async (pages, parent) => {
|
|
|
268
253
|
"nav",
|
|
269
254
|
pageIndex.filter((p) => p.nav),
|
|
270
255
|
);
|
|
271
|
-
>>>>>>> 61ad6f94b646a80d5857c84b58250ea7f00f2758
|
|
272
256
|
if (page.pages) {
|
|
273
257
|
await addLinks(page.pages, page); // Recursive call
|
|
274
258
|
}
|