Добавил поле role, чичас буду менять UI под нее...
This commit is contained in:
parent
c3e82ff61b
commit
54ee3a0a18
@ -8,6 +8,7 @@ import kotlinx.serialization.Serializable
|
||||
data class UserRemote(
|
||||
val id: Int? = 0,
|
||||
val login: String = "",
|
||||
val role: String = "",
|
||||
val password: String = "",
|
||||
var items: List<ItemFromCartRemote> = emptyList()
|
||||
)
|
||||
@ -15,11 +16,13 @@ data class UserRemote(
|
||||
fun UserRemote.toUser(): User = User(
|
||||
id,
|
||||
login,
|
||||
role,
|
||||
password
|
||||
)
|
||||
|
||||
fun User.toUserRemote(): UserRemote = UserRemote(
|
||||
uid,
|
||||
login,
|
||||
role,
|
||||
password
|
||||
)
|
@ -60,7 +60,7 @@ abstract class AppDatabase : RoomDatabase() {
|
||||
INSTANCE?.let { database ->
|
||||
// Users
|
||||
val userDao = database.userDao()
|
||||
val user1 = User(1, "login", "password")
|
||||
val user1 = User(1, "login", "admin", "password")
|
||||
userDao.insert(user1)
|
||||
/*// Bikes
|
||||
val bikeDao = database.bikeDao()
|
||||
|
@ -27,7 +27,7 @@ class RegisterUserViewModel(private val userRepository: UserRepository) : ViewMo
|
||||
if (password.isNotEmpty() && username.isNotEmpty()) {
|
||||
val existingUser = _users.value?.find { it.login == username }
|
||||
if (existingUser == null) {
|
||||
val newUser = User(null, username, password)
|
||||
val newUser = User(null, username,"user" ,password)
|
||||
insertUser(newUser)
|
||||
setUserList()
|
||||
return true
|
||||
|
@ -8,6 +8,7 @@ data class User(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val uid: Int? = 0,
|
||||
val login: String,
|
||||
val role: String,
|
||||
val password: String
|
||||
) {
|
||||
override fun equals(other: Any?): Boolean {
|
||||
|
@ -3,6 +3,7 @@
|
||||
{
|
||||
"id": 1,
|
||||
"login": "login",
|
||||
"role": "admin",
|
||||
"password": "password",
|
||||
"items": [
|
||||
{
|
||||
@ -20,41 +21,49 @@
|
||||
{
|
||||
"id": 2,
|
||||
"login": "hello",
|
||||
"role": "admin",
|
||||
"password": "hello"
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"login": "максимка",
|
||||
"role": "admin",
|
||||
"password": "мпака"
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"login": "радар",
|
||||
"role": "admin",
|
||||
"password": "ура"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"login": "677",
|
||||
"role": "admin",
|
||||
"password": "по оллл"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"login": "ежжпжпж",
|
||||
"role": "admin",
|
||||
"password": "ззрзрзе"
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"login": "1",
|
||||
"role": "user",
|
||||
"password": "1"
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"login": "ickxkx",
|
||||
"role": "user",
|
||||
"password": "dpldllflfl"
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"login": "привет",
|
||||
"role": "user",
|
||||
"password": "привет",
|
||||
"items": [
|
||||
{
|
||||
@ -67,37 +76,50 @@
|
||||
{
|
||||
"id": 10,
|
||||
"login": "q",
|
||||
"role": "user",
|
||||
"password": "q"
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"login": "пр",
|
||||
"role": "user",
|
||||
"password": "пр"
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"login": "лог",
|
||||
"role": "user",
|
||||
"password": "логин"
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
"login": "привето",
|
||||
"role": "user",
|
||||
"password": "приаето"
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
"login": "123",
|
||||
"role": "user",
|
||||
"password": "123"
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
"login": "лол",
|
||||
"role": "user",
|
||||
"password": "лол"
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
"login": "хелп",
|
||||
"role": "user",
|
||||
"password": "хелло"
|
||||
},
|
||||
{
|
||||
"id": 17,
|
||||
"login": "привет 2",
|
||||
"role": "user",
|
||||
"password": "привет 2"
|
||||
}
|
||||
],
|
||||
"rents": [
|
||||
|
Loading…
Reference in New Issue
Block a user