Начинаем делать экран продуктов + ранние фиксы

app/src/main/java/com/example/shawarma/data/dao/OrderDao.kt

@@ -20,7 +20,7 @@ interface OrderDao {
     @Delete
     suspend fun delete(order: OrderModel)
 
-    @Query("select * from orders where orders.user_id is not null")
+    @Query("select * from orders")
     fun getAll() : Flow<List<OrderWithProducts>>
     @Query("select * from orders where orders.id =:id")
     fun getById(id: Int): Flow<List<OrderWithProducts>>

app/src/main/java/com/example/shawarma/screens/discount/DiscountScreen.kt

@@ -36,10 +36,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import com.example.shawarma.R
 import com.example.shawarma.data.db.AppDatabase
-import com.example.shawarma.data.models.DiscountProductModel
 import com.example.shawarma.data.models.ProductModel
-import com.example.shawarma.data.models.getAllDiscountProducts
-import com.example.shawarma.screens.home.HomeList
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightYellow
 import com.example.shawarma.ui.theme.MyMainBackground
@@ -149,6 +146,7 @@ fun DiscountCard(product : ProductModel){
                     .size(160.dp, 36.dp)
             ) {
                 Row(
+                    horizontalArrangement = Arrangement.SpaceBetween
                 ){
                     Box(
                         modifier = Modifier.padding(start = 12.dp)

app/src/main/java/com/example/shawarma/utils/BottomNavItem.kt

@@ -7,4 +7,6 @@ sealed class BottomNavItem(var title:String, var icon:Int, var screen_route:Stri
     object Discount : BottomNavItem("Discount", R.drawable.discount_icon,ScreenPaths.discount.name)
     object Cart : BottomNavItem("Cart", R.drawable.cart_icon,ScreenPaths.cart.name)
     object Orders: BottomNavItem("Orders", R.drawable.orders_icon,ScreenPaths.orders.name)
+    object Products: BottomNavItem("Products", R.drawable.pen_icon, ScreenPaths.products.name)
+
 }

app/src/main/java/com/example/shawarma/utils/ScreenPaths.kt

@@ -1,5 +1,5 @@
 package com.example.shawarma.utils
 
 enum class ScreenPaths {
-    authorization, registration, home, discount, cart, orders
+    authorization, registration, home, discount, cart, orders, products
 }