Skip to content

Commit 76484a0

Browse files
huijinghuijing
committed
rebase to main instead of mh branch
1 parent 8459862 commit 76484a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1760
-1318
lines changed

‎README.md

+16
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,19 @@ After a translation is provided, it must be reviewed by an additional contributo
162162
## Reviews and Approvals
163163

164164
After a PR is submitted, it will be reviewed by a member of the Web Incubator Community Group (WICG). Ensure you're able to receive GitHub notifications so you'll know when the PR is approved and can be merged or if updates are required before approval is given.
165+
166+
## Web Monetization Catchup Call
167+
168+
Our catchup calls are open to our community. We have them every other Thursday at 14:00 GMT, via Google Meet.
169+
170+
To join the video meeting, click this link: https://meet.google.com/fjy-vjef-ogj
171+
Otherwise, to join by phone, dial +49 30 300195060 and enter this PIN: 982 511 322 1488#
172+
To view more phone numbers, click this link: https://tel.meet/fjy-vjef-ogj?hs=5
173+
174+
Video call link: https://meet.google.com/fjy-vjef-ogj
175+
176+
Or dial: (DE) 49 30 300195060 and enter this PIN: 982 511 322 1488#
177+
178+
More phone numbers: https://tel.meet/fjy-vjef-ogj?hs=5
179+
180+
[Add to Google Calendar](https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=c2dyMjY4M2k1dXRrcjZkYW05Mmo3c2xzZm1fMjAyNDA1MDlUMTMwMDAwWiBjX2NqMDI3Z21oc3VqazkxZXZpMjRkOXB2bXQ0QGc&tmsrc=c_cj027gmhsujk91evi24d9pvmt4%40group.calendar.google.com&scp=ALL)

‎astro.config.mjs

