update/require 8 character password

.env.example

@@ -5,4 +5,3 @@ SECRET='123456789'
 GEOLOCATION_API='api_key'
 EMAIL_USER=mail@example.com
 EMAIL_PASS='password'
-GOOGLE_API_KEY='api_key'

app.js

@@ -70,18 +70,8 @@ app.get('/login', (req, res) => {
 });
 
 app.get('/aboutUs', (req, res) => {
-    if (!req.session.authenticated) {
+    res.render('aboutUs');
-        res.render('aboutUs', {
+    return res.status(status.Ok);
-            geoData: undefined
-        });
-        return res.status(status.Ok);
-    } else {
-        res.render('aboutUs', {
-            user: req.session.user,
-            geoData: req.session.geoData
-        });
-        return res.status(status.Ok);
-    }
 });
 
 app.get('/forgotPassword', (req, res) => {
@@ -93,6 +83,7 @@ app.get('/forgotPassword', (req, res) => {
     return res.status(status.Ok);
 });
 
+
 // Reset with token given to user via email
 app.get('/reset/:token', async (req, res) => {
     const token = req.params.token;
@@ -115,6 +106,7 @@ app.get('/reset/:token', async (req, res) => {
     });
 });
 
+
 // 404 handler - keep the actual notFound route please
 // REALLY DONT DELETE THIS
 app.get('/notFound', (req, res) => {

package-lock.json

@@ -9,9 +9,7 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
-        "@google/genai": "^0.14.0",
         "bcrypt": "^5.1.1",
-        "check-password-strength": "^3.0.0",
         "connect-mongo": "^5.1.0",
         "crypto": "^1.0.1",
         "dotenv": "^16.5.0",
@@ -20,28 +18,12 @@
         "express-session": "^1.18.1",
         "joi": "^17.13.3",
         "mongodb": "^6.16.0",
-        "nodemailer": "^7.0.3",
+        "nodemailer": "^7.0.3"
-        "sweetalert2": "^11.6.13"
       },
       "devDependencies": {
         "nodemon": "^3.1.10"
       }
     },
-    "node_modules/@google/genai": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-0.14.0.tgz",
-      "integrity": "sha512-nxXbRJZjCUBlPlfTXBMCgkSEpojcLzjxT2Ye3CDiqlXaiSscZ046bDEzztq6ONxUT3BfqHcGsQLhpbR5DU1Mcg==",
-      "dependencies": {
-        "google-auth-library": "^9.14.2",
-        "test-server-sdk": "^0.2.1",
-        "ws": "^8.18.0",
-        "zod": "^3.22.4",
-        "zod-to-json-schema": "^3.22.4"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -107,15 +89,6 @@
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "license": "BSD-3-Clause"
     },
-    "node_modules/@types/node": {
-      "version": "22.15.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
-      "integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==",
-      "optional": true,
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
     "node_modules/@types/webidl-conversions": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
@@ -131,15 +104,6 @@
         "@types/webidl-conversions": "*"
       }
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -247,46 +211,12 @@
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "license": "MIT"
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/axios": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
-      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "license": "MIT"
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/bcrypt": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz",
@@ -301,14 +231,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/bignumber.js": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
-      "integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -380,19 +302,6 @@
         "node": ">=16.20.1"
       }
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -447,15 +356,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/check-password-strength": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/check-password-strength/-/check-password-strength-3.0.0.tgz",
-      "integrity": "sha512-XIBvWpb7/RI2DO05tMixE4WbFFvEC7ls/jr1VSrWgXvlCmdiH2fsdkixG0cNGs1uIXwoSqJ75T3s9H/TlJV6Cw==",
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^5.0.0"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -517,17 +417,6 @@
         "color-support": "bin.js"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -619,14 +508,6 @@
         }
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -677,14 +558,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -721,14 +594,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -759,38 +624,12 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "license": "MIT"
     },
-    "node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -882,38 +721,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -974,58 +781,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/form-data/node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/form-data/node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -1119,71 +874,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/gaxios": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
-      "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
-      "dependencies": {
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^7.0.1",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.9",
-        "uuid": "^9.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/gaxios/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/gaxios/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/gcp-metadata": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
-      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "gaxios": "^5.0.0",
-        "json-bigint": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/gcp-metadata/node_modules/gaxios": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz",
-      "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^5.0.0",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -1221,20 +911,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -1269,43 +945,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/google-auth-library": {
-      "version": "9.15.1",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
-      "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
-      "dependencies": {
-        "base64-js": "^1.3.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "gaxios": "^6.1.1",
-        "gcp-metadata": "^6.1.0",
-        "gtoken": "^7.0.0",
-        "jws": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/google-auth-library/node_modules/gcp-metadata": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
-      "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
-      "dependencies": {
-        "gaxios": "^6.1.1",
-        "google-logging-utils": "^0.0.2",
-        "json-bigint": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/google-logging-utils": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
-      "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -1318,18 +957,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gtoken": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
-      "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
-      "dependencies": {
-        "gaxios": "^6.0.0",
-        "jws": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1351,20 +978,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -1518,17 +1131,6 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "license": "MIT"
     },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/jake": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
@@ -1560,33 +1162,6 @@
         "@sideway/pinpoint": "^2.0.0"
       }
     },
-    "node_modules/json-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "dependencies": {
-        "bignumber.js": "^9.0.0"
-      }
-    },
-    "node_modules/jwa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
-      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
-      "dependencies": {
-        "buffer-equal-constant-time": "^1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "dependencies": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/kruptein": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/kruptein/-/kruptein-3.0.7.tgz",
@@ -2040,11 +1615,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -2071,11 +1641,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -2083,15 +1648,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -2451,16 +2007,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/sweetalert2": {
-      "version": "11.6.13",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.6.13.tgz",
-      "integrity": "sha512-n5yVF0FNx1lm4XzpPyb1HIaiptzODfVyeCzmB809tpK+1bPdoKoevKOxYjrtId75DV7xuIp4r6cjn8xUAB8dPQ==",
-      "license": "MIT",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/sponsors/limonte"
-      }
-    },
     "node_modules/tar": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
@@ -2478,17 +2024,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/test-server-sdk": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/test-server-sdk/-/test-server-sdk-0.2.1.tgz",
-      "integrity": "sha512-o9F0HEBZbdDMwZ5xwSafkVb0C2nlZ4hq/g/aMgyLniTs69J7zoQJzF5eA3ZN6MPRoYPhy/QsQ/BuRtqaXzawvw==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "axios": "^1.6.0",
-        "extract-zip": "^2.0.1",
-        "tar": "^6.2.0"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2566,12 +2101,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "optional": true
-    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -2587,18 +2116,6 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "license": "MIT"
     },
-    "node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -2645,56 +2162,11 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
-    "node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "license": "ISC"
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/zod": {
-      "version": "3.24.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",
-      "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
-    "node_modules/zod-to-json-schema": {
-      "version": "3.24.5",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz",
-      "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==",
-      "peerDependencies": {
-        "zod": "^3.24.1"
-      }
     }
   }
 }

package.json

@@ -18,9 +18,7 @@
   },
   "homepage": "https://github.com/JoaquinPar/2800-202510-BBY14#readme",
   "dependencies": {
-    "@google/genai": "^0.14.0",
     "bcrypt": "^5.1.1",
-    "check-password-strength": "^3.0.0",
     "connect-mongo": "^5.1.0",
     "crypto": "^1.0.1",
     "dotenv": "^16.5.0",
@@ -29,8 +27,7 @@
     "express-session": "^1.18.1",
     "joi": "^17.13.3",
     "mongodb": "^6.16.0",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.3"
-    "sweetalert2": "^11.6.13"
   },
   "devDependencies": {
     "nodemon": "^3.1.10"

src/auth/authentication.js

@@ -1,5 +1,5 @@
-const { passwordStrength } = require("check-password-strength");
 const status = require("../util/statuses");
+const session = require("express-session");
 const bcrypt = require('bcrypt');
 const joi = require("joi");
 const salt = 12;
@@ -12,16 +12,8 @@ module.exports = (users) => {
     const router = require("express").Router();
 
     router.get("/logout", (req, res) => {
-        req.session.destroy((err) => {
+        req.session.destroy();
-            if (err) {
+        return res.redirect('/login');
-                console.error("Failed to destroy session: ", err);
-                res.status(status.InternalServerError);
-                return res.redirect("back");
-            }
-
-            res.status(status.Ok);
-            return res.redirect('/login');
-        });
     });
     
     router.post("/login", async (req, res) => {
@@ -54,19 +46,10 @@ module.exports = (users) => {
 
             req.session.authenticated = true;
             req.session.userId = user._id;
+            req.session.email = req.body.email;
             req.session.errMessage = "";
-            
+            res.redirect("/home");
-            req.session.save((err) => {
+            return res.status(status.Ok);
-                if (err) {
-                    console.error("Failed to save session: ", err);
-                    req.session.errMessage = "Failed to save session. Please try again.";
-                    res.status(status.InternalServerError);
-                    return res.redirect("/login");
-                }
-
-                res.status(status.Ok);
-                return res.redirect("/home");
-            });
         });
     });
 
@@ -99,14 +82,6 @@ module.exports = (users) => {
             return res.redirect("/signup");
         }
 
-        let strength = passwordStrength(req.body.password);
-
-        if (strength.id < 2) {
-            req.session.errMessage = `Password ${strength.value}`;
-            res.status(status.BadRequest);
-            return res.redirect("/signup");
-        }
-
         let hashedPassword = await bcrypt.hashSync(req.body.password, salt);
 
         users.insertOne({
@@ -122,20 +97,11 @@ module.exports = (users) => {
             }
 
             req.session.authenticated = true;
+            req.session.email = req.body.email;
             req.session.userId = results.insertedId;
+
             req.session.errMessage = "";
-
+            return res.status(status.Ok).redirect("/home");
-            req.session.save((err) => {
-                if (err) {
-                    console.error("Failed to save session: ", err);
-                    req.session.errMessage = "Please login";
-                    res.status(status.Ok);
-                    return res.redirect("/login");
-                }
-
-                res.status(status.Ok);
-                return res.redirect("/home");
-            });
         });
     });
 

src/auth/forgotPass.js

@@ -4,7 +4,6 @@ const joi = require('joi');
 const nodeMail = require('nodemailer');
 const bcrypt = require('bcrypt');
 require('dotenv').config();
-
 const PORT = process.env.PORT;
 
 const transporter = nodeMail.createTransport({
@@ -14,7 +13,7 @@ const transporter = nodeMail.createTransport({
         pass: process.env.EMAIL_PASS,
     }
 });
-
+// users info
 module.exports = (users) => {
     const router = express.Router();
 
@@ -66,7 +65,6 @@ module.exports = (users) => {
         }
     });
 
