diff --git a/.buildrc b/.buildrc new file mode 100755 index 00000000..3cb506a2 --- /dev/null +++ b/.buildrc @@ -0,0 +1,10 @@ +export BUILD_DATE=$(TZ=UTC date "+%Y-%m-%d") +export BUILD_TIME=$(TZ=UTC date "+%H:%M:%S %Z") + +npm install +bundle install + +sed -i "s/^ date:.*$/ date: $BUILD_DATE/" _config.yml +sed -i "s/^ time:.*$/ time: $BUILD_TIME/" _config.yml + +JEKYLL_ENV=production bundle exec jekyll build diff --git a/.gitignore b/.gitignore index c13ad8d8..39c28b7c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ font/_sass/ font/.fontcustom-manifest.json assets/webfonts/ptio-font-preview.html vendor -.bundle node_modules +.bundle +.jekyll-cache diff --git a/.ruby-version b/.ruby-version index 37c2961c..4a36342f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.0.0 diff --git a/Gemfile b/Gemfile index 005148a3..344f65e8 100644 --- a/Gemfile +++ b/Gemfile @@ -8,22 +8,18 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.9.0" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# 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 +gem "jekyll", "~> 4.2" +# Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/) # If you have any plugins, put them here! group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" + gem "jekyll-brotli", "~> 2.2" end -# Jekyll 3.9.0 now requires this explicitly installs, apparently -gem "kramdown-parser-gfm", "~> 1.1.0" +# Jekyll 3.9.0 now requires this explicitly installed, apparently +gem "kramdown-parser-gfm", "~> 1.1" +gem "webrick", "~> 1.7" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 9895f4b4..c3e197c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,6 +3,7 @@ GEM specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) + brotli (0.2.3) colorator (1.1.0) concurrent-ruby (1.1.7) em-websocket (0.5.2) @@ -12,27 +13,30 @@ GEM ffi (1.14.2) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (>= 1.17, < 3) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) + terminal-table (~> 2.0) + jekyll-brotli (2.2.1) + brotli (~> 0.2.0) + jekyll (>= 3.0, < 5.0) jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.7.1) - jekyll (>= 3.8, < 5.0) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) jekyll-watch (2.2.1) listen (~> 3.0) kramdown (2.3.0) @@ -43,11 +47,7 @@ GEM listen (3.4.1) 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) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) @@ -57,21 +57,23 @@ GEM rexml (3.2.4) rouge (3.26.0) 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) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) + webrick (1.7.0) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES - jekyll (~> 3.9.0) + jekyll (~> 4.2) + jekyll-brotli (~> 2.2) jekyll-feed (~> 0.6) - kramdown-parser-gfm (~> 1.1.0) - minima (~> 2.0) + kramdown-parser-gfm (~> 1.1) tzinfo-data + webrick (~> 1.7) BUNDLED WITH - 2.2.4 + 2.2.5 diff --git a/README.md b/README.md new file mode 100644 index 00000000..099fd845 --- /dev/null +++ b/README.md @@ -0,0 +1,68 @@ +
+ + Privacy Guides + +

+ The guide to restoring your online privacy. +

+

+ + + + + + + + + + + + +

+

+ + + + + + +

+

+ + + + + + + + + + + + + + + + + + + + + +

+
+ +## Developing + +1. Install the version of [Ruby](https://www.ruby-lang.org/en/downloads/) currently specified by [`.ruby-version`](.ruby-version) + * With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install` + * With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"` + * [Manually](https://www.ruby-lang.org/en/downloads/) +1. Install [Bundler](https://bundler.io/) v2.2.5: + * `gem install bundler:2.2.5` +1. Install the required dependencies: + * `bundle install` +1. Build the website (the output can be found in the `_site` directory): + * `bundle exec jekyll build` +1. Serve the website locally with live reloading: + * `bundle exec jekyll serve --incremental --livereload` diff --git a/_config.yml b/_config.yml index dbe57e05..452b7cc3 100644 --- a/_config.yml +++ b/_config.yml @@ -88,6 +88,7 @@ build: # Build settings plugins: - jekyll-feed + - jekyll-brotli exclude: [privacytools.io/] # Exclude from processing. diff --git a/_layouts/default.html b/_layouts/default.html index 30651b7f..6dd9fa4b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -8,10 +8,10 @@
{{ content }}
- - - - - + + + + + diff --git a/assets/js/bootstrap.min.js.map b/assets/js/bootstrap.min.js.map new file mode 120000 index 00000000..6b00217d --- /dev/null +++ b/assets/js/bootstrap.min.js.map @@ -0,0 +1 @@ +../../node_modules/bootstrap/dist/js/bootstrap.min.js.map \ No newline at end of file diff --git a/assets/js/jquery.min.js b/assets/js/jquery.min.js new file mode 120000 index 00000000..08ac9f2f --- /dev/null +++ b/assets/js/jquery.min.js @@ -0,0 +1 @@ +../../node_modules/jquery/dist/jquery.min.js \ No newline at end of file