+124-111
Original file line numberDiff line numberDiff line change
@@ -26,194 +26,207 @@ export default defineConfig({
2626
label: 'English',
2727
lang: 'en',
2828
},
29+
es: {
30+
label: 'Español',
31+
lang: 'es',
32+
},
33+
fr: {
34+
label: 'Français',
35+
lang: 'fr',
36+
},
2937
},
3038
components: {
3139
Header: './src/components/docs/Header.astro',
32-
PageSidebar: './src/components/docs/PageSidebar.astro',
33-
Footer: './src/components/docs/Footer.astro',
34-
PageTitle: './src/components/docs/PageTitle.astro',
3540
},
3641
social: {
3742
github: 'https://github.com/WICG/webmonetization',
3843
},
3944
sidebar: [
4045
{
4146
label: 'Intro to Web Monetization',
42-
link: '/docs/',
43-
},
44-
{
45-
label: 'Learn about Web Monetization payments',
4647
collapsed: true,
4748
items: [
4849
{
49-
label: 'Web Monetization payments',
50-
link: '/docs/payments/payments',
50+
label: 'Overview',
51+
link: '/docs/',
5152
},
5253
{
5354
label: 'Sending payments',
54-
link: '/docs/payments/send-payments',
55+
link: '/docs/intro/sending-payments',
5556
},
5657
{
5758
label: 'Receiving payments',
58-
link: '/docs/payments/receive-payments',
59-
},
60-
],
61-
},
62-
{
63-
label: 'Get a wallet address',
64-
collapsed: true,
65-
items: [
66-
{
67-
label: 'FAQ',
68-
link: '/docs/wallet-address/wallet-faq',
69-
},
70-
{
71-
label: 'Wallet address providers',
72-
link: '/docs/wallet-address/wallets',
73-
},
74-
{
75-
label: 'Interledger test wallet',
76-
link: '/docs/wallet-address/ilf-test-wallet',
77-
},
78-
],
79-
},
80-
{
81-
label: 'Support web monetized content',
82-
collapsed: true,
83-
items: [
84-
{
85-
label: 'Overview',
86-
link: '/docs/support/overview',
59+
link: '/docs/intro/receiving-payments',
8760
},
8861
{
89-
label: 'Quick start guide',
90-
link: '/docs/support/quick-start-guide',
62+
label: 'Web Monetization flow',
63+
link: '/docs/intro/web-monetization-flow',
9164
},
9265
],
9366
},
9467
{
95-
label: 'Implement Web Monetization',
68+
label: 'References',
9669
collapsed: true,
9770
items: [
9871
{
99-
label: 'Overview',
100-
link: '/docs/implement/overview',
101-
},
102-
{
103-
label: 'Quick start guide',
104-
link: '/docs/implement/quick-start-guide',
105-
},
106-
{
107-
label: 'APIs',
108-
collapsed: false,
72+
label: 'Web Monetization API',
10973
items: [
11074
{
111-
label: 'HTML DOM API',
112-
collapsed: false,
75+
label: 'HTML <link> rel=monetization',
76+
link: '/docs/references/html-link-rel-monetization',
77+
},
78+
{
79+
label: 'Monetization events',
80+
collapsed: true,
11381
items: [
11482
{
115-
label: 'Monetization <link> element',
116-
link: '/docs/implement/link',
83+
label: 'MonetizationEvent',
84+
link: '/docs/references/monetizationevent',
11785
},
11886
{
119-
label: 'onmonetization event handler',
120-
link: '/docs/implement/onmonetization',
87+
label: 'amountSent',
88+
link: '/docs/references/attributes/amountsent',
12189
},
122-
],
123-
},
124-
{
125-
label: 'Web Monetization API',
126-
collapsed: false,
127-
items: [
12890
{
129-
label: 'Monetization interfaces',
130-
link: '/docs/implement/wmapi-interfaces',
91+
label: 'incomingPayment',
92+
link: '/docs/references/attributes/incomingpayment',
13193
},
13294
{
133-
label: 'Monetization events',
134-
link: '/docs/implement/events',
95+
label: 'paymentPointer',
96+
link: '/docs/references/attributes/paymentpointer',
97+
},
98+
{
99+
label: 'amount',
100+
link: '/docs/references/attributes/amount',
101+
badge: { text: 'deprecated', variant: 'danger' },
102+
},
103+
{
104+
label: 'assetCode',
105+
link: '/docs/references/attributes/assetcode',
106+
badge: { text: 'deprecated', variant: 'danger' },
107+
},
108+
{
109+
label: 'assetScale',
110+
link: '/docs/references/attributes/assetscale',
111+
badge: { text: 'deprecated', variant: 'danger' },
112+
},
113+
{
114+
label: 'receipt',
115+
link: '/docs/references/attributes/receipt',
116+
badge: { text: 'deprecated', variant: 'danger' },
135117
},
136118
],
137119
},
138120
],
139121
},
140122
{
141-
label: 'HTTP Headers',
142-
collapsed: true,
123+
label: 'HTTP headers',
143124
items: [
144125
{
145-
label: 'Content Security Policy (CSP)',
146-
link: '/docs/implement/csp',
126+
label: 'Content-Security-Policy: monetization-src',
127+
link: '/docs/references/csp-monetization-src',
147128
},
148129
{
149-
label: 'Permissions Policy',
150-
link: '/docs/implement/permissions-policy',
130+
label: 'Permissions-Policy: monetization',
131+
link: '/docs/references/permissions-policy-monetization',
151132
},
152133
],
153134
},
154135
{
155-
label: 'Guides',
156-
collapsed: true,
136+
label: 'Events',
157137
items: [
158138
{
159-
label: 'Provide Exclusive Content',
160-
link: '/docs/guides/provide-exclusive-content',
161-
},
162-
{
163-
label: 'Add a streaming payments counter',
164-
link: '/docs/guides/add-a-streaming-payments-counter',
165-
},
166-
{
167-
label: 'Remove ads',
168-
link: '/docs/guides/remove-ads',
169-
},
170-
{
171-
label: 'Set up probabilistic revenue sharing',
172-
link: '/docs/guides/set-up-probabilistic-revenue-sharing',
139+
label: 'GlobalEventHandlers: onmonetization',
140+
link: '/docs/references/onmonetization',
173141
},
174142
],
175143
},
144+
],
145+
},
146+
{
147+
label: 'Guides',
148+
collapsed: true,
149+
items: [
176150
{
177-
label: 'Community content',
178-
collapsed: true,
179-
items: [
180-
{
181-
label: 'Get involved',
182-
link: '/docs/implement/get-involved',
183-
},
184-
{
185-
label: 'Libraries',
186-
link: '/docs/resources/libraries',
187-
},
188-
],
151+
label: 'Add Web Monetization to a page',
152+
link: '/docs/guides/monetize-page',
153+
},
154+
{
155+
label: 'Remove ads',
156+
link: '/docs/guides/remove-ads',
189157
},
190158
{
191-
label: 'Resources',
159+
label: 'Provide exclusive content',
160+
link: '/docs/guides/provide-exclusive-content',
161+
},
162+
{
163+
label: 'Set up probabilistic revenue sharing',
164+
link: '/docs/guides/set-up-probabilistic-revenue-sharing',
165+
},
166+
{
167+
label: 'Add a streaming payments counter',
168+
link: '/docs/guides/add-a-streaming-payments-counter',
169+
},
170+
],
171+
},
172+
{
173+
label: 'Resources',
174+
collapsed: true,
175+
items: [
176+
{
177+
label: 'Glossary',
178+
link: '/docs/resources/glossary',
179+
},
180+
{
181+
label: 'Libraries',
182+
link: '/docs/resources/libraries',
183+
},
184+
{
185+
label: 'Open Payments-enabled wallets',
186+
link: '/docs/resources/op-wallets',
187+
},
188+
{
189+
label: 'Get involved',
190+
link: '/docs/resources/get-involved',
191+
},
192+
{
193+
label: 'External resources',
192194
collapsed: true,
193195
items: [
194196
{
195-
label: 'Glossary',
196-
link: '/docs/resources/glossary',
197+
label: 'Interledger',
198+
link: 'https://interledger.org/',
199+
attrs: { target: '_blank' },
197200
},
198201
{
199-
label: 'Specification',
200-
link: 'https://webmonetization.org/specification/',
202+
label: 'Open Payments API',
203+
link: 'https://openpayments.guide/',
201204
attrs: { target: '_blank' },
202205
},
203206
{
204-
label: 'Interledger',
205-
link: 'https://interledger.org',
207+
label: 'Payment Handler API',
208+
link: 'https://w3c.github.io/payment-handler/',
206209
attrs: { target: '_blank' },
207210
},
208211
{
209-
label: 'Open Payments',
210-
link: 'https://openpayments.guide/',
212+
label: 'Payment pointers',
213+
link: 'https://paymentpointers.org/',
214+
attrs: { target: '_blank' },
215+
},
216+
{
217+
label: 'Payment Request API',
218+
link: 'https://www.w3.org/TR/payment-request/',
211219
attrs: { target: '_blank' },
212220
},
213221
],
214222
},
215223
],
216224
},
225+
{
226+
label: 'Specification',
227+
link: 'https://webmonetization.org/specification/',
228+
attrs: { target: '_blank' },
229+
},
217230
],
218231
}),
219232
react(),

0 commit comments

Comments
 (0)