From d2e69f230f2b7b7261eb6f4fb8c497677c0cc723 Mon Sep 17 00:00:00 2001
From: knighthawk4227 <mitchellschaeffer6@gmail.com>
Date: Wed, 21 May 2025 16:54:17 -0700
Subject: [PATCH] fixing conflicts

---
 src/views/assets.ejs               | 7 +++++--
 src/views/dashboard.ejs            | 7 +++----
 src/views/partials/assetModify.ejs | 5 +++--
 src/views/partials/createAsset.ejs | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/assets.ejs b/src/views/assets.ejs
index 4e95d18..cd1e212 100644
--- a/src/views/assets.ejs
+++ b/src/views/assets.ejs
@@ -25,11 +25,14 @@
         </div>
 
         <div class="w-md my-6 max-w-md mx-auto px-4 flex flex-row justify-between">
-            <a href="/home" class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+            <a href="/home" class="text-center w-sm py-2 mx-2 px-4 border 
+            border-transparent rounded-md shadow-sm text-sm font-medium 
+            text-white bg-blue-600 hover:bg-blue-700 focus:outline-none">
                 Back to Dashboard
             </a>
             <button 
-                class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+                class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 
+                hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
                 onclick="document.getElementById('create-asset-modal').showModal()"
             >
                 Add New Asset
diff --git a/src/views/dashboard.ejs b/src/views/dashboard.ejs
index 0fe0cf6..05855f9 100644
--- a/src/views/dashboard.ejs
+++ b/src/views/dashboard.ejs
@@ -5,9 +5,9 @@
             <!-- Buttons -->
             <div class="flex justify-end gap-4 px-5 py-6">
                 <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"
+                    id="addAss" 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"
+                <a href="/plans?openModal=true"
                     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>
@@ -21,8 +21,7 @@
                                         <div class="mt-4 flex justify-center">
                                             <a href="/plans" class="cursor-pointer border-2 border-blue-600 bg-blue-600 text-white py-2 px-6 
                                                 rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold 
-                                                transition-colors duration-200 focus:outline-none focus:ring-2 
-                                                focus:ring-blue-500 focus:ring-offset-2">Make one</a>
+                                                transition-colors duration-200 focus:outline-none ">Make one</a>
                                         </div>
                                 </div>
                             </div>
diff --git a/src/views/partials/assetModify.ejs b/src/views/partials/assetModify.ejs
index dd0a852..af5fde1 100644
--- a/src/views/partials/assetModify.ejs
+++ b/src/views/partials/assetModify.ejs
@@ -8,7 +8,8 @@
                     style="width: 100%;"
                     onclick="lockAsset('<%= asset._id %>', '<%= asset.icon %>')" 
                     type="submit" 
-                    class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500  cursor-pointer"
+                    class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white
+                    bg-blue-600 hover:bg-blue-700 focus:outline-none "
                 >
                     Close
                 </button>
@@ -71,7 +72,7 @@
             <button
                 id="edit-<%= asset._id %>"
                 onclick="unlockAsset('<%= asset._id %>')"
-                class="py-3 px-8 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500  cursor-pointer"
+                class="py-3 px-8 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500  cursor-pointer"
             >
                 Edit
             </button>
diff --git a/src/views/partials/createAsset.ejs b/src/views/partials/createAsset.ejs
index d24705f..d69543f 100644
--- a/src/views/partials/createAsset.ejs
+++ b/src/views/partials/createAsset.ejs
@@ -6,7 +6,7 @@
             <button 
                 onclick="resetAll()"
                 type="submit"
-                class="text-center py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+                class="text-center py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none cursor-pointer"
             >
                 Cancel
             </button>