diff --git a/src/elm/Main.elm b/src/elm/Main.elm index 514448c3f..501d7e659 100644 --- a/src/elm/Main.elm +++ b/src/elm/Main.elm @@ -28,7 +28,6 @@ import Main.Pages.Model import Main.Pages.Msg import Maybe.Extra import Page -import Pages.Home_ import Pages.Account.Authenticate import Pages.Account.Login import Pages.Account.Logout @@ -47,9 +46,15 @@ import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Add import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Name_ import Pages.Dashboards import Pages.Dashboards.Dashboard_ +import Pages.Home_ +import Pages.NotFound_ import Pages.Org_ import Pages.Org_.Builds import Pages.Org_.Repo_ +import Pages.Org_.Repo_.Build_ +import Pages.Org_.Repo_.Build_.Graph +import Pages.Org_.Repo_.Build_.Pipeline +import Pages.Org_.Repo_.Build_.Services import Pages.Org_.Repo_.Deployments import Pages.Org_.Repo_.Deployments.Add import Pages.Org_.Repo_.Hooks @@ -59,12 +64,6 @@ import Pages.Org_.Repo_.Schedules.Add import Pages.Org_.Repo_.Schedules.Name_ import Pages.Org_.Repo_.Settings import Pages.Org_.Repo_.Tags -import Pages.Org_.Repo_.Build_ -import Pages.Org_.Repo_.Build_.Graph -import Pages.Org_.Repo_.Build_.Pipeline -import Pages.Org_.Repo_.Build_.Services -import Pages.NotFound_ -import Pages.NotFound_ import Route exposing (Route) import Route.Path import Shared @@ -118,10 +117,10 @@ init json url key = , shared = sharedModel } , Cmd.batch - [ Tuple.second page - , layout |> Maybe.map Tuple.second |> Maybe.withDefault Cmd.none - , fromSharedEffect { key = key, url = url, shared = sharedModel } sharedEffect - ] + [ Tuple.second page + , layout |> Maybe.map Tuple.second |> Maybe.withDefault Cmd.none + , fromSharedEffect { key = key, url = url, shared = sharedModel } sharedEffect + ] ) @@ -351,9 +350,10 @@ initLayout model layout = Layout.init defaultLayout () in ( Main.Layouts.Model.Default_Build { default = defaultLayoutModel, build = buildLayoutModel } - , Cmd.batch [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Build buildLayoutEffect) - , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) - ] + , Cmd.batch + [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Build buildLayoutEffect) + , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) + ] ) ( Layouts.Default_Org props, Just (Main.Layouts.Model.Default existing) ) -> @@ -444,9 +444,10 @@ initLayout model layout = Layout.init defaultLayout () in ( Main.Layouts.Model.Default_Org { default = defaultLayoutModel, org = orgLayoutModel } - , Cmd.batch [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Org orgLayoutEffect) - , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) - ] + , Cmd.batch + [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Org orgLayoutEffect) + , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) + ] ) ( Layouts.Default_Repo props, Just (Main.Layouts.Model.Default existing) ) -> @@ -537,9 +538,10 @@ initLayout model layout = Layout.init defaultLayout () in ( Main.Layouts.Model.Default_Repo { default = defaultLayoutModel, repo = repoLayoutModel } - , Cmd.batch [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Repo repoLayoutEffect) - , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) - ] + , Cmd.batch + [ fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default_Repo repoLayoutEffect) + , fromLayoutEffect model (Effect.map Main.Layouts.Msg.Default defaultLayoutEffect) + ] ) @@ -558,12 +560,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Home_ (Effect.map Main.Pages.Msg.Home_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Home_ >> Page)) |> Maybe.map (initLayout model) @@ -579,12 +581,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Account_Authenticate (Effect.map Main.Pages.Msg.Account_Authenticate >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Account_Authenticate >> Page)) |> Maybe.map (initLayout model) @@ -599,12 +601,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Account_Login (Effect.map Main.Pages.Msg.Account_Login >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Account_Login >> Page)) |> Maybe.map (initLayout model) @@ -619,12 +621,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Account_Logout (Effect.map Main.Pages.Msg.Account_Logout >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Account_Logout >> Page)) |> Maybe.map (initLayout model) @@ -642,12 +644,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Account_Settings (Effect.map Main.Pages.Msg.Account_Settings >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Account_Settings >> Page)) |> Maybe.map (initLayout model) @@ -666,12 +668,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Account_SourceRepos (Effect.map Main.Pages.Msg.Account_SourceRepos >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Account_SourceRepos >> Page)) |> Maybe.map (initLayout model) @@ -738,12 +740,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Org_Org_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Org_Org_ >> Page)) |> Maybe.map (initLayout model) @@ -762,12 +764,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Org_Org__Add params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Add >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Add >> Page)) |> Maybe.map (initLayout model) @@ -786,12 +788,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Org_Org__Name_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Name_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Name_ >> Page)) |> Maybe.map (initLayout model) @@ -810,12 +812,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo_ >> Page)) |> Maybe.map (initLayout model) @@ -834,12 +836,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo__Add params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Add >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Add >> Page)) |> Maybe.map (initLayout model) @@ -858,12 +860,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo__Name_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Name_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Name_ >> Page)) |> Maybe.map (initLayout model) @@ -882,12 +884,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team_ >> Page)) |> Maybe.map (initLayout model) @@ -906,12 +908,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team__Add params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Add >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Add >> Page)) |> Maybe.map (initLayout model) @@ -930,12 +932,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team__Name_ params) (Effect.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Name_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Name_ >> Page)) |> Maybe.map (initLayout model) @@ -954,12 +956,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.Dashboards (Effect.map Main.Pages.Msg.Dashboards >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dashboards >> Page)) |> Maybe.map (initLayout model) @@ -978,12 +980,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Dashboards_Dashboard_ params) (Effect.map Main.Pages.Msg.Dashboards_Dashboard_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Dashboards_Dashboard_ >> Page)) |> Maybe.map (initLayout model) @@ -1002,12 +1004,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org_ params) (Effect.map Main.Pages.Msg.Org_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org_ >> Page)) |> Maybe.map (initLayout model) @@ -1026,12 +1028,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Builds params) (Effect.map Main.Pages.Msg.Org__Builds >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Builds >> Page)) |> Maybe.map (initLayout model) @@ -1050,12 +1052,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo_ params) (Effect.map Main.Pages.Msg.Org__Repo_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo_ >> Page)) |> Maybe.map (initLayout model) @@ -1074,12 +1076,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Deployments params) (Effect.map Main.Pages.Msg.Org__Repo__Deployments >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Deployments >> Page)) |> Maybe.map (initLayout model) @@ -1098,12 +1100,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Deployments_Add params) (Effect.map Main.Pages.Msg.Org__Repo__Deployments_Add >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Deployments_Add >> Page)) |> Maybe.map (initLayout model) @@ -1122,12 +1124,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Hooks params) (Effect.map Main.Pages.Msg.Org__Repo__Hooks >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Hooks >> Page)) |> Maybe.map (initLayout model) @@ -1143,12 +1145,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Pulls params) (Effect.map Main.Pages.Msg.Org__Repo__Pulls >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Pulls >> Page)) |> Maybe.map (initLayout model) @@ -1166,12 +1168,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Schedules params) (Effect.map Main.Pages.Msg.Org__Repo__Schedules >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Schedules >> Page)) |> Maybe.map (initLayout model) @@ -1190,12 +1192,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Schedules_Add params) (Effect.map Main.Pages.Msg.Org__Repo__Schedules_Add >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Schedules_Add >> Page)) |> Maybe.map (initLayout model) @@ -1214,12 +1216,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Schedules_Name_ params) (Effect.map Main.Pages.Msg.Org__Repo__Schedules_Name_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Schedules_Name_ >> Page)) |> Maybe.map (initLayout model) @@ -1238,12 +1240,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Settings params) (Effect.map Main.Pages.Msg.Org__Repo__Settings >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Settings >> Page)) |> Maybe.map (initLayout model) @@ -1259,12 +1261,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Tags params) (Effect.map Main.Pages.Msg.Org__Repo__Tags >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Tags >> Page)) |> Maybe.map (initLayout model) @@ -1282,12 +1284,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Build_ params) (Effect.map Main.Pages.Msg.Org__Repo__Build_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Build_ >> Page)) |> Maybe.map (initLayout model) @@ -1306,12 +1308,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Build__Graph params) (Effect.map Main.Pages.Msg.Org__Repo__Build__Graph >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Build__Graph >> Page)) |> Maybe.map (initLayout model) @@ -1330,12 +1332,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Build__Pipeline params) (Effect.map Main.Pages.Msg.Org__Repo__Build__Pipeline >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Build__Pipeline >> Page)) |> Maybe.map (initLayout model) @@ -1354,12 +1356,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth (Main.Pages.Model.Org__Repo__Build__Services params) (Effect.map Main.Pages.Msg.Org__Repo__Build__Services >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.Org__Repo__Build__Services >> Page)) |> Maybe.map (initLayout model) @@ -1375,12 +1377,12 @@ initPageAndLayout model = ( pageModel, pageEffect ) = Page.init page () in - { page = + { page = Tuple.mapBoth Main.Pages.Model.NotFound_ (Effect.map Main.Pages.Msg.NotFound_ >> fromPageEffect model) ( pageModel, pageEffect ) - , layout = + , layout = Page.layout pageModel page |> Maybe.map (Layouts.map (Main.Pages.Msg.NotFound_ >> Page)) |> Maybe.map (initLayout model) @@ -1419,7 +1421,7 @@ runWhenAuthenticatedWithLayout model toRecord = toRecord user Auth.Action.LoadCustomPage -> - { page = + { page = ( Main.Pages.Model.Loading_ , Cmd.none ) @@ -1427,35 +1429,35 @@ runWhenAuthenticatedWithLayout model toRecord = } Auth.Action.ReplaceRoute options -> - { page = + { page = ( Main.Pages.Model.Redirecting_ , Cmd.batch - [ toCmd (Effect.replaceRoute options) - , Maybe.Extra.unwrap - Cmd.none - (\from -> Interop.setRedirect <| Json.Encode.string from) - (Dict.get "from" options.query) - ] + [ toCmd (Effect.replaceRoute options) + , Maybe.Extra.unwrap + Cmd.none + (\from -> Interop.setRedirect <| Json.Encode.string from) + (Dict.get "from" options.query) + ] ) , layout = Nothing } Auth.Action.PushRoute options -> - { page = + { page = ( Main.Pages.Model.Redirecting_ , Cmd.batch - [ toCmd (Effect.pushRoute options) - , Maybe.Extra.unwrap - Cmd.none - (\from -> Interop.setRedirect <| Json.Encode.string from) - (Dict.get "from" options.query) - ] + [ toCmd (Effect.pushRoute options) + , Maybe.Extra.unwrap + Cmd.none + (\from -> Interop.setRedirect <| Json.Encode.string from) + (Dict.get "from" options.query) + ] ) , layout = Nothing } Auth.Action.LoadExternalUrl externalUrl -> - { page = + { page = ( Main.Pages.Model.Redirecting_ , Browser.Navigation.load externalUrl ) @@ -1502,15 +1504,16 @@ update msg model = in ( newModel , Cmd.batch - [ toPageUrlHookCmd newModel - { from = Route.fromUrl () model.url - , to = Route.fromUrl () newModel.url - } - , toLayoutUrlHookCmd model newModel - { from = Route.fromUrl () model.url - , to = Route.fromUrl () newModel.url - } - ] + [ toPageUrlHookCmd newModel + { from = Route.fromUrl () model.url + , to = Route.fromUrl () newModel.url + } + , toLayoutUrlHookCmd model + newModel + { from = Route.fromUrl () model.url + , to = Route.fromUrl () newModel.url + } + ] ) else @@ -1534,13 +1537,14 @@ update msg model = in ( newModel , Cmd.batch - [ pageCmd - , layoutCmd - , toLayoutUrlHookCmd model newModel - { from = Route.fromUrl () model.url - , to = Route.fromUrl () newModel.url - } - ] + [ pageCmd + , layoutCmd + , toLayoutUrlHookCmd model + newModel + { from = Route.fromUrl () model.url + , to = Route.fromUrl () newModel.url + } + ] ) Page pageMsg -> @@ -1571,7 +1575,7 @@ update msg model = , Auth.onPageLoad sharedModel (Route.fromUrl () model.url) ) in - if isAuthProtected (Route.fromUrl () model.url).path && (hasActionTypeChanged oldAction newAction) then + if isAuthProtected (Route.fromUrl () model.url).path && hasActionTypeChanged oldAction newAction then let { layout, page } = initPageAndLayout { key = model.key, shared = sharedModel, url = model.url, layout = model.layout } @@ -1586,10 +1590,10 @@ update msg model = in ( { model | shared = sharedModel, page = pageModel, layout = layoutModel } , Cmd.batch - [ pageCmd - , layoutCmd - , fromSharedEffect { model | shared = sharedModel } sharedEffect - ] + [ pageCmd + , layoutCmd + , fromSharedEffect { model | shared = sharedModel } sharedEffect + ] ) else @@ -1600,8 +1604,8 @@ update msg model = Batch messages -> ( model , messages - |> List.map (Task.succeed >> Task.perform identity) - |> Cmd.batch + |> List.map (Task.succeed >> Task.perform identity) + |> Cmd.batch ) @@ -2292,7 +2296,7 @@ hasActionTypeChanged oldAction newAction = ( Auth.Action.LoadExternalUrl _, Auth.Action.LoadExternalUrl _ ) -> False - ( _, _ ) -> + ( _, _ ) -> True @@ -2647,11 +2651,11 @@ subscriptions model = in Sub.batch [ Layout.subscriptions (Layouts.Default.layout defaultProps model.shared route) layoutModel.default - |> Sub.map Main.Layouts.Msg.Default - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default + |> Sub.map Layout , Layout.subscriptions (Layouts.Default.Build.layout props model.shared route) layoutModel.build - |> Sub.map Main.Layouts.Msg.Default_Build - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default_Build + |> Sub.map Layout ] ( Just (Layouts.Default_Org props), Just (Main.Layouts.Model.Default_Org layoutModel) ) -> @@ -2662,11 +2666,11 @@ subscriptions model = in Sub.batch [ Layout.subscriptions (Layouts.Default.layout defaultProps model.shared route) layoutModel.default - |> Sub.map Main.Layouts.Msg.Default - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default + |> Sub.map Layout , Layout.subscriptions (Layouts.Default.Org.layout props model.shared route) layoutModel.org - |> Sub.map Main.Layouts.Msg.Default_Org - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default_Org + |> Sub.map Layout ] ( Just (Layouts.Default_Repo props), Just (Main.Layouts.Model.Default_Repo layoutModel) ) -> @@ -2677,11 +2681,11 @@ subscriptions model = in Sub.batch [ Layout.subscriptions (Layouts.Default.layout defaultProps model.shared route) layoutModel.default - |> Sub.map Main.Layouts.Msg.Default - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default + |> Sub.map Layout , Layout.subscriptions (Layouts.Default.Repo.layout props model.shared route) layoutModel.repo - |> Sub.map Main.Layouts.Msg.Default_Repo - |> Sub.map Layout + |> Sub.map Main.Layouts.Msg.Default_Repo + |> Sub.map Layout ] _ -> @@ -2689,7 +2693,7 @@ subscriptions model = in Sub.batch [ Shared.subscriptions route model.shared - |> Sub.map Shared + |> Sub.map Shared , subscriptionsFromPage , subscriptionsFromLayout ] @@ -2758,7 +2762,7 @@ toView model = (Layouts.Default.layout defaultProps model.shared route) { model = layoutModel.default , toContentMsg = Main.Layouts.Msg.Default >> Layout - , content = + , content = Layout.view (Layouts.Default.Build.layout props model.shared route) { model = layoutModel.build @@ -2777,7 +2781,7 @@ toView model = (Layouts.Default.layout defaultProps model.shared route) { model = layoutModel.default , toContentMsg = Main.Layouts.Msg.Default >> Layout - , content = + , content = Layout.view (Layouts.Default.Org.layout props model.shared route) { model = layoutModel.org @@ -2796,7 +2800,7 @@ toView model = (Layouts.Default.layout defaultProps model.shared route) { model = layoutModel.default , toContentMsg = Main.Layouts.Msg.Default >> Layout - , content = + , content = Layout.view (Layouts.Default.Repo.layout props model.shared route) { model = layoutModel.repo @@ -3179,7 +3183,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Home_ pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Home_.page user model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Home_.page user model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Home_ |> List.map Page |> toCommands @@ -3187,19 +3191,19 @@ toPageUrlHookCmd model routes = (Auth.onPageLoad model.shared (Route.fromUrl () model.url)) Main.Pages.Model.Account_Authenticate pageModel -> - Page.toUrlMessages routes (Pages.Account.Authenticate.page model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Account.Authenticate.page model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Account_Authenticate |> List.map Page |> toCommands Main.Pages.Model.Account_Login pageModel -> - Page.toUrlMessages routes (Pages.Account.Login.page model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Account.Login.page model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Account_Login |> List.map Page |> toCommands Main.Pages.Model.Account_Logout pageModel -> - Page.toUrlMessages routes (Pages.Account.Logout.page model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Account.Logout.page model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Account_Logout |> List.map Page |> toCommands @@ -3207,7 +3211,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Account_Settings pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Account.Settings.page user model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Account.Settings.page user model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Account_Settings |> List.map Page |> toCommands @@ -3217,7 +3221,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Account_SourceRepos pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Account.SourceRepos.page user model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Account.SourceRepos.page user model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Account_SourceRepos |> List.map Page |> toCommands @@ -3247,7 +3251,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Org_Org_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org_ |> List.map Page |> toCommands @@ -3257,7 +3261,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Org_Org__Add params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.Add.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.Add.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Add |> List.map Page |> toCommands @@ -3267,7 +3271,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Org_Org__Name_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.Name_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Org.Org_.Name_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Org_Org__Name_ |> List.map Page |> toCommands @@ -3277,7 +3281,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo_ |> List.map Page |> toCommands @@ -3287,7 +3291,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo__Add params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.Add.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.Add.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Add |> List.map Page |> toCommands @@ -3297,7 +3301,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Repo_Org__Repo__Name_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.Name_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Repo.Org_.Repo_.Name_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Repo_Org__Repo__Name_ |> List.map Page |> toCommands @@ -3307,7 +3311,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team_ |> List.map Page |> toCommands @@ -3317,7 +3321,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team__Add params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Add.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Add.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Add |> List.map Page |> toCommands @@ -3327,7 +3331,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dash_Secrets_Engine__Shared_Org__Team__Name_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Name_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Name_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dash_Secrets_Engine__Shared_Org__Team__Name_ |> List.map Page |> toCommands @@ -3337,7 +3341,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dashboards pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dashboards.page user model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.Dashboards.page user model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.Dashboards |> List.map Page |> toCommands @@ -3347,7 +3351,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Dashboards_Dashboard_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Dashboards.Dashboard_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Dashboards.Dashboard_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Dashboards_Dashboard_ |> List.map Page |> toCommands @@ -3357,7 +3361,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org_ |> List.map Page |> toCommands @@ -3367,7 +3371,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Builds params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Builds.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Builds.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Builds |> List.map Page |> toCommands @@ -3377,7 +3381,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo_ |> List.map Page |> toCommands @@ -3387,7 +3391,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Deployments params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Deployments.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Deployments.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Deployments |> List.map Page |> toCommands @@ -3397,7 +3401,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Deployments_Add params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Deployments.Add.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Deployments.Add.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Deployments_Add |> List.map Page |> toCommands @@ -3407,7 +3411,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Hooks params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Hooks.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Hooks.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Hooks |> List.map Page |> toCommands @@ -3415,7 +3419,7 @@ toPageUrlHookCmd model routes = (Auth.onPageLoad model.shared (Route.fromUrl () model.url)) Main.Pages.Model.Org__Repo__Pulls params pageModel -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Pulls.page model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Pulls.page model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Pulls |> List.map Page |> toCommands @@ -3423,7 +3427,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Schedules params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Schedules |> List.map Page |> toCommands @@ -3433,7 +3437,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Schedules_Add params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.Add.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.Add.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Schedules_Add |> List.map Page |> toCommands @@ -3443,7 +3447,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Schedules_Name_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.Name_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Schedules.Name_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Schedules_Name_ |> List.map Page |> toCommands @@ -3453,7 +3457,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Settings params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Settings.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Settings.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Settings |> List.map Page |> toCommands @@ -3461,7 +3465,7 @@ toPageUrlHookCmd model routes = (Auth.onPageLoad model.shared (Route.fromUrl () model.url)) Main.Pages.Model.Org__Repo__Tags params pageModel -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Tags.page model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Tags.page model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Tags |> List.map Page |> toCommands @@ -3469,7 +3473,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Build_ params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Build_ |> List.map Page |> toCommands @@ -3479,7 +3483,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Build__Graph params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Graph.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Graph.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Build__Graph |> List.map Page |> toCommands @@ -3489,7 +3493,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Build__Pipeline params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Pipeline.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Pipeline.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Build__Pipeline |> List.map Page |> toCommands @@ -3499,7 +3503,7 @@ toPageUrlHookCmd model routes = Main.Pages.Model.Org__Repo__Build__Services params pageModel -> Auth.Action.command (\user -> - Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Services.page user model.shared (Route.fromUrl params model.url)) + Page.toUrlMessages routes (Pages.Org_.Repo_.Build_.Services.page user model.shared (Route.fromUrl params model.url)) |> List.map Main.Pages.Msg.Org__Repo__Build__Services |> List.map Page |> toCommands @@ -3507,7 +3511,7 @@ toPageUrlHookCmd model routes = (Auth.onPageLoad model.shared (Route.fromUrl () model.url)) Main.Pages.Model.NotFound_ pageModel -> - Page.toUrlMessages routes (Pages.NotFound_.page model.shared (Route.fromUrl () model.url)) + Page.toUrlMessages routes (Pages.NotFound_.page model.shared (Route.fromUrl () model.url)) |> List.map Main.Pages.Msg.NotFound_ |> List.map Page |> toCommands @@ -3572,13 +3576,13 @@ toLayoutUrlHookCmd oldModel model routes = in Cmd.batch [ Layout.toUrlMessages routes (Layouts.Default.layout defaultProps model.shared route) - |> List.map Main.Layouts.Msg.Default - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default + |> List.map Layout + |> toCommands , Layout.toUrlMessages routes (Layouts.Default.Build.layout props model.shared route) - |> List.map Main.Layouts.Msg.Default_Build - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default_Build + |> List.map Layout + |> toCommands ] ( Just (Layouts.Default_Org props), Just (Main.Layouts.Model.Default_Org layoutModel) ) -> @@ -3589,13 +3593,13 @@ toLayoutUrlHookCmd oldModel model routes = in Cmd.batch [ Layout.toUrlMessages routes (Layouts.Default.layout defaultProps model.shared route) - |> List.map Main.Layouts.Msg.Default - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default + |> List.map Layout + |> toCommands , Layout.toUrlMessages routes (Layouts.Default.Org.layout props model.shared route) - |> List.map Main.Layouts.Msg.Default_Org - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default_Org + |> List.map Layout + |> toCommands ] ( Just (Layouts.Default_Repo props), Just (Main.Layouts.Model.Default_Repo layoutModel) ) -> @@ -3606,13 +3610,13 @@ toLayoutUrlHookCmd oldModel model routes = in Cmd.batch [ Layout.toUrlMessages routes (Layouts.Default.layout defaultProps model.shared route) - |> List.map Main.Layouts.Msg.Default - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default + |> List.map Layout + |> toCommands , Layout.toUrlMessages routes (Layouts.Default.Repo.layout props model.shared route) - |> List.map Main.Layouts.Msg.Default_Repo - |> List.map Layout - |> toCommands + |> List.map Main.Layouts.Msg.Default_Repo + |> List.map Layout + |> toCommands ] _ -> diff --git a/src/elm/Main/Pages/Model.elm b/src/elm/Main/Pages/Model.elm index 011ae8081..c9d771308 100644 --- a/src/elm/Main/Pages/Model.elm +++ b/src/elm/Main/Pages/Model.elm @@ -5,7 +5,6 @@ SPDX-License-Identifier: Apache-2.0 module Main.Pages.Model exposing (Model(..)) -import Pages.Home_ import Pages.Account.Authenticate import Pages.Account.Login import Pages.Account.Logout @@ -24,9 +23,15 @@ import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Add import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Name_ import Pages.Dashboards import Pages.Dashboards.Dashboard_ +import Pages.Home_ +import Pages.NotFound_ import Pages.Org_ import Pages.Org_.Builds import Pages.Org_.Repo_ +import Pages.Org_.Repo_.Build_ +import Pages.Org_.Repo_.Build_.Graph +import Pages.Org_.Repo_.Build_.Pipeline +import Pages.Org_.Repo_.Build_.Services import Pages.Org_.Repo_.Deployments import Pages.Org_.Repo_.Deployments.Add import Pages.Org_.Repo_.Hooks @@ -36,11 +41,6 @@ import Pages.Org_.Repo_.Schedules.Add import Pages.Org_.Repo_.Schedules.Name_ import Pages.Org_.Repo_.Settings import Pages.Org_.Repo_.Tags -import Pages.Org_.Repo_.Build_ -import Pages.Org_.Repo_.Build_.Graph -import Pages.Org_.Repo_.Build_.Pipeline -import Pages.Org_.Repo_.Build_.Services -import Pages.NotFound_ import View exposing (View) diff --git a/src/elm/Main/Pages/Msg.elm b/src/elm/Main/Pages/Msg.elm index 9dae985a8..84e1f3f5c 100644 --- a/src/elm/Main/Pages/Msg.elm +++ b/src/elm/Main/Pages/Msg.elm @@ -5,7 +5,6 @@ SPDX-License-Identifier: Apache-2.0 module Main.Pages.Msg exposing (Msg(..)) -import Pages.Home_ import Pages.Account.Authenticate import Pages.Account.Login import Pages.Account.Logout @@ -24,9 +23,15 @@ import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Add import Pages.Dash.Secrets.Engine_.Shared.Org_.Team_.Name_ import Pages.Dashboards import Pages.Dashboards.Dashboard_ +import Pages.Home_ +import Pages.NotFound_ import Pages.Org_ import Pages.Org_.Builds import Pages.Org_.Repo_ +import Pages.Org_.Repo_.Build_ +import Pages.Org_.Repo_.Build_.Graph +import Pages.Org_.Repo_.Build_.Pipeline +import Pages.Org_.Repo_.Build_.Services import Pages.Org_.Repo_.Deployments import Pages.Org_.Repo_.Deployments.Add import Pages.Org_.Repo_.Hooks @@ -36,11 +41,6 @@ import Pages.Org_.Repo_.Schedules.Add import Pages.Org_.Repo_.Schedules.Name_ import Pages.Org_.Repo_.Settings import Pages.Org_.Repo_.Tags -import Pages.Org_.Repo_.Build_ -import Pages.Org_.Repo_.Build_.Graph -import Pages.Org_.Repo_.Build_.Pipeline -import Pages.Org_.Repo_.Build_.Services -import Pages.NotFound_ type Msg diff --git a/src/elm/Pages/Dashboards/Dashboard_.elm b/src/elm/Pages/Dashboards/Dashboard_.elm index 4782c5c13..4ee5a03d4 100644 --- a/src/elm/Pages/Dashboards/Dashboard_.elm +++ b/src/elm/Pages/Dashboards/Dashboard_.elm @@ -13,10 +13,12 @@ import Components.Nav import Effect exposing (Effect) import Html exposing - ( div + ( br + , code + , div , h1 , main_ - , code + , p , span , text ) @@ -38,8 +40,6 @@ import Utils.Helpers as Util import Utils.Interval as Interval import Vela import View exposing (View) -import Html exposing (p) -import Html exposing (br) {-| page : takes user, shared model, route, and returns the dashboard page. @@ -224,7 +224,7 @@ view shared route model = [] [ text "This dashboard doesn't have repositories added yet. Add some with the CLI:" , br [] [] - , code [ class "shell" ] + , code [ class "shell" ] [ text ("vela update dashboard --id " ++ route.params.dashboard ++ " --add-repos org/repo") ] ] ] diff --git a/src/elm/Route.elm b/src/elm/Route.elm index aaa807a92..9468bbafb 100644 --- a/src/elm/Route.elm +++ b/src/elm/Route.elm @@ -44,6 +44,6 @@ toString route = [ Route.Path.toString route.path , Route.Query.toString route.query , route.hash - |> Maybe.map (String.append "#") - |> Maybe.withDefault "" + |> Maybe.map (String.append "#") + |> Maybe.withDefault "" ] diff --git a/src/elm/Route/Query.elm b/src/elm/Route/Query.elm index d7ecd4991..0cfabb738 100644 --- a/src/elm/Route/Query.elm +++ b/src/elm/Route/Query.elm @@ -7,8 +7,8 @@ module Route.Query exposing (fromUrl, toString) import Dict exposing (Dict) import Url exposing (Url) -import Url.Parser exposing (query) import Url.Builder exposing (QueryParameter) +import Url.Parser exposing (query) fromUrl : Url -> Dict String String @@ -28,7 +28,7 @@ fromUrl url = |> Dict.fromList -queryPiecesToTuple : List String -> Maybe (String, String) +queryPiecesToTuple : List String -> Maybe ( String, String ) queryPiecesToTuple pieces = case pieces of [] -> @@ -55,6 +55,6 @@ toString queryParameterList = |> Url.Builder.toQuery -tupleToQueryPiece : (String, String) -> QueryParameter +tupleToQueryPiece : ( String, String ) -> QueryParameter tupleToQueryPiece ( key, value ) = Url.Builder.string key value diff --git a/src/scss/_main.scss b/src/scss/_main.scss index e865af718..81f6e4218 100644 --- a/src/scss/_main.scss +++ b/src/scss/_main.scss @@ -1752,14 +1752,14 @@ code.shell { display: inline-block; margin: 1rem 0; padding: 0.75rem 1rem 0.75rem 2rem; - + background-color: var(--color-bg-dark); &::before { position: absolute; top: 50%; left: 0.8rem; - + display: block; color: var(--color-green); diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 6406d867b..6f4e130a6 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -12,7 +12,7 @@ --color-lavender-light: hsl(286, 29%, 65%); // good for text on coal // grays - --color-coal-darkest: hsl(0, 0%, 10%); + --color-coal-darkest: hsl(0, 0%, 10%); --color-coal-dark: hsl(0, 0%, 12%); --color-coal: hsl(0, 0%, 16%); // main dark bg --color-coal-light: hsl(0, 0%, 34%);