Skip to content

Commit

Permalink
Merge branch 'new-ui'
Browse files Browse the repository at this point in the history
  • Loading branch information
bonfry committed Aug 23, 2024
2 parents 658cc27 + 19fac24 commit 30698b3
Show file tree
Hide file tree
Showing 131 changed files with 8,947 additions and 8,018 deletions.
5 changes: 5 additions & 0 deletions .astro/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"_variables": {
"lastUpdateCheck": 1723570607452
}
}
111 changes: 3 additions & 108 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ declare module 'astro:content' {
}

declare module 'astro:content' {
export { z } from 'astro/zod';

type Flatten<T> = T extends { [K: string]: infer U } ? U : never;

export type CollectionKey = keyof AnyEntryMap;
Expand All @@ -29,53 +27,6 @@ declare module 'astro:content' {
export type ContentCollectionKey = keyof ContentEntryMap;
export type DataCollectionKey = keyof DataEntryMap;

// This needs to be in sync with ImageMetadata
export type ImageFunction = () => import('astro/zod').ZodObject<{
src: import('astro/zod').ZodString;
width: import('astro/zod').ZodNumber;
height: import('astro/zod').ZodNumber;
format: import('astro/zod').ZodUnion<
[
import('astro/zod').ZodLiteral<'png'>,
import('astro/zod').ZodLiteral<'jpg'>,
import('astro/zod').ZodLiteral<'jpeg'>,
import('astro/zod').ZodLiteral<'tiff'>,
import('astro/zod').ZodLiteral<'webp'>,
import('astro/zod').ZodLiteral<'gif'>,
import('astro/zod').ZodLiteral<'svg'>,
import('astro/zod').ZodLiteral<'avif'>,
]
>;
}>;

type BaseSchemaWithoutEffects =
| import('astro/zod').AnyZodObject
| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;

type BaseSchema =
| BaseSchemaWithoutEffects
| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;

export type SchemaContext = { image: ImageFunction };

type DataCollectionConfig<S extends BaseSchema> = {
type: 'data';
schema?: S | ((context: SchemaContext) => S);
};

type ContentCollectionConfig<S extends BaseSchema> = {
type?: 'content';
schema?: S | ((context: SchemaContext) => S);
};

type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;

export function defineCollection<S extends BaseSchema>(
input: CollectionConfig<S>
): CollectionConfig<S>;

type AllValuesOf<T> = T extends any ? T[keyof T] : never;
type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
ContentEntryMap[C]
Expand Down Expand Up @@ -165,11 +116,11 @@ declare module 'astro:content' {
? {
collection: C;
slug: ValidContentEntrySlug<C>;
}
}
: {
collection: C;
id: keyof DataEntryMap[C];
}
}
>;
// Allow generic `string` to avoid excessive type errors in the config
// if `dev` is not running to update as you edit.
Expand All @@ -185,34 +136,6 @@ declare module 'astro:content' {

type ContentEntryMap = {
"externals": {
"ass_coach.md": {
id: "ass_coach.md";
slug: "ass_coach";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"aup.md": {
id: "aup.md";
slug: "aup";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"codemotion.md": {
id: "codemotion.md";
slug: "codemotion";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"e80.md": {
id: "e80.md";
slug: "e80";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"google.md": {
id: "google.md";
slug: "google";
Expand All @@ -227,34 +150,6 @@ declare module 'astro:content' {
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"link.md": {
id: "link.md";
slug: "link";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"nextome.md": {
id: "nextome.md";
slug: "nextome";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"wib_puglia.md": {
id: "wib_puglia.md";
slug: "wib_puglia";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
"wideverse.md": {
id: "wideverse.md";
slug: "wideverse";
body: string;
collection: "externals";
data: InferEntrySchema<"externals">
} & { render(): Render[".md"] };
};
"sessions": {
"deep_dive_flutter.md": {
Expand Down Expand Up @@ -341,5 +236,5 @@ declare module 'astro:content' {

type AnyEntryMap = ContentEntryMap & DataEntryMap;

type ContentConfig = typeof import("../src/content/config");
export type ContentConfig = typeof import("./../src/content/config.js");
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules/
dist/
.vscode/
.firebaserc
.firebase
firebase.json
.firebase/hosting.ZGlzdA.cache
copy/template.txt
Expand Down
60 changes: 60 additions & 0 deletions dev.astro.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import mdx from "@astrojs/mdx";
import tailwind from "@astrojs/tailwind";
import { defineConfig } from "astro/config";
import react from "@astrojs/react";
import AstroPWA from "@vite-pwa/astro";
import { WebsiteConfig } from "./src/config";

// https://astro.build/config
export default defineConfig({
i18n: {
defaultLocale: "it",
locales: ["it", "en"],
routing:{
prefixDefaultLocale: false,
}
},
integrations: [
mdx(),
tailwind({
applyBaseStyles: false,
}),
react(),
AstroPWA({
mode: import.meta.env.DEV ? 'development' : 'production',
base: '/',
scope: '/',
includeAssets: ['favicon.svg'],
manifest: {
name: WebsiteConfig.DEVFEST_NAME,
short_name: WebsiteConfig.DEVFEST_NAME,
theme_color: WebsiteConfig.DEVFEST_THEME_COLOR,
icons: [
{
src: 'assets/images/icons/icon-72x72.png',
sizes: '72x72',
type: 'image/png',
},
{
src: 'assets/images/icons/icon-144x144.png',
sizes: '144x144',
type: 'image/png',
},
{
src: 'assets/images/icons/icon-192x192.png',
sizes: '192x192',
type: 'image/png',
},
{
src: 'assets/images/icons/icon-512x512.png',
sizes: '512x512',
type: 'image/png',
purpose: 'any maskable',
}
],
},


}),
],
});
Loading

0 comments on commit 30698b3

Please sign in to comment.