Some cleanup.

frees-au · Dec 7, 2024 · c62945c · c62945c
1 parent 71720be
commit c62945c
Show file tree

Hide file tree

Showing 50 changed files with 545 additions and 524 deletions.
diff --git a/.ddev/commands/host/deploy b/.ddev/commands/host/deploy
diff --git a/.ddev/commands/host/frontend → .ddev/commands/host/fe-build b/.ddev/commands/host/frontend → .ddev/commands/host/fe-build
diff --git a/.ddev/commands/host/fe-watch b/.ddev/commands/host/fe-watch
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ddev npm --prefix web/themes/custom/fstheme ci
+ddev npm --prefix web/themes/custom/fstheme run watch
diff --git a/.ddev/commands/web/tome b/.ddev/commands/web/tome
@@ -5,10 +5,10 @@
 
 rm -rf /var/www/html/static-site
 
-if [ "$1" == "--production" ]; then
-  GENERATE_STATIC_SITE=1 drush tome:static -vv --uri=https://frees.au
-else
+if [ "$1" == "--local" ]; then
   GENERATE_STATIC_SITE=1 drush tome:static -vv --uri=fs-web-static-site.ddev.site:8080
+else
+  GENERATE_STATIC_SITE=1 drush tome:static -vv --uri=https://www.frees.au
 fi
 
 # Need this one to make search api lunr works.

diff --git a/README.md b/README.md
@@ -25,6 +25,9 @@ When you're done.
 # Tome build.
 ddev tome
 
+# Deploy to S3 (Skips repushing stockart).
+aws s3 cp static-site s3://frees-au-static/ --recursive --exclude "themes/custom/fstheme/stockart/*"
+
 # Captures the database.
 ddev save
 ```
@@ -35,10 +38,12 @@ This is a very simple and somewhat unfinished Tailwind theme with no base theme
 dependencies. It's intended for learning and copying rather than being something
 we expect you to use as a base theme. Please don't ask for support if you do 😬.
 
-Install the css with the following command, just to get you started.
+Normally you'd just work out of the theme directory, but these commands will run
+build and watch from the root.
 
 ```
