Update builds, add privacy policy and footer links

2024-11-07 00:50:34 +00:00 · 2024-11-07 00:50:34 +00:00 · 681c6f21b8
parent b702053c13
commit 681c6f21b8
14 changed files with 165 additions and 60 deletions
--- a/.build.yml
+++ b/.build.yml
@ -1,17 +1,9 @@
 image: nixos/latest
-packages:
-  - nixos.ruby_3_3
-  - nixos.html-minifier
-  - nixos.jekyll
-  - nixos.neocities-cli
-  - nixos.sass
-environment:
-  repo: newbarn
 sources:
  - https://git.sr.ht/~stfn/newbarn
 secrets:
  - d1a8c6e8-f481-4e50-9ec8-f780651ea483 # neocities
 tasks:
  - build: |
-      cd $repo
-      sh build.sh
+      cd newbarn
+      sh bin/build
--- a/.bundle/config
+++ b/.bundle/config
@ -1,3 +1,3 @@
 ---
 BUNDLE_JOBS: "4"
-BUNDLE_PATH: "vendor/bundle"
+BUNDLE_PATH: "vendor/cache"
--- a/.envrc
+++ b/.envrc
@ -1 +0,0 @@
-use nix
--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,6 @@ note_modules
 .nix-gems
 .sass-cache
 vendor
+Gemfile.lock
+.env
+.aider*
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +0,0 @@
-3.1.2
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -10,12 +10,32 @@ GEM
      eventmachine (>= 0.12.9)
      http_parser.rb (~> 0)
    eventmachine (1.2.7)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
    forwardable-extended (2.6.0)
+    google-protobuf (4.28.3)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.28.3-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
    google-protobuf (4.28.3-arm64-darwin)
      bigdecimal
      rake (>= 13)
+    google-protobuf (4.28.3-x86-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.28.3-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
    google-protobuf (4.28.3-x86_64-linux)
      bigdecimal
      rake (>= 13)
@ -56,8 +76,16 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.4.0)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
    nokogiri (1.16.7-arm64-darwin)
      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
    nokogiri (1.16.7-x86_64-linux)
      racc (~> 1.4)
    pathutil (0.16.2)
@ -71,18 +99,47 @@ GEM
    rexml (3.3.9)
    rouge (4.4.0)
    safe_yaml (1.0.5)
+    sass-embedded (1.80.6-aarch64-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-aarch64-linux-musl)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-arm-linux-gnueabihf)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-arm-linux-musleabihf)
+      google-protobuf (~> 4.28)
    sass-embedded (1.80.6-arm64-darwin)
      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-x86-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-x86-linux-musl)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-x86_64-darwin)
+      google-protobuf (~> 4.28)
    sass-embedded (1.80.6-x86_64-linux-gnu)
      google-protobuf (~> 4.28)
+    sass-embedded (1.80.6-x86_64-linux-musl)
+      google-protobuf (~> 4.28)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
    unicode-display_width (2.6.0)
    webrick (1.9.0)

 PLATFORMS
-  arm64-darwin-21
-  x86_64-linux
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
+  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl

 DEPENDENCIES
  jekyll
--- a/_config.yml
+++ b/_config.yml
@ -17,11 +17,9 @@ exclude:
  - .sass-cache/
  - .jekyll-cache/
  - gemfiles/
+  - bin/
  - Gemfile
  - Gemfile.lock
  - node_modules/
  - shell.nix
  - vendor
-
-sass:
-  style: compressed
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -96,13 +96,18 @@
          </div>
          <div class="widget">
            <iframe
-              src="https://www.facebook.com/plugins/page.php?href=https%3A%2F%2Fwww.facebook.com%2Fnewbarnltd%2F&show_posts=true&width=285&height=800&small_header=true&adapt_container_width=true&hide_cover=false&show_facepile=true"
-              width="100%" height="800" style="
-                                border:none;
-                                overflow:hidden
-                            " scrolling="no" frameborder="0"
+              src="https://www.facebook.com/plugins/page.php?href=https%3A%2F%2Fwww.facebook.com%2Fnewbarnltd%2F&show_posts=true&width=285&height=800&small_header=true&adapt_container_width=true&hide_cover=false&show_facepile=false"
+              width="100%"
+              height="800"
+              style="
+                border:none;
+                overflow:hidden
+              "
+              loading="lazy"
+              scrolling="no"
+              frameborder="0"
              allowfullscreen="true"
