+1 -1

Makefile

reviewed

··· 46 46 47 47 elm: 48 48 @echo "> Compiling Elm" 49 49 - @elm-make $(SRC_DIR)/App/App.elm --output $(BUILD_DIR)/application.js --yes --debug 49 49 + @elm-make $(SRC_DIR)/App/App.elm --output $(BUILD_DIR)/application.js --yes 50 50 51 51 52 52 system:

+12 -1

src/App/Authentication/State.elm

reviewed

··· 212 212 Ok "Redirect" -> 213 213 (!) 214 214 model 215 215 - [] 215 215 + [ displayMessage "Redirecting ...\nA new tab or window might open." 216 216 + , afterwards 217 217 + ] 216 218 217 219 Ok _ -> 218 220 handleError model "Invalid response from SignIn" ··· 277 279 displayError error = 278 280 error 279 281 |> ErrorScreen 282 282 + |> Routing.Types.SetPage 283 283 + |> TopLevel.RoutingMsg 284 284 + |> do 285 285 + 286 286 + 287 287 + displayMessage : String -> Cmd TopLevel.Msg 288 288 + displayMessage message = 289 289 + message 290 290 + |> MessageScreen 280 291 |> Routing.Types.SetPage 281 292 |> TopLevel.RoutingMsg 282 293 |> do

+9 -3

src/App/Routing/Logic.elm

reviewed

··· 101 101 Equalizer -> 102 102 "/equalizer" 103 103 104 104 - ErrorScreen _ -> 105 105 - "/" 106 106 - 107 104 Index -> 108 105 "/" 109 106 ··· 130 127 131 128 Sources Sources.New -> 132 129 "/sources/new" 130 130 + 131 131 + ------------------------------------ 132 132 + -- Screens 133 133 + ------------------------------------ 134 134 + ErrorScreen _ -> 135 135 + "/" 136 136 + 137 137 + MessageScreen _ -> 138 138 + "/" 133 139 134 140 135 141

+3 -1

src/App/Routing/Types.elm

reviewed

··· 17 17 type Page 18 18 = Abroad 19 19 | Equalizer 20 20 - | ErrorScreen String 21 20 | Index 22 21 | Playlists Playlists.Page 23 22 | Queue Queue.Page 24 23 | Settings 25 24 | Sources Sources.Page 25 25 + -- Screens 26 26 + | ErrorScreen String 27 27 + | MessageScreen String

+1 -1

src/App/Types.elm

reviewed

··· 37 37 -- User layer 38 38 | ImportUserData String 39 39 | StoreUserData 40 40 - -- Time 41 40 | DebounceStoreUserData 42 41 | DebounceCallbackStoreUserData Debounce.Msg 42 42 + -- Time 43 43 | SetTimestamp Time 44 44 -- Children 45 45 | AbroadMsg Abroad.Msg

+34 -4

src/App/View.elm

reviewed

··· 85 85 ErrorScreen err -> 86 86 div 87 87 [ cssClass Shell ] 88 88 - [ if model.authentication.signedIn then 89 89 - authenticatedNavigation model.routing.currentPage 90 90 - else 91 91 - unauthenticatedNavigation model.routing.currentPage 88 88 + [ mainNav model 92 89 , div 93 90 [ cssClasses [ InTheMiddle, Basic ] ] 94 91 [ p ··· 97 94 , strong [] [ text err ] 98 95 ] 99 96 ] 97 97 + ] 98 98 + 99 99 + MessageScreen message -> 100 100 + div 101 101 + [ cssClass Shell ] 102 102 + [ mainNav model 103 103 + , let 104 104 + parts = 105 105 + String.split "\n" message 106 106 + in 107 107 + div 108 108 + [ cssClasses [ InTheMiddle, Basic ] ] 109 109 + [ p 110 110 + [] 111 111 + (List.map 112 112 + (\part -> 113 113 + em 114 114 + [] 115 115 + [ text part 116 116 + , br [] [] 117 117 + ] 118 118 + ) 119 119 + parts 120 120 + ) 121 121 + ] 100 122 ] 101 123 102 124 -- # Needs authentication ··· 325 347 326 348 _ -> 327 349 text "" 350 350 + 351 351 + 352 352 + mainNav : Model -> Html Msg 353 353 + mainNav model = 354 354 + if model.authentication.signedIn then 355 355 + authenticatedNavigation model.routing.currentPage 356 356 + else 357 357 + unauthenticatedNavigation model.routing.currentPage