deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

make base asset URL config more type safe

pull/9777/head
Thibault Duplessis 2021-09-11 09:30:47 +02:00
parent bfaea49be6
commit 2cd20d46f3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/base/layout.scala
View File

@ -182,7 +182,7 @@ object layout {
val dataSoundSet = attr("data-sound-set")
val dataTheme = attr("data-theme")
val dataPieceSet = attr("data-piece-set")
val dataAssetUrl = attr("data-asset-url") := netConfig.assetBaseUrl
val dataAssetUrl = attr("data-asset-url") := netConfig.assetBaseUrl.value
val dataAssetVersion = attr("data-asset-version")
val dataDev = attr("data-dev") := (!netConfig.minifiedAssets).option("true")

10
modules/common/src/main/config.scala
View File

@ -27,16 +27,17 @@ object config {
case class MaxPerSecond(value: Int) extends AnyVal with IntValue
case class NetDomain(value: String) extends AnyVal with StringValue
case class AssetDomain(value: String) extends AnyVal with StringValue
case class RateLimit(value: Boolean) extends AnyVal
case class NetDomain(value: String) extends AnyVal with StringValue
case class AssetDomain(value: String) extends AnyVal with StringValue
case class AssetBaseUrl(value: String) extends AnyVal with StringValue
case class RateLimit(value: Boolean) extends AnyVal
case class NetConfig(
domain: NetDomain,
prodDomain: NetDomain,
@ConfigName("base_url") baseUrl: BaseUrl,
@ConfigName("asset.domain") assetDomain: AssetDomain,
@ConfigName("asset.base_url") assetBaseUrl: String,
@ConfigName("asset.base_url") assetBaseUrl: AssetBaseUrl,
@ConfigName("asset.minified") minifiedAssets: Boolean,
@ConfigName("stage.banner") stageBanner: Boolean,
@ConfigName("socket.domains") socketDomains: List[String],
@ -56,6 +57,7 @@ object config {
implicit val emailAddressLoader = strLoader(EmailAddress.apply)
implicit val netDomainLoader = strLoader(NetDomain.apply)
implicit val assetDomainLoader = strLoader(AssetDomain.apply)
implicit val assetBaseUrlLoader = strLoader(AssetBaseUrl.apply)
implicit val rateLimitLoader = boolLoader(RateLimit.apply)
implicit val netLoader = AutoConfig.loader[NetConfig]