Astro rewrite

.dockerignore

@@ -1,36 +1,13 @@
-# Version control
-.git
-.gitignore
-.gitattributes
-
-# Dependencies
 node_modules
-npm-debug.log
-yarn-debug.log
-yarn-error.log
-
-# Build output
+.astro
 dist
-build
-coverage
-
-# Development
+.git
+.github
+.husky
+docs
+.claude
+.agent*
 *.log
-.DS_Store
-.vscode
-.idea
-
-# Tests
-test
-coverage
-*.spec.ts
-*.test.ts
-
-# Documentation
+.env*
 README.md
-docs
-*.md
-
-# Docker
-Dockerfile
-.dockerignore
+lighthouserc.cjs

.github/workflows/ci.yml

@@ -2,30 +2,64 @@ name: CI
 
 on:
   push:
-    branches: ['master']
+    branches: ['astro-rewrite', 'master']
   pull_request:
-    branches: ['master']
+    branches: ['astro-rewrite', 'master']
+
+permissions:
+  contents: read
 
 jobs:
   build:
+    name: Build + check
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
+      - uses: actions/setup-node@v4
         with:
-          bun-version: latest
-
-      - name: Install dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Type check
-        run: bun run type-check
+          node-version: '22'
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.2'
+      - run: bun install --frozen-lockfile
+      # `bun run build` chains: fetch → astro check → astro build. Splitting
+      # check into its own step would fail because the typed JSON imports
+      # depend on the data fetched in the build step.
+      - run: bun run build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist
+          retention-days: 1
 
-      - name: Build
-        run: bun run build-only
+  lighthouse:
+    name: Lighthouse CI
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.2'
+      - run: bun install --frozen-lockfile
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist
+      - run: bunx @lhci/cli@0.15 autorun --config=./lighthouserc.cjs
 
-      - name: Test Docker build
-        run: docker build -t test .
+  docker:
+    name: Docker smoke build
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+      - run: docker build -t nedaa-website:ci .
+      - name: Smoke test
+        run: |
+          docker run --rm -d --name web -p 8080:80 nedaa-website:ci
+          for _ in 1 2 3 4 5; do sleep 2; curl -fsS http://localhost:8080/ && break; done
+          docker rm -f web

.github/workflows/deploy.yml

@@ -18,13 +18,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Create .env file
-        run: |
-          echo "VITE_HEALTH_CHECK_URL=${{ secrets.VITE_HEALTH_CHECK_URL }}" >> .env
-          echo "VITE_CROWDIN_API_TOKEN=${{ secrets.VITE_CROWDIN_API_TOKEN }}" >> .env
-          echo "VITE_CROWDIN_PROJECT_ID=${{ secrets.VITE_CROWDIN_PROJECT_ID }}" >> .env
-          echo "VITE_CROWDIN_PROJECT_URL=${{ secrets.VITE_CROWDIN_PROJECT_URL }}" >> .env
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

.gitignore

@@ -30,4 +30,14 @@ coverage
 *.tsbuildinfo
 
 
-.env
+.env
+
+# Astro
+.astro/
+
+# Lighthouse CI
+.lighthouseci/
+src/data/release.json
+src/data/prayers-default.json
+src/data/prayer-providers.json
+src/data/github.json

Dockerfile

@@ -1,59 +1,26 @@
-# Use Bun for faster builds
-FROM oven/bun:1-alpine AS base
+# syntax=docker/dockerfile:1.7
 
-# Install security updates
-RUN apk add --no-cache dumb-init && \
-    apk upgrade
-
-# Create non-root user for security
-RUN addgroup -g 1001 -S appgroup && \
-    adduser -S appuser -u 1001 -G appgroup
-
-# Set working directory
+# ---- deps ---------------------------------------------------------------
+FROM oven/bun:1.3-alpine AS deps
 WORKDIR /app
-
-# Change ownership of working directory
-RUN chown -R appuser:appgroup /app
-
-# Switch to non-root user
-USER appuser
-
-# Copy package files
-COPY --chown=appuser:appgroup package.json bun.lock* ./
-
-# Install dependencies
+COPY package.json bun.lock ./
 RUN bun install --frozen-lockfile
 
