merge

src/lib/3dmap/scene.svelte

@@ -1,5 +1,9 @@
 <script>
+<<<<<<< HEAD
 	import { GLTF, interactivity, Text } from '@threlte/extras';
+=======
+	import { GLTF, interactivity } from '@threlte/extras';
+>>>>>>> b73777035a9199b8a683365c7c6ea9853f429e6f
 	import { T } from '@threlte/core';
 	import CameraControls from './cameracontrols.svelte';
 	import {
@@ -13,7 +17,10 @@
 	import ObjectModel from './objectmodel.svelte';
 	import { onMount } from 'svelte';
 	import { base } from '$app/paths';
+<<<<<<< HEAD
 	import labelsList from './labels.json';
+=======
+>>>>>>> b73777035a9199b8a683365c7c6ea9853f429e6f
 
 	let objects = $objectsData;
 	let categories = $categoryData;

src/routes/+page.svelte

@@ -4,7 +4,7 @@
 </script>
 
 <div class="flex h-[calc(100dvh)] flex-col bg-base-100 bg-gradient-to-r to-base-300">
-	<h2 class="text-bold m-5 flex text-xl">
+	<h2 class="text-bold m-5 flex text-2xl">
 		<Logo class="-mt-1" />store<span class="font-thin">companion</span>
 	</h2>
 	<div class="hero flex-1">
@@ -16,8 +16,8 @@
 					Your Store,<br />Your World
 				</h1>
 				<p class="py-6">
-					Unlock a new era of personalized shopping with storecompanion - Create your store's
-					digital twin to make finding items yesterday's problem and get customer hooked.
+					Pioneer a new era of augmented shopping with Storecompanion - the digital twin that will
+					make your customers’ experience richer and smoother.
 				</p>
 				<div>
 					<a class="btn mr-2" href="mailto:sales@storecompanion.xyz">Contact Us</a>

src/routes/app/+page.svelte

@@ -121,7 +121,7 @@
 <div class="flex h-full flex-col-reverse overflow-hidden sm:flex-row">
 	<!-- Product sidebar -->
 	<div
-		class="z-20 flex h-1/3 min-w-[19rem] flex-col items-center overflow-y-auto overflow-x-hidden rounded-r-xl shadow-sm sm:h-full sm:w-[400px] sm:bg-base-200"
+		class="z-20 flex h-1/3 min-w-[20rem] flex-col items-center overflow-y-auto overflow-x-hidden rounded-r-xl shadow-sm sm:h-full sm:bg-base-200"
 	>
 		<!-- Sidebar label -->
 		{#if $currentCategory in categories}

src/routes/app/categories.json

@@ -1,6 +1,6 @@
 {
 	"product": { "name": "Search", "icon": "mdi:store-search", "hide_top": true },
-	"trend": { "name": "Trending", "icon": "mdi:trending-up", "hide_top": true },
+	"trend": { "name": "Trending", "icon": "mdi:fire", "hide_top": true },
 	"service": { "name": "Services", "icon": "mdi:human-greeting-variant" },
 	"promo": { "name": "Promos", "icon": "mdi:cart-percent" },
 	"eco": { "name": "Good for", "icon": "mdi:leaf" }