Skip to content
This repository was archived by the owner on Nov 18, 2025. It is now read-only.

Commit 0d7b97e

Browse files
Refresh project (#182)
1 parent 135ba68 commit 0d7b97e

File tree

146 files changed

+3629
-3787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+3629
-3787
lines changed

.github/workflows/testing.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: 'Testing'
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
gradle-test:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: '21'
24+
- uses: actions/cache@v4
25+
with:
26+
path: |
27+
~/.gradle/caches
28+
~/.gradle/wrapper
29+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
30+
restore-keys: |
31+
${{ runner.os }}-gradle-
32+
33+
- name: Run tests
34+
run: ./gradlew test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ jte-classes/
77
logs/
88

99
### Files ###
10+
.envrc

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
# Bookshelf
44

5-
![Java Version](https://img.shields.io/badge/Temurin-17-green?style=flat-square&logo=eclipse-adoptium)
6-
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.0.20-green?style=flat-square&logo=kotlin)
5+
![Java Version](https://img.shields.io/badge/Temurin-20-green?style=flat-square&logo=eclipse-adoptium)
6+
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.0-green?style=flat-square&logo=kotlin)
77
![Status](https://img.shields.io/badge/Status-Beta-yellowgreen?style=flat-square)
88

9-
[![Gradle](https://img.shields.io/badge/Gradle-8.10-informational?style=flat-square&logo=gradle)](https://github.com/gradle/gradle)
10-
[![Ktlint](https://img.shields.io/badge/Ktlint-1.3.1-informational?style=flat-square)](https://github.com/pinterest/ktlint)
11-
[![Javalin](https://img.shields.io/badge/Javalin-6.3.0-informational?style=flat-square)](https://github.com/javalin/javalin)
12-
[![Bulma](https://img.shields.io/badge/Bulma-1.0.1-informational?style=flat-square)](https://github.com/jgthms/bulma)
9+
[![Gradle](https://img.shields.io/badge/Gradle-9.0-informational?style=flat-square&logo=gradle)](https://github.com/gradle/gradle)
10+
[![Ktlint](https://img.shields.io/badge/Spotless-7.2-informational?style=flat-square)](https://github.com/diffplug/spotless)
11+
[![Javalin](https://img.shields.io/badge/Javalin-6.7-informational?style=flat-square)](https://github.com/javalin/javalin)
12+
[![Bulma](https://img.shields.io/badge/Bulma-1.0-informational?style=flat-square)](https://github.com/jgthms/bulma)
1313

1414
[![Github - Version](https://img.shields.io/github/v/tag/Buried-In-Code/Bookshelf?logo=Github&label=Version&style=flat-square)](https://github.com/Buried-In-Code/Bookshelf/tags)
1515
[![Github - License](https://img.shields.io/github/license/Buried-In-Code/Bookshelf?logo=Github&label=License&style=flat-square)](https://opensource.org/licenses/MIT)
@@ -24,7 +24,7 @@ Tool for tracking books on your bookshelf or books you wish were on it.
2424
1. Make sure you have a supported version of [Java](https://adoptium.net/temurin/releases/) installed: `java --version`
2525
2. Clone the repo: `git clone https://github.com/Buried-In-Code/Bookshelf`
2626
3. Build using: `./gradlew build`
27-
4. Run using: `java -jar ./app/build/libs/app-0.4.1-all.jar`
27+
4. Run using: `java -jar ./app/build/libs/app-0.5.0-all.jar`
2828

2929
### via Gradle
3030

app/build.gradle.kts

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
plugins {
2-
application
3-
alias(libs.plugins.jte)
4-
alias(libs.plugins.shadow)
2+
application
3+
alias(libs.plugins.jte)
4+
alias(libs.plugins.shadow)
55
}
66

77
dependencies {
8-
implementation(project(":openlibrary"))
9-
implementation(libs.bundles.exposed)
10-
implementation(libs.bundles.jackson)
11-
implementation(libs.bundles.javalin)
12-
implementation(libs.bundles.jte)
13-
implementation(libs.hoplite.core)
14-
runtimeOnly(libs.postgres)
8+
implementation(project(":openlibrary"))
9+
implementation(libs.bundles.exposed)
10+
implementation(libs.bundles.jackson)
11+
implementation(libs.bundles.javalin)
12+
implementation(libs.bundles.jte)
13+
implementation(libs.hoplite.core)
1514
}
1615

1716
application {
18-
mainClass = "github.buriedincode.bookshelf.AppKt"
19-
applicationName = "Bookshelf"
17+
mainClass = "github.buriedincode.BookshelfKt"
18+
applicationName = "Bookshelf"
2019
}
2120

2221
jte {
23-
precompile()
24-
kotlinCompileArgs = arrayOf("-jvm-target", "17")
22+
precompile()
23+
kotlinCompileArgs = arrayOf("-jvm-target", "21")
2524
}
2625

26+
tasks.clean { doLast { delete("$projectDir/jte-classes") } }
27+
2728
tasks.jar {
28-
dependsOn(tasks.precompileJte)
29-
from(
30-
fileTree("jte-classes") {
31-
include("**/*.class")
32-
include("**/*.bin") // Only required if you use binary templates
33-
},
34-
)
35-
manifest.attributes["Main-Class"] = "github.buriedincode.bookshelf.AppKt"
29+
dependsOn(tasks.precompileJte)
30+
from(
31+
fileTree("jte-classes") {
32+
include("**/*.class")
33+
include("**/*.bin") // Only required if you use binary templates
34+
}
35+
)
36+
manifest.attributes["Main-Class"] = "github.buriedincode.BookshelfKt"
3637
}
3738

3839
tasks.shadowJar {
39-
dependsOn(tasks.precompileJte)
40-
from(
41-
fileTree("jte-classes") {
42-
include("**/*.class")
43-
include("**/*.bin") // Only required if you use binary templates
44-
},
45-
)
46-
manifest.attributes["Main-Class"] = "github.buriedincode.bookshelf.AppKt"
47-
mergeServiceFiles()
40+
dependsOn(tasks.precompileJte)
41+
from(
42+
fileTree("jte-classes") {
43+
include("**/*.class")
44+
include("**/*.bin") // Only required if you use binary templates
45+
}
46+
)
47+
manifest.attributes["Main-Class"] = "github.buriedincode.BookshelfKt"
48+
mergeServiceFiles()
4849
}

app/src/main/jte/components/filters/book.kte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import github.buriedincode.bookshelf.models.Creator
2-
@import github.buriedincode.bookshelf.models.Format
3-
@import github.buriedincode.bookshelf.models.Publisher
4-
@import github.buriedincode.bookshelf.models.Role
5-
@import github.buriedincode.bookshelf.models.Series
1+
@import github.buriedincode.models.Creator
2+
@import github.buriedincode.models.Format
3+
@import github.buriedincode.models.Publisher
4+
@import github.buriedincode.models.Role
5+
@import github.buriedincode.models.Series
66
@import kotlin.collections.List
77
@param creators: List<Creator>
88
@param creatorSelected: Creator? = null

app/src/main/jte/components/forms/input_date.kte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import github.buriedincode.bookshelf.Utils.toString
1+
@import github.buriedincode.Utils.toString
22
@import kotlinx.datetime.LocalDate
33
@param label: String
44
@param name: String

app/src/main/jte/components/forms/select/book.kte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
@import github.buriedincode.models.Book
12
@import kotlin.collections.List
2-
@import github.buriedincode.bookshelf.models.Book
33
@param label: String = "Book"
44
@param name: String = "book-id"
55
@param options: List<Book>

app/src/main/jte/components/forms/select/creator.kte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
@import github.buriedincode.models.Creator
12
@import kotlin.collections.List
2-
@import github.buriedincode.bookshelf.models.Creator
33
@param label: String = "Creator"
44
@param name: String = "creator-id"
55
@param options: List<Creator>

app/src/main/jte/components/forms/select/format.kte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
@import github.buriedincode.models.Format
12
@import kotlin.collections.List
2-
@import github.buriedincode.bookshelf.models.Format
3-
@import github.buriedincode.bookshelf.Utils.titlecase
43
@param label: String = "Format"
54
@param name: String = "format"
65
@param options: List<Format>
@@ -13,7 +12,7 @@
1312
<select class="input" id="${name}" name="${name}">
1413
<option disabled selected="${selected == null}" value="">Select Format</option>
1514
@for(entry in options)
16-
<option selected="${selected == entry}" value="${entry.name}">${entry.titlecase()}</option>
15+
<option selected="${selected == entry}" value="${entry.name}">${entry.displayName}</option>
1716
@endfor
1817
</select>
1918
</div>

app/src/main/jte/components/forms/select/publisher.kte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
@import github.buriedincode.models.Publisher
12
@import kotlin.collections.List
2-
@import github.buriedincode.bookshelf.models.Publisher
33
@param label: String = "Publisher"
44
@param name: String = "publisher-id"
55
@param options: List<Publisher>

0 commit comments

Comments
 (0)