diff --git a/.vscode/settings.json b/.vscode/settings.json
index f309a42ab..2a4147cf3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -76,7 +76,9 @@
"echarts",
"Everytime",
"FASTNAME",
+ "favicons",
"flexdirection",
+ "fontsource",
"FOURCC",
"frameloop",
"fsformat",
@@ -154,6 +156,7 @@
"Pyogenics",
"ratingleaderboard",
"raycaster",
+ "Redirector",
"researchable",
"Resvg",
"rizz",
diff --git a/bun.lockb b/bun.lockb
index beb8609e0..578df7f42 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 03da10016..cb01d6fd0 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
"dependencies": {
"@types/xmpp__client": "^0.13.3",
"@xmpp/client": "^0.13.6",
+ "astro-favicons": "^3.1.5",
"cheerio": "^1.1.2",
"googleapis": "^144.0.0",
"lodash-es": "^4.17.21",
diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index 5d28cccec..81ceebaba 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -6,6 +6,8 @@
},
"common": {
+ "name": "BlitzKit",
+
"units": {
"m": "%s1m",
"mm": "%s1mm",
diff --git a/packages/website/astro.config.mjs b/packages/website/astro.config.mjs
index 3b002a848..be8cd578b 100644
--- a/packages/website/astro.config.mjs
+++ b/packages/website/astro.config.mjs
@@ -1,13 +1,15 @@
// @ts-check
-import react from '@astrojs/react';
-import sitemap from '@astrojs/sitemap';
-import { SUPPORTED_LOCALES } from '@blitzkit/i18n';
-import { defineConfig } from 'astro/config';
+import react from "@astrojs/react";
+import sitemap from "@astrojs/sitemap";
+import { SUPPORTED_LOCALES } from "@blitzkit/i18n";
+import strings from "@blitzkit/i18n/strings/en.json";
+import favicons from "astro-favicons";
+import { defineConfig } from "astro/config";
export default defineConfig({
i18n: {
- defaultLocale: 'en',
+ defaultLocale: "en",
locales: [...SUPPORTED_LOCALES],
routing: {
prefixDefaultLocale: false,
@@ -15,17 +17,38 @@ export default defineConfig({
},
devToolbar: { enabled: false },
- output: 'static',
- site: 'https://blitzkit.app',
- outDir: '../../dist/website',
+ output: "static",
+ site: "https://blitzkit.app",
+ outDir: "../../dist/website",
prefetch: true,
- integrations: [react(), sitemap()],
+ integrations: [
+ react(),
+ sitemap(),
+ favicons({
+ name: strings.common.name,
+ short_name: strings.common.name,
+
+ manifest: {
+ start_url: "/",
+ display_override: ["minimal-ui"],
+ },
+
+ icons: {
+ windows: true,
+ android: true,
+ appleIcon: true,
+ appleStartup: true,
+ favicons: true,
+ yandex: true,
+ },
+ }),
+ ],
vite: {
resolve: {
alias: {
- '.prisma/client/index-browser':
- '../../node_modules/.prisma/client/index-browser.js',
+ ".prisma/client/index-browser":
+ "../../node_modules/.prisma/client/index-browser.js",
},
},
ssr: {
diff --git a/packages/website/public/favicon.ico b/packages/website/public/favicon.ico
deleted file mode 100644
index 7b326ae1e..000000000
Binary files a/packages/website/public/favicon.ico and /dev/null differ
diff --git a/packages/website/public/favicon.png b/packages/website/public/favicon.png
deleted file mode 100644
index 7b326ae1e..000000000
Binary files a/packages/website/public/favicon.png and /dev/null differ
diff --git a/packages/website/public/favicon.svg b/packages/website/public/favicon.svg
new file mode 100644
index 000000000..f153bc7be
--- /dev/null
+++ b/packages/website/public/favicon.svg
@@ -0,0 +1,47 @@
+
diff --git a/packages/website/src/components/Party3.astro b/packages/website/src/components/Analytics.astro
similarity index 100%
rename from packages/website/src/components/Party3.astro
rename to packages/website/src/components/Analytics.astro
diff --git a/packages/website/src/components/Favicons.astro b/packages/website/src/components/Favicons.astro
new file mode 100644
index 000000000..924db4687
--- /dev/null
+++ b/packages/website/src/components/Favicons.astro
@@ -0,0 +1,5 @@
+---
+import { localizedHTML as favicons } from "astro-favicons/middleware";
+---
+
+
diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro
new file mode 100644
index 000000000..371d7257c
--- /dev/null
+++ b/packages/website/src/components/LocaleRedirector.astro
@@ -0,0 +1,25 @@
+
diff --git a/packages/website/src/components/Meta.astro b/packages/website/src/components/Meta.astro
new file mode 100644
index 000000000..b8890591c
--- /dev/null
+++ b/packages/website/src/components/Meta.astro
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/website/src/components/PWA.astro b/packages/website/src/components/PWA.astro
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/website/src/layouts/BaseLayout.astro b/packages/website/src/layouts/BaseLayout.astro
index f0cd70ab4..688af7331 100644
--- a/packages/website/src/layouts/BaseLayout.astro
+++ b/packages/website/src/layouts/BaseLayout.astro
@@ -1,14 +1,18 @@
---
-import '@fontsource/inter';
-import { Flex } from '@radix-ui/themes';
-import { BlitzKitTheme } from '../components/BlitzKitTheme';
-import { Checks } from '../components/Checks';
-import Footer from '../components/Footer.astro';
-import Navbar from '../components/Navbar.astro';
-import Party3 from '../components/Party3.astro';
-import './base.css';
-import { DEFAULT_LOCALE } from '@blitzkit/i18n';
-import Servicing from '../components/Servicing.astro';
+import { DEFAULT_LOCALE } from "@blitzkit/i18n";
+import strings from "@blitzkit/i18n/strings/en.json";
+import "@fontsource/inter";
+import { Flex } from "@radix-ui/themes";
+import Analytics from "../components/Analytics.astro";
+import { BlitzKitTheme } from "../components/BlitzKitTheme";
+import { Checks } from "../components/Checks";
+import Footer from "../components/Footer.astro";
+import LocaleRedirector from "../components/LocaleRedirector.astro";
+import Meta from "../components/Meta.astro";
+import Navbar from "../components/Navbar.astro";
+import PWA from "../components/PWA.astro";
+import Servicing from "../components/Servicing.astro";
+import "./base.css";
export interface Props {
noFooter?: boolean;
@@ -23,44 +27,17 @@ const locale = Astro.params.locale ?? DEFAULT_LOCALE;
-
-
-
-
-
+
-
-
-
+
+
+
+
-
+
diff --git a/packages/website/src/pages/debug.astro b/packages/website/src/pages/debug.astro
new file mode 100644
index 000000000..d287cd3ed
--- /dev/null
+++ b/packages/website/src/pages/debug.astro
@@ -0,0 +1 @@
+debug