SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity
85 Commits 40 Branches 5 Tags
2ad43139defd3a5f1c311f8281db7c3a1dd23679
Commit Graph
46 Commits
Author SHA1 Message Date
Joaquin 2ad43139de merged dev and added some challenge 1 functionality 2025-05-07 13:06:22 -07:00
Joaquin 8507c4faaf solved merge conflict 2025-05-06 21:29:47 -07:00
Joaquin 17f11c85df feature/improved the getting of rates 2025-05-06 21:26:45 -07:00
nicoagostini 173c0b63c4 Plan detail page finished with mock data 2025-05-06 18:36:25 -07:00
Joaquin a173b8c70c feature/app now receives exchange rates from API 2025-05-06 17:02:37 -07:00
knighthawk4227 e65af5336f Merge branch 'feature/dashboard' into dev 2025-05-06 15:09:16 -07:00
knighthawk4227 7b9b18f030 dashboard page with cards to fill in and add asset and new plan button 2025-05-06 15:08:04 -07:00
Joaquin f3a1a2191a merge feature/geolocation into dev 2025-05-06 14:48:52 -07:00
Joaquin e1626f6ae9 feature/completed getting geolocation data 2025-05-06 14:46:01 -07:00
Nícolas Agostini 03c3f9a610 Merge branch 'dev' into feature/calculations 2025-05-06 14:32:43 -07:00
nicoagostini 9b998078b7 Questionnaire page cleaned up and updated 2025-05-06 14:30:43 -07:00
nicoagostini b944c37c02 Plans page created, listing the plans from the database, new plan page created and saving to database 2025-05-06 14:27:27 -07:00
Joaquin 83be006a83 feature/geolocation implemented 2025-05-06 13:38:00 -07:00
SowinskiBraeden 97a1473e21 fix/require name on register 2025-05-06 12:46:21 -07:00
SowinskiBraeden 3bb9ede515 update/cancel changes 2025-05-06 11:52:53 -07:00
SowinskiBraeden f0d324151d update/error message style 2025-05-06 11:44:26 -07:00
SowinskiBraeden b88333e3b4 refactor/temp remove personal section 2025-05-06 11:41:14 -07:00
SowinskiBraeden 75bc3bee8f update/save modified account settings 2025-05-06 11:39:49 -07:00
SowinskiBraeden 033401dbf7 update/profile page with user data 2025-05-06 11:15:18 -07:00
knighthawk4227 4bb9a01524 deleting projects table 2025-05-06 11:05:37 -07:00
knighthawk4227 47ab6c9eed merging dev with feature dashboard 2025-05-06 10:56:19 -07:00
knighthawk4227 b558a75f20 uncomment partials 2025-05-06 09:46:14 -07:00
Joaquin 4050e95cc3 fixed conflict 2025-05-06 09:30:30 -07:00
Joaquin ae3ddbeaeb Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into dev 2025-05-06 09:30:22 -07:00
nicoagostini 1e32ccfa17 feature/questionnaire page create + saving to MongoDb 2025-05-06 02:07:58 -07:00
knighthawk4227 5abec70c61 login and signup touch ups index page template added 2025-05-06 00:33:36 -07:00
Joaquin 54566f05b7 feature/fully implemented ejs inclusion to main files 2025-05-05 21:56:47 -07:00
Joaquin decdb299b7 Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/layoutPage 2025-05-05 21:17:50 -07:00
Joaquin c8bf2e49ab feature/completed most of ejs implementation into other pages 2025-05-05 21:12:52 -07:00
nicoagostini fef7184404 fix/home.ejs include fix 2025-05-05 18:45:59 -07:00
SowinskiBraeden 7c7098636a fix/middleware authentication + bad merge 2025-05-05 18:34:19 -07:00
nicoagostini 6819b82723 Just a bug fix 2025-05-05 18:17:35 -07:00
Joaquin f6640b23cf feature/some progress made on layouts 2025-05-05 17:07:51 -07:00
nicoagostini d0aa7a0fbd Landing moved to be the index page, routes added and landing page image route fixed 2025-05-05 16:46:16 -07:00
Joaquin 4be7ca3a8e Merge branch 'dev' into feature/layoutPage 2025-05-05 16:30:51 -07:00
Joaquin 10541d2428 merge feature/navBar with dev 2025-05-05 16:26:01 -07:00
Joaquin 7fa75457c9 feature/completed navbar/header functionality 2025-05-05 16:24:25 -07:00
Joaquin 4bcf8dd812 feature/started work on layout.ejs 2025-05-05 14:21:30 -07:00
SowinskiBraeden 7ef6282ac0 update login/signup.ejs pages 2025-05-02 13:18:51 -07:00
Joaquin Paredes 02a8374a58 feature/most nav bar functionality done 2025-05-02 13:15:38 -07:00
SowinskiBraeden 0e4d4d7daf fix project structure & static file 2025-05-02 11:41:13 -07:00
knighthawk4227 50dab82945 making login ejs and setting index blank for now 2025-05-02 02:07:55 -07:00
nicoagostini 8832768838 Merge branch 'feature/landingPage' into dev 2025-05-02 02:01:06 -07:00
knighthawk4227 44cee349e9 ejs login and signup with tailwind 2025-05-02 01:53:47 -07:00
nicoagostini eaecb883e6 update/landing page and aboutUs page created 2025-05-02 01:39:33 -07:00
Joaquin 3ef8129196 update/created routing for pages 2025-04-30 17:15:23 -07:00