hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Move and rename things

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-04-20 16:03:47 +02:00
parent dc7f6b7b3a
commit 2bb3329742
9 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/NotesApplication.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh
import be.vandewalleh.controllers.KodeinController
import be.vandewalleh.controllers.base.KodeinController
import be.vandewalleh.controllers.controllerModule
import be.vandewalleh.features.Feature
import be.vandewalleh.features.configurationFeature
@ -10,7 +10,6 @@ import be.vandewalleh.migrations.Migration
import be.vandewalleh.services.serviceModule
import io.ktor.application.Application
import io.ktor.application.log
import io.ktor.auth.authenticate
import io.ktor.routing.routing
import me.liuwj.ktorm.database.Database
import org.kodein.di.Kodein

1
api/src/controllers/ChaptersController.kt
View File

@ -1,5 +1,6 @@
package be.vandewalleh.controllers
import be.vandewalleh.controllers.base.AuthCrudController
import be.vandewalleh.entities.User
import be.vandewalleh.tables.Chapters
import be.vandewalleh.tables.Notes

4
api/src/controllers/Controllers.kt
View File

@ -1,5 +1,6 @@
package be.vandewalleh.controllers
import be.vandewalleh.controllers.base.KodeinController
import org.kodein.di.Kodein
import org.kodein.di.generic.bind
import org.kodein.di.generic.inSet
@ -13,7 +14,6 @@ val controllerModule = Kodein.Module(name = "Controller") {
bind() from setBinding<KodeinController>()
bind<KodeinController>().inSet() with singleton { UserController(this.kodein) }
bind<KodeinController>().inSet() with singleton { HealthCheckController(this.kodein) }
bind<KodeinController>().inSet() with singleton { NotesController(this.kodein) }
bind<KodeinController>().inSet() with singleton { NotesTitleController(this.kodein) }
bind<KodeinController>().inSet() with singleton { TitleController(this.kodein) }
}

21
api/src/controllers/HealthCheckController.kt
View File

@ -1,21 +0,0 @@
package be.vandewalleh.controllers
import io.ktor.application.call
import io.ktor.locations.Location
import io.ktor.locations.get
import io.ktor.response.respondText
import io.ktor.routing.Routing
import org.kodein.di.Kodein
class HealthCheckController(kodein: Kodein) : KodeinController(kodein) {
override fun Routing.registerRoutes() {
get<Routes.Ping> {
call.respondText("pong")
}
}
object Routes {
@Location("/ping")
class Ping
}
}

1
api/src/controllers/NotesController.kt
View File

@ -1,5 +1,6 @@
package be.vandewalleh.controllers
import be.vandewalleh.controllers.base.AuthCrudController
import be.vandewalleh.services.NotesService
import io.ktor.application.call
import io.ktor.response.respond

3
api/src/controllers/NotesTitleController.kt → api/src/controllers/TitleController.kt
View File

@ -1,5 +1,6 @@
package be.vandewalleh.controllers
import be.vandewalleh.controllers.base.AuthCrudController
import be.vandewalleh.entities.Note
import be.vandewalleh.entities.Tag
import be.vandewalleh.entities.User
@ -22,7 +23,7 @@ import org.kodein.di.Kodein
import org.kodein.di.generic.instance
import java.time.LocalDateTime
class NotesTitleController(kodein: Kodein) : AuthCrudController("/notes/{noteTitle}", kodein) {
class TitleController(kodein: Kodein) : AuthCrudController("/notes/{noteTitle}", kodein) {
private val db by kodein.instance<Database>()
private fun ApplicationCall.noteTitle(): String? {

1
api/src/controllers/UserController.kt
View File

@ -2,6 +2,7 @@ package be.vandewalleh.controllers
import be.vandewalleh.auth.SimpleJWT
import be.vandewalleh.auth.UsernamePasswordCredential
import be.vandewalleh.controllers.base.KodeinController
import be.vandewalleh.services.UserRegistrationDto
import be.vandewalleh.services.UserService
import io.ktor.application.call

2
api/src/controllers/AuthCrudController.kt → api/src/controllers/base/AuthCrudController.kt
View File

@ -1,4 +1,4 @@
package be.vandewalleh.controllers
package be.vandewalleh.controllers.base
import be.vandewalleh.services.UserService
import io.ktor.application.ApplicationCall

2
api/src/controllers/KodeinController.kt → api/src/controllers/base/KodeinController.kt
View File

@ -1,4 +1,4 @@
package be.vandewalleh.controllers
package be.vandewalleh.controllers.base
import io.ktor.application.ApplicationCall
import io.ktor.http.HttpStatusCode