From cabecd4fce61bc72abc4d340db08c77a8ad648fa Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:55:45 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E6=95=B4=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/usbharu/hideout/domain/model/Posts.kt | 4 ++-- .../hideout/domain/model/UsersFollowers.kt | 1 + .../usbharu/hideout/domain/model/ap/Accept.kt | 7 ++++--- .../usbharu/hideout/domain/model/ap/Create.kt | 4 ++-- .../usbharu/hideout/domain/model/ap/Follow.kt | 7 ++++--- .../usbharu/hideout/domain/model/ap/Image.kt | 2 +- .../usbharu/hideout/domain/model/ap/JsonLd.kt | 19 +++++++++++-------- .../usbharu/hideout/domain/model/ap/Key.kt | 9 +++++---- .../usbharu/hideout/domain/model/ap/Note.kt | 13 +++++++------ .../usbharu/hideout/domain/model/ap/Object.kt | 4 ++-- .../usbharu/hideout/domain/model/ap/Person.kt | 17 +++++++++-------- .../hideout/domain/model/api/Status.kt | 4 ++-- .../hideout/domain/model/job/HideoutJob.kt | 4 ++-- .../domain/model/wellknown/WebFinger.kt | 4 ++-- .../usbharu/hideout/plugins/ActivityPub.kt | 6 +++--- .../dev/usbharu/hideout/plugins/HTTP.kt | 2 +- .../dev/usbharu/hideout/plugins/Monitoring.kt | 5 ++--- .../dev/usbharu/hideout/plugins/Routing.kt | 2 +- .../dev/usbharu/hideout/plugins/Security.kt | 2 -- .../usbharu/hideout/plugins/Serialization.kt | 4 ---- .../activitypub/ActivityPubServiceImpl.kt | 2 +- .../HttpSignatureVerifyServiceImpl.kt | 2 +- .../dev/usbharu/hideout/util/HttpUtil.kt | 6 +++++- .../kjob/exposed/ExposedJobRepository.kt | 1 - src/main/web/App.tsx | 2 +- src/main/web/index.html | 8 ++++---- 26 files changed, 73 insertions(+), 68 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/Posts.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/Posts.kt index d9e13915..56ae54a3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/Posts.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/Posts.kt @@ -29,7 +29,7 @@ data class Post( data class PostEntity( val id: Long, - val userId:Long, + val userId: Long, val overview: String? = null, val text: String, val createdAt: Long, @@ -39,7 +39,7 @@ data class PostEntity( val replyId: Long? = null ) -fun ResultRow.toPost():PostEntity{ +fun ResultRow.toPost(): PostEntity { return PostEntity( id = this[Posts.id], userId = this[Posts.userId], diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt index b5078c53..ede23ade 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt @@ -6,6 +6,7 @@ import org.jetbrains.exposed.dao.id.LongIdTable object UsersFollowers : LongIdTable("users_followers") { val userId = long("user_id").references(Users.id).index() val followerId = long("follower_id").references(Users.id) + init { uniqueIndex(userId, followerId) } diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Accept.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Accept.kt index 58889069..7b6d397a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Accept.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Accept.kt @@ -1,15 +1,16 @@ package dev.usbharu.hideout.domain.model.ap open class Accept : Object { - public var `object`: Object? = null - public var actor:String? = null + var `object`: Object? = null + var actor: String? = null + protected constructor() : super() constructor( type: List = emptyList(), name: String, `object`: Object?, actor: String? - ) : super(add(type,"Accept"), name) { + ) : super(add(type, "Accept"), name) { this.`object` = `object` this.actor = actor } diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Create.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Create.kt index a0766fd6..46f89ec4 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Create.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Create.kt @@ -1,10 +1,10 @@ package dev.usbharu.hideout.domain.model.ap open class Create : Object { - var `object` : Object? = null + var `object`: Object? = null protected constructor() : super() - constructor(type: List = emptyList(), name: String, `object`: Object?) : super(add(type,"Create"), name) { + constructor(type: List = emptyList(), name: String, `object`: Object?) : super(add(type, "Create"), name) { this.`object` = `object` } diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Follow.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Follow.kt index c73c85a3..9ed6e67a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Follow.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Follow.kt @@ -1,15 +1,16 @@ package dev.usbharu.hideout.domain.model.ap open class Follow : Object { - public var `object`:String? = null - public var actor:String? = null + var `object`: String? = null + var actor: String? = null + protected constructor() : super() constructor( type: List = emptyList(), name: String, `object`: String?, actor: String? - ) : super(add(type,"Follow"), name) { + ) : super(add(type, "Follow"), name) { this.`object` = `object` this.actor = actor } diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Image.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Image.kt index 5767e7b7..5763366b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Image.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Image.kt @@ -6,7 +6,7 @@ open class Image : Object { protected constructor() : super() constructor(type: List = emptyList(), name: String, mediaType: String?, url: String?) : super( - add(type,"Image"), + add(type, "Image"), name ) { this.mediaType = mediaType diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/JsonLd.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/JsonLd.kt index 4965814a..9700c9d0 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/JsonLd.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/JsonLd.kt @@ -16,10 +16,10 @@ open class JsonLd { @JsonProperty("@context") @JsonDeserialize(contentUsing = ContextDeserializer::class) @JsonSerialize(using = ContextSerializer::class) - var context:List = emptyList() + var context: List = emptyList() @JsonCreator - constructor(context:List){ + constructor(context: List) { this.context = context } @@ -43,9 +43,12 @@ open class JsonLd { } -public class ContextDeserializer : JsonDeserializer() { - override fun deserialize(p0: com.fasterxml.jackson.core.JsonParser?, p1: com.fasterxml.jackson.databind.DeserializationContext?): String { - val readTree : JsonNode = p0?.codec?.readTree(p0) ?: return "" +class ContextDeserializer : JsonDeserializer() { + override fun deserialize( + p0: com.fasterxml.jackson.core.JsonParser?, + p1: com.fasterxml.jackson.databind.DeserializationContext? + ): String { + val readTree: JsonNode = p0?.codec?.readTree(p0) ?: return "" if (readTree.isObject) { return "" } @@ -53,17 +56,17 @@ public class ContextDeserializer : JsonDeserializer() { } } -public class ContextSerializer : JsonSerializer>() { +class ContextSerializer : JsonSerializer>() { override fun serialize(value: List?, gen: JsonGenerator?, serializers: SerializerProvider?) { if (value.isNullOrEmpty()) { gen?.writeNull() return } - if (value?.size == 1) { + if (value.size == 1) { gen?.writeString(value[0]) } else { gen?.writeStartArray() - value?.forEach { + value.forEach { gen?.writeString(it) } gen?.writeEndArray() diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt index ec79ace0..3b1f168a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt @@ -1,9 +1,10 @@ package dev.usbharu.hideout.domain.model.ap open class Key : Object { - var id:String? = null - var owner:String? = null - var publicKeyPem:String? = null + var id: String? = null + var owner: String? = null + var publicKeyPem: String? = null + protected constructor() : super() constructor( type: List, @@ -11,7 +12,7 @@ open class Key : Object { id: String?, owner: String?, publicKeyPem: String? - ) : super(add(type,"Key"), name) { + ) : super(add(type, "Key"), name) { this.id = id this.owner = owner this.publicKeyPem = publicKeyPem diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Note.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Note.kt index caced1da..0250301c 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Note.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Note.kt @@ -1,11 +1,12 @@ package dev.usbharu.hideout.domain.model.ap open class Note : Object { - var id:String? = null - var attributedTo:String? = null - var content:String? = null - var published:String? = null - var to:List = emptyList() + var id: String? = null + var attributedTo: String? = null + var content: String? = null + var published: String? = null + var to: List = emptyList() + protected constructor() : super() constructor( type: List = emptyList(), @@ -15,7 +16,7 @@ open class Note : Object { content: String?, published: String?, to: List = emptyList() - ) : super(add(type,"Note"), name) { + ) : super(add(type, "Note"), name) { this.id = id this.attributedTo = attributedTo this.content = content diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt index faca1cd4..e13d3eb5 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt @@ -18,7 +18,7 @@ open class Object : JsonLd { companion object { @JvmStatic - protected fun add(list:List,type:String):List { + protected fun add(list: List, type: String): List { val toMutableList = list.toMutableList() toMutableList.add(type) return toMutableList.distinct() @@ -46,7 +46,7 @@ open class Object : JsonLd { } -public class TypeSerializer : JsonSerializer>() { +class TypeSerializer : JsonSerializer>() { override fun serialize(value: List?, gen: JsonGenerator?, serializers: SerializerProvider?) { println(value) if (value?.size == 1) { diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Person.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Person.kt index cc04bceb..6fecebc6 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Person.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Person.kt @@ -1,14 +1,15 @@ package dev.usbharu.hideout.domain.model.ap open class Person : Object { - private var id:String? = null - var preferredUsername:String? = null - var summary:String? = null - var inbox:String? = null - var outbox:String? = null - private var url:String? = null + private var id: String? = null + var preferredUsername: String? = null + var summary: String? = null + var inbox: String? = null + var outbox: String? = null + private var url: String? = null private var icon: Image? = null var publicKey: Key? = null + protected constructor() : super() constructor( type: List = emptyList(), @@ -21,7 +22,7 @@ open class Person : Object { url: String?, icon: Image?, publicKey: Key? - ) : super(add(type,"Person"), name) { + ) : super(add(type, "Person"), name) { this.id = id this.preferredUsername = preferredUsername this.summary = summary @@ -29,7 +30,7 @@ open class Person : Object { this.outbox = outbox this.url = url this.icon = icon - this.publicKey = publicKey + this.publicKey = publicKey } override fun equals(other: Any?): Boolean { diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/api/Status.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/api/Status.kt index e8e9bfe0..b89a0516 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/api/Status.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/api/Status.kt @@ -1,6 +1,6 @@ package dev.usbharu.hideout.domain.model.api data class StatusForPost( - val status:String, - val userId:Long + val status: String, + val userId: Long ) diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/job/HideoutJob.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/job/HideoutJob.kt index 6bce8a95..e2d124ad 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/job/HideoutJob.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/job/HideoutJob.kt @@ -4,13 +4,13 @@ import kjob.core.Job sealed class HideoutJob(name: String = "") : Job(name) -object ReceiveFollowJob : HideoutJob("ReceiveFollowJob"){ +object ReceiveFollowJob : HideoutJob("ReceiveFollowJob") { val actor = string("actor") val follow = string("follow") val targetActor = string("targetActor") } -object DeliverPostJob : HideoutJob("DeliverPostJob"){ +object DeliverPostJob : HideoutJob("DeliverPostJob") { val post = string("post") val actor = string("actor") val inbox = string("inbox") diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/wellknown/WebFinger.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/wellknown/WebFinger.kt index b8542f23..01f0e645 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/wellknown/WebFinger.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/wellknown/WebFinger.kt @@ -1,5 +1,5 @@ package dev.usbharu.hideout.domain.model.wellknown -data class WebFinger(val subject:String,val links:List){ - data class Link(val rel:String,val type:String,val href:String) +data class WebFinger(val subject: String, val links: List) { + data class Link(val rel: String, val type: String, val href: String) } diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt index 50d4faaa..50313a58 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt @@ -63,8 +63,8 @@ val httpSignaturePlugin = createClientPlugin("HttpSign", ::HttpSignaturePluginCo println("Digest !!") // UserAuthService.sha256.reset() val digest = - Base64.getEncoder().encodeToString(UserAuthService.sha256.digest(body.toByteArray(Charsets.UTF_8))) - request.headers.append("Digest", "sha-256="+digest) + Base64.getEncoder().encodeToString(UserAuthService.sha256.digest(body.toByteArray(Charsets.UTF_8))) + request.headers.append("Digest", "sha-256=" + digest) } if (request.headers.contains("Signature")) { @@ -126,7 +126,7 @@ val httpSignaturePlugin = createClientPlugin("HttpSign", ::HttpSignaturePluginCo override fun addHeader(name: String?, value: String?) { val split = value?.split("=").orEmpty() - name?.let { request.header(it, split.get(0)+"=\""+split.get(1).trim('"')+"\"") } + name?.let { request.header(it, split.get(0) + "=\"" + split.get(1).trim('"') + "\"") } } override fun method(): String { diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/HTTP.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/HTTP.kt index c89f9289..234130ad 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/HTTP.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/HTTP.kt @@ -1,10 +1,10 @@ package dev.usbharu.hideout.plugins import io.ktor.http.* +import io.ktor.server.application.* import io.ktor.server.plugins.cors.routing.* import io.ktor.server.plugins.defaultheaders.* import io.ktor.server.plugins.forwardedheaders.* -import io.ktor.server.application.* fun Application.configureHTTP() { install(CORS) { diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/Monitoring.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/Monitoring.kt index 3ce065b7..2f33df7a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/Monitoring.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/Monitoring.kt @@ -1,9 +1,8 @@ package dev.usbharu.hideout.plugins -import io.ktor.server.plugins.callloging.* -import org.slf4j.event.* -import io.ktor.server.request.* import io.ktor.server.application.* +import io.ktor.server.plugins.callloging.* +import org.slf4j.event.Level fun Application.configureMonitoring() { install(CallLogging) { diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/Routing.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/Routing.kt index fc4f0742..8ae17d25 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/Routing.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/Routing.kt @@ -25,7 +25,7 @@ fun Application.configureRouting( routing { inbox(httpSignatureVerifyService, activityPubService) outbox() - usersAP(activityPubUserService,userService) + usersAP(activityPubUserService, userService) webfinger(userService) route("/api/v1") { diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/Security.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/Security.kt index 94485569..f8a9e2b3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/Security.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/Security.kt @@ -3,8 +3,6 @@ package dev.usbharu.hideout.plugins import dev.usbharu.hideout.service.IUserAuthService import io.ktor.server.application.* import io.ktor.server.auth.* -import io.ktor.server.sessions.* -import kotlin.collections.set data class UserSession(val username: String) : Principal diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/Serialization.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/Serialization.kt index c8b71a7d..09edfe72 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/Serialization.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/Serialization.kt @@ -4,13 +4,9 @@ import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls import com.fasterxml.jackson.databind.DeserializationFeature -import dev.usbharu.hideout.util.HttpUtil.Activity -import io.ktor.http.* import io.ktor.serialization.jackson.* import io.ktor.server.application.* import io.ktor.server.plugins.contentnegotiation.* -import io.ktor.server.response.* -import io.ktor.server.routing.* fun Application.configureSerialization() { install(ContentNegotiation) { diff --git a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt index e86f967f..320359d3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt @@ -33,7 +33,7 @@ class ActivityPubServiceImpl( return ActivityType.values().first { it.name.equals(type.asText(), true) } } - override suspend fun processActivity(json: String, type: ActivityType): ActivityPubResponse? { + override suspend fun processActivity(json: String, type: ActivityType): ActivityPubResponse { return when (type) { ActivityType.Accept -> TODO() ActivityType.Add -> TODO() diff --git a/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureVerifyServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureVerifyServiceImpl.kt index 488b82cf..5c74f11d 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureVerifyServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/signature/HttpSignatureVerifyServiceImpl.kt @@ -10,7 +10,7 @@ import tech.barbero.http.message.signing.SignatureHeaderVerifier class HttpSignatureVerifyServiceImpl(private val userAuthService: IUserRepository) : HttpSignatureVerifyService { override fun verify(headers: Headers): Boolean { val build = SignatureHeaderVerifier.builder().keyMap(KtorKeyMap(userAuthService)).build() - return true; + return true build.verify(object : HttpMessage { override fun headerValues(name: String?): MutableList { return name?.let { headers.getAll(it) }?.toMutableList() ?: mutableListOf() diff --git a/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt b/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt index 979b8302..90773182 100644 --- a/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt +++ b/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt @@ -30,6 +30,10 @@ object HttpUtil { get() = ContentType("application", "activity+json") val ContentType.Application.JsonLd: ContentType - get() = ContentType("application", "ld+json", listOf(HeaderValueParam("profile", "https://www.w3.org/ns/activitystreams"))) + get() = ContentType( + "application", + "ld+json", + listOf(HeaderValueParam("profile", "https://www.w3.org/ns/activitystreams")) + ) // fun } diff --git a/src/main/kotlin/dev/usbharu/kjob/exposed/ExposedJobRepository.kt b/src/main/kotlin/dev/usbharu/kjob/exposed/ExposedJobRepository.kt index 6533358a..0c7f66dd 100644 --- a/src/main/kotlin/dev/usbharu/kjob/exposed/ExposedJobRepository.kt +++ b/src/main/kotlin/dev/usbharu/kjob/exposed/ExposedJobRepository.kt @@ -14,7 +14,6 @@ import org.jetbrains.exposed.dao.id.LongIdTable import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction import org.jetbrains.exposed.sql.transactions.transaction diff --git a/src/main/web/App.tsx b/src/main/web/App.tsx index 32a849b2..d1b57e50 100644 --- a/src/main/web/App.tsx +++ b/src/main/web/App.tsx @@ -1,5 +1,5 @@ import {Component} from "solid-js"; -export const App:Component = () => { +export const App: Component = () => { return (

aaa

) } diff --git a/src/main/web/index.html b/src/main/web/index.html index 856bb5e6..46837b9c 100644 --- a/src/main/web/index.html +++ b/src/main/web/index.html @@ -1,10 +1,10 @@ - - - - Solid App + + + + Solid App