Merge main into dev#114
Merged
TebelR merged 5 commits intodevelopmentfrom Apr 6, 2026
Merged
Conversation
* Meeting minutes: added minutes from 2 Feb * Client setup: initialized client skeleton from template with vite * API Gatewat Service: initialized with test api endpoint * Auth Service: initialized service with test api endpoint * User Service: initialized with test api endpoint * Python Services: added the analytics and market services with their initial test api enpoints * API Gateway: fixed test endpoint to also run correctly on docker * API Gateway: added cors to allow Vite's default dev port to access port 3000 (the one that the api service is running on) * Client: setup routing to pages * Client: initialized shadcn ui with tailwindcss * Updated folder structure on client side * Added some draft files to client side * removes -s from service names. Changed the docker compose file a bit to handle ports more dynamically. /api/test -> /health * add database to docker compose * db running w/ sample schema * removed user auth folder * whoops. here's the schema * Client: Added layout, dashboard and header component for setup * finished schema * updated schema * hopefuly final change to special investment type strategy * Client: Created header for dashboard * Defined models for profiles, accounts, and transactions. * Moved model files into a src folder * created Api routes for the db (accounts, transactions, profiles and index) * Created connection.ts. Altered the models to extend "RowDataPacket" * Client: Introduced the first chart * Client: Added cards on dashboard page * Client: Refactored account card to a component * Client: Added second chart on dashboard page * Fixed user auth login and signup to work with microservices * Updated frontend to work with multiple tables in db * Client: Introduced transaction table and animation for cards * reworked project structure to use package & eslint inheritance + commons folder where ts services can share code * fixed/cleaned up git ignore & removed extra READMEs * removed bun.locb * added readme * moved db folder to services * factored out some common methods * factored out some common methods * Client: Polished transaction table and added method to fetch transactions * created bun init files for user input models * Moved index.ts out of routes to be under src * Added Api routes for user input models in api gateways * Server: cleaned up post merge moving dev into visualization, health test works now * DB: expanded account types in schema * Created the popup forms components for account and transactions. * added prettier to format code * formatted server code * git hooks to format pre-commit * removed unused file * formatting AND eslint runs before commit AND removed auth b/c deep is working on it in another branch * pretty client * changed name of hooks folder * Updated User Authentication service to work with updated changes * compose images prepping CI pipeline * moved compose db related env vars to defaults * passing db password via env variable instead of secret * Uploaded forms for csv parsing * Added drop boxes for Account and transition forms * Client: added synthetic data and API skeleton for chart components * initi papaparse for csv reading * Correction on init for papaparse lib * created an utility parser for csv files using papaparse * Utility files for Normalization and validation on csv entry * Implemented a convert row -> transaction draft and updated ParseCsv to use new file instead * Implemented a preview table and updated the upload folder to maintain state * Visualization: enabled synthetic data for API for expenses chart * Updated files to import types * Added confirmation to the csv upload. Also updated Csv Upload to implement this behavior * Implemented transaction backend route for batch csv data upload * Visualization: added savings and income charts with synthetic data * Visualization: updated button component to use default react code * Styled the form components and constricted user input in forms. * re-arranged ts service dockerfiles to better utilize layer caching * added support for .env files in ts services * using http proxy in gateway + env file support * Visualization backend: enabled API endpoints with dummy data * Client: Refactored dashboard chart section and table * Created functions to validate the form data and functions to get/post data to/from the server. * Split login and sign up page into separate files, and reorganized client side files * Finished the api functions for accounts and transactions. * env file update * added publish backend workflow * github workflow checkout: @v4 -> commit SHA * fix CI issues * removed unused password files. Everything is in .env * DB: added a python populator script * Client: rework of the dashboard page to work with updated auth feature * Client: Keep refactoring * Merge: cleaned up post-merge of dev into visualization, populator works at this point * Merge: integreated auth feature to work with the database * Visualization: fixed sankey chart render * Cleanup: got rid of old debugging code * removed empty directories + small ts cleanup * small ts error cleanup * eslint errors, dockerized frontend w/nginx webserver. Increases cachyness of backend dockerfiles & compose * Docker cache improvements to client * hope this uses containerd backend * removed bun.lockb from gitignore. turns out it is good to track them... * now pushing client. will deduplicate maybe * added components and api communications for a income form. * Fixed the url for the fetches and added delete request for income * Fixed api requests * auth tests + prettier * dockerfile changes * Created components to create a list of accounts cards * got auth tests running in dockerfile * Create components to create a list of transactions cards. Transaction form now takes a date of the transaction. * Created components to create a list of user's income with cards. * Cleaned up code, put the object types into their own file. * implemented a csv Success model and updated all relevant forms to reflect this * Temp removed (csv upload from accounts) * refactor workflow image publishing * fixed issue where would check every file if none changed * Added workflow to run tests. Runs on every pull request and pushes to main, dev and release branches * Fixed 404 error, move some of the file around so that user service is handling /accounts, /transactions, and /profiles requests instead of database * update README.md * commit hook bugfix * Added new meeting minutes * Cleaned up code and moved around files so that they'll be ready for the merge into dev branch. * updated README.md * Fixed bug when composing docker for client * improve pre-commit hook script * 100% auth backend coverage! * used prettier to format everything * sequence diagram for auth * get rid of repo layer caching from fontend docker compose * fix cors issue when running frontent via bun * add jwt token to the requests and adjusted user-input files. * Set up to handle user service to handle account requests * Fixed typo for transaction * Sequence Diagram for user input * slight corrections to account router * Refactor api-gateway * Refactored auth frontend to use shadcn ui * Updated app.css * updated to have category field * Added handling of the jwt token but currently is bugged * Test inititialization , started working on tests * fixed unknown type in transaction route * Adjusted types, create types to be used for sql querries and added file ot handle JWT tokens * fat merge of visualization into development * removing parse csv test * post-merge cleanup * Fixed typo in transaction route * Added jwt handling in accounts get request * stabilization for missing data * deleted tests, not valid * post-merge fixes to client * Unit test for normalize rows in csv upload * Fixed small issue with Normalize row * fixed the unit test for normalized row * refactor of user microservice for testing * created unit test for convert transaction * updated the transactions to fit the backend more * Added user flow diagram for dashboard * Unit tests for (validateFile, validate row and parseCsv file(still updating) ) * Finished the rest of the accounts request. * implementation of user logic tests - queries avoided * renaming some files for consistency * got rid of fake timers in user-service tests * Updated current unit tests and added unit tests for validate row and handle input * Fixed accounts get request * refactor of analytics service for testing * Fix the visual of editing an account in account list * Fixed where type was being set when editing an account * Transaction form set it's fields to the edited transaction if we're editing it. * implemented routing for csv and updated delete in the front end for transactions * unit tests for analytics service - visualization dashboard * docker tweaks for tests * uploading unfinished test plan * Minor Fix to where minimum age to sign up for Finus is 16 instead of 1 * Making fixes to transactions components * cleanup and populator rework * fixed parsing logic for csv parsing * Tranasction request handling is fixed * Updated csv route for transactions * updated csv transaction route * sample csv file used for testing * Fixed import for auth session * Fixed a test to allign with new normalizeRow * Updated and Complete Test Plan for Sprint 2 * Fixed minor markdown syntax in test plan * One more minor markdown syntax fix in test plan --------- Co-authored-by: Roman Tebel <tebelroman@gmail.com> Co-authored-by: Huy Truong <hoang.truonghuy2004@gmail.com> Co-authored-by: Logan <logand007@outlook.com> Co-authored-by: Dylan Prabagaran <prabagad@myumanitoba.ca> Co-authored-by: Jackie Mei <meij1@myumanitoba.ca>
|
TebelR
approved these changes
Apr 6, 2026
Collaborator
TebelR
left a comment
TebelR
left a comment
There was a problem hiding this comment.
Added a few files that were deleted as they are no longer used in the client components, but its ok if this resolves conflicts - can clean up the little mess later
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.