Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev

This commit is contained in:
knighthawk4227 committed 2025-05-09 11:24:03 -07:00
commit cc875b4e22
3 files changed
+3 -1

No files matched your search

+1
View File
@@ -1442,6 +1442,7 @@
"version": "7.0.3", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.3.tgz", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.3.tgz",
"integrity": "sha512-Ajq6Sz1x7cIK3pN6KesGTah+1gnwMnx5gKl3piQlQQE/PwyJ4Mbc8is2psWYxK3RJTVeqsDaCv8ZzXLCDHMTZw==", "integrity": "sha512-Ajq6Sz1x7cIK3pN6KesGTah+1gnwMnx5gKl3piQlQQE/PwyJ4Mbc8is2psWYxK3RJTVeqsDaCv8ZzXLCDHMTZw==",
"license": "MIT-0",
"engines": { "engines": {
"node": ">=6.0.0" "node": ">=6.0.0"
} }
+2
View File
@@ -7,5 +7,7 @@
</div> </div>
</footer> </footer>
<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
</body> </body>
</html> </html>
-1
View File
@@ -1,5 +1,4 @@
<!-- Get geolocation if not in session and load conversion rates --> <!-- Get geolocation if not in session and load conversion rates -->
<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
<script src="/static/scripts/geolocation.js"></script> <script src="/static/scripts/geolocation.js"></script>
<script> <script>
// If no geoData provided thorugh EJS, send update request to backend // If no geoData provided thorugh EJS, send update request to backend