SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity
57 Commits 40 Branches 5 Tags
4bb9a015243ec0d07d24de2020245a51af550570
Commit Graph
57 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SowinskiBraeden 1d8ec431b2 fix/tidy auth+user routers 2025-05-06 09:32:39 -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
Nícolas Agostini 84cd8b0bae Merge pull request #3 from JoaquinPar/feature/questions 
feature/questionnaire page create + saving to MongoDb
 2025-05-06 02:10:14 -07:00
Nícolas Agostini 5684e96a79 Merge branch 'dev' into feature/questions 2025-05-06 02:10:05 -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 f39b8555fa fix/session check fixed 2025-05-05 18:59:59 -07:00
nicoagostini fef7184404 fix/home.ejs include fix 2025-05-05 18:45:59 -07:00
SowinskiBraeden 6a8595d24b fix/impliment middleware 2025-05-05 18:39:43 -07:00
SowinskiBraeden 7c7098636a fix/middleware authentication + bad merge 2025-05-05 18:34:19 -07:00
Nícolas Agostini a446943d4a Merge pull request #2 from JoaquinPar/feature/questionnaire 
Just a bug fix
 2025-05-05 18:18:55 -07:00
Nícolas Agostini 612bb262d1 Merge branch 'dev' into feature/questionnaire 2025-05-05 18:18:45 -07:00
nicoagostini 6819b82723 Just a bug fix 2025-05-05 18:17:35 -07:00
SowinskiBraeden 5b1b36a553 fix/compare password on sign in 2025-05-05 18:12:19 -07:00
SowinskiBraeden 1114789e57 Merge latest dev into dev 2025-05-05 17:34:24 -07:00
SowinskiBraeden bb6e2eba2c fix/user routing 2025-05-05 17:33:27 -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 8b6ff1354b resolved merge conflict 2025-05-05 14:27:24 -07:00
Joaquin 4bcf8dd812 feature/started work on layout.ejs 2025-05-05 14:21:30 -07:00
SowinskiBraeden fe7152b03b update/create middleware 2025-05-05 14:16:50 -07:00
SowinskiBraeden 87cad63425 update/return status codes 2025-05-05 13:17:30 -07:00
SowinskiBraeden d08fd30888 login/signup function with no sessions 2025-05-02 13:19:14 -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 2a070d95c1 fix/README file folder structure updated 2025-05-02 01:52:05 -07:00
nicoagostini eaecb883e6 update/landing page and aboutUs page created 2025-05-02 01:39:33 -07:00
nicoagostini 2bd4b1e16e README updated with instructions 2025-05-01 19:31:07 -07:00
nicoagostini 7f9e594e9b app.js file moved (fixing previous commit) 2025-05-01 19:25:57 -07:00
nicoagostini 1f9416e0bd .env file created and app.js moved to root folder 2025-05-01 19:24:18 -07:00
Joaquin e4a6c7ef36 merge feature/routing with dev 2025-04-30 17:17:00 -07:00
Joaquin 3ef8129196 update/created routing for pages 2025-04-30 17:15:23 -07:00
SowinskiBraeden c1f3aa126b Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-04-29 16:02:10 -07:00
SowinskiBraeden f3ee6d091e update/create about.html page 2025-04-29 16:00:59 -07:00
mitchell a143dc439b adding readme info 2025-04-29 15:57:56 -07:00
SowinskiBraeden 45746aa922 update/package.json scripts 2025-04-28 13:48:11 -07:00