TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply tag colors from settings

Browse Source
This commit is contained in:
Eike Kettner
2020-06-08 00:54:47 +02:00
parent 1cd65b7b7c
commit 1dd84c11bd
39 changed files with 375 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/webapp/src/main/elm/App/Data.elm
View File

@ -44,18 +44,19 @@ type alias Model =
, itemDetailModel : Page.ItemDetail.Data.Model
, navMenuOpen : Bool
, subs : Sub Msg
, uiSettings : UiSettings
}
init : Key -> Url -> Flags -> ( Model, Cmd Msg )
init key url flags =
init : Key -> Url -> Flags -> UiSettings -> ( Model, Cmd Msg )
init key url flags settings =
let
page =
Page.fromUrl url
|> Maybe.withDefault (defaultPage flags)
( um, uc ) =
Page.UserSettings.Data.emptyModel flags
Page.UserSettings.Data.init flags settings
in
( { flags = flags
, key = key
@ -73,6 +74,7 @@ init key url flags =
, itemDetailModel = Page.ItemDetail.Data.emptyModel
, navMenuOpen = False
, subs = Sub.none
, uiSettings = settings
}
, Cmd.map UserSettingsMsg uc
)

9
modules/webapp/src/main/elm/App/Update.elm
View File

@ -176,10 +176,9 @@ updateWithSub msg model =
GetUiSettings settings ->
Util.Update.andThen1
[ updateUserSettings (Page.UserSettings.Data.GetUiSettings settings)
, updateHome (Page.Home.Data.GetUiSettings settings)
[ updateUserSettings Page.UserSettings.Data.UpdateSettings
]
model
{ model | uiSettings = settings }
|> noSub
@ -253,7 +252,7 @@ updateUserSettings : Page.UserSettings.Data.Msg -> Model -> ( Model, Cmd Msg )
updateUserSettings lmsg model =
let
( lm, lc, ls ) =
Page.UserSettings.Update.update model.flags lmsg model.userSettingsModel
Page.UserSettings.Update.update model.flags model.uiSettings lmsg model.userSettingsModel
in
( { model
| userSettingsModel = lm
@ -302,7 +301,7 @@ updateHome : Page.Home.Data.Msg -> Model -> ( Model, Cmd Msg )
updateHome lmsg model =
let
( lm, lc ) =
Page.Home.Update.update model.key model.flags lmsg model.homeModel
Page.Home.Update.update model.key model.flags model.uiSettings lmsg model.homeModel
in
( { model | homeModel = lm }
, Cmd.map HomeMsg lc

14
modules/webapp/src/main/elm/App/View.elm
View File

@ -121,7 +121,7 @@ viewItemDetail id model =
inav =
Page.Home.Data.itemNav id model.homeModel
in
Html.map ItemDetailMsg (Page.ItemDetail.View.view inav model.itemDetailModel)
Html.map ItemDetailMsg (Page.ItemDetail.View.view inav model.uiSettings model.itemDetailModel)
viewNewInvite : Model -> Html Msg
@ -146,17 +146,21 @@ viewQueue model =
viewUserSettings : Model -> Html Msg
viewUserSettings model =
Html.map UserSettingsMsg (Page.UserSettings.View.view model.userSettingsModel)
Html.map UserSettingsMsg (Page.UserSettings.View.view model.uiSettings model.userSettingsModel)
viewCollectiveSettings : Model -> Html Msg
viewCollectiveSettings model =
Html.map CollSettingsMsg (Page.CollectiveSettings.View.view model.flags model.collSettingsModel)
Html.map CollSettingsMsg
(Page.CollectiveSettings.View.view model.flags
model.uiSettings
model.collSettingsModel
)
viewManageData : Model -> Html Msg
viewManageData model =
Html.map ManageDataMsg (Page.ManageData.View.view model.manageDataModel)
Html.map ManageDataMsg (Page.ManageData.View.view model.uiSettings model.manageDataModel)
viewLogin : Model -> Html Msg
@ -166,7 +170,7 @@ viewLogin model =
viewHome : Model -> Html Msg
viewHome model =
Html.map HomeMsg (Page.Home.View.view model.homeModel)
Html.map HomeMsg (Page.Home.View.view model.uiSettings model.homeModel)
menuEntry : Model -> Page -> List (Html Msg) -> Html Msg