-ddev frontend
+ddev fe-build
+ddev fe-watch
 ```
 
 ## Testing

diff --git a/_db_main.sql.gz b/_db_main.sql.gz
diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "~2.0",
+        "drupal/admin_toolbar": "^3",
         "drupal/better_exposed_filters": "^7.0",
         "drupal/ckeditor5_template": "^1.0",
         "drupal/config_ignore": "^3.2",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/admin_toolbar.settings.yml b/config/sync/admin_toolbar.settings.yml
@@ -0,0 +1,3 @@
+_core:
+  default_config_hash: jvTSppzcgH5wnzBhX5xnAExcp2I1CzkQ_aky65XNfYI
+menu_depth: 4
diff --git a/config/sync/admin_toolbar_tools.settings.yml b/config/sync/admin_toolbar_tools.settings.yml
@@ -0,0 +1,5 @@
+_core:
+  default_config_hash: WgdZsrd_5w9jlmcHV4R9dD2tG9OZEkYo4I_O8h7Gq8Q
+max_bundle_number: 20
+hoverintent_functionality: false
+show_local_tasks: true
diff --git a/config/sync/block.block.fstheme_tabs.yml b/config/sync/block.block.fstheme_tabs.yml
@@ -1,6 +1,6 @@
 uuid: b073a08d-4113-4331-bbbb-f6679a51bc21
 langcode: en
-status: true
+status: false
 dependencies:
   theme:
     - fstheme

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -1,6 +1,8 @@
 _core:
   default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
 module:
+  admin_toolbar: 0
+  admin_toolbar_tools: 0
   block: 0
   block_content: 0
   breakpoint: 0
@@ -37,7 +39,6 @@ module:
   metatag: 0
   metatag_open_graph: 0
   mysql: 0
-  navigation: 0
   node: 0
   oembed_providers: 0
   options: 0

diff --git a/config/sync/gin.settings.yml b/config/sync/gin.settings.yml
@@ -17,12 +17,12 @@ third_party_settings:
 preset_accent_color: red
 preset_focus_color: gin
 enable_darkmode: '0'
-classic_toolbar: new
+classic_toolbar: horizontal
 secondary_toolbar_frontend: true
 high_contrast_mode: false
 accent_color: ''
 focus_color: ''
-layout_density: default
+layout_density: small
 show_description_toggle: false
 show_user_theme_settings: false
 sticky_action_buttons: false
diff --git a/config/sync/navigation.block_layout.yml b/config/sync/navigation.block_layout.yml
diff --git a/config/sync/navigation.settings.yml b/config/sync/navigation.settings.yml
diff --git a/config/sync/search_api.index.article.yml b/config/sync/search_api.index.article.yml
@@ -3,13 +3,12 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_mode.node.teaser
     - field.storage.node.lead
     - search_api.server.lunr
-    - core.entity_view_mode.node.teaser
   module:
-    - search_api_lunr
     - node
-    - search_api
+    - search_api_lunr
 id: article
 name: Article
 description: ''

diff --git a/config/sync/system.menu.content.yml b/config/sync/system.menu.content.yml
diff --git a/static-site/articles/index.html b/static-site/articles/index.html
@@ -2,11 +2,11 @@
 <html>
     <head>
         <meta charset="UTF-8" />
-        <meta http-equiv="refresh" content="0;url='http://fs-web-static-site.ddev.site:8080/ce/content'" />
+        <meta http-equiv="refresh" content="0;url='https://www.frees.au/ce/content'" />
 
-        <title>Redirecting to http://fs-web-static-site.ddev.site:8080/ce/content</title>
+        <title>Redirecting to https://www.frees.au/ce/content</title>
     </head>
     <body>
-        Redirecting to <a href="http://fs-web-static-site.ddev.site:8080/ce/content">http://fs-web-static-site.ddev.site:8080/ce/content</a>.
+        Redirecting to <a href="https://www.frees.au/ce/content">https://www.frees.au/ce/content</a>.
     </body>
 </html>
diff --git a/static-site/ce/content/index.html b/static-site/ce/content/index.html
@@ -2,7 +2,7 @@
 <html lang="en" dir="ltr" prefix="og: https://ogp.me/ns#">
   <head>
     <meta charset="utf-8" />
-<link rel="canonical" href="http://fs-web-static-site.ddev.site:8080/ce/content" />
+<link rel="canonical" href="https://www.frees.au/ce/content" />
 <meta name="Generator" content="Drupal 10 (https://www.drupal.org)" />
 <meta name="MobileOptimized" content="width" />
 <meta name="HandheldFriendly" content="true" />
@@ -12,8 +12,8 @@
     <title>Content | frees.au/ce</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Cutive+Mono&family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">    <link rel="stylesheet" media="all" href="/sites/default/files/css/css_XLgTiWl4HOWpsPI9w51kW0wbFgZ2OcgUUq_oMHjXZCI.css?delta=0&amp;language=en&amp;theme=fstheme&amp;include=eJwrriwuSc3VT0osTtVJKy7JSM1N1U_PyU9KzNFNLi7WKctMLS_WB5N6ufkppTmpANvhEwk" />
-<link rel="stylesheet" media="all" href="/sites/default/files/css/css_jeQn0M8YL8jxtQk906SlOFIWbOFxKHUEwDXPT34q720.css?delta=1&amp;language=en&amp;theme=fstheme&amp;include=eJwrriwuSc3VT0osTtVJKy7JSM1N1U_PyU9KzNFNLi7WKctMLS_WB5N6ufkppTmpANvhEwk" />
+    <link href="https://fonts.googleapis.com/css2?family=Cutive+Mono&family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">    <link rel="stylesheet" media="all" href="/sites/default/files/css/css_RzNjJUtHCaXVWt7uZ9o1WlbweCU_eZxQHPvihL4dIaY.css?delta=0&amp;language=en&amp;theme=fstheme&amp;include=eJwrriwuSc3VT0osTtVJKy7JSM1N1U_PyU9KzNFNLi7WKctMLS_WB5N6ufkppTmpANvhEwk" />
+<link rel="stylesheet" media="all" href="/sites/default/files/css/css_8UcscNztMQPP9qj5Xq8MXKz_rnI3_d02NWrDWPSMxPE.css?delta=1&amp;language=en&amp;theme=fstheme&amp;include=eJwrriwuSc3VT0osTtVJKy7JSM1N1U_PyU9KzNFNLi7WKctMLS_WB5N6ufkppTmpANvhEwk" />
 
 
   </head>
@@ -27,7 +27,7 @@
     <div class="layout-container">
 
   <header role="banner" class="font-mono">
-    <div style="background-image: url('/themes/custom/fstheme/stockart/stock-058.jpg'); box-shadow: inset 0 0 0 2000px rgba(0, 0, 0, 0.8);" class="text-white bg-center bg-cover">
+    <div style="background-image: url('/themes/custom/fstheme/stockart/stock-014.jpg'); box-shadow: inset 0 0 0 2000px rgba(0, 0, 0, 0.8);" class="text-white bg-center bg-cover">
       <div class="container">
         <div class="py-[47px] md:py-[50px] lg:py-[62px] xl:py-[50px] min-h-[400px] md:min-h-[500px] lg:min-h-[600px] xl:min-h-[700px]">
           <div class="min-h-[inherit] flex flex-col justify-between">
@@ -137,7 +137,7 @@ <h1>
         <div class="views-element-container">
 
 
-      <div><div class="js-view-dom-id-4b06042ba883bc457960444f37e53a4812008a6c2b3a891a7197804f834febed">
+      <div><div class="js-view-dom-id-666482267d4985cab5d8cfd1c5cb910b6257bde7ce5e1ea4808636fecd4b7e17">
 
 
 
@@ -151,7 +151,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-025.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-092.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="23" height="27" viewBox="0 0 23 27" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M-0.00600582 26.4805L-0.00600444 0.499705L22.494 13.4901L-0.00600582 26.4805Z" fill="white"></path>
@@ -183,7 +183,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-044.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-058.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="23" height="27" viewBox="0 0 23 27" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M-0.00600582 26.4805L-0.00600444 0.499705L22.494 13.4901L-0.00600582 26.4805Z" fill="white"></path>
@@ -215,7 +215,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-001.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-081.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="23" height="27" viewBox="0 0 23 27" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M-0.00600582 26.4805L-0.00600444 0.499705L22.494 13.4901L-0.00600582 26.4805Z" fill="white"></path>
@@ -247,7 +247,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-088.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-057.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="23" height="27" viewBox="0 0 23 27" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M-0.00600582 26.4805L-0.00600444 0.499705L22.494 13.4901L-0.00600582 26.4805Z" fill="white"></path>
@@ -279,7 +279,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-032.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-031.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="38" height="29" viewBox="0 0 38 29" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M5.26951 28.4336L4.3331 27.0577C10.4243 22.8298 13.4166 18.6832 13.3099 14.6179C13.2557 12.552 12.3246 11.376 10.5164 11.09L6.42018 15.0988C5.07506 14.6673 3.85275 13.8324 2.75323 12.5941C1.58881 11.4243 0.981248 9.87299 0.930543 7.94032C0.879837 6.00766 1.60253 4.32146 3.09862 2.88172C4.59645 1.50863 6.6116 0.788868 9.14407 0.722427C11.6099 0.657734 13.6977 1.43658 15.4075 3.05896C17.0524 4.74973 17.9142 7.09461 17.9929 10.0936C18.1642 16.6247 13.9231 22.738 5.26951 28.4336ZM24.063 27.9405L23.1266 26.5646C29.2178 22.3367 32.2101 18.1901 32.1035 14.1249C32.0493 12.0589 31.1181 10.8829 29.31 10.5969L25.2137 14.6057C23.8686 14.1742 22.6463 13.3393 21.5468 12.1011C20.3823 10.9312 19.7748 9.37993 19.7241 7.44726C19.6734 5.51459 20.3961 3.82839 21.8922 2.38866C23.39 1.01557 25.4051 0.295803 27.9376 0.229361C30.4034 0.164668 32.4912 0.943512 34.201 2.56589C35.8459 4.25667 36.7077 6.60154 36.7864 9.60051C36.9578 16.1316 32.7166 22.2449 24.063 27.9405Z" fill="white"/>
@@ -311,7 +311,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-010.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-045.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="23" height="27" viewBox="0 0 23 27" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M-0.00600582 26.4805L-0.00600444 0.499705L22.494 13.4901L-0.00600582 26.4805Z" fill="white"></path>
@@ -343,7 +343,7 @@ <h1>
           <div class="item">
         <div class="h-full"><div class="flex flex-col h-full shadow-md hover:text-fs-red-tint relative grayscale duration-300 ease-in-out hover:grayscale-0 font-sans">
   <div class="px-[21px] pt-[16px] relative md:h-[330px] lg:h-[390px]">
-    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-018.jpg" />
+    <img class="w-full h-full object-cover" src="/themes/custom/fstheme/stockart/stock-062.jpg" />
     <div class="absolute bottom-[16px] right-[37px]">
               <svg width="38" height="29" viewBox="0 0 38 29" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M5.26951 28.4336L4.3331 27.0577C10.4243 22.8298 13.4166 18.6832 13.3099 14.6179C13.2557 12.552 12.3246 11.376 10.5164 11.09L6.42018 15.0988C5.07506 14.6673 3.85275 13.8324 2.75323 12.5941C1.58881 11.4243 0.981248 9.87299 0.930543 7.94032C0.879837 6.00766 1.60253 4.32146 3.09862 2.88172C4.59645 1.50863 6.6116 0.788868 9.14407 0.722427C11.6099 0.657734 13.6977 1.43658 15.4075 3.05896C17.0524 4.74973 17.9142 7.09461 17.9929 10.0936C18.1642 16.6247 13.9231 22.738 5.26951 28.4336ZM24.063 27.9405L23.1266 26.5646C29.2178 22.3367 32.2101 18.1901 32.1035 14.1249C32.0493 12.0589 31.1181 10.8829 29.31 10.5969L25.2137 14.6057C23.8686 14.1742 22.6463 13.3393 21.5468 12.1011C20.3823 10.9312 19.7748 9.37993 19.7241 7.44726C19.6734 5.51459 20.3961 3.82839 21.8922 2.38866C23.39 1.01557 25.4051 0.295803 27.9376 0.229361C30.4034 0.164668 32.4912 0.943512 34.201 2.56589C35.8459 4.25667 36.7077 6.60154 36.7864 9.60051C36.9578 16.1316 32.7166 22.2449 24.063 27.9405Z" fill="white"/>
@@ -451,9 +451,9 @@ <h5 class="mb-[15px] font-sans font-bold mt-0">Get in touch</h5>
 
 
     </div>
-    <script type="application/json" data-drupal-selector="drupal-settings-json">{"path":{"baseUrl":"\/","pathPrefix":"","currentPath":"node\/7","currentPathIsAdmin":false,"isFront":false,"currentLanguage":"en"},"pluralDelimiter":"\u0003","suppressDeprecationErrors":true,"search_api_lunr":{"servers":{"lunr":{"indexes":{"article":{"fileList":["http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-2.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-7.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-10.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-27.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-28.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-29.json","http:\/\/fs-web-static-site.ddev.site:8080\/sites\/default\/files\/search-api-js\/lunr\/article\/index-37.json"],"fields":{"created":{"boost":1},"lead":{"boost":1,"special_type":"summary"},"rendered_item":{"boost":1},"title":{"boost":21,"special_type":"label"},"url":{"boost":1,"special_type":"url"}},"version":75}}}}},"user":{"uid":0,"permissionsHash":"90e4bac39490bca468a5a6176f80b848f54412b618270998f9fb5753a349f672"}}</script>
-<script src="/sites/default/files/js/js_uyP5OpU91AqS7iLZStS2FiLU7y3RWY52qDee1xghcUY.js?scope=footer&amp;delta=0&amp;language=en&amp;theme=fstheme&amp;include=eJwrTk0sSs6ITyzIjM8pzSvSBzJ00opLMlJzU_XTc_KTEnN0s4oBFWkOWw"></script>
-<script src="/modules/contrib/search_api_lunr/js/build/api.index.js?snfpcr" type="module"></script>
+    <script type="application/json" data-drupal-selector="drupal-settings-json">{"path":{"baseUrl":"\/","pathPrefix":"","currentPath":"node\/7","currentPathIsAdmin":false,"isFront":false,"currentLanguage":"en"},"pluralDelimiter":"\u0003","suppressDeprecationErrors":true,"search_api_lunr":{"servers":{"lunr":{"indexes":{"article":{"fileList":["https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-2.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-7.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-10.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-27.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-28.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-29.json","https:\/\/www.frees.au\/sites\/default\/files\/search-api-js\/lunr\/article\/index-37.json"],"fields":{"created":{"boost":1},"lead":{"boost":1,"special_type":"summary"},"rendered_item":{"boost":1},"title":{"boost":21,"special_type":"label"},"url":{"boost":1,"special_type":"url"}},"version":75}}}}},"user":{"uid":0,"permissionsHash":"90e4bac39490bca468a5a6176f80b848f54412b618270998f9fb5753a349f672"}}</script>
+<script src="/sites/default/files/js/js_lq24AvK0JQx398JutmJZXSasOOsoyfOFbX6sH2oZL_c.js?scope=footer&amp;delta=0&amp;language=en&amp;theme=fstheme&amp;include=eJwrTk0sSs6ITyzIjM8pzSvSBzJ00opLMlJzU_XTc_KTEnN0s4oBFWkOWw"></script>
+<script src="/modules/contrib/search_api_lunr/js/build/api.index.js?so4dwa" type="module"></script>
 <script src="/sites/default/files/js/js_ekg5YtjFoUSzqrJjkf0iBh3lJUA91jwnilVn-z7VvGo.js?scope=footer&amp;delta=2&amp;language=en&amp;theme=fstheme&amp;include=eJwrTk0sSs6ITyzIjM8pzSvSBzJ00opLMlJzU_XTc_KTEnN0s4oBFWkOWw"></script>
 
   </body>