diff --git a/.github/workflows/jekyll_preview.yml b/.github/workflows/jekyll_preview.yml index 97d8c73..ddf5d7f 100644 --- a/.github/workflows/jekyll_preview.yml +++ b/.github/workflows/jekyll_preview.yml @@ -14,13 +14,25 @@ jobs: steps: - name: Checkout 🛎️ uses: actions/checkout@v2 - + + # Use GitHub Actions' cache to shorten build times and decrease load on servers + # - name: Use GitHub Action cache 💾 + # uses: actions/cache@v2 + # with: + # path: | + # - vendor/bundle + # - imgs + + # Build the jekyll page - name: Build 🏗️ - uses: jerryjvl/jekyll-build-action@v1 + uses: helaili/jekyll-action@v2 + with: + build_only: true + pre_build_commands: apk --update add imagemagick - run: sudo chown -R $USER:$USER . - run: | - echo "{ \"hosting\": { \"public\": \".\", \"cleanUrls\": true, \"trailingSlash\": false }}" > _site/firebase.json + echo "{ \"hosting\": { \"public\": \".\", \"cleanUrls\": true, \"trailingSlash\": false }}" > build/firebase.json - uses: FirebaseExtended/action-hosting-deploy@v0 name: Deploy 🚀 to Firebase Pages @@ -28,7 +40,7 @@ jobs: repoToken: '${{ secrets.GITHUB_TOKEN }}' firebaseServiceAccount: '${{ secrets.CEVI_TOOLS_FIREBASE_PREVIEW_TOKEN}}' channelId: dev - entryPoint: _site + entryPoint: build projectId: cevi-tools-preview-deployment env: FIREBASE_CLI_PREVIEWS: hostingchannels diff --git a/.gitignore b/.gitignore index 701804d..3750828 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,7 @@ _site vendor # Excluding directory automatically created by JetBrains IDEs -.idea \ No newline at end of file +.idea + +# used to cache images of differnt sizes +imgs \ No newline at end of file diff --git a/Gemfile b/Gemfile index 200b95f..121baef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org" + # 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: @@ -15,7 +16,8 @@ gem "minima", "~> 2.5" # gem "github-pages", group: :jekyll_plugins # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.12" + gem "jekyll-feed", "~> 0.12" + gem "responsive-images-for-jekyll", git: 'https://github.com/wp99cp/responsive_images_for_jekyll' end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem @@ -28,5 +30,6 @@ end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] - gem "webrick", "~> 1.7" + + diff --git a/Gemfile.lock b/Gemfile.lock index b18ab69..0962e34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/wp99cp/responsive_images_for_jekyll + revision: 9f8edac08e06f80078e554a57e7b40c580d7015a + specs: + responsive-images-for-jekyll (0.1.3) + image_optim + image_optim_pack + jekyll (> 3.3, < 5.0) + mini_magick (~> 4.8) + GEM remote: https://rubygems.org/ specs: @@ -9,13 +19,24 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - eventmachine (1.2.7-x64-mingw32) - ffi (1.15.4) - ffi (1.15.4-x64-mingw32) + exifr (1.3.9) + ffi (1.15.5) forwardable-extended (2.6.0) + fspath (3.1.2) http_parser.rb (0.8.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) + image_optim (0.31.1) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 3.0) + image_size (>= 1.5, < 4) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) + image_optim_pack (0.8.0.20220117-x86_64-linux) + fspath (>= 2.1, < 4) + image_optim (~> 0.19) + image_size (3.0.1) + in_threads (1.6.0) jekyll (4.2.1) addressable (~> 2.4) colorator (~> 1.0) @@ -31,7 +52,7 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 2.0) - jekyll-feed (0.15.1) + jekyll-feed (0.16.0) jekyll (>= 3.7, < 5.0) jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) @@ -44,50 +65,44 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.7.0) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) + mini_magick (4.11.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) + progress (3.6.0) public_suffix (4.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - sassc (2.4.0-x64-mingw32) - ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - tzinfo (1.2.9) - thread_safe (~> 0.1) - tzinfo-data (1.2021.5) - tzinfo (>= 1.0.0) unicode-display_width (1.8.0) - wdm (0.1.1) webrick (1.7.0) PLATFORMS - x64-mingw32 x86_64-linux DEPENDENCIES jekyll (~> 4.2.1) jekyll-feed (~> 0.12) minima (~> 2.5) + responsive-images-for-jekyll! tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.1) webrick (~> 1.7) BUNDLED WITH - 2.2.32 + 2.3.6 diff --git a/_config.yml b/_config.yml index d9c2eda..2d8ecfa 100644 --- a/_config.yml +++ b/_config.yml @@ -30,6 +30,16 @@ github_username: Cevi # Build settings theme: minima +imageoptim: + svgo: false # Disabling svgo because it throws some error + jpegrecompress: + allow_lossy: true + quality: 3 + jpegoptim: + allow_lossy: true + max_quality: 75 + + # Exclude from processing. # The following items will not be processed, by default. # Any item listed under the `exclude:` key here will be automatically added to diff --git a/assets/Walk-Time-Table.png b/assets/Walk-Time-Table.png new file mode 100644 index 0000000..abe556b Binary files /dev/null and b/assets/Walk-Time-Table.png differ diff --git a/assets/eMeal-Menuplanung.png b/assets/eMeal-Menuplanung.png new file mode 100644 index 0000000..8501204 Binary files /dev/null and b/assets/eMeal-Menuplanung.png differ diff --git a/productivetools.md b/productivetools.md index 8272e7d..8e2e9af 100644 --- a/productivetools.md +++ b/productivetools.md @@ -21,11 +21,11 @@ eMeal ermöglicht ein simultanes Bearbeiten aller Rezepte, Lager und Anlässen v Auf [https://emeal.zh11.ch/](https://emeal.zh11.ch/) findest du weitere Informationen und kannst gleich loslegen! -![eMeal Banner](https://user-images.githubusercontent.com/34008738/105835410-10843900-5fcc-11eb-9a23-2b9140c8c373.png) +![eMeal Banner](/assets/eMeal-Menuplanung.png) ## J+S-Marschzeittabellen automatisiert generieren -![J+S-Marschzeittabellen Banner](https://github.com/cevi/automatic_walk-time_tables/raw/master/imgs/Claim.png) +![J+S-Marschzeittabellen Banner](/assets/Walk-Time-Table.png) Ziel dieses Projektes ist es, den Prozess rund um das Erstellen einer J+S-Marschzeittabelle für eine Wanderung oder Velo-Tour zu automatisieren und zu beschleunigen. Features