hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Lint

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-08-14 15:35:45 +02:00
parent 1b79635ffa
commit b90df61020
12 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/Config.kt
View File

@ -45,5 +45,4 @@ object Config {
host = value("host"),
port = value("port").toInt(),
)
}

1
app/src/main/kotlin/SimpleNotes.kt
View File

@ -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(

44
app/src/main/kotlin/controllers/NoteController.kt
View File

@ -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
}
}
}

1
app/src/main/kotlin/controllers/UserController.kt
View File

@ -110,5 +110,4 @@ class UserController(
fun logout(@Suppress("UNUSED_PARAMETER") request: Request) = Response.redirect("/")
.invalidateCookie("Authorization")
}

6
app/src/main/kotlin/views/NoteView.kt
View File

@ -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<Pair<String, String>>()
//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) ->

2
app/src/main/kotlin/views/View.kt
View File

@ -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)

1
domain/src/main/kotlin/usecases/NoteService.kt
View File

@ -42,4 +42,3 @@ class NoteService(
}
data class PaginatedNotes(val pages: Int, val notes: List<PersistedNoteMetadata>)

1
domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt
View File

@ -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()

3
domain/src/main/kotlin/validation/NoteValidations.kt
View File

@ -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()
}
}

2
persistance/src/main/kotlin/DbMigrationsImpl.kt
View File

@ -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"
}

1
persistance/src/main/kotlin/notes/Notes.kt
View File

@ -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.*

1
persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt
View File

@ -155,7 +155,6 @@ internal class NoteRepositoryImplTest {
.hasSize(10)
.allMatch { it.title.toInt() in 41..50 }
}
}
@Nested