diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.bin b/compose/.gradle/8.0/executionHistory/executionHistory.bin index c75d561..bd2d7ec 100644 Binary files a/compose/.gradle/8.0/executionHistory/executionHistory.bin and b/compose/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.lock b/compose/.gradle/8.0/executionHistory/executionHistory.lock index 772189f..e162cbd 100644 Binary files a/compose/.gradle/8.0/executionHistory/executionHistory.lock and b/compose/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/compose/.gradle/8.0/fileHashes/fileHashes.bin b/compose/.gradle/8.0/fileHashes/fileHashes.bin index b56d203..6eb6316 100644 Binary files a/compose/.gradle/8.0/fileHashes/fileHashes.bin and b/compose/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/compose/.gradle/8.0/fileHashes/fileHashes.lock b/compose/.gradle/8.0/fileHashes/fileHashes.lock index a54bda6..26a0ed0 100644 Binary files a/compose/.gradle/8.0/fileHashes/fileHashes.lock and b/compose/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin b/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin index 4f08e90..d53c578 100644 Binary files a/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/compose/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d0c7ee2..bb170fa 100644 Binary files a/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt index 7594d0b..b7e80c0 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ApiRoutes.kt @@ -3,9 +3,9 @@ package ru.ulstu.`is`.pmu.tank.api object ApiRoutes { const val BASE = "http://10.0.2.2:8079/" const val USER = "users" - const val LEVEL = "level" - const val NATION = "nation" - const val TANK = "TANK" + const val LEVEL = "levels" + const val NATION = "nations" + const val TANK = "tanks" const val USER_TANK = "userTanks" const val NOT_USER_TANK = "notUserTanks" } \ No newline at end of file diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt index e59883d..94d65dd 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/ServerService.kt @@ -78,7 +78,7 @@ interface ServerService { @Query("_limit") limit: Int ): List - @GET(ApiRoutes.NATION) + @GET("/getall/${ApiRoutes.NATION}") suspend fun getAllNations(): List @GET("${ApiRoutes.NATION}/{id}") @@ -162,7 +162,7 @@ interface ServerService { // ![USER_TANK_CROSS_REF] companion object { - private const val BASE_URL = ApiRoutes.BASE + private const val BASE_URL = "http://10.0.2.2:8079/" @Volatile private var INSTANCE: ServerService? = null diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt index 12f376e..e3dfc35 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/api/repository/RestUserRepository.kt @@ -32,6 +32,7 @@ class RestUserRepository( override suspend fun insertUser(user: User) { service.insertUser(user.toRemote()) + dbUserRepository.insertUser(user) } override suspend fun updateUser(user: User) { diff --git a/compose/server/package.json b/compose/server/package.json index 0fb3100..2fb0529 100644 --- a/compose/server/package.json +++ b/compose/server/package.json @@ -1,5 +1,5 @@ { - "name": "fake-db", + "name": "20-db", "version": "1.0.0", "scripts": { "start": "json-server --watch data.json --host 0.0.0.0 -p 8079"