From 44a1f2247d05baec6b636e4d726d75e0d7bd4a2c Mon Sep 17 00:00:00 2001 From: Doug Hoyte Date: Fri, 8 Sep 2023 08:02:22 -0400 Subject: [PATCH] wip --- src/apps/web/WebReader.cpp | 3 +++ src/apps/web/rules.mk | 8 ++++---- src/apps/web/static/favicon.ico | Bin 0 -> 7892 bytes src/apps/web/tmpls/searchPage.tmpl | 10 ++++++++-- src/apps/web/tmpls/user/comments.tmpl | 1 - src/apps/web/tmpls/user/metadata.tmpl | 1 - 6 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/apps/web/static/favicon.ico diff --git a/src/apps/web/WebReader.cpp b/src/apps/web/WebReader.cpp index a982e02..8e0f578 100644 --- a/src/apps/web/WebReader.cpp +++ b/src/apps/web/WebReader.cpp @@ -290,6 +290,9 @@ HTTPResponse WebServer::generateReadResponse(lmdb::txn &txn, Decompressor &decom rawBody = std::string(oddbeanStatic__oddbean_svg()); contentType = "image/svg+xml"; } + } else if (u.path[0] == "favicon.ico") { + rawBody = std::string(oddbeanStatic__favicon_ico()); + contentType = "image/x-icon"; } diff --git a/src/apps/web/rules.mk b/src/apps/web/rules.mk index 8e9c05b..3553d45 100644 --- a/src/apps/web/rules.mk +++ b/src/apps/web/rules.mk @@ -11,16 +11,16 @@ LDLIBS += -lre2 build/web-static/oddbean.css: src/apps/web/static/reset.css src/apps/web/static/oddbean.css mkdir -p build/web-static/ cat $^ | sassc -s -t compressed > $@ - gzip -k9f $@ build/web-static/oddbean.js: src/apps/web/static/base.ts src/apps/web/static/turbo.js src/apps/web/static/oddbean.js src/apps/web/static/alpine.js mkdir -p build/web-static/ cat $^ | esbuild --loader=ts --minify > $@ - gzip -k9f $@ build/web-static/oddbean.svg: src/apps/web/static/oddbean.svg cp $^ $@ - gzip -k9f $@ -build/WebStaticFiles.h: build/web-static/oddbean.css build/web-static/oddbean.js build/web-static/oddbean.svg +build/web-static/favicon.ico: src/apps/web/static/favicon.ico + cp $^ $@ + +build/WebStaticFiles.h: build/web-static/oddbean.css build/web-static/oddbean.js build/web-static/oddbean.svg build/web-static/favicon.ico perl golpe/external/hoytech-cpp/dirToCppHeader.pl build/web-static/ oddbeanStatic > $@ diff --git a/src/apps/web/static/favicon.ico b/src/apps/web/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d62fb56272d809cacce595cf4e26cb35915cb06f GIT binary patch literal 7892 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 @(const auto &r : ctx.results) - $(r) +
+
+ Search coming soon... +
+ +
@(const auto &r : ctx.results) + $(r) +
diff --git a/src/apps/web/tmpls/user/comments.tmpl b/src/apps/web/tmpls/user/comments.tmpl index f14d022..fb0b3be 100644 --- a/src/apps/web/tmpls/user/comments.tmpl +++ b/src/apps/web/tmpls/user/comments.tmpl @@ -2,7 +2,6 @@

Notes by $(ctx.u.username) | export - | rss

@(auto &r : ctx.renderedThreads) diff --git a/src/apps/web/tmpls/user/metadata.tmpl b/src/apps/web/tmpls/user/metadata.tmpl index 7ccf047..1be2449 100644 --- a/src/apps/web/tmpls/user/metadata.tmpl +++ b/src/apps/web/tmpls/user/metadata.tmpl @@ -28,6 +28,5 @@ following followers export - rss