From a15e54e0e4c8c3d96ad067993ca9736897df68d7 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Wed, 26 Feb 2025 17:08:13 -0500 Subject: [PATCH] feat: Adds styleguide, working on result view container. --- Package.resolved | 6 +- Package.swift | 11 +- Public/images/toolbox.svg | 13 +- Public/output.css | 2 +- Sources/Routes/MoldRisk.swift | 29 ++++ Sources/Styleguide/Buttons.swift | 19 +++ Sources/Styleguide/Colors.swift | 85 ++++++++++ Sources/Styleguide/FormElements.swift | 84 ++++++++++ Sources/Styleguide/LabeledContent.swift | 54 ++++++ Sources/Styleguide/ResultContainer.swift | 20 +++ Sources/Styleguide/SVG.swift | 158 ++++++++++++++++++ Sources/ViewController/Views/MainPage.swift | 31 +++- Sources/ViewController/Views/MoldRisk.swift | 123 +++++++++----- Sources/ViewController/Views/SVG.swift | 46 ----- Sources/ViewController/Views/Styleguide.swift | 7 - tailwind.config.js | 3 +- 16 files changed, 569 insertions(+), 122 deletions(-) create mode 100644 Sources/Styleguide/Buttons.swift create mode 100644 Sources/Styleguide/Colors.swift create mode 100644 Sources/Styleguide/FormElements.swift create mode 100644 Sources/Styleguide/LabeledContent.swift create mode 100644 Sources/Styleguide/ResultContainer.swift create mode 100644 Sources/Styleguide/SVG.swift delete mode 100644 Sources/ViewController/Views/SVG.swift delete mode 100644 Sources/ViewController/Views/Styleguide.swift diff --git a/Package.resolved b/Package.resolved index 2eb0a90..5054de4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "7efd57cbec8a157adddec3ffcc6ff2b58e602f8762df879e933220d7070945f7", + "originHash" : "af48ddc16f0ca460cff188345cf870056ca53edee23c016080fc1ad55f366bf9", "pins" : [ { "identity" : "async-http-client", @@ -276,8 +276,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swift-psychrometrics/swift-psychrometrics.git", "state" : { - "revision" : "df8b764b06b52386948b2ddcd99cdf000db666ec", - "version" : "0.2.4" + "revision" : "04f3324b2e3498852461b43102b8835136f2f0e7", + "version" : "0.3.0" } }, { diff --git a/Package.swift b/Package.swift index 750b2f4..0b9d797 100644 --- a/Package.swift +++ b/Package.swift @@ -10,6 +10,7 @@ let package = Package( .executable(name: "App", targets: ["App"]), .library(name: "ApiController", targets: ["ApiController"]), .library(name: "Routes", targets: ["Routes"]), + .library(name: "Styleguide", targets: ["Styleguide"]), .library(name: "ViewController", targets: ["ViewController"]) ], dependencies: [ @@ -25,7 +26,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/vapor-routing.git", from: "0.1.3"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.17.7"), .package(url: "https://github.com/pointfreeco/swift-case-paths.git", from: "1.6.0"), - .package(url: "https://github.com/swift-psychrometrics/swift-psychrometrics.git", from: "0.2.4") + .package(url: "https://github.com/swift-psychrometrics/swift-psychrometrics.git", from: "0.3.0") ], targets: [ .executableTarget( @@ -68,10 +69,18 @@ let package = Package( ], swiftSettings: swiftSettings ), + .target( + name: "Styleguide", + dependencies: [ + .product(name: "Elementary", package: "elementary") + ], + swiftSettings: swiftSettings + ), .target( name: "ViewController", dependencies: [ "Routes", + "Styleguide", .product(name: "DependenciesMacros", package: "swift-dependencies"), .product(name: "Elementary", package: "elementary") ], diff --git a/Public/images/toolbox.svg b/Public/images/toolbox.svg index 806e3c5..af7b594 100644 --- a/Public/images/toolbox.svg +++ b/Public/images/toolbox.svg @@ -1,15 +1,8 @@ - - - - - - - - - - + + + diff --git a/Public/output.css b/Public/output.css index 73c5376..aca884c 100644 --- a/Public/output.css +++ b/Public/output.css @@ -1,2 +1,2 @@ /*! tailwindcss v4.0.8 | MIT License | https://tailwindcss.com */ -@layer theme{:root,:host{--font-sans:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-red-200:oklch(.885 .062 18.334);--color-amber-200:oklch(.924 .12 95.746);--color-yellow-300:oklch(.905 .182 98.111);--color-yellow-400:oklch(.852 .199 91.936);--color-yellow-800:oklch(.476 .114 61.907);--color-blue-500:oklch(.623 .214 259.815);--color-blue-600:oklch(.546 .245 262.881);--color-slate-300:oklch(.869 .022 252.894);--color-slate-700:oklch(.372 .044 257.287);--color-gray-200:oklch(.928 .006 264.531);--color-gray-300:oklch(.872 .01 258.338);--color-gray-700:oklch(.373 .034 259.733);--color-gray-800:oklch(.278 .033 256.848);--color-white:#fff;--spacing:.25rem;--text-sm:.875rem;--text-sm--line-height:calc(1.25/.875);--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--font-weight-medium:500;--font-weight-bold:700;--font-weight-extrabold:800;--radius-sm:.25rem;--radius-md:.375rem;--radius-lg:.5rem;--radius-xl:.75rem;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-font-feature-settings:var(--font-sans--font-feature-settings);--default-font-variation-settings:var(--font-sans--font-variation-settings);--default-mono-font-family:var(--font-mono);--default-mono-font-feature-settings:var(--font-mono--font-feature-settings);--default-mono-font-variation-settings:var(--font-mono--font-variation-settings)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}body{line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1;color:color-mix(in oklab,currentColor 50%,transparent)}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components;@layer utilities{.relative{position:relative}.static{position:static}.col-span-1{grid-column:span 1/span 1}.col-span-10{grid-column:span 10/span 10}.-m-1{margin:calc(var(--spacing)*-1)}.m-0{margin:calc(var(--spacing)*0)}.-mx-0{margin-inline:calc(var(--spacing)*0)}.-mx-1{margin-inline:calc(var(--spacing)*-1)}.-mx-2{margin-inline:calc(var(--spacing)*-2)}.-mt-0{margin-top:calc(var(--spacing)*0)}.-mt-1{margin-top:calc(var(--spacing)*-1)}.mt-1{margin-top:calc(var(--spacing)*1)}.mt-2{margin-top:calc(var(--spacing)*2)}.mt-3{margin-top:calc(var(--spacing)*3)}.mt-4{margin-top:calc(var(--spacing)*4)}.-mb-1{margin-bottom:calc(var(--spacing)*-1)}.-mb-2{margin-bottom:calc(var(--spacing)*-2)}.mb-2{margin-bottom:calc(var(--spacing)*2)}.mb-6{margin-bottom:calc(var(--spacing)*6)}.mb-8{margin-bottom:calc(var(--spacing)*8)}.block{display:block}.contents{display:contents}.flex{display:flex}.grid{display:grid}.table{display:table}.h-5{height:calc(var(--spacing)*5)}.h-6{height:calc(var(--spacing)*6)}.h-8{height:calc(var(--spacing)*8)}.min-h-screen{min-height:100vh}.w-1{width:calc(var(--spacing)*1)}.w-5{width:calc(var(--spacing)*5)}.w-6{width:calc(var(--spacing)*6)}.w-8{width:calc(var(--spacing)*8)}.w-full{width:100%}.transform{transform:var(--tw-rotate-x)var(--tw-rotate-y)var(--tw-rotate-z)var(--tw-skew-x)var(--tw-skew-y)}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.gap-2{gap:calc(var(--spacing)*2)}.gap-3{gap:calc(var(--spacing)*3)}:where(.space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*6)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*6)*calc(1 - var(--tw-space-y-reverse)))}.gap-x-2{column-gap:calc(var(--spacing)*2)}.rounded-md{border-radius:var(--radius-md)}.rounded-sm{border-radius:var(--radius-sm)}.rounded-xl{border-radius:var(--radius-xl)}.rounded-e-lg{border-start-end-radius:var(--radius-lg);border-end-end-radius:var(--radius-lg)}.rounded-e-md{border-start-end-radius:var(--radius-md);border-end-end-radius:var(--radius-md)}.border{border-style:var(--tw-border-style);border-width:1px}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-gray-300{border-color:var(--color-gray-300)}.border-yellow-300{border-color:var(--color-yellow-300)}.bg-blue-500{background-color:var(--color-blue-500)}.bg-slate-300{background-color:var(--color-slate-300)}.bg-white{background-color:var(--color-white)}.bg-yellow-300{background-color:var(--color-yellow-300)}.p-0{padding:calc(var(--spacing)*0)}.p-2{padding:calc(var(--spacing)*2)}.p-8{padding:calc(var(--spacing)*8)}.px-2{padding-inline:calc(var(--spacing)*2)}.px-4{padding-inline:calc(var(--spacing)*4)}.py-1{padding-block:calc(var(--spacing)*1)}.py-2{padding-block:calc(var(--spacing)*2)}.py-3{padding-block:calc(var(--spacing)*3)}.pe-2{padding-inline-end:calc(var(--spacing)*2)}.pe-4{padding-inline-end:calc(var(--spacing)*4)}.text-2xl{font-size:var(--text-2xl);line-height:var(--tw-leading,var(--text-2xl--line-height))}.text-sm{font-size:var(--text-sm);line-height:var(--tw-leading,var(--text-sm--line-height))}.font-bold{--tw-font-weight:var(--font-weight-bold);font-weight:var(--font-weight-bold)}.font-extrabold{--tw-font-weight:var(--font-weight-extrabold);font-weight:var(--font-weight-extrabold)}.font-medium{--tw-font-weight:var(--font-weight-medium);font-weight:var(--font-weight-medium)}.text-amber-200{color:var(--color-amber-200)}.text-blue-500{color:var(--color-blue-500)}.text-gray-700{color:var(--color-gray-700)}.text-red-200{color:var(--color-red-200)}.text-white{color:var(--color-white)}.text-yellow-300{color:var(--color-yellow-300)}.shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a),0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}@media (hover:hover){.hover\:bg-blue-600:hover{background-color:var(--color-blue-600)}}.focus\:border-yellow-800:focus{border-color:var(--color-yellow-800)}.focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,)0 0 0 calc(2px + var(--tw-ring-offset-width))var(--tw-ring-color,currentColor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-yellow-800:focus{--tw-ring-color:var(--color-yellow-800)}@media (width>=64rem){.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:gap-x-5{column-gap:calc(var(--spacing)*5)}}@media (prefers-color-scheme:dark){.dark\:bg-gray-800{background-color:var(--color-gray-800)}.dark\:bg-slate-700{background-color:var(--color-slate-700)}.dark\:text-gray-300{color:var(--color-gray-300)}.dark\:text-white{color:var(--color-white)}}.\[\&\:hover\]\:border-b:hover{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.\[\&\:hover\]\:bg-yellow-400:hover{background-color:var(--color-yellow-400)}.\[\&\:hover\]\:text-blue-600:hover{color:var(--color-blue-600)}}body{font-family:Helvetica}*{box-sizing:border-box;-ms-box-sizing:border-box}nav a:active{border-color:var(--color-yellow-300);color:var(--color-white)}@property --tw-rotate-x{syntax:"*";inherits:false;initial-value:rotateX(0)}@property --tw-rotate-y{syntax:"*";inherits:false;initial-value:rotateY(0)}@property --tw-rotate-z{syntax:"*";inherits:false;initial-value:rotateZ(0)}@property --tw-skew-x{syntax:"*";inherits:false;initial-value:skewX(0)}@property --tw-skew-y{syntax:"*";inherits:false;initial-value:skewY(0)}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000} \ No newline at end of file +@layer theme{:root,:host{--font-sans:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-yellow-300:oklch(.905 .182 98.111);--color-yellow-800:oklch(.476 .114 61.907);--color-lime-100:oklch(.967 .067 122.328);--color-lime-300:oklch(.897 .196 126.665);--color-lime-600:oklch(.648 .2 131.684);--color-lime-700:oklch(.532 .157 131.589);--color-green-50:oklch(.982 .018 155.826);--color-green-100:oklch(.962 .044 156.743);--color-green-200:oklch(.925 .084 155.995);--color-green-300:oklch(.871 .15 154.449);--color-green-400:oklch(.792 .209 151.711);--color-green-500:oklch(.723 .219 149.579);--color-green-600:oklch(.627 .194 149.214);--color-green-700:oklch(.527 .154 150.069);--color-green-800:oklch(.448 .119 151.328);--color-blue-50:oklch(.97 .014 254.604);--color-blue-100:oklch(.932 .032 255.585);--color-blue-300:oklch(.809 .105 251.813);--color-blue-500:oklch(.623 .214 259.815);--color-blue-600:oklch(.546 .245 262.881);--color-blue-700:oklch(.488 .243 264.376);--color-blue-800:oklch(.424 .199 265.638);--color-slate-300:oklch(.869 .022 252.894);--color-slate-400:oklch(.704 .04 256.788);--color-slate-500:oklch(.554 .046 257.417);--color-slate-700:oklch(.372 .044 257.287);--color-gray-200:oklch(.928 .006 264.531);--color-gray-300:oklch(.872 .01 258.338);--color-gray-500:oklch(.551 .027 264.364);--color-gray-700:oklch(.373 .034 259.733);--color-gray-800:oklch(.278 .033 256.848);--color-white:#fff;--spacing:.25rem;--text-sm:.875rem;--text-sm--line-height:calc(1.25/.875);--text-lg:1.125rem;--text-lg--line-height:calc(1.75/1.125);--text-xl:1.25rem;--text-xl--line-height:calc(1.75/1.25);--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--font-weight-light:300;--font-weight-medium:500;--font-weight-semibold:600;--font-weight-bold:700;--font-weight-extrabold:800;--radius-md:.375rem;--radius-lg:.5rem;--radius-xl:.75rem;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-font-feature-settings:var(--font-sans--font-feature-settings);--default-font-variation-settings:var(--font-sans--font-variation-settings);--default-mono-font-family:var(--font-mono);--default-mono-font-feature-settings:var(--font-mono--font-feature-settings);--default-mono-font-variation-settings:var(--font-mono--font-variation-settings)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}body{line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1;color:color-mix(in oklab,currentColor 50%,transparent)}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components;@layer utilities{.absolute{position:absolute}.relative{position:relative}.static{position:static}.z-4{z-index:4}.col-span-1{grid-column:span 1/span 1}.col-span-10{grid-column:span 10/span 10}.container{width:100%}@media (width>=40rem){.container{max-width:40rem}}@media (width>=48rem){.container{max-width:48rem}}@media (width>=64rem){.container{max-width:64rem}}@media (width>=80rem){.container{max-width:80rem}}@media (width>=96rem){.container{max-width:96rem}}.m-2{margin:calc(var(--spacing)*2)}.m-4{margin:calc(var(--spacing)*4)}.m-8{margin:calc(var(--spacing)*8)}.mx-5{margin-inline:calc(var(--spacing)*5)}.mx-6{margin-inline:calc(var(--spacing)*6)}.mx-10{margin-inline:calc(var(--spacing)*10)}.me-6{margin-inline-end:calc(var(--spacing)*6)}.-mt-2{margin-top:calc(var(--spacing)*-2)}.mt-2{margin-top:calc(var(--spacing)*2)}.mt-4{margin-top:calc(var(--spacing)*4)}.mt-6{margin-top:calc(var(--spacing)*6)}.mt-8{margin-top:calc(var(--spacing)*8)}.mb-2{margin-bottom:calc(var(--spacing)*2)}.mb-4{margin-bottom:calc(var(--spacing)*4)}.mb-6{margin-bottom:calc(var(--spacing)*6)}.mb-8{margin-bottom:calc(var(--spacing)*8)}.block{display:block}.contents{display:contents}.flex{display:flex}.grid{display:grid}.inline{display:inline}.table{display:table}.size-6{width:calc(var(--spacing)*6);height:calc(var(--spacing)*6)}.h-5{height:calc(var(--spacing)*5)}.h-6{height:calc(var(--spacing)*6)}.h-7{height:calc(var(--spacing)*7)}.h-8{height:calc(var(--spacing)*8)}.h-39{height:calc(var(--spacing)*39)}.min-h-screen{min-height:100vh}.w-3{width:calc(var(--spacing)*3)}.w-5{width:calc(var(--spacing)*5)}.w-6{width:calc(var(--spacing)*6)}.w-8{width:calc(var(--spacing)*8)}.w-full{width:100%}.transform{transform:var(--tw-rotate-x)var(--tw-rotate-y)var(--tw-rotate-z)var(--tw-skew-x)var(--tw-skew-y)}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.justify-items-center{justify-items:center}.justify-items-start{justify-items:start}.gap-2{gap:calc(var(--spacing)*2)}.gap-3{gap:calc(var(--spacing)*3)}.gap-4{gap:calc(var(--spacing)*4)}:where(.space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*6)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*6)*calc(1 - var(--tw-space-y-reverse)))}.gap-x-2{column-gap:calc(var(--spacing)*2)}.rounded-lg{border-radius:var(--radius-lg)}.rounded-md{border-radius:var(--radius-md)}.rounded-xl{border-radius:var(--radius-xl)}.rounded-e-lg{border-start-end-radius:var(--radius-lg);border-end-end-radius:var(--radius-lg)}.border,.border-1{border-style:var(--tw-border-style);border-width:1px}.border-2{border-style:var(--tw-border-style);border-width:2px}.border-4{border-style:var(--tw-border-style);border-width:4px}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-double{--tw-border-style:double;border-style:double}.border-solid{--tw-border-style:solid;border-style:solid}.border-blue-500{border-color:var(--color-blue-500)}.border-blue-600{border-color:var(--color-blue-600)}.border-blue-700{border-color:var(--color-blue-700)}.border-gray-300{border-color:var(--color-gray-300)}.border-gray-500{border-color:var(--color-gray-500)}.border-gray-700{border-color:var(--color-gray-700)}.border-green-400{border-color:var(--color-green-400)}.border-green-500{border-color:var(--color-green-500)}.border-green-700{border-color:var(--color-green-700)}.border-lime-600{border-color:var(--color-lime-600)}.border-lime-700{border-color:var(--color-lime-700)}.border-slate-300{border-color:var(--color-slate-300)}.border-slate-700{border-color:var(--color-slate-700)}.border-white{border-color:var(--color-white)}.border-yellow-300{border-color:var(--color-yellow-300)}.border-yellow-800{border-color:var(--color-yellow-800)}.bg-blue-50{background-color:var(--color-blue-50)}.bg-blue-100{background-color:var(--color-blue-100)}.bg-blue-500{background-color:var(--color-blue-500)}.bg-blue-600{background-color:var(--color-blue-600)}.bg-gray-300{background-color:var(--color-gray-300)}.bg-gray-500{background-color:var(--color-gray-500)}.bg-gray-700{background-color:var(--color-gray-700)}.bg-green-50{background-color:var(--color-green-50)}.bg-green-100{background-color:var(--color-green-100)}.bg-green-200{background-color:var(--color-green-200)}.bg-green-300{background-color:var(--color-green-300)}.bg-green-500{background-color:var(--color-green-500)}.bg-lime-100{background-color:var(--color-lime-100)}.bg-lime-300{background-color:var(--color-lime-300)}.bg-slate-300{background-color:var(--color-slate-300)}.bg-slate-500{background-color:var(--color-slate-500)}.bg-slate-700{background-color:var(--color-slate-700)}.bg-white{background-color:var(--color-white)}.bg-yellow-300{background-color:var(--color-yellow-300)}.p-0{padding:calc(var(--spacing)*0)}.p-2{padding:calc(var(--spacing)*2)}.p-4{padding:calc(var(--spacing)*4)}.p-6{padding:calc(var(--spacing)*6)}.p-8{padding:calc(var(--spacing)*8)}.px-4{padding-inline:calc(var(--spacing)*4)}.px-10{padding-inline:calc(var(--spacing)*10)}.py-1{padding-block:calc(var(--spacing)*1)}.py-2{padding-block:calc(var(--spacing)*2)}.py-3{padding-block:calc(var(--spacing)*3)}.pe-1{padding-inline-end:calc(var(--spacing)*1)}.pe-2{padding-inline-end:calc(var(--spacing)*2)}.pe-3{padding-inline-end:calc(var(--spacing)*3)}.pe-4{padding-inline-end:calc(var(--spacing)*4)}.text-2xl{font-size:var(--text-2xl);line-height:var(--tw-leading,var(--text-2xl--line-height))}.text-lg{font-size:var(--text-lg);line-height:var(--tw-leading,var(--text-lg--line-height))}.text-sm{font-size:var(--text-sm);line-height:var(--tw-leading,var(--text-sm--line-height))}.text-xl{font-size:var(--text-xl);line-height:var(--tw-leading,var(--text-xl--line-height))}.font-bold{--tw-font-weight:var(--font-weight-bold);font-weight:var(--font-weight-bold)}.font-extrabold{--tw-font-weight:var(--font-weight-extrabold);font-weight:var(--font-weight-extrabold)}.font-light{--tw-font-weight:var(--font-weight-light);font-weight:var(--font-weight-light)}.font-medium{--tw-font-weight:var(--font-weight-medium);font-weight:var(--font-weight-medium)}.font-semibold{--tw-font-weight:var(--font-weight-semibold);font-weight:var(--font-weight-semibold)}.text-blue-300{color:var(--color-blue-300)}.text-blue-500{color:var(--color-blue-500)}.text-blue-600{color:var(--color-blue-600)}.text-blue-700{color:var(--color-blue-700)}.text-blue-800{color:var(--color-blue-800)}.text-gray-300{color:var(--color-gray-300)}.text-gray-700{color:var(--color-gray-700)}.text-green-600{color:var(--color-green-600)}.text-slate-300{color:var(--color-slate-300)}.text-slate-700{color:var(--color-slate-700)}.text-white{color:var(--color-white)}.text-yellow-300{color:var(--color-yellow-300)}.shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a),0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a),0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.filter{filter:var(--tw-blur,)var(--tw-brightness,)var(--tw-contrast,)var(--tw-grayscale,)var(--tw-hue-rotate,)var(--tw-invert,)var(--tw-saturate,)var(--tw-sepia,)var(--tw-drop-shadow,)}.transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}@media (hover:hover){.hover\:border-b:hover{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.hover\:bg-blue-600:hover{background-color:var(--color-blue-600)}}.focus\:border-yellow-800:focus{border-color:var(--color-yellow-800)}.focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,)0 0 0 calc(2px + var(--tw-ring-offset-width))var(--tw-ring-color,currentColor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-yellow-800:focus{--tw-ring-color:var(--color-yellow-800)}@media (width>=48rem){.md\:mx-20{margin-inline:calc(var(--spacing)*20)}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (width>=64rem){.lg\:mx-20{margin-inline:calc(var(--spacing)*20)}.lg\:mx-40{margin-inline:calc(var(--spacing)*40)}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:gap-x-5{column-gap:calc(var(--spacing)*5)}.lg\:px-40{padding-inline:calc(var(--spacing)*40)}}@media (prefers-color-scheme:dark){.dark\:bg-gray-800{background-color:var(--color-gray-800)}.dark\:bg-slate-400{background-color:var(--color-slate-400)}.dark\:bg-slate-500{background-color:var(--color-slate-500)}.dark\:bg-slate-700{background-color:var(--color-slate-700)}.dark\:text-gray-300{color:var(--color-gray-300)}.dark\:text-green-300{color:var(--color-green-300)}.dark\:text-green-400{color:var(--color-green-400)}.dark\:text-green-500{color:var(--color-green-500)}.dark\:text-green-700{color:var(--color-green-700)}.dark\:text-green-800{color:var(--color-green-800)}.dark\:text-lime-600{color:var(--color-lime-600)}.dark\:text-lime-700{color:var(--color-lime-700)}.dark\:text-white{color:var(--color-white)}}.\[\&\:hover\]\:border-b:hover{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.\[\&\:hover\]\:text-blue-600:hover{color:var(--color-blue-600)}}body{font-family:Helvetica}*{box-sizing:border-box;-ms-box-sizing:border-box}nav a:active{border-color:var(--color-yellow-300);color:var(--color-white)}@property --tw-rotate-x{syntax:"*";inherits:false;initial-value:rotateX(0)}@property --tw-rotate-y{syntax:"*";inherits:false;initial-value:rotateY(0)}@property --tw-rotate-z{syntax:"*";inherits:false;initial-value:rotateZ(0)}@property --tw-skew-x{syntax:"*";inherits:false;initial-value:skewX(0)}@property --tw-skew-y{syntax:"*";inherits:false;initial-value:skewY(0)}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-blur{syntax:"*";inherits:false}@property --tw-brightness{syntax:"*";inherits:false}@property --tw-contrast{syntax:"*";inherits:false}@property --tw-grayscale{syntax:"*";inherits:false}@property --tw-hue-rotate{syntax:"*";inherits:false}@property --tw-invert{syntax:"*";inherits:false}@property --tw-opacity{syntax:"*";inherits:false}@property --tw-saturate{syntax:"*";inherits:false}@property --tw-sepia{syntax:"*";inherits:false}@property --tw-drop-shadow{syntax:"*";inherits:false} \ No newline at end of file diff --git a/Sources/Routes/MoldRisk.swift b/Sources/Routes/MoldRisk.swift index 4974495..9ccdbd9 100644 --- a/Sources/Routes/MoldRisk.swift +++ b/Sources/Routes/MoldRisk.swift @@ -40,3 +40,32 @@ public enum MoldRisk { case severe } } + +#if DEBUG + import Dependencies + + public extension MoldRisk.Response { + static var mock: Self { + return .init( + psychrometricProperties: .init( + absoluteHumidity: .zero, + atmosphericPressure: .zero, + degreeOfSaturation: .zero, + density: .zero, dewPoint: 59.4, + dryBulb: 75, + enthalpy: .zero, + grainsOfMoisture: .zero, + humidityRatio: .zero, + relativeHumidity: 50%, + specificVolume: .zero, + vaporPressure: .zero, + wetBulb: .zero, + units: .imperial + ), + riskLevel: .low, + recommendations: [] + ) + } + } + +#endif diff --git a/Sources/Styleguide/Buttons.swift b/Sources/Styleguide/Buttons.swift new file mode 100644 index 0000000..7546eba --- /dev/null +++ b/Sources/Styleguide/Buttons.swift @@ -0,0 +1,19 @@ +import Elementary + +public struct SubmitButton: HTML, Sendable { + let label: String + + public init(label: String) { + self.label = label + } + + public var content: some HTML { + button( + .type(.submit), + .class(""" + w-full \(bg: .blue) \(text: .yellow) font-bold py-3 rounded-md + hover:\(bg: .darkBlue) transition-colors + """) + ) { label } + } +} diff --git a/Sources/Styleguide/Colors.swift b/Sources/Styleguide/Colors.swift new file mode 100644 index 0000000..8fb6522 --- /dev/null +++ b/Sources/Styleguide/Colors.swift @@ -0,0 +1,85 @@ +/// Common tailwind colors used. +/// +/// Use these with string interpolation in the class. +/// +/// **Example:** +/// +/// ```swift +/// div(.class("\(text: .yellow) \(border: .gray) \(bg: .blue)")) { +/// ... +/// } +/// ``` +public enum Color { + + public enum BackgroundColor: Sendable { + case blue + case darkBlue + case darkGray + case darkSlate + case slate + case yellow + + var color: String { + switch self { + case .blue: return "bg-blue-500" + case .darkBlue: return "bg-blue-600" + case .darkGray: return "bg-gray-700" + case .darkSlate: return "bg-slate-700" + case .slate: return "bg-slate-300" + case .yellow: return "bg-yellow-300" + } + } + } + + public enum BorderColor: Sendable { + case darkYellow + case gray + case yellow + + var color: String { + switch self { + case .darkYellow: return "border-yellow-800" + case .gray: return "border-gray-300" + case .yellow: return "border-yellow-300" + } + } + } + + public enum TextColor: Sendable { + case blue + case darkBlue + case darkGray + case gray + case green + case yellow + case white + + var color: String { + switch self { + case .blue: return "text-blue-500" + case .darkBlue: return "text-blue-600" + case .darkGray: return "text-gray-700" + case .gray: return "text-gray-300" + case .green: return "text-green-600" + case .yellow: return "text-yellow-300" + case .white: return "text-white" + } + } + } + +} + +public extension String.StringInterpolation { + + mutating func appendInterpolation(bg background: Color.BackgroundColor) { + appendInterpolation(background.color) + } + + mutating func appendInterpolation(border: Color.BorderColor) { + appendInterpolation(border.color) + } + + mutating func appendInterpolation(text: Color.TextColor) { + appendInterpolation(text.color) + } +} diff --git a/Sources/Styleguide/FormElements.swift b/Sources/Styleguide/FormElements.swift new file mode 100644 index 0000000..961e410 --- /dev/null +++ b/Sources/Styleguide/FormElements.swift @@ -0,0 +1,84 @@ +import Elementary + +/// A styled header for a form element, which consists of an +/// svg image and label / name for the form. +/// +public struct FormHeader: HTML, Sendable { + + let label: String + let svg: SVGType + + public init( + label: String, + svg: SVGType + ) { + self.label = label + self.svg = svg + } + + public var content: some HTML { + LabeledContent { + h2(.class("text-2xl font-extrabold dark:\(text: .white)")) { label } + } label: { + SVG(svg, color: .blue) + } + .attributes(.class("flex items-center gap-3 mb-6")) + } +} + +/// A styled form input, does not contain the input type which is generally +/// added at the call site. +/// +/// **Example:** +/// ```swift +/// Input(id: "email", placeholder: "Email") +/// .attributes(.type(.email)) +/// ``` +/// +public struct Input: HTML, Sendable { + let id: String + let name: String? + let placeholder: String + + public init(id: String, name: String? = nil, placeholder: String) { + self.id = id + self.name = name + self.placeholder = placeholder + } + + public var content: some HTML { + input( + .id(id), .placeholder(placeholder), .name(name ?? id), + .class(""" + w-full px-4 py-2 border \(border: .gray) rounded-md focus:ring-2 + focus:ring-yellow-800 focus:border-yellow-800 \(text: .darkGray) dark:\(text: .white) + """) + ) + } +} + +/// A style form input label. +public struct InputLabel: HTML { + + let forInputId: String + let inputLabel: InputLabel + + public init( + for forInputId: String, + @HTMLBuilder label: () -> InputLabel + ) { + self.forInputId = forInputId + self.inputLabel = label() + } + + public var content: some HTML { + label( + .for(forInputId), + .class("block text-sm font-medium \(text: .darkGray) dark:\(text: .gray) mb-2") + ) { + self.inputLabel + } + } +} + +extension InputLabel: Sendable where InputLabel: Sendable {} diff --git a/Sources/Styleguide/LabeledContent.swift b/Sources/Styleguide/LabeledContent.swift new file mode 100644 index 0000000..ad17b32 --- /dev/null +++ b/Sources/Styleguide/LabeledContent.swift @@ -0,0 +1,54 @@ +import Elementary + +public struct LabeledContent: HTML { + + let body: Body + let label: Label + + public init( + @HTMLBuilder body: () -> Body, + @HTMLBuilder label: () -> Label + ) { + self.body = body() + self.label = label() + } + + public var content: some HTML { + div { + label + body + } + } +} + +extension LabeledContent: Sendable where Label: Sendable, Body: Sendable {} + +// MARK: - Forms + +public extension LabeledContent where Label == InputLabel, Body == Input { + + init( + label: String, + input: () -> Body + ) { + self.init { + input() + } label: { + InputLabel(for: input().id) { HTMLText(label) } + } + } +} + +public extension LabeledContent where Label == InputLabel, Body == _AttributedElement