Commit Graph

Select branches

Hide Pull Requests

dev

feature/404

feature/about_us_page

feature/ai-challenge2

feature/asset-select-icon

feature/asset_sort

feature/calculations

feature/challenge1

feature/challenge1_error_message

feature/dashboard

feature/dashboardInfo

feature/delete_account

feature/forgotPass

feature/geolocation

feature/landingPage

feature/layoutPage

feature/login-signup

feature/months-left

feature/morePage

feature/navBar

feature/planDetail

feature/progressBar

feature/questions

feature/routing

feature/vehicle-depreciation

fix/16-hovering-hides-progress

fix/account_details_update

fix/calculation-depreciation

fix/login

fix/password_length

fix/planDetail-padding

fix/questionnaireFix

fix/session_issues

main

readme

refactor/ai-challenge2

refactor/assets

refactor/assets_page

refactor/plans

update/password_security

Challege_1_deliverable

Challenge_2_deliverable

Sprint_0_Deliverable

Sprint_2_deliverable

Sprint_4_deliverable

Mono Color

• 61db8e162f Merge dev into refactor/assets SowinskiBraeden 2025-05-14 14:46:34 -07:00
• 1c5031f48c split assets into partials SowinskiBraeden 2025-05-14 14:43:34 -07:00
• b040f12eaf split assets into partials SowinskiBraeden 2025-05-14 14:43:17 -07:00
• 4a02b75a4d fix/Footer scripts moved to a dedicated file nicoagostini 2025-05-14 12:53:58 -07:00
• f7377f6844 feature/most functionality created Joaquin 2025-05-14 12:42:50 -07:00
• 34c6dd2c66 Merge pull request #28 from JoaquinPar/fix/account_details_update SowinskiBraeden 2025-05-14 12:16:34 -07:00
• 1f3109a68f Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into fix/account_details_update fix/account_details_update SowinskiBraeden 2025-05-14 12:13:04 -07:00
• 9ae23ce25e fix account details not updating + update personal info SowinskiBraeden 2025-05-14 12:12:48 -07:00
• c41f38ce6b Merge pull request #27 from JoaquinPar/feature/ai-challenge2 Challenge_2_deliverable Nícolas Agostini 2025-05-14 11:24:40 -07:00
• 5771f1372f Merge branch 'dev' into feature/ai-challenge2 feature/ai-challenge2 Nícolas Agostini 2025-05-14 11:24:31 -07:00
• 73d61d76de feature/AI feature updated to accept user input nicoagostini 2025-05-14 11:22:28 -07:00
• 50e2d95fda feature/AI feature updated to accept user input nicoagostini 2025-05-14 11:21:10 -07:00
• 370d5d3292 merge dev into feature/challenge1_error_message feature/challenge1_error_message Joaquin 2025-05-14 09:41:39 -07:00
• c12bbe8336 removed debugging code Joaquin 2025-05-14 09:40:06 -07:00
• 0d59c60a28 merge dev into feature/challenge1_error_message Joaquin 2025-05-14 09:39:12 -07:00
• 5e2ac94212 fully implemented error handling for challenge 1 Joaquin 2025-05-14 09:37:09 -07:00
• f5bc2de24a Merge pull request #26 from JoaquinPar/fix/session_issues SowinskiBraeden 2025-05-14 09:36:38 -07:00
• 3771288123 fix/login+signup+logout session bugs fix/session_issues SowinskiBraeden 2025-05-14 09:34:32 -07:00
• ccae6a51ff Merge pull request #25 from JoaquinPar/feature/ai-challenge2 Nícolas Agostini 2025-05-13 14:19:17 -07:00
• 206b31e785 feature/ Surprise challenge #2 - AI pun button added and basic suggestion integrated in the plans nicoagostini 2025-05-13 14:18:21 -07:00
• 8166245ab1 feature/basic functionality added Joaquin 2025-05-13 13:17:18 -07:00
• 2c6ea615c6 update/require 8 character password fix/password_length SowinskiBraeden 2025-05-11 18:17:48 -07:00
• 79f0caa3c1 Merge pull request #23 from JoaquinPar/dev Sprint_2_deliverable Joaquin Paredes 2025-05-10 16:35:08 -07:00
• 4f73959cfb Merge pull request #22 from JoaquinPar/fix/16-hovering-hides-progress Nícolas Agostini 2025-05-09 15:54:45 -07:00
• 6444d7afa7 Progress bar background changed to black to avoid disappearing fix/16-hovering-hides-progress nicoagostini 2025-05-09 15:53:40 -07:00
• daa984a48f Merge pull request #21 from JoaquinPar/fix/questionnaireFix Nícolas Agostini 2025-05-09 14:04:31 -07:00
• 383bd15263 Issue 19: Questionnaire more than once, fixed fix/questionnaireFix nicoagostini 2025-05-09 14:03:35 -07:00
• 1e44e8ddfb moving resetLink post to forgotpass.js knighthawk4227 2025-05-09 11:25:36 -07:00
• cc875b4e22 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev knighthawk4227 2025-05-09 11:24:03 -07:00
• f3dbbebb43 moving resetLink post to forgotpass.js feature/forgotPass knighthawk4227 2025-05-09 11:18:25 -07:00
• 4ee885ac57 fix/reorganized scripts called in ejs files Challege_1_deliverable Joaquin 2025-05-09 11:06:13 -07:00
• f3b121fc71 Merge branch 'feature/forgotPass' into dev knighthawk4227 2025-05-09 11:03:02 -07:00
• 07824e6355 merge cnflicts with dev knighthawk4227 2025-05-09 11:02:31 -07:00
• 22850ab2a2 fix/removed redundant code and fixed UI challenge 1 problem Joaquin 2025-05-09 10:55:02 -07:00
• 69fd776c0f fix/enhanced user input validation SowinskiBraeden 2025-05-09 10:29:20 -07:00
• 671b67be9d Merge branch 'dev' into feature/forgotPass knighthawk4227 2025-05-09 10:27:33 -07:00
• 99b36d3370 fixing conflict with dashboard.ejs knighthawk4227 2025-05-09 10:26:18 -07:00
• 1f742d41c3 fix/signup using existing email SowinskiBraeden 2025-05-09 10:23:34 -07:00
• 18bee21941 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev SowinskiBraeden 2025-05-09 10:07:16 -07:00
• 1fcd12c6da fixing merge conflicts knighthawk4227 2025-05-09 10:04:24 -07:00
• 0a9c176274 fix/default asset icon creation SowinskiBraeden 2025-05-09 10:00:51 -07:00
• 1587f363f7 fixing reset link session knighthawk4227 2025-05-09 09:50:38 -07:00
• 540e191d27 refactor/remove debug statements SowinskiBraeden 2025-05-09 09:49:14 -07:00
• 1e01e022bf Merge pull request #14 from JoaquinPar/feature/asset-select-icon SowinskiBraeden 2025-05-08 23:32:40 -07:00
• 73a510252b update+fix/asset icons + load geolocation scripts feature/asset-select-icon SowinskiBraeden 2025-05-08 23:30:13 -07:00
• 42ea4ed8bc fix/issue #13 SowinskiBraeden 2025-05-08 21:39:07 -07:00
• 1ddb6a9900 Merge pull request #12 from JoaquinPar/feature/progressBar Nícolas Agostini 2025-05-08 20:10:37 -07:00
• 9c0c560441 Progress bar calculations added, displaying and updating the database feature/progressBar nicoagostini 2025-05-08 20:09:22 -07:00
• 5763f03288 fix/geolocation api key SowinskiBraeden 2025-05-08 18:14:22 -07:00
• ed06b8731d fix/404 not found handling SowinskiBraeden 2025-05-08 18:13:06 -07:00
• 345cbd2bf2 fix/database not awaited SowinskiBraeden 2025-05-08 18:09:22 -07:00
• c4a90ceb15 fix/.env example + delete .vscode folder SowinskiBraeden 2025-05-08 11:14:22 -07:00
• ac66323a78 fix/remove deprecated page SowinskiBraeden 2025-05-08 11:02:10 -07:00
• c64da1de46 fixing conflicts and merging dev knighthawk4227 2025-05-08 10:44:38 -07:00
• 7a5d2e7490 fixing conflicts merging dev into this knighthawk4227 2025-05-08 10:40:31 -07:00
• 32437a6e36 fix/fixed rendering pages Joaquin Paredes 2025-05-08 10:38:32 -07:00
• fc39bcf693 nodemailer dependencies knighthawk4227 2025-05-08 10:32:10 -07:00
• 29d682c4e8 fixing joi validation knighthawk4227 2025-05-07 19:26:00 -07:00
• 15dd4e0d20 forgot password validatation using joi knighthawk4227 2025-05-07 19:09:25 -07:00
• cb59e86d8a fixing merge conflicts and forgot password functionality knighthawk4227 2025-05-07 17:44:06 -07:00
• cec777d1bf fix/fixed problem when routing to dashboard Joaquin 2025-05-07 17:11:58 -07:00
• 605c7b3734 solved merge conflict Joaquin 2025-05-07 17:02:09 -07:00
• 1b6c80f84d feature/fully implemented challenge 1 feature/challenge1 Joaquin 2025-05-07 16:56:26 -07:00
• ddf07eee11 fix/middleware+404 handling block plans SowinskiBraeden 2025-05-07 16:24:09 -07:00
• 640ae859e5 Merge pull request #10 from JoaquinPar/feature/delete_account SowinskiBraeden 2025-05-07 15:45:38 -07:00
• 54024bd7a2 fix/delete assets + plans on account delete feature/delete_account SowinskiBraeden 2025-05-07 15:33:07 -07:00
• 6910de3789 refactor/move asset creation to partial refactor/assets_page SowinskiBraeden 2025-05-07 15:12:50 -07:00
• 821843088d update/delete user account SowinskiBraeden 2025-05-07 15:04:11 -07:00
• 2ad43139de merged dev and added some challenge 1 functionality Joaquin 2025-05-07 13:06:22 -07:00
• 04a7fa428c Merge pull request #8 from JoaquinPar/feature/404 SowinskiBraeden 2025-05-07 13:04:54 -07:00
• 088f9ea55a reset pass logic knighthawk4227 2025-05-07 13:03:26 -07:00
• cadbc2187d fix/middleware preventing 404 redirect feature/404 SowinskiBraeden 2025-05-07 13:01:24 -07:00
• f417ac00fb fix/ Plans creation/display bug fixed nicoagostini 2025-05-07 11:37:33 -07:00
• b2e795427d fix/remove duplicated code SowinskiBraeden 2025-05-07 10:53:28 -07:00
• 7ff74b8bbd fix/remove deprecated file SowinskiBraeden 2025-05-07 10:51:54 -07:00
• 700ded35e4 Merge dev@latest into dev SowinskiBraeden 2025-05-07 10:49:37 -07:00
• 617fc8d877 indentation of dashboard knighthawk4227 2025-05-07 10:49:08 -07:00
• dbffe122a2 fix/reset forms on modal close SowinskiBraeden 2025-05-07 10:43:05 -07:00
• d85a4120e2 fix/no assets message SowinskiBraeden 2025-05-07 10:36:46 -07:00
• 3ad4e20588 update/render error messages SowinskiBraeden 2025-05-07 10:35:09 -07:00
• aedfc17c36 update/render error messages SowinskiBraeden 2025-05-07 10:34:06 -07:00
• 4c6945ecbc update/modify + delete assets SowinskiBraeden 2025-05-07 10:33:02 -07:00
• f0b1089e15 routes for forgotPass knighthawk4227 2025-05-07 00:52:01 -07:00
• a40b6d514b forgot password js knighthawk4227 2025-05-06 23:33:05 -07:00
• 8507c4faaf solved merge conflict Joaquin 2025-05-06 21:29:47 -07:00
• 17f11c85df feature/improved the getting of rates Joaquin 2025-05-06 21:26:45 -07:00
• 0658a8a85c Merge pull request #6 Nícolas Agostini 2025-05-06 18:42:34 -07:00
• 173c0b63c4 Plan detail page finished with mock data feature/planDetail nicoagostini 2025-05-06 18:36:25 -07:00
• 93a5c45dd9 Merge branch 'feature/challenge1' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/challenge1 Joaquin 2025-05-06 18:15:51 -07:00
• 1652d05fcd feature/push to pull Joaquin 2025-05-06 18:15:32 -07:00
• 5bbfde3127 feature/improved data gathering from API Joaquin Paredes 2025-05-06 18:13:31 -07:00
• a173b8c70c feature/app now receives exchange rates from API Joaquin 2025-05-06 17:02:37 -07:00
• 78946bb6ca update/save asset to database SowinskiBraeden 2025-05-06 16:59:49 -07:00
• 1f8579a052 update/save user from middleware to session SowinskiBraeden 2025-05-06 16:59:33 -07:00
• 47fc1983f8 update/doc comments + create assets collection SowinskiBraeden 2025-05-06 15:52:53 -07:00
• d67718733d fix/ Route fixed for index/dashboard nicoagostini 2025-05-06 15:46:57 -07:00
• 803330b174 update/assets page and creation forms SowinskiBraeden 2025-05-06 15:46:09 -07:00
• e65af5336f Merge branch 'feature/dashboard' into dev knighthawk4227 2025-05-06 15:09:16 -07:00
• 7b9b18f030 dashboard page with cards to fill in and add asset and new plan button feature/dashboard knighthawk4227 2025-05-06 15:08:04 -07:00
• f3a1a2191a merge feature/geolocation into dev Joaquin 2025-05-06 14:48:52 -07:00