mirror of https://github.com/web3privacy/news.git
update
This commit is contained in:
parent
b282afbdbe
commit
94cae540bf
|
|
@ -1,41 +1,61 @@
|
|||
name: Build and Deploy
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main # Set a branch to deploy
|
||||
pull_request:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- uses: denoland/setup-deno@v1
|
||||
with:
|
||||
deno-version: v1.x
|
||||
name: Deploy to GitHub Pages
|
||||
|
||||
on:
|
||||
# Trigger the workflow every time you push to the `main` branch
|
||||
# Using a different branch name? Replace `main` with your branch’s name
|
||||
push:
|
||||
branches: [ main ]
|
||||
|
||||
# Allow this job to clone the repo and create a page deployment
|
||||
permissions:
|
||||
contents: read
|
||||
pages: write
|
||||
id-token: write
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout your repository using git
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: szenius/set-timezone@v1.0
|
||||
with:
|
||||
timezoneLinux: "Europe/Prague"
|
||||
|
||||
- uses: denoland/setup-deno@v1
|
||||
with:
|
||||
deno-version: v1.x
|
||||
|
||||
- name: Build bundle
|
||||
run: make
|
||||
|
||||
#- name: Add custom domain
|
||||
# run: "touch dist/CNAME && echo \"data.web3privacy.info\" >> dist/CNAME"
|
||||
|
||||
- name: Deploy
|
||||
uses: peaceiris/actions-gh-pages@v3
|
||||
if: ${{ github.ref == 'refs/heads/main' }}
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ./dist
|
||||
cache: npm
|
||||
|
||||
- name: Web install
|
||||
run: "cd web && npm install"
|
||||
|
||||
- name: Web build
|
||||
run: "cd web && npm run build"
|
||||
|
||||
- name: Upload Pages Artifact
|
||||
# Must use v2 to avoid requiring `actions/deploy-pages@v4` or newer
|
||||
uses: actions/upload-pages-artifact@v2
|
||||
with:
|
||||
path: ./dist
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
steps:
|
||||
- name: Deploy to GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
# build output
|
||||
dist/
|
||||
# generated types
|
||||
.astro/
|
||||
|
||||
# dependencies
|
||||
node_modules/
|
||||
|
||||
# logs
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
|
||||
|
||||
# environment variables
|
||||
.env
|
||||
.env.production
|
||||
|
||||
# macOS-specific files
|
||||
.DS_Store
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"recommendations": ["astro-build.astro-vscode"],
|
||||
"unwantedRecommendations": []
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"command": "./node_modules/.bin/astro dev",
|
||||
"name": "Development server",
|
||||
"request": "launch",
|
||||
"type": "node-terminal"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
# Astro Starter Kit: Minimal
|
||||
|
||||
```sh
|
||||
npm create astro@latest -- --template minimal
|
||||
```
|
||||
|
||||
[](https://stackblitz.com/github/withastro/astro/tree/latest/examples/minimal)
|
||||
[](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/minimal)
|
||||
[](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/minimal/devcontainer.json)
|
||||
|
||||
> 🧑🚀 **Seasoned astronaut?** Delete this file. Have fun!
|
||||
|
||||
## 🚀 Project Structure
|
||||
|
||||
Inside of your Astro project, you'll see the following folders and files:
|
||||
|
||||
```text
|
||||
/
|
||||
├── public/
|
||||
├── src/
|
||||
│ └── pages/
|
||||
│ └── index.astro
|
||||
└── package.json
|
||||
```
|
||||
|
||||
Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
|
||||
|
||||
There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
|
||||
|
||||
Any static assets, like images, can be placed in the `public/` directory.
|
||||
|
||||
## 🧞 Commands
|
||||
|
||||
All commands are run from the root of the project, from a terminal:
|
||||
|
||||
| Command | Action |
|
||||
| :------------------------ | :----------------------------------------------- |
|
||||
| `npm install` | Installs dependencies |
|
||||
| `npm run dev` | Starts local dev server at `localhost:4321` |
|
||||
| `npm run build` | Build your production site to `./dist/` |
|
||||
| `npm run preview` | Preview your build locally, before deploying |
|
||||
| `npm run astro ...` | Run CLI commands like `astro add`, `astro check` |
|
||||
| `npm run astro -- --help` | Get help using the Astro CLI |
|
||||
|
||||
## 👀 Want to learn more?
|
||||
|
||||
Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
import { defineConfig } from 'astro/config';
|
||||
import tailwind from "@astrojs/tailwind";
|
||||
import yaml from '@rollup/plugin-yaml';
|
||||
|
||||
import svelte from "@astrojs/svelte";
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({
|
||||
integrations: [tailwind(), svelte()],
|
||||
vite: {
|
||||
plugins: [yaml()],
|
||||
}
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"name": "web",
|
||||
"type": "module",
|
||||
"version": "0.0.1",
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
"start": "astro dev",
|
||||
"build": "astro build",
|
||||
"preview": "astro preview",
|
||||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astrojs/svelte": "^5.0.3",
|
||||
"@astrojs/tailwind": "^5.1.0",
|
||||
"@frsource/base64": "^1.0.40",
|
||||
"@rollup/plugin-yaml": "^4.1.2",
|
||||
"astro": "^4.3.5",
|
||||
"svelte": "^4.2.10",
|
||||
"tailwindcss": "^3.4.1"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
|
||||
<path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
|
||||
<style>
|
||||
path { fill: #000; }
|
||||
@media (prefers-color-scheme: dark) {
|
||||
path { fill: #FFF; }
|
||||
}
|
||||
</style>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 749 B |
|
|
@ -0,0 +1,95 @@
|
|||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
import yaml from 'js-yaml';
|
||||
import { marked } from 'marked';
|
||||
import { setWeek, nextMonday, format, addDays } from 'date-fns';
|
||||
import * as config from '../config.yaml';
|
||||
import { encode, decode } from '@frsource/base64';
|
||||
|
||||
let data = {};
|
||||
let cats = [];
|
||||
let ghData = {};
|
||||
|
||||
export let year = "2024";
|
||||
export let week = "05";
|
||||
export let current = false;
|
||||
|
||||
onMount(async () => {
|
||||
const res = await fetch(`https://api.github.com/repos/web3privacy/news/contents/src/${year}/week${week}.yaml`)
|
||||
ghData = await res.json();
|
||||
const yamlData = decode(ghData.content);
|
||||
data = yaml.load(yamlData);
|
||||
if (!data.news) {
|
||||
return null
|
||||
}
|
||||
let uncat = false
|
||||
for (const item of data.news) {
|
||||
if (item.cat && !cats.includes(item.cat)) {
|
||||
cats = [...cats, item.cat]
|
||||
}
|
||||
if (!item.cat) {
|
||||
uncat = true
|
||||
}
|
||||
}
|
||||
if (uncat) {
|
||||
cats = [...cats, "uncategorized"]
|
||||
}
|
||||
});
|
||||
|
||||
const weekStart = setWeek(nextMonday(new Date(Number(year), 0, 4)), Number(week), {
|
||||
weekStartsOn: 1,
|
||||
firstWeekContainsDate: 4,
|
||||
});
|
||||
const weekEnd = addDays(weekStart, 6);
|
||||
//const weekStartDa
|
||||
|
||||
function capitalizeFirstLetter(string) {
|
||||
return string.charAt(0).toUpperCase() + string.slice(1);
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<div class="mb-8 border {current ? "border-dashed border-blue-950" : "border-white/20"}">
|
||||
|
||||
<div class="flex w-full p-4 sm:p-6 {current ? "bg-blue-950" : "bg-white/10"}">
|
||||
<div class="grid gap-2 sm:gap-6 sm:flex items-center">
|
||||
<h1 class="text-2xl"><a href={data.published} class="{!data.published ? 'no-underline' : ''}">Week {week}/{year}</a></h1>
|
||||
<div class="text-xl {current ? "text-white/50" : ""}">{format(weekStart, "MMM d")} - {format(weekEnd, "MMM d, yyyy")}</div>
|
||||
{#if current}
|
||||
<div class="text-white">🚧 Current week</div>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="grow"></div>
|
||||
<div class="">
|
||||
<a href="https://github.com/web3privacy/news/edit/main/src/{year}/week{week}.yaml">Edit</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{#if data?.news}
|
||||
<div class="p-4 sm:p-6">
|
||||
{#each cats as cat}
|
||||
<div class="mb-6">
|
||||
<h3 class="mb-4 text-xl">{config.cats[cat] ? config.cats[cat].title : capitalizeFirstLetter(cat)}</h3>
|
||||
<ul class="list-disc">
|
||||
{#each data.news.filter(n => (cat === "uncategorized" ? !n.cat : n.cat === cat)) as item}
|
||||
<li class="ml-6 news-item mb-2">
|
||||
{@html marked.parseInline(item.text)}
|
||||
{#if item.src}
|
||||
<span class="news-item-source text-white/20">(<a href={item.src} class="text-white/20">src</a>)</span>
|
||||
{/if}
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<!--div class="mt-6 text-sm p-4 bg-white/10">
|
||||
<div>News count: {data.news?.length}</div>
|
||||
<div>Categories: {cats.join(', ')}</div>
|
||||
<div>{JSON.stringify(ghData.sha)}</div>
|
||||
</div-->
|
||||
{:else}
|
||||
<div class="mt-4 p-6">Loading week ..</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
cats:
|
||||
events:
|
||||
title: Events
|
||||
gov:
|
||||
title: Government
|
||||
|
|
@ -0,0 +1 @@
|
|||
/// <reference types="astro/client" />
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
---
|
||||
import '../styles/base.css';
|
||||
---
|
||||
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<meta name="generator" content={Astro.generator} />
|
||||
<title>Week in the Privacy News | Web3Privacy Now</title>
|
||||
</head>
|
||||
<body>
|
||||
<div class="m-4 sm:m-8">
|
||||
<div class="md:flex w-full">
|
||||
<div class="flex gap-6">
|
||||
<a href="https://web3privacy.info"><div class="w3pn-logo h-6 sm:h-8 md:h-10"></div></a>
|
||||
<h1 class="text-lg sm:text-2xl md:text-3xl lg:text-4xl font-bold">Week in the Privacy News</h1>
|
||||
</div>
|
||||
<div class="grow"></div>
|
||||
<div class="flex gap-3 mt-4 md:mt-0">
|
||||
<a href="https://docs.web3privacy.info/news/week-in-the-privacy">Documentation</a>
|
||||
<a href="https://github.com/web3privacy/news">Source code</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-10">
|
||||
<slot />
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
|
||||
import BaseLayout from '../layouts/base.astro';
|
||||
import WeekNews from '../components/WeekNews.svelte';
|
||||
|
||||
---
|
||||
|
||||
<BaseLayout>
|
||||
<div class="mb-8">
|
||||
<a href="https://paragraph.xyz/@privacynews/subscribe">Subscribe now!</a>
|
||||
</div>
|
||||
<WeekNews year="2024" week="06" current={true} client:load />
|
||||
<WeekNews year="2024" week="05" client:load />
|
||||
</BaseLayout>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,5 @@
|
|||
import { vitePreprocess } from '@astrojs/svelte';
|
||||
|
||||
export default {
|
||||
preprocess: vitePreprocess(),
|
||||
};
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
/** @type {import('tailwindcss').Config} */
|
||||
export default {
|
||||
content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"extends": "astro/tsconfigs/base"
|
||||
}
|
||||
Loading…
Reference in New Issue