Nicolas/website-astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to astro V2

Browse source
This commit is contained in:
Nico 2023-02-03 11:21:01 +01:00
parent 082b193d23
commit f24a432155
14 changed files with 789 additions and 796 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/CardEditorial.astro
View file

@ -6,7 +6,7 @@ const { item, routeName } = Astro.props;
<div class="card">
<div>
<h3>
<a class="clean-link card__link" href={`${routeName}/${item.data.slug}`}
<a class="clean-link card__link" href={`${routeName}/${item.slug}`}
>{item.data.title}</a
>
</h3>
@ -111,19 +111,4 @@ const { item, routeName } = Astro.props;
font-weight: 500;
color: var(--darkBlue);
}
/* @media screen and (min-width: 768px) {
h3 {
margin-block-start: 0;
margin-block-end: var(--space-2xs);
}
.card {
padding: var(--space-xs-s) var(--space-2xs-xs);
}
}
@media screen and (min-width: 1060px) {
.card {
margin: 0;
}
} */
</style>

10
src/content/config.ts
View file

@ -1,11 +1,10 @@
import { z, defineCollection } from "astro:content";
const articles = defineCollection({
schema: {
schema: z.object({
title: z.string(),
subtitle: z.string(),
lang: z.enum(["fr", "en"]),
slug: z.string(),
tags: z.array(z.string()), // An array of strings
// Parse pubDate as a browser-standard `Date` object
createdAt: z.string().transform((str) => new Date(str)),
@ -15,15 +14,14 @@ const articles = defineCollection({
.optional(),
code: z.boolean().optional() || false,
draft: z.boolean().optional() || false,
},
}),
});
const fragments = defineCollection({
schema: {
schema: z.object({
title: z.string(),
subtitle: z.string(),
lang: z.enum(["fr", "en"]),
slug: z.string(),
tags: z.array(z.string()), // An array of strings
// Parse pubDate as a browser-standard `Date` object
createdAt: z.string().transform((str) => new Date(str)),
@ -33,7 +31,7 @@ const fragments = defineCollection({
.optional(),
code: z.boolean().optional() || false,
draft: z.boolean().optional() || false,
},
}),
});
export const collections = {

249
src/content/types.generated.d.ts vendored
View file

@ -1,249 +0,0 @@
declare module 'astro:content' {
export { z } from 'astro/zod';
export type CollectionEntry<C extends keyof typeof entryMap> =
typeof entryMap[C][keyof typeof entryMap[C]] & Render;
type BaseCollectionConfig<S extends import('astro/zod').ZodRawShape> = {
schema?: S;
slug?: (entry: {
id: CollectionEntry<keyof typeof entryMap>['id'];
defaultSlug: string;
collection: string;
body: string;
data: import('astro/zod').infer<import('astro/zod').ZodObject<S>>;
}) => string | Promise<string>;
};
export function defineCollection<S extends import('astro/zod').ZodRawShape>(
input: BaseCollectionConfig<S>
): BaseCollectionConfig<S>;
export function getEntry<C extends keyof typeof entryMap, E extends keyof typeof entryMap[C]>(
collection: C,
entryKey: E
): Promise<typeof entryMap[C][E] & Render>;
export function getCollection<
C extends keyof typeof entryMap,
E extends keyof typeof entryMap[C]
>(
collection: C,
filter?: (data: typeof entryMap[C][E]) => boolean
): Promise<(typeof entryMap[C][E] & Render)[]>;
type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<
import('astro/zod').ZodObject<Required<ContentConfig['collections'][C]>['schema']>
>;
type Render = {
render(): Promise<{
Content: import('astro').MarkdownInstance<{}>['Content'];
headings: import('astro').MarkdownHeading[];
injectedFrontmatter: Record<string, any>;
}>;
};
const entryMap: {
"articles": {
"en/2022.md": {
id: "en/2022.md",
slug: "en/2022",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/after-effects-expressions.mdx": {
id: "en/after-effects-expressions.mdx",
slug: "en/after-effects-expressions",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/faq.md": {
id: "en/faq.md",
slug: "en/faq",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/gratuiste.md": {
id: "en/gratuiste.md",
slug: "en/gratuiste",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/sci-hub-blocage.mdx": {
id: "en/sci-hub-blocage.mdx",
slug: "en/sci-hub-blocage",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/the-day-I-jamd.mdx": {
id: "en/the-day-I-jamd.mdx",
slug: "en/the-day-I-jamd",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"en/video-compression.mdx": {
id: "en/video-compression.mdx",
slug: "en/video-compression",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/2022.md": {
id: "fr/2022.md",
slug: "fr/2022",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/after-effects-expressions.md": {
id: "fr/after-effects-expressions.md",
slug: "fr/after-effects-expressions",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/faq.md": {
id: "fr/faq.md",
slug: "fr/faq",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/gratuiste.md": {
id: "fr/gratuiste.md",
slug: "fr/gratuiste",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/sci-hub-blocage.mdx": {
id: "fr/sci-hub-blocage.mdx",
slug: "fr/sci-hub-blocage",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/the-day-I-jamd.mdx": {
id: "fr/the-day-I-jamd.mdx",
slug: "fr/the-day-I-jamd",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
"fr/video-compression.md": {
id: "fr/video-compression.md",
slug: "fr/video-compression",
body: string,
collection: "articles",
data: InferEntrySchema<"articles">
},
},
"fragments": {
"en/acme-sh-tls-cert.md": {
id: "en/acme-sh-tls-cert.md",
slug: "en/acme-sh-tls-cert",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/array-vs-array.md": {
id: "en/array-vs-array.md",
slug: "en/array-vs-array",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/buttons.md": {
id: "en/buttons.md",
slug: "en/buttons",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/image-full.mdx": {
id: "en/image-full.mdx",
slug: "en/image-full",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/nuxt-graphql-static.md": {
id: "en/nuxt-graphql-static.md",
slug: "en/nuxt-graphql-static",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/super-cookies.md": {
id: "en/super-cookies.md",
slug: "en/super-cookies",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"en/toulouse-fun.md": {
id: "en/toulouse-fun.md",
slug: "en/toulouse-fun",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/acme-sh-tls-cert.md": {
id: "fr/acme-sh-tls-cert.md",
slug: "fr/acme-sh-tls-cert",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/array-vs-array.md": {
id: "fr/array-vs-array.md",
slug: "fr/array-vs-array",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/buttons.mdx": {
id: "fr/buttons.mdx",
slug: "fr/buttons",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/image-full.mdx": {
id: "fr/image-full.mdx",
slug: "fr/image-full",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/nuxt-graphql-static.md": {
id: "fr/nuxt-graphql-static.md",
slug: "fr/nuxt-graphql-static",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/super-cookies.md": {
id: "fr/super-cookies.md",
slug: "fr/super-cookies",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
"fr/toulouse-fun.md": {
id: "fr/toulouse-fun.md",
slug: "fr/toulouse-fun",
body: string,
collection: "fragments",
data: InferEntrySchema<"fragments">
},
},
};
type ContentConfig = typeof import("./config");
}

1
src/env.d.ts vendored
View file

@ -1,3 +1,4 @@
/// <reference path="../.astro/types.d.ts" />
/// <reference types="@astrojs/image/client" />
/// <reference path="../.astro-i18n/generated.d.ts" />

2
src/pages/articles/[slug].astro
View file

@ -12,7 +12,7 @@ export async function getStaticPaths() {
return data.lang === astroI18n.langCode;
});
return articles.map((article) => ({
params: { slug: article.data.slug },
params: { slug: article.slug },
props: { article },
}));
}

2
src/pages/fragments/[slug].astro
View file

@ -12,7 +12,7 @@ export async function getStaticPaths() {
return data.lang === astroI18n.langCode;
});
return snippets.map((snippet) => ({
params: { slug: snippet.data.slug },
params: { slug: snippet.slug },
props: { snippet },
}));
}

4
src/pages/i18n/en.json
View file

@ -8,8 +8,8 @@
"latestProjects": "Latest projects",
"latestArticles": "Latest articles",
"allProjects": "All projects",
"allArticles": "All articles",
"allArticles": "Browse all articles",
"latestSnippets": "Latest snippets",
"allSnippets": "All snippets",
"allSnippets": "Browse all snippets",
"toc": "table of content"
}

4
src/pages/i18n/fr.json
View file

@ -8,8 +8,8 @@
"latestProjects": "Derniers projets",
"latestArticles": "Derniers articles",
"allProjects": "Tous les projets",
"allArticles": "Tous les articles",
"allArticles": "Consulter tous les articles",
"latestSnippets": "Derniers fragments",
"allSnippets": "Tous les fragments",
"allSnippets": "Consulter tous les fragments",
"toc": "table des matières"
}

18
src/pages/index.astro
View file

@ -75,16 +75,20 @@ const sortedSnippets = localizedSnippets.sort(
))
}
<section class="region latest">
<section class="region flow latest">
<div class="flow latest__articles">
<h2>{t("index.latestArticles")}</h2>
<ListCards list={sortedArticles} routeName={t("article.titre")} />
<p><a href={l("/articles")}>{t("index.allArticles")}</a></p>
<p class="latest__link">
<a href={l("/articles")}>{t("index.allArticles")}</a>
</p>
</div>
<div class="flow latest__snippets">
<h2>{t("index.latestSnippets")}</h2>
<ListCards list={sortedSnippets} routeName={t("fragments.titre")} />
<p><a href={l("/fragments")}>{t("index.allSnippets")}</a></p>
<p class="latest__link">
<a href={l("/fragments")}>{t("index.allSnippets")}</a>
</p>
</div>
</section>
</BaseLayout>
@ -163,6 +167,14 @@ const sortedSnippets = localizedSnippets.sort(
font-size: var(--size-1);
}
.latest {
--flow-space: var(--space-l-xl);
}
.latest__link {
text-align: end;
}
@container section (min-width: 50rem) {
.section__container {
flex-direction: row;

4
src/pages/plan-du-site.astro
View file

@ -37,7 +37,7 @@ const pageTitle = t("sitemap");
{
localizedArticles.map((article) => (
<li>
<a href={l("/articles/[slug]", { slug: article.data.slug })}>
<a href={l("/articles/[slug]", { slug: article.slug })}>
{article.data.title}
</a>
</li>
@ -53,7 +53,7 @@ const pageTitle = t("sitemap");
{
localizedFragments.map((fragment) => (
<li>
<a href={l("/fragments/[slug]", { slug: fragment.data.slug })}>
<a href={l("/fragments/[slug]", { slug: fragment.slug })}>
{fragment.data.title}
</a>
</li>