Skip to content

Commit

Permalink
Merge branch 'main' into update/github4s-0.32.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lunatech-ops committed Oct 6, 2023
2 parents eb4c37d + 5483e02 commit 20aaf99
Show file tree
Hide file tree
Showing 22 changed files with 48 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ jobs:
java-version: '11'
distribution: 'adopt'
- name: Run tests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: sbt test
3 changes: 1 addition & 2 deletions app/assets/stylesheets/utils/components/_slider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
}
}
&__picture {
height: 95%;
width: auto;
max-height: 95%;
transition: transform 1s;
&:hover {
transform: translateZ(20px);
Expand Down
32 changes: 16 additions & 16 deletions app/views/main.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ <h1 class="cover__title">Lunatech’s<br />engineer blog</h1>

<div class="slider">
<div class="slider__group">
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char1.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char2.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char3.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char4.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char1.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char2.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char3.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char4.webp")"></div>

<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char1.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char2.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char3.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char4.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char1.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char2.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char3.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char4.webp")"></div>
</div>

<div class="slider__group">
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char5.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char6.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char7.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char8.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char5.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char6.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char7.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char8.webp")"></div>

<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char5.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char6.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char7.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char8.png")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char5.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char6.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char7.webp")"></div>
<div class="slider__person"><img class="slider__picture" src="@routes.Assets.versioned("images/char8.webp")"></div>
</div>
</div>

Expand Down
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ libraryDependencies ++= Seq(
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
"org.asciidoctor" % "asciidoctorj" % "2.5.10",
"com.47deg" %% "github4s" % "0.21.0",
"com.typesafe.play" %% "play-json" % "2.10.1",
)

Global / onChangedBuildSource := ReloadOnSourceChanges
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC3")
addSbtPlugin("io.github.irundaia" % "sbt-sassify" % "1.5.2")
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
Binary file removed public/images/char1.png
Binary file not shown.
Binary file added public/images/char1.webp
Binary file not shown.
Binary file removed public/images/char2.png
Binary file not shown.
Binary file added public/images/char2.webp
Binary file not shown.
Binary file removed public/images/char3.png
Binary file not shown.
Binary file added public/images/char3.webp
Binary file not shown.
Binary file removed public/images/char4.png
Binary file not shown.
Binary file added public/images/char4.webp
Binary file not shown.
Binary file removed public/images/char5.png
Binary file not shown.
Binary file added public/images/char5.webp
Binary file not shown.
Binary file removed public/images/char6.png
Binary file not shown.
Binary file added public/images/char6.webp
Binary file not shown.
Binary file removed public/images/char7.png
Binary file not shown.
Binary file added public/images/char7.webp
Binary file not shown.
Binary file removed public/images/char8.png
Binary file not shown.
Binary file added public/images/char8.webp
Binary file not shown.
28 changes: 28 additions & 0 deletions test/integration/SmokeTest.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

import org.scalatestplus.play.PlaySpec
import org.scalatestplus.play.guice.GuiceOneServerPerSuite
import play.api.libs.ws.WSClient
import org.scalatest._
import org.scalatestplus.play._

import play.api.test._
import play.api.test.Helpers.{GET => GET_REQUEST, _}
import play.api.Application
import play.api.inject.guice.GuiceApplicationBuilder

class SmokeTest extends PlaySpec with GuiceOneServerPerSuite {

override def fakeApplication(): Application = {
GuiceApplicationBuilder()
.configure(
"accessToken" -> sys.env.get("GITHUB_TOKEN").getOrElse("dummy")
)
.build()
}

"should return some page" in {
val wsClient = app.injector.instanceOf[WSClient]
val response = await(wsClient.url(s"http://localhost:$port/").withVirtualHost("blog.lunatech.com").get())
response.status mustBe OK
}
}

0 comments on commit 20aaf99

Please sign in to comment.