c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

Preserve search options between packages and options search page (#82)

Browse source
This commit is contained in:
Rok Garbas 2020-06-10 14:03:44 +02:00 committed by GitHub
parent 9413e66d90
commit 6905ea40dd
Failed to generate hash of commit
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Main.elm
View file

@ -28,10 +28,10 @@ import Html.Attributes
import Page.Home
import Page.Options
import Page.Packages
import RemoteData
import Route
import Search
import Url
import Url.Builder
@ -113,7 +113,7 @@ submitQuery :
-> ( Model, Cmd Msg )
submitQuery old ( new, cmd ) =
let
triggerSearch oldModel newModel msg makeRequest =
triggerSearch _ newModel msg makeRequest =
if newModel.query /= Nothing then
( new
, Cmd.batch
@ -241,7 +241,7 @@ view model =
[ a [ class "brand", href "https://search.nixos.org" ]
[ img [ src "https://nixos.org/logo/nix-wiki.png", class "logo" ] []
]
, viewNavigation model.url
, viewNavigation model.page model.url
]
]
]
@ -263,13 +263,36 @@ view model =
]
viewNavigation : Url.Url -> Html Msg
viewNavigation url =
viewNavigation : Page -> Url.Url -> Html Msg
viewNavigation page url =
let
preserveSearchOptions =
case page of
Packages model ->
model.query
|> Maybe.map (\q -> [ Url.Builder.string "query" q ])
|> Maybe.withDefault []
|> List.append [ Url.Builder.string "channel" model.channel ]
Options model ->
model.query
|> Maybe.map (\q -> [ Url.Builder.string "query" q ])
|> Maybe.withDefault []
|> List.append [ Url.Builder.string "channel" model.channel ]
_ ->
[]
createUrl path =
[]
|> List.append preserveSearchOptions
|> Url.Builder.absolute [ path ]
in
ul [ class "nav" ]
(List.map
(viewNavigationItem url)
[ ( "/packages", "Packages" )
, ( "/options", "Options" )
[ ( createUrl "packages", "Packages" )
, ( createUrl "options", "Options" )
]
)