Commit Graph
35 Commits
Author SHA1 Message Date
knighthawk4227 cb59e86d8a fixing merge conflicts and forgot password functionality 2025-05-07 17:44:06 -07:00
knighthawk4227 088f9ea55a reset pass logic 2025-05-07 13:03:26 -07:00
SowinskiBraeden cadbc2187d fix/middleware preventing 404 redirect 2025-05-07 13:01:24 -07:00
SowinskiBraeden 700ded35e4 Merge dev@latest into dev 2025-05-07 10:49:37 -07:00
knighthawk4227 617fc8d877 indentation of dashboard 2025-05-07 10:49:08 -07:00
knighthawk4227 f0b1089e15 routes for forgotPass 2025-05-07 00:52:01 -07:00
knighthawk4227 a40b6d514b forgot password js 2025-05-06 23:33:05 -07:00
SowinskiBraeden 47fc1983f8 update/doc comments + create assets collection 2025-05-06 15:52:53 -07:00
nicoagostini d67718733d fix/ Route fixed for index/dashboard 2025-05-06 15:46:57 -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
Nícolas Agostini 03c3f9a610 Merge branch 'dev' into feature/calculations 2025-05-06 14:32: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 6d91934229 fix/ignore login err message on signup 2025-05-06 12:49:20 -07:00
knighthawk4227 47ab6c9eed merging dev with feature dashboard 2025-05-06 10:56:19 -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
nicoagostini f39b8555fa fix/session check fixed 2025-05-05 18:59:59 -07:00
SowinskiBraeden 7c7098636a fix/middleware authentication + bad merge 2025-05-05 18:34:19 -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 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
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
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 0e4d4d7daf fix project structure & static file 2025-05-02 11:41:13 -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
nicoagostini 7f9e594e9b app.js file moved (fixing previous commit) 2025-05-01 19:25:57 -07:00