diff --git a/.build.yml b/.build.yml index 36d5cbc..6ad34b5 100644 --- a/.build.yml +++ b/.build.yml @@ -1,26 +1,9 @@ -image: alpine/edge -packages: - - ruby-dev - - nodejs - - npm - - rsync - - imagemagick - - imagemagick-dev - - imagemagick-libs -environment: - repo: freehold-cottage +image: nixos/latest sources: - https://git.sr.ht/~stfn/freehold-cottage - - https://git.sr.ht/~stfn/build-scripts secrets: - 663e253f-76fc-4d51-92ba-2412927a42d8 tasks: - build: | - cd $repo - sudo sh ../build-scripts/jekyll-build - - minify: | - cd $repo - sudo sh ../build-scripts/minify-site - - deploy: | - cd $repo - sudo sh ../build-scripts/neocities-deploy $repo _site + cd freehold-cottage + sh bin/build diff --git a/.bundle/config b/.bundle/config index d746e30..16a6cf6 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,4 +1,4 @@ --- -BUNDLE_PATH: "vendor" +BUNDLE_PATH: "vendor/cache" BUNDLE_WITHOUT: "jekyll-watch" BUNDLE_JOBS: "4" diff --git a/.envrc b/.envrc deleted file mode 100644 index 1d953f4..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/.gitignore b/.gitignore index 7efa104..5c2d78a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ _site -vendor -.jekyll-cache -.DS_Store +.bundle +.direnv .nix-gems -.direnv \ No newline at end of file +.DS_Store +.sass-cache +.jekyll-cache +.jekyll-metadata +vendor +Gemfile.lock +.env +.aider* diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index ef538c2..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.1.2 diff --git a/.sass-cache/08bbb029940157e9afeb5f2145cc53f7311b28d4/site.scssc b/.sass-cache/08bbb029940157e9afeb5f2145cc53f7311b28d4/site.scssc deleted file mode 100644 index 973408d..0000000 Binary files a/.sass-cache/08bbb029940157e9afeb5f2145cc53f7311b28d4/site.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_functions.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_functions.scssc deleted file mode 100644 index f5fdce5..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_functions.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_grid.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_grid.scssc deleted file mode 100644 index 37cf962..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_grid.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_images.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_images.scssc deleted file mode 100644 index 1423e1a..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_images.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_mixins.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_mixins.scssc deleted file mode 100644 index e9b5e1a..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_mixins.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_nav.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_nav.scssc deleted file mode 100644 index 1f9684a..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_nav.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_navbar.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_navbar.scssc deleted file mode 100644 index 68ae92c..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_navbar.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_print.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_print.scssc deleted file mode 100644 index 3efda7f..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_print.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_reboot.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_reboot.scssc deleted file mode 100644 index 1d0e535..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_reboot.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_type.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_type.scssc deleted file mode 100644 index 0c0d701..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_type.scssc and /dev/null differ diff --git a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_variables.scssc b/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_variables.scssc deleted file mode 100644 index d2ae874..0000000 Binary files a/.sass-cache/5b643fea89f07475f0adad42eb0b843004fe2521/_variables.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_alert.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_alert.scssc deleted file mode 100644 index 7e43b3b..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_alert.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_background-variant.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_background-variant.scssc deleted file mode 100644 index 9fb04f9..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_background-variant.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_badge.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_badge.scssc deleted file mode 100644 index 5bf9e93..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_badge.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_border-radius.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_border-radius.scssc deleted file mode 100644 index c692fae..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_border-radius.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_box-shadow.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_box-shadow.scssc deleted file mode 100644 index 3b210a8..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_box-shadow.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_breakpoints.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_breakpoints.scssc deleted file mode 100644 index b11658f..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_breakpoints.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_buttons.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_buttons.scssc deleted file mode 100644 index 9067b4d..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_buttons.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_caret.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_caret.scssc deleted file mode 100644 index 590fbbb..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_caret.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_clearfix.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_clearfix.scssc deleted file mode 100644 index 4c7a5a2..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_clearfix.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_deprecate.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_deprecate.scssc deleted file mode 100644 index 5644408..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_deprecate.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_float.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_float.scssc deleted file mode 100644 index f91dc4d..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_float.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_forms.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_forms.scssc deleted file mode 100644 index a03af73..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_forms.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_gradients.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_gradients.scssc deleted file mode 100644 index 914cfe7..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_gradients.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid-framework.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid-framework.scssc deleted file mode 100644 index 116ec42..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid-framework.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid.scssc deleted file mode 100644 index 6c59677..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_grid.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_hover.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_hover.scssc deleted file mode 100644 index aaeeafe..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_hover.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_image.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_image.scssc deleted file mode 100644 index f226d69..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_image.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_list-group.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_list-group.scssc deleted file mode 100644 index 6cb6bbd..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_list-group.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_lists.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_lists.scssc deleted file mode 100644 index 91fcfa9..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_lists.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_nav-divider.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_nav-divider.scssc deleted file mode 100644 index 56b2e5e..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_nav-divider.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_pagination.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_pagination.scssc deleted file mode 100644 index 4f3425e..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_pagination.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_reset-text.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_reset-text.scssc deleted file mode 100644 index a0498b5..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_reset-text.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_resize.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_resize.scssc deleted file mode 100644 index 18ae0fa..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_resize.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_screen-reader.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_screen-reader.scssc deleted file mode 100644 index ef4bb62..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_screen-reader.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_size.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_size.scssc deleted file mode 100644 index 9c65323..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_size.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_table-row.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_table-row.scssc deleted file mode 100644 index 3d275b6..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_table-row.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-emphasis.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-emphasis.scssc deleted file mode 100644 index e5b80f0..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-emphasis.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-hide.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-hide.scssc deleted file mode 100644 index 94ae692..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-hide.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-truncate.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-truncate.scssc deleted file mode 100644 index 99e94d5..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_text-truncate.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_transition.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_transition.scssc deleted file mode 100644 index 0b80a6e..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_transition.scssc and /dev/null differ diff --git a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_visibility.scssc b/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_visibility.scssc deleted file mode 100644 index 8d78263..0000000 Binary files a/.sass-cache/7595469d2539c1c83954025b916ed733581bb164/_visibility.scssc and /dev/null differ diff --git a/.sass-cache/845d849cfc1abf9fadb5b7737072e44e5de5b9f2/_rfs.scssc b/.sass-cache/845d849cfc1abf9fadb5b7737072e44e5de5b9f2/_rfs.scssc deleted file mode 100644 index 5206d59..0000000 Binary files a/.sass-cache/845d849cfc1abf9fadb5b7737072e44e5de5b9f2/_rfs.scssc and /dev/null differ diff --git a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_embed.scssc b/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_embed.scssc deleted file mode 100644 index 4eed0ea..0000000 Binary files a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_embed.scssc and /dev/null differ diff --git a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_flex.scssc b/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_flex.scssc deleted file mode 100644 index f266283..0000000 Binary files a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_flex.scssc and /dev/null differ diff --git a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_position.scssc b/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_position.scssc deleted file mode 100644 index ea1ac13..0000000 Binary files a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_position.scssc and /dev/null differ diff --git a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_text.scssc b/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_text.scssc deleted file mode 100644 index 2e2eebc..0000000 Binary files a/.sass-cache/8e047bda6461b2293e4dd9b705da95d768c8955b/_text.scssc and /dev/null differ diff --git a/Gemfile b/Gemfile index 325dee3..e4cf0a3 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,6 @@ gem "rmagick" group :jekyll_plugins do gem "jekyll-feed" gem "jekyll-sitemap" - gem "jekyll-minifier" gem "jekyll-responsive-image" end diff --git a/Gemfile.lock b/Gemfile.lock index 1c8d906..93d3093 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,24 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.2.2) - cssminify2 (2.0.1) + concurrent-ruby (1.3.4) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.9.1) - ffi (1.16.3) + ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) - google-protobuf (3.25.0-x86_64-linux) - htmlcompressor (0.4.0) + google-protobuf (4.28.3-x86_64-linux) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -36,12 +36,6 @@ GEM webrick (~> 1.7) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) - jekyll-minifier (0.1.10) - cssminify2 (~> 2.0) - htmlcompressor (~> 0.4) - jekyll (>= 3.5) - json-minify (~> 0.0.3) - uglifier (~> 4.1) jekyll-responsive-image (1.6.0) jekyll (>= 2.0, < 5.0) rmagick (>= 2.0, < 5.0) @@ -51,36 +45,32 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.6.3) - json-minify (0.0.3) - json (> 0) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.3) + public_suffix (6.0.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) + rexml (3.3.9) rmagick (4.3.0) - rouge (4.2.0) + rouge (4.4.0) safe_yaml (1.0.5) - sass-embedded (1.69.5-x86_64-linux-gnu) - google-protobuf (~> 3.23) + sass-embedded (1.80.6-x86_64-linux-gnu) + google-protobuf (~> 4.28) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unicode-display_width (2.5.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + webrick (1.9.0) PLATFORMS x86_64-linux @@ -88,7 +78,6 @@ PLATFORMS DEPENDENCIES jekyll jekyll-feed - jekyll-minifier jekyll-responsive-image jekyll-sitemap rmagick diff --git a/_config.yml b/_config.yml index 2d090dc..f50b1e9 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ title: Freehold Cottage Residential Home description: Residential Care Home in Shawforth, Rochdale domain: "https://freeholdcottage.com" -# you can leave any of these empty - that bit just won't show +# you can leave any of these empty - that bit just won't show email_address: freeholdcottage@gmail.com phone_number: 01706 853384 @@ -48,7 +48,6 @@ markdown: kramdown plugins: - jekyll-responsive-image - - jekyll-minifier collections: pages: @@ -65,6 +64,7 @@ defaults: permalink: :slug/ layout: page - scope: + path: "_services" type: services values: permalink: services/:title/ @@ -73,3 +73,15 @@ defaults: path: "assets/services" values: service_image: true + +exclude: + - build + - shell.nix + - .sass-cache/ + - .jekyll-cache/ + - gemfiles/ + - bin/ + - Gemfile + - Gemfile.lock + - node_modules/ + - vendor diff --git a/_includes/footer.html b/_includes/footer.html index 658d616..a3c6dc5 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,16 @@ {% capture to_markdown %} -**{{site.company_name}}** -{% if site.address.street %}{{site.address.street }} {% endif %} -{% if site.address.locality %}{{site.address.locality }} {% endif %} -{% if site.address.post_code %}{{site.address.post_code }} {% endif %} -{% include link-phone-number.md %} -{% include link-email-address.md %} +**{{site.company_name}}**
+{% if site.address.street %}{{site.address.street }}
{% endif %} +{% if site.address.locality %}{{site.address.locality }}
{% endif %} +{% if site.address.post_code %}{{site.address.post_code }}
{% endif %} +{% include link-phone-number.md %}
+{% include link-email-address.md %} {% endcapture %} - \ No newline at end of file + diff --git a/_layouts/home.html b/_layouts/home.html index aaf6e46..1fff053 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -5,30 +5,35 @@ layout: default {% include title.html %}
- {% responsive_image path: "assets/banner.jpg" %} + {% responsive_image path: "assets/banner.jpg" %}
-
-
- {{ content }} -
- {% if site.google_maps_embed %} -
- -
- {% endif %} -
-
- {% include contact-links.html %} - {% include cqc-widget.html %} -
- - Food Hygiene Rating - 5/5 - Very Good - -
-
-
\ No newline at end of file +
+ {{ content }} +
+ {% if site.google_maps_embed %} +
+ +
+ {% endif %} +
+
+ {% include contact-links.html %} {% include cqc-widget.html %} +
+ + Food Hygiene Rating - 5/5 - Very Good + +
+
+ diff --git a/_pages/contact.md b/_pages/contact.md index 9dfaadd..40984b6 100644 --- a/_pages/contact.md +++ b/_pages/contact.md @@ -7,7 +7,7 @@ meta_title: Freehold Cottage contact details subtitle: It's easy to get in touch --- -If you're interested in your or someone else's eligibility for Freehold Cottage, please check out our [eligibility and referrrals](/page/eligibility-and-referrals) page. +If you're interested in your or someone else's eligibility for Freehold Cottage, please check out our [eligibility and referrrals](/eligibility-and-referrals) page. For all other enquiries, please: diff --git a/_pages/privacy.md b/_pages/privacy.md new file mode 100644 index 0000000..697b14c --- /dev/null +++ b/_pages/privacy.md @@ -0,0 +1,21 @@ +--- +layout: page +permalink: /privacy +title: Our Privacy Policy +meta_description: Our Privacy Policy +header_text: Our Privacy Policy +--- + +This website does not set or read cookies, store any visitor data, or track +visitors in any other way. + +We will only retain personal information about you if you contact our team. If you contact us but do not use our services your data will be deleted after 6 months. + +We are committed to protecting your privacy and will not share or use your personal information for any purposes other than: + +- Responding to your enquiries. +- To provide our service to our service users. + +If you have any questions or concerns about our privacy practices, please contact us at [freeholdcottage@gmail.com](mailto:freeholdcottage@gmail.com) + +Lynn Collins is the Data Security and Protection Officer for Freehold Cottage. diff --git a/bin/build b/bin/build new file mode 100755 index 0000000..b316741 --- /dev/null +++ b/bin/build @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +rm -rf _site + +nix-shell -p ruby_3_3 imagemagick pkg-config --pure --command " + export JEKYLL_ENV=production + echo 'Installing bundles' + bundle config set path 'vendor/cache' + bundle install --gemfile=Gemfile + + echo 'Building site' + bundle exec jekyll build +" + +nix-shell -p html-minifier --pure --command " + echo 'Minifying site' + html-minifier --input-dir _site --output-dir _site --collapse-whitespace --file-ext html +" + +nix-shell -p neocities-cli --command " + echo 'Pushing to Neocities' + + set +x + export NEOCITIES_API_KEY=$(cat ~/.neocities/freeholdcottage) + set -x + neocities push --prune _site +" diff --git a/bin/serve b/bin/serve new file mode 100755 index 0000000..5e9972a --- /dev/null +++ b/bin/serve @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +rm -rf _site + +nix-shell -p ruby_3_3 imagemagick pkg-config --pure --command " + echo 'Installing bundles' + bundle config set path 'vendor/cache' + bundle install --gemfile=Gemfile + + echo 'Building site' + bundle exec jekyll serve +" diff --git a/bin/upgrade b/bin/upgrade new file mode 100755 index 0000000..c807227 --- /dev/null +++ b/bin/upgrade @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +nix-shell -p ruby_3_3 imagemagick pkg-config --pure --command " + export JEKYLL_ENV=production + echo 'Installing bundles' + bundle config set path 'vendor/cache' + bundle install --gemfile=Gemfile + bundle update +" diff --git a/build.sh b/build.sh deleted file mode 100644 index 8f338a0..0000000 --- a/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env - -bundle config jobs 4 -bundle install -export JEKYLL_ENV=production -bundle exec jekyll build - -html-minifier --input-dir _site --output-dir _site --file-ext html --collapse-whitespace --minify-css --remove-comments --remove-attribute-quotes --remove-redundant-attributes - -set +x -export NEOCITIES_API_KEY=$(cat /home/user/.neocities/freeholdcottage) -set -x - -gem install --no-document neocities -neocities push --prune _site - -git add . -git commit -m "auto-updated after build" -git push \ No newline at end of file diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 785269c..0000000 --- a/shell.nix +++ /dev/null @@ -1,22 +0,0 @@ -with (import {}); - mkShell { - buildInputs = [ - bundler - imagemagick - nodejs - nodePackages_latest.html-minifier - nodePackages_latest.npm - pkg-config - ruby - ]; - shellHook = '' - mkdir -p .nix-gems - - export GEM_HOME=$PWD/.nix-gems - export GEM_PATH=$GEM_HOME - export PATH=$GEM_HOME/bin:$PATH - export PATH=$PWD/bin:$PATH - - gem list -i ^neocities$ || gem install neocities --no-document - ''; - }