-# === Build stage ===
-FROM base AS builder
-
-# Copy source code (including .env created by CI)
-COPY --chown=appuser:appgroup . .
-
-# Build the Vue app with env file loaded
-RUN bun --env-file=.env run build-only
-
-# === Production stage ===
-FROM nginx:alpine AS production
-
-# Install security updates and dumb-init
-RUN apk add --no-cache dumb-init && \
-    apk upgrade
-
-# Copy built Vue app from builder stage
-COPY --from=builder /app/dist /usr/share/nginx/html
-
-# Copy custom nginx configuration
-COPY deployment/config/nginx.conf /etc/nginx/conf.d/default.conf
-
-# Set environment variables
+# ---- build --------------------------------------------------------------
+FROM oven/bun:1.3-alpine AS build
+WORKDIR /app
 ENV NODE_ENV=production
-
-# Expose port
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+RUN bun run build
+
+# ---- runtime ------------------------------------------------------------
+FROM nginx:1.27-alpine AS runtime
+RUN apk add --no-cache curl \
+ && rm /etc/nginx/conf.d/default.conf
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist /usr/share/nginx/html
 EXPOSE 80
-
-# Use dumb-init to handle signals properly
-ENTRYPOINT ["dumb-init", "--"]
-
-# Start nginx
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+  CMD curl -fsS http://localhost/ >/dev/null || exit 1
 CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -2,46 +2,10 @@
 
 # nedaa-website
 
-This template should help get you started developing with Vue 3 in Vite.
-
-## Recommended IDE Setup
-
-[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
-
-## Type Support for `.vue` Imports in TS
-
-TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types.
-
-## Customize configuration
-
-See [Vite Configuration Reference](https://vite.dev/config/).
-
-## Project Setup
+Site for [Nedaa](https://nedaa.dev).
 
 ```sh
 bun install
-```
-
-### Compile and Hot-Reload for Development
-
-```sh
-bun dev
-```
-
-### Type-Check, Compile and Minify for Production
-
-```sh
+bun run dev
 bun run build
 ```
-
-### Run Unit Tests with [Vitest](https://vitest.dev/)
-
-```sh
-bun test:unit
-```
-
-### Lint with [ESLint](https://eslint.org/)
-
-```sh
-bun lint
-```

astro.config.ts

@@ -0,0 +1,47 @@
+import { defineConfig, fontProviders } from 'astro/config';
+import { fileURLToPath } from 'node:url';
+import svelte from '@astrojs/svelte';
+import sitemap from '@astrojs/sitemap';
+
+export default defineConfig({
+  site: 'https://nedaa.dev',
+  output: 'static',
+  integrations: [svelte(), sitemap()],
+  fonts: [
+    {
+      name: 'Asap',
+      cssVariable: '--f-sans',
+      provider: fontProviders.fontsource(),
+      weights: ['400 700'],
+      styles: ['normal'],
+      subsets: ['latin'],
+      fallbacks: ['system-ui', '-apple-system', 'Segoe UI', 'Roboto', 'sans-serif'],
+    },
+    {
+      name: 'IBM Plex Sans Arabic',
+      cssVariable: '--f-arabic',
+      provider: fontProviders.fontsource(),
+      weights: [500],
+      styles: ['normal'],
+      subsets: ['arabic'],
+      fallbacks: ['Noto Sans Arabic', 'Tahoma', 'Geeza Pro', 'system-ui', 'sans-serif'],
+    },
+  ],
+  i18n: {
+    defaultLocale: 'en',
+    locales: ['en', 'ar', 'ms', 'ur'],
+    routing: { prefixDefaultLocale: false },
+  },
+  build: {
+    inlineStylesheets: 'always',
+    assets: '_astro',
+  },
+  devToolbar: { enabled: true },
+  vite: {
+    resolve: {
+      alias: {
+        '@': fileURLToPath(new URL('./src', import.meta.url)),
+      },
+    },
+  },
+});