Merge pull request #22 from TeaClientMC/droops-redirect

Droops redirect
TeaClientMC · Mar 28, 2024 · ede1ba0 · ede1ba0
2 parents aa369af + bec1de6
commit ede1ba0
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 40 deletions.
diff --git a/.github/workflows/PrQuality.yml b/.github/workflows/PrQuality.yml
@@ -24,10 +24,10 @@ jobs:
         run: bun install
 
       - name: Check stylelint
-        run: bun stylelint
+        run: bunx stylelint src/styles/**/*.css
 
   CommitQuality:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/Quality.yml b/.github/workflows/Quality.yml
@@ -1,12 +1,12 @@
 name: Quality
 
 on:
-  push:
+ push:
     branches-ignore:
       - main
 
 jobs:
-  Quality:
+ Quality:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -17,44 +17,34 @@ jobs:
           version: latest
       - name: Run Biome
         run: biome ci .
-
       - uses: oven-sh/setup-bun@v1
         with:
           bun-version: latest
-
       - name: Install Deps
         run: bun install
-
       - name: Check stylelint
-        run: bun stylelint
+        run: bunx stylelint src/styles/**/*.css
 
-  CommitQuality:
-    runs-on: ubuntu-22.04
+ CommitQuality:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - uses: oven-sh/setup-bun@v1
         with:
           bun-version: latest
-
       - name: Install packages
-        run: |
-          bun install
+        run: bun install
 
       - name: Print versions
         run: |
           bun --version
           bunx commitlint --version
-      - name: Install commitlint
-        run: |
-          bun install conventional-changelog-conventionalcommits
-          bun install commitlint@latest
-
       - name: Validate current commit (last commit) with commitlint
         if: github.event_name == 'push'
         run: bunx commitlint --from HEAD~1 --to HEAD --verbose
-
       - name: Validate PR commits with commitlint
         if: github.event_name == 'pull_request'
-        run: bunx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
+        run: bunx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -40,7 +40,7 @@ jobs:
         run: bun stylelint
 
   commitquality:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/astro.config.ts b/astro.config.ts
