Merge ssg-test/main
This commit is contained in:
		
						commit
						8adad1367f
					
				
					 12 changed files with 194 additions and 0 deletions
				
			
		
							
								
								
									
										1
									
								
								ssg-test/.envrc
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								ssg-test/.envrc
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | ||||||
|  | use flake | ||||||
							
								
								
									
										6
									
								
								ssg-test/.gitignore
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								ssg-test/.gitignore
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,6 @@ | ||||||
|  | # SSG | ||||||
|  | /dst/* | ||||||
|  | !/dst/.keep | ||||||
|  | 
 | ||||||
|  | # Nix | ||||||
|  | /result | ||||||
							
								
								
									
										37
									
								
								ssg-test/assets/tailwind.config.ts
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								ssg-test/assets/tailwind.config.ts
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,37 @@ | ||||||
|  | import colours from "tailwindcss/colors"; | ||||||
|  | import type { Config } from "tailwindcss"; | ||||||
|  | import formsPlugin from '@tailwindcss/forms'; | ||||||
|  | import typographyPlugin from "@tailwindcss/typography"; | ||||||
|  | 
 | ||||||
|  | export default { | ||||||
|  |   content: [ | ||||||
|  |     "src/**/*.{html,md}", | ||||||
|  |   ], | ||||||
|  |   theme: { | ||||||
|  |     colors: { | ||||||
|  |       black: "#000", | ||||||
|  |       blue: { | ||||||
|  |         primary: "#24608A", | ||||||
|  |         400: "#60a5fa", | ||||||
|  |       }, | ||||||
|  |       current: "currentColor", | ||||||
|  |       grey: colours.stone, | ||||||
|  |       inherit: "inherit", | ||||||
|  |       transparent: "transparent", | ||||||
|  |       white: "#fff", | ||||||
|  |     }, | ||||||
|  | 
 | ||||||
|  |     extend: { | ||||||
|  |       fontFamily: { | ||||||
|  |         sans: [ | ||||||
|  |           "Roboto Condensed", | ||||||
|  |           "Arial", | ||||||
|  |           "Helvetica Neue", | ||||||
|  |           "Helvetica", | ||||||
|  |           "sans-serif", | ||||||
|  |         ], | ||||||
|  |       }, | ||||||
|  |     }, | ||||||
|  |   }, | ||||||
|  |   plugins: [formsPlugin, typographyPlugin], | ||||||
|  | } satisfies Config; | ||||||
							
								
								
									
										0
									
								
								ssg-test/dst/.keep
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								ssg-test/dst/.keep
									
										
									
									
									
										Normal file
									
								
							
							
								
								
									
										27
									
								
								ssg-test/flake.lock
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								ssg-test/flake.lock
									
										
									
										generated
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,27 @@ | ||||||
|  | { | ||||||
|  |   "nodes": { | ||||||
|  |     "nixpkgs": { | ||||||
|  |       "locked": { | ||||||
|  |         "lastModified": 1739866667, | ||||||
|  |         "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", | ||||||
|  |         "owner": "nixos", | ||||||
|  |         "repo": "nixpkgs", | ||||||
|  |         "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", | ||||||
|  |         "type": "github" | ||||||
|  |       }, | ||||||
|  |       "original": { | ||||||
|  |         "owner": "nixos", | ||||||
|  |         "ref": "nixos-unstable", | ||||||
|  |         "repo": "nixpkgs", | ||||||
|  |         "type": "github" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "root": { | ||||||
|  |       "inputs": { | ||||||
|  |         "nixpkgs": "nixpkgs" | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "root": "root", | ||||||
|  |   "version": 7 | ||||||
|  | } | ||||||
							
								
								
									
										41
									
								
								ssg-test/flake.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								ssg-test/flake.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,41 @@ | ||||||
|  | { | ||||||
|  |   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; | ||||||
|  | 
 | ||||||
|  |   outputs = | ||||||
|  |     { nixpkgs, ... }: | ||||||
|  |     let | ||||||
|  |       system = "x86_64-linux"; | ||||||
|  |       pkgs = import nixpkgs { inherit system; }; | ||||||
|  |     in | ||||||
|  |     { | ||||||
|  |       devShells.${system}.default = pkgs.mkShell { | ||||||
|  |         buildInputs = with pkgs; [ | ||||||
|  |           bashInteractive | ||||||
|  |           entr | ||||||
|  |           lowdown | ||||||
|  |           tailwindcss | ||||||
|  |         ]; | ||||||
|  |       }; | ||||||
|  | 
 | ||||||
|  |       packages.${system} = with pkgs; { | ||||||
|  |         ssg = mkDerivation { | ||||||
|  |           name = "ssg"; | ||||||
|  | 
 | ||||||
|  |           src = fetchurl { | ||||||
|  |             url = "https://romanzolotarev.com/bin/ssg"; | ||||||
|  |             sha256 = "OgqH4ZQ47EM25ubEpum6v38Tl76hQPh7aZ6VRQcbd2M="; | ||||||
|  |           }; | ||||||
|  | 
 | ||||||
|  |           dontUnpack = true; | ||||||
|  | 
 | ||||||
|  |           installPhase = '' | ||||||
|  |             mkdir -p $out/bin | ||||||
|  |             cp $src $out/bin/ssg | ||||||
|  |             chmod +x $out/bin/ssg | ||||||
|  |           ''; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|  | 
 | ||||||
|  |       formatter.${system} = pkgs.nixfmt-rfc-style; | ||||||
|  |     }; | ||||||
|  | } | ||||||
							
								
								
									
										6
									
								
								ssg-test/notes.txt
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								ssg-test/notes.txt
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,6 @@ | ||||||
|  | https://romanzolotarev.com/ssg.html | ||||||
|  | https://romanzolotarev.com/bin/ssg | ||||||
|  | 
 | ||||||
|  | nix build .#ssg | ||||||
|  | ./result/bin/ssg | ||||||
|  | 
 | ||||||
							
								
								
									
										36
									
								
								ssg-test/run
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										36
									
								
								ssg-test/run
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,36 @@ | ||||||
|  | #!/usr/bin/env bash | ||||||
|  | 
 | ||||||
|  | set -o errexit | ||||||
|  | set -o nounset | ||||||
|  | set -o pipefail | ||||||
|  | 
 | ||||||
|  | export PATH="${PATH}:./result/bin" | ||||||
|  | 
 | ||||||
|  | function clean { | ||||||
|  |   rm -fr dst "${@}" | ||||||
|  |   mkdir dst | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function css-build { | ||||||
|  |   tailwindcss --config assets/tailwind.config.ts \ | ||||||
|  |     --output src/css/tailwind.css "${@}" | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function generate { | ||||||
|  |   ssg "src" "dst" "Oliver Davies" "https://www.oliverdavies.uk" | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function watch { | ||||||
|  |   find src -type f | entr ./run generate | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function help { | ||||||
|  |   printf "%s <task> [args]\n\nTasks:\n" "${0}" | ||||||
|  | 
 | ||||||
|  |   compgen -A function | grep -v "^_" | cat -n | ||||||
|  | 
 | ||||||
|  |   printf "\nExtended help:\n  Each task has comments for general usage\n" | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | TIMEFORMAT="Task completed in %3lR" | ||||||
|  | time "${@:-help}" | ||||||
							
								
								
									
										16
									
								
								ssg-test/src/_footer.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								ssg-test/src/_footer.html
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,16 @@ | ||||||
|  |         <footer class="mt-16 mb-6"> | ||||||
|  |           <nav class="flex flex-wrap justify-center -mb-3"> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/" title="Home">Home</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/press" title="Press Info">Press Info</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/pricing" title="Services">Services</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/presentations" title="Presentations">Presentations</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/podcast" title="The Beyond Blocks Podcast">Podcast</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/daily" title="The Daily Drupaler Email List">Daily list</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="/sponsor" title="Sponsor me">Sponsor me</a> | ||||||
|  |             <a class="mx-3 mb-3 text-base underline md:text-lg dark:text-white hover:no-underline link dark:hover:text-blue-400 hover:text-gray-900" href="mailto:oliver+website@oliverdavies.uk" title="Contact Oliver">Contact</a> | ||||||
|  |           </nav> | ||||||
|  |         </footer> | ||||||
|  |       </div> | ||||||
|  |     </div> | ||||||
|  |   </body> | ||||||
|  | </html> | ||||||
							
								
								
									
										22
									
								
								ssg-test/src/_header.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								ssg-test/src/_header.html
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,22 @@ | ||||||
|  | <!DOCTYPE html> | ||||||
|  | <html> | ||||||
|  |   <title></title> | ||||||
|  |   <link rel="stylesheet" href="/tailwind.css"/> | ||||||
|  | </html> | ||||||
|  | <body> | ||||||
|  |   <div class="py-4 px-4 mx-auto max-w-xl"> | ||||||
|  |     <header class="flex flex-col justify-between items-center md:flex-row"> | ||||||
|  |       <div class="flex flex-col justify-between items-center md:flex-row"> | ||||||
|  |         <div> | ||||||
|  |           <a href="/" aria-label="Go back to the Home page"> | ||||||
|  |             <svg aria-hidden="true" class="w-16 h-16 fill-current dark:text-blue-400 text-blue-primary md:w-18 md:h-18" viewBox="0 0 706 504" xmlns="http://www.w3.org/2000/svg"> | ||||||
|  |               <path d="M456.5 1.1c-12.3 1.5-31 5.5-44.1 9.4-12.7 3.9-63.6 24.6-64.1 26.2-.2.5 1.4 1.7 3.4 2.7 2.1 1 8.9 5.1 15.1 9.2l11.2 7.5 14.5-6c22.9-9.5 37.3-14 57.5-17.8 7.2-1.3 14.7-1.7 31-1.8 18.6 0 23.1.3 33 2.3 22 4.5 46.1 13.9 64.5 25.2 39.3 24.2 69.9 65.3 86.9 116.5 16.3 49.2 13 100.2-9.4 145.3-21.8 43.7-49.2 68.8-101.5 92.9-13.4 6.2-120.1 51.3-121.3 51.3-.5 0-15.7-35.1-33.7-78l-32.8-78 3.1-12.8c4.4-18 5.6-29.5 4.9-48.5-.6-16.8-2-25.7-6.3-38.7-12-35.8-40.8-69.2-74-85.6l-7.2-3.6-4.2-10c-2.4-5.6-3.9-10.3-3.4-10.7.5-.5 9.7-4.5 20.4-9s19.9-8.6 20.4-9.1c1.5-1.5-18.6-10.1-32.3-13.9l-6.8-1.9-20.6 8.7c-11.4 4.8-20.9 8.9-21.2 9.2-.2.3 2 6.3 5 13.3 3 7 5.5 12.8 5.5 12.9 0 .1-7.5.2-16.7.2-11.8.1-19.4.6-25.6 1.8-27.3 5.5-50.5 17.6-70.4 37-21.8 21.2-36.7 49-43 80.2-2.4 12.3-2.4 44 0 57.2 3.6 19.4 11.9 40.4 22.3 56 6.9 10.4 21.1 25.4 31.2 33 29.9 22.5 70.8 33.2 106.2 27.8 18.9-2.8 39.3-10.6 54.1-20.5 13.5-9.1 29.1-23.8 37.6-35.5 1.2-1.7 2.4-2.8 2.7-2.5.3.3 15.6 36.6 34.1 80.5 18.5 44 33.8 80.1 33.9 80.3.8.8 144.9-60.8 162.1-69.3 45.5-22.4 73.4-47.1 95.7-84.7 28-47.4 37.5-99.7 27.8-153.5-6.8-37.6-25-79-48.6-110.3-33.2-44.1-83-74.2-138.4-83.6-11.4-1.9-46.9-2.7-58.5-1.3zM259.2 141.4c42.4 10.9 77.8 50 84.8 93.8 1.6 9.9.8 34.5-1.4 44.8-5.2 24-15.5 43-32.6 60-20.7 20.6-42.8 31.3-67.7 32.7-26.9 1.5-53.2-6.2-74.3-21.7-29.4-21.7-46-56.2-46-95.7 0-45.4 27.2-89.6 66.1-107.2 8.2-3.7 21.7-7.9 29.4-9.1 10.4-1.6 30.8-.4 41.7 2.4z"></path> | ||||||
|  |               <path d="M201 20.6c-83 11.2-157 71-186.5 150.8-22.3 60.3-18.3 134.9 10.2 192 21.5 43.1 59.6 81.6 102.1 103.4 21.1 10.9 46.3 19 71.2 22.9 16.2 2.5 53.1 2.5 68.5 0 25.9-4.2 45.2-10.5 69-22.2 14.4-7.1 39.7-23.2 41.8-26.7.8-1.2-.2-4.6-4.3-14.5-2.9-7-5.7-13.2-6.1-13.7-.5-.5-4.3 1.7-8.6 5.1C320 447.1 277.6 462 232 462c-59.8 0-115.2-26.3-154.8-73.5-32.2-38.3-48.8-88.7-46.9-142 2-53.7 22.1-99.6 60.7-138.5 28.1-28.3 63-47.2 102.9-55.7 11.9-2.6 14.1-2.8 38.6-2.8 28.3 0 39.4 1.3 59 7 27.9 8.1 58.5 26.1 80.9 47.6l10.9 10.5-14.3 6c-7.8 3.2-14.5 6.4-14.7 7-.2.7 16.5 41.3 37.1 90.4 20.7 49.1 37.6 90.1 37.6 91.1 0 3.4-7.1 24.2-11.6 33.8-2.4 5.1-6.6 13.1-9.4 17.7l-5 8.3 6.6 15.6c5.5 12.9 6.9 15.4 8 14.4 2.8-2.3 19.2-27.8 24.4-37.9l5.3-10.3 8.3 19.8c4.7 10.9 8.7 20.1 8.9 20.3.6.6 60.8-24.6 74.5-31.2 29.7-14.2 52.7-35.8 65.3-61.1 16.9-34 17.6-70.8 2.2-112-17-45.3-45.8-76.7-82.5-90-18.2-6.5-43.1-9.1-63.5-6.5-11.5 1.4-30 5.8-40.3 9.5l-7.3 2.6L402.3 91c-20.3-21.3-37.9-34.3-65.4-48.3-33.4-17.1-63.7-23.8-105.9-23.6-10.7.1-24.2.7-30 1.5zM504.5 122c9.2 2.5 22.1 8.3 29.2 13.1 6.9 4.7 18.7 16.3 24.3 23.9 15.1 20.6 26.3 49 29 74 2.3 20.7-3.1 43-14.5 60.5-8.7 13.3-27.6 29.5-44.5 38-6 3.1-47.3 20.6-47.5 20.2-1.1-1.6-87.5-208-87.3-208.3.2-.2 7.4-3.3 15.8-6.9 22.5-9.5 33.8-13 55-16.9 1.4-.2 9.3-.3 17.5-.1 11.5.2 16.9.8 23 2.5z"></path> | ||||||
|  |             </svg> | ||||||
|  |           </a> | ||||||
|  |         </div> | ||||||
|  |       </div> | ||||||
|  |     </header> | ||||||
|  |   </div> | ||||||
|  | 
 | ||||||
|  |   <div class="py-10 px-6 mx-auto max-w-xl md:py-10"> | ||||||
							
								
								
									
										1
									
								
								ssg-test/src/css/tailwind.css
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								ssg-test/src/css/tailwind.css
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								ssg-test/src/index.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								ssg-test/src/index.html
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | ||||||
|  | <h1 class="mb-4 text-xl font-bold md:text-2xl">Oliver Davies - Drupal Developer, Consultant and Speaker</h1> | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue