refactor: simplify Analytics component and update BaseLayout

- Removed props from the Analytics component to streamline its usage. - Updated BaseLayout to call Analytics without passing the title prop, ensuring default values are used.
style: enhance Header component and update SCSS imports
2025-06-10 20:09:34 +00:00 · 2025-06-10 18:36:35 +00:00
6 changed files with 25 additions and 24 deletions
--- a/src/components/Analytics.astro
+++ b/src/components/Analytics.astro
@@ -1,17 +1,2 @@
---
-type Props = {
-	readonly title: string;
-};
-
-const path = Astro.url.pathname;
-const { title } = Astro.props;
---
-
 <!-- AppMetrix -->
 <script is:inline src="https://appmetrix.com/pixel/T5X0z12SoASBV8Dv"></script>
-
-<!-- GoatCounter -->
-<script is:inline data-goatcounter="https://analytics.popov.link/count" src="//gc.zgo.at/count.js"></script>
-<noscript>
-	<img alt="pixel" src={`https://analytics.popov.link/count?p=${encodeURI(path)}&t=${encodeURI(title)}`} />
-</noscript>
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -1,14 +1,27 @@
 <style lang="scss">
-        @use "../scss/variables" as *;
+	@use "../scss/variables" as *;

 	header {
 		padding-bottom: 1rem;
+		position: relative;
+	}
+
+	.site-title {
+		color: $colorText;
+		font-weight: bold;
+		left: 0;
+		position: absolute;
+		text-decoration: none;
+		top: 0;
+	}
+
+	.nav-links {
 		text-align: right;
 	}

 	a {
-		text-decoration: none;
 		margin-right: 1.5rem;
+		text-decoration: none;

 		&:last-child {
 			margin-right: 0;
@@ -17,6 +30,9 @@
 </style>

 <header>
-	<a href="/">Home</a>
-	<a href="/blog/">Blog</a>
+	<a class="site-title" href="/">{import.meta.env.DEFAULT_TITLE}</a>
+	<div class="nav-links">
+		<a href="/">Home</a>
+		<a href="/blog/">Blog</a>
+	</div>
 </header>
--- a/src/components/PostElement.astro
+++ b/src/components/PostElement.astro
@@ -12,7 +12,7 @@ const formattedDate = dayjs(post.data.pubDate.toString()).format("MMMM DD, YYYY"
 ---

 <style lang="scss">
-        @use "../scss/variables" as *;
+	@use "../scss/variables" as *;

 	small {
 		font-size: $fontSizeBase * 0.75;
--- a/src/components/PostSummary.astro
+++ b/src/components/PostSummary.astro
@@ -12,7 +12,7 @@ const formattedDate = dayjs(post.data.pubDate.toString()).format("MMMM DD, YYYY"
 ---

 <style lang="scss">
-        @use "../scss/variables" as *;
+	@use "../scss/variables" as *;

 	a {
 		color: $colorText;
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -14,8 +14,8 @@ const { description, title } = Astro.props;

 <html lang="ru">
 	<Head
-		description={description ?? import.meta.env.DEFAULT_DESCRIPTION}
 		title={title ?? import.meta.env.DEFAULT_TITLE}
+		description={description ?? import.meta.env.DEFAULT_DESCRIPTION}
 	/>

 	<body>
@@ -26,6 +26,6 @@ const { description, title } = Astro.props;

 			<slot />
 		</main>
-		<Analytics title={title ?? import.meta.env.DEFAULT_TITLE} />
+		<Analytics />
 	</body>
 </html>
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -23,7 +23,7 @@ const formattedDate = dayjs(post.data.pubDate.toString()).format("MMMM DD, YYYY"
 ---

 <style lang="scss">
-        @use "../../scss/variables" as *;
+	@use "../../scss/variables" as *;

 	p {
 		opacity: 0.5;