@@ -18,10 +18,16 @@ export default defineConfig({
 		tailwind({ nesting: true, applyBaseStyles: true }),
 	],
 	redirects: {
+		// Resources
 		"/discord": "https://discord.gg/ejFTe4Hfnc",
-		"/klaas": "https://klaas.tiiny.site/",
 		"/github": "https://github.com/TeaClientMC",
 		"/roadmap": "https://github.com/orgs/TeaClientMC/projects/3",
+
+		// Partner Networks
+		"/dropps": "https://discord.gg/qFarXHT32J",
+
+		// Easter-Eggs
+		"/klaas": "https://klaas.tiiny.site/",
 	},
 	vite: {
 		resolve: {

diff --git a/biome.json b/biome.json
@@ -7,13 +7,15 @@
 		"enabled": true,
 		"rules": {
 			"recommended": true
-		}
+		},
+		"ignore": ["./.astro/*"]
 	},
 	"formatter": {
 		"enabled": true,
 		"formatWithErrors": false,
 		"indentWidth": 2,
-		"lineWidth": 80
+		"lineWidth": 80,
+		"ignore": ["./.astro/*"]
 	},
 	"css": {
 		"formatter": {

diff --git a/package.json b/package.json
@@ -7,11 +7,10 @@
 		"preview": "astro preview",
 		"build": "astro build",
 		"astro": "astro",
-		"lint": "biome check --apply . && bun lint:css --fix",
-		"lint:css": "stylelint 'src/styles/**/*.css'",
+		"lint": "biome check --apply . && stylelint 'src/styles/**/*.css' --fix",
 		"fmt": "biome format . --write",
 		"biome": "bunx @biomejs/biome",
-		"check": "biome check . && bun lint:css && bun astro check",
+		"check": "biome check . && stylelint 'src/styles/**/*.css'&& bun astro check",
 		"postinstall": "husky install"
 	},
 	"trustedDependencies": ["sharp"],
@@ -31,7 +30,7 @@
 	},
 	"dependencies": {
 		"@astrojs/mdx": "^2.0.2",
-		"@astrojs/rss": "^3.0.0",
+		"@astrojs/rss": "^4.0.5",
 		"@astrojs/sitemap": "^3.1.1",
 		"@astrojs/tailwind": "^5.1.0",
 		"@astrojs/ts-plugin": "^1.3.1",
@@ -45,16 +44,16 @@
 		"web-vitals": "^3.5.0"
 	},
 	"devDependencies": {
-		"@astrojs/check": "^0.2.0",
+		"@astrojs/check": "^0.5.10",
 		"@biomejs/biome": "^1.5.3",
 		"@commitlint/cli": "^18.4.3",
 		"@commitlint/config-conventional": "^18.4.3",
 		"@types/node": "^20.8.3",
 		"astro": "^4.2.3",
-		"husky": "^8.0.3",
+		"husky": "^9.0.11",
 		"postcss-scss": "^4.0.9",
-		"stylelint": "^15.11.0",
-		"stylelint-config-standard": "^34.0.0",
+		"stylelint": "^16.3.1",
+		"stylelint-config-standard": "^36.0.0",
 		"stylelint-scss": "^6.2.1",
 		"typescript": "^5.2.2"
 	},

diff --git a/src/components/shared/header.astro b/src/components/shared/header.astro
@@ -1,6 +1,5 @@
 ---
 import { Image } from "astro:assets";
-import { twMerge } from "tailwind-merge";
 ---
 
 <section

diff --git a/src/env.d.ts b/src/env.d.ts
@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
diff --git a/src/layouts/layout.astro b/src/layouts/layout.astro
@@ -15,7 +15,7 @@ export interface Props {
 const { title, className, desc, banner } = Astro.props;
 ---
 
-<Head title={String(title) ?? "TeaClent Website"} customDescription={desc} />
+<Head title={String(title) ?? "TeaClent Website"} customDescription={desc}, bannerPath={banner} />
 <Header />
 <div class={twMerge(`flex flex-col h-screen text-white my-[5%] mx-[5%] bg-[var(--nav-color)] rounded-lg ${className}`)}>
     <slot />

diff --git a/src/pages/apply/[apply].astro b/src/pages/apply/[apply].astro
@@ -1,5 +1,4 @@
 ---
-import AppError from "@layout/error.astro";
 import Layout from "@layout/layout.astro";
 const { apply } = Astro.params;
 
@@ -21,13 +20,13 @@ if (apply === "staff") {
 <Layout title={title}>
  {apply === 'staff' ? (
     <div class="box" style="position: relative;">
-      <iframe src="https://docs.google.com/forms/d/e/1FAIpQLScOuyHA9sX_fW3bijeuDOoUWVIPLptbuyavkZ4XC__8DTHLSg/viewform?embedded=true" width="640" height="1445" class="bg-transparent" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>
+      <iframe src="https://docs.google.com/forms/d/e/1FAIpQLScOuyHA9sX_fW3bijeuDOoUWVIPLptbuyavkZ4XC__8DTHLSg/viewform?embedded=true" width="640" height="1445" class="bg-transparent border-none">Loading…</iframe>
       <br/>
       <a href="/apply" style="position: absolute; bottom: 20px; right: 20px;">Go Back</a>
     </div>
  ) : apply === 'team' ? (
     <div class="box" style="position: relative;">
-      <iframe src="https://docs.google.com/forms/d/e/1FAIpQLSfy0okWtCh1xMZ5YOrQYD-PYKLog3SzAUEYIfvsIE418pdiDA/viewform?embedded=true" width="640" height="1445" class="bg-transparent" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>
+      <iframe src="https://docs.google.com/forms/d/e/1FAIpQLSfy0okWtCh1xMZ5YOrQYD-PYKLog3SzAUEYIfvsIE418pdiDA/viewform?embedded=true" width="640" height="1445" class="bg-transparent border-none">Loading…</iframe>
       <br/>
       <a href="/apply" style="position: absolute; bottom: 20px; right: 20px;">Go Back</a>
     </div>

diff --git a/src/pages/news/index.xml.ts b/src/pages/news/index.xml.ts
@@ -1,11 +1,17 @@
-import rss, { pagesGlobToRssItems } from "@astrojs/rss";
+import rss, {
+	pagesGlobToRssItems,
+	type RSSFeedItem,
+	type RSSOptions,
+} from "@astrojs/rss";
 
-export async function GET(context) {
+export async function GET(context: RSSOptions) {
 	return rss({
 		title: "TeaClient News/Updates",
 		description: "Update your self on the latest news.",
 		site: context.site,
-		items: await pagesGlobToRssItems(import.meta.glob("./*/*.{md,mdx}")),
+		items: (await pagesGlobToRssItems(
+			import.meta.glob("./*/*.{md,mdx}"),
+		)) as RSSFeedItem[],
 		customData: "<language>en-us</language>",
 		trailingSlash: false,
 		stylesheet: "./feed.xsl",