Skip to content

Bug fixes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjuarez26base merged 3 commits into from
Mar 19, 2026
Merged

Bug fixes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f2a74
Made getting a specific users profile page through search bar easier,…
Mar 19, 2026
919ba2d
Merge branch 'bug-fixes' of
Mar 19, 2026
7af4e37
Merge branch 'main' into bug-fixes
jjuarez26base Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/basecamp/HyprLink/controller/ProfileController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public String getProfileById(@PathVariable Long id, Model model) {
@GetMapping("/profile") public String searchProfile(Principal principal, Model model) {
return processUserInfoByUsername(principal.getName(), principal, model);
}
@GetMapping("/profile/username/{userName}")
@GetMapping("/profile/{userName}")
public String getProfileByUsername(@PathVariable String userName, Principal principal, Model model) {
return processUserInfoByUsername(userName, principal, model);
}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/static/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ body {
.nav-right button {
border: none;
background: none;
padding: 0 0 3px 0;
}
.nav-right button:hover {
color: #3b82f6;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/landing.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ body {
.nav-center button, .nav-right button {
border: none;
background: none;
padding: 0 0 3px 0;
padding: 0;
}
.nav-center button:hover, .nav-right button:hover {
color: #3b82f6;
Expand Down
8 changes: 6 additions & 2 deletions src/main/resources/static/css/nav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,14 @@
align-items: center;
}

.nav-center a, .nav-center button {
.nav-center a {
font-size: 1.2rem;
}

.nav-center button {
font-size: 1rem;
}

.nav button:hover {
color: #3b82f6;
}
Expand Down Expand Up @@ -87,7 +91,7 @@
.nav-center button, .nav-right button {
border: none;
background: none;
padding: 0 0 3px 0;
padding: 0;
}
.nav-center button:hover, .nav-right button:hover {
color: #3b82f6;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/css/templates.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ body {
.nav-center button, .nav-right button {
border: none;
background: none;
padding: 0 0 3px 0;
padding: 0;
}
.nav-center button:hover, .nav-right button:hover {
color: #3b82f6;
Expand Down
6 changes: 1 addition & 5 deletions src/main/resources/templates/templates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
HyperLink
</a>
</div>

<div th:if="!${user}" class="nav-center">
<a th:href="@{/templates}">Templates</a>
</div>
<div th:if="!${user}" class="nav-center"></div>
<div th:if="${user}" class="nav-center">
<a th:href="@{/templates}">Templates</a>
<a th:href="@{/profile}">Profile</a>
Expand Down Expand Up @@ -83,6 +80,5 @@ <h1 style="text-align: center; margin-top: 2rem;">See What You Can Create</h1>
<p>&copy; 2026 HyperLink. All rights reserved.</p>
</footer>

</footer>
</body>
</html>
Loading