From 0aaf88b8521e2bc667cae525356eea3550ad9c96 Mon Sep 17 00:00:00 2001
From: kanpov <71177577+kanpov@users.noreply.github.com>
Date: Wed, 23 Aug 2023 19:09:04 +0000
Subject: [PATCH] Fix #403 by moving documentation to separate directory to avoid merge conflicts (#405)
---
docs/features/darkmode.md | 0
docs/configuration.md | 0
docs/features/RSS Feed.md | 0
docs/advanced/creating components.md | 0
docs/build.md | 0
docs/advanced/paths.md | 0
docs/features/callouts.md | 0
docs/images/quartz transform pipeline.png | 0
docs/advanced/architecture.md | 0
docs/features/SPA Routing.md | 0
docs/images/quartz layout.png | 0
docs/migrating from Quartz 3.md | 0
quartz/bootstrap-cli.mjs | 4 +---
docs/features/popover previews.md | 0
docs/features/folder and tag listings.md | 0
docs/features/table of contents.md | 0
docs/features/graph view.md | 0
docs/tags/component.md | 0
docs/hosting.md | 0
docs/features/backlinks.md | 0
docs/features/Mermaid diagrams.md | 0
docs/features/wikilinks.md | 0
docs/features/full-text search.md | 0
docs/index.md | 0
docs/images/dns records.png | 0
docs/authoring content.md | 0
docs/philosophy.md | 0
docs/upgrading.md | 0
docs/features/Obsidian compatibility.md | 0
docs/features/private pages.md | 0
docs/layout.md | 0
docs/features/syntax highlighting.md | 0
docs/features/recent notes.md | 0
docs/features/upcoming features.md | 0
docs/features/Latex.md | 0
content/.gitkeep | 0
docs/showcase.md | 0
docs/advanced/making plugins.md | 0
docs/features/index.md | 0
39 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/content/.gitkeep b/content/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/content/.gitkeep
diff --git a/content/advanced/architecture.md b/docs/advanced/architecture.md
similarity index 100%
rename from content/advanced/architecture.md
rename to docs/advanced/architecture.md
diff --git a/content/advanced/creating components.md b/docs/advanced/creating components.md
similarity index 100%
rename from content/advanced/creating components.md
rename to docs/advanced/creating components.md
diff --git a/content/advanced/making plugins.md b/docs/advanced/making plugins.md
similarity index 100%
rename from content/advanced/making plugins.md
rename to docs/advanced/making plugins.md
diff --git a/content/advanced/paths.md b/docs/advanced/paths.md
similarity index 100%
rename from content/advanced/paths.md
rename to docs/advanced/paths.md
diff --git a/content/authoring content.md b/docs/authoring content.md
similarity index 100%
rename from content/authoring content.md
rename to docs/authoring content.md
diff --git a/content/build.md b/docs/build.md
similarity index 100%
rename from content/build.md
rename to docs/build.md
diff --git a/content/configuration.md b/docs/configuration.md
similarity index 100%
rename from content/configuration.md
rename to docs/configuration.md
diff --git a/content/features/Latex.md b/docs/features/Latex.md
similarity index 100%
rename from content/features/Latex.md
rename to docs/features/Latex.md
diff --git a/content/features/Mermaid diagrams.md b/docs/features/Mermaid diagrams.md
similarity index 100%
rename from content/features/Mermaid diagrams.md
rename to docs/features/Mermaid diagrams.md
diff --git a/content/features/Obsidian compatibility.md b/docs/features/Obsidian compatibility.md
similarity index 100%
rename from content/features/Obsidian compatibility.md
rename to docs/features/Obsidian compatibility.md
diff --git a/content/features/RSS Feed.md b/docs/features/RSS Feed.md
similarity index 100%
rename from content/features/RSS Feed.md
rename to docs/features/RSS Feed.md
diff --git a/content/features/SPA Routing.md b/docs/features/SPA Routing.md
similarity index 100%
rename from content/features/SPA Routing.md
rename to docs/features/SPA Routing.md
diff --git a/content/features/backlinks.md b/docs/features/backlinks.md
similarity index 100%
rename from content/features/backlinks.md
rename to docs/features/backlinks.md
diff --git a/content/features/callouts.md b/docs/features/callouts.md
similarity index 100%
rename from content/features/callouts.md
rename to docs/features/callouts.md
diff --git a/content/features/darkmode.md b/docs/features/darkmode.md
similarity index 100%
rename from content/features/darkmode.md
rename to docs/features/darkmode.md
diff --git a/content/features/folder and tag listings.md b/docs/features/folder and tag listings.md
similarity index 100%
rename from content/features/folder and tag listings.md
rename to docs/features/folder and tag listings.md
diff --git a/content/features/full-text search.md b/docs/features/full-text search.md
similarity index 100%
rename from content/features/full-text search.md
rename to docs/features/full-text search.md
diff --git a/content/features/graph view.md b/docs/features/graph view.md
similarity index 100%
rename from content/features/graph view.md
rename to docs/features/graph view.md
diff --git a/content/features/index.md b/docs/features/index.md
similarity index 100%
rename from content/features/index.md
rename to docs/features/index.md
diff --git a/content/features/popover previews.md b/docs/features/popover previews.md
similarity index 100%
rename from content/features/popover previews.md
rename to docs/features/popover previews.md
diff --git a/content/features/private pages.md b/docs/features/private pages.md
similarity index 100%
rename from content/features/private pages.md
rename to docs/features/private pages.md
diff --git a/content/features/recent notes.md b/docs/features/recent notes.md
similarity index 100%
rename from content/features/recent notes.md
rename to docs/features/recent notes.md
diff --git a/content/features/syntax highlighting.md b/docs/features/syntax highlighting.md
similarity index 100%
rename from content/features/syntax highlighting.md
rename to docs/features/syntax highlighting.md
diff --git a/content/features/table of contents.md b/docs/features/table of contents.md
similarity index 100%
rename from content/features/table of contents.md
rename to docs/features/table of contents.md
diff --git a/content/features/upcoming features.md b/docs/features/upcoming features.md
similarity index 100%
rename from content/features/upcoming features.md
rename to docs/features/upcoming features.md
diff --git a/content/features/wikilinks.md b/docs/features/wikilinks.md
similarity index 100%
rename from content/features/wikilinks.md
rename to docs/features/wikilinks.md
diff --git a/content/hosting.md b/docs/hosting.md
similarity index 100%
rename from content/hosting.md
rename to docs/hosting.md
diff --git a/content/images/dns records.png b/docs/images/dns records.png
similarity index 100%
rename from content/images/dns records.png
rename to docs/images/dns records.png
Binary files differ
diff --git a/content/images/quartz layout.png b/docs/images/quartz layout.png
similarity index 100%
rename from content/images/quartz layout.png
rename to docs/images/quartz layout.png
Binary files differ
diff --git a/content/images/quartz transform pipeline.png b/docs/images/quartz transform pipeline.png
similarity index 100%
rename from content/images/quartz transform pipeline.png
rename to docs/images/quartz transform pipeline.png
Binary files differ
diff --git a/content/index.md b/docs/index.md
similarity index 100%
rename from content/index.md
rename to docs/index.md
diff --git a/content/layout.md b/docs/layout.md
similarity index 100%
rename from content/layout.md
rename to docs/layout.md
diff --git a/content/migrating from Quartz 3.md b/docs/migrating from Quartz 3.md
similarity index 100%
rename from content/migrating from Quartz 3.md
rename to docs/migrating from Quartz 3.md
diff --git a/content/philosophy.md b/docs/philosophy.md
similarity index 100%
rename from content/philosophy.md
rename to docs/philosophy.md
diff --git a/content/showcase.md b/docs/showcase.md
similarity index 100%
rename from content/showcase.md
rename to docs/showcase.md
diff --git a/content/tags/component.md b/docs/tags/component.md
similarity index 100%
rename from content/tags/component.md
rename to docs/tags/component.md
diff --git a/content/upgrading.md b/docs/upgrading.md
similarity index 100%
rename from content/upgrading.md
rename to docs/upgrading.md
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 1656d75..b973317 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -162,7 +162,6 @@
label: "Symlink an existing folder",
hint: "don't select this unless you know what you are doing!",
},
- { value: "keep", label: "Keep the existing files" },
],
}),
)
@@ -176,6 +175,7 @@
}
}
+ await fs.promises.unlink(path.join(contentFolder, ".gitkeep"))
if (setupStrategy === "copy" || setupStrategy === "symlink") {
const originalFolder = escapePath(
exitIfCancel(
@@ -205,8 +205,6 @@
await fs.promises.symlink(originalFolder, contentFolder, "dir")
}
} else if (setupStrategy === "new") {
- await rmContentFolder()
- await fs.promises.mkdir(contentFolder)
await fs.promises.writeFile(
path.join(contentFolder, "index.md"),
`---
--
Gitblit v1.10.0