-    //Reset link verifies information from user and checks token
     router.post('/resetLink', async (req, res) => {
         const { token, password, confirmPassword, } = req.body;
         const passwordSchema = joi.object({
@@ -75,7 +73,7 @@ module.exports = (users) => {
         });
         const valid = passwordSchema.validate({ password, confirmPassword });
         if (valid.error) {
-            console.log("houston we have a problem"); // nice
+            console.log("houston we have a problem");
             req.session.error = 'Invalid input';
             res.status(status.BadRequest);
             return res.redirect(`/reset/${token}`);

src/auth/middleware.js

@@ -1,6 +1,5 @@
 const status = require("../util/statuses");
 const session = require("express-session");
-const ObjectId = require("mongodb").ObjectId;
 
 // Get all names of user routes
 let userRouter = require("../router/user")((req, res, next) => next(), null, null, null);
@@ -19,52 +18,26 @@ const createMiddleware = (users) => {
             return res.status(status.NotFound).redirect("/notFound");
         }
 
-        if (!req.session.authenticated || !req.session.userId) {
+        if (!req.session.authenticated || !req.session.email) {
             req.session.errMessage = "Please login to view that resource";
             res.redirect("/login");
             return res.status(status.Unauthorized);
         }
     
         if (!req.session.user) {
-            let user = await users.findOne({ _id: new ObjectId(req.session.userId) }).then((user) => user);
+            let user = await users.findOne({ "email": req.session.email }).then((user) => user);
-            if (!user) {
-                return req.session.destroy((err) => {
-                    if (err) {
-                        console.error("Failed to destroy session: ", err);
-                        req.session.errMessage = "Failed to logout. Please try again";
-                        res.status(status.InternalServerError);
-                        return res.redirect("/home");
-                    }
         
-                    req.session.errMessage = "User not found";
+            if (!user) {
-                    res.status(status.NotFound);
+                req.session.errMessage = "User not found";
-                    res.redirect("/login");
+                res.redirect("/login");
-                });
+                return res.status(status.Unauthorized);
             }
         
             req.session.user = user;
-            return req.session.save((err) => {
-                if (err) {
-                    console.error("Failed to save session: ", err);
-
-                    return req.session.destroy((err) => {
-                        req.session.errMessage = "Failed to save session, please login again.";
-
-                        if (err) {
-                            console.error("Failed to destroy session: ", err);
-                        }
-
-                        res.status(status.InternalServerError);
-                        res.redirect("/login");
-                    });
-                }
-
-                next();
-            });
         }
 
         next();
     };
-};
+}
 
 module.exports = createMiddleware;

src/public/scripts/dollarFormat.js

@@ -1,15 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-    const number = document.querySelectorAll(".planGoal");
-    number.forEach(value => {
-        num = parseFloat(value.textContent);
-        if (num >= 999999) {
-            value.textContent = (num /= 1000000).toFixed(2) + "M";
-            console.log(value.textContent);
-        } else if (num > 999) {
-            value.textContent = (num /= 1000).toFixed(2) + "K";
-        } else {
-            return num;
-        }
-    });
-});
-

src/public/scripts/footer.js

@@ -1,70 +0,0 @@
-const factButton = document.getElementById("factButton");
-const factMenu = document.getElementById("factMenu");
-const factInput = document.getElementById("factInput");
-const factSubmitButton = document.getElementById("factSubmitButton");
-
-var path = window.location.pathname;
-var page = path.split("/").pop();
-
-if(page !== "login" && page !== "signup" && page !== "forgotPassword" && page !== "") {
-    factButton.classList.remove("hidden");
-}
-
-factButton.addEventListener("click", () => {
-    factMenu.classList.toggle("hidden");
-});
-factSubmitButton.addEventListener("click", () => {
-    fetch("/fact", {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            fact: factInput.value,
-        }),
-    })
-    .then(response => response.json())
-    .then(data => {
-        Swal.fire('Here is a fact!', data.fact, 'success');
-    })
-    .catch(error => {
-        console.error("Error fetching fact:", error);
-        Swal.fire('Error fetching fact', 'Please try again later', 'error');
-    });
-});
-
-document.addEventListener("DOMContentLoaded", () => {
-    const drawer = document.getElementById("drawer-navigation");
-    const toggle = document.getElementById("drawer-toggle");
-
-    function openDrawer() {
-        drawer.classList.remove("translate-x-full");
-
-        // Add backdrop
-        const backdrop = document.createElement("div");
-        backdrop.className = "fixed inset-0 bg-gray-900/50 z-30 drawer-backdrop";
-        document.body.appendChild(backdrop);
-
-        // Optional: prevent scroll
-        document.body.classList.add("overflow-hidden");
-
-        backdrop.addEventListener("click", closeDrawer);
-    }
-
-    function closeDrawer() {
-        drawer.classList.add("translate-x-full");
-
-        const backdrop = document.querySelector(".drawer-backdrop");
-        if (backdrop) backdrop.remove();
-
-        document.body.classList.remove("overflow-hidden");
-    }
-
-    toggle.addEventListener("click", openDrawer);
-
-    // Also close on X button if needed
-    const closeBtn = drawer.querySelector("[data-drawer-hide]");
-    if (closeBtn) {
-        closeBtn.addEventListener("click", closeDrawer);
-    }
-});

src/public/scripts/geolocation.js

