diff --git a/Client/.idea/deploymentTargetSelector.xml b/Client/.idea/deploymentTargetSelector.xml
index 3a82024..3864900 100644
--- a/Client/.idea/deploymentTargetSelector.xml
+++ b/Client/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-16T22:44:29.417709300Z">
+        <DropdownSelection timestamp="2025-06-08T19:57:28.490430900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\slava\.android\avd\Pixel_8.avd" />
diff --git a/Client/.idea/gradle.xml b/Client/.idea/gradle.xml
index 0c87472..22d9498 100644
--- a/Client/.idea/gradle.xml
+++ b/Client/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/Client/.idea/misc.xml b/Client/.idea/misc.xml
index ae3bf2d..b2c751a 100644
--- a/Client/.idea/misc.xml
+++ b/Client/.idea/misc.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/Client/app/build.gradle.kts b/Client/app/build.gradle.kts
index 1f76548..7fa3b0d 100644
--- a/Client/app/build.gradle.kts
+++ b/Client/app/build.gradle.kts
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId = "com.example.evroutes"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
@@ -20,6 +20,12 @@ android {
         }
     }
 
+    packaging {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -47,27 +53,23 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
-    implementation("androidx.activity:activity-compose:1.9.3")
-    implementation(platform("androidx.compose:compose-bom:2024.10.00"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3")
-    // Навигация
-    implementation("androidx.navigation:navigation-compose:2.8.3")
-    // Retrofit для сетевых запросов
-    implementation("com.squareup.retrofit2:retrofit:2.11.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.11.0")
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+
+    implementation(libs.yandex.maps)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.gson)
+    implementation(libs.okhttp)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+
     // ViewModel
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.00"))
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-    debugImplementation("androidx.compose.ui:ui-tooling")
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
 }
\ No newline at end of file
diff --git a/Client/app/src/main/AndroidManifest.xml b/Client/app/src/main/AndroidManifest.xml
index a458420..2cef8cf 100644
--- a/Client/app/src/main/AndroidManifest.xml
+++ b/Client/app/src/main/AndroidManifest.xml
@@ -2,11 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".EVRoutesApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -15,6 +17,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DiplomEVRoutes"
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
@@ -23,7 +27,6 @@
             android:theme="@style/Theme.DiplomEVRoutes">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
diff --git a/Client/app/src/main/java/com/example/evroutes/EVRoutesApplication.kt b/Client/app/src/main/java/com/example/evroutes/EVRoutesApplication.kt
new file mode 100644
index 0000000..f848f57
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/EVRoutesApplication.kt
@@ -0,0 +1,17 @@
+package com.example.evroutes
+
+import android.app.Application
+import com.yandex.mapkit.MapKitFactory
+
+class EVRoutesApplication : Application() {
+
+    companion object {
+        private const val MAPKIT_API_KEY = "b328cf2c-247b-45e8-8013-9ecd243b7671"
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        MapKitFactory.setApiKey(MAPKIT_API_KEY)
+        MapKitFactory.initialize(this)
+    }
+}
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/MainActivity.kt b/Client/app/src/main/java/com/example/evroutes/MainActivity.kt
index 868b6b4..1b538b2 100644
--- a/Client/app/src/main/java/com/example/evroutes/MainActivity.kt
+++ b/Client/app/src/main/java/com/example/evroutes/MainActivity.kt
@@ -1,37 +1,151 @@
 package com.example.evroutes
 
+import android.Manifest
+import android.content.pm.PackageManager
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.runtime.Composable
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.*
+import androidx.compose.material3.Text
+import androidx.compose.foundation.layout.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.example.evroutes.ui.theme.EVRoutesTheme
+
 import com.example.evroutes.data.network.RetrofitClient
+
 import com.example.evroutes.data.repository.AuthRepository
 import com.example.evroutes.ui.auth.AuthViewModel
 import com.example.evroutes.ui.auth.LoginScreen
 import com.example.evroutes.ui.auth.RegisterScreen
-import com.example.evroutes.ui.theme.EVRoutesTheme
+
+import com.example.evroutes.data.repository.MapRepository
+import com.example.evroutes.ui.map.MapScreen
+import com.example.evroutes.ui.map.MapViewModel
+
+import com.yandex.mapkit.MapKitFactory
 
 // Главная активность приложения
 class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+
+    private var hasLocationPermissions = false
+
+    // Регистрируем лаунчер для запроса разрешений
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) { permissions ->
+        val coarseGranted = permissions[Manifest.permission.ACCESS_COARSE_LOCATION] ?: false
+        val fineGranted = permissions[Manifest.permission.ACCESS_FINE_LOCATION] ?: false
+
+        hasLocationPermissions = coarseGranted || fineGranted
+
+        if (hasLocationPermissions) {
+            println("✅ Location permissions granted")
+        } else {
+            println("❌ Location permissions denied")
+        }
+
+        // Перезапускаем UI
         setContent {
             EVRoutesTheme {
-                EVRoutesApp()
+                EVRoutesApp(hasLocationPermissions)
             }
         }
     }
