Skip to content

Commit

Permalink
Mobile fixes, typing animation, lower image quality, update website l…
Browse files Browse the repository at this point in the history
…anguage (#185)

* add daisy, being fixing layout and styling

* typing animation

* resize images for repo size concerns; typo

* styling fix, upgrade astro, add compress plugin

* new coords, time fix, mobile styling

* fix .gitignore
  • Loading branch information
sbaumohl authored May 17, 2024
1 parent 1296d86 commit 45c311b
Show file tree
Hide file tree
Showing 91 changed files with 4,004 additions and 2,844 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": 1715924110054
}
}
70 changes: 18 additions & 52 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,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 @@ -19,53 +17,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 @@ -155,11 +106,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 Down Expand Up @@ -285,6 +236,16 @@ declare module 'astro:content' {

type DataEntryMap = {
"coordinators": {
"ahmet-ahunbay": {
id: "ahmet-ahunbay";
collection: "coordinators";
data: InferEntrySchema<"coordinators">
};
"anna-sun": {
id: "anna-sun";
collection: "coordinators";
data: InferEntrySchema<"coordinators">
};
"ben-lash": {
id: "ben-lash";
collection: "coordinators";
Expand Down Expand Up @@ -355,6 +316,11 @@ declare module 'astro:content' {
collection: "coordinators";
data: InferEntrySchema<"coordinators">
};
"rahul-rao": {
id: "rahul-rao";
collection: "coordinators";
data: InferEntrySchema<"coordinators">
};
"rudy-banerjee": {
id: "rudy-banerjee";
collection: "coordinators";
Expand All @@ -371,5 +337,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");
}
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: withastro/action@v0
with:
# path: . # The root location of your Astro project inside the repository. (optional)
node-version: 18 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
# package-manager: yarn # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)

deploy:
Expand Down
1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

18 changes: 8 additions & 10 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@ import tailwind from "@astrojs/tailwind";
import react from "@astrojs/react";
import { remarkReadingTime } from "./remark-reading-time.mjs";

import playformCompress from "@playform/compress";

// https://astro.build/config
export default defineConfig({
site: "https://www.upl.cs.wisc.edu/",
redirects: {
"/hours.html": "/hours",
"/blog.html": "/blog",
"/hours.html": "/hours",
"/blog.html": "/blog"
},
integrations: [
sitemap(),
tailwind(),
react(),
],
integrations: [sitemap(), tailwind(), react(), playformCompress()],
compressHTML: false,
markdown: {
syntaxHighlight: "prism",
remarkPlugins: [remarkReadingTime],
optimize: true,
},
});
optimize: true
}
});
Loading

0 comments on commit 45c311b

Please sign in to comment.