Skip to content

Commit 30f04e0

Browse files
committed
better hikari config
1 parent 13a065a commit 30f04e0

File tree

6 files changed

+136
-5
lines changed

6 files changed

+136
-5
lines changed

backend/src/main/resources/application.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,12 @@ spring.jpa.show-sql=true
1111
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
1212
spring.datasource.driver-class-name=org.postgresql.Driver
1313

14+
spring.datasource.hikari.validation-timeout=3000
15+
spring.datasource.hikari.connection-test-query=SELECT 1
16+
spring.datasource.hikari.test-on-borrow=true
17+
spring.datasource.hikari.minimum-idle=1
18+
spring.datasource.hikari.maximum-pool-size=10
19+
20+
spring.datasource.hikari.statementCacheSize=0
21+
1422
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration

frontend/package-lock.json

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
"name": "meta-clock",
33
"version": "0.1.0",
4+
"homepage": "https://zabrafax.github.io/spring-react-meta-clock",
45
"private": true,
56
"dependencies": {
67
"@testing-library/dom": "^10.4.0",
78
"@testing-library/jest-dom": "^6.6.3",
89
"@testing-library/react": "^16.3.0",
910
"@testing-library/user-event": "^13.5.0",
11+
"gh-pages": "^6.3.0",
1012
"http-proxy-middleware": "^3.0.5",
1113
"react": "^19.1.0",
1214
"react-color": "^2.19.3",

frontend/src/components/clock/ClockGrid.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function ClockGrid(props) {
2929
if(isTablet) {
3030
setGridSize(2)
3131
} else {
32-
if(isSecondsEnabled) {
32+
if(isSecondsEnabled && isSeparatorsEnabled) {
3333
setGridSize(1);
3434
} else {
3535
setGridSize(0);
@@ -38,7 +38,7 @@ function ClockGrid(props) {
3838

3939
console.log(gridSize);
4040
// eslint-disable-next-line react-hooks/exhaustive-deps
41-
}, [isSecondsEnabled, isMobile, isTablet]);
41+
}, [isSecondsEnabled, isSeparatorsEnabled, isMobile, isTablet]);
4242

4343
useEffect(() => {
4444
if (!currentTimeZoneId) {

frontend/src/components/contexts/ThemeContext.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const ThemeContext = createContext();
77
export function ThemeProvider({ children }) {
88
const { saveColorTheme, isLoggedIn, userColorTheme } = useUserContext();
99

10-
const [allFirstThemeColors, setAllFirstThemeColors] = useState(["#1d2d65", "#eaeaea", "#8a89a6", "#4e9762", "#1d2d65"]);
11-
const [allSecondThemeColors, setAllSecondThemeColors] = useState(["#162652", "#d2d2d2", "#7f7e98", "#478556", "#162652"]);
12-
const [allAccentThemeColors, setAllAccentThemeColors] = useState(["#dcdcdc", "#000000", "#ffffff", "#ffffff", "#dcdcdc"]);
10+
const [allFirstThemeColors, setAllFirstThemeColors] = useState(["#1d2d65", "#eaeaea", "#8a89a6", "#1f1f1f", "#1d2d65"]);
11+
const [allSecondThemeColors, setAllSecondThemeColors] = useState(["#162652", "#d2d2d2", "#7f7e98", "#111111", "#162652"]);
12+
const [allAccentThemeColors, setAllAccentThemeColors] = useState(["#dcdcdc", "#000000", "#ffffff", "#d9d9d9", "#dcdcdc"]);
1313
const [allArrowShadows, setAllArrowShadows] = useState([true, false, true, true, true]);
1414
const [allTextThemeColors, setAllTextThemeColors] = useState(["#ffffff", "#000000", "#000000", "#ffffff", "#ffffff"]);
1515
// eslint-disable-next-line no-unused-vars

frontend/src/components/contexts/UserContext.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export function UserProvider({ children }) {
7878
const apiResponse = await response.json();
7979

8080
if (apiResponse.success) {
81+
console.log("Theme saved");
8182
return {success: true};
8283
} else {
8384
console.log("Error saving colorTheme");

0 commit comments

Comments
 (0)