bubble/yarkov.tech
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/yarkov.tech.git synced 2026-10-11 18:39:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: added canonical urls

Browse Source
This commit is contained in:
Sergey Yarkov 2022-08-19 15:52:57 +03:00
parent eaac35a0c3
commit dafd68fcd2
13 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -15,7 +15,7 @@
"start": "astro dev", "start": "astro dev",
"build": "astro build", "build": "astro build",
"preview": "astro preview --host", "preview": "astro preview --host",
"format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,astro}\"",
"lint": "eslint '**/*.{js,mjs,ts,tsx}'" "lint": "eslint '**/*.{js,mjs,ts,tsx}'"
}, },
"devDependencies": { "devDependencies": {

2
src/components/ArticlePost/ArticlePost.astro
View File

@ -39,7 +39,7 @@ const { title, coverImage, tags, author, published_at } = data;
coverImage && ( coverImage && (
<div> <div>
<figure> <figure>
{coverImage && <img src={coverImage} width='700' height='400' alt={title} />} {coverImage && <img src={coverImage} width="700" height="400" alt={title} />}
{/* Render remote or local image */} {/* Render remote or local image */}
{/* utils.isURL(coverImage) ? ( {/* utils.isURL(coverImage) ? (
<Image itemprop="image" src={coverImage} width={700} height={400} aspectRatio={"16:9"} format={"webp"} alt={data.title} /> <Image itemprop="image" src={coverImage} width={700} height={400} aspectRatio={"16:9"} format={"webp"} alt={data.title} />

9
src/components/BaseHead.astro
View File

@ -5,10 +5,11 @@ import { useTranslation } from "@i18n/utils";
export interface Props { export interface Props {
title?: string | undefined; title?: string | undefined;
description?: string | undefined; description?: string | undefined;
canonicalUrl?: string | undefined;
} }
const t = useTranslation(Astro); const t = useTranslation(Astro);
const { title = SITE_METADATA.title, description } = Astro.props as Props; const { title = SITE_METADATA.title, description, canonicalUrl } = Astro.props as Props;
--- ---
<head> <head>
@ -16,9 +17,11 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props;
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link <link
href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,400;0,500;0,600;0,700;1,400&family=IBM+Plex+Mono&display=swap" href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,400;0,500;0,600;0,700;1,400&family=IBM+Plex+Mono&display=swap"
rel="preload" as="style" onload="this.rel='stylesheet'" rel="preload"
as="style"
onload="this.rel='stylesheet'"
/> />
{canonicalUrl && <link rel="canonical" href={canonicalUrl} />}
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>{title}</title> <title>{title}</title>

20
src/components/ContactsList/ContactsList.astro
View File

@ -1,24 +1,24 @@
--- ---
import { SITE_METADATA } from '@root/config'; import { SITE_METADATA } from "@root/config";
import { Icon } from 'astro-icon'; import { Icon } from "astro-icon";
import './ContactsList.scss'; import "./ContactsList.scss";
const { const {
contacts: { email, githubUrl, telegramUrl }, contacts: { email, githubUrl, telegramUrl },
} = SITE_METADATA; } = SITE_METADATA;
--- ---
<div class='contacts-list'> <div class="contacts-list">
<a href={'mailto:' + email} <a href={"mailto:" + email}
>Email >Email
<Icon name='arrow-up-right' width='15' height='15' data-filter='none' /> <Icon name="arrow-up-right" width="15" height="15" data-filter="none" />
</a> </a>
<a href={githubUrl} target='_blank' <a href={githubUrl} target="_blank"
>Github >Github
<Icon name='arrow-up-right' width='15' height='15' data-filter='none' /> <Icon name="arrow-up-right" width="15" height="15" data-filter="none" />
</a> </a>
<a href={telegramUrl} target='_blank' <a href={telegramUrl} target="_blank"
>Telegram >Telegram
<Icon name='arrow-up-right' width='15' height='15' data-filter='none' /> <Icon name="arrow-up-right" width="15" height="15" data-filter="none" />
</a> </a>
</div> </div>

24
src/components/Footer/Footer.astro
View File

@ -1,24 +1,24 @@
--- ---
import './Footer.scss'; import "./Footer.scss";
import { Icon } from 'astro-icon' import { Icon } from "astro-icon";
--- ---
<footer class='footer'> <footer class="footer">
<div class='container'> <div class="container">
<ul class='footer__links'> <ul class="footer__links">
<li> <li>
<a href='https://astro.build/' target='_blank'>Astro</a> <a href="https://astro.build/" target="_blank">Astro</a>
<Icon name='astro' width='20' height='20' /> <Icon name="astro" width="20" height="20" />
</li> </li>
<li> <li>
<a href='https://www.netlify.com/' target='_blank'>Netlify</a> <a href="https://www.netlify.com/" target="_blank">Netlify</a>
<Icon name='netlify' width='20' height='20' /> <Icon name="netlify" width="20" height="20" />
</li> </li>
<li> <li>
<a href='/rss.xml' target='_blank'>RSS</a> <a href="/rss.xml" target="_blank">RSS</a>
<Icon name='rss' width='20' height='20' /> <Icon name="rss" width="20" height="20" />
</li> </li>
</ul> </ul>
<p class='footer__copy'>© Sergey Yarkov, 2022</p> <p class="footer__copy">© Sergey Yarkov, 2022</p>
</div> </div>
</footer> </footer>

2
src/components/Header/Header.astro
View File

@ -25,7 +25,7 @@ const { pathname } = Astro.url;
{ {
nav.map((link) => ( nav.map((link) => (
<li> <li>
<TranslatedLink class={pathname.includes(removeSlashes(link.url)) && pathname.split('/').length < 5 && "active"} to={link.url}> <TranslatedLink class={pathname.includes(removeSlashes(link.url)) && pathname.split("/").length < 5 && "active"} to={link.url}>
<UIString key={link.key} /> <UIString key={link.key} />
</TranslatedLink> </TranslatedLink>
</li> </li>

6
src/components/ProjectsList/ProjectsList.astro
View File

@ -1,7 +1,7 @@
--- ---
import './ProjectsList.scss'; import "./ProjectsList.scss";
--- ---
<div class='projects-list'> <div class="projects-list">
<slot></slot> <slot />
</div> </div>

4
src/components/SkillsList/SkillsList.astro
View File

@ -1,5 +1,5 @@
--- ---
import './SkillsList.scss'; import "./SkillsList.scss";
--- ---
<div class='skills-list'><slot></slot></div> <div class="skills-list"><slot /></div>

5
src/layouts/article.astro
View File

@ -10,13 +10,14 @@ import "@styles/global.scss";
export interface Props extends BaseHeadProps { export interface Props extends BaseHeadProps {
lang?: string | undefined; lang?: string | undefined;
content: ArticleType; content: ArticleType;
canonicalUrl?: string | undefined;
} }
const { lang = "ru", content } = Astro.props as Props; const { lang = "ru", content, canonicalUrl } = Astro.props as Props;
--- ---
<html lang={lang}> <html lang={lang}>
<BaseHead title={content.title} description={content.description}> <BaseHead title={content.title} description={content.description} canonicalUrl={canonicalUrl}>
<script is:inline defer src="/assets/js/load-code-highlight.js"></script> <script is:inline defer src="/assets/js/load-code-highlight.js"></script>
</BaseHead> </BaseHead>
<BaseLayout> <BaseLayout>

7
src/layouts/default.astro
View File

@ -10,14 +10,15 @@ import "@styles/global.scss";
export interface Props extends BaseHeadProps { export interface Props extends BaseHeadProps {
lang?: string | undefined; lang?: string | undefined;
showPageHeading?: boolean | undefined; showPageHeading?: boolean | undefined;
noIndex?: boolean; noIndex?: boolean | undefined;
canonicalUrl?: string | undefined;
} }
const { title, description, lang = "ru", showPageHeading = true, noIndex = false } = Astro.props as Props; const { title, description, lang = "ru", showPageHeading = true, noIndex = false, canonicalUrl } = Astro.props as Props;
--- ---
<html lang={lang}> <html lang={lang}>
<BaseHead title={title ? `${title} | ${SITE_METADATA.title}` : SITE_METADATA.title} description={description}> <BaseHead title={title ? `${title} | ${SITE_METADATA.title}` : SITE_METADATA.title} description={description} canonicalUrl={canonicalUrl}>
{noIndex && <meta name="robots" content="noindex" />} {noIndex && <meta name="robots" content="noindex" />}
</BaseHead> </BaseHead>
<BaseLayout> <BaseLayout>

3
src/pages/blog/[...slug].astro
View File

@ -6,6 +6,7 @@ import { getLanguageFromURL } from "@root/utils";
import { DEFAULT_LANGUAGE } from "@root/config"; import { DEFAULT_LANGUAGE } from "@root/config";
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
export async function getStaticPaths() { export async function getStaticPaths() {
const modules = import.meta.glob<MDXInstance<ArticleType>>("../../../content/articles/**/*.mdx", { eager: true }); const modules = import.meta.glob<MDXInstance<ArticleType>>("../../../content/articles/**/*.mdx", { eager: true });
@ -23,6 +24,6 @@ export async function getStaticPaths() {
const { Content, frontmatter } = Astro.props as MDXInstance<ArticleType>; const { Content, frontmatter } = Astro.props as MDXInstance<ArticleType>;
--- ---
<ArticleLayout lang={lang} content={frontmatter}> <ArticleLayout lang={lang} content={frontmatter} canonicalUrl={canonicalUrl.href}>
<Content /> <Content />
</ArticleLayout> </ArticleLayout>

3
src/templates/Articles.astro
View File

@ -10,9 +10,10 @@ const data = getTranslatedArticles(Astro);
const tags = new Set(data.map((article) => article.frontmatter.tags).flat()); const tags = new Set(data.map((article) => article.frontmatter.tags).flat());
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
const articles = transformArticles(data); const articles = transformArticles(data);
const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
--- ---
<PageLayout lang={lang} title={t("pageTitle.articles")} description={t("pageDescription.articles")}> <PageLayout lang={lang} title={t("pageTitle.articles")} description={t("pageDescription.articles")} canonicalUrl={canonicalUrl.href}>
<section> <section>
<ArticlesList <ArticlesList
client:load client:load

3
src/templates/Home.astro
View File

@ -11,9 +11,10 @@ const data = getTranslatedArticles(Astro);
const t = useTranslation(Astro); const t = useTranslation(Astro);
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
const articles = utils.transformArticles(data); const articles = utils.transformArticles(data);
const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
--- ---
<PageLayout lang={lang} description={t("site.description")} showPageHeading={false}> <PageLayout lang={lang} description={t("site.description")} showPageHeading={false} canonicalUrl={canonicalUrl.href}>
<Splash> <Splash>
<SplashHeading> <SplashHeading>
<hgroup> <hgroup>