Project-Sloth · FrazzIe · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024
diff --git a/client/client.lua b/client/client.lua
@@ -140,6 +140,18 @@ end)
 
 -- Callbacks
 RegisterNUICallback("setWaypoint", function (data, cb)
+	if data.type == 'house' and data.x == nil and data.y == nil then
+		local location = lib.callback.await("bl-realtor:server:getPropertyLocation", source, data.id, data.shell);
+
+		data.x = location.x;
+		data.y = location.y;
+	end
+
+	if data.x == nil and data.y == nil then
+		lib.notify({ description = 'Unable to set waypoint!' , type = 'error'})
+		return
+	end
+
 	lib.notify({ description = 'Waypoint was set!' , type = 'success'})
 	SetNewWaypoint(data.x, data.y)
 	cb("ok")

diff --git a/html/images/House.png b/html/images/House.png
diff --git a/html/images/apartment-banner.webp b/html/images/apartment-banner.webp
diff --git a/html/images/apartment-card.webp b/html/images/apartment-card.webp
diff --git a/html/images/app-banner.webp b/html/images/app-banner.webp
diff --git a/html/images/apt-card-img.png b/html/images/apt-card-img.png
diff --git a/html/images/apts-bg.png b/html/images/apts-bg.png
diff --git a/html/images/discord-emoji.png b/html/images/discord-emoji.png
diff --git a/html/images/fallback-image.svg b/html/images/fallback-image.svg
diff --git a/html/images/house.webp b/html/images/house.webp
diff --git a/html/images/properties-banner.webp b/html/images/properties-banner.webp
diff --git a/html/images/property-banner.webp b/html/images/property-banner.webp
diff --git a/html/images/property-card-img.png b/html/images/property-card-img.png
diff --git a/html/images/property-card.webp b/html/images/property-card.webp
diff --git a/html/images/user-location-pin.png b/html/images/user-location-pin.png
diff --git a/html/index.css b/html/index.css
diff --git a/html/index.html b/html/index.html
@@ -1,31 +1,29 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-    <!-- FontAwesome Icons Import -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css">
-    <!-- Material Icons Import -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <!-- Material Design Icons Import -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font/css/materialdesignicons.min.css">
-    <!-- Line Awesome Icons Import -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/line-awesome/dist/line-awesome/css/line-awesome.min.css">
-    <!-- Boostrap Icons -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.min.css">
-
-    <!-- Satoshi Font -->
-    <link href="https://fonts.cdnfonts.com/css/satoshi" rel="stylesheet">
-
-
-
-    <title>FIVEM</title>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <!-- FontAwesome Icons Import -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css">
+    <!-- Material Icons Import -->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+    <!-- Material Design Icons Import -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font/css/materialdesignicons.min.css">
+    <!-- Line Awesome Icons Import -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/line-awesome/dist/line-awesome/css/line-awesome.min.css">
+    <!-- Boostrap Icons -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.min.css">
+
+    <!-- Satoshi Font -->
+    <link href="https://fonts.cdnfonts.com/css/satoshi" rel="stylesheet">
+
+
+    <title>FIVEM</title>
     <script type="module" crossorigin src="./index.js"></script>
-    <link rel="stylesheet" href="./index.css">
-  </head>
-  <body>
-    <div id="app"></div>
-
-  </body>
-</html>
+    <link rel="stylesheet" crossorigin href="./index.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

diff --git a/html/index.js b/html/index.js
diff --git a/server/server.lua b/server/server.lua
@@ -58,6 +58,11 @@ lib.callback.register("bl-realtor:server:getNames", function (source, data)
     return names
 end)
 
+lib.callback.register("bl-realtor:server:getPropertyLocation", function(source, propertyId, shell)
+    local door = exports['ps-housing']:getMainDoor(propertyId, 1, shell ~= 'mlo')
+    return door ~= nil and vector2(door.coords.x, door.coords.y) or vector2(0);
+end)
+
 if Config.UseItem then
     QBCore.Functions.CreateUseableItem(Config.ItemName, function(source, item)
         local src = source

diff --git a/ui/css/apartments/apartment-card.css b/ui/css/apartments/apartment-card.css
diff --git a/ui/css/apartments/apartments.css b/ui/css/apartments/apartments.css
diff --git a/ui/css/apartments/selected-apartment.css b/ui/css/apartments/selected-apartment.css
diff --git a/ui/css/colors.css b/ui/css/colors.css
@@ -22,4 +22,8 @@
     --red-color: rgba(220, 38, 38, 1);
 
     --circle-color: rgba(75, 75, 75, 1);
+
+    --control-background-gradient: linear-gradient(0deg, #313131, #313131), linear-gradient(0deg, var(--light-border-color-2), var(--light-border-color-2));
+
+    --background-color: #131313;
 }