Skip to content

Commit 14d04be

Browse files
Merge branch 'main' into docs/amino-dht-tooltip
2 parents 4a4f63f + 08d5838 commit 14d04be

26 files changed

Lines changed: 293 additions & 208 deletions

.github/styles/Vocab/ipfs-docs-vocab/accept.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ homebrew
114114
hostname
115115
HTML
116116
HTTPS
117-
identafiability
117+
identifiability
118118
Infura
119119
interop
120120
ipget

.github/styles/pln-ignore.txt

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Caddyfile
3333
callout
3434
callouts
3535
cas
36+
cdn('s)
37+
CDN's
3638
cdns
3739
certbot
3840
cid
@@ -55,6 +57,7 @@ crowdsourcing
5557
crypto(currencies)
5658
daos
5759
dapps
60+
dClimate
5861
data('s)
5962
datastore
6063
deduplicate
@@ -68,6 +71,8 @@ deserialized
6871
devs
6972
dheeraj
7073
dht
74+
dht('s)
75+
DHT's
7176
dhts
7277
dialable
7378
dialback
@@ -76,12 +81,14 @@ dns('s)
7681
dnsaddr
7782
dnscontrol
7883
dnslink
84+
DNSimple
7985
dotgraph
8086
dups
8187
durin
8288
dweb
8389
embeddable
8490
eternum
91+
exfiltrate
8592
ethereum
8693
explainers
8794
fabien
@@ -95,7 +102,10 @@ filestore
95102
flatfs
96103
flatf[ss]
97104
fleek
105+
Fleek's
106+
fleek('s)
98107
fqdns
108+
Gandi
99109
gasless
100110
geospatial
101111
gif
@@ -114,7 +124,7 @@ hostname
114124
hostnames
115125
html
116126
https
117-
identafiability
127+
identifiability
118128
infura
119129
interop
120130
ipfs
@@ -136,6 +146,7 @@ keypair
136146
keystores
137147
kubo
138148
Kubo's
149+
Lakhani
139150
kubuxu
140151
laika
141152
lan
@@ -184,11 +195,14 @@ nakamoto
184195
nakamoto's
185196
namebase
186197
namecheap
198+
nameserver
187199
namespace
188200
nats
189201
neocities
190202
netlify
191203
next.js
204+
nft('s)
205+
NFT's
192206
nfts
193207
nginx
194208
nodejs
@@ -208,6 +222,7 @@ pluggable
208222
powergate
209223
powershell
210224
preload
225+
prenegotiated
211226
prepended
212227
processannounce
213228
protobuf
@@ -238,6 +253,7 @@ sandboxed
238253
satoshi
239254
satoshi nakamoto
240255
SDKs
256+
se
241257
serverless
242258
sharding
243259
snapshotted
@@ -259,6 +275,7 @@ takedown
259275
testground
260276
testnet
261277
toolkits
278+
toolset
262279
trustlessly
263280
trustlessness
264281
uncensorable
@@ -279,6 +296,8 @@ vue
279296
Vuepress
280297
wantlist
281298
wantlists
299+
walkthrough
300+
WASM
282301
web
283302
webpack
284303
webpages
@@ -298,4 +317,6 @@ youtube
298317
IPFS's
299318
IPIPs
300319
IPIP
320+
Zeeshan
321+
Zelenka
301322
_redirects

.github/workflows/deploy.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ name: Deploy
88

99
# Explicitly declare permissions
1010
permissions:
11+
actions: read
1112
contents: read
1213
pull-requests: write
1314
statuses: write
@@ -26,6 +27,8 @@ jobs:
2627
runs-on: ubuntu-latest
2728
outputs:
2829
cid: ${{ steps.deploy.outputs.cid }}
30+
environment:
31+
name: 'ipfs-publish'
2932
steps:
3033
- name: Download build artifact
3134
uses: actions/download-artifact@v5
@@ -35,15 +38,8 @@ jobs:
3538
run-id: ${{ github.event.workflow_run.id }}
3639
github-token: ${{ github.token }}
3740

38-
- name: Debug PR context and SHA
39-
run: |
40-
echo "Event: ${{ github.event_name }}"
41-
echo "SHA: ${{ github.sha }}"
42-
echo "Head SHA: ${{ github.event.pull_request.head.sha }}"
43-
echo "workflow_run.head_sha: ${{ github.event.workflow_run.head_sha }}"
44-
4541
- name: Deploy to IPFS
46-
uses: ipfs/ipfs-deploy-action@v1
42+
uses: ipshipyard/ipfs-deploy-action@v1
4743
id: deploy
4844
with:
4945
path-to-deploy: ${{ env.BUILD_PATH }}
@@ -55,6 +51,24 @@ jobs:
5551
#storacha-proof: ${{ secrets.STORACHA_PROOF }}
5652
github-token: ${{ github.token }}
5753

54+
dnslink-update:
55+
runs-on: ubuntu-latest
56+
needs: deploy-ipfs
57+
if: github.event.workflow_run.head_branch == 'main'
58+
environment:
59+
name: 'cf-dnslink'
60+
url: "https://docs-ipfs-tech.ipns.inbrowser.link/"
61+
steps:
62+
- name: Update DNSLink
63+
uses: ipshipyard/dnslink-action@v1
64+
with:
65+
cid: ${{ needs.deploy-ipfs.outputs.cid }}
66+
dnslink_domain: 'docs-ipfs-tech.dnslinks.ipshipyard.tech'
67+
cf_zone_id: ${{ secrets.CF_DNS_ZONE_ID }}
68+
cf_auth_token: ${{ secrets.CF_DNS_AUTH_TOKEN }}
69+
github_token: ${{ github.token }}
70+
set_github_status: true
71+
5872
deploy-gh-pages:
5973
if: |
6074
github.event.workflow_run.conclusion == 'success' &&

docs/.vuepress/config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,14 @@ module.exports = {
256256
sidebarDepth: 1,
257257
collapsable: true,
258258
children: [
259-
'/how-to/websites-on-ipfs/deploy-github-action',
260-
'/how-to/websites-on-ipfs/custom-domains',
261259
'/how-to/websites-on-ipfs/single-page-website',
262-
'/how-to/websites-on-ipfs/dnslink-gateway',
263260
'/how-to/websites-on-ipfs/multipage-website',
264261
'/how-to/websites-on-ipfs/static-site-generators',
265-
'/how-to/websites-on-ipfs/redirects-and-custom-404s'
262+
'/how-to/websites-on-ipfs/redirects-and-custom-404s',
263+
'/how-to/websites-on-ipfs/custom-domains',
264+
'/how-to/websites-on-ipfs/deploy-github-action',
265+
'/how-to/websites-on-ipfs/dnslink-action',
266+
'/how-to/websites-on-ipfs/dnslink-gateway',
266267
]
267268
},
268269
{

docs/.vuepress/redirects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
/how-to/run-ipfs-inside-docker /install/run-ipfs-inside-docker
4646
/how-to/ipfs-updater /install/command-line
4747
/how-to/websites-on-ipfs/link-a-domain /how-to/websites-on-ipfs/custom-domains
48+
/how-to/websites-on-ipfs/introducing-fleek /how-to/websites-on-ipfs/static-site-generators
4849
/how-to/gateway-troubleshooting /how-to/troubleshooting
4950
/install/command-line-quick-start/ /how-to/command-line-quick-start
5051
/install/js-ipfs/ https://github.com/ipfs/helia/wiki
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<template>
2+
<div class="help-callout">
3+
<p><b>Help us improve this site!</b></p>
4+
<p v-if="editLink">
5+
<a :href="editLink" target="_blank" rel="noopener noreferrer">Edit this page</a>
6+
<span v-if="issueLink">
7+
or
8+
<a :href="issueLink" target="_blank" rel="noopener noreferrer">open an issue</a>
9+
</span>
10+
</p>
11+
</div>
12+
</template>
13+
14+
<script>
15+
export default {
16+
name: 'HelpCallout',
17+
computed: {
18+
editLink() {
19+
const { docsRepo, docsDir = '', docsBranch = 'main' } = this.$site.themeConfig
20+
if (!docsRepo || !this.$page.relativePath) return null
21+
const dir = docsDir ? docsDir.replace(/\/$/, '') + '/' : ''
22+
return `https://github.com/${docsRepo}/edit/${docsBranch}/${dir}${this.$page.relativePath}`
23+
},
24+
issueLink() {
25+
const { docsRepo } = this.$site.themeConfig
26+
if (!docsRepo) return null
27+
return `https://github.com/${docsRepo}/issues/new?title=${encodeURIComponent(this.$page.title)}`
28+
}
29+
}
30+
}
31+
</script>
32+
33+
<style lang="stylus" scoped>
34+
.help-callout {
35+
background-color: lighten($badgeTipColor, 95%);
36+
color: lighten($textColor, 20%);
37+
border-color: $badgeTipColor;
38+
padding: 1rem 2rem;
39+
margin-top: 3rem;
40+
41+
p {
42+
margin: 0.5rem 0;
43+
}
44+
}
45+
</style>

docs/.vuepress/theme/components/LegacyCallout.vue

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)