Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<link rel="icon" href="/favicon.ico" sizes="48x48">
<link rel="icon" href="/favicon.svg" sizes="any" type="image/svg+xml">
<meta name="theme-color" content="#00E1BF" media="(prefers-color-scheme: light)">
<meta name="theme-color" content="#0D3B4A" media="(prefers-color-scheme: dark)">
<meta name="apple-mobile-web-app-title" content="UCM ACM" />
<link rel="manifest" href="/site.webmanifest" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ACM @ UC Merced</title>
</head>
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"tw-animate-css": "^1.4.0",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"typescript-eslint": "^8.62.1",
"vite": "^8.1.3"
"vite": "^8.1.3",
"vite-plugin-pwa": "^1.3.0"
}
}
3,002 changes: 2,841 additions & 161 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Binary file modified public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/favicon-96x96.png
Binary file not shown.
Binary file modified public/favicon.ico
Binary file not shown.
32 changes: 1 addition & 31 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pwa-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pwa-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pwa-maskable-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pwa-maskable-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 0 additions & 21 deletions public/site.webmanifest

This file was deleted.

Binary file removed public/web-app-manifest-192x192.png
Binary file not shown.
Binary file removed public/web-app-manifest-512x512.png
Binary file not shown.
36 changes: 36 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import tailwindcss from "@tailwindcss/vite";
import { tanstackRouter } from "@tanstack/router-plugin/vite";
import react, { reactCompilerPreset } from "@vitejs/plugin-react";
import { defineConfig } from "vite";
import { VitePWA } from "vite-plugin-pwa";

// https://vitejs.dev/config/
export default defineConfig({
Expand All @@ -18,6 +19,41 @@ export default defineConfig({
presets: [reactCompilerPreset()],
}),
tailwindcss(),
VitePWA({
registerType: "autoUpdate",
manifestFilename: "site.webmanifest",
manifest: {
id: "/",
name: "ACM @ UC Merced",
short_name: "UCMACM",
description:
"The official website of the Association for Computing Machinery student chapter at UC Merced — find our events, student projects, and special interest groups.",
start_url: "/",
scope: "/",
display: "standalone",
background_color: "#F5F5F5",
theme_color: "#00E1BF",
icons: [
{ src: "/pwa-192x192.png", sizes: "192x192", type: "image/png", purpose: "any" },
{ src: "/pwa-512x512.png", sizes: "512x512", type: "image/png", purpose: "any" },
{
src: "/pwa-maskable-192x192.png",
sizes: "192x192",
type: "image/png",
purpose: "maskable",
},
{
src: "/pwa-maskable-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "maskable",
},
],
},
workbox: {
globPatterns: ["**/*.{js,css,html,ico,png,svg,jpg,woff2}"],
},
}),
],
resolve: {
alias: {
Expand Down