From 69a49e4830e6d8f2f0bc4b09c1c9c93dc25d187e Mon Sep 17 00:00:00 2001 From: Wouter Termont Date: Sat, 17 Dec 2022 15:00:52 +0100 Subject: [PATCH 1/5] fix: update gemfile to work with ruby>=3.1 (use bundler>=2.3.4) Signed-off-by: Wouter Termont --- Gemfile.lock | 142 ++++++++++++++++++++++++--------------------------- _config.yml | 3 +- 2 files changed, 69 insertions(+), 76 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ffe98799a..2a4dfdca7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,57 +4,49 @@ GEM activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + async (2.3.0) + console (~> 1.10) + io-event (~> 1.1) + timers (~> 4.1) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.9) - dnsruby (1.61.7) + commonmarker (0.23.6) + concurrent-ruby (1.1.10) + console (1.16.2) + fiber-local + dnsruby (1.61.9) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.14.0) + http_parser.rb (~> 0) + ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (1.6.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday (2.7.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - ffi (1.15.3) + faraday-net_http (3.0.2) + ffi (1.15.5) + fiber-local (1.0.0) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (218) - github-pages-health-check (= 1.17.2) - jekyll (= 3.9.0) + github-pages (227) + github-pages-health-check (= 1.17.9) + jekyll (= 3.9.2) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) + jekyll-commonmark-ghpages (= 0.2.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) @@ -63,7 +55,7 @@ GEM jekyll-relative-links (= 0.6.1) jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.7.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) jekyll-theme-architect (= 0.2.0) @@ -81,35 +73,36 @@ GEM jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) - kramdown (= 2.3.1) + kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) + nokogiri (>= 1.13.6, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.2) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (>= 2.0.2, < 5.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.19.2) + html-proofer (5.0.3) addressable (~> 2.3) - mercenary (~> 0.3) - nokogumbo (~> 2.0) - parallel (~> 1.3) + async (~> 2.1) + nokogiri (~> 1.13) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) + zeitwerk (~> 2.5) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + io-event (1.1.4) + jekyll (3.9.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -130,12 +123,12 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.2.0) + commonmarker (~> 0.23.4) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 4.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) @@ -146,6 +139,8 @@ GEM jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -165,7 +160,7 @@ GEM rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) @@ -218,12 +213,12 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.6.0) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) @@ -232,30 +227,24 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) multi_json (1.15.0) - multipart-post (2.1.1) - nokogiri (1.11.7-x86_64-darwin) + nokogiri (1.13.10-x86_64-darwin) racc (~> 1.4) - nokogiri (1.11.7-x86_64-linux) + nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.20.1) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.5.2) - rainbow (3.0.0) - rb-fsevent (0.11.0) + public_suffix (4.0.7) + racc (1.6.1) + rainbow (3.1.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) rinku (1.7.3) rouge (3.26.0) - ruby-enum (0.9.0) - i18n ruby2_keywords (0.0.5) rubyzip (2.3.2) safe_yaml (1.0.5) @@ -264,30 +253,33 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + timers (4.3.5) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.1) + tzinfo-data (1.2022.7) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) wdm (0.1.1) webrick (1.7.0) yell (2.2.2) + zeitwerk (2.6.6) PLATFORMS x86_64-darwin-18 x86_64-darwin-20 + x86_64-darwin-22 x86_64-linux-musl DEPENDENCIES @@ -301,4 +293,4 @@ DEPENDENCIES webrick (~> 1.7) BUNDLED WITH - 2.2.22 + 2.3.26 diff --git a/_config.yml b/_config.yml index 29cf72645..dc544276b 100644 --- a/_config.yml +++ b/_config.yml @@ -19,7 +19,8 @@ url: 'https://solidproject.org/' twitter_username: project_solid github_username: solid repository: solid/solidproject.org -include: _redirects +include: + - _redirects # Build settings markdown: kramdown From 1d5fc76564015ace8ecf38c1e6590ffec1ce79e0 Mon Sep 17 00:00:00 2001 From: Wouter Termont Date: Sat, 17 Dec 2022 15:01:45 +0100 Subject: [PATCH 2/5] feat: add contributing page to navigation and footer Signed-off-by: Wouter Termont --- _data/footer.yml | 20 ++++++++++---------- _data/navigation.yml | 9 +++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/_data/footer.yml b/_data/footer.yml index e26ab45d6..83e100d1b 100644 --- a/_data/footer.yml +++ b/_data/footer.yml @@ -3,22 +3,18 @@ sublinks: - name: About Solid link: "/about" - - name: Using Solid - link: "/users" + - name: Specification + link: "/specification" - name: Get a Pod link: "/users/get-a-pod" - name: Solid Apps link: "/apps" + - name: Contributing + link: "/contributing" - name: Team link: "/team" - name: Research Labs link: "/labs" - - name: FAQs - link: "/faqs" - - name: Terms of Use - link: "/terms" - - name: Code of Conduct - link: "https://github.com/solid/process/blob/main/code-of-conduct.md" - name: What's New sublinks: - name: This Month in Solid @@ -40,11 +36,15 @@ link: "https://forum.solidproject.org" - name: More sublinks: - - name: Specification - link: "/specification" + - name: FAQs + link: "/faqs" - name: License link: "/license" + - name: Terms of Use + link: "/terms" - name: Logo usage guidelines link: "/logo-usage-guidelines" + - name: Code of Conduct + link: "https://github.com/solid/process/blob/main/code-of-conduct.md" - name: Website feedback link: "https://github.com/solid/solidproject.org/issues/new" diff --git a/_data/navigation.yml b/_data/navigation.yml index 592d63f61..7dc26adaf 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,5 +1,14 @@ - name: About Solid link: /about + sublinks: + - name: Specification + link: /specification + - name: Contributing + link: /contributing + - name: Origin + link: "/origin" + - name: Team + link: "/team" - name: Developers sublinks: - name: Getting Started From 63860f6ce4432f282579bb382d1cb801a93cc1d5 Mon Sep 17 00:00:00 2001 From: Wouter Termont Date: Sat, 17 Dec 2022 15:02:14 +0100 Subject: [PATCH 3/5] chore: add title to team page Signed-off-by: Wouter Termont --- _includes/toc-about.html | 10 +++++----- pages/team.md | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/_includes/toc-about.html b/_includes/toc-about.html index 4a2b8706f..99775cb23 100644 --- a/_includes/toc-about.html +++ b/_includes/toc-about.html @@ -1,10 +1,10 @@ diff --git a/pages/team.md b/pages/team.md index 3b60240fb..c5b328547 100644 --- a/pages/team.md +++ b/pages/team.md @@ -4,6 +4,8 @@ title: Team permalink: team --- +# Team + The Solid team helps coordinate the standardisation work and support those who are implementing and using Solid. If you are interested in joining the Solid team email info@solidproject.org with your CV and motivation letter. From 4f24a5318b65486c1360ad94791244c47b1396bb Mon Sep 17 00:00:00 2001 From: Wouter Termont Date: Sat, 17 Dec 2022 16:27:02 +0100 Subject: [PATCH 4/5] feat: add TR overview to specification page Signed-off-by: Wouter Termont --- pages/specification.md | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/pages/specification.md b/pages/specification.md index 9bab3f1d2..84ad60170 100644 --- a/pages/specification.md +++ b/pages/specification.md @@ -8,36 +8,21 @@ redirect_from: # Specification -To read the current specification, see [Solid Specification](https://solidproject.org/TR/). +The Solid Specification consists of several Technical Reports. These reports are listed below, together with their current status. For more information, please see the [Solid Technical Reports](https://solidproject.org/TR/) page. -## Contribute +
+ From 01b8efa521eb6960061cef2b88ca054704eb5c5a Mon Sep 17 00:00:00 2001 From: Wouter Termont Date: Sat, 17 Dec 2022 18:29:50 +0100 Subject: [PATCH 5/5] feat: update contributing page Signed-off-by: Wouter Termont --- pages/contributing.md | 115 +++++++++++++++++++++++++++++------------- 1 file changed, 80 insertions(+), 35 deletions(-) diff --git a/pages/contributing.md b/pages/contributing.md index 58b6d76d1..f177185f7 100644 --- a/pages/contributing.md +++ b/pages/contributing.md @@ -11,45 +11,90 @@ real-world to solve practical problems, introducing exciting new ways for people to control their data and extract value from it. The Solid ecosystem evolves and expands thanks to the efforts of the -Solid Community. Check out some of the [applications](/apps) created by -the community as well as some of the exciting work underway in several -prestigious [Research Labs](/labs) across the world. - +Solid Community. Start by [getting a pod](/users/get-a-pod); +try out some of the [applications](/apps) created by the community; +and check out some of the exciting work underway in several +prestigious [Research Labs](/labs) across the world. There is much more work to do, and many exciting problems left to solve. We invite and encourage you to join in! -### Engage with the Community - -- [Join the Solid Project Forum](https://forum.solidproject.org). - -- [Join the live Gitter Chat](https://gitter.im/solid/chat). +**Engage with the Community!**
+Join the [Solid Project Forum](https://forum.solidproject.org), +and the [Solid Gitter Chat](https://gitter.im/solid/chat); +attend the monthly [Solid World](/events), and other events +hosted across the world by community members. Sign up for the +[This Month in Solid](https://solidproject.org/newsletter) newsletter. -- [Attend the monthly Solid World](/events). - -- [Attend other events](/events) hosted across the world by community - members. +**Do you feel like programming?**
+[Learn to develop](/developers) Solid applications yourself, +or contribute to [existing tools and libraries](/developers/tools). For organizations interested in how Solid can help address specific problems or use cases, email the [Solid Team](/team) at -[info@solidproject.org](mailto:info@solidproject.org), and we'll be happy -to provide some guidance. - -### Strengthen the Specification - -- [Contribute to the Specification](/specification) by proposing - changes, identifying problems, or suggesting new use cases. - -- [Engage with the Panels](/specification), all of which are actively - working on proposals to the specification in specific topic areas, - from authentication to interoperability. - -### Contribute to the Ecosystem - -- [Get a pod](/users/get-a-pod) and try out some [applications](/apps) - for yourself! - -- [Contribute to existing tools and libraries](/developers/tools) or - make new ones! - -- [Learn to develop](/developers) Solid applications and [share - them](/apps) with the community! +[info@solidproject.org](mailto:info@solidproject.org), and we'll be +happy to provide some guidance. + +### Contribute to the Specification + +The Solid Specification consists of several +[Technical Reports](/specification) (TR), each of which is edited by a +[Solid panel](https://github.com/solid/specification/blob/main/README.md#solid-panels). + +**Engage with the Panels!**
+Anyone can propose changes, identify problems, or suggest new +use cases by filing an +[issue via GitHub](https://github.com/solid/specification/issues), +or by submitting +[pull requests](https://github.com/solid/specification/pulls). + +- **User Stories**: Anyone is free to submit new User Stories to + the [Solid User Stories](https://github.com/solid/user-stories/) + repository. They are tagged according to the aspects of Solid + that are relevant to them, so that specification panels can easily + find them for the work items at hand. + +- **Use Cases and Requirements** (UCR): Based on the User Stories, + extensive Use Cases are formulated for each TR. + + * [Authorization UCR](https://solid.github.io/authorization-panel/authorization-ucr/) + * [Notifications UCR](https://solid.github.io/notifications-panel/notifications-ucr/) + * Upcoming: WebID-Profile UCR ([issue](https://github.com/solid/webid-profile/issues/55), + [PR](https://github.com/solid/webid-profile/pull/80)) + + These Use Cases and Requirements are reviewed by the Diversity, Equity, and Inclusion Team + ([DEIT](https://github.com/solid/deit/blob/main/meetings/2021-11-09.md#deit-to-review-use-cases-in-specification-development)). + +- **Panel Meetings**: Anyone can join the + [Solid panel meetings](https://github.com/solid/specification/blob/main/README.md#solid-panels) + to listen, provide insight or suggest topics for discussion. + Meeting schedules, agendas and minutes can be found on the GitHub + pages of each + [panel](https://github.com/solid/specification/blob/main/README.md#solid-panels). + Please read the + [guidelines for participation](https://github.com/solid/specification/blob/main/meetings/README.md) + before calling in. + +#### The Solid Process + +All proposals undergo an Editorial review process. +For more information on proposal submissions and reviews, see the +[Solid Process](https://github.com/solid/process). +The document also describes stakeholders in the specification process, +describes how to document use cases, and encourages adherence to the W3C's +[Web Platform Design Principles](https://www.w3.org/TR/design-principles/), +specifically the [Priority of Constituencies](https://www.w3.org/TR/design-principles/#priority-of-constituencies). +This principle basically states that users always come as a first consideration, +i.e. we look at what users need before thinking of what other stakeholders might need. + +
+

+ Before contributing, please read the Solid Code of Conduct and the W3C Code of Ethics and Professional Conduct. Join the W3C Solid Community Group + before providing substantial contributions. +

+
+ +More details on how to contribute can be found [on GitHub](https://github.com/solid/specification/blob/main/CONTRIBUTING.md).