From 42ea4ed8bc42b8aa8ef0090e43a5b84126b9da4f Mon Sep 17 00:00:00 2001
From: SowinskiBraeden <braeden@sowinski.dev>
Date: Thu, 8 May 2025 21:39:07 -0700
Subject: [PATCH] fix/issue #13

---
 src/views/dashboard.ejs       | 14 ++------------
 src/views/partials/footer.ejs | 12 +++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/dashboard.ejs b/src/views/dashboard.ejs
index 88ed427..11979d3 100644
--- a/src/views/dashboard.ejs
+++ b/src/views/dashboard.ejs
@@ -4,8 +4,8 @@
 <main>
     <!-- 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>
-        <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>
+        <a href="/assets?popup" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">Add Asset</a>
+        <a href="/newPlan" class="text-center 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>
     </div>
     <!--This is the cards for plans and other things-->
     <div class="mt-12">
@@ -90,15 +90,5 @@
     </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") %>
\ No newline at end of file
diff --git a/src/views/partials/footer.ejs b/src/views/partials/footer.ejs
index 110cbe0..89cc09b 100644
--- a/src/views/partials/footer.ejs
+++ b/src/views/partials/footer.ejs
@@ -6,5 +6,15 @@
         </div>
     </div>
 </footer>
+
+<!-- Get geolocation if not in session and load conversion rates -->
+<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
+<script src="/static/scripts/geolocation.js"></script>
+<script>
+    // If no geoData provided thorugh EJS, send update request to backend
+    let country = "<%= geoData.country %>";
+    if (!country) getLocation();
+</script>
+
 </body>
-</html>
\ No newline at end of file
+</html>