Update build scripts, add footer link

.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

.bundle/config

@@ -1,4 +1,4 @@
 ---
-BUNDLE_PATH: "vendor"
+BUNDLE_PATH: "vendor/cache"
 BUNDLE_WITHOUT: "jekyll-watch"
 BUNDLE_JOBS: "4"

.envrc

@@ -1 +0,0 @@
-use nix

.gitignore

@@ -1,6 +1,12 @@
 _site
-vendor
-.jekyll-cache
-.DS_Store
+.bundle
+.direnv
 .nix-gems
-.direnv
+.DS_Store
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
+Gemfile.lock
+.env
+.aider*

.ruby-version

@@ -1 +0,0 @@
-3.1.2

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
 

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

_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

_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}}**<br>
+{% if site.address.street    %}{{site.address.street    }}<br>{% endif %}
+{% if site.address.locality  %}{{site.address.locality  }}<br>{% endif %}
+{% if site.address.post_code %}{{site.address.post_code }}<br>{% endif %}
+{% include link-phone-number.md %}<br>
+{% include link-email-address.md %}
 {% endcapture %}
 
-<footer>{{ to_markdown | markdownify }}</footer>
+<footer>
+  {{ to_markdown | markdownify }}
+  <br>
+  <a href="/privacy">Privacy Policy</a>
+  <br>
+  <a href="https://stefn.co.uk">site by stef</a>
+</footer>

_layouts/home.html

@@ -5,30 +5,35 @@ layout: default
 {% include title.html %}
 
 <div class="homepage-banner">
-	{% responsive_image path: "assets/banner.jpg" %}
+  {% responsive_image path: "assets/banner.jpg" %}
 </div>
 
-
 <div class="row">
-	<div class="col-md-8 page page--home">
-		{{ content }}
-		<hr>
-		{% if site.google_maps_embed %}
-		<div class="embed-responsive embed-responsive-16by9 margin--top">
-			<iframe class="embed-responsive-item"
-				src="{{site.google_maps_embed}}"></iframe>
-		</div>
-		{% endif %}
-	</div>
-	<div class="col-md-4">
-		{% include contact-links.html %}
-		{% include cqc-widget.html %}
-		<div class="scores-doors">
-			<a
-				href="https://www.scoresonthedoors.org.uk/business/freehold-cottage-rochdale-lancashire-510716.html?ins_type=FH">
-				<img src="/assets/scores-on-the-doors.png"
-					alt="Food Hygiene Rating - 5/5 - Very Good">
-			</a>
-		</div>
-	</div>
-</div>
+  <div class="col-md-8 page page--home">
+    {{ content }}
+    <hr />
+    {% if site.google_maps_embed %}
+    <div class="embed-responsive embed-responsive-16by9 margin--top">
+      <iframe
+        class="embed-responsive-item"
+        loading="lazy"
+        sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox"
+        src="{{site.google_maps_embed}}"
+      ></iframe>
+    </div>
+    {% endif %}
+  </div>
+  <div class="col-md-4">
+    {% include contact-links.html %} {% include cqc-widget.html %}
+    <div class="scores-doors">
+      <a
+        href="https://www.scoresonthedoors.org.uk/business/freehold-cottage-rochdale-lancashire-510716.html?ins_type=FH"
+      >
+        <img
+          src="/assets/scores-on-the-doors.png"
+          alt="Food Hygiene Rating - 5/5 - Very Good"
+        />
+      </a>
+    </div>
+  </div>
+</div>

_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:
 

_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.

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
+"

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
+"

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
+"

build.sh

@@ -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

shell.nix

@@ -1,22 +0,0 @@
-with (import <nixpkgs> {});
-  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
-    '';
-  }