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/Pages.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Omni/Jr/Web/Pages.hs') diff --git a/Omni/Jr/Web/Pages.hs b/Omni/Jr/Web/Pages.hs index 8e335ea..2fbbc00 100644 --- a/Omni/Jr/Web/Pages.hs +++ b/Omni/Jr/Web/Pages.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE NoImplicitPrelude #-} +{-# OPTIONS_GHC -Wno-orphans #-} -- : dep lucid -- : dep servant-lucid @@ -10,18 +11,14 @@ module Omni.Jr.Web.Pages where import Alpha -import Data.List (init) import qualified Data.Text as Text -import Data.Time (UTCTime) +import Data.Time (utctDayTime) import qualified Lucid import qualified Lucid.Base as Lucid import Numeric (showFFloat) import Omni.Jr.Web.Components ( Breadcrumb (..), - SortOrder (..), complexityBadge, - epicProgressBar, - getDescendants, metaSep, multiColorProgressBar, pageBody, @@ -38,11 +35,11 @@ import Omni.Jr.Web.Components renderTaskCard, renderUnifiedTimeline, sortDropdown, - sortOrderToParam, statusBadge, statusBadgeWithForm, taskBreadcrumbs, ) +import Omni.Jr.Web.Partials () import Omni.Jr.Web.Types ( BlockedPage (..), DescriptionViewPartial (..), @@ -54,6 +51,7 @@ import Omni.Jr.Web.Types KBPage (..), ReadyQueuePage (..), ReviewInfo (..), + SortOrder (..), StatsPage (..), TaskDetailPage (..), TaskDiffPage (..), @@ -64,6 +62,7 @@ import Omni.Jr.Web.Types filterNamespace, filterPriority, filterStatus, + sortOrderToParam, sortTasks, timeRangeToParam, ) @@ -72,7 +71,7 @@ import qualified Omni.Task.Core as TaskCore taskToUnixTs :: TaskCore.Task -> Int taskToUnixTs t = let ts = TaskCore.taskUpdatedAt t - in floor (realToFrac (Data.Time.utctDayTime ts) :: Double) + in floor (realToFrac (utctDayTime ts) :: Double) instance Lucid.ToHtml HomePage where toHtmlRaw = Lucid.toHtml -- cgit v1.2.3