From 94b6a6758b0086581fa2b334fd769a1c3cc77976 Mon Sep 17 00:00:00 2001 From: csasq Date: Thu, 11 Sep 2025 14:30:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=81=D0=BE=D0=B1=D1=80=D0=B0=D0=BD=20=D0=B1?= =?UTF-8?q?=D0=B5=D0=B7=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20desktopMa?= =?UTF-8?q?in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 18 + README.md | 25 ++ build.gradle.kts | 7 + composeApp/build.gradle.kts | 54 +++ .../drawable/baseline_check_24.xml | 5 + .../drawable/baseline_close_24.xml | 5 + .../drawable/baseline_content_paste_24.xml | 5 + .../drawable/baseline_dehaze_24.xml | 5 + .../drawable/baseline_info_outline_24.xml | 5 + .../drawable/baseline_manage_accounts_24.xml | 9 + .../baseline_notifications_active_24.xml | 5 + .../drawable/baseline_person_24.xml | 5 + .../drawable/baseline_person_add_alt_1_24.xml | 5 + .../drawable/baseline_public_24.xml | 5 + .../drawable/outline_add_24.xml | 5 + .../drawable/outline_download_24.xml | 5 + .../drawable/round_arrow_right_24.xml | 5 + .../drawable/round_check_24.xml | 5 + .../drawable/round_close_24.xml | 5 + .../drawable/round_content_copy_24.xml | 5 + .../drawable/round_manage_accounts_24.xml | 9 + .../drawable/round_settings_24.xml | 5 + .../drawable/rounded_add_a_photo_24.xml | 5 + .../kotlin/ru/cit71/pchelovod71/App.kt | 330 ++++++++++++++ .../kotlin/ru/cit71/pchelovod71/core/Api.kt | 401 ++++++++++++++++++ .../ru/cit71/pchelovod71/core/Config.kt | 38 ++ .../ru/cit71/pchelovod71/core/Models.kt | 358 ++++++++++++++++ .../ru/cit71/pchelovod71/core/Platform.kt | 177 ++++++++ .../kotlin/ru/cit71/pchelovod71/main.kt | 12 + .../ui/components/BooleanFilter.kt | 43 ++ .../cit71/pchelovod71/ui/components/Button.kt | 41 ++ .../cit71/pchelovod71/ui/components/Column.kt | 95 +++++ .../pchelovod71/ui/components/CopyField.kt | 83 ++++ .../cit71/pchelovod71/ui/components/Dialog.kt | 84 ++++ .../ui/components/DropdownField.kt | 85 ++++ .../pchelovod71/ui/components/ImagePicker.kt | 136 ++++++ .../ui/components/LoadingIndicator.kt | 20 + .../ui/components/RegistrationRequestCard.kt | 200 +++++++++ .../pchelovod71/ui/components/Scaffold.kt | 165 +++++++ .../pchelovod71/ui/components/SettingCard.kt | 60 +++ .../pchelovod71/ui/components/SnackbarHost.kt | 35 ++ .../pchelovod71/ui/components/Spoiler.kt | 88 ++++ .../pchelovod71/ui/components/TextField.kt | 89 ++++ .../pchelovod71/ui/components/UserCard.kt | 51 +++ .../ui/components/UserRequestCard.kt | 55 +++ .../pchelovod71/ui/dialogs/ConfirmDialog.kt | 119 ++++++ .../pchelovod71/ui/dialogs/ImageViewDialog.kt | 50 +++ .../pchelovod71/ui/dialogs/UserDialog.kt | 171 ++++++++ .../ui/dialogs/UserRequestDialog.kt | 263 ++++++++++++ .../ui/screens/RegistrationRequestsScreen.kt | 181 ++++++++ .../pchelovod71/ui/screens/SettingsScreen.kt | 78 ++++ .../ui/screens/UserRegistrationScreen.kt | 230 ++++++++++ .../ui/screens/UserRequestsScreen.kt | 279 ++++++++++++ .../pchelovod71/ui/screens/UsersScreen.kt | 275 ++++++++++++ .../src/wasmJsMain/resources/index.html | 15 + .../src/wasmJsMain/resources/styles.css | 74 ++++ gradle.properties | 8 + gradle/libs.versions.toml | 51 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 +++++++++++ gradlew.bat | 94 ++++ settings.gradle.kts | 31 ++ 63 files changed, 5030 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 composeApp/build.gradle.kts create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_check_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_close_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_content_paste_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_dehaze_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_info_outline_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_manage_accounts_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_notifications_active_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_add_alt_1_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/baseline_public_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/outline_add_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/outline_download_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_arrow_right_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_check_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_close_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_content_copy_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_manage_accounts_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/round_settings_24.xml create mode 100644 composeApp/src/wasmJsMain/composeResources/drawable/rounded_add_a_photo_24.xml create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/App.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Api.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Config.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Models.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Platform.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/main.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/BooleanFilter.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Button.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Column.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/CopyField.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Dialog.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/DropdownField.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/ImagePicker.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/LoadingIndicator.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/RegistrationRequestCard.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Scaffold.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SettingCard.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SnackbarHost.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Spoiler.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/TextField.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserCard.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserRequestCard.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ConfirmDialog.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ImageViewDialog.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserDialog.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserRequestDialog.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/RegistrationRequestsScreen.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/SettingsScreen.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRegistrationScreen.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRequestsScreen.kt create mode 100644 composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UsersScreen.kt create mode 100644 composeApp/src/wasmJsMain/resources/index.html create mode 100644 composeApp/src/wasmJsMain/resources/styles.css create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7d9c0e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +*.iml +.kotlin +.gradle +**/build/ +xcuserdata +!src/**/build/ +local.properties +.idea +.DS_Store +captures +.externalNativeBuild +.cxx +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcodeproj/project.xcworkspace/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings diff --git a/README.md b/README.md new file mode 100644 index 0000000..472c3fc --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ +# Помощник пчеловода + +![Static Badge](https://img.shields.io/badge/IntelliJ%20IDEA-2025.2-blue) +![Static Badge](https://img.shields.io/badge/JDK-24.0.2-blue) +![Static Badge](https://img.shields.io/badge/Gradle-9.0.0-blue) +![Static Badge](https://img.shields.io/badge/Compose%20Material-3%20Expressive-blue) + +## Конфигурация + +Путь до файла: `/composeApp/src/commonMain/kotlin/ru/cit71/bee_frontend/core/Config.kt` + +```kotlin +data object Config { + const val DEBUG = false + private const val TELEGRAM_INIT_DATA = "YOUR-TELEGRAM-INIT-DATA" +} +``` + +## Запуск и компиляция + +| Задача | Команда | +|--------------|-------------------------------------------| +| desktop Run | `:composeApp:run` | +| wasmJs Run | `:composeApp:wasmJsBrowserDevelopmentRun` | +| wasmJs Build | `:composeApp:wasmJsBrowserDistribution` | diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..7d61caf --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + alias(libs.plugins.composeMultiplatform) apply false + alias(libs.plugins.composeCompiler) apply false + alias(libs.plugins.kotlinMultiplatform) apply false +} \ No newline at end of file diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts new file mode 100644 index 0000000..2924d56 --- /dev/null +++ b/composeApp/build.gradle.kts @@ -0,0 +1,54 @@ +import org.jetbrains.compose.desktop.application.dsl.TargetFormat +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig + +plugins { + // Initial + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.composeCompiler) + + // Custom + kotlin("plugin.serialization") version "2.2.10" +} + +kotlin { + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + binaries.executable() + } + + sourceSets { + commonMain.dependencies { + // Initial + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) + implementation(libs.androidx.lifecycle.viewmodelCompose) + implementation(libs.androidx.lifecycle.runtimeCompose) + + // Custom + //// Ktor + implementation(libs.ktor.clientCore) + implementation(libs.ktor.clientContentNegotiation) + implementation(libs.ktor.clientLogging) + implementation(libs.ktor.serializationKotlinxJson) + + //// Coil + implementation(libs.coil.compose) + implementation(libs.coil.networkKtor) + + //// Navigation + implementation(libs.navigation.compose) + } + commonTest.dependencies { + implementation(libs.kotlin.test) + } + } +} + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_check_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_check_24.xml new file mode 100644 index 0000000..72d3aab --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_check_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_close_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_close_24.xml new file mode 100644 index 0000000..34dd837 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_close_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_content_paste_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_content_paste_24.xml new file mode 100644 index 0000000..2f6f3a0 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_content_paste_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_dehaze_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_dehaze_24.xml new file mode 100644 index 0000000..db840e2 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_dehaze_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_info_outline_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_info_outline_24.xml new file mode 100644 index 0000000..4e64bbc --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_info_outline_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_manage_accounts_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_manage_accounts_24.xml new file mode 100644 index 0000000..480c50b --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_manage_accounts_24.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_notifications_active_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_notifications_active_24.xml new file mode 100644 index 0000000..9890419 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_notifications_active_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_24.xml new file mode 100644 index 0000000..72e0f1a --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_add_alt_1_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_add_alt_1_24.xml new file mode 100644 index 0000000..8caea13 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_person_add_alt_1_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/baseline_public_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_public_24.xml new file mode 100644 index 0000000..8f980a5 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/baseline_public_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/outline_add_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/outline_add_24.xml new file mode 100644 index 0000000..ba28c0f --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/outline_add_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/outline_download_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/outline_download_24.xml new file mode 100644 index 0000000..3750d7f --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/outline_download_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_arrow_right_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_arrow_right_24.xml new file mode 100644 index 0000000..7567197 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_arrow_right_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_check_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_check_24.xml new file mode 100644 index 0000000..989f628 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_check_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_close_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_close_24.xml new file mode 100644 index 0000000..c0285c8 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_close_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_content_copy_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_content_copy_24.xml new file mode 100644 index 0000000..ccb42d1 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_content_copy_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_manage_accounts_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_manage_accounts_24.xml new file mode 100644 index 0000000..c2bf476 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_manage_accounts_24.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/round_settings_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/round_settings_24.xml new file mode 100644 index 0000000..dae7fed --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/round_settings_24.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/composeResources/drawable/rounded_add_a_photo_24.xml b/composeApp/src/wasmJsMain/composeResources/drawable/rounded_add_a_photo_24.xml new file mode 100644 index 0000000..b69d3e5 --- /dev/null +++ b/composeApp/src/wasmJsMain/composeResources/drawable/rounded_add_a_photo_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/App.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/App.kt new file mode 100644 index 0000000..cfcad74 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/App.kt @@ -0,0 +1,330 @@ +package ru.cit71.pchelovod71 + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Text +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import org.jetbrains.compose.ui.tooling.preview.Preview +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.baseline_content_paste_24 +import frontend.composeapp.generated.resources.baseline_person_24 +import frontend.composeapp.generated.resources.baseline_person_add_alt_1_24 +import frontend.composeapp.generated.resources.round_settings_24 +import org.jetbrains.compose.resources.DrawableResource +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.core.Platform +import ru.cit71.pchelovod71.ui.components.MainScaffold +import ru.cit71.pchelovod71.ui.screens.RegistrationRequestsScreen +import ru.cit71.pchelovod71.ui.screens.RegistrationUserScreen +import ru.cit71.pchelovod71.ui.screens.RejectRegistrationUserScreen +import ru.cit71.pchelovod71.ui.screens.SettingsScreen +import ru.cit71.pchelovod71.ui.screens.UserRequestsScreen +import ru.cit71.pchelovod71.ui.screens.UsersScreen +import ru.cit71.pchelovod71.ui.screens.WaitRegistrationUserScreen + +interface Screen { + val route: String + val title: String + val icon: DrawableResource +} + +enum class AdminScreen( + override val route: String, + override val title: String, + override val icon: DrawableResource, +) : Screen { + RegistrationRequests( + route = "registration-requests", + title = "Запросы на регистрацию", + icon = Res.drawable.baseline_person_add_alt_1_24, + ), + Users( + route = "users", + title = "Пользователи", + icon = Res.drawable.baseline_person_24, + ), + UserRequests( + route = "user-requests", + title = "Обращения пользователей", + icon = Res.drawable.baseline_content_paste_24, + ), +} + +enum class UserScreen( + override val route: String, + override val title: String, + override val icon: DrawableResource, +) : Screen { + MyRequests( + route = "my-requests", + title = "Мои обращения", + icon = Res.drawable.baseline_content_paste_24, + ), + Settings( + route = "settings", + title = "Настройки", + icon = Res.drawable.round_settings_24, + ), +} + +@Composable +fun AdminApp( + paddingValues: PaddingValues, + userDomain: Models.User.Domain, +) { + val navHostController = rememberNavController() + + MainScaffold( + bottomBar = { + NavigationBar { + val navBackStackEntry = navHostController.currentBackStackEntryAsState() + + AdminScreen.entries.forEach { screen -> + NavigationBarItem( + icon = { + Icon( + painter = painterResource(screen.icon), + contentDescription = null + ) + }, + label = { + Text( + text = screen.title, + textAlign = TextAlign.Center + ) + }, + selected = navBackStackEntry.value?.destination?.hierarchy?.any { + it.route == screen.route + } == true, + onClick = { + navHostController.navigate(screen.route) + }, + ) + } + } + }, + modifier = Modifier + .padding(paddingValues), + ) { mainScaffoldParams -> + NavHost( + navController = navHostController, + startDestination = AdminScreen.UserRequests.route, + ) { + composable(AdminScreen.RegistrationRequests.route) { + RegistrationRequestsScreen( + mainScaffoldParams = mainScaffoldParams, + ) + } + + composable(AdminScreen.Users.route) { + UsersScreen( + mainScaffoldParams = mainScaffoldParams, + ) + } + + composable(AdminScreen.UserRequests.route) { + UserRequestsScreen( + mainScaffoldParams = mainScaffoldParams, + userDomain = userDomain, + ) + } + } + } +} + +@Composable +fun UserApp( + paddingValues: PaddingValues, + userDomain: Models.User.Domain, +) { + val navHostController = rememberNavController() + + MainScaffold( + bottomBar = { + NavigationBar { + val navBackStackEntry = navHostController.currentBackStackEntryAsState() + + UserScreen.entries.forEach { screen -> + NavigationBarItem( + icon = { + Icon( + painter = painterResource(screen.icon), + contentDescription = null + ) + }, + label = { + Text( + text = screen.title, + textAlign = TextAlign.Center + ) + }, + selected = navBackStackEntry.value?.destination?.hierarchy?.any { + it.route == screen.route + } == true, + onClick = { + navHostController.navigate(screen.route) + }, + ) + } + } + }, + modifier = Modifier + .padding(paddingValues), + ) { mainScaffoldParams -> + NavHost( + navController = navHostController, + startDestination = UserScreen.MyRequests.route, + ) { + composable(UserScreen.MyRequests.route) { + UserRequestsScreen( + mainScaffoldParams = mainScaffoldParams, + userDomain = userDomain, + ) + } + + composable(UserScreen.Settings.route) { + SettingsScreen( + mainScaffoldParams = mainScaffoldParams, + ) + } + } + } +} + +@Composable +@Preview +fun App() { + var userDomain by remember { mutableStateOf(null) } + + MaterialTheme( + colorScheme = darkColorScheme(), + ) { + MainScaffold { mainScaffoldParams -> + suspend fun reloadUserDomain() { + Api.Users.auth( + authParams = Models.AuthParams.DTO.Send( + initData = Api.telegramInitData, + ), + onSuccess = { user -> + userDomain = user.toDomain() + }, + onError = {}, + ) + } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + Api.telegramInitData = Platform.getTelegramInitData() + reloadUserDomain() + } + } + + when (userDomain) { + null -> { + var telegramId by remember { mutableStateOf(null) } + + suspend fun reloadTelegramId() { + Api.Users.getTelegramId( + authParams = Models.AuthParams.DTO.Send( + initData = Platform.getTelegramInitData(), + ), + onSuccess = { + telegramId = it.telegramId + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось авторизоваться с помощью учетной записи Telegram" + ) + }, + ) + } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + when (val bindUuid = Platform.getBindUuid()) { + null -> { + reloadTelegramId() + } + else -> { + Api.Users.bind( + uuid = bindUuid, + onSuccess = { + reloadUserDomain() + mainScaffoldParams.showSuccessSnackbar( + "Учетная запись Telegram успешно привязана" + ) + }, + onError = { + reloadTelegramId() + mainScaffoldParams.showErrorSnackbar( + "Не удалось привязать учетную запись Telegram" + ) + }, + ) + } + } + } + } + + telegramId?.let { + RegistrationUserScreen( + mainScaffoldParams = mainScaffoldParams, + telegramId = it, + reloadUserDomain = ::reloadUserDomain, + ) + } + } + else -> { + userDomain?.let { userDomain -> + when (userDomain.deleted) { + true -> { + RejectRegistrationUserScreen( + mainScaffoldParams = mainScaffoldParams, + ) + } + false -> { + when (userDomain.accepted) { + true -> { + when (userDomain.role) { + Models.Role.Admin -> { + AdminApp( + paddingValues = mainScaffoldParams.paddingValues, + userDomain = userDomain, + ) + } + Models.Role.User -> { + UserApp( + paddingValues = mainScaffoldParams.paddingValues, + userDomain = userDomain, + ) + } + } + } + false -> { + WaitRegistrationUserScreen( + mainScaffoldParams = mainScaffoldParams, + ) + } + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Api.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Api.kt new file mode 100644 index 0000000..bdf8882 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Api.kt @@ -0,0 +1,401 @@ +package ru.cit71.pchelovod71.core + +import io.ktor.client.HttpClient +import io.ktor.client.call.body +import io.ktor.client.plugins.DefaultRequest +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation +import io.ktor.client.plugins.logging.LogLevel +import io.ktor.client.plugins.logging.Logger +import io.ktor.client.plugins.logging.Logging +import io.ktor.client.request.delete +import io.ktor.client.request.forms.MultiPartFormDataContent +import io.ktor.client.request.forms.formData +import io.ktor.client.request.get +import io.ktor.client.request.header +import io.ktor.client.request.patch +import io.ktor.client.request.post +import io.ktor.client.request.setBody +import io.ktor.http.ContentType +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.HttpStatusCode +import io.ktor.http.clone +import io.ktor.http.contentType +import io.ktor.serialization.kotlinx.json.json +import ru.cit71.pchelovod71.core.Platform.base64Encode + +object Api { + lateinit var telegramInitData: String + + private val httpClient = HttpClient { + install(ContentNegotiation) { + json() + } + + install(DefaultRequest) { + header("Authorization", "Bearer ${base64Encode(telegramInitData)}") + } + + if (Config.DEBUG) + install(Logging) { + logger = object : Logger { + override fun log(message: String) { + println(message) + } + } + level = LogLevel.ALL + } + } + + private val apiUrlBuilder = Config.apiUrlBuilder + + object Users { + suspend fun getTelegramId( + authParams: Models.AuthParams.DTO.Send, + onSuccess: suspend (Models.AuthParams.DTO.Get) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("auth", "telegram") + }.build() + val response = httpClient.post(url) { + contentType(ContentType.Application.Json) + setBody(authParams) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + HttpStatusCode.Unauthorized -> { + onError() + } + } + } + + suspend fun auth( + authParams: Models.AuthParams.DTO.Send, + onSuccess: suspend (Models.User.DTO.Get) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("auth", "user") + }.build() + val response = httpClient.post(url) { + contentType(ContentType.Application.Json) + setBody(authParams) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + HttpStatusCode.Unauthorized -> { + onError() + } + } + } + + suspend fun get( + verified: Boolean? = null, + deleted: Boolean? = null, + onSuccess: suspend (List) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "") + verified?.let { + parameters.append("verified", "$it") + } + deleted?.let { + parameters.append("deleted_status", "$it") + } + }.build() + val response = httpClient.get(url) + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + else -> { + onError() + } + } + } + + suspend fun create( + user: Models.User.DTO.Create, + onSuccess: suspend (Models.User.DTO.Get) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "") + }.build() + val response = httpClient.post(url) { + contentType(ContentType.Application.Json) + setBody(user) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + else -> { + onError() + } + } + } + + suspend fun update( + user: Models.User.DTO.Update, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "${user.id}") + }.build() + val response = httpClient.patch(url) { + contentType(ContentType.Application.Json) + setBody(user) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun bind( + uuid: String, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "binding", "") + parameters["user_uuid"] = uuid + }.build() + val response = httpClient.patch(url) + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun subscribe( + id: Int, + user: Models.User.DTO.Subscribe, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "$id") + }.build() + val response = httpClient.patch(url) { + contentType(ContentType.Application.Json) + setBody(user) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun accept( + id: Int, + user: Models.User.DTO.Accept, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "$id") + }.build() + val response = httpClient.patch(url) { + contentType(ContentType.Application.Json) + setBody(user) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun reject( + id: Int, + user: Models.User.DTO.Reject, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "delete", "$id") + }.build() + val response = httpClient.delete(url) { + contentType(ContentType.Application.Json) + setBody(user) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun delete( + id: Int, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("users", "delete", "$id") + }.build() + val response = httpClient.delete(url) + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + } + + object UserRequests { + suspend fun get( + userId: Int? = null, + status: Models.RequestStatus, + onSuccess: suspend (List) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("requests") + userId?.let { + parameters.append("user_id", "$it") + } + parameters.append("status", status.value) + }.build() + val response = httpClient.get(url) + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + else -> { + onError() + } + } + } + + suspend fun create( + userRequest: Models.UserRequest.DTO.Create, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += "requests" + }.build() + val response = httpClient.post(url) { + contentType(ContentType.Application.Json) + setBody(userRequest) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun accept( + id: Int, + request: Models.UserRequest.DTO.Accept, + onSuccess: suspend () -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("requests", "$id") + }.build() + val response = httpClient.patch(url) { + contentType(ContentType.Application.Json) + setBody(request) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess() + } + else -> { + onError() + } + } + } + + suspend fun uploadImage( + type: String, + data: ByteArray, + onSuccess: suspend (Models.Image.DTO.Get) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("requests", "upload_photo") + }.build() + val response = httpClient.post(url) { + setBody( + MultiPartFormDataContent( + formData { + append( + key = "file", + value = data, + headers = Headers.build { + append(HttpHeaders.ContentType, type) + append(HttpHeaders.ContentDisposition, "form-data; name=\"file\"; filename=\"image\"") + }, + ) + } + ) + ) + } + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + else -> { + onError() + } + } + } + } + + object Municipalities { + suspend fun get( + onSuccess: suspend (List) -> Unit, + onError: suspend () -> Unit, + ) { + val url = apiUrlBuilder.clone().apply { + pathSegments += listOf("districts", "") + }.build() + val response = httpClient.get(url) + when (response.status) { + HttpStatusCode.OK -> { + onSuccess(response.body()) + } + else -> { + onError() + } + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Config.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Config.kt new file mode 100644 index 0000000..3bb144f --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Config.kt @@ -0,0 +1,38 @@ +package ru.cit71.pchelovod71.core + +import io.ktor.http.URLBuilder +import io.ktor.http.URLProtocol + +data object Config { + const val DEBUG = false + private const val TELEGRAM_INIT_DATA = "YOUR-TELEGRAM-INIT-DATA" + + val botUrlBuilder = URLBuilder( + protocol = URLProtocol.HTTPS, + host = "t.me", + pathSegments = listOf("pchelovod71_bot"), + ) + + val apiUrlBuilder = when (DEBUG) { + true -> { + URLBuilder( + protocol = URLProtocol.HTTP, + host = "localhost", + port = 5500, + pathSegments = listOf("api"), + ) + } + false -> { + URLBuilder( + protocol = URLProtocol.HTTPS, + host = "pchelovod71.tularegion.ru", + pathSegments = listOf("api"), + ) + } + } + + val telegramInitData = when (DEBUG) { + true -> TELEGRAM_INIT_DATA + else -> null + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Models.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Models.kt new file mode 100644 index 0000000..9f720a3 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Models.kt @@ -0,0 +1,358 @@ +package ru.cit71.pchelovod71.core + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +object Models { + enum class Module { + DesktopMain, + WasmJsMain, + } + + enum class Role { + Admin, + User, + } + + object AuthParams { + object DTO { + @Serializable + data class Get( + @SerialName("telegram_id") val telegramId: String, + ) + + @Serializable + data class Send( + @SerialName("init_data") val initData: String, + ) + } + } + + object User { + data class Domain( + val id: Int = 0, + val role: Role = Role.User, + val fullName: String = "", + val organization: String = "", + val phoneNumber: String = "", + val telegramId: String? = null, + val municipality: Municipality.Domain, + val accepted: Boolean = false, + val subscribed: Boolean = false, + val deleted: Boolean = false, + val deleteReason: String? = null, + val uuid: String = "", + ) { + fun toCreateDTO(): DTO.Create { + return DTO.Create( + fullName = fullName, + organization = organization, + phoneNumber = phoneNumber, + telegramId = telegramId, + municipality = municipality.toGetDTO(), + accepted = accepted, + ) + } + + fun toUpdateDTO(): DTO.Update { + return DTO.Update( + id = id, + fullName = fullName, + organization = organization, + phoneNumber = phoneNumber, + telegramId = telegramId, + municipality = municipality.toGetDTO(), + accepted = accepted, + subscribed = subscribed, + ) + } + + fun toAcceptDTO(): DTO.Accept { + return DTO.Accept( + fullName = fullName, + organization = organization, + phoneNumber = phoneNumber, + telegramId = telegramId, + municipality = municipality.toGetDTO(), + accepted = true, + ) + } + + fun toSubscribeDTO(): DTO.Subscribe { + return DTO.Subscribe( + subscribed = subscribed, + ) + } + + fun toRejectDTO(): DTO.Reject { + return DTO.Reject( + deleteReason = deleteReason!!, + ) + } + } + + data object DTO { + @Serializable + data class Get( + @SerialName("id") val id: Int, + @SerialName("role_id") val roleId: Int = 2, // TODO: вынужденный костыль, т. к. при создании пользователя в returning возвращается модель отличная от стандартной модели User.DTO.Get + @SerialName("fio") val fullName: String, + @SerialName("organization") val organization: String, + @SerialName("phone_number") val phoneNumber: String, + @SerialName("telegram_id") val telegramId: String?, + @SerialName("district") val municipality: Municipality.DTO.Get, + @SerialName("verified") val accepted: Boolean, + @SerialName("processing_alert_status") val subscribed: Boolean, + @SerialName("deleted_status") val deleted: Boolean, + @SerialName("deleted_comment") val deleteReason: String?, + @SerialName("user_uuid") val uuid: String, + ) { + fun toDomain(): Domain { + return Domain( + id = id, + role = when (roleId) { + 1 -> Role.Admin + else -> Role.User + }, + fullName = fullName, + organization = organization, + phoneNumber = phoneNumber, + telegramId = telegramId, + municipality = municipality.toDomain(), + accepted = accepted, + subscribed = subscribed, + deleted = deleted, + deleteReason = deleteReason, + uuid = uuid, + ) + } + } + + @Serializable + data class Create( + @SerialName("fio") val fullName: String, + @SerialName("organization") val organization: String, + @SerialName("phone_number") val phoneNumber: String, + @SerialName("telegram_id") val telegramId: String?, + @SerialName("district") val municipality: Municipality.DTO.Get, + @SerialName("verified") val accepted: Boolean = false, // FIXME: зачем принимает verified? Любой идиот может отправить на API null значение и фронт упадет, т. к. полагается на то, что это не nullable значение (пост. Иваницкий Г.О., отв. Бондарев А.И.) + ) + + @Serializable + data class Update( + @SerialName("id") val id: Int, + @SerialName("fio") val fullName: String, + @SerialName("organization") val organization: String, + @SerialName("phone_number") val phoneNumber: String, + @SerialName("telegram_id") val telegramId: String?, + @SerialName("district") val municipality: Municipality.DTO.Get, + @SerialName("verified") val accepted: Boolean, + @SerialName("processing_alert_status") val subscribed: Boolean, + ) + + @Serializable + data class Accept( + @SerialName("fio") val fullName: String, + @SerialName("organization") val organization: String, + @SerialName("phone_number") val phoneNumber: String, + @SerialName("telegram_id") val telegramId: String?, + @SerialName("district") val municipality: Municipality.DTO.Get, + @SerialName("verified") val accepted: Boolean, + ) + + @Serializable + data class Subscribe( + @SerialName("processing_alert_status") val subscribed: Boolean, + ) + + @Serializable + data class Reject( + @SerialName("deleted_comment") val deleteReason: String, + ) + } + } + + enum class RequestStatus( + val value: String, + ) { + New("new"), + Accepted("accept"), + Rejected("reject"), + } + + object RequestType { + data class Domain( + val id: Int, + val name: String, + ) { + override fun toString(): String { + return name + } + } + + object DTO { + @Serializable + data class Get( + @SerialName("id") val id: Int, + @SerialName("request_type_name") val name: String, + ) { + fun toDomain(): Domain { + return Domain( + id = id, + name = name, + ) + } + } + } + } + + object UserRequest { + data class Domain( + val id: Int = 0, + val user: User.Domain, + val type: RequestType.Domain = RequestType.Domain( + id = 1, + name = "Фиксация гибели пчел", + ), + val address: String = "", + val text: String = "", + val imageList: List = emptyList(), + val adminComment: String? = null, + val accepted: Boolean? = null, + val rejectComment: String? = null, + ) { + fun toCreateDTO(): DTO.Create { + return DTO.Create( + userId = user.id, + typeId = type.id, + address = address, + text = text, + imageFileIdList = imageList.map { it.id } + ) + } + + fun toAcceptDTO(): DTO.Accept { + return DTO.Accept( + adminComment = adminComment, + accepted = accepted!!, + rejectComment = rejectComment, + ) + } + } + + data object DTO { + @Serializable + data class Get( + @SerialName("id") val id: Int, + @SerialName("user") val user: User.DTO.Get, + @SerialName("request_type") val type: RequestType.DTO.Get, + @SerialName("address") val address: String, + @SerialName("request_description") val text: String, + @SerialName("upload_file") val imageList: List = emptyList(), + @SerialName("admin_correction") val adminComment: String?, + @SerialName("status") val accepted: Boolean?, + @SerialName("reject_comment") val rejectComment: String?, + ) { + fun toDomain(): Domain { + return Domain( + id = id, + user = user.toDomain(), + type = type.toDomain(), + address = address, + text = text, + imageList = imageList.map { it.toDomain() }, + adminComment = adminComment, + accepted = accepted, + rejectComment = rejectComment, + ) + } + } + + @Serializable + data class Create( + @SerialName("user_id") val userId: Int, + @SerialName("request_type_id") val typeId: Int, + @SerialName("address") val address: String, + @SerialName("request_description") val text: String, + @SerialName("file_id_list") val imageFileIdList: List, + ) + + @Serializable + data class Accept( + @SerialName("admin_correction") val adminComment: String?, + @SerialName("status") val accepted: Boolean, + @SerialName("reject_comment") val rejectComment: String?, + ) + } + } + + object Image { + data class Domain( + val id: Int, + val userRequestId: Int?, + val fileName: String, + val fileSize: Int, + val fileType: String, + val uploadedAt: String, + val url: String, + ) + + object DTO { + @Serializable + data class Get( + @SerialName("id") val id: Int, + @SerialName("request_id") val userRequestId: Int?, + @SerialName("file_name") val fileName: String, + @SerialName("file_size") val fileSize: Int, + @SerialName("file_type") val fileType: String, + @SerialName("uploaded_at") val uploadedAt: String, + @SerialName("url") val url: String, + ) { + fun toDomain(): Domain { + return Domain( + id = id, + userRequestId = userRequestId, + fileName = fileName, + fileSize = fileSize, + fileType = fileType, + uploadedAt = uploadedAt, + url = url, + ) + } + } + } + } + + object Municipality { + data class Domain( + val id: Int, + val name: String, + ) { + fun toGetDTO(): DTO.Get { + return DTO.Get( + id = id, + name = name, + ) + } + + override fun toString(): String { + return name + } + } + + object DTO { + @Serializable + data class Get( + @SerialName("id") val id: Int, + @SerialName("district_name") val name: String, + ) { + fun toDomain(): Domain { + return Domain( + id = id, + name = name, + ) + } + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Platform.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Platform.kt new file mode 100644 index 0000000..acef5f6 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/core/Platform.kt @@ -0,0 +1,177 @@ +package ru.cit71.pchelovod71.core + +import androidx.compose.ui.text.input.KeyboardType +import kotlinx.browser.document +import kotlinx.browser.window +import kotlinx.coroutines.await +import org.khronos.webgl.Uint8Array +import org.khronos.webgl.get +import org.khronos.webgl.set +import org.w3c.dom.CanvasRenderingContext2D +import org.w3c.dom.HTMLCanvasElement +import org.w3c.dom.HTMLDivElement +import org.w3c.dom.HTMLInputElement +import org.w3c.dom.HTMLTextAreaElement +import org.w3c.dom.Image +import org.w3c.files.FileReader +import org.w3c.files.get +import kotlin.math.round + +const val MAX_WIDTH = 1920.0 +const val MAX_HEIGHT = 1080.0 +const val TYPE = "image/jpeg" +val QUALITY: JsAny = js(".8") +val STARTAPP_PATTERN = Regex("^.*tgWebAppStartParam=(.*?)(?:&.*)?$") + +@JsFun("() => getTelegramInitData()") +private external fun topLevelGetTelegramInitData(): String + +@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING") +object Platform { + val module = Models.Module.WasmJsMain + + suspend fun getTelegramInitData() = Config.telegramInitData ?: topLevelGetTelegramInitData() + + suspend fun getBindUuid() = STARTAPP_PATTERN.find(window.location.search)?.groupValues[1] + + fun base64Encode( + data: String, + ) = window.btoa(data) + + suspend fun copyToClipboard( + data: String, + ) { + window.navigator.clipboard.writeText(data).await() + } + + fun initIme( + value: String, + onValueChange: (String) -> Unit, + singleLine: Boolean, + label: String, + keyboardType: KeyboardType, + ) { + val blank = document.createElement("div") as HTMLDivElement + blank.classList.add("blank") + blank.addEventListener("click", { + blank.remove() + }) + + val container = document.createElement("div") as HTMLDivElement + container.classList.add("container") + container.addEventListener("click", { event -> + event.stopPropagation() + }) + + val textField = when (singleLine) { + true -> document.createElement("input") as HTMLInputElement + false -> document.createElement("textarea") as HTMLTextAreaElement + } + textField.classList.add("text-field") + when (textField) { + is HTMLInputElement -> { + textField.value = value + textField.placeholder = label + textField.type = when (keyboardType) { + KeyboardType.Text -> "text" + KeyboardType.Number -> "number" + KeyboardType.Decimal -> "number" + KeyboardType.Phone -> "tel" + KeyboardType.Email -> "email" + KeyboardType.Password -> "password" + KeyboardType.NumberPassword -> "password" + else -> "text" + } + } + is HTMLTextAreaElement -> { + textField.value = value + textField.placeholder = label + textField.rows = 4 + } + } + + val button = document.createElement("input") as HTMLInputElement + button.classList.add("continue") + button.type = "button" + button.value = "Продолжить" + button.addEventListener("click", { + blank.remove() + }) + + container.appendChild(textField) + container.appendChild(button) + blank.appendChild(container) + document.body!!.appendChild(blank) + + textField.focus() + + textField.addEventListener("input", { + when (textField) { + is HTMLInputElement -> onValueChange(textField.value) + is HTMLTextAreaElement -> onValueChange(textField.value) + } + }) + } + + fun pickFile( + callback: (String, ByteArray) -> Unit, + ) { + val input = document.createElement("input") as HTMLInputElement + input.type = "file" + input.style.display = "none" + input.accept = "image/*" + input.setAttribute("capture", "environment") + + input.onchange = { _ -> + input.files?.let { it[0] }?.let { file -> + val fileReader = FileReader() + + fileReader.onload = { _ -> + val img = Image() + + img.onload = { + val canvas = document.createElement("canvas") as HTMLCanvasElement + var width = img.width.toDouble() + var height = img.height.toDouble() + + if (width > MAX_WIDTH || height > MAX_HEIGHT) { + if (width / MAX_WIDTH > height / MAX_HEIGHT) { + width = MAX_WIDTH + height = round((img.height * (MAX_WIDTH / img.width))) + } else { + height = MAX_HEIGHT + width = round(img.width * (MAX_HEIGHT / img.height)) + } + } + + canvas.width = width.toInt() + canvas.height = height.toInt() + val ctx = canvas.getContext("2d") as CanvasRenderingContext2D + ctx.drawImage(img, .0, .0, width, height) + val dataUrl = canvas.toDataURL(TYPE, QUALITY) + + val base64Data = dataUrl.substringAfter(",") + val binaryString = window.atob(base64Data) + val uint8Array = Uint8Array(binaryString.length) + for (i in binaryString.indices) + uint8Array[i] = binaryString[i].code.toByte() + val byteArray = ByteArray(uint8Array.length) { i -> uint8Array[i] } + callback( + file.type, + byteArray, + ) + } + + fileReader.result?.let { + img.src = "$it" + } + } + + fileReader.readAsDataURL(file) + } + } + + document.body?.appendChild(input) + input.click() + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/main.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/main.kt new file mode 100644 index 0000000..fd1756d --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/main.kt @@ -0,0 +1,12 @@ +package ru.cit71.pchelovod71 + +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.window.ComposeViewport +import kotlinx.browser.document + +@OptIn(ExperimentalComposeUiApi::class) +fun main() { + ComposeViewport(document.body!!) { + App() + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/BooleanFilter.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/BooleanFilter.kt new file mode 100644 index 0000000..bfc2db2 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/BooleanFilter.kt @@ -0,0 +1,43 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun BooleanFilter( + modifier: Modifier = Modifier, + valueMap: Map, + value: Boolean?, + onValueChange: (Boolean?) -> Unit, +) { + SingleChoiceSegmentedButtonRow( + modifier = modifier + .padding( + vertical = 12.dp, + ), + ) { + valueMap.entries.forEachIndexed { index, entry -> + SegmentedButton( + shape = SegmentedButtonDefaults.itemShape( + index = index, + count = valueMap.size, + ), + onClick = { + onValueChange(entry.value) + }, + selected = value == entry.value, + label = { + Text( + text = entry.key, + ) + }, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Button.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Button.kt new file mode 100644 index 0000000..4693cc3 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Button.kt @@ -0,0 +1,41 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.material3.Button +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@Composable +fun ConfirmButton( + modifier: Modifier, + onClick: () -> Unit, + label: String, +) { + Button( + modifier = Modifier + .then(modifier), + onClick = onClick, + ) { + Text( + text = label, + ) + } +} + +@Composable +fun DismissButton( + modifier: Modifier, + onClick: () -> Unit, + label: String, +) { + OutlinedButton( + modifier = Modifier + .then(modifier), + onClick = onClick, + ) { + Text( + text = label, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Column.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Column.kt new file mode 100644 index 0000000..cab721b --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Column.kt @@ -0,0 +1,95 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier + +@Composable +fun MainColumn( + modifier: Modifier = Modifier, + paddingValues: PaddingValues = PaddingValues(), + horizontalAlignment: Alignment.Horizontal = Alignment.Start, + verticalArrangement: Arrangement.Vertical = Arrangement.Top, + content: @Composable ColumnScope.() -> Unit, +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .verticalScroll( + state = rememberScrollState(), + ) + .then(modifier), + horizontalAlignment = horizontalAlignment, + verticalArrangement = verticalArrangement, + content = content, + ) +} + +@Composable +fun MainColumnList( + modifier: Modifier = Modifier, + paddingValues: PaddingValues = PaddingValues(), + onScrollChange: ((Boolean) -> Unit)? = null, + valueList: List, + placeholder: String, + content: @Composable (T) -> Unit, +) { + val verticalScrollState = rememberScrollState() + + LaunchedEffect(Unit) { + onScrollChange?.let { onScrollChange -> + var previousValue = 0 + snapshotFlow { + verticalScrollState.value + }.collect { + onScrollChange(it <= previousValue) + previousValue = it + } + } + } + + when (valueList.isEmpty()) { + true -> { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentAlignment = Alignment.Center, + ) { + Text( + text = placeholder, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + false -> { + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .verticalScroll( + state = verticalScrollState, + ) + .then(modifier), + ) { + valueList.forEach { + content(it) + } + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/CopyField.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/CopyField.kt new file mode 100644 index 0000000..acde4aa --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/CopyField.kt @@ -0,0 +1,83 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.PointerIcon +import androidx.compose.ui.input.pointer.pointerHoverIcon +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.round_content_copy_24 +import kotlinx.coroutines.launch +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Platform + +@Composable +fun CopyField( + mainScaffoldParams: MainScaffoldParams, + value: String, + label: String, + supportingText: String? = null, +) { + val clipboardCoroutineScope = rememberCoroutineScope() + val outlinedTextFieldDefaults = OutlinedTextFieldDefaults.colors() + + OutlinedTextField( + modifier = Modifier + .fillMaxWidth() + .pointerHoverIcon( + icon = PointerIcon.Default, + overrideDescendants = true, + ), + value = value, + onValueChange = {}, + enabled = false, + label = { + Text( + text = label, + ) + }, + trailingIcon = { + IconButton( + onClick = { + clipboardCoroutineScope.launch { + Platform.copyToClipboard(value) + mainScaffoldParams.showSuccessSnackbar( + "Ссылка скопирована в буфер обмена" + ) + } + }, + ) { + Icon( + painter = painterResource(Res.drawable.round_content_copy_24), + contentDescription = null, + ) + } + }, + supportingText = supportingText?.let { + { + Text( + text = it, + ) + } + }, + singleLine = true, + colors = outlinedTextFieldDefaults.copy( + disabledTextColor = outlinedTextFieldDefaults.unfocusedTextColor, + disabledContainerColor = outlinedTextFieldDefaults.unfocusedContainerColor, + disabledIndicatorColor = outlinedTextFieldDefaults.unfocusedIndicatorColor, + disabledLeadingIconColor = outlinedTextFieldDefaults.unfocusedLeadingIconColor, + disabledTrailingIconColor = outlinedTextFieldDefaults.unfocusedTrailingIconColor, + disabledLabelColor = outlinedTextFieldDefaults.unfocusedLabelColor, + disabledPlaceholderColor = outlinedTextFieldDefaults.unfocusedPlaceholderColor, + disabledSupportingTextColor = outlinedTextFieldDefaults.unfocusedSupportingTextColor, + disabledPrefixColor = outlinedTextFieldDefaults.unfocusedPrefixColor, + disabledSuffixColor = outlinedTextFieldDefaults.unfocusedSuffixColor, + ), + ) +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Dialog.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Dialog.kt new file mode 100644 index 0000000..bcead82 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Dialog.kt @@ -0,0 +1,84 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.baseline_close_24 +import org.jetbrains.compose.resources.painterResource + +interface MainDialogParams { + val onDismiss: () -> Unit +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainDialog( + title: String, + onDismiss: () -> Unit, + buttons: @Composable RowScope.() -> Unit, + content: @Composable (MainScaffoldParams) -> Unit, +) { + Dialog( + onDismissRequest = {}, + properties = DialogProperties( + usePlatformDefaultWidth = false, + ), + ) { + MainScaffold( + topBar = { + TopAppBar( + title = { + Text( + text = title, + overflow = TextOverflow.Ellipsis, + softWrap = false, + ) + }, + navigationIcon = { + IconButton( + onClick = onDismiss, + ) { + Icon( + painter = painterResource(Res.drawable.baseline_close_24), + contentDescription = null, + ) + } + }, + ) + }, + bottomBar = { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + content = buttons, + ) + } + ) { mainScaffoldParams -> + Box( + modifier = Modifier + .padding( + horizontal = 16.dp, + ), + ) { + content(mainScaffoldParams) + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/DropdownField.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/DropdownField.kt new file mode 100644 index 0000000..366cb5a --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/DropdownField.kt @@ -0,0 +1,85 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.ExposedDropdownMenuDefaults +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.PointerIcon +import androidx.compose.ui.input.pointer.pointerHoverIcon + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DropdownField( + modifier: Modifier = Modifier, + valueList: List, + value: T, + onValueChange: (T) -> Unit, + enabled: Boolean = true, + label: String, +) { + var expanded by remember { mutableStateOf(false) } + + ExposedDropdownMenuBox( + expanded = enabled && expanded, + onExpandedChange = { + expanded = it + } + ) { + OutlinedTextField( + modifier = modifier + .fillMaxWidth() + .menuAnchor( + type = ExposedDropdownMenuAnchorType.PrimaryEditable, + ) + .pointerHoverIcon( + icon = PointerIcon.Default, + overrideDescendants = true, + ), + enabled = enabled, + readOnly = true, + value = value.toString(), + onValueChange = {}, + label = { + Text( + text = label, + ) + }, + trailingIcon = { + ExposedDropdownMenuDefaults.TrailingIcon( + expanded = enabled && expanded + ) + }, + ) + + ExposedDropdownMenu( + expanded = enabled && expanded, + onDismissRequest = { + expanded = false + } + ) { + valueList.forEach { + DropdownMenuItem( + text = { + Text( + text = it.toString(), + ) + }, + onClick = { + onValueChange(it) + expanded = false + } + ) + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/ImagePicker.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/ImagePicker.kt new file mode 100644 index 0000000..326fd6f --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/ImagePicker.kt @@ -0,0 +1,136 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.material3.carousel.CarouselState +import androidx.compose.material3.carousel.HorizontalMultiBrowseCarousel +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.baseline_close_24 +import coil3.compose.rememberAsyncImagePainter +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Models + +enum class InteractionType { + Upload, + Download, +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ImagePicker( + imageList: List, + onImageAdd: (() -> Unit)? = null, + onImageDrop: (Int) -> Unit, + onImageSelect: (Models.Image.Domain) -> Unit, + interactionType: InteractionType, +) { + Column { + if (interactionType == InteractionType.Upload) + onImageAdd?.let { + OutlinedButton( + modifier = Modifier + .fillMaxWidth(), + onClick = it, + ) { + Text( + text = "Добавить изображение", + ) + } + } + + when (imageList.size) { + 0 -> { + Text( + modifier = Modifier + .fillMaxWidth() + .padding( + top = 4.dp, + ), + text = "Изображения не выбраны", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.bodySmall, + ) + } + else -> { + HorizontalMultiBrowseCarousel( + state = remember(imageList.size) { + CarouselState( + currentItem = imageList.size, + itemCount = { + imageList.size + }, + ) + }, + modifier = Modifier + .fillMaxWidth() + .wrapContentHeight() + .padding( + vertical = 8.dp, + ), + preferredItemWidth = 186.dp, + itemSpacing = 8.dp, + ) { i -> + val image = imageList[i] + Box( + contentAlignment = Alignment.TopEnd, + ) { + Image( + modifier = Modifier + .height(205.dp) + .maskClip(MaterialTheme.shapes.extraLarge) + .clickable { + onImageSelect(image) + }, + painter = rememberAsyncImagePainter( + model = image.url, + contentScale = ContentScale.None, + ), + contentDescription = null, + contentScale = ContentScale.Crop, + ) + + if (interactionType == InteractionType.Upload) + IconButton( + onClick = { + onImageDrop(i) + }, + ) { + Icon( + painter = painterResource(Res.drawable.baseline_close_24), + contentDescription = null, + ) + } + } + } + } + } + + if (interactionType == InteractionType.Upload && imageList.size > 1) + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Для прокрутки изображений на компьютерах и ноутбуках удерживайте клавишу Shift", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.bodySmall, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/LoadingIndicator.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/LoadingIndicator.kt new file mode 100644 index 0000000..fe5f99c --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/LoadingIndicator.kt @@ -0,0 +1,20 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.layout.size +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.LoadingIndicator +import androidx.compose.material3.LoadingIndicatorDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun MainLoadingIndicator() { + LoadingIndicator( + modifier = Modifier + .size( + width = LoadingIndicatorDefaults.ContainerWidth * 3, + height = LoadingIndicatorDefaults.ContainerHeight * 3, + ), + ) +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/RegistrationRequestCard.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/RegistrationRequestCard.kt new file mode 100644 index 0000000..5516d91 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/RegistrationRequestCard.kt @@ -0,0 +1,200 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardColors +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.round_check_24 +import frontend.composeapp.generated.resources.round_close_24 +import frontend.composeapp.generated.resources.round_manage_accounts_24 +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Models + +@Composable +fun RegistrationRequestCard( + userDomain: Models.User.Domain, + selected: Boolean, + onSelectedChange: ((Models.User.Domain)?) -> Unit, + onAccept: (Models.User.Domain) -> Unit, + onEdit: (Models.User.Domain) -> Unit, + onDecline: (Models.User.Domain) -> Unit, +) { + val backgroundColor = animateColorAsState( + targetValue = when (selected) { + true -> MaterialTheme.colorScheme.primary.copy( + alpha = 0.12f, + ) + false -> Color.Transparent + }, + ) + val horizontalPadding = animateDpAsState( + targetValue = when (selected) { + true -> 16.dp + false -> 0.dp + }, + ) + val shapeState = animateDpAsState( + targetValue = when (selected) { + true -> 28.0.dp + false -> 0.0.dp + }, + ) + val cardColors = CardDefaults.cardColors() + + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontalPadding.value), + shape = RoundedCornerShape(shapeState.value), + colors = CardColors( + containerColor = backgroundColor.value, + contentColor = cardColors.contentColor, + disabledContainerColor = cardColors.disabledContainerColor, + disabledContentColor = cardColors.disabledContentColor, + ), + ) { + Column { + Column( + modifier = Modifier + .fillMaxWidth() + .clickable { + onSelectedChange( + when (selected) { + true -> null + false -> userDomain + } + ) + } + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = userDomain.fullName, + overflow = TextOverflow.Ellipsis, + maxLines = 1, + style = MaterialTheme.typography.titleLarge, + ) + + Text( + text = userDomain.municipality.name, + overflow = TextOverflow.Ellipsis, + maxLines = 3, + style = MaterialTheme.typography.bodyMedium, + ) + } + + AnimatedVisibility( + visible = selected, + ) { + HorizontalDivider() + Row( + modifier = Modifier + .fillMaxWidth() + .height(IntrinsicSize.Min), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + RegistrationRequestButton( + modifier = Modifier + .weight( + weight = 1f, + fill = true, + ), + title = "Принять", + painter = painterResource(Res.drawable.round_check_24), + onClick = { + onAccept(userDomain) + }, + ) + RegistrationRequestButton( + modifier = Modifier + .weight( + weight = 1f, + fill = true, + ), + title = "Изменить", + painter = painterResource(Res.drawable.round_manage_accounts_24), + onClick = { + onEdit(userDomain) + }, + ) + RegistrationRequestButton( + modifier = Modifier + .weight( + weight = 1f, + fill = true, + ), + title = "Отклонить", + painter = painterResource(Res.drawable.round_close_24), + onClick = { + onDecline(userDomain) + }, + ) + } + } + } + } +} + +@Composable +fun RegistrationRequestButton( + modifier: Modifier = Modifier, + title: String, + painter: Painter, + onClick: () -> Unit, +) { + Button( + onClick = onClick, + modifier = modifier + .fillMaxHeight(), + shape = RectangleShape, + colors = ButtonDefaults.textButtonColors(), + contentPadding = PaddingValues(), + ) { + Column( + modifier = Modifier + .padding(12.dp) + .fillMaxHeight(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Icon( + painter = painter, + contentDescription = null, + ) + + Text( + text = title, + textAlign = TextAlign.Center, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Scaffold.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Scaffold.kt new file mode 100644 index 0000000..b7f6a73 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Scaffold.kt @@ -0,0 +1,165 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.AnimatedVisibilityScope +import androidx.compose.animation.expandHorizontally +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkHorizontally +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHostState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.pointer.pointerInput +import kotlinx.coroutines.launch + +data class MainScaffoldParams( + val paddingValues: PaddingValues, + val showSuccessSnackbar: (String) -> Unit, + val showErrorSnackbar: (String) -> Unit, + val setFloatingActionButton: ((@Composable AnimatedVisibilityScope.() -> Unit)?) -> Unit, + val withLoadingIndicator: suspend (suspend () -> Unit) -> Unit, +) + +@Composable +fun MainScaffold( + modifier: Modifier = Modifier, + topBar: @Composable () -> Unit = {}, + bottomBar: @Composable () -> Unit = {}, + content: (@Composable (MainScaffoldParams) -> Unit)? = null, +) { + var loadingIndicator by remember { mutableStateOf(false) } + + suspend fun withLoadingIndicator( + function: suspend () -> Unit, + ) { + loadingIndicator = true + try { + function() + } finally { + loadingIndicator = false + } + } + + val snackbarCoroutineScope = rememberCoroutineScope() + val successSnackbarHostState = SnackbarHostState() + val errorSnackbarHostState = SnackbarHostState() + + fun showSuccessSnackbar( + message: String, + ) { + snackbarCoroutineScope.launch { + successSnackbarHostState.showSnackbar( + message = message, + withDismissAction = true, + ) + } + } + + fun showErrorSnackbar( + message: String, + ) { + snackbarCoroutineScope.launch { + errorSnackbarHostState.showSnackbar( + message = message, + withDismissAction = true, + ) + } + } + + var floatingActionButton by remember { mutableStateOf<(@Composable AnimatedVisibilityScope.() -> Unit)?>(null) } + var floatingActionButtonVisible by remember { mutableStateOf(false) } + + fun setFloatingActionButton( + content: (@Composable AnimatedVisibilityScope.() -> Unit)?, + ) { + when (content) { + null -> { + floatingActionButtonVisible = false + } + else -> { + floatingActionButton = content + floatingActionButtonVisible = true + } + } + } + + Scaffold( + modifier = Modifier + .fillMaxSize() + .then(modifier), + topBar = topBar, + bottomBar = bottomBar, + floatingActionButton = { + floatingActionButton?.let { + AnimatedVisibility( + visible = floatingActionButtonVisible, + enter = fadeIn() + expandHorizontally(), + exit = shrinkHorizontally() + fadeOut(), + content = it, + ) + } + }, + snackbarHost = { + MainSnackbarHost( + successSnackbarHostState = successSnackbarHostState, + errorSnackbarHostState = errorSnackbarHostState, + ) + }, + content = { paddingValues -> + content?.let { + it( + MainScaffoldParams( + paddingValues = paddingValues, + showSuccessSnackbar = ::showSuccessSnackbar, + showErrorSnackbar = ::showErrorSnackbar, + setFloatingActionButton = ::setFloatingActionButton, + withLoadingIndicator = ::withLoadingIndicator, + ), + ) + } + + AnimatedVisibility( + modifier = Modifier + .fillMaxSize(), + visible = loadingIndicator, + enter = fadeIn(), + exit = fadeOut(), + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + color = when (content) { + null -> Color.Unspecified + else -> Color.Black.copy( + alpha = .5f, + ) + }, + ) + .pointerInput(Unit) { + awaitPointerEventScope { + while (true) { + awaitPointerEvent() + } + } + }, + contentAlignment = Alignment.Center, + ) { + MainLoadingIndicator() + } + } + }, + ) +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SettingCard.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SettingCard.kt new file mode 100644 index 0000000..10898c6 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SettingCard.kt @@ -0,0 +1,60 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp + +@Composable +fun SettingCard( + name: String, + caption: String, + checked: Boolean, + onCheckedChange: ((Boolean) -> Unit), +) { + Row( + modifier = Modifier + .fillMaxWidth() + .clickable( + onClick = { + onCheckedChange(!checked) + }, + ) + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + modifier = Modifier + .weight(1f), + verticalArrangement = Arrangement.spacedBy(8.dp), + ){ + Text( + text = name, + overflow = TextOverflow.Ellipsis, + softWrap = false, + style = MaterialTheme.typography.titleLarge, + ) + + Text( + text = caption, + style = MaterialTheme.typography.bodyMedium, + ) + } + + Switch( + checked = checked, + onCheckedChange = onCheckedChange, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SnackbarHost.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SnackbarHost.kt new file mode 100644 index 0000000..6d678eb --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/SnackbarHost.kt @@ -0,0 +1,35 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Snackbar +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +@Composable +fun MainSnackbarHost( + successSnackbarHostState: SnackbarHostState, + errorSnackbarHostState: SnackbarHostState, +) { + val successContainerDark = Color(0xFF009424) + val onSuccessContainerDark = Color(0xFFD6FFEA) + + SnackbarHost(successSnackbarHostState) { + Snackbar( + snackbarData = it, + contentColor = onSuccessContainerDark, + containerColor = successContainerDark, + dismissActionContentColor = onSuccessContainerDark, + ) + } + + SnackbarHost(errorSnackbarHostState) { + Snackbar( + snackbarData = it, + contentColor = MaterialTheme.colorScheme.onErrorContainer, + containerColor = MaterialTheme.colorScheme.errorContainer, + dismissActionContentColor = MaterialTheme.colorScheme.onErrorContainer, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Spoiler.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Spoiler.kt new file mode 100644 index 0000000..3e42b43 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/Spoiler.kt @@ -0,0 +1,88 @@ +package ru.cit71.pchelovod71.ui.components// TODO: спойлер для расширенных параметров пользователя; не пригодился, но оставлен до востребования + +//package ru.cit71.bee_frontend.ui.components +// +//import androidx.compose.animation.AnimatedVisibility +//import androidx.compose.animation.core.FastOutSlowInEasing +//import androidx.compose.animation.core.animateFloatAsState +//import androidx.compose.animation.core.tween +//import androidx.compose.foundation.layout.Arrangement +//import androidx.compose.foundation.layout.Column +//import androidx.compose.foundation.layout.ColumnScope +//import androidx.compose.foundation.layout.Row +//import androidx.compose.foundation.layout.fillMaxWidth +//import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +//import androidx.compose.material3.Icon +//import androidx.compose.material3.IconToggleButton +//import androidx.compose.material3.MaterialTheme +//import androidx.compose.material3.Text +//import androidx.compose.runtime.Composable +//import androidx.compose.runtime.getValue +//import androidx.compose.runtime.mutableStateOf +//import androidx.compose.runtime.remember +//import androidx.compose.runtime.setValue +//import androidx.compose.ui.Alignment +//import androidx.compose.ui.Modifier +//import androidx.compose.ui.draw.rotate +//import androidx.compose.ui.text.style.TextOverflow +//import androidx.compose.ui.unit.dp +//import frontend.composeapp.generated.resources.Res +//import frontend.composeapp.generated.resources.round_arrow_right_24 +//import org.jetbrains.compose.resources.painterResource +// +//@OptIn(ExperimentalMaterial3ExpressiveApi::class) +//@Composable +//fun Spoiler( +// name: String, +// content: @Composable ColumnScope.() -> Unit, +//) { +// var expanded by remember { mutableStateOf(false) } +// val rotation by animateFloatAsState( +// targetValue = if (expanded) 90f else 0f, +// animationSpec = tween( +// durationMillis = 300, +// easing = FastOutSlowInEasing +// ), +// ) +// +// Column( +// verticalArrangement = Arrangement.spacedBy(16.dp), +// ) { +// Row( +// horizontalArrangement = Arrangement.spacedBy(8.dp), +// verticalAlignment = Alignment.CenterVertically, +// ) { +// IconToggleButton( +// checked = expanded, +// onCheckedChange = { +// expanded = it +// }, +// ) { +// Icon( +// modifier = Modifier +// .rotate(rotation), +// painter = painterResource(Res.drawable.round_arrow_right_24), +// contentDescription = null, +// ) +// } +// +// Text( +// text = name, +// overflow = TextOverflow.Ellipsis, +// softWrap = false, +// style = MaterialTheme.typography.titleMedium, +// ) +// } +// +// AnimatedVisibility( +// visible = expanded, +// ) { +// Column( +// modifier = Modifier +// .fillMaxWidth(), +// verticalArrangement = Arrangement.spacedBy(16.dp), +// content = content, +// ) +// } +// } +//} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/TextField.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/TextField.kt new file mode 100644 index 0000000..c521ed0 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/TextField.kt @@ -0,0 +1,89 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.core.Platform + +@Composable +fun MainTextField( + modifier: Modifier = Modifier, + value: String, + onValueChange: (String) -> Unit, + enabled: Boolean = true, + label: String, + singleLine: Boolean = true, + minLines: Int = 1, + maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, + keyboardType: KeyboardType = KeyboardType.Unspecified, +) { + val outlinedTextFieldDefaults = OutlinedTextFieldDefaults.colors() + + val moduleModifier = when (Platform.module) { + Models.Module.DesktopMain -> Modifier + Models.Module.WasmJsMain -> Modifier + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = null, + ) { + if (enabled) + Platform.initIme( + value = value, + onValueChange = onValueChange, + singleLine = singleLine, + label = label, + keyboardType = keyboardType, + ) + } + } + + OutlinedTextField( + modifier = modifier + .fillMaxWidth() + .then(moduleModifier), + value = value, + onValueChange = onValueChange, + enabled = when (Platform.module) { + Models.Module.DesktopMain -> enabled + Models.Module.WasmJsMain -> false + }, + label = { + Text( + text = label, + ) + }, + keyboardOptions = KeyboardOptions( + keyboardType = keyboardType, + ), + singleLine = singleLine, + maxLines = maxLines, + minLines = minLines, + colors = when (Platform.module) { + Models.Module.DesktopMain -> outlinedTextFieldDefaults + Models.Module.WasmJsMain -> when (enabled) { + true -> outlinedTextFieldDefaults.copy( + disabledTextColor = outlinedTextFieldDefaults.unfocusedTextColor, + disabledContainerColor = outlinedTextFieldDefaults.unfocusedContainerColor, + disabledIndicatorColor = outlinedTextFieldDefaults.unfocusedIndicatorColor, + disabledLeadingIconColor = outlinedTextFieldDefaults.unfocusedLeadingIconColor, + disabledTrailingIconColor = outlinedTextFieldDefaults.unfocusedTrailingIconColor, + disabledLabelColor = outlinedTextFieldDefaults.unfocusedLabelColor, + disabledPlaceholderColor = outlinedTextFieldDefaults.unfocusedPlaceholderColor, + disabledSupportingTextColor = outlinedTextFieldDefaults.unfocusedSupportingTextColor, + disabledPrefixColor = outlinedTextFieldDefaults.unfocusedPrefixColor, + disabledSuffixColor = outlinedTextFieldDefaults.unfocusedSuffixColor, + ) + false -> outlinedTextFieldDefaults + } + }, + ) +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserCard.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserCard.kt new file mode 100644 index 0000000..3b74348 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserCard.kt @@ -0,0 +1,51 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import ru.cit71.pchelovod71.core.Models + +@Composable +fun UserCard( + userDomain: Models.User.Domain, + onClick: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxWidth() + .clickable( + onClick = onClick, + ) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ){ + Text( + text = userDomain.fullName, + style = MaterialTheme.typography.titleLarge, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = userDomain.organization, + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = userDomain.phoneNumber, + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = userDomain.municipality.name, + style = MaterialTheme.typography.bodyMedium, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserRequestCard.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserRequestCard.kt new file mode 100644 index 0000000..1194a8d --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/components/UserRequestCard.kt @@ -0,0 +1,55 @@ +package ru.cit71.pchelovod71.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import ru.cit71.pchelovod71.core.Models + +@Composable +fun UserRequestCard( + userRequestDomain: Models.UserRequest.Domain, + onClick: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxWidth() + .clickable( + onClick = onClick, + ) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ){ + Text( + text = userRequestDomain.type.name, + style = MaterialTheme.typography.titleLarge, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = userRequestDomain.user.municipality.name, + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = userRequestDomain.address, + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = when (userRequestDomain.accepted) { + true -> "Принято" + false -> "Отклонено" + null -> "Новое" + }, + style = MaterialTheme.typography.bodyMedium, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ConfirmDialog.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ConfirmDialog.kt new file mode 100644 index 0000000..d8fb0bf --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ConfirmDialog.kt @@ -0,0 +1,119 @@ +package ru.cit71.pchelovod71.ui.dialogs + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import ru.cit71.pchelovod71.ui.components.ConfirmButton +import ru.cit71.pchelovod71.ui.components.DismissButton +import ru.cit71.pchelovod71.ui.components.MainDialogParams +import ru.cit71.pchelovod71.ui.components.MainTextField + +sealed interface ConfirmDialogParams : MainDialogParams + +data class ConfirmCommentDialogParams( + override val onDismiss: () -> Unit, + val onConfirm: (String) -> Unit, +) : ConfirmDialogParams + +data class ConfirmOnlyDialogParams( + override val onDismiss: () -> Unit, + val onConfirm: () -> Unit, + val title: String, +) : ConfirmDialogParams + +@Composable +fun ConfirmDialog( + confirmDialogParams: ConfirmDialogParams, + dismissButtonText: String, + confirmButtonText: String, +) { + var comment by remember { mutableStateOf("") } + + Dialog( + onDismissRequest = confirmDialogParams.onDismiss, + properties = DialogProperties( + dismissOnClickOutside = false, + ), + ) { + Surface( + modifier = Modifier + .wrapContentSize(), + shape = MaterialTheme.shapes.medium, + ) { + Column( + modifier = Modifier + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + when (confirmDialogParams) { + is ConfirmCommentDialogParams -> { + MainTextField( + value = comment, + onValueChange = { + comment = it + }, + label = "Комментарий", + keyboardType = KeyboardType.Text, + singleLine = false, + minLines = 3, + maxLines = 6, + ) + } + is ConfirmOnlyDialogParams -> { + Text( + text = confirmDialogParams.title, + overflow = TextOverflow.Ellipsis, + softWrap = false, + style = MaterialTheme.typography.titleLarge, + ) + } + } + + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + when (confirmDialogParams) { + is ConfirmCommentDialogParams -> { + confirmDialogParams.onConfirm(comment) + } + is ConfirmOnlyDialogParams -> { + confirmDialogParams.onConfirm() + } + } + }, + label = confirmButtonText, + ) + + DismissButton( + modifier = Modifier + .weight(1f), + onClick = { + confirmDialogParams.onDismiss() + }, + label = dismissButtonText, + ) + } + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ImageViewDialog.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ImageViewDialog.kt new file mode 100644 index 0000000..3a46a96 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/ImageViewDialog.kt @@ -0,0 +1,50 @@ +package ru.cit71.pchelovod71.ui.dialogs + +import androidx.compose.foundation.Image +import androidx.compose.foundation.gestures.TransformableState +import androidx.compose.foundation.gestures.transformable +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.window.Dialog +import coil3.compose.rememberAsyncImagePainter +import ru.cit71.pchelovod71.core.Models +import kotlin.math.max + +@Composable +fun ImageViewDialog( + image: Models.Image.Domain, + onClose: () -> Unit, +) { + var zoom by remember { mutableStateOf(1f) } + var pan by remember { mutableStateOf(Offset.Zero) } + var rotation by remember { mutableStateOf(0f) } + + Dialog( + onDismissRequest = onClose, + ) { + Image( + modifier = Modifier + .wrapContentSize() + .transformable( + state = TransformableState { zoomChange, panChange, rotationChange -> + zoom = max(zoom * zoomChange, 1f) + pan += panChange + rotation += rotationChange + }, + ), + painter = rememberAsyncImagePainter( + model = image.url, + contentScale = ContentScale.None, + ), + contentDescription = null, + contentScale = ContentScale.Fit, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserDialog.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserDialog.kt new file mode 100644 index 0000000..7d6197d --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserDialog.kt @@ -0,0 +1,171 @@ +package ru.cit71.pchelovod71.ui.dialogs + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import io.ktor.http.clone +import ru.cit71.pchelovod71.core.Config +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.ui.components.ConfirmButton +import ru.cit71.pchelovod71.ui.components.CopyField +import ru.cit71.pchelovod71.ui.components.DismissButton +import ru.cit71.pchelovod71.ui.components.MainColumn +import ru.cit71.pchelovod71.ui.components.MainDialog +import ru.cit71.pchelovod71.ui.components.MainDialogParams +import ru.cit71.pchelovod71.ui.components.DropdownField +import ru.cit71.pchelovod71.ui.components.MainTextField + +sealed interface UserDialogParams : MainDialogParams + +data class CreateUserDialogParams( + override val onDismiss: () -> Unit, + val onCreate: ((Models.User.Domain) -> Unit), +) : UserDialogParams + +data class UpdateUserDialogParams( + override val onDismiss: () -> Unit, + val onSave: ((Models.User.Domain) -> Unit), + val onDelete: ((Models.User.Domain) -> Unit), +) : UserDialogParams + +data class AcceptUserDialogParams( + override val onDismiss: () -> Unit, + val onAccept: ((Models.User.Domain) -> Unit), + val onDecline: ((Models.User.Domain) -> Unit), +) : UserDialogParams + +@Composable +fun UserDialog( + userDomain: Models.User.Domain, + municipalityDomainList: List, + userDialogParams: UserDialogParams, +) { + var outUserDomain by remember { mutableStateOf(userDomain) } + + MainDialog( + title = when (userDialogParams) { + is CreateUserDialogParams -> "Добавить пользователя" + is UpdateUserDialogParams -> "Изменить пользователя" + is AcceptUserDialogParams -> "Принять заявку на регистрацию" + }, + onDismiss = userDialogParams.onDismiss, + buttons = { + when (userDialogParams) { + is CreateUserDialogParams -> { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + userDialogParams.onCreate(outUserDomain) + }, + label = "Добавить", + ) + } + is UpdateUserDialogParams -> { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + userDialogParams.onSave(outUserDomain) + }, + label = "Сохранить", + ) + DismissButton( + modifier = Modifier + .weight(1f), + onClick = { + userDialogParams.onDelete(outUserDomain) + }, + label = "Удалить", + ) + } + is AcceptUserDialogParams -> { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + userDialogParams.onAccept(outUserDomain) + }, + label = "Принять", + ) + DismissButton( + modifier = Modifier + .weight(1f), + onClick = { + userDialogParams.onDecline(outUserDomain) + }, + label = "Отклонить", + ) + } + } + }, + ) { mainScaffoldParams -> + MainColumn( + paddingValues = mainScaffoldParams.paddingValues, + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + MainTextField( + value = outUserDomain.fullName, + onValueChange = { + outUserDomain = outUserDomain.copy( + fullName = it, + ) + }, + label = "ФИО", + keyboardType = KeyboardType.Text, + ) + + MainTextField( + value = outUserDomain.organization, + onValueChange = { + outUserDomain = outUserDomain.copy( + organization = it, + ) + }, + label = "Организация", + keyboardType = KeyboardType.Text, + ) + + MainTextField( + value = outUserDomain.phoneNumber, + onValueChange = { + outUserDomain = outUserDomain.copy( + phoneNumber = it, + ) + }, + label = "Номер телефона", + keyboardType = KeyboardType.Phone, + ) + + DropdownField( + valueList = municipalityDomainList, + value = outUserDomain.municipality, + onValueChange = { + outUserDomain = outUserDomain.copy( + municipality = it, + ) + }, + label = "Муниципальное образование", + ) + + if (userDialogParams is UpdateUserDialogParams && userDomain.telegramId == null) { + val inviteUrl = Config.botUrlBuilder.clone().apply { + parameters["startapp"] = userDomain.uuid + }.buildString() + + CopyField( + mainScaffoldParams = mainScaffoldParams, + value = inviteUrl, + label = "Пригласительная ссылка", + supportingText = "Пользователь не привязан к учетной записи Telegram. Скопируйте ссылку и передайте ее владельцу", + ) + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserRequestDialog.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserRequestDialog.kt new file mode 100644 index 0000000..04c70a4 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/dialogs/UserRequestDialog.kt @@ -0,0 +1,263 @@ +package ru.cit71.pchelovod71.ui.dialogs + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.core.Platform +import ru.cit71.pchelovod71.ui.components.ConfirmButton +import ru.cit71.pchelovod71.ui.components.DismissButton +import ru.cit71.pchelovod71.ui.components.DropdownField +import ru.cit71.pchelovod71.ui.components.ImagePicker +import ru.cit71.pchelovod71.ui.components.InteractionType +import ru.cit71.pchelovod71.ui.components.MainColumn +import ru.cit71.pchelovod71.ui.components.MainDialog +import ru.cit71.pchelovod71.ui.components.MainDialogParams +import ru.cit71.pchelovod71.ui.components.MainTextField + +sealed interface UserRequestDialogParams : MainDialogParams + +data class ShowUserRequestDialogParams( + override val onDismiss: () -> Unit, +) : UserRequestDialogParams + +data class CreateUserRequestDialogParams( + override val onDismiss: () -> Unit, + val onCreate: (Models.UserRequest.Domain) -> Unit, +) : UserRequestDialogParams + +data class AcceptUserRequestDialogParams( + override val onDismiss: () -> Unit, + val onAccept: ((Models.UserRequest.Domain) -> Unit), + val onDecline: ((Models.UserRequest.Domain) -> Unit), +) : UserRequestDialogParams + +@Composable +fun UserRequestDialog( + userRequestDomain: Models.UserRequest.Domain, + userRequestDialogParams: UserRequestDialogParams, +) { + val apiCoroutineScope = rememberCoroutineScope() + + var outUserRequestDomain by remember { mutableStateOf(userRequestDomain) } + + var imageView by remember { mutableStateOf(null) } + + MainDialog( + title = when (userRequestDialogParams) { + is ShowUserRequestDialogParams -> "Просмотреть обращение" + is CreateUserRequestDialogParams -> "Добавить обращение" + is AcceptUserRequestDialogParams -> "Принять обращение" + }, + onDismiss = userRequestDialogParams.onDismiss, + buttons = { + when (userRequestDialogParams) { + is ShowUserRequestDialogParams -> {} + is CreateUserRequestDialogParams -> { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + userRequestDialogParams.onCreate(outUserRequestDomain) + }, + label = "Добавить", + ) + } + is AcceptUserRequestDialogParams -> { + if (userRequestDomain.accepted == null) { + ConfirmButton( + modifier = Modifier + .weight(1f), + onClick = { + userRequestDialogParams.onAccept(outUserRequestDomain) + }, + label = "Принять", + ) + DismissButton( + modifier = Modifier + .weight(1f), + onClick = { + userRequestDialogParams.onDecline(outUserRequestDomain) + }, + label = "Отклонить", + ) + } + } + } + }, + ) { mainScaffoldParams -> + MainColumn( + modifier = Modifier + .padding( + bottom = 16.dp, + ), + paddingValues = mainScaffoldParams.paddingValues, + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + MainTextField( + value = userRequestDomain.user.fullName, + onValueChange = {}, + enabled = false, + label = "ФИО", + ) + + MainTextField( + value = userRequestDomain.user.organization, + onValueChange = {}, + enabled = false, + label = "Организация", + ) + + MainTextField( + value = userRequestDomain.user.phoneNumber, + onValueChange = {}, + enabled = false, + label = "Номер телефона", + ) + + MainTextField( + value = outUserRequestDomain.user.municipality.name, + onValueChange = {}, + enabled = false, + label = "Муниципальное образование", + ) + + val enabledField = when (userRequestDialogParams) { + is ShowUserRequestDialogParams -> false + is AcceptUserRequestDialogParams -> false + is CreateUserRequestDialogParams -> true + } + + val requestTypeList = listOf( // TODO: по хорошему, нужно стягивать список по API + Models.RequestType.Domain( + id = 1, + name = "Фиксация гибели пчел", + ), + Models.RequestType.Domain( + id = 2, + name = "Фиксация факта нарушения сроков обработки полей", + ), + ) + + DropdownField( + valueList = requestTypeList, + value = outUserRequestDomain.type, + onValueChange = { + outUserRequestDomain = outUserRequestDomain.copy( + type = it, + ) + }, + enabled = enabledField, + label = "Тип обращения", + ) + + MainTextField( + value = outUserRequestDomain.address, + onValueChange = { + outUserRequestDomain = outUserRequestDomain.copy( + address = it, + ) + }, + enabled = enabledField, + label = "Адрес", + keyboardType = KeyboardType.Text, + ) + + MainTextField( + value = outUserRequestDomain.text, + onValueChange = { + outUserRequestDomain = outUserRequestDomain.copy( + text = it, + ) + }, + enabled = enabledField, + label = "Сутьевая часть", + keyboardType = KeyboardType.Text, + singleLine = false, + minLines = 3, + maxLines = 6, + ) + + if (userRequestDialogParams is AcceptUserRequestDialogParams) + MainTextField( + value = outUserRequestDomain.adminComment ?: "", + onValueChange = { + outUserRequestDomain = outUserRequestDomain.copy( + adminComment = it, + ) + }, + enabled = userRequestDomain.accepted == null, + label = "Уточнение администратора", + keyboardType = KeyboardType.Text, + singleLine = false, + minLines = 3, + maxLines = 6, + ) + + ImagePicker( + imageList = outUserRequestDomain.imageList, + onImageAdd = { + Platform.pickFile { type, data -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.UserRequests.uploadImage( + type = type, + data = data, + onSuccess = { imageGetDTO -> + val imageList = outUserRequestDomain.imageList.toMutableList() + imageList.add(imageGetDTO.toDomain()) + outUserRequestDomain = outUserRequestDomain.copy( + imageList = imageList, + ) + mainScaffoldParams.showSuccessSnackbar( + "Файл успешно добавлен", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось добавить файл", + ) + }, + ) + } + } + } + }, + onImageDrop = { i -> + val imageList = outUserRequestDomain.imageList.toMutableList() + imageList.removeAt(i) + outUserRequestDomain = outUserRequestDomain.copy( + imageList = imageList, + ) + }, + onImageSelect = { + imageView = it + }, + interactionType = when (userRequestDialogParams) { + is ShowUserRequestDialogParams -> InteractionType.Download + is CreateUserRequestDialogParams -> InteractionType.Upload + is AcceptUserRequestDialogParams -> InteractionType.Download + }, + ) + } + + imageView?.let { + ImageViewDialog( + image = it, + onClose = { + imageView = null + }, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/RegistrationRequestsScreen.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/RegistrationRequestsScreen.kt new file mode 100644 index 0000000..fce2111 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/RegistrationRequestsScreen.kt @@ -0,0 +1,181 @@ +package ru.cit71.pchelovod71.ui.screens + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import kotlinx.coroutines.launch +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.ui.components.MainColumnList +import ru.cit71.pchelovod71.ui.components.MainScaffoldParams +import ru.cit71.pchelovod71.ui.components.RegistrationRequestCard +import ru.cit71.pchelovod71.ui.dialogs.AcceptUserDialogParams +import ru.cit71.pchelovod71.ui.dialogs.ConfirmCommentDialogParams +import ru.cit71.pchelovod71.ui.dialogs.ConfirmDialog +import ru.cit71.pchelovod71.ui.dialogs.UserDialog + +@Composable +fun RegistrationRequestsScreen( + mainScaffoldParams: MainScaffoldParams, +) { + mainScaffoldParams.setFloatingActionButton(null) + + val apiCoroutineScope = rememberCoroutineScope() + + var userDomainList by remember { mutableStateOf(listOf()) } + var municipalityDomainList by remember { mutableStateOf(listOf()) } + + var userDomainCard by remember { mutableStateOf(null) } + var userDomainDialog by remember { mutableStateOf(null) } + + var confirmCommentDialog by remember { mutableStateOf(false) } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + Api.Municipalities.get( + onSuccess = { municipalityDTOList -> + municipalityDomainList = municipalityDTOList.map { it.toDomain() } + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список муниципальных образований" + ) + }, + ) + } + } + + suspend fun updateUserDomainList() { + Api.Users.get( + verified = false, + onSuccess = { userDTOList -> + userDomainList = userDTOList.map { it.toDomain() } + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список запросов на регистрацию", + ) + }, + ) + } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + updateUserDomainList() + } + } + + suspend fun onAccept( + userDomain: Models.User.Domain, + ) { + Api.Users.accept( + id = userDomain.id, + user = userDomain.toAcceptDTO(), + onSuccess = { + mainScaffoldParams.showSuccessSnackbar( + "Пользователь успешно принят", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось принять пользователя", + ) + }, + ) + updateUserDomainList() + } + + MainColumnList( + paddingValues = mainScaffoldParams.paddingValues, + valueList = userDomainList, + placeholder = "Список заявок на регистрацию пуст", + ) { + RegistrationRequestCard( + userDomain = it, + selected = it == userDomainCard, + onSelectedChange = { + userDomainCard = it + }, + onAccept = { outUserDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + onAccept(outUserDomain) + } + } + }, + onEdit = { + userDomainDialog = it + }, + onDecline = { outUserDomain -> + userDomainCard = outUserDomain + confirmCommentDialog = true + }, + ) + } + + userDomainDialog?.let { inUserDomain -> + UserDialog( + userDomain = inUserDomain, + municipalityDomainList = municipalityDomainList, + userDialogParams = AcceptUserDialogParams( + onDismiss = { + userDomainDialog = null + }, + onAccept = { outUserDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + onAccept(outUserDomain) + } + } + userDomainDialog = null + }, + onDecline = { outUserDomain -> + userDomainCard = outUserDomain + confirmCommentDialog = true + }, + ), + ) + } + + userDomainCard?.let { inUserDomain -> + if (confirmCommentDialog) + ConfirmDialog( + confirmDialogParams = ConfirmCommentDialogParams( + onDismiss = { + confirmCommentDialog = false + }, + onConfirm = { comment -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.reject( + id = inUserDomain.id, + user = inUserDomain.copy( + deleteReason = comment, + ).toRejectDTO(), + onSuccess = { + confirmCommentDialog = false + userDomainDialog = null + mainScaffoldParams.showSuccessSnackbar( + "Пользователь успешно отклонен", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось отклонить пользователя", + ) + }, + ) + updateUserDomainList() + } + } + }, + ), + dismissButtonText = "Отмена", + confirmButtonText = "Отправить", + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/SettingsScreen.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/SettingsScreen.kt new file mode 100644 index 0000000..4294f59 --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/SettingsScreen.kt @@ -0,0 +1,78 @@ +package ru.cit71.pchelovod71.ui.screens + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import kotlinx.coroutines.launch +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.core.Platform +import ru.cit71.pchelovod71.ui.components.MainColumn +import ru.cit71.pchelovod71.ui.components.MainScaffoldParams +import ru.cit71.pchelovod71.ui.components.SettingCard + +@Composable +fun SettingsScreen( + mainScaffoldParams: MainScaffoldParams, +) { + val apiCoroutineScope = rememberCoroutineScope() + + var userDomain by remember { mutableStateOf(null) } + + mainScaffoldParams.setFloatingActionButton(null) + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + Api.Users.auth( + authParams = Models.AuthParams.DTO.Send( + initData = Platform.getTelegramInitData(), + ), + onSuccess = { + userDomain = it.toDomain() + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить текущие настройки пользователя" + ) + }, + ) + } + } + + MainColumn { + userDomain?.let { + SettingCard( + name = "Уведомления", + caption = "Подписаться на уведомления по инцидентам вашего муниципального образования", + checked = userDomain!!.subscribed, + onCheckedChange = { + userDomain = userDomain!!.copy( + subscribed = it + ) + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.subscribe( + id = userDomain!!.id, + user = userDomain!!.toSubscribeDTO(), + onSuccess = { + mainScaffoldParams.showSuccessSnackbar( + "Настройки пользователя успешно применены" + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось применить настройки пользователя" + ) + }, + ) + } + } + }, + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRegistrationScreen.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRegistrationScreen.kt new file mode 100644 index 0000000..0ed45ac --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRegistrationScreen.kt @@ -0,0 +1,230 @@ +package ru.cit71.pchelovod71.ui.screens + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.ui.components.MainColumn +import ru.cit71.pchelovod71.ui.components.DropdownField +import ru.cit71.pchelovod71.ui.components.MainScaffoldParams +import ru.cit71.pchelovod71.ui.components.MainTextField + +@Composable +fun RegistrationUserScreen( + mainScaffoldParams: MainScaffoldParams, + telegramId: String, + reloadUserDomain: suspend () -> Unit, +) { + val apiCoroutineScope = rememberCoroutineScope() + + var municipalityDomainList by remember { mutableStateOf(listOf()) } + var userDomain by remember { mutableStateOf(null) } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + Api.Municipalities.get( + onSuccess = { municipalityDTOList -> + municipalityDomainList = municipalityDTOList.map { it.toDomain() } + + userDomain = Models.User.Domain( + telegramId = telegramId, + municipality = municipalityDomainList[5], + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список муниципальных образований" + ) + }, + ) + } + } + + userDomain?.let { + MainColumn( + modifier = Modifier + .padding( + horizontal = 16.dp, + vertical = 32.dp, + ), + paddingValues = mainScaffoldParams.paddingValues, + verticalArrangement = Arrangement.spacedBy(32.dp), + ) { + Column( + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Помощник пчеловода", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.displayMedium, + ) + + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Заявка на регистрацию", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.headlineSmall, + ) + } + + Column( + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + MainTextField( + value = userDomain!!.fullName, + onValueChange = { + userDomain = userDomain!!.copy( + fullName = it, + ) + }, + label = "ФИО", + keyboardType = KeyboardType.Text, + ) + + DropdownField( + valueList = municipalityDomainList, + value = userDomain!!.municipality, + onValueChange = { + userDomain = userDomain!!.copy( + municipality = it, + ) + }, + label = "Муниципальное образование", + ) + + MainTextField( + value = userDomain!!.organization, + onValueChange = { + userDomain = userDomain!!.copy( + organization = it, + ) + }, + label = "Организация", + keyboardType = KeyboardType.Text, + ) + + MainTextField( + value = userDomain!!.phoneNumber, + onValueChange = { + userDomain = userDomain!!.copy( + phoneNumber = it, + ) + }, + label = "Номер телефона", + keyboardType = KeyboardType.Phone, + ) + } + + Button( + modifier = Modifier + .fillMaxWidth(), + onClick = { + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.create( + user = userDomain!!.toCreateDTO(), + onSuccess = { + reloadUserDomain() + mainScaffoldParams.showSuccessSnackbar( + "Заявка на регистрацию успешно отправлена!" + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось отправить заявку на регистрацию" + ) + }, + ) + } + } + }, + ) { + Text( + text = "Отправить", + ) + } + } + } +} + +@Composable +fun WaitRegistrationUserScreen( + mainScaffoldParams: MainScaffoldParams, +) { + MainColumn( + modifier = Modifier + .padding( + horizontal = 16.dp, + vertical = 32.dp, + ), + paddingValues = mainScaffoldParams.paddingValues, + verticalArrangement = Arrangement.spacedBy(32.dp), + ) { + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Помощник пчеловода", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.displayMedium, + ) + + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Заявка на регистрацию находится на рассмотрении сотрудников министерства сельского хозяйства, природных ресурсов и экологии Тульской области. После одобрения вам поступит сообщение от чат-бота.", + style = MaterialTheme.typography.bodyLarge, + textAlign = TextAlign.Center, + ) + } +} + +@Composable +fun RejectRegistrationUserScreen( + mainScaffoldParams: MainScaffoldParams, +) { + MainColumn( + modifier = Modifier + .padding( + horizontal = 16.dp, + vertical = 32.dp, + ), + paddingValues = mainScaffoldParams.paddingValues, + verticalArrangement = Arrangement.spacedBy(32.dp), + ) { + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Помощник пчеловода", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.displayMedium, + ) + + Text( + modifier = Modifier + .fillMaxWidth(), + text = "Заявка на регистрацию была отклонена сотрудником министерства сельского хозяйства, природных ресурсов и экологии Тульской области.", + style = MaterialTheme.typography.bodyLarge, + textAlign = TextAlign.Center, + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRequestsScreen.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRequestsScreen.kt new file mode 100644 index 0000000..56a658b --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UserRequestsScreen.kt @@ -0,0 +1,279 @@ +package ru.cit71.pchelovod71.ui.screens + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.outline_add_24 +import kotlinx.coroutines.launch +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.ui.components.BooleanFilter +import ru.cit71.pchelovod71.ui.components.MainColumnList +import ru.cit71.pchelovod71.ui.components.MainScaffoldParams +import ru.cit71.pchelovod71.ui.components.UserRequestCard +import ru.cit71.pchelovod71.ui.dialogs.AcceptUserRequestDialogParams +import ru.cit71.pchelovod71.ui.dialogs.ConfirmCommentDialogParams +import ru.cit71.pchelovod71.ui.dialogs.ConfirmDialog +import ru.cit71.pchelovod71.ui.dialogs.CreateUserRequestDialogParams +import ru.cit71.pchelovod71.ui.dialogs.ShowUserRequestDialogParams +import ru.cit71.pchelovod71.ui.dialogs.UserRequestDialog +import ru.cit71.pchelovod71.ui.dialogs.UserRequestDialogParams + +@Composable +fun UserRequestsScreen( + mainScaffoldParams: MainScaffoldParams, + userDomain: Models.User.Domain, +) { + mainScaffoldParams.setFloatingActionButton(null) + + val apiCoroutineScope = rememberCoroutineScope() + + var userRequestDomainList by remember { mutableStateOf(listOf()) } + + var userRequestDomain by remember { mutableStateOf(null) } + var userRequestDialogParams by remember { mutableStateOf(null) } + + var confirmCommentDialog by remember { mutableStateOf(false) } + + var floatingActionButton by remember { mutableStateOf( + when (userDomain.role) { + Models.Role.Admin -> false + Models.Role.User -> true + } + ) } + + var acceptedFilter by remember { mutableStateOf(null) } + + suspend fun updateUserRequestDomainList() { + Api.UserRequests.get( + userId = when (userDomain.role) { + Models.Role.Admin -> null + Models.Role.User -> userDomain.id + }, + status = when (acceptedFilter) { + null -> Models.RequestStatus.New + true -> Models.RequestStatus.Accepted + false -> Models.RequestStatus.Rejected + }, + onSuccess = { userRequestList -> + userRequestDomainList = userRequestList.map { it.toDomain() } + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список обращений", + ) + }, + ) + } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + updateUserRequestDomainList() + } + } + + fun onDismiss() { + userRequestDomain = null + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + updateUserRequestDomainList() + } + } + } + + when (userDomain.role) { + Models.Role.Admin -> { + mainScaffoldParams.setFloatingActionButton(null) + } + Models.Role.User -> { + mainScaffoldParams.setFloatingActionButton { + ExtendedFloatingActionButton( + text = { + Text( + text = "Добавить обращение", + ) + }, + icon = { + Icon( + painter = painterResource(Res.drawable.outline_add_24), + contentDescription = null, + ) + }, + onClick = { + userRequestDialogParams = CreateUserRequestDialogParams( + onDismiss = ::onDismiss, + onCreate = { outUserRequestDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.UserRequests.create( + userRequest = outUserRequestDomain.toCreateDTO(), + onSuccess = { + userRequestDomain = null + mainScaffoldParams.showSuccessSnackbar( + "Обращение успешно добавлено", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось добавить обращение", + ) + }, + ) + updateUserRequestDomainList() + } + } + }, + ) + userRequestDomain = Models.UserRequest.Domain( + user = userDomain, + ) + }, + expanded = floatingActionButton, + ) + } + } + } + + Column( + modifier = Modifier + .padding(mainScaffoldParams.paddingValues), + ) { + BooleanFilter( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = 16.dp, + ), + valueMap = mapOf( + "Принято" to true, + "Новые" to null, + "Отклонено" to false, + ), + value = acceptedFilter, + onValueChange = { + acceptedFilter = it + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + updateUserRequestDomainList() + } + } + }, + ) + + MainColumnList( + onScrollChange = { + floatingActionButton = it + }, + valueList = userRequestDomainList, + placeholder = "Список обращений пуст", + ) { + UserRequestCard( + userRequestDomain = it, + onClick = { + when (userDomain.role) { + Models.Role.Admin -> { + userRequestDialogParams = AcceptUserRequestDialogParams( + onDismiss = ::onDismiss, + onAccept = { outUserRequestDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.UserRequests.accept( + id = it.id, + request = outUserRequestDomain.copy( + accepted = true, + ).toAcceptDTO(), + onSuccess = { + userRequestDomain = null + mainScaffoldParams.showSuccessSnackbar( + "Обращение успешно принято", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось принять обращение", + ) + }, + ) + updateUserRequestDomainList() + } + } + }, + onDecline = { outUserRequestDomain -> + userRequestDomain = outUserRequestDomain + confirmCommentDialog = true + }, + ) + } + Models.Role.User -> { + userRequestDialogParams = ShowUserRequestDialogParams( + onDismiss = ::onDismiss, + ) + } + } + + userRequestDomain = it + }, + ) + } + } + + userRequestDomain?.let { inUserRequestDomain -> + userRequestDialogParams?.let { userRequestDialogParams -> + UserRequestDialog( + userRequestDomain = inUserRequestDomain, + userRequestDialogParams = userRequestDialogParams, + ) + } + + if (confirmCommentDialog) + ConfirmDialog( + confirmDialogParams = ConfirmCommentDialogParams( + onDismiss = { + confirmCommentDialog = false + }, + onConfirm = { comment -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.UserRequests.accept( + id = inUserRequestDomain.id, + request = inUserRequestDomain.copy( + accepted = false, + rejectComment = comment, + ).toAcceptDTO(), + onSuccess = { + confirmCommentDialog = false + userRequestDomain = null + mainScaffoldParams.showSuccessSnackbar( + "Обращение успешно отклонено", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось отклонить обращение", + ) + }, + ) + updateUserRequestDomainList() + } + } + }, + ), + dismissButtonText = "Отмена", + confirmButtonText = "Отправить", + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UsersScreen.kt b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UsersScreen.kt new file mode 100644 index 0000000..517a5dd --- /dev/null +++ b/composeApp/src/wasmJsMain/kotlin/ru/cit71/pchelovod71/ui/screens/UsersScreen.kt @@ -0,0 +1,275 @@ +package ru.cit71.pchelovod71.ui.screens + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import frontend.composeapp.generated.resources.Res +import frontend.composeapp.generated.resources.outline_add_24 +import io.ktor.http.clone +import kotlinx.coroutines.launch +import org.jetbrains.compose.resources.painterResource +import ru.cit71.pchelovod71.core.Api +import ru.cit71.pchelovod71.core.Config +import ru.cit71.pchelovod71.core.Models +import ru.cit71.pchelovod71.core.Platform +import ru.cit71.pchelovod71.ui.components.BooleanFilter +import ru.cit71.pchelovod71.ui.components.MainColumnList +import ru.cit71.pchelovod71.ui.components.MainScaffoldParams +import ru.cit71.pchelovod71.ui.components.UserCard +import ru.cit71.pchelovod71.ui.dialogs.ConfirmDialog +import ru.cit71.pchelovod71.ui.dialogs.ConfirmOnlyDialogParams +import ru.cit71.pchelovod71.ui.dialogs.CreateUserDialogParams +import ru.cit71.pchelovod71.ui.dialogs.UpdateUserDialogParams +import ru.cit71.pchelovod71.ui.dialogs.UserDialog +import ru.cit71.pchelovod71.ui.dialogs.UserDialogParams + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun UsersScreen( + mainScaffoldParams: MainScaffoldParams, +) { + val apiCoroutineScope = rememberCoroutineScope() + + var userDomainList by remember { mutableStateOf(listOf()) } + var municipalityDomainList by remember { mutableStateOf(listOf()) } + + var userDomain by remember { mutableStateOf(null) } + var userDialogParams by remember { mutableStateOf(null) } + + var confirmOnlyDialog by remember { mutableStateOf(false) } + + var floatingActionButton by remember { mutableStateOf(true) } + + var deletedFilter by remember { mutableStateOf(false) } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + Api.Municipalities.get( + onSuccess = { municipalityDTOList -> + municipalityDomainList = municipalityDTOList.map { it.toDomain() } + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список муниципальных образований" + ) + }, + ) + } + } + + suspend fun updateUserDomainList() { + Api.Users.get( + verified = if (deletedFilter != false) null else true, + deleted = deletedFilter, + onSuccess = { userDTOList -> + userDomainList = userDTOList.mapNotNull { userDTO -> + when (userDTO.roleId) { + 1 -> null + else -> userDTO.toDomain() + } + } + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось загрузить список пользователей", + ) + }, + ) + } + + LaunchedEffect(Unit) { + mainScaffoldParams.withLoadingIndicator { + updateUserDomainList() + } + } + + fun onDismiss() { + userDomain = null + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + updateUserDomainList() + } + } + } + + mainScaffoldParams.setFloatingActionButton { + ExtendedFloatingActionButton( + text = { + Text( + text = "Добавить пользователя", + ) + }, + icon = { + Icon( + painter = painterResource(Res.drawable.outline_add_24), + contentDescription = null, + ) + }, + onClick = { + if (municipalityDomainList.isNotEmpty()) { + userDialogParams = CreateUserDialogParams( + onDismiss = ::onDismiss, + onCreate = { outUserDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.create( + user = outUserDomain.toCreateDTO(), + onSuccess = { + userDomain = null + + val inviteUrl = Config.botUrlBuilder.clone().apply { + parameters["startapp"] = it.uuid + }.buildString() + Platform.copyToClipboard(inviteUrl) + + mainScaffoldParams.showSuccessSnackbar( + "Пригласительная ссылка скопирована в буфер обмена", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось добавить пользователя", + ) + }, + ) + updateUserDomainList() + } + } + }, + ) + userDomain = Models.User.Domain( + municipality = municipalityDomainList[0], + accepted = true, + ) + } + }, + expanded = floatingActionButton, + ) + } + + Column( + modifier = Modifier + .padding(mainScaffoldParams.paddingValues), + ) { + BooleanFilter( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = 16.dp, + ), + valueMap = mapOf( + "Принято" to false, + "Все" to null, + "Отклонено" to true, + ), + value = deletedFilter, + onValueChange = { + deletedFilter = it + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + updateUserDomainList() + } + } + }, + ) + + MainColumnList( + onScrollChange = { + floatingActionButton = it + }, + valueList = userDomainList, + placeholder = "Список пользователей пуст", + ) { + UserCard( + userDomain = it, + onClick = { + userDialogParams = UpdateUserDialogParams( + onDismiss = ::onDismiss, + onSave = { outUserDomain -> + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.update( + user = outUserDomain.toUpdateDTO(), + onSuccess = { + userDomain = null + mainScaffoldParams.showSuccessSnackbar( + "Пользователь успешно изменен", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось изменить пользователя", + ) + }, + ) + updateUserDomainList() + } + } + }, + onDelete = { + confirmOnlyDialog = true + } + ) + userDomain = it + }, + ) + } + } + + userDomain?.let { inUserDomain -> + userDialogParams?.let { userDialogParams -> + UserDialog( + userDomain = inUserDomain, + municipalityDomainList = municipalityDomainList, + userDialogParams = userDialogParams, + ) + } + + if (confirmOnlyDialog) + ConfirmDialog( + confirmDialogParams = ConfirmOnlyDialogParams( + onDismiss = { + confirmOnlyDialog = false + }, + onConfirm = { + apiCoroutineScope.launch { + mainScaffoldParams.withLoadingIndicator { + Api.Users.delete( + id = inUserDomain.id, + onSuccess = { + confirmOnlyDialog = false + userDomain = null + mainScaffoldParams.showSuccessSnackbar( + "Пользователь успешно удален", + ) + }, + onError = { + mainScaffoldParams.showErrorSnackbar( + "Не удалось удалить пользователя", + ) + }, + ) + updateUserDomainList() + } + } + }, + title = "Удаление пользователя", + ), + dismissButtonText = "Отмена", + confirmButtonText = "Удалить", + ) + } +} \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/resources/index.html b/composeApp/src/wasmJsMain/resources/index.html new file mode 100644 index 0000000..5a33f7b --- /dev/null +++ b/composeApp/src/wasmJsMain/resources/index.html @@ -0,0 +1,15 @@ + + + + + + + Помощник пчеловода + + + + + + + + \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/resources/styles.css b/composeApp/src/wasmJsMain/resources/styles.css new file mode 100644 index 0000000..ed3dd2e --- /dev/null +++ b/composeApp/src/wasmJsMain/resources/styles.css @@ -0,0 +1,74 @@ +html { + margin: 0 !important; + padding: 0 !important; + width: 100% !important; + height: 100% !important; + overflow: hidden !important; + color-scheme: dark !important; +} + +body { + position: fixed !important; + top: 0 !important; + right: 0 !important; + bottom: 0 !important; + left: 0 !important; + margin: 0 !important; + z-index: 9999 !important; +} + +canvas { + outline: none !important; +} + +div.blank { + position: fixed !important; + top: 0 !important; + right: 0 !important; + bottom: 0 !important; + left: 0 !important; + display: flex !important; + justify-content: center !important; + align-items: center !important; + backdrop-filter: brightness(.5) !important; + z-index: 99999 !important; + user-select: none !important; +} + +div.container { + display: flex !important; + gap: 1.5rem !important; + flex-direction: column !important; + margin: 1rem !important; + padding: 1.25rem 1rem !important; + width: 100% !important; + max-width: 34.25rem !important; + border-radius: 1rem !important; + background-color: #141218 !important; +} + +input.text-field, +textarea.text-field { + box-sizing: border-box !important; + padding: 1.125rem !important; + width: 100% !important; + border: solid .0625rem #938F99 !important; + border-radius: .25rem !important; + outline: none !important; + background-color: transparent !important; + color: #E6E0E9 !important; + font-family: 'Roboto', 'Helvetica', 'Arial', 'Verdana', sans-serif !important; + font-size: 1rem !important; +} + +input[type="button"] { + padding: .875rem !important; + font-family: 'Roboto', 'Helvetica', 'Arial', 'Verdana', sans-serif !important; + font-size: .875rem !important; + font-weight: normal !important; + border-radius: 99rem !important; + border: none !important; + outline: none !important; + background: #D0BCFF !important; + color: #381E72 !important; +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..41d680b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +#Kotlin +kotlin.code.style=official +kotlin.daemon.jvmargs=-Xmx3072M + +#Gradle +org.gradle.jvmargs=-Xmx3072M -Dfile.encoding=UTF-8 +org.gradle.configuration-cache=true +org.gradle.caching=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..248253f --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,51 @@ +[versions] +# Initial +androidx-lifecycle = "2.9.1" +composeMultiplatform = "1.9.0-alpha03" +junit = "4.13.2" +kotlin = "2.2.10" + +# Custom +ktor = "3.2.3" +coil = "3.3.0" +navigation = "2.9.0-beta04" + +[libraries] +# Initial +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +junit = { module = "junit:junit", version.ref = "junit" } +androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } + +# Custom +## Ktor +ktor-clientCore = { module = "io.ktor:ktor-client-core-wasm-js", version.ref = "ktor" } +ktor-clientContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } +ktor-clientLogging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } +ktor-serializationKotlinxJson = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } + +## Coil +coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } +coil-networkKtor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } + +# Compose Multiplatform +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } +compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" } +compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "composeMultiplatform" } +compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" } +compose-ui-util = { module = "org.jetbrains.compose.ui:ui-util", version.ref = "composeMultiplatform" } +compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" } +compose-components-ui-tooling-preview = { module = "org.jetbrains.compose.components:components-ui-tooling-preview", version.ref = "composeMultiplatform" } + +## Navigation +navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation" } + +[plugins] +# Initial +composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } +composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } + +# Custom +ktor = { id = "io.ktor.plugin", version.ref = "ktor" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..816dedf --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,31 @@ +rootProject.name = "frontend" +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +pluginManagement { + repositories { + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositories { + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } + mavenCentral() + } +} + +include(":composeApp") \ No newline at end of file