diff --git a/edit/server.py b/edit/server.py index 19b3ebd..cd47753 100644 --- a/edit/server.py +++ b/edit/server.py @@ -21,6 +21,7 @@ from pydantic import BaseModel # Resolved at startup relative to the project root (one level above this file) _ROOT = Path(__file__).parent.parent pages_dir: Path = _ROOT / os.environ.get("WIKI_PAGES_DIR", "pages") +stories_dir: Path = _ROOT / os.environ.get("WIKI_STORIES_DIR", "stories") site_dir: Path = _ROOT / "site" _DB_PATH = _ROOT / "data" / "wiki.db" @@ -165,13 +166,13 @@ async def me(user: dict = Depends(require_auth)) -> JSONResponse: return JSONResponse({"username": user["username"]}) -# ── Page helpers ────────────────────────────────────────────────────────────── +# ── File helpers ────────────────────────────────────────────────────────────── -def _slug_to_path(slug: str) -> Path: +def _slug_to_path(slug: str, base: Path) -> Path: if not _SAFE_SLUG.match(slug): - raise HTTPException(400, "Invalid page slug — only alphanumeric, hyphens, underscores, and slashes allowed") - resolved = (pages_dir / f"{slug}.md").resolve() - if not str(resolved).startswith(str(pages_dir.resolve())): + raise HTTPException(400, "Invalid slug — only alphanumeric, hyphens, underscores, and slashes allowed") + resolved = (base / f"{slug}.md").resolve() + if not str(resolved).startswith(str(base.resolve())): raise HTTPException(400, "Path traversal detected") return resolved @@ -182,44 +183,67 @@ class PageBody(BaseModel): # ── Page endpoints (all require auth) ──────────────────────────────────────── -@app.get("/pages") -async def list_pages(user: dict = Depends(require_auth)) -> JSONResponse: - """Return all wiki page slugs.""" - if not pages_dir.exists(): - return JSONResponse({"pages": []}) - slugs = [ - str(p.relative_to(pages_dir).with_suffix("")) - for p in sorted(pages_dir.rglob("*.md")) - ] - return JSONResponse({"pages": slugs}) +def _list(base: Path) -> list[str]: + if not base.exists(): + return [] + return [str(p.relative_to(base).with_suffix("")) for p in sorted(base.rglob("*.md"))] - -@app.get("/pages/{slug:path}") -async def get_page(slug: str, user: dict = Depends(require_auth)) -> JSONResponse: - """Return raw markdown content for a page.""" - path = _slug_to_path(slug) +def _get(slug: str, base: Path) -> JSONResponse: + path = _slug_to_path(slug, base) if not path.exists(): - raise HTTPException(404, "Page not found") + raise HTTPException(404, "Not found") return JSONResponse({"slug": slug, "content": path.read_text(encoding="utf-8")}) - -@app.post("/pages/{slug:path}") -async def save_page(slug: str, body: PageBody, user: dict = Depends(require_auth)) -> JSONResponse: - """Create or update a wiki page.""" - path = _slug_to_path(slug) +def _save(slug: str, body: PageBody, base: Path) -> JSONResponse: + path = _slug_to_path(slug, base) path.parent.mkdir(parents=True, exist_ok=True) path.write_text(body.content, encoding="utf-8") return JSONResponse({"slug": slug, "saved": True}) +def _delete(slug: str, base: Path) -> JSONResponse: + path = _slug_to_path(slug, base) + if not path.exists(): + raise HTTPException(404, "Not found") + path.unlink() + return JSONResponse({"slug": slug, "deleted": True}) + + +# ── Page endpoints ──────────────────────────────────────────────────────────── + +@app.get("/pages") +async def list_pages(user: dict = Depends(require_auth)) -> JSONResponse: + return JSONResponse({"pages": _list(pages_dir)}) + +@app.get("/pages/{slug:path}") +async def get_page(slug: str, user: dict = Depends(require_auth)) -> JSONResponse: + return _get(slug, pages_dir) + +@app.post("/pages/{slug:path}") +async def save_page(slug: str, body: PageBody, user: dict = Depends(require_auth)) -> JSONResponse: + return _save(slug, body, pages_dir) @app.delete("/pages/{slug:path}") async def delete_page(slug: str, user: dict = Depends(require_auth)) -> JSONResponse: - """Delete a wiki page.""" - path = _slug_to_path(slug) - if not path.exists(): - raise HTTPException(404, "Page not found") - path.unlink() - return JSONResponse({"slug": slug, "deleted": True}) + return _delete(slug, pages_dir) + + +# ── Story endpoints ─────────────────────────────────────────────────────────── + +@app.get("/stories") +async def list_stories(user: dict = Depends(require_auth)) -> JSONResponse: + return JSONResponse({"stories": _list(stories_dir)}) + +@app.get("/stories/{slug:path}") +async def get_story(slug: str, user: dict = Depends(require_auth)) -> JSONResponse: + return _get(slug, stories_dir) + +@app.post("/stories/{slug:path}") +async def save_story(slug: str, body: PageBody, user: dict = Depends(require_auth)) -> JSONResponse: + return _save(slug, body, stories_dir) + +@app.delete("/stories/{slug:path}") +async def delete_story(slug: str, user: dict = Depends(require_auth)) -> JSONResponse: + return _delete(slug, stories_dir) @app.post("/rebuild") diff --git a/scripts/dev.sh b/scripts/dev.sh index 314baab..019e4ee 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -5,8 +5,9 @@ set -e cd "$(dirname "$0")/.." ROOT="$(pwd)" -# Symlink wiki pages into the site's content collection -mkdir -p pages +# Symlink wiki pages and stories into the site's content collections +mkdir -p pages stories + mkdir -p site/src/content/entries LINK="$ROOT/site/src/content/entries/_wiki" if [ ! -L "$LINK" ]; then @@ -14,6 +15,12 @@ if [ ! -L "$LINK" ]; then echo "Linked pages/ → site/src/content/entries/_wiki" fi +BLOG_LINK="$ROOT/site/src/content/blog" +if [ ! -L "$BLOG_LINK" ]; then + ln -sf "$ROOT/stories" "$BLOG_LINK" + echo "Linked stories/ → site/src/content/blog" +fi + # Start edit sidecar if requested if [[ "$*" == *"--edit"* ]]; then echo "Starting edit sidecar on :8001..." diff --git a/site b/site index 43d1bbe..76115f2 160000 --- a/site +++ b/site @@ -1 +1 @@ -Subproject commit 43d1bbe677f6d41ad80a2f77569e8e557be88922 +Subproject commit 76115f28ef3a355da9f3b46ef491f5ee82d02bff diff --git a/stories/first-post.md b/stories/first-post.md new file mode 100644 index 0000000..5cad92f --- /dev/null +++ b/stories/first-post.md @@ -0,0 +1,21 @@ +--- +title: 'First post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 08 2022' +heroImage: '/blog-placeholder-3.jpg' +--- + +:attrtype::string +:attr::[[wikirefs]] + +👉 [[wikirefs]] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. + +Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi. + +Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim. + +Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. + +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/stories/markdown-style-guide.md b/stories/markdown-style-guide.md new file mode 100644 index 0000000..877ec2f --- /dev/null +++ b/stories/markdown-style-guide.md @@ -0,0 +1,214 @@ +--- +title: 'Markdown Style Guide' +description: 'Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro.' +pubDate: 'Jul 01 2022' +heroImage: '/blog-placeholder-1.jpg' +--- + +Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro. + +## Headings + +The following HTML `

