Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update acceptance #72

Merged
merged 15 commits into from
Oct 4, 2023
Merged

Update acceptance #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
66f4a2c
Update sbt to 1.9.2 (#60)
lunatech-ops Jul 13, 2023
95bdecb
Update sbt to 1.9.3 (#61)
lunatech-ops Jul 24, 2023
f75b4f2
Update scala.yml
wjglerum Jul 25, 2023
829a8f2
Create dependabot.yml
wjglerum Jul 25, 2023
74d63d3
Bump actions/checkout from 2 to 3 (#63)
dependabot[bot] Jul 25, 2023
d3bbbff
Bump actions/setup-java from 2 to 3 (#62)
dependabot[bot] Jul 25, 2023
b285412
Update asciidoctorj to 2.5.10 (#53)
lunatech-ops Jul 25, 2023
f9620ff
Update sbt to 1.9.4 (#64)
lunatech-ops Aug 25, 2023
7d3f209
Bump actions/checkout from 3 to 4 (#65)
dependabot[bot] Sep 5, 2023
2bb8a15
Update scala-library to 2.13.12 (#66)
lunatech-ops Sep 12, 2023
c19d570
Update sbt to 1.9.5 (#67)
lunatech-ops Sep 14, 2023
a5aa772
Update play-json to 2.10.0 (#68)
lunatech-ops Sep 15, 2023
9f01430
Update sbt to 1.9.6 (#69)
lunatech-ops Sep 18, 2023
6d25ad5
Update play-json to 2.10.1 (#70)
lunatech-ops Sep 19, 2023
4d171aa
Reduce images size (#71)
AurelienRichez Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: "08:00"
timezone: "Europe/Amsterdam"
8 changes: 4 additions & 4 deletions .github/workflows/scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: Scala CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/utils/components/_slider.scss
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ version := "1.0-SNAPSHOT"

lazy val root = (project in file(".")).enablePlugins(PlayScala)

scalaVersion := "2.13.11"
scalaVersion := "2.13.12"

libraryDependencies ++= Seq(
guice, ws, ehcache,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
"org.asciidoctor" % "asciidoctorj" % "2.5.9",
"org.asciidoctor" % "asciidoctorj" % "2.5.10",
"com.47deg" %% "github4s" % "0.21.0",
"com.typesafe.play" %% "play-json" % "2.9.4",
"com.typesafe.play" %% "play-json" % "2.10.1",
)

Global / onChangedBuildSource := ReloadOnSourceChanges
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.6
Binary file removed public/images/char1.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char1.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char2.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char2.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char3.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char3.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char4.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char4.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char5.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char5.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char6.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char6.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char7.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char7.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/char8.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/char8.webp
View file
Open in desktop
Binary file not shown.