feat: redesign of entire website (#263)

* feat: base rewrite

* fix: small cleanup and install sharp

* chore: remove banner

* feat: improve sponsor

* feat: make navbar and footer full screen

* feat: add preline js

* chore: update lockfile

* feat: add normal workshop page

* chore: general cleanup

* feat: start adding what we do page

* feat: add region title

* feat: add id to all cards

* feat: add reach out box

* feat: make locations clickable

* fix: dark mode colours

* feat: customise contact page

* fix: move contact us on navbar

* feat: improve content on what we do

* feat: start adding mahi pages

* fix: small typos

* feat: improve session info

* feat: base layout

* feat: move to consistent branding colours

* fix: small fixes

.github/workflows/publish.yml

@@ -10,32 +10,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - name: Setup bun
-        uses: oven-sh/setup-bun@v1
+
+      - uses: pnpm/action-setup@v3
         with:
-          bun-version: latest
+          run_install: true
+
+      - name: Build project
+        run: pnpm run build
 
-      - name: Install project dependencies
-        run: bun install
-
-      - name: Run post-install for sharp
-        run: cd node_modules/sharp && bun install && cd ../..
-
-      - name: Build project 
-        run: bun run build
-
       - name: Publish to Cloudflare Pages
         uses: cloudflare/pages-action@v1
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: "f9b287db44d75988c9ac726f6390d9c0"
           projectName: "tuhura-tech-website"
           directory: dist/
-          # Optional: Enable this if you want to have GitHub Deployments triggered
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          # Optional: Switch what branch you are publishing to.
-          # By default this will be the branch which triggered this workflow
-          branch: main
-          # Optional: Change the Wrangler version, allows you to point to a specific version or a tag such as `beta`
-          wranglerVersion: '3'

.gitignore

@@ -1,6 +1,8 @@
 # build output
 dist/
-.output/
+# generated types
+.astro/
+.idea/
 
 # dependencies
 node_modules/
@@ -18,11 +20,3 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
-
-# Visual Studio Code
-.vscode
-
-# eslintrc
-.eslintcache
-
-.astro

README.md

@@ -1,3 +1 @@
-# Website
-
-This is the website for Tūhura Tech ([tuhuratech.org.nz](https://tuhuratech.org.nz)); originally based on the AstroWind template.
+# Tuhura Tech Website

astro.config.mjs

@@ -1,43 +1,14 @@
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-import { defineConfig, sharpImageService } from 'astro/config';
-
-import tailwind from '@astrojs/tailwind';
-import sitemap from '@astrojs/sitemap';
-import mdx from '@astrojs/mdx';
-
-import { SITE } from './src/config.mjs';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import { defineConfig } from "astro/config";
+import tailwind from "@astrojs/tailwind";
+import sitemap from "@astrojs/sitemap";
+import icon from "astro-icon";
 
 export default defineConfig({
-	site: SITE.origin,
-	base: SITE.basePathname,
-	trailingSlash: SITE.trailingSlash ? 'always' : 'never',
-
-	output: 'static',
-	compressHTML: true,
-
-	integrations: [
-		tailwind({
-			config: {
-				applyBaseStyles: false,
-			},
-		}),
-		sitemap(),
-		mdx(),
-	],
-
-  image: {
-    service: sharpImageService(),
-  },
-
-	vite: {
-		resolve: {
-			alias: {
-				'~': path.resolve(__dirname, './src'),
-			},
-		},
-	},
+  site: "https://tuhuratech.org.nz",
+  prefetch: true,
+  integrations: [
+    tailwind(),
+    sitemap(),
+    icon(),
+  ],
 });

package.json

@@ -1,46 +1,30 @@
 {
   "name": "website",
-  "description": "Tūhura Tech Website.",
+  "type": "module",
   "version": "1.0.0",
-  "private": true,
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro build",
-    "preview": "astro build && astro preview",
-    "astro": "astro",
-    "prepare": "husky install",
-    "format": "prettier -w --cache src",
-    "format-ci": "prettier --check src",
-    "format-staged": "pretty-quick --staged",
-    "lint:eslint": "eslint --cache --ext .js,.ts,.astro ."
+    "build": "astro check && astro build",
+    "preview": "astro preview",
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/check": "^0.5.10",
+    "@astrojs/sitemap": "^3.1.2",
+    "@astrojs/tailwind": "^5.1.0",
+    "@iconify-json/mdi": "^1.1.66",
+    "astro": "^4.6.1",
+    "astro-icon": "^1.1.0",
+    "preline": "^2.1.0",
+    "sharp": "^0.33.3",
+    "tailwindcss": "^3.4.3"
   },
   "devDependencies": {
-    "@astrojs/mdx": "^2.0.0",
-    "@astrojs/sitemap": "^3.0.0",
-    "@astrojs/tailwind": "^5.0.0",
-    "@astrolib/seo": "^0.6.0",
-    "@fontsource-variable/inter": "^5.0.8",
-    "@tailwindcss/typography": "^0.5.9",
-    "@types/slug": "^5.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
-    "astro": "^4.0.0",
-    "astro-icon": "^0.8.1",
-    "eslint": "^9.0.0",
-    "eslint-plugin-astro": "^1.0.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "husky": "^9.0.0",
-    "marked": "^12.0.0",
-    "prettier": "^3.0.0",
+    "@tailwindcss/forms": "^0.5.7",
+    "prettier": "^3.2.5",
     "prettier-plugin-astro": "^0.13.0",
-    "pretty-quick": "^4.0.0",
-    "rehype-autolink-headings": "^7.0.0",
-    "rehype-slug": "^6.0.0",
-    "sanitize-html": "^2.11.0",
-    "sharp": "^0.33.0",
-    "slug": "^9.0.0",
-    "tailwindcss": "^3.3.3",
-    "typescript": "^5.1.6"
-  }
+    "typescript": "^5.4.5"
+  },
+  "packageManager": "pnpm@8.15.6+sha256.01c01eeb990e379b31ef19c03e9d06a14afa5250b82e81303f88721c99ff2e6f"
 }