+
+    private fun checkAndRequestLocationPermissions() {
+        val coarseGranted = ContextCompat.checkSelfPermission(
+            this, Manifest.permission.ACCESS_COARSE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+
+        val fineGranted = ContextCompat.checkSelfPermission(
+            this, Manifest.permission.ACCESS_FINE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+
+        hasLocationPermissions = coarseGranted || fineGranted
+
+        if (hasLocationPermissions) {
+            println("✅ Location permissions already granted")
+            setContent {
+                EVRoutesTheme {
+                    EVRoutesApp(true)
+                }
+            }
+        } else {
+            println("⚠️ Requesting location permissions...")
+            // Запрашиваем разрешения
+            requestPermissionLauncher.launch(
+                arrayOf(
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                    Manifest.permission.ACCESS_FINE_LOCATION
+                )
+            )
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        MapKitFactory.initialize(this)
+        checkAndRequestLocationPermissions()
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        try {
+            MapKitFactory.getInstance().onStart()
+        } catch (e: Exception) {
+            print("Текст без переноса строки")
+        }
+    }
+
+    override fun onStop() {
+        try {
+            MapKitFactory.getInstance().onStop()
+        } catch (e: Exception) {
+            print("Текст без переноса строки")
+        }
+        super.onStop()
+    }
 }
 
 // Настройка навигации приложения
 @Composable
-fun EVRoutesApp() {
+fun EVRoutesApp(hasLocationPermissions: Boolean = false) {
     val navController = rememberNavController()
+
+    if (!hasLocationPermissions) {
+        // Показываем сообщение о необходимости разрешений
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.padding(16.dp)
+            ) {
+                Text("Для работы с картами необходимо")
+                Text("разрешение на доступ к местоположению")
+                Spacer(modifier = Modifier.height(8.dp))
+                Text("Пожалуйста, разрешите доступ в настройках")
+            }
+        }
+        return
+    }
+
+    // Репозитории
     val authRepository = AuthRepository(RetrofitClient.authApiService)
+    val mapRepository = MapRepository(RetrofitClient.mapApiService)
+
+    // ViewModels
     val authViewModel = AuthViewModel(authRepository)
+    val mapViewModel = MapViewModel(mapRepository)
 
     NavHost(navController = navController, startDestination = "login") {
         composable("login") {
@@ -40,5 +154,8 @@ fun EVRoutesApp() {
         composable("register") {
             RegisterScreen(viewModel = authViewModel, navController = navController)
         }
+        composable("map") {
+            MapScreen(navController = navController, viewModel = mapViewModel)
+        }
     }
 }
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/data/model/LoginRequest.kt b/Client/app/src/main/java/com/example/evroutes/data/model/LoginRequest.kt
index dadca8f..93cd21a 100644
--- a/Client/app/src/main/java/com/example/evroutes/data/model/LoginRequest.kt
+++ b/Client/app/src/main/java/com/example/evroutes/data/model/LoginRequest.kt
@@ -1,6 +1,6 @@
 package com.example.evroutes.data.model
 
 data class LoginRequest(
-    val email: String,
+    val login: String,
     val password: String
 )
diff --git a/Client/app/src/main/java/com/example/evroutes/data/model/MapModels.kt b/Client/app/src/main/java/com/example/evroutes/data/model/MapModels.kt
new file mode 100644
index 0000000..a30b00c
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/data/model/MapModels.kt
@@ -0,0 +1,63 @@
+package com.example.evroutes.data.model;
+
+
+data class ChargingStationRequest(
+        val name: String,
+        val latitude: Double,
+        val longtitude: Double,
+        val connection_type: String,
+        val power_kw: Int
+)
+
+// Ответ со списком зарядных станций
+data class ChargingStationsResponse(
+        val stations: List<ChargingStation>
+)
+
+// Модель зарядной станции
+data class ChargingStation(
+        val id: String,
+        val name: String,
+        val latitude: Double,
+        val longitude: Double,
+        val address: String,
+        val connectorTypes: List<String>,
+        val power: Int, // кВт
+        val isAvailable: Boolean,
+        val price: Double,
+        val openingHours: String,
+        val rating: Double
+)
+
+data class RouteRequest(
+        val fromLatitude: Double,
+        val fromLongitude: Double,
+        val toLatitude: Double,
+        val toLongitude: Double,
+        val batteryLevel: Int, // процент заряда
+        val vehicleRange: Int // запас хода в км
+)
+
+// Оптимизированный маршрут
+data class OptimizedRoute(
+        val totalDistance: Double, // км
+        val estimatedTime: Int, // минуты
+        val waypoints: List<RouteWaypoint>,
+        val chargingStops: List<ChargingStop>
+)
+
+// Точка маршрута
+data class RouteWaypoint(
+        val latitude: Double,
+        val longitude: Double,
+        val distanceFromStart: Double, // км от начала маршрута
+        val estimatedTimeFromStart: Int // минуты от начала маршрута
+)
+
+// Остановка для зарядки
+data class ChargingStop(
+        val station: ChargingStation,
+        val arrivalBatteryLevel: Int, // процент заряда при прибытии
+        val recommendedChargingTime: Int, // минуты
+        val departureBatteryLevel: Int // процент заряда при отъезде
+)
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/data/model/RegisterRequest.kt b/Client/app/src/main/java/com/example/evroutes/data/model/RegisterRequest.kt
index 73426b3..5e81e69 100644
--- a/Client/app/src/main/java/com/example/evroutes/data/model/RegisterRequest.kt
+++ b/Client/app/src/main/java/com/example/evroutes/data/model/RegisterRequest.kt
@@ -1,7 +1,6 @@
 package com.example.evroutes.data.model
 
 data class RegisterRequest(
-    val email: String,
-    val password: String,
-    val role: String = "user"
+    val login: String,
+    val password: String
 )
diff --git a/Client/app/src/main/java/com/example/evroutes/data/network/AuthApiService.kt b/Client/app/src/main/java/com/example/evroutes/data/network/AuthApiService.kt
index e1c13d8..590a740 100644
--- a/Client/app/src/main/java/com/example/evroutes/data/network/AuthApiService.kt
+++ b/Client/app/src/main/java/com/example/evroutes/data/network/AuthApiService.kt
@@ -8,9 +8,9 @@ import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface AuthApiService {
-    @POST("/auth/login")
+    @POST("/user/login")
     suspend fun login(@Body request: LoginRequest): LoginResponse
 
-    @POST("/auth/register")
+    @POST("/user/register")
     suspend fun register(@Body request: RegisterRequest): RegisterResponse
 }
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/data/network/MapApiService.kt b/Client/app/src/main/java/com/example/evroutes/data/network/MapApiService.kt
new file mode 100644
index 0000000..7ccecfa
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/data/network/MapApiService.kt
@@ -0,0 +1,17 @@
+package com.example.evroutes.data.network
+
+import com.example.evroutes.data.model.LoginRequest
+import com.example.evroutes.data.model.LoginResponse
+import com.example.evroutes.data.model.RegisterRequest
+import com.example.evroutes.data.model.RegisterResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.GET
+
+interface MapApiService {
+    @GET("/station/all_stations")
+    suspend fun login(@Body request: LoginRequest): LoginResponse
+
+    @POST("/auth/register")
+    suspend fun register(@Body request: RegisterRequest): RegisterResponse
+}
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/data/network/RetrofitClient.kt b/Client/app/src/main/java/com/example/evroutes/data/network/RetrofitClient.kt
index 041f7f9..d57154c 100644
--- a/Client/app/src/main/java/com/example/evroutes/data/network/RetrofitClient.kt
+++ b/Client/app/src/main/java/com/example/evroutes/data/network/RetrofitClient.kt
@@ -4,13 +4,20 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 object RetrofitClient {
-    private const val BASE_URL = "http://10.0.2.2:8000"
+    private const val BASE_URL = "http://10.0.2.2:8001"
 
-    val authApiService: AuthApiService by lazy {
+    private val retrofit: Retrofit by lazy {
         Retrofit.Builder()
             .baseUrl(BASE_URL)
             .addConverterFactory(GsonConverterFactory.create())
             .build()
-            .create(AuthApiService::class.java)
+    }
+
+    val authApiService: AuthApiService by lazy {
+        retrofit.create(AuthApiService::class.java)
+    }
+
+    val mapApiService: MapApiService by lazy {
+        retrofit.create(MapApiService::class.java)
     }
 }
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/data/repository/MapRepository.kt b/Client/app/src/main/java/com/example/evroutes/data/repository/MapRepository.kt
new file mode 100644
index 0000000..1d6ee40
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/data/repository/MapRepository.kt
@@ -0,0 +1,68 @@
+package com.example.evroutes.data.repository
+
+import com.example.evroutes.data.network.MapApiService
+import com.yandex.mapkit.RequestPoint
+import com.yandex.mapkit.RequestPointType
+import com.yandex.mapkit.directions.DirectionsFactory
+import com.yandex.mapkit.directions.driving.DrivingOptions
+import com.yandex.mapkit.directions.driving.DrivingRoute
+import com.yandex.mapkit.directions.driving.DrivingRouter
+import com.yandex.mapkit.directions.driving.DrivingRouterType
+import com.yandex.mapkit.directions.driving.DrivingSession
+import com.yandex.mapkit.directions.driving.VehicleOptions
+import com.yandex.mapkit.directions.driving.VehicleType
+import com.yandex.mapkit.geometry.Point
+
+class MapRepository(private val apiService: MapApiService) {
+    private val drivingRouter: DrivingRouter =
+        DirectionsFactory.getInstance().createDrivingRouter(DrivingRouterType.ONLINE)
+
+    fun findRoute(
+        from: Point,
+        to: Point,
+        onSuccess: (DrivingSession.DrivingRouteListener) -> Unit,
+        onError: (Exception) -> Unit
+    ) {
+        try {
+            val requestPoints = listOf(
+                RequestPoint(from, RequestPointType.WAYPOINT, null, null, null),
+                RequestPoint(to, RequestPointType.WAYPOINT, null, null, null)
+            )
+
+            val drivingOptions = DrivingOptions().apply {
+                routesCount = 1
+            }
+
+            val vehicleOptions = VehicleOptions().setVehicleType(VehicleType.DEFAULT)
+
+            val routeListener = object : DrivingSession.DrivingRouteListener {
+                override fun onDrivingRoutes(routes: MutableList<DrivingRoute>) {
+                    if (routes.isNotEmpty()) {
+                        onSuccess(this)
+                    } else {
+                        onError(Exception("Маршрут не найден"))
+                    }
+                }
+
+                override fun onDrivingRoutesError(error: com.yandex.runtime.Error) {
+                    onError(Exception("Ошибка построения маршрута: ${error.toString()}"))
+                }
+            }
+
+            drivingRouter.requestRoutes(requestPoints, drivingOptions, vehicleOptions, routeListener)
+
+        } catch (e: Exception) {
+            onError(e)
+        }
+    }
+
+    suspend fun getCurrentLocation(): Result<Point> {
+        return try {
+            val currentLocation = Point(55.751574, 37.573856)
+            Result.success(currentLocation)
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/ui/auth/AuthViewModel.kt b/Client/app/src/main/java/com/example/evroutes/ui/auth/AuthViewModel.kt
index baaf218..22279c5 100644
--- a/Client/app/src/main/java/com/example/evroutes/ui/auth/AuthViewModel.kt
+++ b/Client/app/src/main/java/com/example/evroutes/ui/auth/AuthViewModel.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-// ViewModel для управления состоянием UI авторизации
+
 class AuthViewModel(private val repository: AuthRepository) : ViewModel() {
     private val _uiState = MutableStateFlow(AuthUiState())
     val uiState: StateFlow<AuthUiState> = _uiState.asStateFlow()
diff --git a/Client/app/src/main/java/com/example/evroutes/ui/auth/LoginScreen.kt b/Client/app/src/main/java/com/example/evroutes/ui/auth/LoginScreen.kt
index da73921..9aa1357 100644
--- a/Client/app/src/main/java/com/example/evroutes/ui/auth/LoginScreen.kt
+++ b/Client/app/src/main/java/com/example/evroutes/ui/auth/LoginScreen.kt
@@ -86,7 +86,10 @@ fun LoginScreen(viewModel: AuthViewModel, navController: NavController) {
 
         if (uiState.token != null) {
             LaunchedEffect(uiState.token) {
-                // TODO: Перейти на главный экран или сохранить токен
+                navController.navigate("map") {
+                    // Очистка стека навигации, чтобы нельзя было вернуться на экран входа
+                    popUpTo("login") { inclusive = true }
+                }
                 viewModel.resetState()
             }
         }
diff --git a/Client/app/src/main/java/com/example/evroutes/ui/map/MapScreen.kt b/Client/app/src/main/java/com/example/evroutes/ui/map/MapScreen.kt
new file mode 100644
index 0000000..509c0d1
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/ui/map/MapScreen.kt
@@ -0,0 +1,249 @@
+package com.example.evroutes.ui.map
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.LocationOn
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.navigation.NavController
+import com.yandex.mapkit.geometry.Point
+import com.yandex.mapkit.map.CameraPosition
+import com.yandex.mapkit.mapview.MapView
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MapScreen(
+    navController: NavController,
+    viewModel: MapViewModel // Создадим позже
+) {
+    var mapView by remember { mutableStateOf<MapView?>(null) }
+    var showRouteDialog by remember { mutableStateOf(false) }
+
+    val uiState by viewModel.uiState.collectAsState()
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        // Карта занимает весь экран
+        YandexMapView(
+            modifier = Modifier.fillMaxSize(),
+            onMapReady = { map ->
+                mapView = map
+                viewModel.setMapView(map)
+            },
+            cameraPosition = uiState.cameraPosition
+        )
+
+        // Кнопки управления снизу
+        Card(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .padding(16.dp),
+            elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                horizontalArrangement = Arrangement.SpaceEvenly
+            ) {
+                // Кнопка "Моя локация"
+                FloatingActionButton(
+                    onClick = { viewModel.moveToUserLocation() },
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.size(56.dp)
+                ) {
+                    Icon(
+                        Icons.Default.LocationOn,
+                        contentDescription = "Моя локация",
+                        tint = Color.White
+                    )
+                }
+
+                // Кнопка "Найти маршрут"
+                Button(
+                    onClick = { showRouteDialog = true },
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(start = 16.dp),
+                    enabled = !uiState.isLoading
+                ) {
+                    Text("Построить маршрут")
+                }
+            }
+        }
+
+        // Индикатор загрузки
+        if (uiState.isLoading) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
+                Card(
+                    elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+                ) {
+                    Column(
+                        modifier = Modifier.padding(24.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        CircularProgressIndicator()
+                        Spacer(modifier = Modifier.height(16.dp))
+                        Text("Поиск маршрута...")
+                    }
+                }
+            }
+        }
+
+        // Отображение ошибок
+        uiState.error?.let { error ->
+            LaunchedEffect(error) {
+                // Показать Snackbar с ошибкой
+            }
+        }
+
+        if (showRouteDialog) {
+            RouteDialog(
+                onDismiss = { showRouteDialog = false },
+                onBuildRoute = { startPoint, endPoint, consumption ->
+                    showRouteDialog = false
+                    val consumptionFloat = consumption.toFloatOrNull() ?: 20.0f
+                    viewModel.buildRouteWithParams(startPoint, endPoint, consumptionFloat)
+                },
+                currentLocation = uiState.userLocation
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun RouteDialog(
+    onDismiss: () -> Unit,
+    onBuildRoute: (String, String, String) -> Unit,
+    currentLocation: Point?
+) {
+    var startPoint by remember { mutableStateOf("") }
+    var endPoint by remember { mutableStateOf("") }
+    var consumption by remember { mutableStateOf("") }
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(
+            dismissOnBackPress = true,
+            dismissOnClickOutside = true
+        )
+    ) {
+        Card(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+        ) {
+            Column(
+                modifier = Modifier.padding(24.dp)
+            ) {
+                // Заголовок с кнопкой закрытия
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = "Построение маршрута",
+                        style = MaterialTheme.typography.headlineSmall,
+                        fontWeight = FontWeight.Bold
+                    )
+
+                    IconButton(
+                        onClick = onDismiss
+                    ) {
+                        Icon(
+                            Icons.Default.Close,
+                            contentDescription = "Закрыть"
+                        )
+                    }
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // Поле исходной точки
+                OutlinedTextField(
+                    value = startPoint,
+                    onValueChange = { startPoint = it },
+                    label = { Text("Исходная точка") },
+                    placeholder = { Text("Введите адрес или координаты") },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(12.dp))
+
+                // Поле конечной точки
+                OutlinedTextField(
+                    value = endPoint,
+                    onValueChange = { endPoint = it },
+                    label = { Text("Конечная точка") },
+                    placeholder = { Text("Введите адрес или координаты") },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(12.dp))
+
+                // Поле расхода автомобиля
+                OutlinedTextField(
+                    value = consumption,
+                    onValueChange = {
+                        // Позволяем вводить только цифры и точку
+                        if (it.isEmpty() || it.matches(Regex("^\\d*\\.?\\d*$"))) {
+                            consumption = it
+                        }
+                    },
+                    label = { Text("Средний расход") },
+                    placeholder = { Text("Вт⋅ч/100км") },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true,
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
+                    supportingText = { Text("Расход электроэнергии в Вт⋅ч на 100 км") }
+                )
+
+                Spacer(modifier = Modifier.height(24.dp))
+
+                // Кнопки
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    OutlinedButton(
+                        onClick = onDismiss,
+                        modifier = Modifier.weight(1f)
+                    ) {
+                        Text("Отмена")
+                    }
+
+                    Button(
+                        onClick = {
+                            if (startPoint.isNotBlank() && endPoint.isNotBlank() && consumption.isNotBlank()) {
+                                onBuildRoute(startPoint, endPoint, consumption)
+                            }
+                        },
+                        modifier = Modifier.weight(1f),
+                        enabled = startPoint.isNotBlank() && endPoint.isNotBlank() && consumption.isNotBlank()
+                    ) {
+                        Text("Построить")
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/ui/map/MapViewModel.kt b/Client/app/src/main/java/com/example/evroutes/ui/map/MapViewModel.kt
new file mode 100644
index 0000000..756bfa4
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/ui/map/MapViewModel.kt
@@ -0,0 +1,258 @@
+package com.example.evroutes.ui.map
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.evroutes.data.repository.MapRepository
+import com.yandex.mapkit.geometry.Point
+import com.yandex.mapkit.map.CameraPosition
+import com.yandex.mapkit.mapview.MapView
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+import com.yandex.mapkit.directions.DirectionsFactory
+import com.yandex.mapkit.directions.driving.DrivingOptions
+import com.yandex.mapkit.directions.driving.DrivingRoute
+import com.yandex.mapkit.directions.driving.DrivingRouter
+import com.yandex.mapkit.directions.driving.DrivingSession
+import com.yandex.mapkit.directions.driving.VehicleOptions
+import com.yandex.mapkit.RequestPoint
+import com.yandex.mapkit.RequestPointType
+import com.yandex.mapkit.directions.driving.DrivingRouterType
+import com.yandex.runtime.image.ImageProvider
+import android.graphics.Color
+
+import android.graphics.*
+
+data class MapUiState(
+    val isLoading: Boolean = false,
+    val error: String? = null,
+    val cameraPosition: CameraPosition = CameraPosition(
+        Point(55.751574, 37.573856), // Москва по умолчанию
+        11.0f, 0.0f, 0.0f
+    ),
+    val chargingStations: List<Point> = emptyList(),
+    val selectedStation: Point? = null,
+    val userLocation: Point? = null
+)
+
+class MapViewModel(
+    private val mapRepository: MapRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(MapUiState())
+    val uiState: StateFlow<MapUiState> = _uiState.asStateFlow()
+
+    private var mapView: MapView? = null
+
+    fun setMapView(mapView: MapView) {
+        this.mapView = mapView
+        // loadChargingStations()
+    }
+
+    fun moveToUserLocation() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoading = true)
+
+            try {
+                // Здесь будет логика получения текущей локации пользователя
+                // Для примера используем координаты Москвы
+                val userLocation = Point(55.751574, 37.573856)
+
+                _uiState.value = _uiState.value.copy(
+                    userLocation = userLocation,
+                    cameraPosition = CameraPosition(userLocation, 15.0f, 0.0f, 0.0f),
+                    isLoading = false
+                )
+
+                // Перемещение камеры к позиции пользователя
+                mapView?.map?.move(
+                    CameraPosition(userLocation, 15.0f, 0.0f, 0.0f)
+                )
+
+            } catch (e: Exception) {
+                _uiState.value = _uiState.value.copy(
+                    error = "Не удалось определить местоположение: ${e.message}",
+                    isLoading = false
+                )
+            }
+        }
+    }
+
+    fun buildRouteWithParams(startPoint: String, endPoint: String, consumption: Float) {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoading = true)
+
+            try {
+                buildMoscowToSpbRoute(consumption)
+            } catch (e: Exception) {
+                _uiState.value = _uiState.value.copy(
+                    error = "Ошибка построения маршрута: ${e.message}",
+                    isLoading = false
+                )
+            }
+        }
+    }
+
+private fun buildRoute(startPoint, endPoint, consumption: Float, initialBattery: Float, minBatteryPercent: Float) {
+    // Параметры запроса
+    val request = RouteRequest(
+        start = Coordinates(startPoint.latitude, startPoint.longitude),
+        end = Coordinates(endPoint.latitude, endPoint.longitude),
+        initial_battery = initialBattery,
+        min_battery_percent = minBatteryPercent,
+        consumption_per_km = consumption,
+        charging_stations = getPredefinedChargingStations() // Предопределенные станции
+    )
+    
+    _uiState.value = _uiState.value.copy(isLoading = true)
+    
+    routeService.calculateRoute(request).enqueue(object : Callback<RouteResponse> {
+        override fun onResponse(call: Call<RouteResponse>, response: Response<RouteResponse>) {
+            if (response.isSuccessful && response.body()?.success == true) {
+                val routeResponse = response.body()!!
+                
+                // Обновляем UI
+                _uiState.value = _uiState.value.copy(
+                    isLoading = false,
+                    error = null,
+                    routeInfo = "Расстояние: ${routeResponse.total_distance} км, " +
+                              "Финальный заряд: ${routeResponse.final_battery}%"
+                )
+                
+                // Отображаем маршрут на карте
+                displayOptimizedRoute(routeResponse)
+                
+                // Рассчитываем расход энергии
+                calculateEnergyConsumption(routeResponse.total_distance, consumption)
+            } else {
+                _uiState.value = _uiState.value.copy(
+                    isLoading = false,
+                    error = "Ошибка сервера: ${response.errorBody()?.string()}"
+                )
+            }
+        }
+        
+        override fun onFailure(call: Call<RouteResponse>, t: Throwable) {
+            _uiState.value = _uiState.value.copy(
+                isLoading = false,
+                error = "Ошибка сети: ${t.message}"
+            )
+        }
+    })
+}
+
+private fun displayOptimizedRoute(routeResponse: RouteResponse) {
+    mapView?.map?.let { map ->
+        map.mapObjects.clear()
+        val mapObjectCollection = map.mapObjects.addCollection()
+        
+        // Рисуем маршрут
+        val points = routeResponse.path_coordinates.map { Point(it.lat, it.lon) }
+        mapObjectCollection.addPolyline(points).apply {
+            setStrokeColor(0xFF0066FF.toInt())
+            setStrokeWidth(5.0f)
+        }
+        
+        // Добавляем маркеры
+        points.forEachIndexed { index, point ->
+            mapObjectCollection.addPlacemark().apply {
+                geometry = point
+                when {
+                    index == 0 -> setIcon(ImageProvider.fromBitmap(createCircleBitmap(Color.GREEN, 40)))
+                    index == points.size - 1 -> setIcon(ImageProvider.fromBitmap(createCircleBitmap(Color.RED, 40)))
+                    routeResponse.charging_stations.any { it.id == index } -> 
+                        setIcon(ImageProvider.fromBitmap(createChargingStationBitmap(Color.BLUE, 35)))
+                    else -> setIcon(ImageProvider.fromBitmap(createCircleBitmap(Color.YELLOW, 30)))
+                }
+            }
+        }
+        
+        // Центрируем камеру
+        val boundingBox = BoundingBox.builder()
+            .include(points)
+            .build()
+        map.move(CameraPosition(boundingBox), Animation(Animation.Type.SMOOTH, 1f))
+    }
+}
+
+// Интерфейс для API
+interface RouteService {
+    @POST("calculate_route")
+    fun calculateRoute(@Body request: RouteRequest): Call<RouteResponse>
+}
+
+// Модели данных
+data class RouteRequest(
+    val start: Coordinates,
+    val end: Coordinates,
+    val initial_battery: Float,
+    val min_battery_percent: Float,
+    val consumption_per_km: Float,
+    val charging_stations: List<ChargingStation>
+)
+
+data class RouteResponse(
+    val success: Boolean,
+    val total_distance: Float,
+    val path_coordinates: List<Coordinates>,
+    val charging_stations: List<ChargingStation>,
+    val final_battery: Float
+)
+
+data class Coordinates(val lat: Double, val lon: Double)
+
+data class ChargingStation(
+    val id: Int,
+    val lat: Double,
+    val lon: Double,
+    val name: String
+)
+
+    // Вспомогательная функция для создания цветного круга
+    private fun createCircleBitmap(color: Int, size: Int): Bitmap {
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        val paint = Paint().apply {
+            this.color = color
+            isAntiAlias = true
+            style = Paint.Style.FILL
+        }
+
+        // Рисуем круг с белой обводкой
+        val radius = size / 2f
+        val center = radius
+
+        // Белая обводка
+        paint.color = Color.WHITE
+        canvas.drawCircle(center, center, radius, paint)
+
+        // Цветной круг внутри
+        paint.color = color
+        canvas.drawCircle(center, center, radius - 4, paint)
+
+        return bitmap
+    }
+
+    private fun calculateEnergyConsumption(route: DrivingRoute, consumptionPer100km: Float) {
+        // Получаем общее расстояние маршрута в метрах
+        val totalDistanceMeters = route.metadata.weight.distance.value
+        val totalDistanceKm = totalDistanceMeters / 1000.0
+
+        // Вычисляем общий расход энергии
+        val totalConsumption = (totalDistanceKm * consumptionPer100km / 100.0).toFloat()
+
+        // Здесь можно обновить UI состояние с информацией о маршруте
+        // Например, добавить в MapUiState поля для отображения информации о маршруте
+
+        // Логируем для отладки
+        println("Общее расстояние: ${String.format("%.1f", totalDistanceKm)} км")
+        println("Расход энергии: ${String.format("%.1f", totalConsumption)} кВт⋅ч")
+        println("Время в пути: ${route.metadata.weight.time.text}")
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+}
\ No newline at end of file
diff --git a/Client/app/src/main/java/com/example/evroutes/ui/map/YandexMapComposable.kt b/Client/app/src/main/java/com/example/evroutes/ui/map/YandexMapComposable.kt
new file mode 100644
index 0000000..b462d5a
--- /dev/null
+++ b/Client/app/src/main/java/com/example/evroutes/ui/map/YandexMapComposable.kt
@@ -0,0 +1,58 @@
+package com.example.evroutes.ui.map
+
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import com.yandex.mapkit.MapKitFactory
+import com.yandex.mapkit.geometry.Point
+import com.yandex.mapkit.map.CameraPosition
+import com.yandex.mapkit.mapview.MapView
+
+@Composable
+fun YandexMapView(
+    modifier: Modifier = Modifier,
+    onMapReady: (MapView) -> Unit = {},
+    cameraPosition: CameraPosition = CameraPosition(
+        Point(55.751574, 37.573856), // Москва по умолчанию
+        11.0f, 0.0f, 0.0f
+    )
+) {
+    val lifecycleOwner = LocalLifecycleOwner.current
+
+    AndroidView(
+        modifier = modifier,
+        factory = { context ->
+            MapView(context).apply {
+                // Установка начальной позиции камеры
+                map.move(cameraPosition)
+                onMapReady(this)
+            }
+        },
+        update = { mapView ->
+            // Обновление карты при изменении параметров
+        }
+    )
+
+    DisposableEffect(lifecycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            when (event) {
+                Lifecycle.Event.ON_START -> {
+                    MapKitFactory.getInstance().onStart()
+                }
+                Lifecycle.Event.ON_STOP -> {
+                    MapKitFactory.getInstance().onStop()
+                }
+                else -> {}
+            }
+        }
+
+        lifecycleOwner.lifecycle.addObserver(observer)
+
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Client/app/src/main/res/xml/network_security_config.xml b/Client/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..d2e6f3c
--- /dev/null
+++ b/Client/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">10.0.2.2</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/Client/build.gradle.kts b/Client/build.gradle.kts
index 77acb3f..1f242f6 100644
--- a/Client/build.gradle.kts
+++ b/Client/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.0" apply false
+    id("com.android.application") version "8.10.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }
\ No newline at end of file
diff --git a/Client/gradle/libs.versions.toml b/Client/gradle/libs.versions.toml
index 2e88400..3cf4d12 100644
--- a/Client/gradle/libs.versions.toml
+++ b/Client/gradle/libs.versions.toml
@@ -1,30 +1,35 @@
 [versions]
 agp = "8.10.0"
 kotlin = "2.0.21"
-coreKtx = "1.10.1"
-junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
+coreKtx = "1.12.0"
 lifecycleRuntimeKtx = "2.6.1"
-activityCompose = "1.8.0"
-composeBom = "2024.09.00"
+activityCompose = "1.9.3"
+composeBom = "2024.10.00"
+lifecycleViewModelCompose = "2.8.6"
+navigationCompose = "2.8.3"
+retrofit = "2.11.0"
+okhttp = "4.12.0"
+yandexMaps = "4.16.0-full"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
-androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 
+yandex-maps = { group = "com.yandex.android", name = "maps.mobile", version.ref = "yandexMaps" }
+
+androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewModelCompose" }
+androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
+retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/Client/settings.gradle.kts b/Client/settings.gradle.kts
index b8b6b10..cbf6c32 100644
--- a/Client/settings.gradle.kts
+++ b/Client/settings.gradle.kts
@@ -16,6 +16,9 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url = uri("https://maven.google.com/")
+        }
     }
 }
 
diff --git a/server/data_service/requirements.txt b/server/data_service/requirements.txt
index 46b7e34..3c43f62 100644
--- a/server/data_service/requirements.txt
+++ b/server/data_service/requirements.txt
@@ -36,7 +36,6 @@ typing_extensions==4.13.2
 uvicorn==0.34.2
 watchfiles==1.0.5
 websockets==15.0.1
-psycopg2-binary
 beautifulsoup4
 requests
 SQLAlchemy
\ No newline at end of file
diff --git a/server/data_service/src/database/cruds.py b/server/data_service/src/database/cruds.py
index 70aa228..42f6934 100644
--- a/server/data_service/src/database/cruds.py
+++ b/server/data_service/src/database/cruds.py
@@ -1,5 +1,6 @@
 from database.schemas import CarCreate, CarGet
 from database.models import Car
+from fastapi import HTTPException
 
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
@@ -33,15 +34,18 @@ async def get_all_cars(db: AsyncSession) -> list[CarGet]:
     result = await db.execute(stmt)
     return result.scalars().all()
 
-async def get_car_by_name(db: AsyncSession, name: str) -> CarGet | None:
+async def get_car_by_name(db: AsyncSession, name: str) -> list[CarGet] | None:
     stmt = select(Car).where(Car.name == name)
 
     result = await db.execute(stmt)
-    return result.scalar_one_or_none()
+    return result.scalars().all()
 
 async def get_car(db: AsyncSession, id: int) -> CarGet | None:
     stmt = select(Car).where(Car.id == id)
 
     result = await db.execute(stmt)
-    return result.scalar_one_or_none()
+    car = result.scalar_one_or_none()
+    if car is None:
+        raise HTTPException(status_code=404, detail="Пользователь не найден")
+    return car
 
diff --git a/server/data_service/src/main.py b/server/data_service/src/main.py
index 017a67b..6c5d33e 100644
--- a/server/data_service/src/main.py
+++ b/server/data_service/src/main.py
@@ -1,28 +1,50 @@
 from fastapi import FastAPI, Depends, status
+from fastapi.middleware.cors import CORSMiddleware
 from sqlalchemy.ext.asyncio import AsyncSession
 from database.database import get_db
 from EV_cars import parse_ev_cars
+from database.database import get_db
+
 from database.init_db import init_models
 from contextlib import asynccontextmanager
 from database import cruds
 from database.schemas import CarCreate, CarGet
 
 
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     try:
         print("Starting up")
-        app.add_middleware(
-            allow_methods=["GET", "POST"],
-            allow_origins=["*"]
-        )
         await init_models()
+
+        db_gen = get_db()
+        session = await anext(db_gen)
+        try:
+
+            if True:
+                print("Машины не найдены. Загружаем из API...")
+                cars = parse_ev_cars()
+                await cruds.add_cars(session, cars)
+                await session.commit()
+            else:
+                print("Станции уже есть, пропускаем.")
+        except Exception as e:
+            await session.rollback()
+            print(str(e))
+            raise e
+        finally:
+            await db_gen.aclose()
         yield
     finally:
         print("Shutting down...")
 
 app = FastAPI(lifespan=lifespan, title="EV Route Car Service")
-
+app.add_middleware(
+    CORSMiddleware,
+    allow_methods=["GET", "POST"],
+    allow_origins=["*"]
+)
 
 @app.post("/car", response_model=CarCreate, status_code=status.HTTP_201_CREATED)
 async def add_car(car: CarCreate, db: AsyncSession = Depends(get_db)):
@@ -32,7 +54,7 @@ async def add_car(car: CarCreate, db: AsyncSession = Depends(get_db)):
 async def add_cars(cars: list[CarCreate], db: AsyncSession = Depends(get_db)):
     return await cruds.add_cars(db, cars)
 
-@app.get("/car", response_model=CarGet)
+@app.get("/car", response_model=list[CarGet])
 async def get_car_by_name(name: str, db: AsyncSession = Depends(get_db)):
     return await cruds.get_car_by_name(db, name)
 
@@ -40,6 +62,6 @@ async def get_car_by_name(name: str, db: AsyncSession = Depends(get_db)):
 async def get_car(car_id: int, db: AsyncSession = Depends(get_db)):
     return await cruds.get_car(db, car_id)
 
-@app.get("/cars", response_model=CarGet)
+@app.get("/cars", response_model=list[CarGet])
 async def get_cars(db: AsyncSession = Depends(get_db)):
     return await cruds.get_all_cars(db)
\ No newline at end of file
diff --git a/server/docker-compose.local.yml b/server/docker-compose.local.yml
index 8e4811b..2205aea 100644
--- a/server/docker-compose.local.yml
+++ b/server/docker-compose.local.yml
@@ -7,18 +7,8 @@ services:
     ports:
       - "8001:8001"
     depends_on:
-      - postgres
-    environment:
-      DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
-    restart: unless-stopped
-
-  auth_service:
-    build: ./auth_service
-    container_name: auth_service
-    ports:
-      - "8002:8002"
-    depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
     restart: unless-stopped
@@ -29,7 +19,8 @@ services:
     ports:
       - "8003:8003"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
     restart: unless-stopped
@@ -40,7 +31,8 @@ services:
     ports:
       - "8004:8004"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
     restart: unless-stopped
@@ -51,8 +43,10 @@ services:
     ports:
       - "8005:8005"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
+      API_KEY: 0693cf5e-35eb-460b-acb3-585ca9dd2547
       DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
     restart: unless-stopped
 
@@ -62,8 +56,10 @@ services:
     ports:
       - "8006:8006"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
+      SECRET_KEY: Bc-1ZXSm_MehZgkiDSRm70sLZHCM5wlgTQegWqg3LsbOK5sd2cc4KHGc0dNqY5egfMLm2YYo5vnl1m3uMMxB8w==
       DATABASE_URL: postgresql+asyncpg://fastapi:secret@postgres:5432/fastapi_dev
     restart: unless-stopped
 
@@ -79,5 +75,13 @@ services:
     ports:
       - "5432:5432"
 
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U fastapi -d fastapi_dev"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+
 volumes:
-  postgres_data:
\ No newline at end of file
+  postgres_data:
+  
\ No newline at end of file
diff --git a/server/gateway/requirements.txt b/server/gateway/requirements.txt
index 65c38d9..9cb0fb4 100644
--- a/server/gateway/requirements.txt
+++ b/server/gateway/requirements.txt
@@ -17,7 +17,6 @@ Jinja2==3.1.6
 markdown-it-py==3.0.0
 MarkupSafe==3.0.2
 mdurl==0.1.2
-psycopg2==2.9.10
 pydantic==2.11.4
 pydantic_core==2.33.2
 Pygments==2.19.1
diff --git a/server/gateway/src/config.py b/server/gateway/src/config.py
index 66fc382..2f695c0 100644
--- a/server/gateway/src/config.py
+++ b/server/gateway/src/config.py
@@ -1,10 +1,6 @@
-import os
-from abc import ABC
-from dataclasses import asdict, dataclass
-
-
-class CfgBase(ABC):
-    dict: callable = asdict
-
-class PostgresCfg(CfgBase):
-    url: str = os.getenv("DATABASE_URL")
\ No newline at end of file
+SERVICES = {
+    "user": "http://user_service:8006",
+    "station": "http://station_service:8005",
+    "route": "http://route_service:8004",
+    "data": "http://data_service:8003",
+}
\ No newline at end of file
diff --git a/server/gateway/src/main.py b/server/gateway/src/main.py
index 4e4f0ef..086d1f9 100644
--- a/server/gateway/src/main.py
+++ b/server/gateway/src/main.py
@@ -3,9 +3,7 @@
 from contextlib import asynccontextmanager
 import logging
 import uvicorn
-
-from server.gateway.src.routers import auth, route
-from server.gateway.src.routers import user, station
+from routers.routing import include_routes
 
 logging.basicConfig(
     level=logging.INFO,
@@ -15,7 +13,7 @@
 
 
 app = FastAPI(title="EV Route Planner Gateway")
-
+include_routes(app)
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -24,20 +22,15 @@
     allow_headers=["*"],
 )
 
-# Подключение маршрутов
-app.include_router(auth.router, prefix="/auth")
-app.include_router(user.router, prefix="/user")
-app.include_router(station.router, prefix="/stations")
-app.include_router(route.router, prefix="/route")
-#app.include_router(data.router, prefix="/data")
-
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     logger.info("Gateway server is starting...")
+
+    for route in app.routes:
+        print(f"{route.path} [{', '.join(route.methods)}]")
     yield
     logger.info("Gateway server is shutting down...")
 
-
 if __name__ == "__main__":
     logger.info("Running with Uvicorn at http://0.0.0.0:8000")
-    uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True)
\ No newline at end of file
+    uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True)
diff --git a/server/gateway/src/routers/auth.py b/server/gateway/src/routers/auth.py
deleted file mode 100644
index 2e99684..0000000
--- a/server/gateway/src/routers/auth.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from fastapi import APIRouter, HTTPException, Depends
-from pydantic import BaseModel, EmailStr
-from utils import hash_password, verify_password, create_access_token
-import psycopg2
-
-router = APIRouter()
-
-SECRET_KEY = "secret"
-
-conn = psycopg2.connect(dbname="evroutesusers", user="roki", password="roki", host="localhost")
-cursor = conn.cursor()
-
-class LoginData(BaseModel):
-    email: EmailStr
-    password: str
-
-class RegisterData(BaseModel):
-    email: EmailStr
-    password: str
-    role: str = "user"
-
-@router.post("/register")
-def register(data: RegisterData):
-    cursor.execute("SELECT 1 FROM users WHERE email = %s", (data.email,))
-    if cursor.fetchone():
-        raise HTTPException(status_code=400, detail="User already exists")
-
-    hashed_pw = hash_password(data.password)
-
-    cursor.execute(
-        "INSERT INTO users (email, password_hash, role) VALUES (%s, %s, %s)",
-        (data.email, hashed_pw, data.role)
-    )
-    conn.commit()
-    return {"status": "registered"}
-
-@router.post("/login")
-def login(data: LoginData):
-    cursor.execute("SELECT password_hash, role FROM users WHERE email = %s", (data.email,))
-    row = cursor.fetchone()
-    if not row or not verify_password(data.password, row[0]):
-        raise HTTPException(status_code=401, detail="Invalid credentials")
-    
-    token = create_access_token({"email": data.email, "role": row[1]})
-    return {"access_token": token}
\ No newline at end of file
diff --git a/server/gateway/src/routers/data.py b/server/gateway/src/routers/data.py
new file mode 100644
index 0000000..d7d9784
--- /dev/null
+++ b/server/gateway/src/routers/data.py
@@ -0,0 +1,52 @@
+from fastapi import APIRouter, Request
+import httpx
+from config import SERVICES
+
+router = APIRouter()
+
+@router.post("/add_car")
+async def add_car(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['data']}/car", content=body, headers=request.headers)
+        return response.json()
+    
+@router.post("/add_cars")
+async def add_cars(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['data']}/cars", content=body, headers=request.headers)
+        return response.json()
+
+@router.get("/get_car_by_name")
+async def get_car_by_name(request: Request):
+    query_params = str(request.query_params)
+    async with httpx.AsyncClient() as client:
+        request_url = f"{SERVICES['data']}/car"
+        if query_params:
+            request_url += f"?{query_params}"
+
+        response = await client.get(request_url)
+        response.raise_for_status()
+        return response.json()
+    
+
+@router.get("/get_car/{car_id}")
+async def get_user_by_login(car_id: int, request: Request):
+    query_params = str(request.query_params)
+    async with httpx.AsyncClient() as client:
+        request_url = f"{SERVICES['data']}/car/{car_id}"
+        if query_params:
+            request_url += f"?{query_params}"
+
+        response = await client.get(request_url)
+        response.raise_for_status()
+        return response.json()
+    
+
+@router.get("/get_cars")
+async def update_user_car(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['data']}/cars", content=body, headers=request.headers)
+        return response.json()
diff --git a/server/gateway/src/routers/route.py b/server/gateway/src/routers/route.py
index f51661f..a12cac7 100644
--- a/server/gateway/src/routers/route.py
+++ b/server/gateway/src/routers/route.py
@@ -1,18 +1,12 @@
-from fastapi import APIRouter
-from pydantic import BaseModel
+from fastapi import APIRouter, Request
+import httpx
+from config import SERVICES
 
 router = APIRouter()
 
-class RouteRequest(BaseModel):
-    start: str
-    end: str
-    battery_level: int
-
-@router.post("/")
-def calculate_route(data: RouteRequest):
-    return {
-        "start": data.start,
-        "end": data.end,
-        "estimated_time": "2h 30m",
-        "stations_on_route": []
-    }
\ No newline at end of file
+@router.post("/distance_between_points")
+async def add_station(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['route']}/distance_between_points", content=body, headers=request.headers)
+        return response.json()
\ No newline at end of file
diff --git a/server/gateway/src/routers/routing.py b/server/gateway/src/routers/routing.py
new file mode 100644
index 0000000..416d6d9
--- /dev/null
+++ b/server/gateway/src/routers/routing.py
@@ -0,0 +1,11 @@
+from fastapi import FastAPI
+from routers.data import router as data_router
+from routers.user import router as user_router
+from routers.station import router as station_router
+from routers.route import router as route_router
+
+def include_routes(app: FastAPI):
+    app.include_router(data_router, prefix="/data")
+    app.include_router(user_router, prefix="/user")
+    app.include_router(station_router, prefix="/station")
+    app.include_router(route_router, prefix="/route")
\ No newline at end of file
diff --git a/server/gateway/src/routers/station.py b/server/gateway/src/routers/station.py
index 7554805..4636e8b 100644
--- a/server/gateway/src/routers/station.py
+++ b/server/gateway/src/routers/station.py
@@ -1,34 +1,31 @@
-from fastapi import APIRouter
-from pydantic import BaseModel
-import psycopg2
+from fastapi import APIRouter, Request
+import httpx
+from config import SERVICES
 
 router = APIRouter()
 
-conn = psycopg2.connect(dbname="evroutesstations", user="roki", password="roki", host="localhost")
-cursor = conn.cursor()
+@router.post("/add_station")
+async def add_station(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['station']}/station", content=body, headers=request.headers)
+        return response.json()
 
-class Station(BaseModel):
-    name: str
-    latitude: float
-    longitude: float
-    connector_type: str
-    power_kW: int
-    working_hours: str
+@router.post("/add_stations")
+async def login(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['station']}/stations", content=body, headers=request.headers)
+        return response.json()
 
-@router.post("/")
-def add_station(station: Station):
-    cursor.execute(
-        """
-        INSERT INTO stations (name, latitude, longitude, connector_type, power_kW, working_hours)
-        VALUES (%s, %s, %s, %s, %s, %s)
-        """,
-        (station.name, station.latitude, station.longitude, station.connector_type, station.power_kW, station.working_hours)
-    )
-    conn.commit()
-    return {"status": "ok"}
+@router.get(path="/all_stations")
+async def get_user_by_login(request: Request):
+    query_params = str(request.query_params)
+    async with httpx.AsyncClient() as client:
+        request_url = f"{SERVICES['station']}/stations"
+        if query_params:
+            request_url += f"?{query_params}"
 
-@router.get("/")
-def get_stations():
-    cursor.execute("SELECT * FROM stations")
-    rows = cursor.fetchall()
-    return rows
\ No newline at end of file
+        response = await client.get(request_url)
+        response.raise_for_status()
+        return response.json()
\ No newline at end of file
diff --git a/server/gateway/src/routers/user.py b/server/gateway/src/routers/user.py
index 3821aed..d82733a 100644
--- a/server/gateway/src/routers/user.py
+++ b/server/gateway/src/routers/user.py
@@ -1,36 +1,38 @@
-from fastapi import APIRouter
-from pydantic import BaseModel
-import psycopg2
+from fastapi import APIRouter, Request
+import httpx
+from config import SERVICES
 
 router = APIRouter()
 
-conn = psycopg2.connect(dbname="evroutesuserinfo", user="roki", password="roki", host="localhost")
-cursor = conn.cursor()
+@router.post("/register")
+async def add_user(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['user']}/register", content=body, headers=request.headers)
+        return response.json()
 
-class UserData(BaseModel):
-    email: str
-    car_model: str
-    battery_capacity: float
-    connector_type: str
+@router.post("/login")
+async def login(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['user']}/login", content=body, headers=request.headers)
+        return response.json()
 
-@router.post("/")
-def save_user(data: UserData):
-    cursor.execute(
-        """
-        INSERT INTO users (email, car_model, battery_capacity, connector_type)
-        VALUES (%s, %s, %s, %s)
-        ON CONFLICT (email) DO UPDATE SET
-            car_model = EXCLUDED.car_model,
-            battery_capacity = EXCLUDED.battery_capacity,
-            connector_type = EXCLUDED.connector_type
-        """,
-        (data.email, data.car_model, data.battery_capacity, data.connector_type)
-    )
-    conn.commit()
-    return {"status": "saved"}
+@router.get("/user_by_login")
+async def get_user_by_login(request: Request):
+    query_params = str(request.query_params)
+    async with httpx.AsyncClient() as client:
+        request_url = f"{SERVICES['user']}/user"
+        if query_params:
+            request_url += f"?{query_params}"
 
-@router.get("/{email}")
-def get_user(email: str):
-    cursor.execute("SELECT * FROM users WHERE email = %s", (email,))
-    row = cursor.fetchone()
-    return row
\ No newline at end of file
+        response = await client.get(request_url)
+        response.raise_for_status()
+        return response.json()
+    
+@router.get("/user_change_car")
+async def update_user_car(request: Request):
+    body = await request.body()
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{SERVICES['user']}/user/car", content=body, headers=request.headers)
+        return response.json()
diff --git a/server/gateway/src/utils.py b/server/gateway/src/utils.py
deleted file mode 100644
index d77654c..0000000
--- a/server/gateway/src/utils.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import jwt
-import bcrypt
-from datetime import datetime, timedelta
-
-SECRET_KEY = "secret"
-ALGORITHM = "HS256"
-
-def hash_password(password: str) -> str:
-    return bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
-
-def verify_password(password: str, hashed: str) -> bool:
-    return bcrypt.checkpw(password.encode(), hashed.encode())
-
-def create_access_token(data: dict, expires_delta: timedelta = timedelta(hours=1)):
-    to_encode = data.copy()
-    to_encode["exp"] = datetime.utcnow() + expires_delta
-    return jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
-
-def decode_token(token: str):
-    return jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-
-
-# async def authenticate_user(self, db: AsyncSession, login: str, password: str) -> UserInDB | None:
-#     user = await cruds.get_user(db, login)
-#     if not user or not pwd_context.verify(password, user.password_hash):
-#         return None
-#     return user
-
-# def create_access_token(self, data: TokenData, expires_delta: timedelta) -> str:
-#     to_encode = data.model_dump()
-#     expire = datetime.now(timezone.utc) + expires_delta
-#     to_encode.update({"exp": expire})
-#     return jwt.encode(to_encode, self.SECRET_KEY, algorithm=self.ALGORITHM)
-    
-# SECRET_KEY = "secret"
-# ALGORITHM = "HS256"
-
-# security = HTTPBearer()
-
-# def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(security)):
-#     token = credentials.credentials
-#     try:
-#         payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-#         return payload
-#     except jwt.ExpiredSignatureError:
-#         raise HTTPException(status_code=401, detail="Token expired")
-#     except jwt.InvalidTokenError:
-#         raise HTTPException(status_code=401, detail="Invalid token")
\ No newline at end of file
diff --git a/server/route_service/Dockerfile b/server/route_service/Dockerfile
index e132f97..bcdcf08 100644
--- a/server/route_service/Dockerfile
+++ b/server/route_service/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.13.3-slim
 
 WORKDIR /app
-
+ENV PYTHONUNBUFFERED=1
 COPY requirements.txt .
 
 RUN pip install --no-cache-dir fastapi[standard] && \
diff --git a/server/route_service/requirements.txt b/server/route_service/requirements.txt
index e69de29..4c56479 100644
--- a/server/route_service/requirements.txt
+++ b/server/route_service/requirements.txt
@@ -0,0 +1,45 @@
+psycopg2-binary
+geopy
+geopandas
+shapely
+annotated-types==0.7.0
+anyio==4.9.0
+asyncpg==0.30.0
+certifi==2025.4.26
+click==8.1.8
+colorama==0.4.6
+dnspython==2.7.0
+email_validator==2.2.0
+fastapi==0.115.12
+fastapi-cli==0.0.7
+greenlet==3.2.2
+h11==0.16.0
+httpcore==1.0.9
+httptools==0.6.4
+httpx==0.28.1
+idna==3.10
+Jinja2==3.1.6
+markdown-it-py==3.0.0
+MarkupSafe==3.0.2
+mdurl==0.1.2
+pydantic==2.11.5
+pydantic_core==2.33.2
+Pygments==2.19.1
+python-dotenv==1.1.0
+python-multipart==0.0.20
+PyYAML==6.0.2
+rich==14.0.0
+rich-toolkit==0.14.6
+shellingham==1.5.4
+sniffio==1.3.1
+SQLAlchemy==2.0.41
+starlette==0.46.2
+typer==0.15.4
+typing-inspection==0.4.1
+typing_extensions==4.13.2
+uvicorn==0.34.2
+watchfiles==1.0.5
+websockets==15.0.1
+beautifulsoup4
+requests
+SQLAlchemy
\ No newline at end of file
diff --git a/server/route_service/src/database/schemas.py b/server/route_service/src/database/schemas.py
new file mode 100644
index 0000000..95d86c4
--- /dev/null
+++ b/server/route_service/src/database/schemas.py
@@ -0,0 +1,17 @@
+from pydantic import BaseModel
+
+class StationGet(BaseModel): 
+    id: int
+    name: str
+    latitude: float
+    longitude: float
+    connection_type: str
+    power_kw: int | None = None
+
+class MapPoint(BaseModel):
+    latitude: float
+    longitude: float
+
+    def __iter__(self):
+        yield self.latitude
+        yield self.longitude
\ No newline at end of file
diff --git a/server/route_service/src/main.py b/server/route_service/src/main.py
index e69de29..13fcaf8 100644
--- a/server/route_service/src/main.py
+++ b/server/route_service/src/main.py
@@ -0,0 +1,19 @@
+from fastapi import FastAPI, Depends, status
+from fastapi.middleware.cors import CORSMiddleware
+from sqlalchemy.ext.asyncio import AsyncSession
+from contextlib import asynccontextmanager
+from database.schemas import StationGet, MapPoint
+from utils import get_road_distance
+
+
+app = FastAPI(title="EV Route Car Service")
+app.add_middleware(
+    CORSMiddleware,
+    allow_methods=["GET", "POST"],
+    allow_origins=["*"]
+)
+
+@app.post("/distance_between_points")
+async def get_distance(start: MapPoint, end: MapPoint):
+    distance = get_road_distance(start, end)
+    return {"distance_km": distance}
\ No newline at end of file
diff --git a/server/route_service/src/utils.py b/server/route_service/src/utils.py
new file mode 100644
index 0000000..4d8e9ff
--- /dev/null
+++ b/server/route_service/src/utils.py
@@ -0,0 +1,174 @@
+from geopy.distance import geodesic
+from dataclasses import dataclass
+import requests
+from database.schemas import StationGet
+
+import os
+
+import geopandas as gpd
+from shapely.geometry import LineString
+
+from heapq import heappush, heappop
+from dataclasses import dataclass
+from typing import List, Tuple, Set
+
+@dataclass
+class MapPoint:
+    latitude: float
+    longitude: float
+
+    def __iter__(self):
+        yield self.latitude
+        yield self.longitude
+
+@dataclass
+class State:
+    position: Tuple[float, float] 
+    battery_level: float 
+    cost: float 
+    path: List[Tuple[float, float]]
+
+def get_geo_distance(point_a: MapPoint, point_b: MapPoint):
+    return geodesic(point_a, point_b).kilometers
+
+def get_road_distance(point_a: MapPoint, point_b: MapPoint) -> float:
+    url = f"http://router.project-osrm.org/route/v1/driving/{point_a.longitude},{point_a.latitude};{point_b.longitude},{point_b.latitude}"
+    response = requests.get(url).json()
+    print(response)
+    distance_km = response["routes"][0]["distance"] / 1000
+    return distance_km
+
+def get_coordinates(api_key: str, location_name: str) -> tuple[float, float] | None:
+    base_url = "https://geocode-maps.yandex.ru/1.x/"
+    params = {
+        "apikey": os.getenv(api_key),
+        "geocode": location_name,
+        "format": "json",
+        "results": 1
+    }
+    
+    try:
+        response = requests.get(base_url, params=params)
+        response.raise_for_status()
+        
+        data = response.json()
+        
+        if data["response"]["GeoObjectCollection"]["featureMember"]:
+            geo_object = data["response"]["GeoObjectCollection"]["featureMember"][0]["GeoObject"]
+            pos = geo_object["Point"]["pos"].split()
+            longitude, latitude = float(pos[0]), float(pos[1])
+            return latitude, longitude
+            
+    except Exception as e:
+        print(f"Ошибка при обработке ответа: {e}")
+    
+    return None
+
+def get_close_stations_to_route(point_a: MapPoint, point_b: MapPoint, stations: list[StationGet], radius_search: int = 90_000) -> list[StationGet]:
+    if not stations:
+        return []
+
+    # Создаём прямой путь от А до Б
+    route_points = [(point_a.longitude, point_a.latitude),
+                        (point_b.longitude, point_b.latitude)]
+    route_line = LineString(route_points)
+
+    route_geo_frame = gpd.GeoDataFrame(geometry=[route_line], crs="EPSG:4326")
+    route_geo_frame = route_geo_frame.to_crs("EPSG:3857")
+    buffer_zone = route_geo_frame.geometry.iloc[0].buffer(radius_search)
+
+    poi_geo_frame = gpd.GeoDataFrame(
+        data=[station.model_dump() for station in stations],
+        geometry=gpd.points_from_xy([station.longtitude for station in stations],
+                                    [station.latitude for station in stations]),
+        crs="EPSG:4326"
+    )
+    poi_geo_frame = poi_geo_frame.to_crs(route_geo_frame.crs)
+
+    within_mask = poi_geo_frame.geometry.within(buffer_zone)
+    poi_in_buffer = poi_geo_frame[within_mask]
+    
+    if len(poi_in_buffer) > 0:
+        selected_indices = poi_in_buffer.index.tolist()
+        print(selected_indices)
+        return [stations[i] for i in selected_indices]
+    else:
+        return []
+
+
+def modified_dijkstra(start, end, initial_battery, min_battery_percent, 
+                     consumption_per_km, charging_stations):
+    
+    # Приоритетная очередь: (стоимость, состояние)
+    pq = [(0, State(start, initial_battery, 0, []))]
+    
+    # Множество посещенных состояний (позиция, заряд батареи округленный до 1 знака)
+    visited = set()
+    
+    while pq:
+        current_cost, current_state = heappop(pq)
+        
+        # Создаем ключ состояния для избежания повторных посещений
+        if isinstance(current_state.position, tuple):
+            pos_key = current_state.position
+        else:
+            pos_key = tuple(current_state.position)
+            
+        state_key = (pos_key, round(current_state.battery_level, 1))
+        
+        if state_key in visited:
+            continue
+        visited.add(state_key)
+        
+        # Проверяем, можем ли добраться до цели напрямую
+        current_pos = current_state.position
+        if not isinstance(current_pos, tuple):
+            current_pos = tuple(current_pos)
+            
+        dist_to_end = get_road_distance(current_pos, end)
+        battery_needed_to_end = dist_to_end * consumption_per_km
+        
+        # Если можем добраться до цели с достаточным запасом
+        if current_state.battery_level >= battery_needed_to_end + min_battery_percent:
+            final_battery = current_state.battery_level - battery_needed_to_end
+            return {
+                'success': True,
+                'total_distance': current_cost + dist_to_end,
+                'path_coordinates': [start] + [tuple(sid.position) 
+                                             for sid in current_state.path] + [end],
+                'charging_stations': current_state.path,
+                'final_battery': final_battery
+            }
+        
+        # Ищем ближайшие заправочные станции
+        nearby_stations = get_close_stations_to_route(point_a=start, point_b=end, stations=charging_stations)
+        
+        for station in nearby_stations:
+            station_pos = (station['lat'], station['lon'])
+            dist_to_station = get_road_distance(current_pos, station_pos)
+            battery_needed_to_station = dist_to_station * consumption_per_km
+            
+            # Проверяем, можем ли добраться до станции с минимальным запасом
+            if current_state.battery_level >= battery_needed_to_station + min_battery_percent:
+                # Переход к станции (зарядка без дополнительной стоимости)
+                new_battery = 100.0
+                new_cost = current_cost + dist_to_station  # только расстояние
+                new_path = current_state.path + [station['id']]
+                
+                new_state = State(
+                    station['id'],
+                    new_battery,
+                    new_cost,
+                    new_path
+                )
+                
+                heappush(pq, (new_cost, new_state))
+    
+    # Маршрут не найден
+    return {
+        'success': False,
+        'total_distance': float('inf'),
+        'path_coordinates': [],
+        'charging_stations': [],
+        'final_battery': 0
+    }
\ No newline at end of file
diff --git a/server/station_service/requirements.txt b/server/station_service/requirements.txt
index e69de29..8ea05d5 100644
--- a/server/station_service/requirements.txt
+++ b/server/station_service/requirements.txt
@@ -0,0 +1,4 @@
+SQLAlchemy
+fastapi[standard]
+requests
+asyncpg
\ No newline at end of file
diff --git a/server/station_service/src/database/cruds.py b/server/station_service/src/database/cruds.py
index 61a0e88..2df94fa 100644
--- a/server/station_service/src/database/cruds.py
+++ b/server/station_service/src/database/cruds.py
@@ -7,7 +7,7 @@
 async def add_station(db: AsyncSession, station: StationCreate) -> Station:
     new_station = Station(name=station.name,
                     latitude=station.latitude,
-                    longtitude=station.longtitude, 
+                    longitude=station.longtitude, 
                     connection_type=station.connection_type,
                     power_kw=station.power_kw)
     db.add(new_station)
@@ -18,7 +18,7 @@ async def add_stations(db: AsyncSession, stations: list[StationCreate]) -> list[
     station_objects = [
                 Station(name=station.name,
                     latitude=station.latitude,
-                    longtitude=station.longtitude, 
+                    longitude=station.longtitude, 
                     connection_type=station.connection_type,
                     power_kw=station.power_kw)
             for station in stations
@@ -31,5 +31,5 @@ async def add_stations(db: AsyncSession, stations: list[StationCreate]) -> list[
 async def get_all_stations(db: AsyncSession) -> list[StationGet]:
     stmt = select(Station)
 
-    result = await db.execute(stmt)
+    result = await db.execute(statement=stmt)
     return result.scalars().all()
diff --git a/server/station_service/src/database/models.py b/server/station_service/src/database/models.py
index 3dcd8af..11167cb 100644
--- a/server/station_service/src/database/models.py
+++ b/server/station_service/src/database/models.py
@@ -1,4 +1,4 @@
-from sqlalchemy import String, Integer, Float
+from sqlalchemy import String, Integer, Float, UniqueConstraint
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 class Base(DeclarativeBase):
@@ -10,6 +10,10 @@ class Station(Base):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(String, index=True, nullable=False)
     latitude: Mapped[float] = mapped_column(Float, index=True, nullable=False)
-    longtitude: Mapped[float] = mapped_column(Float, index=True, nullable=False)
+    longitude: Mapped[float] = mapped_column(Float, index=True, nullable=False)
     connection_type: Mapped[str] = mapped_column(String, index=True, nullable=False)
-    power_kw: Mapped[int] = mapped_column(Integer, nullable=False)
\ No newline at end of file
+    power_kw: Mapped[int] = mapped_column(__name_pos=Integer, nullable=True)
+
+    __table_args__ = (
+        UniqueConstraint('latitude', 'longitude', name='location'),
+    )
\ No newline at end of file
diff --git a/server/station_service/src/database/schemas.py b/server/station_service/src/database/schemas.py
index 5db06f0..ea6dcdb 100644
--- a/server/station_service/src/database/schemas.py
+++ b/server/station_service/src/database/schemas.py
@@ -3,14 +3,14 @@
 class StationCreate(BaseModel):
     name: str
     latitude: float
-    longtitude: float
+    longitude: float
     connection_type: str
-    power_kw: int
+    power_kw: int | None
 
-class StationGet(BaseModel):
+class StationGet(BaseModel): 
     id: int
     name: str
     latitude: float
-    longtitude: float
+    longitude: float
     connection_type: str
-    power_kw: int
\ No newline at end of file
+    power_kw: int | None = None
diff --git a/server/station_service/src/main.py b/server/station_service/src/main.py
index 33d639a..c6e40d8 100644
--- a/server/station_service/src/main.py
+++ b/server/station_service/src/main.py
@@ -1,28 +1,72 @@
 from fastapi import FastAPI, Depends, status
+from fastapi.middleware.cors import CORSMiddleware
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.future import select
+from sqlalchemy import func
+
 from database.database import get_db
-from stations import get_all_stations
-from database.init_db import init_models
-from contextlib import asynccontextmanager
 from database import cruds
 from database.schemas import StationCreate, StationGet
+from database.models import Station
 
+from stations import all_stations_info
+from database.init_db import init_models
+from contextlib import asynccontextmanager
+
+async def initialize_stations():
+    """Инициализация станций в базе данных при первом запуске"""
+    async for session in get_db():
+        try:
+            result = await session.execute(select(func.count(Station.id)))
+            count = result.scalar()
+            
+            if count == 0:
+                print("База данных пуста. Загружаем станции из API...")
+                origin_stations = all_stations_info()
+                
+                if origin_stations:
+                    await cruds.add_stations(session, origin_stations)
+                    await session.commit()
+                    print(f"Успешно загружено {len(origin_stations)} станций")
+                else:
+                    print("Не удалось получить данные о станциях из API")
+            else:
+                print(f"В базе данных уже есть {count} станций. Пропускаем инициализацию.")
+                
+        except Exception as e:
+            await session.rollback()
+            print(f"Ошибка при инициализации станций: {str(e)}")
+            raise
+        finally:
+            break
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     try:
-        print("Starting up")
-        app.add_middleware(
-            allow_methods=["GET", "POST"],
-            allow_origins=["*"]
-        )
+        print("Запуск приложения...")
+        
+        # Инициализация моделей БД
         await init_models()
+        print("Модели базы данных инициализированы")
+        
+        # Инициализация данных
+        await initialize_stations()
+        
+        print("Приложение успешно запущено")
         yield
+        
+    except Exception as e:
+        print(f"Ошибка при запуске приложения: {str(e)}")
+        raise
     finally:
-        print("Shutting down...")
+        print("Завершение работы приложения...")
 
 app = FastAPI(lifespan=lifespan, title="EV Route Station Service")
-
+app.add_middleware(
+    CORSMiddleware,
+    allow_methods=["GET", "POST"],
+    allow_origins=["*"]
+)
 
 @app.post("/station", response_model=StationCreate, status_code=status.HTTP_201_CREATED)
 async def add_station(station: StationCreate, db: AsyncSession = Depends(get_db)):
@@ -32,6 +76,6 @@ async def add_station(station: StationCreate, db: AsyncSession = Depends(get_db)
 async def add_statios(stations: list[StationCreate], db: AsyncSession = Depends(get_db)):
     return await cruds.add_stations(db, stations)
 
-@app.get("/stations", response_model=StationGet)
+@app.get("/stations", response_model=list[StationGet])
 async def get_stations(db: AsyncSession = Depends(get_db)):
     return await cruds.get_all_stations(db)
\ No newline at end of file
diff --git a/server/station_service/src/stations.py b/server/station_service/src/stations.py
index 330bbb5..109dba8 100644
--- a/server/station_service/src/stations.py
+++ b/server/station_service/src/stations.py
@@ -10,24 +10,36 @@
         'key': API_KEY
     }
 
-def get_ref_data():
+def get_ref_data_base_params():
+    '''
+    Возвращает описание возможных значений полей по нужным направлениям:
+    1) Типы зарядок
+    2) Страны
+    '''
     new_url = f"{API_BASE_URL}/referencedata?{'&'.join(f'{key}={value}' for key, value in URL_PARAMS.items())}"
     response = requests.get(new_url)
     response.raise_for_status()
     data = response.json()
     
+    print(data)
     conn_types = data['ConnectionTypes']
     countries = data['Countries']
     return conn_types, countries
 
 def get_good_charg_ids():
+    result_id = []
     GOOD_CHARG = ['CHAdeMO', 'CCS (Type 1)', 'CCS (Type 2)']
-    
-    pass
+    connectors, _ = get_ref_data_base_params()
+
+    for conn in connectors:
+        if conn['Title'] in GOOD_CHARG:
+            result_id.append(conn['ID'])
+    return result_id
 
-def get_all_info_by_country(country_id: int):
+def get_all_info_by_country(country_id: int, connector_ids: list[int] = [2, 32, 33]):
     result = []
-    new_url = f"{API_BASE_URL}/poi?{'&'.join(f'{key}={value}' for key, value in URL_PARAMS.items())}&countryid={country_id}&connectiontypeid=2, 32, 33"
+    new_url = f"""{API_BASE_URL}/poi?{'&'.join(f'{key}={value}' for key, value in URL_PARAMS.items())}&countryid={country_id}&connectiontypeid={', '.join(str(charge_id) for charge_id in connector_ids)}"""
+    
     response = requests.get(new_url)
     response.raise_for_status()
     data = response.json()
@@ -35,31 +47,33 @@ def get_all_info_by_country(country_id: int):
         result.append(get_use_info_from_json(station=station))
     return result
 
-
 def get_use_info_from_json(station: dict) -> StationCreate:
     address_info = station['AddressInfo']
     name = address_info['Title']
     latitude = address_info['Latitude']
-    longtitude = address_info['Longitude']
+    longitude = address_info['Longitude']
     connections_info = station['Connections']
     
     for connection in connections_info:
-        connection_type = connection['ConnectionType']
+        connection_type = connection['ConnectionType']['Title']
         power_kw = connection['PowerKW']
+        if connection['PowerKW'] is not None:
+            power_kw = int(connection['PowerKW'])
+        
 
     return StationCreate(name=name,
                         latitude=latitude,
-                        longtitude=longtitude, 
+                        longitude=longitude, 
                         connection_type=connection_type,
                         power_kw=power_kw
                         )
 
 def all_stations_info():
     stations = []
-
     for country_id in range(251):
         country_stations = get_all_info_by_country(country_id=country_id)
-        stations.append(country_stations)
+        stations.extend(country_stations)
     return stations
 
-stations = all_stations_info()
\ No newline at end of file
+if __name__ == '__main__':
+    get_ref_data_base_params()
\ No newline at end of file
diff --git a/server/user_service/requirements.txt b/server/user_service/requirements.txt
index e69de29..96f97f2 100644
--- a/server/user_service/requirements.txt
+++ b/server/user_service/requirements.txt
@@ -0,0 +1,51 @@
+annotated-types==0.7.0
+anyio==4.9.0
+async-timeout==5.0.1
+asyncpg==0.30.0
+beautifulsoup4==4.13.4
+certifi==2025.4.26
+charset-normalizer==3.4.2
+click==8.1.8
+colorama==0.4.6
+dnspython==2.7.0
+email_validator==2.2.0
+exceptiongroup==1.3.0
+fastapi==0.115.12
+fastapi-cli==0.0.7
+greenlet==3.2.2
+h11==0.16.0
+httpcore==1.0.9
+httptools==0.6.4
+httpx==0.28.1
+idna==3.10
+Jinja2==3.1.6
+markdown-it-py==3.0.0
+MarkupSafe==3.0.2
+mdurl==0.1.2
+passlib==1.7.4
+psycopg2-binary==2.9.10
+pydantic==2.11.5
+pydantic_core==2.33.2
+Pygments==2.19.1
+python-dotenv==1.1.0
+python-multipart==0.0.20
+PyYAML==6.0.2
+requests==2.32.3
+rich==14.0.0
+rich-toolkit==0.14.6
+shellingham==1.5.4
+sniffio==1.3.1
+soupsieve==2.7
+SQLAlchemy==2.0.41
+starlette==0.46.2
+typer==0.15.4
+typing-inspection==0.4.1
+typing_extensions==4.13.2
+urllib3==2.4.0
+uvicorn==0.34.2
+uvloop==0.21.0
+watchfiles==1.0.5
+websockets==15.0.1
+PyJWT
+bcrypt
+passlib[bcrypt]
\ No newline at end of file
diff --git a/server/user_service/src/auth/__init__.py b/server/user_service/src/auth/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/user_service/src/auth/auth.py b/server/user_service/src/auth/auth.py
index 4631314..a387d7a 100644
--- a/server/user_service/src/auth/auth.py
+++ b/server/user_service/src/auth/auth.py
@@ -1,22 +1,23 @@
 from passlib.context import CryptContext
 from sqlalchemy.ext.asyncio import AsyncSession
 from datetime import datetime, timedelta, timezone
-
-from jose import jwt
-
+import jwt
+from pydantic import SecretStr
 from database.schemas import UserInDB, TokenData
 from database import cruds
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
+
 class AuthService:
     def __init__(self, secret_key: str, algorithm: str = "HS256"):
         self.SECRET_KEY = secret_key
         self.ALGORITHM = algorithm
 
-    async def authenticate_user(self, db: AsyncSession, login: str, password: str) -> UserInDB | None:
+    async def authenticate_user(self, db: AsyncSession, login: str, password: SecretStr) -> UserInDB | None:
         user = await cruds.get_user(db, login)
-        if not user or not pwd_context.verify(password, user.password_hash):
+        password_orig = password.get_secret_value()
+        if not user or not pwd_context.verify(password_orig, user.password_hash):
             return None
         return user
 
@@ -24,4 +25,8 @@ def create_access_token(self, data: TokenData, expires_delta: timedelta) -> str:
         to_encode = data.model_dump()
         expire = datetime.now(timezone.utc) + expires_delta
         to_encode.update({"exp": expire})
-        return jwt.encode(to_encode, self.SECRET_KEY, algorithm=self.ALGORITHM)
\ No newline at end of file
+        return jwt.encode(to_encode, self.SECRET_KEY, algorithm=self.ALGORITHM)
+    
+
+# def decode_token(token: str):
+#     return jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
\ No newline at end of file
diff --git a/server/user_service/src/config.py b/server/user_service/src/config.py
index 66fc382..dd2c5bc 100644
--- a/server/user_service/src/config.py
+++ b/server/user_service/src/config.py
@@ -1,7 +1,6 @@
 import os
 from abc import ABC
-from dataclasses import asdict, dataclass
-
+from dataclasses import asdict
 
 class CfgBase(ABC):
     dict: callable = asdict
diff --git a/server/user_service/src/database/cruds.py b/server/user_service/src/database/cruds.py
index 1b7140b..3f2c556 100644
--- a/server/user_service/src/database/cruds.py
+++ b/server/user_service/src/database/cruds.py
@@ -9,16 +9,15 @@
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 async def add_user(db: AsyncSession, user: UserCreate) -> UserGet:
     hashed_password = pwd_context.hash(user.password.get_secret_value())
-    new_user = UserInDB(login=user.login,
-                        password_hash=hashed_password)
+    new_user = User(login=user.login,
+                    password_hash=hashed_password)
     try:
         db.add(new_user)
-        db.flush()
+        await db.flush()
         return UserGet(id=new_user.id,
                     login=new_user.login,
                     car_id=new_user.car_id)
     except IntegrityError as ie:
-        await db.rollback()
         raise HTTPException(status_code=400, detail=f"Логин уже занят: {str(ie)}")
 
 async def get_db_user(db: AsyncSession, login: str) -> UserInDB | None:
@@ -29,10 +28,14 @@ async def get_db_user(db: AsyncSession, login: str) -> UserInDB | None:
 async def get_user(db: AsyncSession, login: str) -> UserGet | None:
     stmt = select(User).where(User.login == login)
     result = await db.execute(stmt)
-    return result.scalar_one_or_none()
+    user = result.scalar_one_or_none()
+
+    if user is None:
+        raise HTTPException(status_code=404, detail="Пользователь не найден")
+    return user
 
 async def update_user_car(db: AsyncSession, login: int, new_car: int | None) -> UserGet:
-    query = select(UserInDB).where(UserInDB.login == login)
+    query = select(User).where(User.login == login)
     result = await db.execute(statement=query)
     user = result.scalar_one_or_none()
 
diff --git a/server/user_service/src/database/init_db.py b/server/user_service/src/database/init_db.py
index e69de29..65ccf55 100644
--- a/server/user_service/src/database/init_db.py
+++ b/server/user_service/src/database/init_db.py
@@ -0,0 +1,10 @@
+import asyncio
+from database.database import engine
+from database.models import Base
+
+async def init_models():
+    async with engine.begin() as conn:
+        await conn.run_sync(Base.metadata.create_all)
+
+if __name__ == "__main__":
+    asyncio.run(init_models())
\ No newline at end of file
diff --git a/server/user_service/src/database/schemas.py b/server/user_service/src/database/schemas.py
index 1612a95..1c6502e 100644
--- a/server/user_service/src/database/schemas.py
+++ b/server/user_service/src/database/schemas.py
@@ -16,14 +16,13 @@ class UserInDB(BaseModel):
 class UserGet(BaseModel):
     id: int
     login: str
-    car_id: str | None
+    car_id: int | None
+
+class AccessToken(BaseModel):
+    access_token: str
+    token_type: str = "bearer"
 
 class TokenData(BaseModel):
     sub: str
     exp: datetime | None = None
     scopes: list[str] = []
-
-    class Config:
-        json_encoders = {
-            datetime: lambda v: v.timestamp()  # Для корректной сериализации в JSON
-        }
\ No newline at end of file
diff --git a/server/user_service/src/logger_config.py b/server/user_service/src/logger_config.py
new file mode 100644
index 0000000..111efaf
--- /dev/null
+++ b/server/user_service/src/logger_config.py
@@ -0,0 +1,20 @@
+import logging
+
+def setup_logger(name=__name__):
+    logger = logging.getLogger(name)
+    logger.setLevel(logging.INFO)
+
+    formatter = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
+
+    console_handler = logging.StreamHandler()
+    console_handler.setFormatter(formatter)
+
+    # Если логгер уже имеет обработчики, не добавляем их снова
+    if not logger.handlers:
+        logger.addHandler(console_handler)
+
+    return logger
+
+logger = setup_logger()
\ No newline at end of file
diff --git a/server/user_service/src/main.py b/server/user_service/src/main.py
index ba3ee38..8d3a682 100644
--- a/server/user_service/src/main.py
+++ b/server/user_service/src/main.py
@@ -1,41 +1,53 @@
+from datetime import timedelta
 from fastapi import FastAPI, Depends, status, HTTPException
+from fastapi.middleware.cors import CORSMiddleware
 from sqlalchemy.ext.asyncio import AsyncSession
 from database.database import get_db
 from database.init_db import init_models
 from contextlib import asynccontextmanager
 from database import cruds
-from database.schemas import UserCreate, UserGet, UserLogin
-from auth.auth import authenticate_user, create_access_token
+from database.schemas import TokenData, UserCreate, UserGet, UserLogin, AccessToken
+from auth.auth import AuthService
+from logger_config import logger
+import os
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     try:
         print("Starting up")
-        app.add_middleware(
-            allow_methods=["GET", "POST", "PATCH"],
-            allow_origins=["*"]
-        )
         await init_models()
         yield
     finally:
         print("Shutting down...")
 
 app = FastAPI(lifespan=lifespan, title="EV Route User Service")
+app.add_middleware(
+CORSMiddleware,
+                allow_methods=["GET", "POST", "PATCH"],
+                allow_origins=["*"]
+)
+
+secret_key = os.getenv("SECRET_KEY")
+auth_service = AuthService(secret_key=secret_key)
 
 @app.post("/register", response_model=UserGet, status_code=status.HTTP_201_CREATED)
 async def add_user(user: UserCreate, db: AsyncSession = Depends(get_db)):
+    logger.info("Начали регистрацию")
     return await cruds.add_user(db, user)
 
-@app.post("/login", response_model=UserGet)
+@app.post("/login", response_model=AccessToken)
 async def login(user_data: UserLogin, db: AsyncSession = Depends(get_db)):
-    user = await authenticate_user(db, user_data.login, user_data.password)
+    user = await auth_service.authenticate_user(db, user_data.login, user_data.password)
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect login or password",
         )
-    access_token = create_access_token(data={"sub": user.login})
-    return {"access_token": access_token, "token_type": "bearer"}
+    access_token = auth_service.create_access_token(
+        data=TokenData(sub=user.login),
+        expires_delta=timedelta(minutes=30)
+        )
+    return AccessToken(access_token=access_token)
 
 @app.get("/user", response_model=UserGet)
 async def get_user(login: str, db: AsyncSession = Depends(get_db)):
@@ -43,4 +55,4 @@ async def get_user(login: str, db: AsyncSession = Depends(get_db)):
 
 @app.patch("/user/car", response_model=UserGet, status_code=status.HTTP_202_ACCEPTED)
 async def update_car(login: str, new_car: int, db: AsyncSession = Depends(get_db)):
-    return await cruds.update_user_car(db, login, new_car)
+    return await cruds.update_user_car(db, login, new_car)
\ No newline at end of file