From a8882a4cea3923334e0c15f7b69ef69b41bd2f7e Mon Sep 17 00:00:00 2001 From: Mathijs de Bruin Date: Tue, 9 Oct 2018 21:55:54 +0100 Subject: [PATCH 01/14] Update ipfs-search URL, source URL and description --- data/apps.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/apps.yaml b/data/apps.yaml index 807ad6d..e239d6b 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -111,9 +111,12 @@ content: description: > Publish and render markdown essays to and from ipfs. - title: ipfs-search - website: http://ipfs-search.com + website: https://ipfs-search.com + source: https://github.com/ipfs-search/ipfs-search description: > - Search engine for files and directories on IPFS. + Searching the universe since 2016. + + Sniffs the DHT gossip and indexes file and directory hashes. Metadata and search API's available. - title: ipfs-share source: https://github.com/rameshvarun/ipfs-share description: > From e5557c593990a14c56f0a96a788bb4eeb50105b2 Mon Sep 17 00:00:00 2001 From: Mathijs de Bruin Date: Wed, 10 Oct 2018 10:30:11 +0100 Subject: [PATCH 02/14] Regenerated README. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c2a84ea..9cf732f 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,8 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [IPFS Event Drop](https://github.com/travisperson/ipfs-event-drops) - An app that allows for improved visualization of ipfs events. - [IPFS ID and Public Key QR Codes Demo](https://ipfs.io/ipfs/zdj7Whr8X3zah99TSuyPjENaERcBW9C7B36EaCb1DEZ5pbbL9/) - A demo app that uses windows.ipfs to show you a QR Code of your IPNS Link and of your Public Key. [Source](https://github.com/ipfs-shipyard/demo-ipfs-id-qr-codes) - [ipfs-md-wiki](https://github.com/daijiale/ipfs-md-wiki) - Build your wiki system base on ipfs and markdown. -- [ipfs-search](http://ipfs-search.com) - Search engine for files and directories on IPFS. +- [ipfs-search](https://ipfs-search.com) - Searching the universe since 2016. +Sniffs the DHT gossip and indexes file and directory hashes. Metadata and search API's available. [Source](https://github.com/ipfs-search/ipfs-search) - [ipfs-share](https://github.com/rameshvarun/ipfs-share) - Pastebin/Image host/File sharing application - [ipfs.ink](https://ipfs.ink) - Publish and render markdown essays to and from ipfs. [Source](https://github.com/kpcyrd/ipfs.ink) - [ipfs.pics](https://github.com/ipfspics/ipfspics-server) - Upload and share pics. From 8fc0dd2508e40f1e19c382b9be385eb6f4c24b68 Mon Sep 17 00:00:00 2001 From: Mark Henderson Date: Fri, 30 Nov 2018 18:24:21 -0500 Subject: [PATCH 03/14] Fixing TallyLab typo --- README.md | 2 +- data/apps.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c909bed..f88ea69 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [PubSub Chat Demo](https://ipfs.io/ipfs/QmWZ3u5S7RjFXKfW6dSZhj7CozcvpqJxm48RYMmKkWcmNQ/) - A ~76KB demo chat app that uses window.ipfs, provided by the IPFS Companion web extension [Source](https://github.com/tableflip/ipfs-pubsub-chat-example) - [PushToTalk](http://timothy.hobbs.cz/push-to-talk/index.html) - Push to Talk lets you edit audio essays and publish them with IPFS. - [qri](https://qri.io) - Dataset creation, collaboration, and discovery on the distributed web. [Source](https://github.com/qri-io/qri) -- [TallyLab](https://tallylab.com/) - Local-first, end-to-end encrypted diary app for capturing, analyzing, and sharing data about any and - title: Temporal +- [TallyLab](https://tallylab.com/) - Local-first, end-to-end encrypted data diary app for capturing, analyzing, and sharing data about any and everything. - [Temporal](https://github.com/RTradeLtd/Temporal) - Temporal is an easy to use API and platform for integrating IPFS and other distributed/decentralized storage technologies into enterprise applications - [Textile Photos](https://www.textile.photos) - Textile Photos is a secure, mobile digital wallet for your photos. [Source](https://github.com/textileio/textile-mobile) - [ToDo List Demo](https://ipfs.io/ipfs/QmfFaH6dGibQ5JwEdsujeHBzsmHUsFRB5kU9P8nzPyzMv2/) - A ToDo List demo app that uses windows.ipfs. [Source](https://github.com/ipfs-shipyard/demo-ipfs-todo) diff --git a/data/apps.yaml b/data/apps.yaml index a8405aa..83dc32b 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -216,7 +216,7 @@ content: website: https://tallylab.com/ picture: /images/tallylab.jpg description: > - Local-first, end-to-end encrypted diary app for capturing, analyzing, and sharing data about any and - title: Temporal + Local-first, end-to-end encrypted data diary app for capturing, analyzing, and sharing data about any and everything. - title: Temporal source: https://github.com/RTradeLtd/Temporal description: > @@ -294,4 +294,4 @@ content: description: > Run your IPFS node on your machine without having to bother with command line tools. Manage your node, add your files, easily change the settings... everything from - just one interface. \ No newline at end of file + just one interface. From 20212e2926bf7a42ddac08e9fbe90a1901beead5 Mon Sep 17 00:00:00 2001 From: Haz Date: Thu, 20 Dec 2018 23:03:50 +0100 Subject: [PATCH 04/14] Added "Sweet IPFS" to tools.yaml --- data/tools.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/tools.yaml b/data/tools.yaml index df16037..4b76e4a 100644 --- a/data/tools.yaml +++ b/data/tools.yaml @@ -3,6 +3,9 @@ color: yellow icon: stroke_code description: Tools built on the top of IPFS. content: +- title: Sweet IPFS + source: https://github.com/RHazDev/Sweet-IPFS + description: Full node for Android - title: cachewarmer source: https://github.com/BrendanBenshoof/cachewarmer description: Donate ipfs gateways to cache other people's content From 08d0160e7838ac403e61dad345928fbe9fb25799 Mon Sep 17 00:00:00 2001 From: Haz Date: Thu, 20 Dec 2018 23:06:07 +0100 Subject: [PATCH 05/14] Built README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cd1ced..f3547e5 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2017-08-21: [Understanding the IPFS White Paper part 2](https://decentralized.blog/understanding-the-ipfs-white-paper-part-2.html) - 2017-08-10: [Understanding the IPFS White Paper part 1](https://decentralized.blog/understanding-the-ipfs-white-paper-part-1.html) - 2017-06-13: [Decentralized & Distributed Edge Computing Comes to Computes.io](https://blog.computes.io/decentralized-distributed-edge-computing-comes-to-computes-io-396aa062bc85) +- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) - 2017-05-05: [Decentralized indexes for public genomic data](https://github.com/luizirber/2017-recomb) - 2017-03-31: [Using IPFS for IoT Communications](https://medium.com/@chrismatthieu/using-ipfs-for-iot-communications-b49c2139783a) - 2016-09-12: [IPFS: The Internet Democratised](https://medium.com/@tonywillenberg/web-3-0-a-truly-democratised-internet-f4b06cb4077b) @@ -112,7 +113,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2015-09-13: [Introduction to IPFS](http://whatdoesthequantsay.com/2015/09/13/ipfs-introduction-by-example) - 2015-09-10: [First Steps Toward Implementing Distributed Permanent Web With IPFS](https://hacked.com/first-steps-toward-implementing-distributed-permanent-web-ipfs/) - 2015-09-08: [HTTP is obsolete. It's time for the distributed, permanent web](https://ipfs.io/ipfs/QmNhFJjGcMPqpuYfxL62VVB9528NXqDNMFXiqN5bgFYiZ1/its-time-for-the-permanent-web.html) -- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) ## Datasets @@ -153,6 +153,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [ipscend](https://github.com/diasdavid/ipscend) - Tool for hosting web apps and static websites in IPFS - [pinbot](https://github.com/whyrusleeping/pinbot) - Pin content via IRC - [Siderus Orion](https://orion.siderus.io) - Easy to use IPFS desktop client for macOS, Windows and Linux [Source](https://github.com/Siderus/Orion) +- [Sweet IPFS](https://github.com/RHazDev/Sweet-IPFS) - Full node for Android ## Videos From 91a4707f14b673bb1118037518fadad5e5d662a8 Mon Sep 17 00:00:00 2001 From: Rico Gardaphe Date: Thu, 24 Jan 2019 09:38:33 -0500 Subject: [PATCH 06/14] Update apps.yaml (#232) --- data/apps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/apps.yaml b/data/apps.yaml index 863e721..bab5208 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -166,7 +166,7 @@ content: website: https://qri.io source: https://github.com/qri-io/qri description: > - Dataset creation, collaboration, and discovery on the distributed web. + Dataset verion control, discovery and collaboration tools (free, open-source). - title: ujo website: http://ujomusic.com/ description: > From ff441d80de6d2b86f2a25079751e3ed82e65d143 Mon Sep 17 00:00:00 2001 From: meehow Date: Thu, 14 Feb 2019 16:54:52 +0100 Subject: [PATCH 07/14] added 2read.net (#235) * npm run build:readme without any changes * added 2read --- README.md | 5 ++- data/apps.yaml | 7 ++++ src/static/images/2read.svg | 83 +++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 src/static/images/2read.svg diff --git a/README.md b/README.md index 3cd1ced..616c882 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el ## Apps +- [2read](https://2read.net/) - Convert article in current tab to readable form and upload it to writable node(s). [Source](https://github.com/meehow/2read) - [3Box](https://3box.io) - Create and manage your Ethereum Profile, and your personal data. Use the 3box-js library to integrate profiles into your dapp. [Source](https://github.com/uport-project/3box) - [a js video player](https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/play) - [Demo](https://ipfs.io/ipfs/QmVc6zuAneKJzicnJpfrqCH9gSy6bz54JhcypfJYhGUFQu/play#/ipfs/QmTKZgRNwDNZwHtJSjCp6r5FYefzpULfy37JvMt9DwvXs) - [a markdown renderer](https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/markdown-viewer) - [Demo](https://ipfs.io/ipfs/QmSrCRJmzE4zE1nAfWPbzVfanKQNBhp7ZWmMnEdbiLvYNh/mdown#/ipfs/QmfQ75DjAxYzxMP2hdm6o4wFwZS5t7uorEZ2pX9AKXEg2u) @@ -86,7 +87,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [Playback](https://mafintosh.github.io/playback/) - IPFS playback support. This allows casting a video in IPFS to a Chromecast. - [PubSub Chat Demo](https://ipfs.io/ipfs/QmWZ3u5S7RjFXKfW6dSZhj7CozcvpqJxm48RYMmKkWcmNQ/) - A ~76KB demo chat app that uses window.ipfs, provided by the IPFS Companion web extension [Source](https://github.com/tableflip/ipfs-pubsub-chat-example) - [PushToTalk](http://timothy.hobbs.cz/push-to-talk/index.html) - Push to Talk lets you edit audio essays and publish them with IPFS. -- [qri](https://qri.io) - Dataset creation, collaboration, and discovery on the distributed web. [Source](https://github.com/qri-io/qri) +- [qri](https://qri.io) - Dataset verion control, discovery and collaboration tools (free, open-source). [Source](https://github.com/qri-io/qri) - [Request Network](https://request.network/) - Decentralized network for financial transactions. [Source](https://github.com/RequestNetwork/requestNetwork) - [TallyLab](https://tallylab.com/) - Local-first, end-to-end encrypted diary app for capturing, analyzing, and sharing data about any and everything. - [Temporal](https://github.com/RTradeLtd/Temporal) - Temporal is an easy to use API and platform for integrating IPFS and other distributed/decentralized storage technologies into enterprise applications @@ -103,6 +104,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2017-08-21: [Understanding the IPFS White Paper part 2](https://decentralized.blog/understanding-the-ipfs-white-paper-part-2.html) - 2017-08-10: [Understanding the IPFS White Paper part 1](https://decentralized.blog/understanding-the-ipfs-white-paper-part-1.html) - 2017-06-13: [Decentralized & Distributed Edge Computing Comes to Computes.io](https://blog.computes.io/decentralized-distributed-edge-computing-comes-to-computes-io-396aa062bc85) +- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) - 2017-05-05: [Decentralized indexes for public genomic data](https://github.com/luizirber/2017-recomb) - 2017-03-31: [Using IPFS for IoT Communications](https://medium.com/@chrismatthieu/using-ipfs-for-iot-communications-b49c2139783a) - 2016-09-12: [IPFS: The Internet Democratised](https://medium.com/@tonywillenberg/web-3-0-a-truly-democratised-internet-f4b06cb4077b) @@ -112,7 +114,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2015-09-13: [Introduction to IPFS](http://whatdoesthequantsay.com/2015/09/13/ipfs-introduction-by-example) - 2015-09-10: [First Steps Toward Implementing Distributed Permanent Web With IPFS](https://hacked.com/first-steps-toward-implementing-distributed-permanent-web-ipfs/) - 2015-09-08: [HTTP is obsolete. It's time for the distributed, permanent web](https://ipfs.io/ipfs/QmNhFJjGcMPqpuYfxL62VVB9528NXqDNMFXiqN5bgFYiZ1/its-time-for-the-permanent-web.html) -- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) ## Datasets diff --git a/data/apps.yaml b/data/apps.yaml index bab5208..5ca271a 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -3,6 +3,13 @@ color: aqua icon: stroke_marketing description: Applications built with IPFS or with functionality that uses IPFS. content: + - title: 2read + website: https://2read.net/ + source: https://github.com/meehow/2read + picture: /images/2read.svg + description: > + Convert article in current tab to readable form and upload it + to writable node(s). - title: killcord website: https://killcord.io/ source: https://github.com/nomasters/killcord diff --git a/src/static/images/2read.svg b/src/static/images/2read.svg new file mode 100644 index 0000000..9830a57 --- /dev/null +++ b/src/static/images/2read.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 57191b80db7401b1cbdb2467c909b6f48ab35834 Mon Sep 17 00:00:00 2001 From: Javi Date: Mon, 1 Apr 2019 02:05:56 +0200 Subject: [PATCH 08/14] Add tool to check public gateways states (#242) --- README.md | 1 + data/tools.yaml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/README.md b/README.md index 616c882..22d0468 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [IPRedirect](https://github.com/JayBrown/IPRedirect) - Browser userscript for redirecting IPFS/IPNS addresses to your local gateway. This should work on any browser that hasn't had an extension written for it yet and has support for userscripts. - [ipscend](https://github.com/diasdavid/ipscend) - Tool for hosting web apps and static websites in IPFS - [pinbot](https://github.com/whyrusleeping/pinbot) - Pin content via IRC +- [Public gateway status checker](https://ipfs.fooock.com/) - Web app to check public states of IPFS gateways, including latency and gateway writable state. [Source](https://github.com/fooock/ipfs-gateway-checker) - [Siderus Orion](https://orion.siderus.io) - Easy to use IPFS desktop client for macOS, Windows and Linux [Source](https://github.com/Siderus/Orion) ## Videos diff --git a/data/tools.yaml b/data/tools.yaml index df16037..12d2c86 100644 --- a/data/tools.yaml +++ b/data/tools.yaml @@ -98,3 +98,7 @@ content: source: https://github.com/arsyun/ipfs-common description: > some common tools, 1.CID to human readable cid, 2.cid and block name convert, 3. read the leveldb tools. +- title: Public gateway status checker + website: https://ipfs.fooock.com/ + source: https://github.com/fooock/ipfs-gateway-checker + description: Web app to check public states of IPFS gateways, including latency and gateway writable state. From 225e574fbfd4a54702edc066b1be568341c1dbac Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Mon, 29 Apr 2019 21:51:54 +0100 Subject: [PATCH 09/14] feat: update xkcd archive (#243) License: MIT Signed-off-by: Henrique Dias --- README.md | 4 ++-- data/datasets.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 22d0468..4b717a2 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2017-08-21: [Understanding the IPFS White Paper part 2](https://decentralized.blog/understanding-the-ipfs-white-paper-part-2.html) - 2017-08-10: [Understanding the IPFS White Paper part 1](https://decentralized.blog/understanding-the-ipfs-white-paper-part-1.html) - 2017-06-13: [Decentralized & Distributed Edge Computing Comes to Computes.io](https://blog.computes.io/decentralized-distributed-edge-computing-comes-to-computes-io-396aa062bc85) -- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) - 2017-05-05: [Decentralized indexes for public genomic data](https://github.com/luizirber/2017-recomb) - 2017-03-31: [Using IPFS for IoT Communications](https://medium.com/@chrismatthieu/using-ipfs-for-iot-communications-b49c2139783a) - 2016-09-12: [IPFS: The Internet Democratised](https://medium.com/@tonywillenberg/web-3-0-a-truly-democratised-internet-f4b06cb4077b) @@ -114,6 +113,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2015-09-13: [Introduction to IPFS](http://whatdoesthequantsay.com/2015/09/13/ipfs-introduction-by-example) - 2015-09-10: [First Steps Toward Implementing Distributed Permanent Web With IPFS](https://hacked.com/first-steps-toward-implementing-distributed-permanent-web-ipfs/) - 2015-09-08: [HTTP is obsolete. It's time for the distributed, permanent web](https://ipfs.io/ipfs/QmNhFJjGcMPqpuYfxL62VVB9528NXqDNMFXiqN5bgFYiZ1/its-time-for-the-permanent-web.html) +- [Downloading nodejs versions with nvm/n over IPFS](https://ipfs.io/ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/example#/ipfs/QmUx363UFtgiQqkHHsPK3TSDmwoALDo2hrbMWbcxjH2vFc) ## Datasets @@ -123,7 +123,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [Old Internet Files](https://ipfs.io/ipfs/QmbsZEvJE8EU51HCUHQg2aem9JNFmFHdva3tGVYutdCXHp) [Source](https://github.com/ipfs/archives/issues/176) - [Presidental Daily Briefs](https://ipfs.io/ipfs/Qme6epvZDj3vzHcFKdF1nZhbixjw8Bn4imGcKnbUyBJL89) [Source](https://github.com/ipfs/archives/issues/23) - [World Wide Web History Project](https://ipfs.io/ipfs/QmRTSA1UFHSx3z7taNRwUVM8AjB2EQwKvyZu3BfJg9QRtZ) [Source](https://github.com/ipfs/archives/issues/159) -- [XKCD](https://ipfs.io/ipfs/Qmb8wsGZNXt5VXZh1pEmYynjB6Euqpq3HYyeAdw2vScTkQ) [Source](https://github.com/ipfs/archives/issues/21) +- [XKCD](https://ipfs.io/ipns/xkcd.hacdias.com) [Source](https://github.com/ipfs/archives/issues/21) - [yarchive.net](https://ipfs.io/ipfs/QmdA5WkDNALetBn4iFeSepHjdLGJdxPBwZyY47ir1bZGAK) [Source](https://github.com/ipfs/archives/issues/76) ## Tools diff --git a/data/datasets.yml b/data/datasets.yml index 5f2c775..cd1e134 100644 --- a/data/datasets.yml +++ b/data/datasets.yml @@ -15,11 +15,11 @@ content: description: size: 480MB - title: XKCD - hash: /ipfs/Qmb8wsGZNXt5VXZh1pEmYynjB6Euqpq3HYyeAdw2vScTkQ - website: https://ipfs.io/ipfs/Qmb8wsGZNXt5VXZh1pEmYynjB6Euqpq3HYyeAdw2vScTkQ + hash: /ipns/xkcd.hacdias.com + website: https://ipfs.io/ipns/xkcd.hacdias.com source: https://github.com/ipfs/archives/issues/21 description: - size: 122MB + size: 241MB - title: Old Internet Files hash: /ipfs/QmbsZEvJE8EU51HCUHQg2aem9JNFmFHdva3tGVYutdCXHp website: https://ipfs.io/ipfs/QmbsZEvJE8EU51HCUHQg2aem9JNFmFHdva3tGVYutdCXHp From b4cb8c2ccd1ed8c48e5e8cea67c68a22174ee62f Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 30 Apr 2019 09:43:17 +0100 Subject: [PATCH 10/14] fix: remove non-existing (#245) * fix: remove non-existing License: MIT Signed-off-by: Henrique Dias * fix: remove failing demo License: MIT Signed-off-by: Henrique Dias --- README.md | 9 ++------- data/apps.yaml | 13 ------------- data/articles.yaml | 3 --- data/datasets.yml | 6 ------ data/tools.yaml | 2 +- 5 files changed, 3 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 4b717a2..3fc47b3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [akasha](http://akasha.world/) - A Next-Generation Social Media Network, powered by Ethereum and embedded into IPFS. - [Alexandria](http://www.alexandria.io/learn/#integrated-technologies) - Decentralized content publishing / monetization platform. - [Arbore](http://arbo.re) - A friend-to-friend file-sharing app build on top of IPFS. -- [Arpadyne](https://arpadyne.computes.com) - The New Internet - DNS powered by OrbitDB. Content delivered via IPFS. - [Autonomica "IPFS Social Proof"](https://github.com/IBM/ipfs-social-proof) - Autonomica is a Keybase-like Dapp for creating an identity and proving this identity via published social media and web proofs. - [beets](https://github.com/beetbox/beets) - Beets has a plugin which allows for easy sharing of music libraries using IPFS - [Blokaly](https://github.com/blokaly) - A badge issuing, sharing and display platform based on IPFS. @@ -49,11 +48,10 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [dtube](https://d.tube) - Distributed video sharing with steem.it intergrations, using ipfs for backend storage. - [enzypt.io](https://enzypt.io/) - A website to buy and sell files through Ethereum and IPFS. [Source](https://github.com/flex-dapps/enzypt) - [Ethlance](http://ethlance.com) - First completely decentralised job market platform built on Ethereum and IPFS. [Source](https://github.com/madvas/ethlance) -- [FileNation](https://filenation.io/) - The simplest way to send your files around the world using IPFS. - [git-ipfs-rehost](https://github.com/whyrusleeping/git-ipfs-rehost) - A script to rehost your git repos in ipfs. - [Global Upload](https://globalupload.io/) - File transportation service for IPFS, upload files to the future of distributed web. - [gogo.tattoo](http://gogo.tattoo) - Gogo Tattoo Project uses IPFS, DLTs and other modern technologies to offer tattoo artists and wearers an unbreakable lifetime record of their portfolios. gogo.tattoo app already has a feature to share works directly to IPFS. -- [Gorilla REPL viewer](https://github.com/keorn/ipfs-gorilla-repl) - Gorilla is a rich REPL for Clojure in the notebook style. [Demo](https://ipfs.io/ipfs/QmRNUauWDvZFkAp1Bw3kAode3jT8aH2vx7LYzbS7H6R3Mg/view.html?path=/ipfs/QmbRdyLXiFWrKc5hW1NbvpUxF9tLovWCPgiz4BDhjD9k3j) +- [Gorilla REPL viewer](https://github.com/keorn/ipfs-gorilla-repl) - Gorilla is a rich REPL for Clojure in the notebook style. - [Hardbin](https://github.com/jes/hardbin) - Hardbin is an encrypted pastebin, with the decryption key passed in the URL fragment - [hasteIPFS](https://ipfs.io/ipns/bin.ipfs.ovh/) - IPFS based code bin. (Read only for now) - [HydrusNetwork](https://github.com/hydrusnetwork/hydrus) - A booru-style media tagging application with a multitude of features, recently added basic ipfs support. @@ -71,7 +69,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [ipfs.ink](https://ipfs.ink) - Publish and render markdown essays to and from ipfs. [Source](https://github.com/kpcyrd/ipfs.ink) - [ipfs.pics](https://github.com/ipfspics/ipfspics-server) - Upload and share pics. - [IPFSBin](https://github.com/victorbjelkholm/ipfsbin) - Pastebin clone build. -- [IPFSStore](https://ipfsstore.it) - Pinning paid with Steem - [killcord](https://killcord.io/) - A censorship resistant deadman's switch [Source](https://github.com/nomasters/killcord) - [markup.rocks](https://ipfs.io/ipfs/QmWPgJnUGLB1LPh9KMG9LEN4LVu5e17TwkEtcmTWdNn9V6/#/ipfs/QmfQ75DjAxYzxMP2hdm6o4wFwZS5t7uorEZ2pX9AKXEg2u) - Pandoc-based markup editor/previewer/converter, ported to IPFS. [Source](https://github.com/davidar/markup.rocks) - [NodeFort.io](https://www.nodefort.io) - Web-based IPFS node hosting service. @@ -108,7 +105,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - 2017-03-31: [Using IPFS for IoT Communications](https://medium.com/@chrismatthieu/using-ipfs-for-iot-communications-b49c2139783a) - 2016-09-12: [IPFS: The Internet Democratised](https://medium.com/@tonywillenberg/web-3-0-a-truly-democratised-internet-f4b06cb4077b) - 2016-05-20: [Changelog Podcast](https://changelog.com/204/) -- 2015-11-01: [Eris + IPFS](https://monax.io/blog/2015/11/01/eris-and-ipfs/) - 2015-09-18: [The InterPlanetary File System Wants to Create a Permanent Web](http://motherboard.vice.com/read/the-interplanetary-file-system-wants-to-create-a-permanent-web) - 2015-09-13: [Introduction to IPFS](http://whatdoesthequantsay.com/2015/09/13/ipfs-introduction-by-example) - 2015-09-10: [First Steps Toward Implementing Distributed Permanent Web With IPFS](https://hacked.com/first-steps-toward-implementing-distributed-permanent-web-ipfs/) @@ -121,7 +117,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [IETF RFC Archive](https://ipfs.io/ipfs/QmNvTjdqEPjZVWCvRWsFJA1vK7TTw1g9JP6we1WBJTRADM) [Source](https://github.com/ipfs/archives/issues/18) - [MDSConnect](https://ipfs.io/ipfs/QmcvfB6pAqUfTnuAK8zFKVxbdhopnBPveJrDcy1JAA7HX5) [Source](https://github.com/ipfs/archives/issues/152) - [Old Internet Files](https://ipfs.io/ipfs/QmbsZEvJE8EU51HCUHQg2aem9JNFmFHdva3tGVYutdCXHp) [Source](https://github.com/ipfs/archives/issues/176) -- [Presidental Daily Briefs](https://ipfs.io/ipfs/Qme6epvZDj3vzHcFKdF1nZhbixjw8Bn4imGcKnbUyBJL89) [Source](https://github.com/ipfs/archives/issues/23) - [World Wide Web History Project](https://ipfs.io/ipfs/QmRTSA1UFHSx3z7taNRwUVM8AjB2EQwKvyZu3BfJg9QRtZ) [Source](https://github.com/ipfs/archives/issues/159) - [XKCD](https://ipfs.io/ipns/xkcd.hacdias.com) [Source](https://github.com/ipfs/archives/issues/21) - [yarchive.net](https://ipfs.io/ipfs/QmdA5WkDNALetBn4iFeSepHjdLGJdxPBwZyY47ir1bZGAK) [Source](https://github.com/ipfs/archives/issues/76) @@ -130,7 +125,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [Blockwatch](https://ipfs.io/ipfs/QmdikpwcyeBuGaVzWzSzPuqvBfTGD8jPAVydcCjYHsBUxo/index.html) - Monitor the current block number of the Ethereum blockchain, and set alerts (stored locally using PouchDB in your browser) for when certain block heights are passed. [Source](https://github.com/MidnightLightning/ethereum-blockwatch) - [cachewarmer](https://github.com/BrendanBenshoof/cachewarmer) - Donate ipfs gateways to cache other people's content -- [dillo-ipfs](https://ipfs.io/ipns/12D3KooWBG1fsFRF4ykpidXVNVnbon5KLfv67pkkGeFstrwftVVb/) - IPFS integration for the Dillo web browser. [Source](https://git.scuttlebot.io/%25C35b%2BMlZ%2Fy5TT1e7SG66eNKEIdX5DRl9PRUxbhvO89k%3D.sha256) +- [dillo-ipfs](https://git.scuttlebot.io/%25C35b%2BMlZ%2Fy5TT1e7SG66eNKEIdX5DRl9PRUxbhvO89k%3D.sha256) - IPFS integration for the Dillo web browser. - [gatsby-plugin-ipfs](https://github.com/moxystudio/gatsby-plugin-ipfs) - Adds support for deploying Gatsby websites to IPFS by ensuring that assets are relative. - [git-remote-ipfs](https://github.com/cryptix/git-remote-ipfs) - push/pull repositories from/to IPFS - [http2ipfs](https://github.com/jbenet/http2ipfs-web) - This is a simple webtool to add URLs to an IPFS node. diff --git a/data/apps.yaml b/data/apps.yaml index 5ca271a..ff8f991 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -138,10 +138,6 @@ content: source: https://github.com/victorbjelkholm/ipfsbin description: > Pastebin clone build. - - title: IPFSStore - website: https://ipfsstore.it - description: > - Pinning paid with Steem - title: markup.rocks website: https://ipfs.io/ipfs/QmWPgJnUGLB1LPh9KMG9LEN4LVu5e17TwkEtcmTWdNn9V6/#/ipfs/QmfQ75DjAxYzxMP2hdm6o4wFwZS5t7uorEZ2pX9AKXEg2u source: https://github.com/davidar/markup.rocks @@ -157,10 +153,6 @@ content: website: https://partysha.re description: > A simple file sharing app. - - title: FileNation - website: https://filenation.io/ - description: > - The simplest way to send your files around the world using IPFS. - title: Playback source: https://mafintosh.github.io/playback/ description: > @@ -204,7 +196,6 @@ content: IPFS based code bin. (Read only for now) - title: Gorilla REPL viewer source: https://github.com/keorn/ipfs-gorilla-repl - demo: https://ipfs.io/ipfs/QmRNUauWDvZFkAp1Bw3kAode3jT8aH2vx7LYzbS7H6R3Mg/view.html?path=/ipfs/QmbRdyLXiFWrKc5hW1NbvpUxF9tLovWCPgiz4BDhjD9k3j description: > Gorilla is a rich REPL for Clojure in the notebook style. - title: a markdown renderer @@ -216,10 +207,6 @@ content: - title: a qr-code renderer source: https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/qr-render demo: https://ipfs.io/ipfs/QmccqhJg5wm5kNjAP4k4HrYxoqaXUGNuotDUqfvYBx8jrR/qr#enter%20text%20here - - title: Arpadyne - website: https://arpadyne.computes.com - description: > - The New Internet - DNS powered by OrbitDB. Content delivered via IPFS. - title: TallyLab website: https://tallylab.com/ picture: /images/tallylab.jpg diff --git a/data/articles.yaml b/data/articles.yaml index 661b589..d219960 100644 --- a/data/articles.yaml +++ b/data/articles.yaml @@ -24,9 +24,6 @@ content: - title: The InterPlanetary File System Wants to Create a Permanent Web date: '2015-09-18' website: http://motherboard.vice.com/read/the-interplanetary-file-system-wants-to-create-a-permanent-web - - title: Eris + IPFS - date: '2015-11-01' - website: https://monax.io/blog/2015/11/01/eris-and-ipfs/ - title: HTTP is obsolete. It's time for the distributed, permanent web date: '2015-09-08' website: https://ipfs.io/ipfs/QmNhFJjGcMPqpuYfxL62VVB9528NXqDNMFXiqN5bgFYiZ1/its-time-for-the-permanent-web.html diff --git a/data/datasets.yml b/data/datasets.yml index cd1e134..4cd0474 100644 --- a/data/datasets.yml +++ b/data/datasets.yml @@ -8,12 +8,6 @@ content: website: https://ipfs.io/ipfs/QmNvTjdqEPjZVWCvRWsFJA1vK7TTw1g9JP6we1WBJTRADM source: https://github.com/ipfs/archives/issues/18 size: 500MB - - title: Presidental Daily Briefs - hash: /ipfs/Qme6epvZDj3vzHcFKdF1nZhbixjw8Bn4imGcKnbUyBJL89 - website: https://ipfs.io/ipfs/Qme6epvZDj3vzHcFKdF1nZhbixjw8Bn4imGcKnbUyBJL89 - source: https://github.com/ipfs/archives/issues/23 - description: - size: 480MB - title: XKCD hash: /ipns/xkcd.hacdias.com website: https://ipfs.io/ipns/xkcd.hacdias.com diff --git a/data/tools.yaml b/data/tools.yaml index 12d2c86..2ab7362 100644 --- a/data/tools.yaml +++ b/data/tools.yaml @@ -11,7 +11,7 @@ content: description: Adds support for deploying Gatsby websites to IPFS by ensuring that assets are relative. - title: dillo-ipfs source: https://git.scuttlebot.io/%25C35b%2BMlZ%2Fy5TT1e7SG66eNKEIdX5DRl9PRUxbhvO89k%3D.sha256 - website: https://ipfs.io/ipns/12D3KooWBG1fsFRF4ykpidXVNVnbon5KLfv67pkkGeFstrwftVVb/ + website: https://git.scuttlebot.io/%25C35b%2BMlZ%2Fy5TT1e7SG66eNKEIdX5DRl9PRUxbhvO89k%3D.sha256 description: IPFS integration for the Dillo web browser. picture: /images/dillo-ipfs.png - title: git-remote-ipfs From 5a3a3e5f38ae3d82c81cbc25e2f8bca80d0d6971 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 30 Apr 2019 13:33:54 +0100 Subject: [PATCH 11/14] chore: move to Circle CI and fix deploy (#244) License: MIT Signed-off-by: Henrique Dias --- .circleci/config.yml | 47 ++++++++++++++++++++++++++++++++++ ci/Jenkinsfile | 4 --- src/layouts/partials/list.html | 3 ++- 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 ci/Jenkinsfile diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..266a179 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,47 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/node:10.15.1-browsers + environment: + NO_SANDBOX: true + steps: + - checkout + - run: npm install + - run: npm run build + - persist_to_workspace: + root: . + paths: + - public + + deploy: + docker: + - image: olizilla/ipfs-dns-deploy + environment: + DOMAIN: awesome.ipfs.io + BUILD_DIR: public + steps: + - attach_workspace: + at: /tmp/workspace + - run: + name: Deploy website to IPFS + command: | + pin_name="$DOMAIN build $CIRCLE_BUILD_NUMBER" + + hash=$(pin-to-cluster.sh "$pin_name" /tmp/workspace/$BUILD_DIR) + + echo "Website added to IPFS: https://ipfs.io/ipfs/$hash" + + if [ "$CIRCLE_BRANCH" == "master" ] ; then + dnslink-dnsimple -d $DOMAIN -r _dnslink -l /ipfs/$hash + fi + +workflows: + version: 2 + build-deploy: + jobs: + - build + - deploy: + context: ipfs-dns-deploy + requires: + - build diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile deleted file mode 100644 index ef1e8bc..0000000 --- a/ci/Jenkinsfile +++ /dev/null @@ -1,4 +0,0 @@ -website([ - website: 'awesome.ipfs.io', - record: '_dnslink' -]) diff --git a/src/layouts/partials/list.html b/src/layouts/partials/list.html index 8bfa17e..aa09419 100644 --- a/src/layouts/partials/list.html +++ b/src/layouts/partials/list.html @@ -45,7 +45,8 @@
- {{ substr .Params.hash 0 10 }}...{{ substr .Params.hash 47 5 }} + {{ $length := sub (len .Params.hash) 5 }} + {{ substr .Params.hash 0 10 }}...{{ substr .Params.hash $length 5 }}
From 9544b76bbe3168ab0ab45aa397dfb37013c15ddb Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 30 Apr 2019 15:04:20 +0100 Subject: [PATCH 12/14] chore: remove travis and just use circle (#246) License: MIT Signed-off-by: Henrique Dias --- .circleci/config.yml | 19 +++++++++++++++++++ .travis.yml | 7 ------- 2 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 266a179..727ad0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,13 @@ version: 2 jobs: + awesome: + docker: + - image: circleci/ruby:2.4.2-jessie-node + steps: + - checkout + - run: gem install awesome_bot + - run: awesome_bot --allow-redirect --allow-dupe --allow-ssl -w ipfs.io README.md + build: docker: - image: circleci/node:10.15.1-browsers @@ -38,8 +46,19 @@ jobs: workflows: version: 2 + check-links: + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - master + jobs: + - awesome build-deploy: jobs: + - awesome - build - deploy: context: ipfs-dns-deploy diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cd3108b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: ruby -rvm: - - 2.2 -before_script: - - gem install awesome_bot -script: - - awesome_bot --allow-redirect --allow-dupe --allow-ssl README.md From 6f15e77ed672bd081fdde1fe7ba5f8e6b6c35332 Mon Sep 17 00:00:00 2001 From: Daniel Aleksandersen Date: Tue, 30 Apr 2019 16:04:47 +0200 Subject: [PATCH 13/14] Add Eternum.io (#229) --- README.md | 1 + data/apps.yaml | 5 +++++ src/static/images/eternum.png | Bin 0 -> 46908 bytes 3 files changed, 6 insertions(+) create mode 100644 src/static/images/eternum.png diff --git a/README.md b/README.md index 3fc47b3..6183b05 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el - [digx](https://www.dgx.io/) - Digix is an asset-tokenisation platform built on Ethereum and IPFS. - [dtube](https://d.tube) - Distributed video sharing with steem.it intergrations, using ipfs for backend storage. - [enzypt.io](https://enzypt.io/) - A website to buy and sell files through Ethereum and IPFS. [Source](https://github.com/flex-dapps/enzypt) +- [Eternum](https://www.eternum.io/) - Paid pinning service with an easy-to-use API. - [Ethlance](http://ethlance.com) - First completely decentralised job market platform built on Ethereum and IPFS. [Source](https://github.com/madvas/ethlance) - [git-ipfs-rehost](https://github.com/whyrusleeping/git-ipfs-rehost) - A script to rehost your git repos in ipfs. - [Global Upload](https://globalupload.io/) - File transportation service for IPFS, upload files to the future of distributed web. diff --git a/data/apps.yaml b/data/apps.yaml index ff8f991..6986bcf 100644 --- a/data/apps.yaml +++ b/data/apps.yaml @@ -73,6 +73,11 @@ content: description: > Distributed video sharing with steem.it intergrations, using ipfs for backend storage. + - title: Eternum + website: https://www.eternum.io/ + picture: /images/eternum.png + description: > + Paid pinning service with an easy-to-use API. - title: Ethlance website: http://ethlance.com source: https://github.com/madvas/ethlance diff --git a/src/static/images/eternum.png b/src/static/images/eternum.png new file mode 100644 index 0000000000000000000000000000000000000000..1c5e67b68cbee54fba2f6c26869f84d8013099b9 GIT binary patch literal 46908 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

kmb=W3f$AWLRsya8Z+&#IEJi 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 Date: Tue, 30 Apr 2019 17:35:30 +0100 Subject: [PATCH 14/14] feat: clean up (a lot) (#247) License: MIT Signed-off-by: Henrique Dias --- .gitignore | 2 - Makefile | 6 -- package.json | 34 ++++---- scripts/data.js | 29 +++++-- scripts/make-data.js | 138 +++++++------------------------ scripts/make-readme.js | 10 +-- scripts/utils.js | 5 +- src/layouts/_default/baseof.html | 15 ++-- src/layouts/_default/list.html | 9 -- src/layouts/_default/single.html | 3 + src/layouts/index.html | 8 +- src/layouts/partials/list.html | 119 +++++++++++++------------- 12 files changed, 141 insertions(+), 237 deletions(-) delete mode 100644 Makefile delete mode 100644 src/layouts/_default/list.html create mode 100644 src/layouts/_default/single.html diff --git a/.gitignore b/.gitignore index 6789b40..3a106de 100644 --- a/.gitignore +++ b/.gitignore @@ -27,9 +27,7 @@ stroke*.svg public dist /src/resources -/src/data /src/content -/src/layouts/partials/indexes /src/static/fonts /src/static/app.css /src/static/app.js diff --git a/Makefile b/Makefile deleted file mode 100644 index b9a954c..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -build: - npm --version - node --version - npm install - npm run lint - npm run build \ No newline at end of file diff --git a/package.json b/package.json index 4de646d..f2ebcee 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "1.0.0", "private": true, "dependencies": { - "ipfs-css": "^0.5.2", - "lunr": "^2.3.0", - "tachyons": "^4.10.0" + "ipfs-css": "^0.12.0", + "lunr": "^2.3.6", + "tachyons": "^4.11.1" }, "scripts": { "start": "node ./scripts/dev.js", @@ -18,24 +18,22 @@ "build:css": "postcss --no-map --use postcss-import cssnano -o src/static/app.css src/css/*.css", "build:js": "browserify -g uglifyify src/js/app.js -o src/static/app.js", "build:data": "node ./scripts/make-data.js", - "build:hugo": "hugo -s src -d ../public --cleanDestinationDir", - "build:minify": "html-minifier --input-dir=./public --output-dir=./public --file-ext=html --collapse-whitespace --remove-comments" + "build:hugo": "hugo -s src -d ../public --cleanDestinationDir --minify --gc" }, "devDependencies": { - "babel-eslint": "^8.2.6", - "browserify": "^16.2.2", - "chokidar": "^2.0.4", - "cssnano": "^4.0.1", - "ecstatic": "^3.2.1", - "fs-extra": "^6.0.1", - "html-minifier": "^3.5.19", - "hugo-bin": "^0.29.0", - "node-yaml": "^3.1.1", - "npm-run-all": "^4.1.3", - "postcss-cli": "^5.0.1", - "postcss-import": "^11.1.0", + "babel-eslint": "^10.0.1", + "browserify": "^16.2.3", + "chokidar": "^2.1.5", + "cssnano": "^4.1.10", + "ecstatic": "^4.1.2", + "fs-extra": "^7.0.1", + "hugo-bin": "^0.43.4", + "node-yaml": "^3.2.0", + "npm-run-all": "^4.1.5", + "postcss-cli": "^6.1.2", + "postcss-import": "^12.0.1", "shx": "^0.3.2", - "standard": "^11.0.1", + "standard": "^12.0.1", "uglifyify": "^5.0.1", "watch": "^1.0.2" }, diff --git a/scripts/data.js b/scripts/data.js index 6b6932d..6965e32 100644 --- a/scripts/data.js +++ b/scripts/data.js @@ -1,23 +1,34 @@ const fs = require('fs') -const path = require('path') +const { join } = require('path') const yaml = require('node-yaml') -const { sortAbc } = require('./utils') -const dataDir = path.join(__dirname, '../data') +const { sortAbc, sortInv, slugify } = require('./utils') +const dir = join(__dirname, '../data') const trimIfExists = (str) => str ? str.trim() : undefined -const files = fs.readdirSync(dataDir) - .map(file => path.join(dataDir, file)) +module.exports = fs.readdirSync(dir) + .map(file => join(dir, file)) .map(file => yaml.readSync(file)) .map(file => { - file.content = file.content.map(({ title, description, ...file }) => ({ + file.slug = slugify(file.title) + file.type = 'category' + + file.content = file.content.map(({ title, description, ...meta }, i) => ({ + ...meta, title: trimIfExists(title), description: trimIfExists(description), - ...file + category: file.slug, + color: file.color, + index: i })) + let sort = (a, b) => sortAbc(a.title, b.title) + + if (file.slug === 'articles') { + sort = (a, b) => sortInv(a.date, b.date) + } + + file.content = file.content.sort(sort) return file }) .sort((a, b) => sortAbc(a.title, b.title)) - -module.exports = files diff --git a/scripts/make-data.js b/scripts/make-data.js index 967e70e..9a8ff93 100644 --- a/scripts/make-data.js +++ b/scripts/make-data.js @@ -1,126 +1,50 @@ const lunr = require('lunr') const fs = require('fs-extra') -const path = require('path') -const { slugify, capitalize, sortAbc } = require('./utils') +const { join } = require('path') -const dataDir = path.join(__dirname, '../src/data') -const contentDir = path.join(__dirname, '../src/content') -const indexesDir = path.join(__dirname, '../src/layouts/partials/indexes') +function getData () { + let data = require('./data') -const processDataType = (data) => { - const content = data.content.map(info => { - const { website, ...more } = info - - return { - website: website, - categories: [data.title.toLowerCase()], - ...more - } + data.push({ + title: 'Awesome IPFS', + slug: '_index', + content: data + .reduce((arr, cat) => arr.concat(cat.content), []) + .map((el, i) => ({ + ...el, + index: i + })) }) - delete data.content - - return { - info: { ...data }, - content: content - } + data.forEach(makeIndex) + return data } -const writeContentFile = (data) => { - const basename = slugify(data.title) - const filename = path.join(contentDir, `${basename}.md`) - - fs.writeFileSync(filename, JSON.stringify(data)) -} - -const makeIndex = (data) => { - const indexes = { 'index': [] } - - const checkField = (field, el) => { - if (Array.isArray(el[field])) { - el[field].forEach(t => { - const key = `${field}_${t}` - - if (indexes[key]) { - indexes[key].push(el.index) - } else { - indexes[key] = [el.index] - } - }) - } - } - - data.forEach(el => { - indexes.index.push(el.index) - checkField('tags', el) - checkField('categories', el) - }) - - data = data.map(({index, title, description = '', tags = [], categories = []}) => ({ +function makeIndex (category) { + const data = category.content.map(({ index, title, description = '', tags = [], category = '' }) => ({ ref: index, - data: `${title} ${description} ${tags.join(' ')} ${categories.join(' ')}` + data: `${title} ${description} ${tags.join(' ')} ${category}` })) - for (const index in indexes) { - const idx = lunr(function () { - this.ref('ref') - this.field('data') - - indexes[index].map(i => data[i]).forEach(this.add.bind(this)) - }) - - const file = path.join(indexesDir, index + '.html') - const json = JSON.stringify(idx).replace(`'`, `\\'`) - - fs.writeFileSync(file, ``) - } + category.index = lunr(function () { + this.ref('ref') + this.field('data') + data.forEach(this.add.bind(this)) + }) } const process = () => { - fs.ensureDirSync(dataDir) - fs.ensureDirSync(contentDir) - fs.ensureDirSync(indexesDir) - fs.emptyDirSync(dataDir) - fs.emptyDirSync(contentDir) - fs.emptyDirSync(indexesDir) + const dir = join(__dirname, '../src/content') + fs.ensureDirSync(dir) + fs.emptyDirSync(dir) - let data = [] - let types = [] - let typesObj = {} + const data = getData() - require('./data') - .map(processDataType) - .forEach(({info, content}) => { - types.push(info) - data.push(content) - }) - - data = data.reduce((a, v) => a.concat(v), []) - .sort((a, b) => sortAbc(a.title, b.title)) - .map((v, i) => { v.index = i; return v }) - - data.forEach(writeContentFile) - makeIndex(data) - - types = types.map(t => { - t.title = capitalize(t.title) - return t - }).sort((a, b) => { - if (a.weight < b.weight) { - return -1 - } - - if (a.weight > b.weight) { - return 1 - } - - return 0 - }).forEach(type => { - typesObj[type.title.toLowerCase()] = type - }) - - const pt = path.join(dataDir, 'categories.json') - fs.writeFileSync(pt, JSON.stringify(typesObj)) + for (const { index, slug, ...meta } of data) { + const filename = join(dir, slug + '.md') + fs.writeFileSync(filename, `${JSON.stringify(meta)} +`) + } } process() diff --git a/scripts/make-readme.js b/scripts/make-readme.js index 9aae10e..34b5179 100644 --- a/scripts/make-readme.js +++ b/scripts/make-readme.js @@ -3,18 +3,12 @@ const path = require('path') const files = require('./data') const readme = path.join(__dirname, '../README.md') const template = path.join(__dirname, 'readme-template.md') -const { slugify, sortInv, sortAbc } = require('./utils') +const { slugify } = require('./utils') const toc = files.map(cat => `- [${cat.title}](#${slugify(cat.title)})`).join('\n') const sections = files.map(category => { - let sort = (a, b) => sortAbc(a.title, b.title) - - if (category.title === 'Articles') { - sort = (a, b) => sortInv(a.date, b.date) - } - - const content = category.content.sort(sort).map(item => { + const content = category.content.map(item => { let block = '- ' let mainUrl = '' diff --git a/scripts/utils.js b/scripts/utils.js index 72bd658..3573363 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -20,12 +20,9 @@ const slugify = (text) => text.toString() .replace(/^-+/, '') .replace(/-+$/, '') -const capitalize = (text) => `${text.charAt(0).toUpperCase()}${text.slice(1).toLowerCase()}` - module.exports = { sort, sortInv, sortAbc, - slugify, - capitalize + slugify } diff --git a/src/layouts/_default/baseof.html b/src/layouts/_default/baseof.html index 875a157..ed673f5 100644 --- a/src/layouts/_default/baseof.html +++ b/src/layouts/_default/baseof.html @@ -11,15 +11,12 @@ IPFS

Awesome IPFS

- - {{ $site := .Site }} - {{ range $name, $taxonomy := .Site.Taxonomies.categories }} - {{ $color := (index $site.Data.categories $name).color }} - {{ $icon := print (index $site.Data.categories $name).icon ".svg" }} - - {{ partial (print "icons/" $icon ) }} - {{ $name }} + + {{ range (where .Site.Pages "Type" "category") }} + + {{ partial (print "icons/" .Params.icon ".svg" ) }} + {{ .Title }} {{ end }} diff --git a/src/layouts/_default/list.html b/src/layouts/_default/list.html deleted file mode 100644 index 913007d..0000000 --- a/src/layouts/_default/list.html +++ /dev/null @@ -1,9 +0,0 @@ -{{ define "main" }} - -{{- $p1 := (print .Data.Plural "_") -}} -{{- $p2 := lower .Title -}} -{{- $partial := print $p1 $p2 -}} -{{- partial "list" .Data.Pages -}} -{{- partial (print "indexes/" $partial) -}} - -{{ end }} diff --git a/src/layouts/_default/single.html b/src/layouts/_default/single.html new file mode 100644 index 0000000..c9f00c1 --- /dev/null +++ b/src/layouts/_default/single.html @@ -0,0 +1,3 @@ +{{ define "main" }} +{{ partial "list" . }} +{{ end }} diff --git a/src/layouts/index.html b/src/layouts/index.html index 265d3a0..c9f00c1 100644 --- a/src/layouts/index.html +++ b/src/layouts/index.html @@ -1,7 +1,3 @@ -{{ define "main" }} - -{{ partial "list" .Pages }} -{{ partial "indexes/index" }} - +{{ define "main" }} +{{ partial "list" . }} {{ end }} - diff --git a/src/layouts/partials/list.html b/src/layouts/partials/list.html index aa09419..3952728 100644 --- a/src/layouts/partials/list.html +++ b/src/layouts/partials/list.html @@ -12,74 +12,75 @@
- {{ range (sort . "Params.index") -}} -
- {{ $cat := index .Params.categories 0 }} - {{ $color := (index .Site.Data.categories $cat).color }} -
- {{ humanize $cat }} + {{ range (sort .Params.content "index") -}} +
+
+ {{ humanize .category }} +
+ +
+
+
+ +

{{- .title -}}

+ +
-
-
-
- -

{{- .Title -}}

- -
-
+ {{- if isset . "date" -}} + {{ template "text" dateFormat "January 2, 2006" .date }} + {{- end -}} - {{- if isset .Params "date" -}} - {{ template "text" .Date.Format "January 2, 2006" }} - {{- end -}} + {{- if isset . "description" -}} + {{ template "text" .description }} + {{- end -}} - {{- if isset .Params "description" -}} - {{ template "text" .Params.description }} - {{- end -}} + {{- if isset . "size" -}} + {{ template "text" (print "Size: " .size) }} + {{- end -}} - {{- if isset .Params "size" -}} - {{ template "text" (print "Size: " .Params.size) }} - {{- end -}} - - {{- if isset .Params "hash" -}} -
- - - {{ $length := sub (len .Params.hash) 5 }} - {{ substr .Params.hash 0 10 }}...{{ substr .Params.hash $length 5 }} - - -
- {{- end -}} - - {{- if isset .Params "picture" -}} + {{- if isset . "hash" -}}
- - + + + {{ $length := sub (len .hash) 5 }} + {{ substr .hash 0 10 }}...{{ substr .hash $length 5 }} +
- {{ end }} + {{- end -}} -
- {{- if isset .Params "website" -}} - - {{ partial "icons/globe.svg" }} - - {{- end -}} - - {{- if isset .Params "source" -}} - - {{ partial "icons/code.svg" }} - - {{- end -}} - - {{- if isset .Params "demo" -}} - - {{ partial "icons/flask.svg" }} - - {{- end -}} -
+ {{- if isset . "picture" -}} +
+ + +
-
+ {{ end }} + +
+ {{- if isset . "website" -}} + + {{ partial "icons/globe.svg" }} + + {{- end -}} + + {{- if isset . "source" -}} + + {{ partial "icons/code.svg" }} + + {{- end -}} + + {{- if isset . "demo" -}} + + {{ partial "icons/flask.svg" }} + + {{- end -}} +
+ +
+
{{ end }}
+ +{{ .Content }} \ No newline at end of file