Merge version_3 into main #2

Merged
development merged 7 commits from version_3 into main 2026-01-29 13:44:17 +00:00
7 changed files with 20 additions and 19 deletions

View File

@@ -138,4 +138,4 @@ export default function AboutPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -54,7 +54,8 @@ export default function BlogPage() {
const url = `${apiUrl}/posts/${projectId}?status=published`; const url = `${apiUrl}/posts/${projectId}?status=published`;
const response = await fetch(url, { const response = await fetch(url, {
method: "GET", headers: { method: "GET", headers: {
"Content-Type": "application/json"}, "Content-Type": "application/json"
},
}); });
if (response.ok) { if (response.ok) {
@@ -160,4 +161,4 @@ export default function BlogPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -137,4 +137,4 @@ export default function ContactPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5faff;; /* --background: #fbfaff;;
--card: #f1f8ff;; --card: #f7f5ff;;
--foreground: #001122;; --foreground: #0f0022;;
--primary-cta: #15479c;; --primary-cta: #8b5cf6;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #a8cce8;; --accent: #d8cef5;;
--background-accent: #7ba3cf;; */ --background-accent: #c4a8f9;; */
--background: #f5faff;; --background: #fbfaff;;
--card: #f1f8ff;; --card: #f7f5ff;;
--foreground: #001122;; --foreground: #0f0022;;
--primary-cta: #15479c;; --primary-cta: #8b5cf6;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #a8cce8;; --accent: #d8cef5;;
--background-accent: #7ba3cf;; --background-accent: #c4a8f9;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

@@ -1251,4 +1251,4 @@ export default function RootLayout({
</body> </body>
</html> </html>
); );
} }

View File

@@ -230,4 +230,4 @@ export default function HomePage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -144,4 +144,4 @@ export default function RoomsPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }