on master help sign in
Grants reorg (#639)
8d9c85dmikeosborne
content/grants/apprenticeships/ua-3rd-party-software-distribution.mdnew file+50
@@ -0,0 +1,50 @@
1++++
2+title = "Apprenticeship: 3rd Party Software Distribution"
3+date = 2021-02-01
4+[taxonomies]
5+grant_type = ["apprenticeships"]
6+grant_category = ["App Dev: Core"]
7+[extra]
8+image = ""
9+description = "3rd party software distribution infrastructure"
10+reward = 5
11+mentor = "~wolref-podlex"
12+assignee = "~sovmep-ripsum"
13+completed = false
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0025"
15++++
16+
17+## Scope
18+
19+Ultimate goal: 3rd party software distribution
20+
21+Key results:
22+- Virtual desks
23+- Tools to manipulate and inspect them
24+
25+Background reading:
26+- Thread about 3rd party software distribution: https://groups.google.com/a/urbit.org/g/dev/c/zNK_-Z4gDNk/m/FM4PP2kxCAAJ
27+- Description of merge strategies: https://github.com/urbit/urbit/blob/729802102b788fd51e4e9afe8580b370f5119073/pkg/arvo/gen/hood/merge/help.txt
28+
29+Step 1 is to build a simple tool to see the difference between desks. For an example of a file diff, try running `-diff %/app/lens/hoon %/app/glob/hoon`. Mainly, we want a recursive version of that, with options to display the full diff or just list the files which changed. Ideally we'd also have a 3-way diff, but that could be delayed.
30+
31+Step 2 is the hard one: as described in that urbit-dev thread, add "virtual" desks to clay. These represent the continual merge of several other desks. Their main properties are:
32+
33+- No committing directly to the desk, the only permitted manual modification is to change the list of source desks (including order and merge strategy)
34+- Every time a source desk is updated, the next commit is a brand new merge of all the source desks, in order according to their merge strategy. Possibly the previous version should also be listed as a parent.
35+- The list of source desks is ordered, includes a merge strategy, and each desk may be pinned to a revision.
36+
37+Step 3 is to make the %home desk virtual. There should probably be another local desk which is a source of %home for local modifications. This step could be a bit finicky but shouldn't be too hard.
38+
39+With these steps complete, the infrastructure side of 3rd party software distribution should be complete.
40+
41+Future work:
42+- UI stuff
43+- Port forward pottery for debugging (https://github.com/urbit/pottery)
44+
45+## Compensation
46+
47+* Parts 1 & 2: Two stars, one awarded after a month of work, another awarded after completion of Part 2.
48+* Part 3: One star awarded after one month of work, two additional stars awarded after completion of Part 3, which is completion of the project.
49+* Total: 5 stars for ~2.5 months of estimated work.
50+* "One month of work," if not resulting in a finished milestone, will be evaluated by the Tlon engineer working on the project with you for determination of reward eligibility.
content/grants/ua-collaborative-text-editor.md → content/grants/apprenticeships/ua-collaborative-text-editor.mdrenamed

The content is the same.

content/grants/ua-filesharer.md → content/grants/apprenticeships/ua-filesharer.mdrenamed

The content is the same.

content/grants/ua-heads-up-poker.md → content/grants/apprenticeships/ua-heads-up-poker.mdrenamed

The content is the same.

content/grants/ua-invoice-system.md → content/grants/apprenticeships/ua-invoice-system.mdrenamed

The content is the same.

content/grants/ua-marketplace.md → content/grants/apprenticeships/ua-marketplace.mdrenamed

The content is the same.

content/grants/analytics-script.md → content/grants/bounties/analytics-script.mdrenamed

The content is the same.

content/grants/antechamber.md → content/grants/bounties/antechamber.mdrenamed

The content is the same.

content/grants/bart-train-tracker-landscape-tile.md → content/grants/bounties/bart-train-tracker-landscape-tile.mdrenamed

The content is the same.

content/grants/bitcoin-full-node-provider-and-wallet.md → content/grants/bounties/bitcoin-full-node-provider-and-wallet.mdrenamed

The content is the same.

content/grants/bitcoin-key-derivation.md → content/grants/bounties/bitcoin-key-derivation.mdrenamed

The content is the same.

content/grants/bitcoin-node-json-rpc-api-part-1.md → content/grants/bounties/bitcoin-node-json-rpc-api-part-1.mdrenamed

The content is the same.

content/grants/bitcoin-node-json-rpc-api-part-2.md → content/grants/bounties/bitcoin-node-json-rpc-api-part-2.mdrenamed

The content is the same.

content/grants/bitcoin-node-json-rpc-api-part-3.md → content/grants/bounties/bitcoin-node-json-rpc-api-part-3.mdrenamed

The content is the same.

content/grants/bitcoin-node-json-rpc-api-part-4.md → content/grants/bounties/bitcoin-node-json-rpc-api-part-4.mdrenamed

The content is the same.

content/grants/bitcoin-wallet-on-bridge.md → content/grants/bounties/bitcoin-wallet-on-bridge.mdrenamed

The content is the same.

content/grants/boston-t-train-tracker-landscape-tile.md → content/grants/bounties/boston-t-train-tracker-landscape-tile.mdrenamed

The content is the same.

content/grants/bounties/bounty-vane-documentation.mdnew file+95
@@ -0,0 +1,95 @@
1++++
2+title = "Create Vane Documentation"
3+date = 2021-03-01
4+[taxonomies]
5+grant_type = ["bounties"]
6+grant_category = ["Documentation"]
7+[extra]
8+image = ""
9+description = "Create vane documentation for clay, eyer, iris, jael, and behn"
10+reward = 5
11+assignee = "~tinnus-napbus"
12+id = ""
13+completed = false
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0025&prefill_Grant+Name=Create%20vane%20Documentation"
15++++
16+
17+## Overview
18+
19+Creating and maintaining great documentation is an ongoing challenge for any project, ours included. The importance of documentation for Urbit is greater than most projects though, since so much of what we're doing is entirely novel.
20+
21+This grant will have you work within the Urbit Foundation and Tlon to improve/create select portions of our documentation over the course of three months (April, May and June).
22+
23+## Scope
24+
25+The goal over these three months is to more fully document Arvo's vanes. At present, the documentation is sporadic: some vanes have good TODO:[explanation-style] () documentation, others have good TODO:[API References] ()—some even have both. In the case of `eyre` and `clay`, which are arguably two of the most important vanes, we have neither—the explanations are outdated and overly technical, and the API reference is missing, incomplete, and outdated.
26+
27+Your task is to fill in the blanks and provide complete documentation that leaves the reader with an understanding of *how to use the vanes.* Understanding *how they work* is of secondary importance, so:
28+
29+- Explanations should be high level and light-to-free of code. The explanation should also serve to provide an overview of what kinds of capabilities the vane has in the first place.
30+- API reference for each vane should be complete
31+- Usage guides for common tasks would be very helpful
32+
33+Here's a sketch of what's probably needed for each vane in order of priority:
34+
35+### 1) [clay](https://urbit.org/docs/arvo/clay/clay)
36+
37+The clay documentation is generally out of date, and the explanations are overly geared at describing how the internals work over what the interface is and what you can do with it. Some of the explanatory material is actually pretty good (like the [Architecture](https://urbit.org/docs/arvo/clay/architecture/) doc), but much of it is too dense.
38+
39+For clay we want:
40+
41+* Proper API Reference documentation
42+* Guides for common tasks and capabilities
43+* Updated explanations of the key concepts and capabilities that [avoid becoming overly technical](https://urbit.org/docs/arvo/clay/local-reads/)
44+
45+A contributor (~sovmep-ripsum) has recently been doing a lot of work on Clay and has offered to give you some direction on this, which will be helpful coming from the perspective of someone who's recently had to learn clay. He also wrote up some [notes](https://docs.google.com/document/d/10b5oC_Jcdq7Ex4iwf0mRjquEfolmUQvbs5YFJulsXa0/edit?ts=606cddf2) which you can use.
46+
47+### 2) [eyre](https://urbit.org/docs/arvo/eyre/eyre/)
48+
49+The eyre documentation is completely out of date and needs to be rewritten, particularly where the explanation is concerned. Fortunately, you're not starting from scratch with the API documentation, for which there's an [open PR](https://github.com/urbit/docs/pull/981) that needs to be brought through to completion.
50+
51+For eyre we want:
52+
53+* Complete API Reference documentation
54+* Guides for common tasks and capabilities
55+* Explanations of key concepts and capabilities
56+
57+### 3) [iris](https://urbit.org/docs/arvo/iris/)
58+
59+Iris has no explanation whatsoever, but does have an API reference.
60+
61+For iris we want:
62+
63+* Explanations of key concepts and capabilities
64+* Guides for common tasks and capabilities
65+
66+### 4) [jael](https://urbit.org/docs/arvo/jael)
67+
68+Jael has no explanation whatsoever, but does have an API reference.
69+
70+For jael we want:
71+
72+* Explanations of key concepts and capabilities
73+* Guides for common tasks and capabilities
74+
75+### 5) [behn](https://urbit.org/docs/arvo/behn/behn/), [dill](https://urbit.org/docs/arvo/dill/dill), [ames](https://urbit.org/docs/arvo/ames/ames)
76+
77+These vanes already have either minimal but viable explanations (behn, dill) or very good explanations (ames). They've all also got API Reference docs. None of them have usage guides that demonstrate how to work with the APIs though.
78+
79+Adding more documentation to these vanes is lowest priority, but if you have ideas for contribution they'd be welcome.
80+
81+## Requirements/Resources
82+
83+Work should be submitted as pull requests against the [docs](https://github.com/urbit/docs) repository, and is to be considered complete upon review and merge.
84+
85+You'll work with the Director of urbit.org and the Tlon docs team regularly, and should expect to meet weekly or biweekly to check in and share progress. Access to Tlon's infrastructure engineers will be provided for whenever you have technical questions.
86+
87+## Compensation
88+
89+We're targeting a three month period to complete the above, but may seek to extend the engagement. During this time, compensation is as follows:
90+
91+* One star for completion of clay docs
92+* One star for completion of eyre docs
93+* One star for completion of iris and jael docs
94+* One star upon completion of all of the above docs
95+* One additional star awarded at the director's discretion for exemplary work
content/grants/content-saver.md → content/grants/bounties/content-saver.mdrenamed

The content is the same.

content/grants/cta-train-tracker-landscape-tile.md → content/grants/bounties/cta-train-tracker-landscape-tile.mdrenamed

The content is the same.

content/grants/display-eth-data.md → content/grants/bounties/display-eth-data.mdrenamed

The content is the same.

content/grants/educational-guide-todomvc-urbit-edition.md → content/grants/bounties/educational-guide-todomvc-urbit-edition.mdrenamed

The content is the same.

content/grants/ethereum-abi-parser.md → content/grants/bounties/ethereum-abi-parser.mdrenamed

The content is the same.

content/grants/gall-api-documentation.md → content/grants/bounties/gall-api-documentation.mdrenamed

The content is the same.

content/grants/go-airlock-library.md → content/grants/bounties/go-airlock-library.mdrenamed

The content is the same.

content/grants/haskell-airlock-library.md → content/grants/bounties/haskell-airlock-library.mdrenamed

The content is the same.

content/grants/host-three-college-university-urbit-meetups-1.md → content/grants/bounties/host-three-college-university-urbit-meetups-1.mdrenamed

The content is the same.

content/grants/host-three-college-university-urbit-meetups-2.md → content/grants/bounties/host-three-college-university-urbit-meetups-2.mdrenamed

The content is the same.

content/grants/host-three-college-university-urbit-meetups-3.md → content/grants/bounties/host-three-college-university-urbit-meetups-3.mdrenamed

The content is the same.

content/grants/host-three-virtual-urbit-meetups.md → content/grants/bounties/host-three-virtual-urbit-meetups.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-1.md → content/grants/bounties/host-two-urbit-meetups-1.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-10.md → content/grants/bounties/host-two-urbit-meetups-10.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-11.md → content/grants/bounties/host-two-urbit-meetups-11.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-2.md → content/grants/bounties/host-two-urbit-meetups-2.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-3.md → content/grants/bounties/host-two-urbit-meetups-3.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-4.md → content/grants/bounties/host-two-urbit-meetups-4.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-5.md → content/grants/bounties/host-two-urbit-meetups-5.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-6.md → content/grants/bounties/host-two-urbit-meetups-6.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-7.md → content/grants/bounties/host-two-urbit-meetups-7.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-8.md → content/grants/bounties/host-two-urbit-meetups-8.mdrenamed

The content is the same.

content/grants/host-two-urbit-meetups-9.md → content/grants/bounties/host-two-urbit-meetups-9.mdrenamed

The content is the same.

content/grants/matrices-in-hoon.md → content/grants/bounties/matrices-in-hoon.mdrenamed

The content is the same.

content/grants/network-explorer-data-pipeline-http-api.md → content/grants/bounties/network-explorer-data-pipeline-http-api.mdrenamed

The content is the same.

content/grants/open-street-maps-data-importation.md → content/grants/bounties/open-street-maps-data-importation.mdrenamed

The content is the same.

content/grants/overhaul-the-urbitorg-website.md → content/grants/bounties/overhaul-the-urbitorg-website.mdrenamed

The content is the same.

content/grants/staff-the-urbit-help-desk-1.md → content/grants/bounties/staff-the-urbit-help-desk-1.mdrenamed

The content is the same.

content/grants/staff-the-urbit-help-desk-2.md → content/grants/bounties/staff-the-urbit-help-desk-2.mdrenamed

The content is the same.

content/grants/staff-the-urbit-helpdesk-east.md → content/grants/bounties/staff-the-urbit-helpdesk-east.mdrenamed

The content is the same.

content/grants/staff-the-urbit-helpdesk-west.md → content/grants/bounties/staff-the-urbit-helpdesk-west.mdrenamed

The content is the same.

content/grants/thread-documentation.md → content/grants/bounties/thread-documentation.mdrenamed

The content is the same.

content/grants/tor-nodes-relay-search-tile.md → content/grants/bounties/tor-nodes-relay-search-tile.mdrenamed

The content is the same.

content/grants/typescript-airlock-library.md → content/grants/bounties/typescript-airlock-library.mdrenamed

The content is the same.

content/grants/ucal-google-and-outlook-integration.md → content/grants/bounties/ucal-google-and-outlook-integration.mdrenamed

The content is the same.

content/grants/udon-syntax-highlighter.md → content/grants/bounties/udon-syntax-highlighter.mdrenamed

The content is the same.

content/grants/unit-tests-for-json-parsing.md → content/grants/bounties/unit-tests-for-json-parsing.mdrenamed

The content is the same.

content/grants/unit-tests-for-pure-algorithms.md → content/grants/bounties/unit-tests-for-pure-algorithms.mdrenamed

The content is the same.

content/grants/unit-tests-for-sha-functions.md → content/grants/bounties/unit-tests-for-sha-functions.mdrenamed

The content is the same.

content/grants/unit-tests-for-zuse-cryptographic-functions.md → content/grants/bounties/unit-tests-for-zuse-cryptographic-functions.mdrenamed

The content is the same.

content/grants/urbit-community-concierge-east-coast-2q2021.md → content/grants/bounties/urbit-community-concierge-east-coast-2q2021.mdrenamed

The content is the same.

content/grants/urbit-community-concierge-east-coast.md → content/grants/bounties/urbit-community-concierge-east-coast.mdrenamed

The content is the same.

content/grants/urbit-community-concierge-west-coast-2q2021.md → content/grants/bounties/urbit-community-concierge-west-coast-2q2021.mdrenamed

The content is the same.

content/grants/urbit-community-concierge-west-coast.md → content/grants/bounties/urbit-community-concierge-west-coast.mdrenamed

The content is the same.

content/grants/verifying-urbit-id-on-keybase.md → content/grants/bounties/verifying-urbit-id-on-keybase.mdrenamed

The content is the same.

content/grants/video-content-manager.md → content/grants/bounties/video-content-manager.mdrenamed

The content is the same.

content/grants/volt-lightning-on-urbit.md → content/grants/bounties/volt-lightning-on-urbit.mdrenamed

The content is the same.

content/grants/web-scraper.md → content/grants/bounties/web-scraper.mdrenamed

The content is the same.

content/grants/calendar-ui.mddeleted−53
@@ -1,53 +0,0 @@
1−+++
2−title = "Calendar UI"
3−date = 2020-07-16
4−[taxonomies]
5−grant_type = ["proposals"]
6−grant_category = ["App Dev: Arvo"]
7−[extra]
8−image = ""
9−description = "Build a Landscape-native calendar UI"
10−reward = 2
11−assignee = "finled-bansel"
12−id = "1555464949"
13−completed = false
14−link = ""
15−+++
16−
17−# Purpose
18−
19−A calendar is an indispensible personal tool to many people. A [previous proposal](https://grants.urbit.org/proposals/1851255517) has started work on an Urbit-native calendar. This previous proposal seeks to create a parser and a Gall agent to manage the data layer of a calendar app.
20−
21−The current proposal aims to create a Landscape tile and app to improve the accessibility of a Calendar Gall app. The Calendar UI will provide several screens to interact with the calendar. These are a monthly view, a daily view and a page to create new events.
22−
23−# Implementation and deliverables
24−
25−The UI will be backed by the calendar app implementation described in the aforementioned previous proposal. In order to allow the parallel implementation of a UI and the Gall app, this proposal will be executed in two stages.
26−
27−The first stage is the development of working prototypes of the screens that the calendar will initially support. These include:
28− - a monthly view with clickable dates to daily views;
29− - a daily view that lists the events in chronological order with a short description
30− - a form to create new events with fields for the required properties per RFC 5545.
31−
32−The deliverables will be functional web pages that can be integrated with Landscape. The screens will be built entirely with components from the [Indigo-react](https://github.com/urbit/indigo-react) library.
33−The UI will be built with the assumption that event participants are ships.
34−
35−The second stage is to integrate the screens with the Gall agent implemented as part of the first proposal. This takes a dependency on a correctly functioning calendar Gall app. The requisite
36−
37−# Basis for future integration
38−
39−These pages can provide the basis for UX experiments and integrations with other parts of Landscape. One possibility is to integrate notebook posts with the timeline of a calendar, allowing a temporal exploration of the notebook posts a ship has seen.
40−
41−## Milestones
42−
43−
44−### Functional pages
45−1 stars
46−Build the necessary pages that will allow Landscape to interact with a Calendar Gall app
47−
48−
49−### Working integration with Gall app
50−1 stars
51−Fully capable of importing an .ics calendar, creating new events, looking through existing events in the calendar of a ship.
52−
53−
content/grants/a-book-about-urbit.md → content/grants/proposals/a-book-about-urbit.mdrenamed

The content is the same.

content/grants/a-collaborative-web-mapping-system-for-urbit.md → content/grants/proposals/a-collaborative-web-mapping-system-for-urbit.mdrenamed

The content is the same.

content/grants/art-by-urbit.md → content/grants/proposals/art-by-urbit.mdrenamed

The content is the same.

content/grants/proposals/calendar-ui.mdnew file+54
@@ -0,0 +1,54 @@
1++++
2+title = "Calendar UI"
3+date = 2021-01-01
4+[taxonomies]
5+grant_type = ["proposals"]
6+grant_category = ["App Dev: Other"]
7+[extra]
8+image = ""
9+description = "Develop a UI for improved access to the Calendar Gall app"
10+reward = 3
11+assignee = "~fabnev-hinmur"
12+grants_id = ""
13+completed = true
14++++
15+
16+
17+## Purpose
18+
19+A calendar is an indispensible personal tool to many people. A previous proposal has started work on an Urbit-native calendar.
20+This previous proposal seeks to create a parser and a Gall agent to manage the data layer of a calendar app.
21+
22+The current proposal aims to create a Landscape tile and app to improve the accessibility of a Calendar Gall app.
23+The Calendar UI will provide several screens to interact with the calendar. These are a daily view, weekly view, monthly view,
24+and yearly view, along with pages to create and edit calendars and events.
25+
26+## Deliverables
27+
28+The UI will be backed by the Gall calendar app implementation (now known as 'ucal') mentioned above. The UI design will be
29+based on the Google Calendar layout and built with components from the Indigo-react library.
30+
31+The UI will be written in Typescript with the React framework, following the Landscape structure as much as possible. The goal is to have a UI that can be incorporated as part of Landscape if desired.
32+
33+List of Features:
34+
35+1. Daily View
36+2. Weekly View
37+3. Monthly View
38+4. Yearly View
39+5. Create / Edit Calendar View
40+6. Create / Edit Event View
41+7. Full CRUD operations for calendars
42+8. Full CRUD operations for events
43+9. Toggle calendar display
44+
45+## Future features
46+
47+There will be additional UI features necessary to allow users to interact with other ships' calendars. Specifically, retrieving events that a user is invited to, RSVPing to events, subscribing to other ships' calendars, modifying other calendars with requisite permissions, and perhaps requesting additional permissions on other calendars. Many of these features are in progress but still require significant development and testing.
48+
49+
50+## Milestones
51+
52+Completion of all 9 features: 3 stars
53+
54+
content/grants/calendar.md → content/grants/proposals/calendar.mdrenamed

The content is the same.

content/grants/comprehensive-local-server-and-mum-explanation-video.md → content/grants/proposals/comprehensive-local-server-and-mum-explanation-video.mdrenamed

The content is the same.

content/grants/cross-platform-desktop-urbit-app.md → content/grants/proposals/cross-platform-desktop-urbit-app.mdrenamed

The content is the same.

content/grants/docker-image-for-cloud-container-orchestration.md → content/grants/proposals/docker-image-for-cloud-container-orchestration.mdrenamed

The content is the same.

content/grants/escape.md → content/grants/proposals/escape.mdrenamed

The content is the same.

content/grants/graph-store-documentation-guide.md → content/grants/proposals/graph-store-documentation-guide.mdrenamed

The content is the same.

content/grants/hoon-001-learner-efficiency-and-early-learner-resources.md → content/grants/proposals/hoon-001-learner-efficiency-and-early-learner-resources.mdrenamed

The content is the same.

content/grants/links-in-urbit-reference-docs.md → content/grants/proposals/links-in-urbit-reference-docs.mdrenamed

The content is the same.

content/grants/llelogram.md → content/grants/proposals/llelogram.mdrenamed

The content is the same.

content/grants/matrixriotim-bridge-bot.md → content/grants/proposals/matrixriotim-bridge-bot.mdrenamed

The content is the same.

content/grants/minimal-urbit-os.md → content/grants/proposals/minimal-urbit-os.mdrenamed

The content is the same.

content/grants/ragnarok-online-on-urbit.md → content/grants/proposals/ragnarok-online-on-urbit.mdrenamed

The content is the same.

content/grants/search-in-groups.md → content/grants/proposals/search-in-groups.mdrenamed

The content is the same.

content/grants/-smol-future-sustained-knowledge-sharing-and-marketing.md → content/grants/proposals/smol-future-sustained-knowledge-sharing-and-marketing.mdrenamed

The content is the same.

content/grants/the-complete-guide-to-gall-and-landscape.md → content/grants/proposals/the-complete-guide-to-gall-and-landscape.mdrenamed

The content is the same.

content/grants/translate-key-parts-of-urbitorg-into-german.md → content/grants/proposals/translate-key-parts-of-urbitorg-into-german.mdrenamed

The content is the same.

content/grants/translate-key-parts-of-urbitorg-into-korean.md → content/grants/proposals/translate-key-parts-of-urbitorg-into-korean.mdrenamed

The content is the same.

content/grants/translate-key-parts-of-urbitorg-into-norwegian.md → content/grants/proposals/translate-key-parts-of-urbitorg-into-norwegian.mdrenamed

The content is the same.

content/grants/translate-key-parts-of-urbitorg-into-spanish.md → content/grants/proposals/translate-key-parts-of-urbitorg-into-spanish.mdrenamed

The content is the same.

content/grants/try-urbit-website.md → content/grants/proposals/try-urbit-website.mdrenamed

The content is the same.

content/grants/up-to-date-hoon-reference-card.md → content/grants/proposals/up-to-date-hoon-reference-card.mdrenamed

The content is the same.

content/grants/urbian-a-customized-linux-distribution-for-urbit-appliances.md → content/grants/proposals/urbian-a-customized-linux-distribution-for-urbit-appliances.mdrenamed

The content is the same.

content/grants/urbit-api-for-elixir.md → content/grants/proposals/urbit-api-for-elixir.mdrenamed

The content is the same.

content/grants/urbit-event-series.md → content/grants/proposals/urbit-event-series.mdrenamed

The content is the same.

content/grants/urbit-explainer-video.md → content/grants/proposals/urbit-explainer-video.mdrenamed

The content is the same.

content/grants/urbit-http-api-for-emacs-elisp.md → content/grants/proposals/urbit-http-api-for-emacs-elisp.mdrenamed

The content is the same.

content/grants/urbit-http-api-for-kotlin.md → content/grants/proposals/urbit-http-api-for-kotlin.mdrenamed

The content is the same.

content/grants/urbit-http-api-for-rust.md → content/grants/proposals/urbit-http-api-for-rust.mdrenamed

The content is the same.

content/grants/urbit-http-interface-java-edition.md → content/grants/proposals/urbit-http-interface-java-edition.mdrenamed

The content is the same.

content/grants/urbit-http-library-for-ruby.md → content/grants/proposals/urbit-http-library-for-ruby.mdrenamed

The content is the same.

content/grants/urbit-lfs-filehosting.md → content/grants/proposals/urbit-lfs-filehosting.mdrenamed

The content is the same.

content/grants/urbit-online-meetup.md → content/grants/proposals/urbit-online-meetup.mdrenamed

The content is the same.

content/grants/urbit-react-cookbook.md → content/grants/proposals/urbit-react-cookbook.mdrenamed

The content is the same.

content/grants/urbit-ship-and-star-hosting-and-troubleshooting-docs.md → content/grants/proposals/urbit-ship-and-star-hosting-and-troubleshooting-docs.mdrenamed

The content is the same.

content/grants/webrtc-gall-agent-and-external-app.md → content/grants/proposals/webrtc-gall-agent-and-external-app.mdrenamed

The content is the same.

templates/grant_type/proposals.html+8−8
@@ -37,38 +37,38 @@
37 <h1>Proposals</h1>
37 <h1>Proposals</h1>
38 <p>Community members may submit proposals for a wide range of projects that contribute to Urbit. Past proposals have spanned a wide range of topics: </p>
38 <p>Community members may submit proposals for a wide range of projects that contribute to Urbit. Past proposals have spanned a wide range of topics: </p>
39 <ul class="list mb2">
39 <ul class="list mb2">
40− <li>Development projects, like <a class="bb" href="/grants/webrtc-gall-agent-and-external-app/" target="_blank">WebRTC integration</a></li>
40+ <li>Development projects, like <a class="bb" href="/grants/proposals/webrtc-gall-agent-and-external-app/" target="_blank">WebRTC integration</a></li>
41 <li>
41 <li>
42− <a class="bb" target="_blank" href="/grants/a-book-about-urbit/">
42+ <a class="bb" target="_blank" href="/grants/proposals/a-book-about-urbit/">
43 A book about Urbit
43 A book about Urbit
44 </a>
44 </a>
45 </li>
45 </li>
46 <li>
46 <li>
47 Creation of
47 Creation of
48− <a class="bb" target="_blank" href="/grants/urbit-explainer-video/">
48+ <a class="bb" target="_blank" href="/grants/proposals/urbit-explainer-video/">
49 video
49 video
50 </a>
50 </a>
51− <a class="bb" target="_blank" href="/grants/comprehensive-local-server-and-mum-explanation-video/">
51+ <a class="bb" target="_blank" href="/grants/proposals/comprehensive-local-server-and-mum-explanation-video/">
52 content
52 content
53 </a>
53 </a>
54 </li>
54 </li>
55 <li>
55 <li>
56− <a class="bb" target="_blank" href="/grants/urbit-event-series/">
56+ <a class="bb" target="_blank" href="/grants/proposals/urbit-event-series/">
57 Production of events
57 Production of events
58 </a>
58 </a>
59 </li>
59 </li>
60 <li>
60 <li>
61− <a class="bb" target="_blank" href="/grants/urbit-online-meetup/">
61+ <a class="bb" target="_blank" href="/grants/proposals/urbit-online-meetup/">
62 Hosting meetups
62 Hosting meetups
63 </a>
63 </a>
64 </li>
64 </li>
65 <li>
65 <li>
66− <a class="bb" target="_blank" href="/grants/graph-store-documentation-guide/">
66+ <a class="bb" target="_blank" href="/grants/proposals/graph-store-documentation-guide/">
67 Writing documentation
67 Writing documentation
68 </a>
68 </a>
69 </li>
69 </li>
70 <li>
70 <li>
71− <a class="bb" target="_blank" href="/grants/hoon-001-learner-efficiency-and-early-learner-resources/">
71+ <a class="bb" target="_blank" href="/grants/proposals/hoon-001-learner-efficiency-and-early-learner-resources/">
72 Educational materials
72 Educational materials
73 </a>
73 </a>
74 </li>
74 </li>
templates/grants/list.html+8−5
@@ -12,7 +12,10 @@
12{% endblock description %}
12{% endblock description %}
13
13
14{% block content %}
14{% block content %}
15−{% set posts = get_section(path="grants/_index.md") %}
15+{% set aposts = get_section(path="grants/apprenticeships/_index.md") %}
16+{% set bposts = get_section(path="grants/bounties//_index.md") %}
17+{% set pposts = get_section(path="grants/proposals//_index.md") %}
18+{% set posts = aposts.pages | concat(with=bposts.pages) | concat(with=pposts.pages) %}
16<!-- header -->
19<!-- header -->
17<nav class="mt4 full fourth-1-lg mb3 mb0-m mb0-l mb0-xl fixed-xl">
20<nav class="mt4 full fourth-1-lg mb3 mb0-m mb0-l mb0-xl fixed-xl">
18 <a class="gray3" href="/">Urbit</a>
21 <a class="gray3" href="/">Urbit</a>
@@ -62,17 +65,17 @@
62 <div class="grid12">
65 <div class="grid12">
63
66
64 <div class="c1-13 c1-6-md c1-5-lg flex items-stretch pv3">
67 <div class="c1-13 c1-6-md c1-5-lg flex items-stretch pv3">
65− {% set page = get_page(path="grants/bitcoin-full-node-provider-and-wallet.md") %}
68+ {% set page = get_page(path="grants/bounties/bitcoin-full-node-provider-and-wallet.md") %}
66 {{ macros::grant(page=page, mode="mini") }}
69 {{ macros::grant(page=page, mode="mini") }}
67 </div>
70 </div>
68
71
69 <div class="c1-13 c6-13-md c5-9-lg flex items-stretch pv3">
72 <div class="c1-13 c6-13-md c5-9-lg flex items-stretch pv3">
70− {% set page = get_page(path="grants/webrtc-gall-agent-and-external-app.md") %}
73+ {% set page = get_page(path="grants/proposals/webrtc-gall-agent-and-external-app.md") %}
71 {{ macros::grant(page=page, mode="mini") }}
74 {{ macros::grant(page=page, mode="mini") }}
72 </div>
75 </div>
73
76
74 <div class="c1-13 c1-13-md c9-13-lg flex items-stretch pv3">
77 <div class="c1-13 c1-13-md c9-13-lg flex items-stretch pv3">
75− {% set page = get_page(path="grants/urbian-a-customized-linux-distribution-for-urbit-appliances.md") %}
78+ {% set page = get_page(path="grants/proposals/urbian-a-customized-linux-distribution-for-urbit-appliances.md") %}
76 {{ macros::grant(page=page, mode="mini") }}
79 {{ macros::grant(page=page, mode="mini") }}
77 </div>
80 </div>
78
81
@@ -87,7 +90,7 @@
87 {% endfor %}
90 {% endfor %}
88 </ul>
91 </ul>
89
92
90− {% for page in posts.pages %}
93+ {% for page in posts | sort(attribute="date") | reverse %}
91 {% if not page.extra.canceled %}
94 {% if not page.extra.canceled %}
92 {{ macros::grant(page=page, classes="full c1-10-lg mv5")}}
95 {{ macros::grant(page=page, classes="full c1-10-lg mv5")}}
93 {% endif %}
96 {% endif %}