Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2026-01-08 12:11:55 +00:00
Code Issues Releases Wiki Activity

ui: Get UI to compile with Elm 0.19

Browse Source
This commit is contained in:
James Hillyerd
2018-11-13 22:03:36 -08:00
parent 5ccdece541
commit fe20854173
15 changed files with 210 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ui/src/Page/Mailbox.elm
View File

@@ -3,7 +3,6 @@ module Page.Mailbox exposing (Model, Msg, init, load, subscriptions, update, vie
import Data.Message as Message exposing (Message)
import Data.MessageHeader as MessageHeader exposing (MessageHeader)
import Data.Session as Session exposing (Session)
import Date exposing (Date)
import DateFormat
import DateFormat.Relative as Relative
import Html exposing (..)
@@ -11,7 +10,7 @@ import Html.Attributes
exposing
( class
, classList
, downloadAs
, download
, href
, id
, placeholder
@@ -28,7 +27,7 @@ import Json.Encode as Encode
import Ports
import Route
import Task
import Time exposing (Time)
import Time exposing (Posix)
@@ -65,7 +64,7 @@ type alias MessageList =
type alias VisibleMessage =
{ message : Message
, markSeenAt : Maybe Time
, markSeenAt : Maybe Int
}
@@ -74,13 +73,13 @@ type alias Model =
, state : State
, bodyMode : Body
, searchInput : String
, now : Date
, now : Posix
}
init : String -> Maybe MessageID -> ( Model, Cmd Msg )
init mailboxName selection =
( Model mailboxName (LoadingList selection) SafeHtmlBody "" (Date.fromTime 0)
( Model mailboxName (LoadingList selection) SafeHtmlBody "" (Time.millisToPosix 0)
, load mailboxName
)
@@ -108,13 +107,13 @@ subscriptions model =
Sub.none
else
Time.every (250 * Time.millisecond) SeenTick
Time.every 250 SeenTick
_ ->
Sub.none
in
Sub.batch
[ Time.every (30 * Time.second) Tick
[ Time.every (30 * 1000) Tick
, subSeen
]
@@ -131,12 +130,12 @@ type Msg
| MarkSeenResult (Result Http.Error ())
| MessageResult (Result Http.Error Message)
| MessageBody Body
| OpenedTime Time
| OpenedTime Posix
| Purge
| PurgeResult (Result Http.Error ())
| SearchInput String
| SeenTick Time
| Tick Time
| SeenTick Posix
| Tick Posix
| ViewMessage MessageID
@@ -147,7 +146,7 @@ update session msg model =
( updateSelected model id
, Cmd.batch
[ -- Update browser location.
Route.newUrl (Route.Message model.mailboxName id)
Route.newUrl session.key (Route.Message model.mailboxName id)
, getMessage model.mailboxName id
]
, Session.DisableRouting
@@ -216,13 +215,17 @@ update session msg model =
( model, Cmd.none, Session.none )
else
-- Set delay before reporting message as seen to backend.
-- Set 1500ms delay before reporting message as seen to backend.
let
markSeenAt =
Time.posixToMillis time + 1500
in
( { model
| state =
ShowingList list
(ShowingMessage
{ visible
| markSeenAt = Just (time + (1.5 * Time.second))
| markSeenAt = Just markSeenAt
}
)
}
@@ -247,7 +250,7 @@ update session msg model =
ShowingList _ (ShowingMessage { message, markSeenAt }) ->
case markSeenAt of
Just deadline ->
if now >= deadline then
if Time.posixToMillis now >= deadline then
updateMarkMessageSeen model message
else
@@ -260,7 +263,7 @@ update session msg model =
( model, Cmd.none, Session.none )
Tick now ->
( { model | now = Date.fromTime now }, Cmd.none, Session.none )
( { model | now = now }, Cmd.none, Session.none )
{-| Replace the currently displayed message.
@@ -530,14 +533,14 @@ messageChip model selected message =
viewMessage : Message -> Body -> Html Msg
viewMessage message bodyMode =
let
sourceUrl message =
sourceUrl =
"/serve/m/" ++ message.mailbox ++ "/" ++ message.id ++ "/source"
in
div []
[ div [ class "button-bar" ]
[ button [ class "danger", onClick (DeleteMessage message) ] [ text "Delete" ]
, a
[ href (sourceUrl message), target "_blank" ]
[ href sourceUrl, target "_blank" ]
[ button [] [ text "Source" ] ]
]
, dl [ id "message-header" ]
@@ -616,16 +619,16 @@ attachmentRow baseUrl attach =
[ a [ href url, target "_blank" ] [ text attach.fileName ]
, text (" (" ++ attach.contentType ++ ") ")
]
, td [] [ a [ href url, downloadAs attach.fileName, class "button" ] [ text "Download" ] ]
, td [] [ a [ href url, download attach.fileName, class "button" ] [ text "Download" ] ]
]
relativeDate : Model -> Date -> Html Msg
relativeDate : Model -> Posix -> Html Msg
relativeDate model date =
Relative.relativeTime model.now date |> text
verboseDate : Date -> Html Msg
verboseDate : Posix -> Html Msg
verboseDate date =
DateFormat.format
[ DateFormat.monthNameFull
@@ -642,6 +645,7 @@ verboseDate date =
, DateFormat.text " "
, DateFormat.amPmUppercase
]
Time.utc
date
|> text

21
ui/src/Page/Monitor.elm
View File

@@ -2,7 +2,6 @@ module Page.Monitor exposing (Model, Msg, init, subscriptions, update, view)
import Data.MessageHeader as MessageHeader exposing (MessageHeader)
import Data.Session as Session exposing (Session)
import Date exposing (Date)
import DateFormat
exposing
( amPmUppercase
@@ -10,7 +9,7 @@ import DateFormat
, format
, hourNumber
, minuteFixed
, monthNameFirstThree
, monthNameAbbreviated
)
import Html exposing (..)
import Html.Attributes exposing (..)
@@ -18,6 +17,7 @@ import Html.Events as Events
import Json.Decode as D
import Ports
import Route
import Time exposing (Posix)
@@ -63,7 +63,7 @@ subscriptions model =
type Msg
= MonitorResult (Result String MonitorMessage)
= MonitorResult (Result D.Error MonitorMessage)
| OpenMessage MessageHeader
@@ -78,15 +78,15 @@ update session msg model =
MonitorResult (Ok (Connected status)) ->
( { model | connected = status }, Cmd.none, Session.none )
MonitorResult (Ok (Message msg)) ->
( { model | messages = msg :: model.messages }, Cmd.none, Session.none )
MonitorResult (Ok (Message header)) ->
( { model | messages = header :: model.messages }, Cmd.none, Session.none )
MonitorResult (Err err) ->
( model, Cmd.none, Session.SetFlash err )
( model, Cmd.none, Session.SetFlash (D.errorToString err) )
OpenMessage msg ->
OpenMessage header ->
( model
, Route.newUrl (Route.Message msg.mailbox msg.id)
, Route.newUrl session.key (Route.Message header.mailbox header.id)
, Session.none
)
@@ -133,12 +133,12 @@ viewMessage message =
]
shortDate : Date -> Html Msg
shortDate : Posix -> Html Msg
shortDate date =
format
[ dayOfMonthFixed
, DateFormat.text "-"
, monthNameFirstThree
, monthNameAbbreviated
, DateFormat.text " "
, hourNumber
, DateFormat.text ":"
@@ -146,5 +146,6 @@ shortDate date =
, DateFormat.text " "
, amPmUppercase
]
Time.utc
date
|> text

16
ui/src/Page/Status.elm
View File

@@ -9,7 +9,7 @@ import Http exposing (Error)
import HttpUtil
import Sparkline exposing (DataSet, Point, Size, sparkline)
import Svg.Attributes as SvgAttrib
import Time exposing (Time)
import Time exposing (Posix)
@@ -84,7 +84,7 @@ load =
subscriptions : Model -> Sub Msg
subscriptions model =
Time.every (10 * Time.second) Tick
Time.every (10 * 1000) Tick
@@ -93,7 +93,7 @@ subscriptions model =
type Msg
= NewMetrics (Result Http.Error Metrics)
| Tick Time
| Tick Posix
update : Session -> Msg -> Model -> ( Model, Cmd Msg, Session.Msg )
@@ -256,7 +256,7 @@ viewMetric metric =
, div [ class "value" ] [ text (metric.formatter metric.value) ]
, div [ class "graph" ]
[ metric.graph metric.history
, text ("(" ++ toString metric.minutes ++ "min)")
, text ("(" ++ String.fromInt metric.minutes ++ "min)")
]
]
@@ -280,7 +280,11 @@ graphNull =
graphSize : Size
graphSize =
( 180, 16, 0, 0 )
{ width = 180
, height = 16
, marginLR = 0
, marginTB = 0
}
areaStyle : Sparkline.Param a -> Sparkline.Param a
@@ -400,4 +404,4 @@ fmtInt n =
else
thousands (String.slice 0 -3 str) ++ "," ++ String.right 3 str
in
thousands (toString n)
thousands (String.fromInt n)