update #5

Open
mdebray wants to merge 231 commits from update into main
4 changed files with 16 additions and 8 deletions
Showing only changes of commit 7ccb4d59b0 - Show all commits

View file

@ -4,6 +4,7 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import stirling.software.SPDF.model.User; import stirling.software.SPDF.model.User;
@ -13,7 +14,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByUsernameIgnoreCase(String username); Optional<User> findByUsernameIgnoreCase(String username);
@Query("FROM User u LEFT JOIN FETCH u.settings where upper(u.username) = upper(:username)") @Query("FROM User u LEFT JOIN FETCH u.settings where upper(u.username) = upper(:username)")
Optional<User> findByUsernameIgnoreCaseWithSettings(String username); Optional<User> findByUsernameIgnoreCaseWithSettings(@Param("username") String username);
Optional<User> findByUsername(String username); Optional<User> findByUsername(String username);

View file

@ -18,7 +18,17 @@
text-align: center; /* Centers the text inside the div */ text-align: center; /* Centers the text inside the div */
width: 100%; /* Full width to center the text properly */ width: 100%; /* Full width to center the text properly */
} }
.stirling-link {
text-decoration: none; /* Remove the underline */
color: inherit; /* Keep the text color the same as the surrounding text */
cursor: pointer; /* Change the cursor to indicate it's clickable */
font-weight: bold; /* Make it bold to subtly hint that it's clickable */
transition: color 0.3s ease; /* Add a smooth transition effect for color change on hover */
}
.stirling-link:hover {
color: #007BFF; /* Change the color on hover to a noticeable link color */
}
.footer-icon { .footer-icon {
font-size: 2rem; font-size: 2rem;
} }

View file

@ -10,7 +10,8 @@
<!-- powered by section --> <!-- powered by section -->
<div class="footer-powered-by"> <div class="footer-powered-by">
<span th:text="#{poweredBy} + ' Stirling PDF'"></span> <span th:text="#{poweredBy}"></span>
<a href="https://stirlingpdf.com" class="stirling-link">Stirling PDF</a>
</div> </div>
</div> </div>
</footer> </footer>

View file

@ -397,11 +397,6 @@
<a href="https://discord.gg/Cn8pWhQRxZ" class="mx-1" role="button" th:title="#{joinDiscord}"> <a href="https://discord.gg/Cn8pWhQRxZ" class="mx-1" role="button" th:title="#{joinDiscord}">
<img th:src="@{'/images/discord.svg'}" alt="discord"> <img th:src="@{'/images/discord.svg'}" alt="discord">
</a> </a>
<a href="https://github.com/sponsors/Frooodle" class="mx-1" role="button" th:title="#{donate}">
<span class="material-symbols-rounded fill footer-icon" style="font-size: 2.5rem;">
favorite
</span>
</a>
</div> </div>
<a th:href="@{'/swagger-ui/index.html'}" class="btn btn-sm btn-outline-primary mx-1" role="button" <a th:href="@{'/swagger-ui/index.html'}" class="btn btn-sm btn-outline-primary mx-1" role="button"