From 8d8dec801bf959d6e4bf1ba3fbc5af5b242f96d9 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 1 Dec 2025 20:28:27 -0500 Subject: Fix build errors in Jr modules - Fix Worker.hs to use EngineError instead of tuple - Fix Types.hs imports for LazyText.encodeUtf8 and dayOfWeek - Remove duplicate SortOrder from Components.hs (import from Types.hs) - Add orphan instance pragmas to Pages.hs and Partials.hs - Clean up unused imports --- Omni/Jr/Web/Components.hs | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'Omni/Jr/Web/Components.hs') diff --git a/Omni/Jr/Web/Components.hs b/Omni/Jr/Web/Components.hs index 9c32cf2..f1a8168 100644 --- a/Omni/Jr/Web/Components.hs +++ b/Omni/Jr/Web/Components.hs @@ -46,9 +46,6 @@ module Omni.Jr.Web.Components priorityOption, -- * Sorting - SortOrder (..), - sortOrderToParam, - sortOrderLabel, sortDropdown, sortOption, @@ -130,6 +127,7 @@ import Data.Time (NominalDiffTime, UTCTime, defaultTimeLocale, diffUTCTime, form import qualified Lucid import qualified Lucid.Base as Lucid import Numeric (showFFloat) +import Omni.Jr.Web.Types (SortOrder (..), sortOrderLabel, sortOrderToParam) import qualified Omni.Task.Core as TaskCore -- * Time formatting @@ -169,30 +167,6 @@ renderRelativeTimestamp now timestamp = metaSep :: (Monad m) => Lucid.HtmlT m () metaSep = Lucid.span_ [Lucid.class_ "meta-sep"] "ยท" --- * Sort types - -data SortOrder - = SortNewest - | SortOldest - | SortUpdated - | SortPriorityHigh - | SortPriorityLow - deriving (Show, Eq) - -sortOrderToParam :: SortOrder -> Text -sortOrderToParam SortNewest = "newest" -sortOrderToParam SortOldest = "oldest" -sortOrderToParam SortUpdated = "updated" -sortOrderToParam SortPriorityHigh = "priority-high" -sortOrderToParam SortPriorityLow = "priority-low" - -sortOrderLabel :: SortOrder -> Text -sortOrderLabel SortNewest = "Newest First" -sortOrderLabel SortOldest = "Oldest First" -sortOrderLabel SortUpdated = "Recently Updated" -sortOrderLabel SortPriorityHigh = "Priority (High to Low)" -sortOrderLabel SortPriorityLow = "Priority (Low to High)" - -- * Page layout pageHead :: (Monad m) => Text -> Lucid.HtmlT m () -- cgit v1.2.3