From 4de21a8db9ea5f41bead35d4a61810bfbb7a195d Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 15:25:43 +0100 Subject: [PATCH 01/14] update --- utils/build.js | 36 ++++++++++++++++++------------- web/src/components/MetaTags.astro | 25 +++++++++++++++++++++ web/src/layouts/base.astro | 14 +++++++++--- web/src/pages/cover.astro | 21 ++++++++++++++++++ web/src/pages/issue/[week].astro | 7 +++++- 5 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 web/src/components/MetaTags.astro create mode 100644 web/src/pages/cover.astro diff --git a/utils/build.js b/utils/build.js index 8725e15..9fc8a79 100644 --- a/utils/build.js +++ b/utils/build.js @@ -43,23 +43,12 @@ async function build() { // get images for (const issue of issues) { - const imgResp = await fetch("https://html2svg.gwei.cz", { - method: 'POST', - body: JSON.stringify({ - url: `https://news.web3privacy.info/image/${issue.week}?${new Date().valueOf()}`, - format: "png", - width: 1920, - height: 960, - }) - }); - - const imgFn = join(imgDir, `${issue.week}.png`) - if (imgResp.body) { - const file = await Deno.open(imgFn, { write: true, create: true }); - await imgResp.body.pipeTo(file.writable); - } + await genImage(`https://news.web3privacy.info/image/${issue.week}?${new Date().valueOf()}`, join(imgDir, `${issue.week}.png`)) } + // make cover + await genImage(`https://news.web3privacy.info/cover`, join(imgDir, 'cover.png')) + const outputFn = join(DEST_DIR, "index.json"); await writeJSONFile(outputFn, issues); } @@ -91,4 +80,21 @@ async function writeJSONFile(fn, data) { return Deno.writeTextFile(fn, JSON.stringify(data, null, 2)); } +async function genImage(url, fn) { + const imgResp = await fetch("https://html2svg.gwei.cz", { + method: 'POST', + body: JSON.stringify({ + url, + format: "png", + width: 1920, + height: 960, + }) + }); + + if (imgResp.body) { + const file = await Deno.open(fn, { write: true, create: true }); + await imgResp.body.pipeTo(file.writable); + } +} + build(); \ No newline at end of file diff --git a/web/src/components/MetaTags.astro b/web/src/components/MetaTags.astro new file mode 100644 index 0000000..b12b811 --- /dev/null +++ b/web/src/components/MetaTags.astro @@ -0,0 +1,25 @@ +--- + +const { title, description, image } = Astro.props; +--- + + + +{title} + + + + + + + + + + + + + + + + + diff --git a/web/src/layouts/base.astro b/web/src/layouts/base.astro index d0cc820..0d89fd6 100644 --- a/web/src/layouts/base.astro +++ b/web/src/layouts/base.astro @@ -1,15 +1,23 @@ --- import '../styles/base.css'; import config from '../config.yaml'; +import MetaTags from '../components/MetaTags.astro'; + +const { title, description, image } = Astro.props; + --- - - - {config.name} | Web3Privacy Now + + +
diff --git a/web/src/pages/cover.astro b/web/src/pages/cover.astro new file mode 100644 index 0000000..45f0cea --- /dev/null +++ b/web/src/pages/cover.astro @@ -0,0 +1,21 @@ +--- +import '../styles/base.css'; +import config from '../config.yaml'; + +--- + + + + +
+
+
{config.name}
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/web/src/pages/issue/[week].astro b/web/src/pages/issue/[week].astro index 496998d..8a23a51 100644 --- a/web/src/pages/issue/[week].astro +++ b/web/src/pages/issue/[week].astro @@ -2,6 +2,7 @@ import BaseLayout from '../../layouts/base.astro'; import WeekNews from '../../components/WeekNews.astro'; import issues from '../../issues.json'; +import config from '../../config.yaml'; export function getStaticPaths() { return issues.map(issue => { @@ -16,7 +17,11 @@ const issue = issues.find(item => item.week === week); --- - +
← Show latest edition
From a4524862821159cb624f23261ac8ca65a47f9be9 Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 15:26:21 +0100 Subject: [PATCH 02/14] cover update --- web/src/layouts/base.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/layouts/base.astro b/web/src/layouts/base.astro index 0d89fd6..aa7fced 100644 --- a/web/src/layouts/base.astro +++ b/web/src/layouts/base.astro @@ -15,7 +15,7 @@ const { title, description, image } = Astro.props; From ae8485296f5ca39b9b51b19d9e7c6b2b1cf7061f Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 15:33:30 +0100 Subject: [PATCH 03/14] simplify urls --- web/src/components/WeekNews.astro | 2 +- web/src/pages/{issue => }/[week].astro | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename web/src/pages/{issue => }/[week].astro (73%) diff --git a/web/src/components/WeekNews.astro b/web/src/components/WeekNews.astro index f827e7c..bcdb4e8 100644 --- a/web/src/components/WeekNews.astro +++ b/web/src/components/WeekNews.astro @@ -13,7 +13,7 @@ const current = false;
-

Week {issue.week.split('-').reverse().join('/')}

+

Week {issue.week.split('-').reverse().join('/')}

{format(issue.period[0], "MMM d")} - {format(issue.period[1], "MMM d, yyyy")}
{!issue.published &&
🚧 Future edition
diff --git a/web/src/pages/issue/[week].astro b/web/src/pages/[week].astro similarity index 73% rename from web/src/pages/issue/[week].astro rename to web/src/pages/[week].astro index 8a23a51..ec6e65d 100644 --- a/web/src/pages/issue/[week].astro +++ b/web/src/pages/[week].astro @@ -1,8 +1,8 @@ --- -import BaseLayout from '../../layouts/base.astro'; -import WeekNews from '../../components/WeekNews.astro'; -import issues from '../../issues.json'; -import config from '../../config.yaml'; +import BaseLayout from '../layouts/base.astro'; +import WeekNews from '../components/WeekNews.astro'; +import issues from '../issues.json'; +import config from '../config.yaml'; export function getStaticPaths() { return issues.map(issue => { From f418b40222549d9712778d6709d1b9ee6ddf4111 Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 15:50:40 +0100 Subject: [PATCH 04/14] publish 2024-06 --- data/2024/week06.md | 1 + 1 file changed, 1 insertion(+) diff --git a/data/2024/week06.md b/data/2024/week06.md index d770fb0..9d907b9 100644 --- a/data/2024/week06.md +++ b/data/2024/week06.md @@ -1,5 +1,6 @@ --- curator: Tree +published: https://paragraph.xyz/@privacynews/2024-06 --- Welcome to the historical debut - the **first edition** (#1) of [Week In The Privacy News](https://news.web3privacy.info/). From 84fc7e4a8d0679aeaff1db1ecbdf89321a162508 Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 16:26:44 +0100 Subject: [PATCH 05/14] Update week07.md --- data/2024/week07.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 8c95ac3..65b8d25 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -1,3 +1,7 @@ --- curator: Mykola ---- \ No newline at end of file +--- + +### Ecosystem + +* [Eppie](https://eppie.io/): Web3 native email as replacement for Skiff ([src](https://bsky.app/profile/eppieapp.bsky.social)) From f574dd9207d8684068078f65e1de262969f4346d Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 16:29:48 +0100 Subject: [PATCH 06/14] Update week07.md --- data/2024/week07.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 65b8d25..da47d2d 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -4,4 +4,4 @@ curator: Mykola ### Ecosystem -* [Eppie](https://eppie.io/): Web3 native email as replacement for Skiff ([src](https://bsky.app/profile/eppieapp.bsky.social)) +* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://bsky.app/profile/eppieapp.bsky.social)) From d544cf0e836979c790b28661b3156ba480d38373 Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 16:32:33 +0100 Subject: [PATCH 07/14] Update week07.md --- data/2024/week07.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index da47d2d..ba1eb08 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -4,4 +4,4 @@ curator: Mykola ### Ecosystem -* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://bsky.app/profile/eppieapp.bsky.social)) +* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)https://blog.eppie.io/post/nextgen/) From e155000f5691ef1ab4c9b7b2ed89a18dc9a3cffe Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 12 Feb 2024 16:36:26 +0100 Subject: [PATCH 08/14] fixes --- data/2024/week07.md | 2 +- web/src/components/WeekNews.astro | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index ba1eb08..1bf8595 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -4,4 +4,4 @@ curator: Mykola ### Ecosystem -* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)https://blog.eppie.io/post/nextgen/) +* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)) \ No newline at end of file diff --git a/web/src/components/WeekNews.astro b/web/src/components/WeekNews.astro index bcdb4e8..d8f53db 100644 --- a/web/src/components/WeekNews.astro +++ b/web/src/components/WeekNews.astro @@ -23,8 +23,11 @@ const current = false;
{issue.published && Paragraph + Source + } + {!issue.published && + Edit } - {issue.published ? 'Source' : 'Edit'}
From 383cdf0437ea3b9f60819d71bbc3c8ef5aaeda4a Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 11:40:59 +0100 Subject: [PATCH 09/14] Update week07.md --- data/2024/week07.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 1bf8595..3b3c063 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -4,4 +4,5 @@ curator: Mykola ### Ecosystem -* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)) \ No newline at end of file +* [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)) +* [Eternal Safe](https://github.com/eternalsafe/wallet/): decentralized fork of Safe{Wallet} without tracking ([src](https://twitter.com/devanoneth/status/1756861443310305780)) From 12eea4856dbbe24627f46908e0a02fcc30d92cfd Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 11:45:26 +0100 Subject: [PATCH 10/14] Update week07.md --- data/2024/week07.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/2024/week07.md b/data/2024/week07.md index 3b3c063..4bca5c2 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -6,3 +6,7 @@ curator: Mykola * [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)) * [Eternal Safe](https://github.com/eternalsafe/wallet/): decentralized fork of Safe{Wallet} without tracking ([src](https://twitter.com/devanoneth/status/1756861443310305780)) + +### Releases + +* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) From 9b65019d547653d4fa0be6ef600fddf466d759e8 Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 11:47:19 +0100 Subject: [PATCH 11/14] Update week07.md --- data/2024/week07.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 4bca5c2..254824d 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -9,4 +9,4 @@ curator: Mykola ### Releases -* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) +* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) - new Traits syntax, new U128 structure & BN254 field comparison module in the std lib ([src](https://twitter.com/aztecnetwork/status/1757224321242837344)) From a16e691b12e1d8b890a284dee7845c758d1aae7d Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 11:49:41 +0100 Subject: [PATCH 12/14] Update week07.md --- data/2024/week07.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 254824d..4bca5c2 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -9,4 +9,4 @@ curator: Mykola ### Releases -* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) - new Traits syntax, new U128 structure & BN254 field comparison module in the std lib ([src](https://twitter.com/aztecnetwork/status/1757224321242837344)) +* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) From fdd3e801d5d7b6bfff97d4f5e2ec47f1f42a0b0d Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 11:56:27 +0100 Subject: [PATCH 13/14] Update week07.md --- data/2024/week07.md | 1 + 1 file changed, 1 insertion(+) diff --git a/data/2024/week07.md b/data/2024/week07.md index 4bca5c2..87dd0cc 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -6,6 +6,7 @@ curator: Mykola * [Eppie](https://eppie.io/): encrypted p2p email as better replacement for Skiff ([src](https://blog.eppie.io/post/nextgen/)) * [Eternal Safe](https://github.com/eternalsafe/wallet/): decentralized fork of Safe{Wallet} without tracking ([src](https://twitter.com/devanoneth/status/1756861443310305780)) +* [koan](https://twitter.com/koanpay): private cross-chain swaps by Zcash ([src](https://twitter.com/koanpay/status/1757088529698734366)) ### Releases From 4704df8d2b6e92d4fd48b6e01b277680d405cd32 Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 13 Feb 2024 12:07:22 +0100 Subject: [PATCH 14/14] Update week07.md --- data/2024/week07.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/2024/week07.md b/data/2024/week07.md index 87dd0cc..20da928 100644 --- a/data/2024/week07.md +++ b/data/2024/week07.md @@ -10,4 +10,4 @@ curator: Mykola ### Releases -* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) +* Noir [v0.24.0](https://github.com/noir-lang/noir/releases) (pre-release)