Merging branch main with branch bug-fixes.#16
Merged
jjuarez26base merged 40 commits intobug-fixesfrom Mar 19, 2026
Merged
Conversation
Connected landing page to user auth pages
Based on current project status., subject to change.
Created README.md
Added profile picture url edit section in dashboard, and a cancel edit button.
Setting up for DB deployment. Using environment variables for database credentials.
Created dockerfile for deployment. Creates the correct envioment for the project to run in on after deployment.
updated readme file with info about deployment.
Created dockerfile Updated application.properties with env vars DB hosted with neon.tech Application hosted on render.com
Took logic out of the controllers and put it into service layer files for easier testing and better project architecture.
17 Test cases for UserRepository.java. Test documentation file also added in the same test package.
Created 3 files for AuthService, DashboardService, and ProfileService. Also added a test documentation md file.
# Conflicts: # src/main/java/com/basecamp/HyprLink/security/SecurityConfig.java # src/main/resources/application.properties # src/main/resources/static/auth.css # src/main/resources/static/landing.css # src/main/resources/templates/dashboard.html
Moved all stylesheets into a subdirectiory in the static folder. CSS wouldn't call unless signed in on the site due to security features.
Created tests for all controller layer files. Also added a documentation file.
Tests cases for security and documentation for test cases
styling for login & register page, added logo for landing
Remade the dashboard controller for the new dashboard rework.
Merge from test branch added: - Service Tests - Controller Tests - Security Tests - Repository Tests Documentation for each can be found in the respective test packages as TEST_DOCUMENTATION.md
Updated readme to reflect the current project status.
Updated readme to reflect the current project status.
…ll CSS files. Added registration checkers, and error messages to register.html. In SecurityConfig.java, allowed all register/ links to be accessible without logging in. In ProfileService, added a function so users can now be searched by username. Had to rename profileController function getProfile to getProfileById, and refactored test cases that used it. Made navbar links in profile adaptable base on if a user is logged in, and if it's their profile page or not. Added LandingPageController.java in order to send model attribute user to index.html, and added a couple more changes.
…ers to view temps without being logged in, mobile responsivness for login and register, fixed minor styling for navbar, fixed reigster & login buttons / logout link
…n and register pages. Signing in now redirects to profile page.
added templates template and styling, configured security to allow us…
…mp, other minor styling that I can't remember
…on, & other things I forgot again
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
4 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.
Updating bug-fixes with changes from main.