fixing conflicts merging dev into this

src/views/dashboard.ejs

@@ -2,20 +2,14 @@
     <%- include("./partials/header") %>
 
         <main>
-            <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %>
-            </h2>
             <!-- Buttons -->
             <div class="flex justify-end gap-4 px-5 py-6">
                 <button
                     class="cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
-                    type="button">
-                    Add Asset
-                </button>
+                    type="button">Add Asset</button>
                 <a href="/newPlan"
                     class="cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
-                    type="button">
-                    Create new plan
-                </a>
+                    type="button">Create new plan </a>
             </div>
             <!--This is the cards for plans and other things-->
             <div class="mt-12">
@@ -35,8 +29,7 @@
                         <div class="border-t border-blue-gray-50 p-10">
                             <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
                                 <strong class="text-green-500">Make this percent bar or graph or something
-                                </strong>&nbsp;than last
-                                week
+                                </strong>&nbsp;than lastweek
                             </p>
                         </div>
                     </div>
@@ -106,5 +99,15 @@
                 </div>
         </main>
 
+        <script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
+        <script src="/static/scripts/geolocation.js"></script>
+        <!-- <script src="/static/scripts/calcExchange.js"></script> -->
+        <script>
+            // If no geoData provided thorugh EJS, send update request to backend
+            let country = "<%= geoData.country %>";
+            if (!country) getLocation();
+        </script>
+
+
         <%- include("./partials/navBar") %>
             <%- include("./partials/footer") %>