-              sandbox="allow-scripts allow-same-origin"
+              sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox"
              allow="autoplay; clipboard-write; encrypted-media; picture-in-picture; web-share"></iframe>
          </div>
        </div>
@ -116,13 +121,13 @@
        <div class="col-md-4">
          <div class="widget">
            <p>
-              Please
+              Please call
              <strong>
-                <a href="tel:01706345886">call</a>
+                <a href="tel:01706345886">01706 345 886</a>
              </strong>
-              or
+              or email
              <strong>
-                <a href="mailto:info@newbarnltd.com">email</a>
+                <a href="mailto:info@newbarnltd.com">info@newbarnltd.com</a>
              </strong>
              for more information.
            </p>
@ -139,21 +144,24 @@
                  Cottage</a></li>
            </ul>
          </div>
+          <div class="footer-links">
+            <a href="/privacy">Privacy Policy</a>
+          </div>
        </div>
      </div>
      <hr />
-      <div class="row">
-        <div class="col-md-12">
-          <p class="pull-left">
-            &copy; Newbarn Ltd
-          </p>
-          <p class="pull-right">
-            <a href="http://opencorporates.com/companies/gb/07825886"
-              target="_blank"
-              title="Blue Pits Housing Action on OpenCorporates.org">OpenCorporates.org</a>
-          </p>
-          <div class="clearfix"></div>
-        </div>
+      <div class="footer-links">
+        &copy; Newbarn Ltd
+        <span>//</span>
+        <a
+          href="https://opencorporates.com/companies/gb/07825886"
+          target="_blank"
+          title="Blue Pits Housing Action on OpenCorporates.org"
+        >
+          OpenCorporates.org
+        </a>
+        <span>//</span>
+        <a href="https://stefn.co.uk">website by stef</a>
      </div>
    </div>
  </footer>
--- a/_pages/privacy.md
+++ 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 [newbarnltd@gmail.com](mailto:newbarnltd@gmail.com)
+
+Lynn Collins is the Data Security and Protection Officer for Newbarn Ltd.
--- a/bin/build
+++ b/bin/build
@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+rm -rf _site
+
+nix-shell -p ruby_3_3 --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/newbarn)
+  set -x
+  neocities push --prune _site
+"
--- a/bin/serve
+++ b/bin/serve
@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+rm -rf _site
+
+nix-shell -p ruby_3_3 --pure --command "
+  echo 'Installing bundles'
+  bundle config set path 'vendor/cache'
+  bundle install --gemfile=Gemfile
+
+  echo 'Building site'
+  bundle exec jekyll serve
+"
--- a/bin/upgrade
+++ b/bin/upgrade
@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+nix-shell -p ruby_3_3 --pure --command "
+  export JEKYLL_ENV=production
+  echo 'Installing bundles'
+  bundle config set path 'vendor/cache'
+  bundle install --gemfile=Gemfile
+  bundle update
+"
--- a/build.sh
+++ b/build.sh
@ -1,11 +0,0 @@
-#!/usr/bin/env
-
-export JEKYLL_ENV=production
-set +x
-export NEOCITIES_API_KEY=$(cat ~/.neocities/newbarn)
-set -x
-rm -rf _site
-bundle install
-bundle exec jekyll build
-html-minifier --input-dir _site --output-dir _site --collapse-whitespace --file-ext html
-neocities push --prune _site
--- a/shell.nix
+++ b/shell.nix
@ -1,9 +0,0 @@
-with (import <nixpkgs> {});
-mkShell {
-  buildInputs = [
-    ruby_3_3
-    html-minifier
-    neocities-cli
-    sass
-  ];
-}