mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-03-31 13:45:09 +00:00
commit
515bcccc57
7
elm.json
7
elm.json
@ -7,11 +7,11 @@
|
|||||||
"elm-version": "0.19.1",
|
"elm-version": "0.19.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"direct": {
|
"direct": {
|
||||||
"CurrySoftware/elm-datepicker": "3.1.0",
|
"CurrySoftware/elm-datepicker": "4.0.0",
|
||||||
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
|
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
|
||||||
"NoRedInk/elm-simple-fuzzy": "1.0.3",
|
"NoRedInk/elm-simple-fuzzy": "1.0.3",
|
||||||
"elm/browser": "1.0.1",
|
"elm/browser": "1.0.2",
|
||||||
"elm/core": "1.0.2",
|
"elm/core": "1.0.5",
|
||||||
"elm/file": "1.0.5",
|
"elm/file": "1.0.5",
|
||||||
"elm/html": "1.0.0",
|
"elm/html": "1.0.0",
|
||||||
"elm/http": "2.0.0",
|
"elm/http": "2.0.0",
|
||||||
@ -24,6 +24,7 @@
|
|||||||
"pablohirafuji/elm-qrcode": "3.3.1",
|
"pablohirafuji/elm-qrcode": "3.3.1",
|
||||||
"ryannhg/date-format": "2.3.0",
|
"ryannhg/date-format": "2.3.0",
|
||||||
"truqu/elm-base64": "2.0.4",
|
"truqu/elm-base64": "2.0.4",
|
||||||
|
"ursi/elm-scroll": "1.0.0",
|
||||||
"ursi/elm-throttle": "1.0.1"
|
"ursi/elm-throttle": "1.0.1"
|
||||||
},
|
},
|
||||||
"indirect": {
|
"indirect": {
|
||||||
|
@ -160,7 +160,7 @@ checkPage flags page =
|
|||||||
defaultPage : Flags -> Page
|
defaultPage : Flags -> Page
|
||||||
defaultPage flags =
|
defaultPage flags =
|
||||||
if isSignedIn flags then
|
if isSignedIn flags then
|
||||||
HomePage
|
HomePage Nothing
|
||||||
|
|
||||||
else
|
else
|
||||||
LoginPage Nothing
|
LoginPage Nothing
|
||||||
|
@ -304,8 +304,16 @@ updateLogin lmsg model =
|
|||||||
updateHome : Page.Home.Data.Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
updateHome : Page.Home.Data.Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
||||||
updateHome lmsg model =
|
updateHome lmsg model =
|
||||||
let
|
let
|
||||||
|
mid =
|
||||||
|
case model.page of
|
||||||
|
HomePage x ->
|
||||||
|
x
|
||||||
|
|
||||||
|
_ ->
|
||||||
|
Nothing
|
||||||
|
|
||||||
( lm, lc, ls ) =
|
( lm, lc, ls ) =
|
||||||
Page.Home.Update.update model.key model.flags model.uiSettings lmsg model.homeModel
|
Page.Home.Update.update mid model.key model.flags model.uiSettings lmsg model.homeModel
|
||||||
in
|
in
|
||||||
( { model
|
( { model
|
||||||
| homeModel = lm
|
| homeModel = lm
|
||||||
@ -330,7 +338,7 @@ updateManageData lmsg model =
|
|||||||
initPage : Model -> Page -> ( Model, Cmd Msg, Sub Msg )
|
initPage : Model -> Page -> ( Model, Cmd Msg, Sub Msg )
|
||||||
initPage model page =
|
initPage model page =
|
||||||
case page of
|
case page of
|
||||||
HomePage ->
|
HomePage mid ->
|
||||||
Util.Update.andThen2
|
Util.Update.andThen2
|
||||||
[ updateHome Page.Home.Data.Init
|
[ updateHome Page.Home.Data.Init
|
||||||
, updateQueue Page.Queue.Data.StopRefresh
|
, updateQueue Page.Queue.Data.StopRefresh
|
||||||
|
@ -65,7 +65,7 @@ defaultLayout model =
|
|||||||
[ div [ class "ui fluid container" ]
|
[ div [ class "ui fluid container" ]
|
||||||
[ a
|
[ a
|
||||||
[ class "header item narrow-item"
|
[ class "header item narrow-item"
|
||||||
, Page.href HomePage
|
, Page.href (HomePage Nothing)
|
||||||
]
|
]
|
||||||
[ img
|
[ img
|
||||||
[ class "image"
|
[ class "image"
|
||||||
@ -79,9 +79,12 @@ defaultLayout model =
|
|||||||
, loginInfo model
|
, loginInfo model
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
, div [ class "main-content" ]
|
, div
|
||||||
|
[ class "main-content"
|
||||||
|
, id "main-content"
|
||||||
|
]
|
||||||
[ case model.page of
|
[ case model.page of
|
||||||
HomePage ->
|
HomePage _ ->
|
||||||
viewHome model
|
viewHome model
|
||||||
|
|
||||||
LoginPage _ ->
|
LoginPage _ ->
|
||||||
@ -174,7 +177,16 @@ viewLogin model =
|
|||||||
|
|
||||||
viewHome : Model -> Html Msg
|
viewHome : Model -> Html Msg
|
||||||
viewHome model =
|
viewHome model =
|
||||||
Html.map HomeMsg (Page.Home.View.view model.flags model.uiSettings model.homeModel)
|
let
|
||||||
|
mid =
|
||||||
|
case model.page of
|
||||||
|
HomePage x ->
|
||||||
|
x
|
||||||
|
|
||||||
|
_ ->
|
||||||
|
Nothing
|
||||||
|
in
|
||||||
|
Html.map HomeMsg (Page.Home.View.view mid model.flags model.uiSettings model.homeModel)
|
||||||
|
|
||||||
|
|
||||||
menuEntry : Model -> Page -> List (Html Msg) -> Html Msg
|
menuEntry : Model -> Page -> List (Html Msg) -> Html Msg
|
||||||
@ -206,7 +218,7 @@ loginInfo model =
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
[ menuEntry model
|
[ menuEntry model
|
||||||
HomePage
|
(HomePage Nothing)
|
||||||
[ img
|
[ img
|
||||||
[ class "image icon"
|
[ class "image icon"
|
||||||
, src (model.flags.config.docspellAssetPath ++ "/img/logo-mc-96.png")
|
, src (model.flags.config.docspellAssetPath ++ "/img/logo-mc-96.png")
|
||||||
|
@ -120,26 +120,26 @@ updateDrag dm _ msg model =
|
|||||||
--- View
|
--- View
|
||||||
|
|
||||||
|
|
||||||
view : UiSettings -> Model -> Html Msg
|
view : Maybe String -> UiSettings -> Model -> Html Msg
|
||||||
view settings model =
|
view current settings model =
|
||||||
div [ class "ui container" ]
|
div [ class "ui container" ]
|
||||||
(List.map (viewGroup settings) model.results.groups)
|
(List.map (viewGroup current settings) model.results.groups)
|
||||||
|
|
||||||
|
|
||||||
viewGroup : UiSettings -> ItemLightGroup -> Html Msg
|
viewGroup : Maybe String -> UiSettings -> ItemLightGroup -> Html Msg
|
||||||
viewGroup settings group =
|
viewGroup current settings group =
|
||||||
div [ class "item-group" ]
|
div [ class "item-group" ]
|
||||||
[ div [ class "ui horizontal divider header item-list" ]
|
[ div [ class "ui horizontal divider header item-list" ]
|
||||||
[ i [ class "calendar alternate outline icon" ] []
|
[ i [ class "calendar alternate outline icon" ] []
|
||||||
, text group.name
|
, text group.name
|
||||||
]
|
]
|
||||||
, div [ class "ui stackable three cards" ]
|
, div [ class "ui stackable three cards" ]
|
||||||
(List.map (viewItem settings) group.items)
|
(List.map (viewItem current settings) group.items)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
viewItem : UiSettings -> ItemLight -> Html Msg
|
viewItem : Maybe String -> UiSettings -> ItemLight -> Html Msg
|
||||||
viewItem settings item =
|
viewItem current settings item =
|
||||||
let
|
let
|
||||||
dirIcon =
|
dirIcon =
|
||||||
i [ class (Data.Direction.iconFromMaybe item.direction) ] []
|
i [ class (Data.Direction.iconFromMaybe item.direction) ] []
|
||||||
@ -174,6 +174,7 @@ viewItem settings item =
|
|||||||
([ classList
|
([ classList
|
||||||
[ ( "ui fluid card", True )
|
[ ( "ui fluid card", True )
|
||||||
, ( newColor, not isConfirmed )
|
, ( newColor, not isConfirmed )
|
||||||
|
, ( "current", current == Just item.id )
|
||||||
]
|
]
|
||||||
, id item.id
|
, id item.id
|
||||||
, href "#"
|
, href "#"
|
||||||
|
@ -648,7 +648,7 @@ update key flags next msg model =
|
|||||||
noSub ( model, Page.set key (ItemDetailPage id) )
|
noSub ( model, Page.set key (ItemDetailPage id) )
|
||||||
|
|
||||||
Nothing ->
|
Nothing ->
|
||||||
noSub ( model, Page.set key HomePage )
|
noSub ( model, Page.set key (HomePage Nothing) )
|
||||||
|
|
||||||
else
|
else
|
||||||
noSub ( model, Cmd.none )
|
noSub ( model, Cmd.none )
|
||||||
|
@ -99,7 +99,7 @@ renderDetailMenu inav model =
|
|||||||
)
|
)
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
[ a [ class "item", Page.href HomePage ]
|
[ a [ class "item", Page.href (HomePage (Just model.item.id)) ]
|
||||||
[ i [ class "arrow left icon" ] []
|
[ i [ class "arrow left icon" ] []
|
||||||
]
|
]
|
||||||
, a
|
, a
|
||||||
|
@ -24,7 +24,7 @@ import Util.Maybe
|
|||||||
|
|
||||||
|
|
||||||
type Page
|
type Page
|
||||||
= HomePage
|
= HomePage (Maybe String)
|
||||||
| LoginPage (Maybe Page)
|
| LoginPage (Maybe Page)
|
||||||
| ManageDataPage
|
| ManageDataPage
|
||||||
| CollectiveSettingPage
|
| CollectiveSettingPage
|
||||||
@ -39,7 +39,7 @@ type Page
|
|||||||
isSecured : Page -> Bool
|
isSecured : Page -> Bool
|
||||||
isSecured page =
|
isSecured page =
|
||||||
case page of
|
case page of
|
||||||
HomePage ->
|
HomePage _ ->
|
||||||
True
|
True
|
||||||
|
|
||||||
LoginPage _ ->
|
LoginPage _ ->
|
||||||
@ -88,7 +88,7 @@ loginPage p =
|
|||||||
pageName : Page -> String
|
pageName : Page -> String
|
||||||
pageName page =
|
pageName page =
|
||||||
case page of
|
case page of
|
||||||
HomePage ->
|
HomePage _ ->
|
||||||
"Home"
|
"Home"
|
||||||
|
|
||||||
LoginPage _ ->
|
LoginPage _ ->
|
||||||
@ -147,7 +147,10 @@ uploadId page =
|
|||||||
pageToString : Page -> String
|
pageToString : Page -> String
|
||||||
pageToString page =
|
pageToString page =
|
||||||
case page of
|
case page of
|
||||||
HomePage ->
|
HomePage (Just id) ->
|
||||||
|
"/app/home?item=" ++ id
|
||||||
|
|
||||||
|
HomePage Nothing ->
|
||||||
"/app/home"
|
"/app/home"
|
||||||
|
|
||||||
LoginPage referer ->
|
LoginPage referer ->
|
||||||
@ -227,7 +230,12 @@ pathPrefix =
|
|||||||
parser : Parser (Page -> a) a
|
parser : Parser (Page -> a) a
|
||||||
parser =
|
parser =
|
||||||
oneOf
|
oneOf
|
||||||
[ Parser.map HomePage (oneOf [ Parser.top, s pathPrefix </> s "home" ])
|
[ Parser.map HomePage
|
||||||
|
(oneOf
|
||||||
|
[ Parser.top <?> itemQuery
|
||||||
|
, s pathPrefix </> s "home" <?> itemQuery
|
||||||
|
]
|
||||||
|
)
|
||||||
, Parser.map LoginPage (s pathPrefix </> s "login" <?> pageQuery)
|
, Parser.map LoginPage (s pathPrefix </> s "login" <?> pageQuery)
|
||||||
, Parser.map ManageDataPage (s pathPrefix </> s "managedata")
|
, Parser.map ManageDataPage (s pathPrefix </> s "managedata")
|
||||||
, Parser.map CollectiveSettingPage (s pathPrefix </> s "csettings")
|
, Parser.map CollectiveSettingPage (s pathPrefix </> s "csettings")
|
||||||
@ -263,3 +271,8 @@ pageQuery =
|
|||||||
in
|
in
|
||||||
Query.string "r"
|
Query.string "r"
|
||||||
|> Query.map parsePage
|
|> Query.map parsePage
|
||||||
|
|
||||||
|
|
||||||
|
itemQuery : Query.Parser (Maybe String)
|
||||||
|
itemQuery =
|
||||||
|
Query.string "item"
|
||||||
|
@ -2,7 +2,6 @@ module Page.Home.Data exposing
|
|||||||
( Model
|
( Model
|
||||||
, Msg(..)
|
, Msg(..)
|
||||||
, SearchType(..)
|
, SearchType(..)
|
||||||
, ViewMode(..)
|
|
||||||
, defaultSearchType
|
, defaultSearchType
|
||||||
, doSearchCmd
|
, doSearchCmd
|
||||||
, init
|
, init
|
||||||
@ -14,6 +13,7 @@ module Page.Home.Data exposing
|
|||||||
import Api
|
import Api
|
||||||
import Api.Model.ItemLightList exposing (ItemLightList)
|
import Api.Model.ItemLightList exposing (ItemLightList)
|
||||||
import Api.Model.ItemSearch
|
import Api.Model.ItemSearch
|
||||||
|
import Browser.Dom as Dom
|
||||||
import Comp.FixedDropdown
|
import Comp.FixedDropdown
|
||||||
import Comp.ItemCardList
|
import Comp.ItemCardList
|
||||||
import Comp.SearchMenu
|
import Comp.SearchMenu
|
||||||
@ -30,7 +30,6 @@ type alias Model =
|
|||||||
{ searchMenuModel : Comp.SearchMenu.Model
|
{ searchMenuModel : Comp.SearchMenu.Model
|
||||||
, itemListModel : Comp.ItemCardList.Model
|
, itemListModel : Comp.ItemCardList.Model
|
||||||
, searchInProgress : Bool
|
, searchInProgress : Bool
|
||||||
, viewMode : ViewMode
|
|
||||||
, menuCollapsed : Bool
|
, menuCollapsed : Bool
|
||||||
, searchOffset : Int
|
, searchOffset : Int
|
||||||
, moreAvailable : Bool
|
, moreAvailable : Bool
|
||||||
@ -57,7 +56,6 @@ init flags =
|
|||||||
{ searchMenuModel = Comp.SearchMenu.init
|
{ searchMenuModel = Comp.SearchMenu.init
|
||||||
, itemListModel = Comp.ItemCardList.init
|
, itemListModel = Comp.ItemCardList.init
|
||||||
, searchInProgress = False
|
, searchInProgress = False
|
||||||
, viewMode = Listing
|
|
||||||
, menuCollapsed = True
|
, menuCollapsed = True
|
||||||
, searchOffset = 0
|
, searchOffset = 0
|
||||||
, moreAvailable = True
|
, moreAvailable = True
|
||||||
@ -98,6 +96,8 @@ type Msg
|
|||||||
| SearchTypeMsg (Comp.FixedDropdown.Msg SearchType)
|
| SearchTypeMsg (Comp.FixedDropdown.Msg SearchType)
|
||||||
| KeyUpMsg (Maybe KeyCode)
|
| KeyUpMsg (Maybe KeyCode)
|
||||||
| SetContentOnly String
|
| SetContentOnly String
|
||||||
|
| ScrollResult (Result Dom.Error ())
|
||||||
|
| ClearItemDetailId
|
||||||
|
|
||||||
|
|
||||||
type SearchType
|
type SearchType
|
||||||
@ -119,11 +119,6 @@ searchTypeString st =
|
|||||||
"Contents Only"
|
"Contents Only"
|
||||||
|
|
||||||
|
|
||||||
type ViewMode
|
|
||||||
= Listing
|
|
||||||
| Detail
|
|
||||||
|
|
||||||
|
|
||||||
itemNav : String -> Model -> { prev : Maybe String, next : Maybe String }
|
itemNav : String -> Model -> { prev : Maybe String, next : Maybe String }
|
||||||
itemNav id model =
|
itemNav id model =
|
||||||
let
|
let
|
||||||
|
@ -8,6 +8,9 @@ import Data.Flags exposing (Flags)
|
|||||||
import Data.UiSettings exposing (UiSettings)
|
import Data.UiSettings exposing (UiSettings)
|
||||||
import Page exposing (Page(..))
|
import Page exposing (Page(..))
|
||||||
import Page.Home.Data exposing (..)
|
import Page.Home.Data exposing (..)
|
||||||
|
import Process
|
||||||
|
import Scroll
|
||||||
|
import Task
|
||||||
import Throttle
|
import Throttle
|
||||||
import Time
|
import Time
|
||||||
import Util.Html exposing (KeyCode(..))
|
import Util.Html exposing (KeyCode(..))
|
||||||
@ -17,12 +20,12 @@ import Util.String
|
|||||||
import Util.Update
|
import Util.Update
|
||||||
|
|
||||||
|
|
||||||
update : Nav.Key -> Flags -> UiSettings -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
update : Maybe String -> Nav.Key -> Flags -> UiSettings -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
||||||
update key flags settings msg model =
|
update mId key flags settings msg model =
|
||||||
case msg of
|
case msg of
|
||||||
Init ->
|
Init ->
|
||||||
Util.Update.andThen2
|
Util.Update.andThen2
|
||||||
[ update key flags settings (SearchMenuMsg Comp.SearchMenu.Init)
|
[ update mId key flags settings (SearchMenuMsg Comp.SearchMenu.Init)
|
||||||
, doSearch flags settings
|
, doSearch flags settings
|
||||||
]
|
]
|
||||||
model
|
model
|
||||||
@ -35,7 +38,7 @@ update key flags settings msg model =
|
|||||||
, searchType = defaultSearchType flags
|
, searchType = defaultSearchType flags
|
||||||
}
|
}
|
||||||
in
|
in
|
||||||
update key flags settings (SearchMenuMsg Comp.SearchMenu.ResetForm) nm
|
update mId key flags settings (SearchMenuMsg Comp.SearchMenu.ResetForm) nm
|
||||||
|
|
||||||
SearchMenuMsg m ->
|
SearchMenuMsg m ->
|
||||||
let
|
let
|
||||||
@ -80,13 +83,13 @@ update key flags settings msg model =
|
|||||||
m
|
m
|
||||||
model.itemListModel
|
model.itemListModel
|
||||||
|
|
||||||
cmd =
|
( cmd, id ) =
|
||||||
case result.selected of
|
case result.selected of
|
||||||
Just item ->
|
Just item ->
|
||||||
Page.set key (ItemDetailPage item.id)
|
( Page.set key (ItemDetailPage item.id), Just item.id )
|
||||||
|
|
||||||
Nothing ->
|
Nothing ->
|
||||||
Cmd.none
|
( Cmd.none, Nothing )
|
||||||
in
|
in
|
||||||
withSub
|
withSub
|
||||||
( { model
|
( { model
|
||||||
@ -105,11 +108,14 @@ update key flags settings msg model =
|
|||||||
{ model
|
{ model
|
||||||
| searchInProgress = False
|
| searchInProgress = False
|
||||||
, searchOffset = noff
|
, searchOffset = noff
|
||||||
, viewMode = Listing
|
|
||||||
, moreAvailable = list.groups /= []
|
, moreAvailable = list.groups /= []
|
||||||
}
|
}
|
||||||
in
|
in
|
||||||
update key flags settings (ItemCardListMsg (Comp.ItemCardList.SetResults list)) m
|
Util.Update.andThen2
|
||||||
|
[ update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.SetResults list))
|
||||||
|
, scrollToCard mId
|
||||||
|
]
|
||||||
|
m
|
||||||
|
|
||||||
ItemSearchAddResp (Ok list) ->
|
ItemSearchAddResp (Ok list) ->
|
||||||
let
|
let
|
||||||
@ -121,11 +127,14 @@ update key flags settings msg model =
|
|||||||
| searchInProgress = False
|
| searchInProgress = False
|
||||||
, moreInProgress = False
|
, moreInProgress = False
|
||||||
, searchOffset = noff
|
, searchOffset = noff
|
||||||
, viewMode = Listing
|
|
||||||
, moreAvailable = list.groups /= []
|
, moreAvailable = list.groups /= []
|
||||||
}
|
}
|
||||||
in
|
in
|
||||||
update key flags settings (ItemCardListMsg (Comp.ItemCardList.AddResults list)) m
|
Util.Update.andThen2
|
||||||
|
[ update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.AddResults list))
|
||||||
|
, scrollToCard mId
|
||||||
|
]
|
||||||
|
m
|
||||||
|
|
||||||
ItemSearchAddResp (Err _) ->
|
ItemSearchAddResp (Err _) ->
|
||||||
withSub
|
withSub
|
||||||
@ -187,7 +196,7 @@ update key flags settings msg model =
|
|||||||
ContentOnlySearch ->
|
ContentOnlySearch ->
|
||||||
SetContentOnly str
|
SetContentOnly str
|
||||||
in
|
in
|
||||||
update key flags settings smMsg model
|
update mId key flags settings smMsg model
|
||||||
|
|
||||||
SetContentOnly str ->
|
SetContentOnly str ->
|
||||||
withSub
|
withSub
|
||||||
@ -209,16 +218,40 @@ update key flags settings msg model =
|
|||||||
)
|
)
|
||||||
|
|
||||||
KeyUpMsg (Just Enter) ->
|
KeyUpMsg (Just Enter) ->
|
||||||
update key flags settings DoSearch model
|
update mId key flags settings DoSearch model
|
||||||
|
|
||||||
KeyUpMsg _ ->
|
KeyUpMsg _ ->
|
||||||
withSub ( model, Cmd.none )
|
withSub ( model, Cmd.none )
|
||||||
|
|
||||||
|
ScrollResult _ ->
|
||||||
|
let
|
||||||
|
cmd =
|
||||||
|
Process.sleep 350 |> Task.perform (always ClearItemDetailId)
|
||||||
|
in
|
||||||
|
withSub ( model, cmd )
|
||||||
|
|
||||||
|
ClearItemDetailId ->
|
||||||
|
withSub ( model, Page.set key (HomePage Nothing) )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--- Helpers
|
--- Helpers
|
||||||
|
|
||||||
|
|
||||||
|
scrollToCard : Maybe String -> Model -> ( Model, Cmd Msg, Sub Msg )
|
||||||
|
scrollToCard mId model =
|
||||||
|
let
|
||||||
|
scroll id =
|
||||||
|
Scroll.scroll id 0.5 0.5 0.5 0.5
|
||||||
|
in
|
||||||
|
case mId of
|
||||||
|
Just id ->
|
||||||
|
( model, Task.attempt ScrollResult (scroll id), Sub.none )
|
||||||
|
|
||||||
|
Nothing ->
|
||||||
|
( model, Cmd.none, Sub.none )
|
||||||
|
|
||||||
|
|
||||||
doSearch : Flags -> UiSettings -> Model -> ( Model, Cmd Msg, Sub Msg )
|
doSearch : Flags -> UiSettings -> Model -> ( Model, Cmd Msg, Sub Msg )
|
||||||
doSearch flags settings model =
|
doSearch flags settings model =
|
||||||
let
|
let
|
||||||
@ -244,7 +277,6 @@ doSearch flags settings model =
|
|||||||
withSub
|
withSub
|
||||||
( { model_
|
( { model_
|
||||||
| searchInProgress = cmd /= Cmd.none
|
| searchInProgress = cmd /= Cmd.none
|
||||||
, viewMode = Listing
|
|
||||||
, searchOffset = 0
|
, searchOffset = 0
|
||||||
, throttle = newThrottle
|
, throttle = newThrottle
|
||||||
}
|
}
|
||||||
@ -258,7 +290,7 @@ doSearchMore flags settings model =
|
|||||||
cmd =
|
cmd =
|
||||||
doSearchCmd flags settings model.searchOffset model
|
doSearchCmd flags settings model.searchOffset model
|
||||||
in
|
in
|
||||||
( { model | moreInProgress = True, viewMode = Listing }
|
( { model | moreInProgress = True }
|
||||||
, cmd
|
, cmd
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -14,8 +14,8 @@ import Page.Home.Data exposing (..)
|
|||||||
import Util.Html
|
import Util.Html
|
||||||
|
|
||||||
|
|
||||||
view : Flags -> UiSettings -> Model -> Html Msg
|
view : Maybe String -> Flags -> UiSettings -> Model -> Html Msg
|
||||||
view flags settings model =
|
view current flags settings model =
|
||||||
div [ class "home-page ui padded grid" ]
|
div [ class "home-page ui padded grid" ]
|
||||||
[ div
|
[ div
|
||||||
[ classList
|
[ classList
|
||||||
@ -81,13 +81,8 @@ view flags settings model =
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
[ viewSearchBar flags model
|
[ viewSearchBar flags model
|
||||||
, case model.viewMode of
|
, Html.map ItemCardListMsg
|
||||||
Listing ->
|
(Comp.ItemCardList.view current settings model.itemListModel)
|
||||||
Html.map ItemCardListMsg
|
|
||||||
(Comp.ItemCardList.view settings model.itemListModel)
|
|
||||||
|
|
||||||
Detail ->
|
|
||||||
div [] []
|
|
||||||
]
|
]
|
||||||
, div
|
, div
|
||||||
[ classList
|
[ classList
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
module Page.ItemDetail.Data exposing (Model, Msg(..), emptyModel)
|
module Page.ItemDetail.Data exposing (Model, Msg(..), emptyModel)
|
||||||
|
|
||||||
import Api.Model.ItemDetail exposing (ItemDetail)
|
import Api.Model.ItemDetail exposing (ItemDetail)
|
||||||
|
import Browser.Dom as Dom
|
||||||
import Comp.ItemDetail
|
import Comp.ItemDetail
|
||||||
import Comp.ItemDetail.Update
|
import Comp.ItemDetail.Update
|
||||||
import Http
|
import Http
|
||||||
@ -21,3 +22,4 @@ type Msg
|
|||||||
= Init String
|
= Init String
|
||||||
| ItemDetailMsg Comp.ItemDetail.Update.Msg
|
| ItemDetailMsg Comp.ItemDetail.Update.Msg
|
||||||
| ItemResp (Result Http.Error ItemDetail)
|
| ItemResp (Result Http.Error ItemDetail)
|
||||||
|
| ScrollResult (Result Dom.Error ())
|
||||||
|
@ -6,6 +6,8 @@ import Comp.ItemDetail
|
|||||||
import Comp.ItemDetail.Update
|
import Comp.ItemDetail.Update
|
||||||
import Data.Flags exposing (Flags)
|
import Data.Flags exposing (Flags)
|
||||||
import Page.ItemDetail.Data exposing (Model, Msg(..))
|
import Page.ItemDetail.Data exposing (Model, Msg(..))
|
||||||
|
import Scroll
|
||||||
|
import Task
|
||||||
|
|
||||||
|
|
||||||
update : Nav.Key -> Flags -> Maybe String -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
update : Nav.Key -> Flags -> Maybe String -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
|
||||||
@ -15,9 +17,16 @@ update key flags next msg model =
|
|||||||
let
|
let
|
||||||
( lm, lc, ls ) =
|
( lm, lc, ls ) =
|
||||||
Comp.ItemDetail.update key flags next Comp.ItemDetail.Update.Init model.detail
|
Comp.ItemDetail.update key flags next Comp.ItemDetail.Update.Init model.detail
|
||||||
|
|
||||||
|
task =
|
||||||
|
Scroll.scroll "main-content" 0 0 0 0
|
||||||
in
|
in
|
||||||
( { model | detail = lm }
|
( { model | detail = lm }
|
||||||
, Cmd.batch [ Api.itemDetail flags id ItemResp, Cmd.map ItemDetailMsg lc ]
|
, Cmd.batch
|
||||||
|
[ Api.itemDetail flags id ItemResp
|
||||||
|
, Cmd.map ItemDetailMsg lc
|
||||||
|
, Task.attempt ScrollResult task
|
||||||
|
]
|
||||||
, Sub.map ItemDetailMsg ls
|
, Sub.map ItemDetailMsg ls
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -40,3 +49,6 @@ update key flags next msg model =
|
|||||||
|
|
||||||
ItemResp (Err _) ->
|
ItemResp (Err _) ->
|
||||||
( model, Cmd.none, Sub.none )
|
( model, Cmd.none, Sub.none )
|
||||||
|
|
||||||
|
ScrollResult _ ->
|
||||||
|
( model, Cmd.none, Sub.none )
|
||||||
|
@ -25,7 +25,7 @@ update referrer flags msg model =
|
|||||||
AuthResp (Ok lr) ->
|
AuthResp (Ok lr) ->
|
||||||
let
|
let
|
||||||
gotoRef =
|
gotoRef =
|
||||||
Maybe.withDefault HomePage referrer |> Page.goto
|
Maybe.withDefault (HomePage Nothing) referrer |> Page.goto
|
||||||
in
|
in
|
||||||
if lr.success then
|
if lr.success then
|
||||||
( { model | result = Just lr, password = "" }, Cmd.batch [ setAccount lr, gotoRef ], Just lr )
|
( { model | result = Just lr, password = "" }, Cmd.batch [ setAccount lr, gotoRef ], Just lr )
|
||||||
|
@ -77,7 +77,7 @@ renderSuccessMsg public _ =
|
|||||||
else
|
else
|
||||||
p []
|
p []
|
||||||
[ text "Your files have been successfully uploaded. They are now being processed. Check the "
|
[ text "Your files have been successfully uploaded. They are now being processed. Check the "
|
||||||
, a [ class "ui link", Page.href HomePage ]
|
, a [ class "ui link", Page.href (HomePage Nothing) ]
|
||||||
[ text "Items page"
|
[ text "Items page"
|
||||||
]
|
]
|
||||||
, text " later where the files will arrive eventually. Or go to the "
|
, text " later where the files will arrive eventually. Or go to the "
|
||||||
|
@ -4,7 +4,6 @@ port module Ports exposing
|
|||||||
, loadUiSettings
|
, loadUiSettings
|
||||||
, onUiSettingsSaved
|
, onUiSettingsSaved
|
||||||
, removeAccount
|
, removeAccount
|
||||||
, scrollToElem
|
|
||||||
, setAccount
|
, setAccount
|
||||||
, setAllProgress
|
, setAllProgress
|
||||||
, setProgress
|
, setProgress
|
||||||
@ -30,9 +29,6 @@ port setProgress : ( String, Int ) -> Cmd msg
|
|||||||
port setAllProgress : ( String, Int ) -> Cmd msg
|
port setAllProgress : ( String, Int ) -> Cmd msg
|
||||||
|
|
||||||
|
|
||||||
port scrollToElem : String -> Cmd msg
|
|
||||||
|
|
||||||
|
|
||||||
port saveUiSettings : ( AuthResult, StoredUiSettings ) -> Cmd msg
|
port saveUiSettings : ( AuthResult, StoredUiSettings ) -> Cmd msg
|
||||||
|
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.default-layout .main-content {
|
.default-layout .main-content {
|
||||||
margin-top: 44px;
|
padding-top: 44px;
|
||||||
padding-bottom: 2em;
|
padding-bottom: 2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -97,6 +97,10 @@
|
|||||||
.default-layout .ui.cards .ui.card .content.search-highlight .ui.list .item .content .description strong > em {
|
.default-layout .ui.cards .ui.card .content.search-highlight .ui.list .item .content .description strong > em {
|
||||||
background: rgba(220, 255, 71, 0.6);
|
background: rgba(220, 255, 71, 0.6);
|
||||||
}
|
}
|
||||||
|
.default-layout .ui.cards .ui.card.current {
|
||||||
|
/* semantic-ui purple */
|
||||||
|
box-shadow: 0 0 6px rgba(0,0,0,0.55);
|
||||||
|
}
|
||||||
|
|
||||||
.default-layout .qr-code svg {
|
.default-layout .qr-code svg {
|
||||||
width: 200px;
|
width: 200px;
|
||||||
|
@ -32,21 +32,6 @@ elmApp.ports.setAllProgress.subscribe(function(input) {
|
|||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
|
|
||||||
// elmApp.ports.scrollToElem.subscribe(function(id) {
|
|
||||||
// if (id && id != "") {
|
|
||||||
// window.setTimeout(function() {
|
|
||||||
// var el = document.getElementById(id);
|
|
||||||
// if (el) {
|
|
||||||
// if (el["scrollIntoViewIfNeeded"]) {
|
|
||||||
// el.scrollIntoViewIfNeeded();
|
|
||||||
// } else {
|
|
||||||
// el.scrollIntoView();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }, 20);
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
|
|
||||||
elmApp.ports.saveUiSettings.subscribe(function(args) {
|
elmApp.ports.saveUiSettings.subscribe(function(args) {
|
||||||
if (Array.isArray(args) && args.length == 2) {
|
if (Array.isArray(args) && args.length == 2) {
|
||||||
var authResult = args[0];
|
var authResult = args[0];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user