Commit Graph
29 Commits
Author SHA1 Message Date
Joaquin 22850ab2a2 fix/removed redundant code and fixed UI challenge 1 problem 2025-05-09 10:55:02 -07:00
Joaquin Paredes 32437a6e36 fix/fixed rendering pages 2025-05-08 10:38:32 -07:00
Joaquin cec777d1bf fix/fixed problem when routing to dashboard 2025-05-07 17:11:58 -07:00
Joaquin 605c7b3734 solved merge conflict 2025-05-07 17:02:09 -07:00
Joaquin 1b6c80f84d feature/fully implemented challenge 1 2025-05-07 16:56:26 -07:00
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
Joaquin 93a5c45dd9 Merge branch 'feature/challenge1' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/challenge1 2025-05-06 18:15:51 -07:00
Joaquin 1652d05fcd feature/push to pull 2025-05-06 18:15:32 -07:00
Joaquin Paredes 5bbfde3127 feature/improved data gathering from API 2025-05-06 18:13:31 -07:00
Joaquin a173b8c70c feature/app now receives exchange rates from API 2025-05-06 17:02:37 -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
Joaquin 83be006a83 feature/geolocation implemented 2025-05-06 13:38:00 -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
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
Joaquin f6640b23cf feature/some progress made on layouts 2025-05-05 17:07:51 -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
Joaquin Paredes 02a8374a58 feature/most nav bar functionality done 2025-05-02 13:15:38 -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