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

Rename HomePage to SearchPage

Browse Source
This commit is contained in:
eikek
2022-01-26 21:20:34 +01:00
parent 5b5a25ac72
commit c38ab3ef82
18 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,13 @@ import Http
import Messages.UiLanguage exposing (UiLanguage)
import Page exposing (Page(..))
import Page.CollectiveSettings.Data
import Page.Home.Data
import Page.ItemDetail.Data
import Page.Login.Data
import Page.ManageData.Data
import Page.NewInvite.Data
import Page.Queue.Data
import Page.Register.Data
import Page.Search.Data
import Page.Share.Data
import Page.ShareDetail.Data
import Page.Upload.Data
@ -45,7 +45,7 @@ type alias Model =
, key : Key
, page : Page
, version : VersionInfo
, homeModel : Page.Home.Data.Model
, searchModel : Page.Search.Data.Model
, loginModel : Page.Login.Data.Model
, manageDataModel : Page.ManageData.Data.Model
, collSettingsModel : Page.CollectiveSettings.Data.Model
@ -98,18 +98,18 @@ init key url flags_ settings =
( sdm, sdc ) =
Page.ShareDetail.Data.init (Page.pageShareDetail page) flags
homeViewMode =
searchViewMode =
if settings.searchMenuVisible then
Page.Home.Data.SearchView
Page.Search.Data.SearchView
else
Page.Home.Data.SimpleView
Page.Search.Data.SimpleView
in
( { flags = flags
, key = key
, page = page
, version = Api.Model.VersionInfo.empty
, homeModel = Page.Home.Data.init flags homeViewMode
, searchModel = Page.Search.Data.init flags searchViewMode
, loginModel = loginm
, manageDataModel = mdm
, collSettingsModel = csm
@ -171,7 +171,7 @@ type Msg
= NavRequest UrlRequest
| NavChange Url
| VersionResp (Result Http.Error VersionInfo)
| HomeMsg Page.Home.Data.Msg
| SearchMsg Page.Search.Data.Msg
| LoginMsg Page.Login.Data.Msg
| ManageDataMsg Page.ManageData.Data.Msg
| CollSettingsMsg Page.CollectiveSettings.Data.Msg
@ -201,7 +201,7 @@ type Msg
defaultPage : Flags -> Page
defaultPage _ =
HomePage
SearchPage
getUiLanguage : Model -> UiLanguage

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

@ -22,8 +22,6 @@ import Messages exposing (Messages)
import Page exposing (Page(..))
import Page.CollectiveSettings.Data
import Page.CollectiveSettings.Update
import Page.Home.Data
import Page.Home.Update
import Page.ItemDetail.Data
import Page.ItemDetail.Update
import Page.Login.Data
@ -36,6 +34,8 @@ import Page.Queue.Data
import Page.Queue.Update
import Page.Register.Data
import Page.Register.Update
import Page.Search.Data
import Page.Search.Update
import Page.Share.Data
import Page.Share.Update
import Page.ShareDetail.Data
@ -121,8 +121,8 @@ updateWithSub msg model =
SetLanguage lang ->
( { model | anonymousUiLang = lang, langMenuOpen = False }, Cmd.none, Sub.none )
HomeMsg lm ->
updateHome texts lm model
SearchMsg lm ->
updateSearch texts lm model
ShareMsg lm ->
updateShare lm model
@ -318,12 +318,12 @@ updateWithSub msg model =
newModel =
{ model
| showNewItemsArrived = isProcessItem && model.page /= HomePage
| showNewItemsArrived = isProcessItem && model.page /= SearchPage
, jobsWaiting = max 0 (model.jobsWaiting - 1)
}
in
if model.page == HomePage && isProcessItem then
updateHome texts Page.Home.Data.RefreshView newModel
if model.page == SearchPage && isProcessItem then
updateSearch texts Page.Search.Data.RefreshView newModel
else
( newModel, Cmd.none, Sub.none )
@ -360,7 +360,7 @@ applyClientSettings texts model settings =
, Sub.none
)
, updateUserSettings texts Page.UserSettings.Data.UpdateSettings
, updateHome texts Page.Home.Data.UiSettingsUpdated
, updateSearch texts Page.Search.Data.UiSettingsUpdated
, updateItemDetail texts Page.ItemDetail.Data.UiSettingsUpdated
]
{ model | uiSettings = settings }
@ -404,7 +404,7 @@ updateItemDetail : Messages -> Page.ItemDetail.Data.Msg -> Model -> ( Model, Cmd
updateItemDetail texts lmsg model =
let
inav =
Page.Home.Data.itemNav model.itemDetailModel.detail.item.id model.homeModel
Page.Search.Data.itemNav model.itemDetailModel.detail.item.id model.searchModel
result =
Page.ItemDetail.Update.update
@ -421,12 +421,12 @@ updateItemDetail texts lmsg model =
}
( hm, hc, hs ) =
updateHome texts (Page.Home.Data.SetLinkTarget result.linkTarget) model_
updateSearch texts (Page.Search.Data.SetLinkTarget result.linkTarget) model_
( hm1, hc1, hs1 ) =
case result.removedItem of
Just removedId ->
updateHome texts (Page.Home.Data.RemoveItem removedId) hm
updateSearch texts (Page.Search.Data.RemoveItem removedId) hm
Nothing ->
( hm, hc, hs )
@ -552,22 +552,22 @@ updateLogin lmsg model =
)
updateHome : Messages -> Page.Home.Data.Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
updateHome texts lmsg model =
updateSearch : Messages -> Page.Search.Data.Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
updateSearch texts lmsg model =
let
mid =
case model.page of
HomePage ->
SearchPage ->
Util.Maybe.fromString model.itemDetailModel.detail.item.id
_ ->
Nothing
result =
Page.Home.Update.update mid model.key model.flags texts.home model.uiSettings lmsg model.homeModel
Page.Search.Update.update mid model.key model.flags texts.search model.uiSettings lmsg model.searchModel
model_ =
{ model | homeModel = result.model }
{ model | searchModel = result.model }
( lm, lc, ls ) =
case result.newSettings of
@ -579,11 +579,11 @@ updateHome texts lmsg model =
in
( lm
, Cmd.batch
[ Cmd.map HomeMsg result.cmd
[ Cmd.map SearchMsg result.cmd
, lc
]
, Sub.batch
[ Sub.map HomeMsg result.sub
[ Sub.map SearchMsg result.sub
, ls
]
)
@ -611,9 +611,9 @@ initPage model_ page =
Messages.get <| App.Data.getUiLanguage model
in
case page of
HomePage ->
SearchPage ->
Util.Update.andThen2
[ updateHome texts Page.Home.Data.Init
[ updateSearch texts Page.Search.Data.Init
, updateQueue Page.Queue.Data.StopRefresh
]
model

32
modules/webapp/src/main/elm/App/View2.elm
View File

@ -19,14 +19,14 @@ import Messages.App exposing (Texts)
import Messages.UiLanguage
import Page exposing (Page(..))
import Page.CollectiveSettings.View2 as CollectiveSettings
import Page.Home.Data
import Page.Home.View2 as Home
import Page.ItemDetail.View2 as ItemDetail
import Page.Login.View2 as Login
import Page.ManageData.View2 as ManageData
import Page.NewInvite.View2 as NewInvite
import Page.Queue.View2 as Queue
import Page.Register.View2 as Register
import Page.Search.Data
import Page.Search.View2 as Search
import Page.Share.View as Share
import Page.ShareDetail.View as ShareDetail
import Page.Upload.View2 as Upload
@ -76,7 +76,7 @@ topNavUser auth model =
[ class S.infoMessageBase
, class "my-2 px-1 py-1 rounded-lg inline-block hover:opacity-50"
, classList [ ( "hidden", not model.showNewItemsArrived ) ]
, Page.href HomePage
, Page.href SearchPage
, onClick ToggleShowNewItemsArrived
]
[ i [ class "fa fa-exclamation-circle mr-1" ] []
@ -133,7 +133,7 @@ headerNavItem authenticated model =
[ class "inline-flex font-bold items-center px-4"
, classList [ ( "hover:bg-blue-200 dark:hover:bg-slate-800", authenticated ) ]
, if authenticated then
Page.href HomePage
Page.href SearchPage
else
href "#"
@ -160,8 +160,8 @@ mainContent model =
, class styleMain
]
(case model.page of
HomePage ->
viewHome texts model
SearchPage ->
viewSearch texts model
CollectiveSettingPage ->
viewCollectiveSettings texts model
@ -280,7 +280,7 @@ dataMenu texts _ model =
, classList [ ( "hidden", not model.navMenuOpen ) ]
]
[ dataPageLink model
HomePage
SearchPage
[]
[ img
[ class "w-4 inline-block"
@ -510,20 +510,20 @@ viewShareDetail texts shareId itemId model =
]
viewHome : Messages -> Model -> List (Html Msg)
viewHome texts model =
[ Html.map HomeMsg
(Home.viewSidebar texts.home
viewSearch : Messages -> Model -> List (Html Msg)
viewSearch texts model =
[ Html.map SearchMsg
(Search.viewSidebar texts.search
model.sidebarVisible
model.flags
model.uiSettings
model.homeModel
model.searchModel
)
, Html.map HomeMsg
(Home.viewContent texts.home
, Html.map SearchMsg
(Search.viewContent texts.search
model.flags
model.uiSettings
model.homeModel
model.searchModel
)
]
@ -647,7 +647,7 @@ viewItemDetail : Messages -> String -> Model -> List (Html Msg)
viewItemDetail texts id model =
let
inav =
Page.Home.Data.itemNav id model.homeModel
Page.Search.Data.itemNav id model.searchModel
in
[ Html.map ItemDetailMsg
(ItemDetail.viewSidebar texts.itemDetail