@@ -5,47 +5,38 @@ function getLocation() {
 }
 
 function update(data) {
-    if (data.data.message != "error") {
+    document.getElementById("loading").style = "display: none";
-        document.getElementById("loading").style = "display: none";
+    document.getElementById("currencyExchange").style = "display: flex";
-        document.getElementById("currencyExchange").style = "display: flex";
 
-        document.getElementById("yourFlag").src = `/static/svgs/flags/${data.data.country}.svg`
+    document.getElementById("yourFlag").src = `/static/svgs/flags/${data.data.country}.svg`
-        document.getElementById("yourFlag").alt = data.data.country;
+    document.getElementById("yourFlag").alt = data.data.country;
-        document.getElementById("flagTag").innerHTML = `(${data.data.country})`;
+    document.getElementById("flagTag").innerHTML = `(${data.data.country})`;
 
-        document.getElementById("exchangeFlag").src = `/static/svgs/flags/USD.svg`;
+    document.getElementById("exchangeFlag").src = `/static/svgs/flags/USD.svg`;
-        document.getElementById("exchangeFlag").alt = "USD";
+    document.getElementById("exchangeFlag").alt = "USD";
-        document.getElementById("exFlagTag").innerHTML = "(USD)";
+    document.getElementById("exFlagTag").innerHTML = "(USD)";
     
-        document.getElementById("dropdown-country-button").value = data.data.toCurrencyRates["USD"];
+    document.getElementById("dropdown-country-button").value = data.data.toCurrencyRates["USD"];
 
-        updateExchange(document.getElementById("dropdown-country-button").value);
+    updateExchange(document.getElementById("dropdown-country-button").value);
 
-        const dropdown = document.getElementById("dropdown");
+    const dropdown = document.getElementById("dropdown");
-        let countries = Object.keys(data.data.toCurrencyRates);
+    let countries = Object.keys(data.data.toCurrencyRates);
 
-        countries.forEach(item => {
+    countries.forEach(item => {
-            if (dropdown.querySelector(`button[value="${data.data.toCurrencyRates[item]}"]`)) {
+        if (dropdown.querySelector(`button[value="${data.data.toCurrencyRates[item]}"]`)) {
-                return;
+            return;
-            }
+        }
 
-            const listItem = document.createElement("li");
+        const listItem = document.createElement("li");
-            listItem.innerHTML  = `<button onclick="switchButton(this)" type="button" value="${data.data.toCurrencyRates[item]}" class="country Button inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
+        listItem.innerHTML  = `<button onclick="switchButton(this)" type="button" value="${data.data.toCurrencyRates[item]}" class="country Button inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
-                        <span class="inline-flex items-center">
+                    <span class="inline-flex items-center">
-                            <img src="/static/svgs/flags/${item}.svg" class="h-4 w-4 me-2" alt="${item}"> (${item})
+                        <img src="/static/svgs/flags/${item}.svg" class="h-4 w-4 me-2" alt="${item}"> (${item})
-                        </span>
+                    </span>
-                    </button>`;
+                </button>`;
 
-            dropdown.appendChild(listItem);
+        dropdown.appendChild(listItem);
-        });
+    });
-    } else {
-        document.getElementById("loading").style = "display: none";
-        document.getElementById("exFrom").style = "display: none";
-        document.getElementById("dropdown-country-button").style = "display: none";
-        document.getElementById("currencyExchange").style = "display: flex";
-        document.getElementById("exchange").innerHTML = "Country not supported";
-        document.getElementById("exchange").className = "block rounded-lg text-center p-2.5 w-50 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500";
-    }
 }
 
 function switchButton(clickedButton) {
@@ -74,11 +65,5 @@ async function getLatestExchange(position) {
 }
 
 function error(err) {
-    const data = {
+    console.error("Geolocation error: ", err);
-        data: {
-            message: "error"
-        }
-    }
-
-    update(data);
 }

src/public/scripts/profile.js

@@ -11,7 +11,6 @@ function lockAccount() {
   document.getElementById("password").disabled = true;
   document.getElementById("repassword").disabled = true;
   document.getElementById("save-account").classList.add("cursor-not-allowed");
-  document.getElementById("save-account").classList.remove("cursor-pointer");
 
   document.getElementById("edit-account").innerHTML = "Edit";
   document.getElementById("edit-account").onclick = unlockAccount;
@@ -31,12 +30,7 @@ function lockPersonal() {
   document.getElementById("ms-married").disabled = true;
   document.getElementById("ms-divorced").disabled = true;
   document.getElementById("ms-widowed").disabled = true;
-  document.getElementById("income").disabled = true;
-  document.getElementById("expenses").disabled = true;
-  document.getElementById("assets").disabled = true;
-  document.getElementById("liabilities").disabled = true;
   document.getElementById("save-personal").classList.add("cursor-not-allowed");
-  document.getElementById("save-personal").classList.remove("cursor-pointer");
 
   document.getElementById("edit-personal").innerHTML = "Edit";
   document.getElementById("edit-personal").onclick = unlockPersonal;
@@ -48,12 +42,11 @@ function lockPersonal() {
  */
 function unlockAccount() {
   document.getElementById("save-account").disabled = false;
-  document.getElementById("email").disabled = false;
+  // document.getElementById("email").disabled = false;
   document.getElementById("name").disabled = false;
   document.getElementById("password").disabled = false;
   document.getElementById("repassword").disabled = false;
   document.getElementById("save-account").classList.remove("cursor-not-allowed");
-  document.getElementById("save-account").classList.add("cursor-pointer");
 
   document.getElementById("edit-account").innerHTML = "Cancel changes";
   document.getElementById("edit-account").onclick = lockAccount;
@@ -71,12 +64,7 @@ function unlockPersonal() {
   document.getElementById("ms-married").disabled = false;
   document.getElementById("ms-divorced").disabled = false;
   document.getElementById("ms-widowed").disabled = false;
-  document.getElementById("income").disabled = false;
-  document.getElementById("expenses").disabled = false;
-  document.getElementById("assets").disabled = false;
-  document.getElementById("liabilities").disabled = false;
   document.getElementById("save-personal").classList.remove("cursor-not-allowed");
-  document.getElementById("save-personal").classList.add("cursor-pointer");
 
   document.getElementById("edit-personal").innerHTML = "Cancel changes";
   document.getElementById("edit-personal").onclick = lockPersonal;
@@ -84,4 +72,4 @@ function unlockPersonal() {
 
 // On page load, ensure forms are locked and reset
 lockAccount();
-lockPersonal();
+// lockPersonal();

src/router/user.js

@@ -1,6 +1,5 @@
 const getRates = require("../util/exchangeRate");
 const { calculatePlanProgress, updatePlanProgressInDB } = require("../util/calculations");
-const suggestions = require("../util/suggestions");
 const status = require("../util/statuses");
 const ObjectId = require('mongodb').ObjectId;
 const session = require("express-session");
@@ -56,12 +55,6 @@ const getAssetSchema = (type) => {
     return assetSchema;
 }
 
-/** 
- * Function takes in a number and formats it to currency
- * @param {integer}
- * @returns nuber formatted in currency
- */
-
 /**
  * @param {function} middleware handler
  * @param {MongoClient.collection} users db collection
@@ -78,7 +71,6 @@ module.exports = (middleware, users, plans, assets) => {
     router.use(middleware);
 
     router.get('/home', async (req, res) => {
-        let user = req.session.user._id;
         // if no session with geoData
         if (!req.session.geoData) {
             req.session.geoData = {
@@ -86,19 +78,14 @@ module.exports = (middleware, users, plans, assets) => {
                 toCurrencyRates: [],
             };
         }
-        let planSchema = await plans.find({ userId: new ObjectId(user) }).project({
+
-            name: 1, retirementAssets: 1, progress: 1, _id: 1,
+        res.render('dashboard', { user: req.user, geoData: req.session.geoData });
-        }).toArray();
-        res.render('dashboard', { 
-            user: req.session.user,
-            geoData: req.session.geoData,
-            plans: planSchema, });
 
         return res.status(status.Ok);
     });
 
     router.get('/assets', async (req, res) => {
-        let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
+        let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
         res.render('assets', {
             user: req.session.user,
             errMessage: req.session.errMessage,
@@ -111,19 +98,20 @@ module.exports = (middleware, users, plans, assets) => {
 
     router.get('/plans', async (req, res) => {
         try {
-            const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
+            const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
 
+            // Use a for...of loop for proper async/await behavior in series for updates
             for (const plan of userPlansFromDB) {
                 const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
-                await updatePlanProgressInDB(plan._id, percentage, plans);
+                await updatePlanProgressInDB(plan._id, percentage, plans); // Pass the 'plans' collection
             }
 
+            // Re-fetch plans to get updated progress for rendering
             const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
 
-
             res.render('plans', {
                 user: req.session.user,
-                plans: updatedUserPlans,
+                plans: updatedUserPlans, // Send the most up-to-date plans
                 geoData: req.session.geoData
             });
         } catch (err) {
@@ -137,27 +125,34 @@ module.exports = (middleware, users, plans, assets) => {
 
         try {
             const planId = req.params.id;
-            let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
+            let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
+
 
             if (!ObjectId.isValid(planId)) {
                 req.session.errMessage = "Invalid plan ID format.";
                 return res.status(status.BadRequest).redirect('/plans');
             }
 
-            const plan = await plans.findOne({ userId: new ObjectId(req.session.userId), _id: new ObjectId(planId) });
+            const plan = await plans.findOne({ userId: new ObjectId(req.session.user._id), _id: new ObjectId(planId) });
 
             if (!plan) {
-                console.log(`Plan not found with ID: ${planId} for user: ${req.session.userId}`);
+                console.log(`Plan not found with ID: ${planId} for user: ${req.session.user.email}`);
                 req.session.errMessage = "Plan not found or you do not have permission to view it.";
                 return res.status(status.NotFound).redirect('/plans');
             }
 
+            // The plan.progress should be up-to-date from the database as it was updated in the /plans route
+            // or when assets/plans are modified. If an immediate recalculation for this specific view is absolutely needed,
+            // (e.g., if assets were modified without an immediate plan progress update elsewhere),
+            // you could do it here:
+            // const currentProgress = await calculatePlanProgress(plan, assets, req.session.user._id);
+            // plan.progress = currentProgress; // This would only update the 'plan' object for this render, not in DB
+
             res.render('planDetail', {
                 user: req.session.user,
-                plan: plan,
+                plan: plan, // This plan object will have the progress from the database
                 geoData: req.session.geoData,
                 assets: userAssets,
-                suggestions: await suggestions.generateSuggestions(),
             });
 
         } catch (err) {
@@ -200,7 +195,7 @@ module.exports = (middleware, users, plans, assets) => {
             return;
         }
         const newPlan = {
-            userId: new ObjectId(req.session.userId),
+            userId: new ObjectId(req.session.user._id),
             name: value.name,
             retirementAge: value.retirementAge,
             retirementExpenses: value.retirementExpenses,
@@ -210,7 +205,7 @@ module.exports = (middleware, users, plans, assets) => {
         };
 
         try {
-            await plans.insertOne({ userId: new ObjectId(req.session.userId), ...newPlan });
+            await plans.insertOne({ userId: new ObjectId(req.session.user._id), ...newPlan });
             req.session.errMessage = "";
             res.redirect('/plans');
         }
@@ -221,12 +216,6 @@ module.exports = (middleware, users, plans, assets) => {
         }
     });
 
-    router.post('/fact', async (req, res) => {
-        const factInput = req.body.fact;
-        const fact = await suggestions.generateFact(factInput);
-        return res.status(status.Ok).json({ fact });
-    });
-
     router.get('/more', (req, res) => {
         res.render('more', {
             user: req.session.user,
@@ -276,17 +265,15 @@ module.exports = (middleware, users, plans, assets) => {
         const validationOptions = { convert: true, abortEarly: false };
         const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
 
-        let referrer = req.get('Referrer') || "/home";
         if (error) {
             console.error("Questionnaire validation error:", error.details);
             req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
-            let redirect = referrer.includes("?profile") ? "/questionnaire?profile" : "/questionnaire";
+            res.status(status.BadRequest).redirect("/questionnaire");
-            res.status(status.BadRequest).redirect(redirect);
             return;
         }
 
         users.updateOne(
-            { _id: new ObjectId(req.session.userId) },
+            { _id: new ObjectId(req.session.user._id) },
             {
                 $set: {
                     financialData: true,
@@ -301,43 +288,29 @@ module.exports = (middleware, users, plans, assets) => {
             }
         ).then((result) => {
             if (result.matchedCount === 0) {
-                console.log(`User not found during questionnaire update: ${req.session.userId}`);
+                console.log(`User not found during questionnaire update: ${req.session.user.email}`);
                 req.session.errMessage = "User session invalid. Please log in again.";
                 res.status(status.NotFound).redirect("/login");
                 return;
             }
             if (result.modifiedCount === 0 && result.matchedCount === 1) {
-                console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.userId}`);
+                console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.user.email}`);
             }
 
+            req.session.user.financialData = true;
             req.session.errMessage = "";
-            req.session.user = null; // set user to null so middleware updates user
+
-            req.session.save((err) => {
+            req.session.save(err => {
                 if (err) {
-                    console.error("Failed to save session: ", err);
+                    res.status(status.InternalServerError).redirect("/plans");
-
-                    return req.session.destroy((err) => {
-                        req.session.errMessage = "Failed to save session, please login again.";
-
-                        if (err) {
-                            console.error("Failed to destroy session: ", err);
-                        }
-
-                        res.status(status.InternalServerError);
-                        return res.redirect("/login");
-                    });
                 }
-
+                res.status(status.Ok).redirect("/plans");
-                let redirect = referrer.includes("?profile") ? "/profile" :
-                                referrer != "/home"           ? "/plans" : referrer;
-                return res.status(status.Ok).redirect(redirect);
             });
 
         }).catch(err => {
             console.error("Error updating questionnaire in database:", err);
             req.session.errMessage = "An error occurred while saving your information. Please try again.";
-            let redirect = referrer.includes("?profile") ? "/questionnaire?profile" : "/questionnaire";
+            res.status(status.InternalServerError).redirect("/questionnaire");
-            res.status(status.InternalServerError).redirect(redirect);
         });
     });
 
@@ -353,12 +326,11 @@ module.exports = (middleware, users, plans, assets) => {
 
         if (valid.err) {
             req.session.errMessage = "Invalid input",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
             return res.redirect("/profile");
         }
 
         let update = {
-            email: req.body.email,
             name: req.body.name,
         };
 
@@ -372,39 +344,21 @@ module.exports = (middleware, users, plans, assets) => {
         }
 
         users.updateOne(
-            { _id: new ObjectId(req.session.userId) },
+            { email: req.session.email },
             { $set: update }
         ).then((result) => {
             if (result.matchedCount === 0) {
-                console.log(`User not found during account update: ${req.session.userId}`);
+                console.log(`User not found during account update: ${req.session.email}`);
                 req.session.errMessage = "User session invalid. Please log in again.";
                 res.status(status.NotFound).redirect("/login");
                 return;
             }
             if (result.modifiedCount === 0 && result.matchedCount === 1) {
-                console.log(`User account data unchanged (already up-to-date): ${req.session.userId}`);
+                console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
             }
 
             req.session.errMessage = "";
-            req.session.user = null; // set user to null so middleware updates user
+            return res.status(status.Ok).redirect("/profile");
-            req.session.save((err) => {
-                if (err) {
-                    console.error("Failed to save session: ", err);
-
-                    return req.session.destroy((err) => {
-                        req.session.errMessage = "Failed to save session, please login again.";
-
-                        if (err) {
-                            console.error("Failed to destroy session: ", err);
-                        }
-
-                        res.status(status.InternalServerError);
-                        return res.redirect("/login");
-                    });
-                }
-
-                return res.status(status.Ok).redirect("/profile");
-            });
         }).catch(err => {
             console.error("Error updating account in database:", err);
             req.session.errMessage = "An error occurred while saving your information. Please try again.";
@@ -412,81 +366,7 @@ module.exports = (middleware, users, plans, assets) => {
         });
     });
 
-    router.post("/updatePersonal", (req, res) => {
+    router.post("/createAsset", async (req, res) => {
-        const questionnaireSchema = joi.object({
-            dob: joi.date().required(),
-            education: joi.string().valid('primary', 'secondary', 'tertiary', 'postgraduate').required(),
-            maritalStatus: joi.string().valid('single', 'married', 'divorced', 'widowed').required(),
-            income: joi.number().min(0).required(),
-            expenses: joi.number().min(0).required(),
-            assets: joi.number().min(0).required(),
-            liabilities: joi.number().min(0).required(),
-        });
-
-        const validationOptions = { convert: true, abortEarly: false };
-        const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
-
-        if (error) {
-            console.error("Personal info validation error:", error.details);
-            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
-            res.status(status.BadRequest).redirect("/profile");
-            return;
-        }
-
-        users.updateOne(
-            { _id: new ObjectId(req.session.userId) },
-            {
-                $set: {
-                    financialData: true,
-                    dob: value.dob,
-                    education: value.education,
-                    maritalStatus: value.maritalStatus,
-                    income: value.income,
-                    expenses: value.expenses,
-                    assets: value.assets,
-                    liabilities: value.liabilities,
-                }
-            }
-        ).then((result) => {
-            if (result.matchedCount === 0) {
-                console.log(`User not found during personal info update: ${req.session.userId}`);
-                req.session.errMessage = "User session invalid. Please log in again.";
-                res.status(status.NotFound).redirect("/login");
-                return;
-            }
-            if (result.modifiedCount === 0 && result.matchedCount === 1) {
-                console.log(`User personal info unchanged (already up-to-date): ${req.session.userId}`);
-            }
-
-            req.session.errMessage = "";
-            req.session.user = null; // set user to null so middleware updates user
-            req.session.save((err) => {
-                if (err) {
-                    console.error("Failed to save session: ", err);
-
-                    return req.session.destroy((err) => {
-                        req.session.errMessage = "Failed to save session, please login again.";
-
-                        if (err) {
-                            console.error("Failed to destroy session: ", err);
-                        }
-
-                        res.status(status.InternalServerError);
-                        return res.redirect("/login");
-                    });
-                }
-
-                return res.status(status.Ok).redirect("/profile");
-            });
-
-        }).catch(err => {
-            console.error("Error updating personal info in database:", err);
-            req.session.errMessage = "An error occurred while saving your information. Please try again.";
-            res.status(status.InternalServerError).redirect("/profile");
-        });
-    });
-
-    router.post("/createAsset", (req, res) => {
         // Create asset, each asset has different data structure based on type
         const type = req.body.type;
         const assetSchema = getAssetSchema(type);
@@ -501,12 +381,12 @@ module.exports = (middleware, users, plans, assets) => {
 
         if (valid.err) {
             req.session.errMessage = "Invalid input",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
             return res.redirect("/assets");
         }
 
         let newAsset = {
-            userId: new ObjectId(req.session.userId),
+            userId: new ObjectId(req.session.user._id),
             ...req.body,
             updatedAt: new Date(),
         };
@@ -532,7 +412,7 @@ module.exports = (middleware, users, plans, assets) => {
         return res.status(status.Ok).redirect("/assets");
     });
 
-    router.post("/updateAsset", (req, res) => {
+    router.post("/updateAsset", async (req, res) => {
         const type = req.body.type;
         const assetSchema = getAssetSchema(type);
 
@@ -550,7 +430,7 @@ module.exports = (middleware, users, plans, assets) => {
             return res.redirect("/assets");
         }
 
-        if (req.body.userId != req.session.userId) {
+        if (req.body.userId != req.session.user._id) {
             req.session.errMessage = "Cannot change asset owner",
                 res.status(status.BadRequest);
             return res.redirect("/assets");
@@ -620,20 +500,20 @@ module.exports = (middleware, users, plans, assets) => {
 
     router.post("/deleteUser", (req, res) => {
         // not as critical if results aren't as expected only if crashing
-        assets.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
+        assets.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
             console.error("Error deleting user assets: ", err);
             req.session.errMessage = "An error occured while deleting your account. Please try again.";
             return res.status(status.InternalServerError).redirect("/profile");
         });
 
-        plans.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
+        plans.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
             console.error("Error deleting user assets: ", err);
             req.session.errMessage = "An error occured while deleting your account. Please try again.";
             return res.status(status.InternalServerError).redirect("/profile");
         });
 
         users.deleteOne(
-            { _id: new ObjectId(req.session.userId) },
+            { _id: new ObjectId(req.session.user._id) },
         ).then((result) => {
             if (result.deletedCount === 0) {
                 console.error(`User not found: ${req.body.id}`);
@@ -664,19 +544,11 @@ module.exports = (middleware, users, plans, assets) => {
 
             country = data.results[0].formatted_address;
             let results = await getRates(country);
-
+            req.session.geoData = {
-            if (!results.exRates) {
+                country: results.abbreviation,
-                req.session.geoData = {
+                toCurrencyRates: results.exRates,
-                    message: "error"
+                geoData: req.session.geoData
-                }
-            } else {
-                req.session.geoData = {
-                    country: results.abbreviation,
-                    toCurrencyRates: results.exRates,
-                    geoData: req.session.geoData
-                }
             }
-
         }
 
         return res.status(status.Ok).send({ data: req.session.geoData });

src/util/suggestions.js

@@ -1,24 +0,0 @@
-const { GoogleGenAI } = require("@google/genai");
-
-const ai = new GoogleGenAI({ apiKey: process.env.GOOGLE_API_KEY });
-
-async function generateFact(factInput) {
-  const response = await ai.models.generateContent({
-    model: "gemini-2.0-flash",
-    contents: `Generate a concise investment fact about "${factInput}". If "${factInput}" is not directly investment-related, provide a general, useful investment fact instead. Deliver only the fact itself, with no extra text or explanation.`,
-  });
-  return response.text;
-}
-
-async function generateSuggestions() {
-    const response = await ai.models.generateContent({
-      model: "gemini-2.0-flash",
-      contents: "Return a mock investment suggestion 3-5 lines only",
-    });
-    return response.text;
-}
-
-module.exports = {
-    generateFact,
-    generateSuggestions
-};

src/views/aboutUs.ejs

@@ -1,12 +1,7 @@
 <%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
 
-<% if (!geoData) { %>
+<main>
-    <%- include("./partials/headerStart") %>
-<% } else { %>
-    <%- include("./partials/header") %>
-<% } %>
-
-<main class="pt-24 pb-16">
     <section class="bg-white dark:bg-gray-900 py-12 md:py-20">
         <div class="max-w-screen-lg mx-auto px-4 text-center">
             <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-gray-900 md:text-5xl lg:text-6xl dark:text-white">About RCalculator</h1>
@@ -30,23 +25,15 @@
                 </p>
             </div>
         </div>
-
+        <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-        <% if (!geoData) { %>
+            <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
-            <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
+                Get started
-                <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+                <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
-                    Get started
+                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
-                    <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
+                </svg>
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
+            </a>
-                    </svg>
+        </div>
-                </a>
-            </div>
-        <% } %>
     </section>
 </main>
 
-<% if (!geoData) { %>
-<% } else { %>
-    <%- include("./partials/navBar") %>
-<% } %>
-
 <%- include("./partials/footer") %>

src/views/assets.ejs

@@ -1,8 +1,157 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="pt-26">
+<main>
-    <%- include("./partials/createAsset", { icons: icons }) %>
+    <!-- Create Asset popup Modal -->
+    <dialog id="create-asset-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
+        <div class="flex flex-row justify-between">
+            <h2 class="text-lg font-bold mb-2">Create New Asset</h2>
+            <form method="dialog">
+                <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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Cancel
+                </button>
+            </form>
+        </div>
+
+        <div class="my-4">
+            <label class="block text-sm font-medium text-gray-700">Asset Type</label>
+            <div class="mt-1 space-x-4">
+                <label class="inline-flex items-center">
+                    <input checked onclick="selectAssetForm('create-other-asset-form')" id="asset-other" type="radio" name="type" value="other" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
+                    <span class="ml-2 text-sm text-gray-700">Other Assets</span>
+                </label>
+                <label class="inline-flex items-center">
+                    <input onclick="selectAssetForm('create-saving-asset-form')" id="asset-saving" type="radio" name="type" value="saving" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
+                    <span class="ml-2 text-sm text-gray-700">Savings</span>
+                </label>
+                <label class="inline-flex items-center">
+                    <input onclick="selectAssetForm('create-stock-asset-form')" id="asset-stock" type="radio" name="type" value="stock" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
+                    <span class="ml-2 text-sm text-gray-700">Stocks</span>
+                </label>
+            </div>
+        </div>
+
+        <!-- Create other asset form -->
+        <form method="POST" action="/createAsset" id="create-other-asset-form">
+            <input style="display: none;" id="type" value="other" name="type" type="text">
+            <input style="display: none;" id="icon" value="Other" name="icon" type="text">
+            
+            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Select an Icon</label>            
+            <div class="flex items-center">
+                <button id="dropdown-icon-button" value="" data-dropdown-toggle="dropdown-icons" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" type="button">
+                    <img src="/static/svgs/icons/Other.svg" class="h-4 w-4 me-2" alt="Other"> Other
+                    <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                    </svg>
+                </button>
+                <div id="dropdown-icons" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                    <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button">
+                        <% icons.forEach(icon => { %>
+                            <li>
+                                <button onclick="selectIcon(this)" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
+                                    <span class="inline-flex items-center">
+                                        <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
+                                    </span>
+                                </button>
+                            </li>
+                        <% }); %>
+                    </ul>
+                </div>
+            </div>
+
+            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Asset Name</label>
+            <input required id="name" type="text" name="name" minlength="3" maxlength="30" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Asset Value</label>
+            <input required placeholder="CAD" min="0" id="value" type="number" name="value" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
+            <input required type="date" id="purchaseDate" name="purchaseDate" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
+            <textarea maxlength="240" id="description" name="description" rows="4" cols="50" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"></textarea>
+
+            <div class="mt-6 flex flex-row justify-between">
+                <button 
+                    type="reset"
+                    onclick="document.getElementById('create-other-asset-form').reset()"
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Clear
+                </button>
+                <button 
+                    type="submit"
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Create
+                </button>
+            </div>
+        </form>
+
+        <!-- Create savings asset form -->
+        <form style="display: none;" method="POST" action="/createAsset" id="create-saving-asset-form">
+            <input style="display: none;" value="saving" name="type" type="text">
+
+            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Savings Name</label>
+            <input required id="name" type="text" name="name" minlength="3" maxlength="30" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Savings Value</label>
+            <input required placeholder="CAD" min="0" id="value" type="number" name="value" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <div class="mt-6 flex flex-row justify-between">
+                <button 
+                    type="reset"
+                    onclick="document.getElementById('create-saving-asset-form').reset()"
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Clear
+                </button>
+                <button 
+                    type="submit" 
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Create
+                </button>
+            </div>
+        </form>
+
+        <!-- Create stock asset form -->
+        <form style="display: none;" method="POST" action="/createAsset" id="create-stock-asset-form">
+            <input style="display: none;" value="stock" name="type" type="text">
+
+            <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
+            <input required id="ticker" type="text" name="ticker" minlength="3" maxlength="5" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
+            <input required placeholder="CAD" min="0" id="price" type="number" name="price" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
+            <input required type="number" min="1" id="quantity" name="quantity" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
+            <input required type="date" id="purchaseDate" name="purchaseDate" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+
+            <div class="mt-6 flex flex-row justify-between">
+                <button 
+                    type="reset"
+                    onclick="document.getElementById('create-stock-asset-form').reset()"
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Clear
+                </button>
+                <button 
+                    type="submit"
+                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
+                >
+                    Create
+                </button>
+            </div>
+        </form>
+    </dialog>
 
     <% if (errMessage != "") { %>
         <div class="max-w-md mx-auto mb-10 rounded-lg shadow-md text-white font-bold bg-red-400 py-4 text-center"><%= errMessage %></div>
@@ -47,11 +196,183 @@
             </div>
         <% } %>
         <% assets.forEach((asset) => { %>
-            <%- include("./partials/assetPreview", { asset: asset }); %>
+            <!-- Clickable asset list item -->
+            <div class="mt-4 max-w-md mx-auto bg-white rounded-lg shadow-md">
+                <button onclick="document.getElementById('<%= asset._id %>-modal').showModal()" style="width: 100%; height: 100%;" class="px-4 py-4 cursor-pointer">
+                    <div class="flex flex-row justify-between">
+                        <div class="flex flex-row justify-between">
+                            <div class="mx-2">
+                                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-6 w-6 me-2" alt="<%= asset.icon %>">
+                            </div>
+                            <div class="mx-2"><h3><%= asset.name %></h3></div>
+                        </div>
+                        <div>
+                            <h3><strong>
+                                $<%= asset.value.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) %>
+                            </strong></h3>
+                        </div>
+                    </div>
+                </button>
+            </div>
 
-            <%- include("./partials/assetDelete", { asset: asset }); %>
+            <!-- Confirm delete asset modal -->
+            <dialog id="<%= asset._id %>-delete-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
+                <div class="relative p-4 w-full max-w-md h-full md:h-auto">
+                    <!-- Modal content -->
+                    <div class="relative p-4 text-center bg-white rounded-lg shadow dark:bg-gray-800 sm:p-5">
+                        <form method="dialog">
+                            <button type="submit" class="text-gray-400 absolute top-2.5 right-2.5 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white">
+                                <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
+                                <span class="sr-only">Close modal</span>
+                            </button>
+                        </form>
+                        <svg class="text-gray-400 dark:text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
+                        <p class="mb-4 text-gray-500 dark:text-gray-300">Are you sure you want to delete this item?</p>
+                        <div class="flex justify-center items-center space-x-4">
+                            <div style="width: 100%;">
+                                <form method="dialog" style="width: 100%;">
+                                    <button
+                                        type="submit" 
+                                        class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
+                                    >
+                                        No, cancel
+                                    </button>
+                                </form>
+                            </div>
+                            <div style="width: 100%;">
+                                <form method="POST" action="/deleteAsset">
+                                    <input id="id-delete-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
+                                    <button 
+                                        type="submit" 
+                                        class="py-2 px-3 text-sm font-medium text-center text-white bg-red-600 rounded-lg hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-500 dark:hover:bg-red-600 dark:focus:ring-red-900"
+                                    >
+                                        Yes, I'm sure
+                                    </button>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </dialog>
 
-            <%- include("./partials/assetModify", { asset: asset }); %>
+            <!-- View/edit popup modal for asset -->
+            <dialog id="<%= asset._id %>-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
+                <div class="flex flex-row justify-between">
+                    <div style="width: 45%;">
+                        <form method="dialog" style="width: 100%;">
+                            <button
+                                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500  cursor-pointer"
+                            >
+                                Close
+                            </button>
+                        </form>
+                    </div>
+                    <div style="width: 45%;">
+                        <button
+                            style="width: 100%;"
+                            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-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 cursor-pointer"
+                            onclick="document.getElementById('<%= asset._id %>-delete-modal').showModal()"
+                        >
+                            Delete
+                        </button>
+                    </div>
+                </div>
+                <br>
+
+                <div class="flex flex-row justify-between">
+                    <% if (asset.type == "other") { %>
+                        <div class="flex items-center">
+                            <button id="dropdown-icon-button-<%= asset._id %>" value="" data-dropdown-toggle="dropdown-icons-<%= asset._id %>" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" type="button">
+                                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4 me-2" alt="<%= asset.icon %>"> <%= asset.icon %>
+                                <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                                </svg>
+                            </button>
+                            <div id="dropdown-icons-<%= asset._id %>" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                                <ul id="dropdown-<%= asset._id %>" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button-<%= asset._id %>">
+                                    <% icons.forEach(icon => { %>
+                                        <li>
+                                            <button onclick="selectIcon(this, '<%= asset._id %>')" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
+                                                <span class="inline-flex items-center">
+                                                    <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
+                                                </span>
+                                            </button>
+                                        </li>
+                                    <% }); %>
+                                </ul>
+                            </div>
+                        </div>
+                    <% } else { %>
+                        <button disabled class="inline-flex items-center py-2.5 px-10 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" type="button">
+                            <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4" alt="<%= asset.icon %>">
+                        </button>
+                    <% } %>
+                    
+                    <h2 class="text-xl font-medium tracking-tight leading-none mt-3"><%= String(asset.type).charAt(0).toUpperCase() + String(asset.type).slice(1); %> Asset</h2>
+                    <div>
+                        <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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500  cursor-pointer"
+                        >
+                            Edit
+                        </button>
+                    </div>
+                </div>
+                <br>
+
+                <form id="<%= asset._id %>-form" method="POST" action="/updateAsset">
+                    <input id="type-<%= asset._id %>" name="type" type="text" hidden value="<%= asset.type %>">
+                    <input id="id-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
+                    <input id="userId-<%= asset.userId %>" name="userId" type="text" hidden value="<%= asset.userId %>">
+                    <input id="icon-<%= asset._id %>" name="icon" type="text" hidden value="<%= asset.icon %>">
+
+                    <% if (asset.type != "stock") { %>
+                        <label for="name" class="block text-sm font-medium text-gray-700 mt-6">Name</label>
+                        <input id="name-<%= asset._id %>" disabled type="text" name="name" value="<%= asset.name %>" class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <% } else { %>
+                        <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
+                        <input id="ticker-<%= asset._id %>" disabled type="text" name="ticker" value="<%= asset.ticker %>" class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <% } %>
+
+                    <hr class="h-px mt-6 mb-4 bg-gray-500 border-0 mx-10">
+
+                    <% if (asset.type != "stock") { %>
+                        <label for="value" class="block text-sm font-medium text-gray-700">Value</label>
+                        <input id="value-<%= asset._id %>" disabled type="number" name="value" value="<%= asset.value %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <% } else { %>
+                        <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
+                        <input id="price-<%= asset._id %>" disabled type="number" name="price" value="<%= asset.price %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        
+                        <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
+                        <input id="quantity-<%= asset._id %>" disabled type="number" name="quantity" value="<%= asset.quantity %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <% } %>
+
+                    <% if (asset.type == "other") { %>
+                        <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
+                        <textarea disabled maxlength="240" id="description-<%= asset._id %>" name="description" rows="4" cols="50" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"><%= asset.description %></textarea>
+                    <% } %>
+
+                    <% if (asset.type != "saving") { %>
+                        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Purchased on</label>
+                        <input id="purchaseDate-<%= asset._id %>" disabled type="date" name="purchaseDate" value="<%= asset.purchaseDate %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <% } %>
+
+                    <br>
+                    <small class="block text-sm font-medium text-gray-700">Last Modified: <%= asset.updatedAt %></small>
+                    <br>
+
+                    <div>
+                        <button id="save-<%= asset._id %>" disabled type="submit" class="w-full flex justify-center py-2 px-4 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-not-allowed">
+                            Save
+                        </button>
+                    </div>
+                </form>
+            </dialog>
         <% }) %>
     </section>
 </main>
@@ -61,10 +382,9 @@
 <script src="/static/scripts/assetManager.js"></script>
 <script>
     // Ensure all assets popup modals are locked and reset on page load    
-    let assets = <%- JSON.stringify(assets) %>;
+    <% assets.forEach((asset) => { %>
-    assets.forEach((asset) => {
+        lockAsset("<%= asset._id %>", "<%= asset.icon %>");
-        lockAsset(asset._id, asset.icon);
+    <% }) %>
-    });
 </script>
 
 <%- include("./partials/navBar") %>

src/views/dashboard.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
     <%- include("./partials/header") %>
 
-        <main class="pt-24 pb-14">
+        <main>
             <!-- Buttons -->
             <div class="flex justify-end gap-4 px-5 py-6">
                 <a href="/assets?popup"
@@ -11,17 +11,106 @@
                     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>
-            <div class="flex justify-center sm:px-6 w-full ">
+            <!--This is the cards for plans and other things-->
-                <div class="mb-12  grid gap-y-4 gap-x-6 md:grid-cols-2  ">
+            <div class="mt-12">
-                    <% plans.forEach(plan=> { %>
+                <!--box to put logo icon if we want on in a box-->
-                        <%- include('./partials/dashboardBox.ejs', {plan: plan}) %>
+                <!-- <div -->
-                            <% }); %>
+                <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
-                </div>
+                <!-- </div> -->
-            </div>
+                <!--This is the cards for plans and other things-->
+                <div class="mt-12">
+                    <div class="mb-12 grid gap-y-10 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
+                        <!--box to put logo icon if we want on in a box-->
+                        <div class=" relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                            <!-- <div -->
+                            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
+                            <!-- </div> -->
+                            <div class="p-4 flex items-center justify-between">
+                                <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                                    Retirement goal</p>
+                                <h4
+                                    class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
+                                    $53k</h4>
+                            </div>
+                            <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 lastweek
+                                </p>
+                            </div>
+                        </div>
+                        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                            <div class="p-4 flex items-center justify-between">
+                                <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                                    Retirement goal</p>
+                                <h4
+                                    class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
+                                    $53k</h4>
+                            </div>
+                            <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
+                                </p>
+                            </div>
+                        </div>
+                        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                            <!-- <div -->
+                            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-green-600 to-green-400 text-white shadow-green-500/40 shadow-lg absolute -mt-4 grid h-16 w-16 place-items-center"> -->
+                            <!--   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" -->
+                            <!--     class="w-6 h-6 text-white"> -->
+                            <!--     <path -->
+                            <!--       d="M6.25 6.375a4.125 4.125 0 118.25 0 4.125 4.125 0 01-8.25 0zM3.25 19.125a7.125 7.125 0 0114.25 0v.003l-.001.119a.75.75 0 01-.363.63 13.067 13.067 0 01-6.761 1.873c-2.472 0-4.786-.684-6.76-1.873a.75.75 0 01-.364-.63l-.001-.122zM19.75 7.5a.75.75 0 00-1.5 0v2.25H16a.75.75 0 000 1.5h2.25v2.25a.75.75 0 001.5 0v-2.25H22a.75.75 0 000-1.5h-2.25V7.5z"> -->
+                            <!--     </path> -->
+                            <!--   </svg> -->
+                            <!-- </div> -->
+                            <!-- we can use this later if needed not sure what it shoudl be for right now. -->
+                            <!--   <div class="p-4 text-right"> -->
+                            <!--     <p class="block antialiased font-sans text-sm leading-normal font-normal text-blue-gray-600">New Clients -->
+                            <!--     </p> -->
+                            <!--     <h4 -->
+                            <!--       class="block antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900"> -->
+                            <!--       3,462</h4> -->
+                            <!--   </div> -->
+                            <!--   <div class="border-t border-blue-gray-50 p-4"> -->
+                            <!--     <p class="block antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600"> -->
+                            <!--       <strong class="text-red-500">-2%</strong>&nbsp;than yesterday -->
+                            <!--     </p> -->
+                            <!--   </div> -->
+                            <!-- </div> -->
+                            <div
+                                class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                                <div
+                                    class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                                    <div class="p-4 flex items-center justify-between">
+                                        <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                                            Retirement goal</p>
+                                        <h4
+                                            class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
+                                            $53k</h4>
+                                    </div>
+                                    <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
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="text-blue-gray-600">
+                    </div>
         </main>
 
-        <script src="/static/scripts/dollarFormat.js"></script>
-
         <%- include("./partials/navBar") %>
             <%- include("./partials/scriptLoader") %>
                 <%- include("./partials/footer") %>

src/views/forgotPass.ejs

@@ -1,42 +1,38 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
 
-<main class="pt-12 bg-slate-100 min-h-screen">
+    <main>
-    <div class="flex justify-center items-center py-10">
+        <div class="flex justify-center items-center h-screen">
-        <form action="/auth/resetPass" method="POST">
+            <form action="/auth/resetPass" method="POST">
-            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
+                <div class="w-96 p-6 shadow-1g bg-white rounded-md">
-                <h1 class="text-3xl block text-center font-semibold text-slate-700">Reset Password</h1>
+                    <h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
-                <hr class="mt-4 mb-6 border-slate-300">
+                    <hr class="mt-3">
+                    <% if (!reset ) { %>
+                        <div class="mt-3">
+                            <label for="email" class="block text-base mb-2">Email</label>
+                            <input type="text" id="email" name="email"
+                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                                placeholder="Enter Email" />
+                        </div>
+                        <% } else { %>
+                            <div class="mt-3">
+                                <h1 class="text-2xl block text-center font-bold text-red-600"> Reset link sent. </h1>
+                            </div>
+                            <% } %>
+                                <!---->
 
-                <% if (!reset ) { %>
+                                <div class="text-red-800 font-bold" id="forgor">
-                    <div class="mt-4">
+                                    <%= error%>
-                        <label for="email" class="block text-base mb-2 text-slate-600">Email</label>
+                                </div>
-                        <input type="text" id="email" name="email"
+                                <% if (!reset) { %>
-                            class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                                    <div class="mt-5">
-                            placeholder="Enter Email" />
+                                        <button type="submit"
-                    </div>
+                                            class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Send
-                <% } else { %>
+                                            reset Link</button>
-                    <div class="mt-4 text-center">
+                                    </div>
-                        <h2 class="text-xl font-semibold text-green-600">Reset link sent.</h2>
+                                    <% } %>
-                        <p class="text-sm text-slate-600 mt-2">Please check your email inbox (and spam folder).</p>
+                </div>
-                    </div>
+            </form>
-                <% } %>
+        </div>
+    </main>
 
-                <% if (typeof error !== 'undefined' && error && error.length > 0) { %>
+    <%- include("./partials/footer") %> <%- include("./partials/footer") %>
-                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"><%= error %></div>
-                <% } else if (!reset) { %>
-                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder for layout consistency */ %>
-                <% } %>
-
-                <% if (!reset) { %>
-                    <div class="mt-6">
-                        <button type="submit"
-                            class="border-2 border-indigo-600 bg-indigo-600 text-white py-2 w-full rounded-md hover:bg-indigo-700 hover:border-indigo-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">Send Reset Link</button>
-                    </div>
-                <% } %>
-            </div>
-        </form>
-    </div>
-</main>
-
-<%- include("./partials/footer") %>

src/views/login.ejs

@@ -1,45 +1,40 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
 
-<main class="pt-12 bg-slate-100 min-h-screen">
+<main>
-    <div class="flex justify-center items-center py-10">
+    <div class="flex justify-center items-center h-screen">
         <form action="/login" method="POST">
-            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
+            <div class="w-96 p-6 shadow-1g bg-white rounded-md">
-                <h1 class="text-3xl block text-center font-semibold text-slate-700">Login</h1>
+                <h1 class="text-3xl block text-center font-semibold">Login</h1>
-                <hr class="mt-4 mb-6 border-slate-300">
+                <hr class="mt-3">
-                <div class="mt-4">
+                <div class="mt-3">
-                    <label for="email" class="block text-base mb-2 text-slate-600">Email</label>
+                    <label for="email" class="block text-base mb-2">Email</label>
                     <input type="text" id="email" name="email"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                         placeholder="Enter Email" />
                 </div>
-                <div class="mt-4">
+                <div class="mt-3">
-                    <label for="password" class="block text-base mb-2 text-slate-600">Password</label>
+                    <label for="password" class="block text-base mb-2">Password</label>
                     <input type="password" id="password" name="password"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                         placeholder="Enter Password" />
                 </div>
-                <% if (errMessage && errMessage.length > 0) { %>
+                <div class="text-red-800 font-bold" id="forgor"> <%= errMessage %></div>
-                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"> <%= errMessage %></div>
+                <div class="mt-3 flex justify-between items-center">
-                <% } else { %>
+                    <div>
-                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder to maintain layout when no error */ %>
+                        <input type="checkbox">
-                <% } %>
+                        <label>Remember me</label>
-                <div class="mt-4 flex justify-between items-center">
-                    <div class="flex items-center">
-                        <input type="checkbox" id="rememberMe" class="h-4 w-4 text-indigo-600 border-slate-300 rounded focus:ring-indigo-500">
-                        <label for="rememberMe" class="ml-2 text-sm text-slate-600">Remember me</label>
                     </div>
                     <div>
-                        <a href="/forgotPassword" class="text-sm text-indigo-600 hover:text-indigo-500 font-semibold transition-colors duration-200">Forgot Password? </a>
+                        <a href="/forgotPassword" class="text-indigo-600 font-semibold">Forgot Password? </a>
                     </div>
                 </div>
-                <div class="mt-6">
+                <div class="mt-5">
                     <button type="submit"
-                        class="border-2 border-indigo-600 bg-indigo-600 text-white py-2 w-full rounded-md hover:bg-indigo-700 hover:border-indigo-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">Login</button>
+                        class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Login</button>
                 </div>
-                <div class="mt-6 text-center">
+                <div class="mt-5 block justify-between items-center">
-                    <span class="text-sm text-slate-600">Don't have an account?</span>
+                    <label>Don't have an account?</label>
-                    <a href="/signup" class="text-sm text-indigo-600 hover:text-indigo-500 font-semibold ml-1 transition-colors duration-200">Register</a>
+                    <a href="/signup" class="text-indigo-600 font-semibold">Register</a>
                 </div>
             </div>
         </form>

src/views/more.ejs

@@ -1,54 +1,11 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="pt-24 pb-10">
+<main>
-    <div class="mt-6">
+    The More Page
-        <div class="mb-12 grid gap-y-6 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
-            <!--box to put logo icon if we want on in a box-->
-            <a href="/profile" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                <div class="p-4 flex items-center justify-between">
-                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                        Profile
-                    </p>
-                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
-                    </svg>
-                </div>
-            </a>
-            <a href="/settings" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                <div class="p-4 flex items-center justify-between">
-                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                        Settings
-                    </p>
-                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
-                    </svg>
-                </div>
-            </a>
-            <a href="/aboutUs" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                <div class="p-4 flex items-center justify-between">
-                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                        About Us
-                    </p>
-                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
-                    </svg>
-                </div>
-            </a>
-            <a href="/logout" class="mt-77 relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                <div class="p-4 flex items-center justify-between">
-                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                        Log Out
-                    </p>
-                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
-                    </svg>
-                </div>
-            </a>
-        </div>
-    </div>
 </main>
 
 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
 <%- include("./partials/footer") %>
+    

src/views/newPlan.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4 pt-30">
+<main class="container mx-auto p-4">
     <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
         <h3 class="text-lg font-medium mb-6">Retirement Plan</h3>

src/views/partials/assetDelete.ejs

@@ -1,39 +0,0 @@
-<!-- Confirm delete asset modal -->
-<dialog id="<%= asset._id %>-delete-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
-    <div class="relative p-4 w-full max-w-md h-full md:h-auto">
-        <!-- Modal content -->
-        <div class="relative p-4 text-center bg-white rounded-lg shadow dark:bg-gray-800 sm:p-5">
-            <form method="dialog">
-                <button type="submit" class="text-gray-400 absolute top-2.5 right-2.5 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white">
-                    <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
-                    <span class="sr-only">Close modal</span>
-                </button>
-            </form>
-            <svg class="text-gray-400 dark:text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
-            <p class="mb-4 text-gray-500 dark:text-gray-300">Are you sure you want to delete this item?</p>
-            <div class="flex justify-center items-center space-x-4">
-                <div style="width: 100%;">
-                    <form method="dialog" style="width: 100%;">
-                        <button
-                            type="submit" 
-                            class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
-                        >
-                            No, cancel
-                        </button>
-                    </form>
-                </div>
-                <div style="width: 100%;">
-                    <form method="POST" action="/deleteAsset">
-                        <input id="id-delete-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
-                        <button 
-                            type="submit" 
-                            class="py-2 px-3 text-sm font-medium text-center text-white bg-red-600 rounded-lg hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-500 dark:hover:bg-red-600 dark:focus:ring-red-900"
-                        >
-                            Yes, I'm sure
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</dialog>

src/views/partials/assetModify.ejs

@@ -1,119 +0,0 @@
-
-<!-- View/edit popup modal for asset -->
-<dialog id="<%= asset._id %>-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
-    <div class="flex flex-row justify-between">
-        <div style="width: 45%;">
-            <form method="dialog" style="width: 100%;">
-                <button
-                    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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500  cursor-pointer"
-                >
-                    Close
-                </button>
-            </form>
-        </div>
-        <div style="width: 45%;">
-            <button
-                style="width: 100%;"
-                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-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 cursor-pointer"
-                onclick="document.getElementById('<%= asset._id %>-delete-modal').showModal()"
-            >
-                Delete
-            </button>
-        </div>
-    </div>
-    <br>
-
-    <div class="flex flex-row justify-between">
-        <% if (asset.type == "other") { %>
-            <div class="flex items-center">
-                <button id="dropdown-icon-button-<%= asset._id %>" value="" data-dropdown-toggle="dropdown-icons-<%= asset._id %>" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" type="button">
-                    <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4 me-2" alt="<%= asset.icon %>"> <%= asset.icon %>
-                    <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
-                    </svg>
-                </button>
-                <div id="dropdown-icons-<%= asset._id %>" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
-                    <ul id="dropdown-<%= asset._id %>" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button-<%= asset._id %>">
-                        <% icons.forEach(icon => { %>
-                            <li>
-                                <button onclick="selectIcon(this, '<%= asset._id %>')" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
-                                    <span class="inline-flex items-center">
-                                        <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
-                                    </span>
-                                </button>
-                            </li>
-                        <% }); %>
-                    </ul>
-                </div>
-            </div>
-        <% } else { %>
-            <button disabled class="inline-flex items-center py-2.5 px-10 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" type="button">
-                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4" alt="<%= asset.icon %>">
-            </button>
-        <% } %>
-        
-        <h2 class="text-xl font-medium tracking-tight leading-none mt-3"><%= String(asset.type).charAt(0).toUpperCase() + String(asset.type).slice(1); %> Asset</h2>
-        <div>
-            <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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500  cursor-pointer"
-            >
-                Edit
-            </button>
-        </div>
-    </div>
-    <br>
-
-    <form id="<%= asset._id %>-form" method="POST" action="/updateAsset">
-        <input id="type-<%= asset._id %>" name="type" type="text" hidden value="<%= asset.type %>">
-        <input id="id-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
-        <input id="userId-<%= asset.userId %>" name="userId" type="text" hidden value="<%= asset.userId %>">
-        <input id="icon-<%= asset._id %>" name="icon" type="text" hidden value="<%= asset.icon %>">
-
-        <% if (asset.type != "stock") { %>
-            <label for="name" class="block text-sm font-medium text-gray-700 mt-6">Name</label>
-            <input id="name-<%= asset._id %>" disabled type="text" name="name" value="<%= asset.name %>" class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-        <% } else { %>
-            <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
-            <input id="ticker-<%= asset._id %>" disabled type="text" name="ticker" value="<%= asset.ticker %>" class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-        <% } %>
-
-        <hr class="h-px mt-6 mb-4 bg-gray-500 border-0 mx-10">
-
-        <% if (asset.type != "stock") { %>
-            <label for="value" class="block text-sm font-medium text-gray-700">Value</label>
-            <input id="value-<%= asset._id %>" disabled type="number" name="value" value="<%= asset.value %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-        <% } else { %>
-            <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
-            <input id="price-<%= asset._id %>" disabled type="number" name="price" value="<%= asset.price %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-            
-            <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
-            <input id="quantity-<%= asset._id %>" disabled type="number" name="quantity" value="<%= asset.quantity %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-        <% } %>
-
-        <% if (asset.type == "other") { %>
-            <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
-            <textarea disabled maxlength="240" id="description-<%= asset._id %>" name="description" rows="4" cols="50" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"><%= asset.description %></textarea>
-        <% } %>
-
-        <% if (asset.type != "saving") { %>
-            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Purchased on</label>
-            <input id="purchaseDate-<%= asset._id %>" disabled type="date" name="purchaseDate" value="<%= asset.purchaseDate %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-        <% } %>
-
-        <br>
-        <small class="block text-sm font-medium text-gray-700">Last Modified: <%= asset.updatedAt %></small>
-        <br>
-
-        <div>
-            <button id="save-<%= asset._id %>" disabled type="submit" class="w-full flex justify-center py-2 px-4 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-not-allowed">
-                Save
-            </button>
-        </div>
-    </form>
-</dialog>

src/views/partials/assetPreview.ejs

@@ -1,18 +0,0 @@
-<!-- Clickable asset list item -->
-<div class="mt-4 max-w-md mx-auto bg-white rounded-lg shadow-md">
-    <button onclick="document.getElementById('<%= asset._id %>-modal').showModal()" style="width: 100%; height: 100%;" class="px-4 py-4 cursor-pointer">
-        <div class="flex flex-row justify-between">
-            <div class="flex flex-row justify-between">
-                <div class="mx-2">
-                    <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-6 w-6 me-2" alt="<%= asset.icon %>">
-                </div>
-                <div class="mx-2"><h3><%= asset.name %></h3></div>
-            </div>
-            <div>
-                <h3><strong>
-                    $<%= asset.value.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) %>
-                </strong></h3>
-            </div>
-        </div>
-    </button>
-</div>

src/views/partials/createAsset.ejs

@@ -1,150 +0,0 @@
-<!-- Create Asset popup Modal -->
-<dialog id="create-asset-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
-    <div class="flex flex-row justify-between">
-        <h2 class="text-lg font-bold mb-2">Create New Asset</h2>
-        <form method="dialog">
-            <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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Cancel
-            </button>
-        </form>
-    </div>
-
-    <div class="my-4">
-        <label class="block text-sm font-medium text-gray-700">Asset Type</label>
-        <div class="mt-1 space-x-4">
-            <label class="inline-flex items-center">
-                <input checked onclick="selectAssetForm('create-other-asset-form')" id="asset-other" type="radio" name="type" value="other" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                <span class="ml-2 text-sm text-gray-700">Other Assets</span>
-            </label>
-            <label class="inline-flex items-center">
-                <input onclick="selectAssetForm('create-saving-asset-form')" id="asset-saving" type="radio" name="type" value="saving" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                <span class="ml-2 text-sm text-gray-700">Savings</span>
-            </label>
-            <label class="inline-flex items-center">
-                <input onclick="selectAssetForm('create-stock-asset-form')" id="asset-stock" type="radio" name="type" value="stock" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                <span class="ml-2 text-sm text-gray-700">Stocks</span>
-            </label>
-        </div>
-    </div>
-
-    <!-- Create other asset form -->
-    <form method="POST" action="/createAsset" id="create-other-asset-form">
-        <input style="display: none;" id="type" value="other" name="type" type="text">
-        <input style="display: none;" id="icon" value="Other" name="icon" type="text">
-        
-        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Select an Icon</label>            
-        <div class="flex items-center">
-            <button id="dropdown-icon-button" value="" data-dropdown-toggle="dropdown-icons" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" type="button">
-                <img src="/static/svgs/icons/Other.svg" class="h-4 w-4 me-2" alt="Other"> Other
-                <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
-                </svg>
-            </button>
-            <div id="dropdown-icons" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
-                <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button">
-                    <% icons.forEach(icon => { %>
-                        <li>
-                            <button onclick="selectIcon(this)" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
-                                <span class="inline-flex items-center">
-                                    <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
-                                </span>
-                            </button>
-                        </li>
-                    <% }); %>
-                </ul>
-            </div>
-        </div>
-
-        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Asset Name</label>
-        <input required id="name" type="text" name="name" minlength="3" maxlength="30" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Asset Value</label>
-        <input required placeholder="CAD" min="0" id="value" type="number" name="value" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
-        <input required type="date" id="purchaseDate" name="purchaseDate" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
-        <textarea maxlength="240" id="description" name="description" rows="4" cols="50" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"></textarea>
-
-        <div class="mt-6 flex flex-row justify-between">
-            <button 
-                type="reset"
-                onclick="document.getElementById('create-other-asset-form').reset()"
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Clear
-            </button>
-            <button 
-                type="submit"
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Create
-            </button>
-        </div>
-    </form>
-
-    <!-- Create savings asset form -->
-    <form style="display: none;" method="POST" action="/createAsset" id="create-saving-asset-form">
-        <input style="display: none;" value="saving" name="type" type="text">
-
-        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Savings Name</label>
-        <input required id="name" type="text" name="name" minlength="3" maxlength="30" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Savings Value</label>
-        <input required placeholder="CAD" min="0" id="value" type="number" name="value" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <div class="mt-6 flex flex-row justify-between">
-            <button 
-                type="reset"
-                onclick="document.getElementById('create-saving-asset-form').reset()"
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Clear
-            </button>
-            <button 
-                type="submit" 
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Create
-            </button>
-        </div>
-    </form>
-
-    <!-- Create stock asset form -->
-    <form style="display: none;" method="POST" action="/createAsset" id="create-stock-asset-form">
-        <input style="display: none;" value="stock" name="type" type="text">
-
-        <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
-        <input required id="ticker" type="text" name="ticker" minlength="3" maxlength="5" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
-        <input required placeholder="CAD" min="0" id="price" type="number" name="price" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
-        <input required type="number" min="1" id="quantity" name="quantity" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
-        <input required type="date" id="purchaseDate" name="purchaseDate" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-
-        <div class="mt-6 flex flex-row justify-between">
-            <button 
-                type="reset"
-                onclick="document.getElementById('create-stock-asset-form').reset()"
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Clear
-            </button>
-            <button 
-                type="submit"
-                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-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
-            >
-                Create
-            </button>
-        </div>
-    </form>
-</dialog>

src/views/partials/dashboardBox.ejs

@@ -1,35 +0,0 @@
-<div class="mt-12">
-    <a href="/plans/<%=plan._id%>">
-        <div class=" relative flex flex-col bg-clip-border  rounded-xl bg-white text-gray-700 shadow-md w-full min-h-[130px] min-w-[340px] 
-        md:min-h-[220px] md:min-w-[500px]">
-            <!-- <div -->
-            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
-            <!-- </div> -->
-            <div class="p-4 flex items-center justify-between">
-                <p class="font-sans text-2xl leading-normal font-bold text-blue-gray-600">
-                    <%= plan.name %>
-                </p>
-                <h4
-                    class="planGoal block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                    <%= plan.retirementAssets %>
-                </h4>
-            </div>
-            <div class="border-t border-blue-gray-50 p-10">
-                <div class="float-left font-bold">
-                    <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                        Status bar:
-                    </p>
-                </div>
-                <strong class="text-green-500">
-                    <div class="float-right mb-2">
-                        <%=Math.floor(plan.progress) %>% complete
-                    </div>
-                    <div class="bg-gray-400 mt-7">
-                        <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500"
-                            style="width: <%= plan.progress %>%;"></div>
-
-                    </div>
-            </div>
-        </div>
-    </a>
-</div>

src/views/partials/fileHeader.ejs

@@ -6,18 +6,5 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
         <title>RCalculator</title>
-
-        <style>
-            ::-webkit-scrollbar {
-                display: none;
-            }
-
-            * {
-                scrollbar-width: none;
-                -ms-overflow-style: none;
-            }
-        </style>
     </head>
-    <body class="bg-gray-900 overflow-y-auto">
+    <body class="bg-gray-900">
-
-        

src/views/partials/footer.ejs

@@ -1,28 +1,13 @@
-    <div class="fixed end-6 bottom-20 group">
+
-        <div id="factMenu" class="absolute right-0 bottom-full mb-2 hidden">
+<footer class="mt-16">
-            <div id="factContainer" class="bg-white p-4 rounded-lg shadow-md dark:bg-gray-700 w-64">
+    <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
-                <p class="mb-2 text-sm text-gray-700 dark:text-gray-300">Insert the kind of short fact you would like to know more about:</p>
+        <div class="container mx-auto">
-                <input type="text" id="factInput" placeholder="Enter your topic here" class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-600 dark:border-gray-500 dark:text-white dark:placeholder-gray-400">
+            <p>&copy; 2025 RCalculator. All rights reserved.</p>
-                <button type="button" id="factSubmitButton" class="mt-3 w-full px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 dark:focus:ring-offset-gray-700">Submit</button>
-            </div>
         </div>
-        <button type="button" id="factButton" class="flex items-center justify-center text-white bg-blue-700 rounded-full w-14 h-14 hover:bg-blue-800 dark:bg-blue-600 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 focus:outline-none dark:focus:ring-blue-800 hidden">
-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>
-            <span class="sr-only">Get a Fact</span>
-        </button>
     </div>
+</footer>
 
-    <footer class="mt-16">
+<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
-        <div class="fixed bottom-0 left-0 z-30 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-            </div>
-        </div>
-    </footer>
-    
-    <script src="/static/scripts/footer.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 
 </body>
 </html>

src/views/partials/header.ejs

@@ -1,8 +1,8 @@
 
 <header>
-    <nav class="fixed bg-gray-800 border-b border-gray-700 z-30">
+    <nav class="bg-gray-800 border-b border-gray-700">
-        <div class="w-screen flex flex-col md:flex-row flex-wrap items-center justify-between p-3">
+        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
-            <a href="/home" class="flex xl:w-[320px] items-center space-x-3 rtl:space-x-reverse">
+            <a href="/home" class="flex items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
                 <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>
             </a>
@@ -16,13 +16,13 @@
                     <span class="sr-only">Loading...</span>
                 </div>
                 
-                <div style="display: none;" class="flex items-center pt-2 md:pt-0 lg:pt-0" id="currencyExchange">
+                <div style="display: none;" class="flex items-center" id="currencyExchange">
-                    <div id="exFrom" class="shrink-0 z-10 inline-flex w-[115px] items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
                         <img src="" id="yourFlag" class="h-4 w-4 me-2" alt="">
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
                         </p>
                     </div>
                     <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
@@ -32,26 +32,24 @@
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
                         </svg>
                     </button>
-                    <div id="dropdown-country" class="overflow-y-auto w-[115px] h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                    <div id="dropdown-country" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
                         <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-country-button">
 
                         </ul>
                     </div>
                 </div>
-            <% } else if(geoData.message == "error") { %>
-                <p>error</p>
             <% } else { %>
-                <div class="flex items-center pt-2 md:pt-0 lg:pt-0">
+                <div class="flex items-center">
-                    <div class="shrink-0 z-10 w-[115px] inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
                         <img src="/static/svgs/flags/<%= geoData.country %>.svg" id="yourFlag" class="h-4 w-4 me-2" alt="<%= geoData.country %>"> (<%= geoData.country %>)
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
                             $1.00 = $<%= (1 * geoData.toCurrencyRates["USD"]).toFixed(2) %>
                         </p>
                     </div>
-                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 w-[115px] z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
+                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
                         <img src="/static/svgs/flags/USD.svg" class="h-4 w-4 me-2" alt="USD"> (USD)
                         <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
@@ -73,77 +71,25 @@
                     </div>
                 </div>
             <% } %>
-            <div class="hidden w-full lg:block lg:w-[320px]" id="navbar-solid-bg">
+            <div class="hidden w-full lg:block lg:w-auto" id="navbar-solid-bg">
                 <ul class="flex flex-col font-medium mt-4 rounded-lg bg-gray-50 lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0 lg:bg-transparent dark:bg-gray-800 lg:dark:bg-transparent dark:border-gray-700">
-                    <li class="flex items-center justify-center">
+                    <li>
-                        <a href="/home" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Dashboard</a>
+                        <a href="/home" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Dashboard</a>
-                    </li>
-                    <li class="flex items-center justify-center">
-                        <a href="/assets" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Assets</a>
-                    </li>
-                    <li class="flex items-center justify-center">
-                        <a href="/plans" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Plans</a>
                     </li>
                     <li>
-                        <div class="text-center">
+                        <a href="/assets" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Assets</a>
-                            <button class="flex flex-row text-white hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 font-medium rounded-full text-sm focus:outline-none dark:focus:ring-blue-800" type="button" id="drawer-toggle" data-drawer-target="drawer-navigation" data-drawer-placement="right" aria-controls="drawer-navigation">
+                    </li>
-                                <svg class="w-[30px] h-[30px] text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+                    <li>
-                                    <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
+                        <a href="/plans" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Plans</a>
-                                </svg>
+                    </li>
-                                <svg class="w-[30px] h-[30px] text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                    <li>
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M5 7h14M5 12h14M5 17h14"/>
+                        <a href="/more" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">More</a>
-                                </svg>
+                    </li>
-
+                    <li>
-                            </button>
+                        <a href="/logout" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Logout</a>
-                        </div>
                     </li>
                 </ul>
             </div>
-
-            <!-- drawer component -->
         </div>
     </nav>
-    <div id="drawer-navigation" class="lg:block fixed top-0 right-0 z-60 w-64 h-screen p-4 overflow-y-auto transition-transform translate-x-full bg-white dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
-        <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400"><%= user.name %></h5>
-        <button type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 end-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
-            <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
-            <span class="sr-only">Close menu</span>
-        </button>
-        <div class="">
-            <div class="w-full pt-5 pl-2.5">
-                <a href="/logout" class="text-white bg-blue-700 hover:bg-blue-800 focus:outline-none focus:ring-4 focus:ring-blue-300 font-medium rounded-full text-sm px-20 py-2.5 text-center me-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
-                    Logout
-                </a>
-            </div>
-        </div>
-        <div class="py-4 overflow-y-auto">
-            <ul class="space-y-2 font-medium">
-                <li>
-                    <a href="/profile" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
-                    <svg class="w-5 h-5 text-gray-500 dark:text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
-                        <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
-                    </svg>
-                    <span class="ms-3">Profile</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="/settings" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
-                    <svg class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
-                        <path d="M16.975 11H10V4.025a1 1 0 0 0-1.066-.998 8.5 8.5 0 1 0 9.039 9.039.999.999 0 0 0-1-1.066h.002Z"/>
-                        <path d="M12.5 0c-.157 0-.311.01-.565.027A1 1 0 0 0 11 1.02V10h8.975a1 1 0 0 0 1-.935c.013-.188.028-.374.028-.565A8.51 8.51 0 0 0 12.5 0Z"/>
-                    </svg>
-                    <span class="ms-3">Settings</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="aboutUs" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
-                    <svg class="shrink-0 w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">
-                        <path d="M14 2a3.963 3.963 0 0 0-1.4.267 6.439 6.439 0 0 1-1.331 6.638A4 4 0 1 0 14 2Zm1 9h-1.264A6.957 6.957 0 0 1 15 15v2a2.97 2.97 0 0 1-.184 1H19a1 1 0 0 0 1-1v-1a5.006 5.006 0 0 0-5-5ZM6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Z"/>
-                    </svg>
-                    <span class="flex-1 ms-3 whitespace-nowrap">About Us</span>
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </div>
 </header>

src/views/partials/headerStart.ejs

@@ -1,6 +1,6 @@
 <header>
     <nav class="bg-gray-800 border-b border-gray-700">
-        <div class="w-screen flex flex-wrap items-center justify-between p-4">
+        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
             <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
                 <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>

src/views/partials/navBar.ejs

@@ -1,5 +1,5 @@
-<div class="fixed block bottom-0 left-0 z-50 lg:hidden w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 text-sm">
+<div class="fixed bottom-0 z-50 lg:hidden w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 text-sm">
-    <div class="grid h-16 grid-cols-4 mx-auto font-medium">
+    <div class="grid h-16 max-w-lg grid-cols-4 mx-auto font-medium">
         <a href="/home" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group">
             <img src="/static/svgs/dashboard.svg" alt="dashboard">
             <span class="text-gray-500 dark:text-gray-400 text-sm">Dashboard</span>

src/views/planDetail.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4 p-28">
+<main class="container mx-auto p-4">
     <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-lg mx-auto bg-white p-6 sm:p-8 rounded-xl shadow-lg space-y-6 dark:bg-gray-800">
         
@@ -62,7 +62,7 @@
             
             <div class="mt-6 p-4 bg-blue-50 border border-blue-200 rounded-lg dark:bg-gray-700 dark:border-gray-600">
                 <p class="text-sm text-blue-700 dark:text-blue-300">
-                    <%= suggestions %>
+                    USE YOUR HEAD MOCK
                 </p>
             </div>
         </div>

src/views/plans.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4 pt-28">
+<main class="container mx-auto p-4">
     <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md space-y-4">
         <h3 class="text-lg font-medium mb-6">My Retirement Plans</h3>

src/views/profile.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="pt-24">
+<main>
     <!-- Confirm delete account modal -->
     <dialog id="delete-warning-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
         <div class="relative p-4 w-full max-w-md h-full md:h-auto">
@@ -62,7 +62,7 @@
             <input id="name" disabled type="text" name="name" value="<%= user.name %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
 
             <label for="password" class="block text-sm font-medium text-gray-700">New password</label>
-            <input id="password" disabled type="password" name="password" minlength="8" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+            <input id="password" disabled type="password" name="password" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
 
             <label for="repassword" class="block text-sm font-medium text-gray-700">Confirm new password</label>
             <input id="repassword" disabled type="password" name="repassword" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
@@ -73,96 +73,6 @@
         </form>
     </div>
 
-    <!-- Questionnare details -->
-    <div class="mb-10 max-w-md mx-auto bg-white p-8 rounded-lg shadow-md">
-        <div class="flex flex-row justify-between">
-            <h3 class="pt-2 pr-2 pb-2">Personal information</h3>
-            <% if (user.financialData) { %>
-                <button id="edit-personal" onclick="unlockPersonal()" class="py-2 px-4 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">Edit</button>
-            <% } %>
-        </div>
-
-        <% if (user.financialData) { %>
-            <form action="/updatePersonal" method="post" class="space-y-4" id="personal-form">
-                <div>
-                    <label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth</label>
-                    <input 
-                        disabled 
-                        id="dob" 
-                        type="date" 
-                        name="dob" 
-                        class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
-                        <% let year  = typeof(user.dob) == "object" ? user.dob.getFullYear() : user.dob.split('-')[0]; %>
-                        <% let month = typeof(user.dob) == "object" ? user.dob.getMonth()    : user.dob.split('-')[1] - 1;  %>
-                        <% let day   = typeof(user.dob) == "object" ? user.dob.getDate() + 1 : user.dob.split('-')[2].split('T')[0];%>
-                        <% let d = new Date(parseInt(year), parseInt(month), parseInt(day)); %>
-                        value="<%= d.getFullYear() + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2); %>"
-                    >
-                </div>
-                <div>
-                    <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
-                    <select disabled id="education" name="education" id="education" class="mt-1 block w-full px-3 py-2 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                        <option <%= user.education == "primary"      ? 'selected' : '' %> value="primary">Primary (Elementary)</option>
-                        <option <%= user.education == "secondary"    ? 'selected' : '' %> value="secondary">Secondary (High School)</option>
-                        <option <%= user.education == "tertiary"     ? 'selected' : '' %> value="tertiary">Tertiary (College/University)</option>
-                        <option <%= user.education == "postgraduate" ? 'selected' : '' %> value="postgraduate">Postgraduate (Master's/PhD)</option>
-                    </select>
-                </div>
-                <div>
-                    <label class="block text-sm font-medium text-gray-700">Marital Status</label>
-                    <div class="mt-1 space-x-4">
-                        <label class="inline-flex items-center">
-                            <input disabled <%= user.maritalStatus == "single" ? 'checked' : '' %> id="ms-single" type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                            <span class="ml-2 text-sm text-gray-700">Single</span>
-                        </label>
-                        <label class="inline-flex items-center">
-                            <input disabled <%= user.maritalStatus == "married" ? 'checked' : '' %> id="ms-married" type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                            <span class="ml-2 text-sm text-gray-700">Married</span>
-                        </label>
-                            <label class="inline-flex items-center">
-                            <input disabled <%= user.maritalStatus == "divorced" ? 'checked' : '' %> id="ms-divorced" type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                            <span class="ml-2 text-sm text-gray-700">Divorced</span>
-                        </label>
-                            <label class="inline-flex items-center">
-                            <input disabled <%= user.maritalStatus == "widowed" ? 'checked' : '' %> id="ms-widowed" type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                            <span class="ml-2 text-sm text-gray-700">Widowed</span>
-                        </label>
-                    </div>
-                </div>
-                
-                <div>
-                    <label for="income" class="block text-sm font-medium text-gray-700">Annual Gross Income</label>
-                    <input disabled value="<%= user.income %>" id="income" type="number" name="income" min="0" placeholder="e.g., 50000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                </div>
-                
-                <div>
-                    <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses</label>
-                    <input disabled value="<%= user.expenses %>" id="expenses" type="number" name="expenses" min="0" placeholder="e.g., 2000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                </div>
-                
-                <div>
-                    <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth</label>
-                    <input disabled value="<%= user.assets %>" id="assets" type="number" name="assets" min="0" placeholder="Estimated Net Worth" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                </div>
-                
-                <div>
-                    <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities</label>
-                    <input disabled value="<%= user.liabilities %>" id="liabilities" type="number" name="liabilities" min="0" placeholder="Estimated Liabilities" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
-                </div>
-
-                <div>
-                    <button id="save-personal" disabled type="submit" class="w-full flex justify-center py-2 px-4 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-not-allowed">Save</button>
-                </div>
-            </form>
-        <% } else { %>
-            <div>
-                <a href="/questionnaire?profile" class="w-full flex justify-center py-2 px-4 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">Answer Questionnare</a>
-            </div>
-        <% } %>
-
-    </div>
-
-    <!-- Delete account -->    
     <div class="flex flex-row justify-center mx-auto p8">
         <button
             type="submit"
@@ -173,6 +83,55 @@
         </button>
     </div>
 
+<!--
+    <div class="mb-10 max-w-md mx-auto bg-white p-8 rounded-lg shadow-md">
+        <div class="flex flex-row justify-between">
+            <h3 class="pt-2 pr-2 pb-2">Personal information</h3>
+            <button onclick="unlockPersonal()" class="py-2 px-4 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">Edit</button>
+        </div>
+        <form action="/updatePersonal" method="post" class="space-y-4" id="personal-form">
+            <div>
+                <label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth</label>
+                <input id="dob" disabled type="date" name="dob" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+            </div>
+            <div>
+                <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
+                <select disabled name="education" id="education" class="mt-1 block w-full px-3 py-2 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                    <option value="primary">Primary (Elementary)</option>
+                    <option value="secondary">Secondary (High School)</option>
+                    <option value="tertiary">Tertiary (College/University)</option>
+                    <option value="postgraduate">Postgraduate (Master's/PhD)</option>
+                </select>
+            </div>
+
+            <div>
+                <label class="block text-sm font-medium text-gray-700">Marital Status</label>
+                <div class="mt-1 space-x-4">
+                    <label class="inline-flex items-center">
+                        <input disabled id="ms-single" type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        <span class="ml-2 text-sm text-gray-700">Single</span>
+                    </label>
+                    <label class="inline-flex items-center">
+                        <input disabled id="ms-married" type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        <span class="ml-2 text-sm text-gray-700">Married</span>
+                    </label>
+                    <label class="inline-flex items-center">
+                        <input disabled id="ms-divorced" type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        <span class="ml-2 text-sm text-gray-700">Divorced</span>
+                    </label>
+                        <label class="inline-flex items-center">
+                        <input disabled id="ms-widowed" type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        <span class="ml-2 text-sm text-gray-700">Widowed</span>
+                    </label>
+                </div>
+            </div>
+
+            <div>
+                <button id="save-personal" disabled type="submit" class="w-full flex justify-center py-2 px-4 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-not-allowed">Save</button>
+            </div>
+        </form>
+    </div> -->
+
     <div class="mt-24"></div>
 </main>
 

src/views/questionnaire.ejs

@@ -1,8 +1,8 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4 pt-28">
+<main class="container mx-auto p-4">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
+    <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
         <h3 class="text-lg font-medium mb-6">Financial Questionnaire</h3>
         <form action="/questionnaire" method="post" class="space-y-4">

src/views/signup.ejs

@@ -1,50 +1,46 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
+    <%- include("./partials/headerStart") %>
 
-<main class="pt-12 bg-slate-100 min-h-screen">
+        <main>
-    <div class="flex justify-center items-center py-10">
+            <div class="flex justify-center items-center h-screen">
-        <form action="/signup" method="POST">
+                <form action="/signup" method="POST">
-            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
+                    <div class="w-96 p-6 shadow-1g bg-white rounded-md">
-                <h1 class="text-3xl block text-center font-semibold text-slate-700">Signup</h1>
+                        <h1 class="text-3xl block text-center font-semibold">Signup</h1>
-                <hr class="mt-4 mb-6 border-slate-300">
+                        <hr class="mt-3">
-                <div class="mt-4">
+                        <div class="mt-3">
-                    <label for="name" class="block text-base mb-2 text-slate-600">Name</label>
+                            <label for="name" class="block text-base mb-2">Name</label>
-                    <input type="text" id="name" name="name"
+                            <input type="text" id="name" name="name"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
-                        placeholder="Enter Name" />
+                                placeholder="Enter Name" />
-                </div>
+                        </div>
-                <div class="mt-4">
+                        <div class="mt-3">
-                    <label for="email" class="block text-base mb-2 text-slate-600">Email</label>
+                            <label for="email" class="block text-base mb-2">Email</label>
-                    <input type="email" id="email" name="email"
+                            <input type="email" id="email" name="email"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
-                        placeholder="Enter Email" />
+                                placeholder="Enter Email" />
-                </div>
+                        </div>
-                <div class="mt-4">
+                        <div class="mt-3">
-                    <label for="password" class="block text-base mb-2 text-slate-600">Password</label>
+                            <label for="password" class="block text-base mb-2">Password</label>
-                    <input type="password" id="password" name="password"
+                            <input type="password" id="password" name="password" minlength="8"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
-                        placeholder="Enter Password" />
+                                placeholder="Enter Password" />
-                    <label for="repassword" class="block text-base mb-2 mt-3 text-slate-600">Re-type Password</label>
+                            <label for="password" class="block text-base mb-2 mt-3">Re-type Password</label>
-                    <input type="password" id="repassword" name="repassword"
+                            <input type="password" id="repassword" name="repassword" minlength="8"
-                        class="border border-slate-300 focus:border-indigo-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-indigo-500 transition-colors duration-200"
+                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
-                        placeholder="Enter Password" />
+                                placeholder="Enter Password" />
-                </div>
+                        </div>
-                <% if (errMessage && errMessage.length > 0) { %>
+                        <div class="text-red-800 font-bold " id="forgor">
-                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"> <%= errMessage %></div>
+                            <%= errMessage %>
-                <% } else { %>
+                        </div>
-                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder to maintain layout when no error */ %>
+                        <div class="mt-5">
-                <% } %>
+                            <button type="submit"
-                <div class="mt-6">
+                                class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Signup</button>
-                    <button type="submit"
+                        </div>
-                        class="border-2 border-indigo-600 bg-indigo-600 text-white py-2 w-full rounded-md hover:bg-indigo-700 hover:border-indigo-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">Signup</button>
+                        <div class="mt-5 block justify-between items-center">
-                </div>
+                            <label>Already have an account?</label>
-                <div class="mt-6 text-center">
+                            <a href="/login" class="text-indigo-600 font-semibold">Login</a>
-                    <span class="text-sm text-slate-600">Already have an account?</span>
+                        </div>
-                    <a href="/login" class="text-sm text-indigo-600 hover:text-indigo-500 font-semibold ml-1 transition-colors duration-200">Login</a>
+                    </div>
-                </div>
+        </main>
-            </div>
-        </form>
-    </div>
-</main>
 
-<%- include("./partials/footer") %>
+        <%- include("./partials/footer") %>