TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-25 16:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path to docspell assets

Browse Source
This commit is contained in:
Eike Kettner 2019-09-21 22:14:02 +02:00
parent 9a6f3eb786
commit 4562786206
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
View File

@ -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]

6
modules/webapp/src/main/elm/App/View.elm
View File

@ -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"
]

1
modules/webapp/src/main/elm/Data/Flags.elm
View File

@ -6,6 +6,7 @@ type alias Config =
{ appName: String
, baseUrl: String
, signupMode: String
, docspellAssetPath: String
}
type alias Flags =

7
modules/webapp/src/main/elm/Page/Login/View.elm
View File

@ -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"

2
modules/webapp/src/main/elm/Page/NewInvite/View.elm
View File

@ -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"

2
modules/webapp/src/main/elm/Page/Register/View.elm
View File

@ -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"
]