From 4562786206589257a913246da77aea6244852a0a Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 21 Sep 2019 22:14:02 +0200 Subject: [PATCH] Fix path to docspell assets --- .../main/scala/docspell/restserver/webapp/Flags.scala | 9 ++++++--- modules/webapp/src/main/elm/App/View.elm | 6 +++--- modules/webapp/src/main/elm/Data/Flags.elm | 1 + modules/webapp/src/main/elm/Page/Login/View.elm | 7 ++++--- modules/webapp/src/main/elm/Page/NewInvite/View.elm | 2 +- modules/webapp/src/main/elm/Page/Register/View.elm | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala index 18cb7b70..f67cb6b3 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala @@ -3,16 +3,19 @@ package docspell.restserver.webapp import _root_.io.circe._ import _root_.io.circe.generic.semiauto._ import docspell.common.LenientUri -import docspell.restserver.Config +import docspell.restserver.{BuildInfo, Config} import docspell.backend.signup.{Config => SignupConfig} import yamusca.imports._ import yamusca.implicits._ -case class Flags(appName: String, baseUrl: LenientUri, signupMode: SignupConfig.Mode) +case class Flags( appName: String + , baseUrl: LenientUri + , signupMode: SignupConfig.Mode + , docspellAssetPath: String) object Flags { def apply(cfg: Config): Flags = - Flags(cfg.appName, cfg.baseUrl, cfg.backend.signup.mode) + Flags(cfg.appName, cfg.baseUrl, cfg.backend.signup.mode, s"assets/docspell-webapp/${BuildInfo.version}") implicit val jsonEncoder: Encoder[Flags] = deriveEncoder[Flags] diff --git a/modules/webapp/src/main/elm/App/View.elm b/modules/webapp/src/main/elm/App/View.elm index 4c3136d6..71d4173a 100644 --- a/modules/webapp/src/main/elm/App/View.elm +++ b/modules/webapp/src/main/elm/App/View.elm @@ -60,7 +60,7 @@ defaultLayout model = ,Page.href HomePage ] [img [class "image" - ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][] + ,src (model.flags.config.docspellAssetPath ++ "/img/logo-96.png")][] ,div [class "content"] [text model.flags.config.appName ] @@ -123,7 +123,7 @@ viewManageData model = viewLogin: Model -> Html Msg viewLogin model = - Html.map LoginMsg (Page.Login.View.view model.loginModel) + Html.map LoginMsg (Page.Login.View.view model.flags model.loginModel) viewHome: Model -> Html Msg viewHome model = @@ -153,7 +153,7 @@ loginInfo model = ] [menuEntry model HomePage [img [class "image icon" - ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-mc-96.png" + ,src (model.flags.config.docspellAssetPath ++ "/img/logo-mc-96.png") ][] ,text "Items" ] diff --git a/modules/webapp/src/main/elm/Data/Flags.elm b/modules/webapp/src/main/elm/Data/Flags.elm index 01bdc9da..659d9284 100644 --- a/modules/webapp/src/main/elm/Data/Flags.elm +++ b/modules/webapp/src/main/elm/Data/Flags.elm @@ -6,6 +6,7 @@ type alias Config = { appName: String , baseUrl: String , signupMode: String + , docspellAssetPath: String } type alias Flags = diff --git a/modules/webapp/src/main/elm/Page/Login/View.elm b/modules/webapp/src/main/elm/Page/Login/View.elm index 0f4117dd..effba219 100644 --- a/modules/webapp/src/main/elm/Page/Login/View.elm +++ b/modules/webapp/src/main/elm/Page/Login/View.elm @@ -5,16 +5,17 @@ import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput, onSubmit) import Page exposing (Page(..)) import Page.Login.Data exposing (..) +import Data.Flags exposing (Flags) -view: Model -> Html Msg -view model = +view: Flags -> Model -> Html Msg +view flags model = div [class "login-page"] [div [class "ui centered grid"] [div [class "row"] [div [class "six wide column ui segment login-view"] [h1 [class "ui center aligned icon header"] [img [class "ui image" - ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png" + ,src (flags.config.docspellAssetPath ++ "/img/logo-96.png") ][] ,div [class "content"] [text "Sign in to Docspell" diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View.elm b/modules/webapp/src/main/elm/Page/NewInvite/View.elm index c868e405..2c2cc750 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/View.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/View.elm @@ -16,7 +16,7 @@ view flags model = [div [class "eight wide column ui segment newinvite-view"] [h1 [class "ui cener aligned icon header"] [img [class "ui image" - ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png" + ,src (flags.config.docspellAssetPath ++ "/img/logo-96.png") ][] ,div [class "content"] [text "Create new invitations" diff --git a/modules/webapp/src/main/elm/Page/Register/View.elm b/modules/webapp/src/main/elm/Page/Register/View.elm index f6894fd2..8300cabd 100644 --- a/modules/webapp/src/main/elm/Page/Register/View.elm +++ b/modules/webapp/src/main/elm/Page/Register/View.elm @@ -15,7 +15,7 @@ view flags model = [div [class "six wide column ui segment register-view"] [h1 [class "ui cener aligned icon header"] [img [class "ui image" - ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][] + ,src (flags.config.docspellAssetPath ++ "/img/logo-96.png")][] ,div [class "content"] [text "Sign up @ Docspell" ]