diff --git a/app/src/main/kotlin/Config.kt b/app/src/main/kotlin/Config.kt index 181e561..b7d9980 100644 --- a/app/src/main/kotlin/Config.kt +++ b/app/src/main/kotlin/Config.kt @@ -45,5 +45,4 @@ object Config { host = value("host"), port = value("port").toInt(), ) - } diff --git a/app/src/main/kotlin/SimpleNotes.kt b/app/src/main/kotlin/SimpleNotes.kt index 6fb7c38..703aa58 100644 --- a/app/src/main/kotlin/SimpleNotes.kt +++ b/app/src/main/kotlin/SimpleNotes.kt @@ -23,7 +23,6 @@ import org.koin.dsl.module import org.slf4j.LoggerFactory import be.simplenotes.shared.config.ServerConfig as SimpleNotesServeConfig - fun main() { val koin = startKoin { modules( diff --git a/app/src/main/kotlin/controllers/NoteController.kt b/app/src/main/kotlin/controllers/NoteController.kt index 97ec25e..e9ad5dc 100644 --- a/app/src/main/kotlin/controllers/NoteController.kt +++ b/app/src/main/kotlin/controllers/NoteController.kt @@ -29,16 +29,19 @@ class NoteController( val markdownForm = request.form("markdown") ?: "" - return noteService.create(jwtPayload.userId, markdownForm).fold({ - val html = when (it) { - MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm) - InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm) - is ValidationError -> view.noteEditor(jwtPayload, validationErrors = it.validationErrors, textarea = markdownForm) + return noteService.create(jwtPayload.userId, markdownForm).fold( + { + val html = when (it) { + MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm) + InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm) + is ValidationError -> view.noteEditor(jwtPayload, validationErrors = it.validationErrors, textarea = markdownForm) + } + Response(BAD_REQUEST).html(html) + }, + { + Response.redirect("/notes/${it.uuid}") } - Response(BAD_REQUEST).html(html) - }, { - Response.redirect("/notes/${it.uuid}") - }) + ) } fun list(request: Request, jwtPayload: JwtPayload): Response { @@ -71,17 +74,19 @@ class NoteController( val markdownForm = request.form("markdown") ?: "" - return noteService.update(jwtPayload.userId, note.uuid, markdownForm).fold({ - val html = when (it) { - MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm) - InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm) - is ValidationError -> view.noteEditor(jwtPayload, validationErrors = it.validationErrors, textarea = markdownForm) + return noteService.update(jwtPayload.userId, note.uuid, markdownForm).fold( + { + val html = when (it) { + MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm) + InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm) + is ValidationError -> view.noteEditor(jwtPayload, validationErrors = it.validationErrors, textarea = markdownForm) + } + Response(BAD_REQUEST).html(html) + }, + { + Response.redirect("/notes/${note.uuid}") } - Response(BAD_REQUEST).html(html) - }, { - Response.redirect("/notes/${note.uuid}") - }) - + ) } private fun Request.uuidPath(): UUID? { @@ -92,5 +97,4 @@ class NoteController( null } } - } diff --git a/app/src/main/kotlin/controllers/UserController.kt b/app/src/main/kotlin/controllers/UserController.kt index 09103ae..acac45f 100644 --- a/app/src/main/kotlin/controllers/UserController.kt +++ b/app/src/main/kotlin/controllers/UserController.kt @@ -110,5 +110,4 @@ class UserController( fun logout(@Suppress("UNUSED_PARAMETER") request: Request) = Response.redirect("/") .invalidateCookie("Authorization") - } diff --git a/app/src/main/kotlin/views/NoteView.kt b/app/src/main/kotlin/views/NoteView.kt index dc183c2..984f796 100644 --- a/app/src/main/kotlin/views/NoteView.kt +++ b/app/src/main/kotlin/views/NoteView.kt @@ -64,7 +64,7 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver ul { notes.forEach { (title, tags, _, uuid) -> li("flex justify-between") { - a(classes = "text-blue-200 text-xl hover:underline", href = "/notes/${uuid}") { + a(classes = "text-blue-200 text-xl hover:underline", href = "/notes/$uuid") { +title } span { @@ -84,9 +84,9 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver private fun DIV.pagination(currentPage: Int, numberOfPages: Int) { val links = mutableListOf>() - //if (currentPage > 1) links += "Previous" to "?page=${currentPage - 1}" + // if (currentPage > 1) links += "Previous" to "?page=${currentPage - 1}" links += (1..numberOfPages).map { "$it" to "?page=$it" } - //if (currentPage < numberOfPages) links += "Next" to "?page=${currentPage + 1}" + // if (currentPage < numberOfPages) links += "Next" to "?page=${currentPage + 1}" nav("pages") { links.forEach { (name, href) -> diff --git a/app/src/main/kotlin/views/View.kt b/app/src/main/kotlin/views/View.kt index 38db761..d00d61a 100644 --- a/app/src/main/kotlin/views/View.kt +++ b/app/src/main/kotlin/views/View.kt @@ -25,7 +25,7 @@ abstract class View(private val staticFileResolver: StaticFileResolver) { title("$title - SimpleNotes") description?.let { meta(name = "description", content = it) } link(rel = "stylesheet", href = styles) - link(rel = "shortcut icon", href="/favicon.ico", type = "image/x-icon") + link(rel = "shortcut icon", href = "/favicon.ico", type = "image/x-icon") } body("bg-gray-900 text-white") { navbar(jwtPayload) diff --git a/domain/src/main/kotlin/usecases/NoteService.kt b/domain/src/main/kotlin/usecases/NoteService.kt index 684a323..58fbd0a 100644 --- a/domain/src/main/kotlin/usecases/NoteService.kt +++ b/domain/src/main/kotlin/usecases/NoteService.kt @@ -42,4 +42,3 @@ class NoteService( } data class PaginatedNotes(val pages: Int, val notes: List) - diff --git a/domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt b/domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt index 385fbb5..b059cc3 100644 --- a/domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt +++ b/domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt @@ -15,7 +15,6 @@ import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.parser.ParserException import org.yaml.snakeyaml.scanner.ScannerException - sealed class MarkdownParsingError object MissingMeta : MarkdownParsingError() object InvalidMeta : MarkdownParsingError() diff --git a/domain/src/main/kotlin/validation/NoteValidations.kt b/domain/src/main/kotlin/validation/NoteValidations.kt index 2bddce9..b58a3e7 100644 --- a/domain/src/main/kotlin/validation/NoteValidations.kt +++ b/domain/src/main/kotlin/validation/NoteValidations.kt @@ -2,8 +2,6 @@ package be.simplenotes.domain.validation import arrow.core.* import be.simplenotes.domain.model.NoteMetadata -import be.simplenotes.domain.model.User -import be.simplenotes.domain.usecases.login.InvalidLoginForm import be.simplenotes.domain.usecases.markdown.ValidationError import io.konform.validation.Validation import io.konform.validation.jsonschema.maxItems @@ -32,5 +30,4 @@ internal object NoteValidations { return if (errors.isEmpty()) none() else return ValidationError(errors).some() } - } diff --git a/persistance/src/main/kotlin/DbMigrationsImpl.kt b/persistance/src/main/kotlin/DbMigrationsImpl.kt index 8ddd48f..30f41e1 100644 --- a/persistance/src/main/kotlin/DbMigrationsImpl.kt +++ b/persistance/src/main/kotlin/DbMigrationsImpl.kt @@ -10,7 +10,7 @@ internal class DbMigrationsImpl( ) : DbMigrations { override fun migrate() { - val migrationDir = when { + val migrationDir = when { dataSourceConfig.jdbcUrl.contains("mariadb") -> "db/migration/mariadb" else -> "db/migration/other" } diff --git a/persistance/src/main/kotlin/notes/Notes.kt b/persistance/src/main/kotlin/notes/Notes.kt index 89da92b..95127fd 100644 --- a/persistance/src/main/kotlin/notes/Notes.kt +++ b/persistance/src/main/kotlin/notes/Notes.kt @@ -10,7 +10,6 @@ import be.simplenotes.persistance.users.Users import me.liuwj.ktorm.database.* import me.liuwj.ktorm.entity.* import me.liuwj.ktorm.schema.* -import java.time.Instant import java.time.LocalDateTime import java.util.* diff --git a/persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt b/persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt index 7c0a96c..ee3dd0d 100644 --- a/persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt +++ b/persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt @@ -155,7 +155,6 @@ internal class NoteRepositoryImplTest { .hasSize(10) .allMatch { it.title.toInt() in 41..50 } } - } @Nested