From bf62d7d71c5cf7e51f672613a29c67f4fa603cfc Mon Sep 17 00:00:00 2001 From: akuleshov7 Date: Sun, 8 Sep 2024 06:03:31 +0300 Subject: [PATCH] Just a test commit for investigation --- backend/build.gradle.kts | 1 + .../kotlin/ru/posidata/views/main/QuestionCard.kt | 7 ------- .../jsMain/kotlin/ru/posidata/views/main/Welcome.kt | 12 +++++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index 089622a..e6460a4 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.liquibase:liquibase-core") implementation("com.h2database:h2:2.3.232") + implementation("com.mysql:mysql-connector-j:9.0.0") implementation("commons-codec:commons-codec:1.17.1") runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5") runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5") diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt index 6526da8..69e77f1 100644 --- a/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt +++ b/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt @@ -32,7 +32,6 @@ val questionCard = FC { props -> val pokemon = Resources.getById(props.pokemonId) val updateResult = useDeferredRequest { - console.log("Test") if (props.tgUser != null) { val response = get( url = "${window.location.origin}/api/update", @@ -91,7 +90,6 @@ val questionCard = FC { props -> if (pokemon.type == BIG_DATA) { updateResult() props.answers[props.counter] = CORRECT - console.log("a") } else { props.answers[props.counter] = WRONG } @@ -114,15 +112,10 @@ val questionCard = FC { props -> props.setSelection(ANSWER) props.setCounter(props.counter + 1) if (pokemon.type == POKEMON) { - console.log("Entering POKEMON condition") updateResult() props.answers[props.counter] = CORRECT - console.log("Answer set to CORRECT") - console.log("tgUser: ${props.tgUser}") } else { - console.log("POKEMON condition not met") props.answers[props.counter] = WRONG - console.log("Answer set to WRONG") } props.setAnswers(props.answers) } diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt index 1197754..1f698d4 100644 --- a/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt +++ b/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt @@ -36,14 +36,17 @@ val welcomeCard = FC { props -> ) when { - response.ok -> props.setUser(response.decodeFromJsonString()) + response.ok -> { + props.setUser(response.decodeFromJsonString()) + } else -> window.alert("Failed to login with telegram") } } + props.setSelection(Selection.QUESTION) } // just a small test - /*div { + div { button { onClick = { console.log(props.tgUser) @@ -68,7 +71,7 @@ val welcomeCard = FC { props -> } } } -*/ + div { className = ClassName("row justify-content-center mt-1 px-0") @@ -142,7 +145,7 @@ val welcomeCard = FC { props -> requestAccess = "write" usePic = null lang = null - additionalClassNames = "d-flex justify-content-center zIndex1000" + additionalClassNames = "d-flex justify-content-center zIndex1000 mb-2" onAuthCallback = { user -> val feUser = UserDataFromTelegram( authDate = user.auth_date, @@ -178,7 +181,6 @@ val welcomeCard = FC { props -> } onClick = { getUser() - props.setSelection(Selection.QUESTION) } } }