diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 95289d657..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: 2 -updates: -- package-ecosystem: bundler - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - ignore: - - dependency-name: html-proofer - versions: - - 3.18.6 - - 3.19.0 - - dependency-name: github-pages - versions: - - "211" - - "212" - - "213" diff --git a/404.html b/404.html index 7e60ccc70..fea56e097 100644 --- a/404.html +++ b/404.html @@ -1,9 +1,15 @@ ---- -layout: base ---- -
-

404

- -

Page not found :(

-

The requested page could not be found.

-
+ + + + + + 404 Page + + +
+

404

+

Page not found :(

+

The requested page could not be found.

+
+ + diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 7a4d33dfa..000000000 --- a/Gemfile +++ /dev/null @@ -1,44 +0,0 @@ -source "https://rubygems.org" - -#ruby ">=3.2" - -if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("2.3.4") - abort "Update your Bundler version to '>=2.3.4' to be future proof." -end - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -# gem "jekyll", "~> 3.8.6" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -gem "html-proofer", "~> 4" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! -group :jekyll_plugins do - gem "jekyll-autolink_email" -end - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -# and associated library. -install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do - gem "tzinfo", "~> 2.0" - gem "tzinfo-data" -end - -# Web server for Jekyll serve -gem "webrick", "~> 1.8" - -# Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index c937b1518..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,295 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (7.0.4.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.11.1) - colorator (1.1.0) - commonmarker (0.23.8) - concurrent-ruby (1.2.2) - dnsruby (1.61.9) - simpleidn (~> 0.1) - em-websocket (0.5.3) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0) - ethon (0.16.0) - ffi (>= 1.15.0) - eventmachine (1.2.7) - execjs (2.8.1) - faraday (2.7.4) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - ffi (1.15.5) - forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (228) - github-pages-health-check (= 1.17.9) - jekyll (= 3.9.3) - jekyll-avatar (= 0.7.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.4.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) - jekyll-readme-index (= 0.3.0) - jekyll-redirect-from (= 0.16.0) - jekyll-relative-links (= 0.6.1) - jekyll-remote-theme (= 0.4.3) - jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.8.0) - jekyll-sitemap (= 1.4.0) - jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.2.0) - jekyll-theme-cayman (= 0.2.0) - jekyll-theme-dinky (= 0.2.0) - jekyll-theme-hacker (= 0.2.0) - jekyll-theme-leap-day (= 0.2.0) - jekyll-theme-merlot (= 0.2.0) - jekyll-theme-midnight (= 0.2.0) - jekyll-theme-minimal (= 0.2.0) - jekyll-theme-modernist (= 0.2.0) - jekyll-theme-primer (= 0.6.0) - jekyll-theme-slate (= 0.2.0) - jekyll-theme-tactile (= 0.2.0) - jekyll-theme-time-machine (= 0.2.0) - jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.12.0) - kramdown (= 2.3.2) - kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.4) - mercenary (~> 0.3) - minima (= 2.5.1) - nokogiri (>= 1.13.6, < 2.0) - rouge (= 3.26.0) - terminal-table (~> 1.4) - github-pages-health-check (1.17.9) - addressable (~> 2.3) - dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (>= 3.0, < 5.0) - typhoeus (~> 1.3) - html-pipeline (2.14.3) - activesupport (>= 2) - nokogiri (>= 1.4) - html-proofer (4.4.3) - addressable (~> 2.3) - mercenary (~> 0.3) - nokogiri (~> 1.13) - parallel (~> 1.10) - rainbow (~> 3.0) - typhoeus (~> 1.3) - yell (~> 2.0) - zeitwerk (~> 2.5) - http_parser.rb (0.8.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - jekyll (3.9.3) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (>= 0.7, < 2) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (>= 1.17, < 3) - liquid (~> 4.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (>= 1.7, < 4) - safe_yaml (~> 1.0) - jekyll-autolink_email (0.1.0) - jekyll (~> 3.0) - rinku (~> 1.7.0) - jekyll-avatar (0.7.0) - jekyll (>= 3.0, < 5.0) - jekyll-coffeescript (1.1.1) - coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.4.0) - commonmarker (~> 0.22) - jekyll-commonmark-ghpages (0.4.0) - commonmarker (~> 0.23.7) - jekyll (~> 3.9.0) - jekyll-commonmark (~> 1.4.0) - rouge (>= 2.0, < 5.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.15.1) - jekyll (>= 3.7, < 5.0) - jekyll-gist (1.5.0) - octokit (~> 4.2) - 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) - jekyll-optional-front-matter (0.3.2) - jekyll (>= 3.0, < 5.0) - jekyll-paginate (1.1.0) - jekyll-readme-index (0.3.0) - jekyll (>= 3.0, < 5.0) - jekyll-redirect-from (0.16.0) - jekyll (>= 3.3, < 5.0) - jekyll-relative-links (0.6.1) - jekyll (>= 3.3, < 5.0) - jekyll-remote-theme (0.4.3) - addressable (~> 2.0) - jekyll (>= 3.5, < 5.0) - jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) - rubyzip (>= 1.3.0, < 3.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.8.0) - jekyll (>= 3.8, < 5.0) - jekyll-sitemap (1.4.0) - jekyll (>= 3.7, < 5.0) - jekyll-swiss (1.0.0) - jekyll-theme-architect (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.6.0) - jekyll (> 3.5, < 5.0) - jekyll-github-metadata (~> 2.9) - jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.2.0) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.3) - jekyll (>= 3.3, < 5.0) - jekyll-watch (2.2.1) - listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) - html-pipeline (~> 2.2) - jekyll (>= 3.0, < 5.0) - kramdown (2.3.2) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - liquid (4.0.4) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) - minima (2.5.1) - jekyll (>= 3.5, < 5.0) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - minitest (5.17.0) - nokogiri (1.14.2-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.14.2-x86_64-linux) - racc (~> 1.4) - octokit (4.25.1) - faraday (>= 1, < 3) - sawyer (~> 0.9) - parallel (1.23.0) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (4.0.7) - racc (1.6.2) - 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) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.9.2) - addressable (>= 2.3.5) - 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) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.4) - tzinfo (>= 1.0.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.8.0) - wdm (0.1.1) - webrick (1.8.1) - yell (2.2.2) - zeitwerk (2.6.8) - -PLATFORMS - x86_64-darwin-18 - x86_64-darwin-20 - x86_64-darwin-22 - x86_64-linux - x86_64-linux-musl - -DEPENDENCIES - github-pages - html-proofer (~> 4) - jekyll-autolink_email - minima (~> 2.0) - tzinfo (~> 2.0) - tzinfo-data - wdm (~> 0.1.0) - webrick (~> 1.8) - -RUBY VERSION - ruby 3.2.2p53 - -BUNDLED WITH - 2.4.15 diff --git a/README.md b/README.md index 9fecadcac..1dc027553 100644 --- a/README.md +++ b/README.md @@ -2,25 +2,25 @@ Official website of the Solid Project -## Important note about 2023-redesign +## How to contribute -If you want to make improvements to this website, please (also) add them in [the 2023-redesign branch](https://github.com/solid/solidproject.org/tree/2023-redesign?tab=readme-ov-file#how-to-contribute ) -which we hope to merge soon. +To see your changes, you can run `npx serve` in your local checkout of this +repository, or even just browse to: -## Local Environment Setup (before 2023-redesign) +``` +file:///your/local/path/to/gh/solid/solidproject.org/index.html +``` -This website is built using [Jekyll](https://jekyllrb.com/), a static -site generator. +NOTE: please make sure to check out the `2023-redesign` branch! -If you have [Docker Compose](https://docs.docker.com/compose/) installed, view `docker-compose up` to start a local server to view the website. +If you just want to propose small textual changes you can also create a PR through GitHub's +online editor. -Alternatively, you can install and run the required tooling manually as follows: -1. [Install](https://jekyllrb.com/docs/installation/) Ruby and Jekyll -1. `$ git clone https://github.com/solid/solidproject.org.git` -1. `$ cd solidproject.org` -1. `$ bundle install` -1. `$ bundle exec jekyll serve --livereload` +The filenames should be intuitive enough for you to search for the HTML text that corresponds to the section +you want to edit. + +If you state in your PR description that you had trouble setting up your local environment, +and then a Solid Team member will check and fix the layout for you if necessary, before merging your PR. + +This way anyone who understands HTML and who has a GitHub account can suggest improvements for our website. -To afford a good cross-platform developer experience, -this repository employs the following tooling versions: -`ruby >=3.2` with `bundler >=2.3.4`. diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 71bc34b62..000000000 --- a/_config.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely edit after that. If you find -# yourself editing this file very often, consider using Jekyll's data files -# feature for the data you need to update frequently. -# -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'bundle exec jekyll serve'. If you change this file, please restart the server process. - -# Site settings -# These are used to personalize your new site. If you look in the HTML files, -# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. -# You can create any custom variable you would like, and they will be accessible -# in the templates via {{ site.myvariable }}. -title: Solid -email: info@solidproject.org -url: 'https://solidproject.org/' -twitter_username: project_solid -github_username: solid -repository: solid/solidproject.org -include: - - _redirects - -# Build settings -markdown: kramdown -future: true -theme: minima -plugins: - - jekyll-feed - - jekyll-redirect-from - - jekyll-autolink_email - # Exclude from processing. -# The following items will not be processed, by default. Create a custom list -# to override the default setting. -# exclude: -# - Gemfile -# - Gemfile.lock -# - node_modules -# - vendor/bundle/ -# - vendor/cache/ -# - vendor/gems/ -# - vendor/ruby/ - -kramdown: - input: GFM - # GitHub Pages only supports rouge for syntax highlighting: - # https://github.blog/2016-02-01-github-pages-now-faster-and-simpler-with-jekyll-3-0/#the-highlight-zone - syntax_highlighter: rouge - syntax_highlighter_opts: - # Use existing pygments syntax highlighting css - css_class: 'highlight' diff --git a/_data/footer.yml b/_data/footer.yml deleted file mode 100644 index 1e934300c..000000000 --- a/_data/footer.yml +++ /dev/null @@ -1,44 +0,0 @@ -- name: Home - link: "/" - sublinks: - - name: About Solid - link: "/about" - - name: Using Solid - link: "/users" - - name: Get a Pod - link: "/users/get-a-pod" - - name: Solid Apps - link: "/apps" - - name: Team - link: "/team" - - 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 - link: "/newsletter" - - name: Solid Events - link: "/events" - - name: Press - link: "/press" -- name: Developers - link: "/developers" - sublinks: - - name: Getting Started - link: "/developers/tutorials/getting-started" - - name: Forum - link: "https://forum.solidproject.org" -- name: More - sublinks: - - name: Specification - link: "/specification" - - name: License - link: "/license" - - name: Logo usage guidelines - link: "/logo-usage-guidelines" - - name: Website feedback - link: "https://github.com/solid/solidproject.org/issues/new" diff --git a/_data/navigation.yml b/_data/navigation.yml deleted file mode 100644 index 3437b1b6e..000000000 --- a/_data/navigation.yml +++ /dev/null @@ -1,30 +0,0 @@ -- name: About Solid - link: /about -- name: Developers - sublinks: - - name: Getting Started - link: "/developers/tutorials/getting-started" - - name: Solid Tools and Libraries - link: "/developers/tools" - - name: Solid Apps - link: "/apps" -- name: Users - sublinks: - - name: Getting a Pod - link: /users/get-a-pod - - name: Solid Apps - link: "/apps" -- name: Community - sublinks: - - name: Newsletter - link: /newsletter - - name: Events - link: /events - - name: Solid Forum - link: "https://forum.solidproject.org/" - - name: Chat - link: "https://matrix.to/#/#solid_project:matrix.org" - - name: Press - link: /press - - name: Code of Conduct - link: "https://github.com/solid/process/blob/main/code-of-conduct.md" diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html deleted file mode 100644 index dc406cdf2..000000000 --- a/_includes/breadcrumbs.html +++ /dev/null @@ -1,48 +0,0 @@ -{% if page.url != "/" %} - -{% endif %} diff --git a/_includes/card.html b/_includes/card.html deleted file mode 100644 index 93c0e1761..000000000 --- a/_includes/card.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
- [] -
-

- {{include.heading}} -

-
-

- {{include.content}} -

-
-
\ No newline at end of file diff --git a/_includes/choose-your-own-adventure.html b/_includes/choose-your-own-adventure.html deleted file mode 100644 index c4e381fd9..000000000 --- a/_includes/choose-your-own-adventure.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
-
-

- {{include.heading}} -

-
-
- {{include.adventure1}} -
-
- {{include.adventure2}} -
- {% if include.link3 and include.adventure3 %} -
- {{include.adventure3}} -
- {% endif %} -
-
-
-
diff --git a/_includes/draft-warning.html b/_includes/draft-warning.html deleted file mode 100644 index e94668087..000000000 --- a/_includes/draft-warning.html +++ /dev/null @@ -1,18 +0,0 @@ -
- diff --git a/_includes/footer.html b/_includes/footer.html deleted file mode 100644 index 8bd041d40..000000000 --- a/_includes/footer.html +++ /dev/null @@ -1,72 +0,0 @@ - diff --git a/_includes/header.html b/_includes/header.html deleted file mode 100644 index a10431be1..000000000 --- a/_includes/header.html +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/_includes/subscribe.html b/_includes/subscribe.html deleted file mode 100644 index c9512024a..000000000 --- a/_includes/subscribe.html +++ /dev/null @@ -1,40 +0,0 @@ -
-
-
-

- {% if page.url == "/newsletter" %} - This Month in Solid - {% else %} - - This Month in Solid - - {% endif %} -

-

- -

-
-
- -
-
- - -
-
- -
-
-
-
-
diff --git a/_includes/talk.html b/_includes/talk.html deleted file mode 100644 index 84b186079..000000000 --- a/_includes/talk.html +++ /dev/null @@ -1,66 +0,0 @@ -
-
-
-

- {{ include.date }} -

-

- {% if include.website %} - - {{ include.title }} - - {% else %} - {{ include.title }} - {% endif %} -
- By {{ include.speaker }} -

-
- -
-
diff --git a/_includes/toc-about.html b/_includes/toc-about.html deleted file mode 100644 index f85067b1b..000000000 --- a/_includes/toc-about.html +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/_includes/toc-apps.html b/_includes/toc-apps.html deleted file mode 100644 index 839a326df..000000000 --- a/_includes/toc-apps.html +++ /dev/null @@ -1,80 +0,0 @@ -{% assign categories_list = "Tutorials AND Vocabularies AND Tools and libraries" | split: " AND " %} -{% assign subcategories_list = "Overview AND Quickstart AND Discover AND Create AND Code AND Other" | split: " AND " %} - diff --git a/_includes/toc-pod-server.html b/_includes/toc-pod-server.html deleted file mode 100644 index aa4189e38..000000000 --- a/_includes/toc-pod-server.html +++ /dev/null @@ -1,18 +0,0 @@ -