`—`

` elements represent six levels of section headings. `

` is the highest section level while `

` is the lowest. + +# H1 + +## H2 + +### H3 + +#### H4 + +##### H5 + +###### H6 + +## Paragraph + +Xerum, quo qui aut unt expliquam qui dolut labo. Aque venitatiusda cum, voluptionse latur sitiae dolessi aut parist aut dollo enim qui voluptate ma dolestendit peritin re plis aut quas inctum laceat est volestemque commosa as cus endigna tectur, offic to cor sequas etum rerum idem sintibus eiur? Quianimin porecus evelectur, cum que nis nust voloribus ratem aut omnimi, sitatur? Quiatem. Nam, omnis sum am facea corem alique molestrunt et eos evelece arcillit ut aut eos eos nus, sin conecerem erum fuga. Ri oditatquam, ad quibus unda veliamenimin cusam et facea ipsamus es exerum sitate dolores editium rerore eost, temped molorro ratiae volorro te reribus dolorer sperchicium faceata tiustia prat. + +Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sapicia is sinveli squiatum, core et que aut hariosam ex eat. + +## Images + +#### Syntax + +```markdown +![Alt text](./full/or/relative/path/of/image) +``` + +#### Output + +![blog placeholder](/blog-placeholder-about.jpg) + +## Blockquotes + +The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations. + +### Blockquote without attribution + +#### Syntax + +```markdown +> Tiam, ad mint andaepu dandae nostion secatur sequo quae. +> **Note** that you can use _Markdown syntax_ within a blockquote. +``` + +#### Output + +> Tiam, ad mint andaepu dandae nostion secatur sequo quae. +> **Note** that you can use _Markdown syntax_ within a blockquote. + +### Blockquote with attribution + +#### Syntax + +```markdown +> Don't communicate by sharing memory, share memory by communicating.
+> — Rob Pike[^1] +``` + +#### Output + +> Don't communicate by sharing memory, share memory by communicating.
+> — Rob Pike[^1] + +[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015. + +## Tables + +#### Syntax + +```markdown +| Italics | Bold | Code | +| --------- | -------- | ------ | +| _italics_ | **bold** | `code` | +``` + +#### Output + +| Italics | Bold | Code | +| --------- | -------- | ------ | +| _italics_ | **bold** | `code` | + +## Code Blocks + +#### Syntax + +we can use 3 backticks ``` in new line and write snippet and close with 3 backticks on new line and to highlight language specific syntac, write one word of language name after first 3 backticks, for eg. html, javascript, css, markdown, typescript, txt, bash + +````markdown +```html + + + + + Example HTML5 Document + + +

Test

+ + +``` +```` + +Output + +```html + + + + + Example HTML5 Document + + +

Test

+ + +``` + +## List Types + +### Ordered List + +#### Syntax + +```markdown +1. First item +2. Second item +3. Third item +``` + +#### Output + +1. First item +2. Second item +3. Third item + +### Unordered List + +#### Syntax + +```markdown +- List item +- Another item +- And another item +``` + +#### Output + +- List item +- Another item +- And another item + +### Nested list + +#### Syntax + +```markdown +- Fruit + - Apple + - Orange + - Banana +- Dairy + - Milk + - Cheese +``` + +#### Output + +- Fruit + - Apple + - Orange + - Banana +- Dairy + - Milk + - Cheese + +## Other Elements — abbr, sub, sup, kbd, mark + +#### Syntax + +```markdown +GIF is a bitmap image format. + +H2O + +Xn + Yn = Zn + +Press CTRL+ALT+Delete to end the session. + +Most salamanders are nocturnal, and hunt for insects, worms, and other small creatures. +``` + +#### Output + +GIF is a bitmap image format. + +H2O + +Xn + Yn = Zn + +Press CTRL+ALT+Delete to end the session. + +Most salamanders are nocturnal, and hunt for insects, worms, and other small creatures. diff --git a/stories/second-post.md b/stories/second-post.md new file mode 100644 index 0000000..19a9105 --- /dev/null +++ b/stories/second-post.md @@ -0,0 +1,16 @@ +--- +title: 'Second post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 22 2022' +heroImage: '/blog-placeholder-4.jpg' +--- + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. + +Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi. + +Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim. + +Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. + +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/stories/third-post.md b/stories/third-post.md new file mode 100644 index 0000000..463cd25 --- /dev/null +++ b/stories/third-post.md @@ -0,0 +1,16 @@ +--- +title: 'Third post' +description: 'Lorem ipsum dolor sit amet' +pubDate: 'Jul 15 2022' +heroImage: '/blog-placeholder-2.jpg' +--- + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. + +Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi. + +Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim. + +Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. + +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.