Rework directory structure

.devcontainer/devcontainer.json

@@ -1,32 +1,27 @@
 {
-	"name": "Go",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
+  "name": "Typescript",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
   "features": {
-		"docker-in-docker": {
-			"version": "latest",
-			"moby": true
-		},
-		"azure-cli": "latest",
-		"ghcr.io/devcontainers/features/github-cli:1": {},
-		"ghcr.io/devcontainers/features/node:1": {}
-	},
-
-	"remoteUser": "vscode",
-	"customizations": {
-		"vscode": {
-			"settings": {
-				"go.toolsManagement.checkForUpdates": "local",
-				"go.useLanguageServer": true,
-				"go.gopath": "/go",
-				"gopls": { "ui.semanticTokens": true }
-			}
-		},
-		"extensions": [
-			"github.copilot",
-			"golang.go"
-		]
-	},
-	"postCreateCommand": "./script/install-tools.sh"
+    "docker-in-docker": {
+      "version": "latest",
+      "moby": true
+    },
+    "azure-cli": "latest",
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/node:1": {}
+  },
+
+  "remoteUser": "vscode",
+  "customizations": {
+    "vscode": {
+      "settings": {}
+    },
+    "extensions": [
+      "github.copilot",
+      "dbaeumer.vscode-eslint",
+      "esbenp.prettier-vscode"
+    ]
+  }
 }

.env.example

@@ -0,0 +1,2 @@
+GRAPHQL_TOKEN="<YOUR TOKEN HERE>"
+NEXT_TELEMETRY_DISABLED=1 

.github/dependabot.yml

@@ -5,19 +5,19 @@ registries:
     type: docker-registry
     url: ghcr.io
     username: PAT
-    password: "${{secrets.CONTAINER_BUILDER_TOKEN}}"
+    password: '${{secrets.CONTAINER_BUILDER_TOKEN}}'
 updates:
-- package-ecosystem: "gomod"
-  directory: "/"
-  schedule:
-    interval: weekly
-- package-ecosystem: docker
-  registries:
-  - ghcr
-  directory: "/"
-  schedule:
-    interval: weekly
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: weekly
+  - package-ecosystem: 'gomod'
+    directory: '/'
+    schedule:
+      interval: weekly
+  - package-ecosystem: docker
+    registries:
+      - ghcr
+    directory: '/'
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: '/'
+    schedule:
+      interval: weekly

.github/workflows/codeql.yml

@@ -1,10 +1,10 @@
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ['main']
   pull_request:
-    branches: [ "main" ]
+    branches: ['main']
 
 jobs:
   analyze:
@@ -17,18 +17,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'go' ]
+        language: ['javascript']
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        queries: security-and-quality
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          queries: security-and-quality
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: '/language:${{matrix.language}}'

.github/workflows/nextjs.yml

@@ -1,13 +1,9 @@
-# Sample workflow for building and deploying a Next.js site to GitHub Pages
-#
-# To get started with Next.js see: https://nextjs.org/docs/getting-started
-#
 name: Deploy Next.js site to Pages
 
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main"]
+    branches: ['main']
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -27,7 +23,7 @@ env:
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: "pages"
+  group: 'pages'
   cancel-in-progress: false
 
 jobs:
@@ -37,26 +33,26 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Node for metrics backend
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: '20.x'
       - name: Collect metrics and save output
         id: metrics
         run: |
-          cd ts-backend
+          cd backend
           npm i
-          npm start
+          npm run dev
       - name: Detect package manager
         id: detect-package-manager
         run: |
-          if [ -f "${{ github.workspace }}/who-metrics-ui/yarn.lock" ]; then
+          if [ -f "${{ github.workspace }}/app/yarn.lock" ]; then
             echo "manager=yarn" >> $GITHUB_OUTPUT
             echo "command=install" >> $GITHUB_OUTPUT
             echo "runner=yarn" >> $GITHUB_OUTPUT
             echo "cache-dependency-path=**/yarn.lock" >> $GITHUB_OUTPUT
             exit 0
-          elif [ -f "${{ github.workspace }}/who-metrics-ui/package.json" ]; then
+          elif [ -f "${{ github.workspace }}/app/package.json" ]; then
             echo "manager=npm" >> $GITHUB_OUTPUT
             echo "command=ci" >> $GITHUB_OUTPUT
             echo "runner=npx --no-install" >> $GITHUB_OUTPUT
@@ -66,12 +62,6 @@ jobs:
             echo "Unable to determine package manager"
             exit 1
           fi
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.x"
-          cache: ${{ steps.detect-package-manager.outputs.manager }}
-          cache-dependency-path: ${{ steps.detect-package-manager.outputs.cache-dependency-path }}
       - name: Setup Pages
         uses: actions/configure-pages@v4
         with:
@@ -84,22 +74,20 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            "${{ github.workspace }}/who-metrics-ui/.next/cache"
+            "${{ github.workspace }}/app/.next/cache"
           # Generate a new cache whenever packages or source files change.
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
           # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
       - name: Install dependencies
-        run: cd "${{ github.workspace }}/who-metrics-ui" && ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
+        run: cd "${{ github.workspace }}/app" && ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
       - name: Build with Next.js
-        run: cd "${{ github.workspace }}/who-metrics-ui" && ${{ steps.detect-package-manager.outputs.runner }} next build
-      - name: Static HTML export with Next.js
-        run: cd "${{ github.workspace }}/who-metrics-ui" && ${{ steps.detect-package-manager.outputs.runner }} next export
+        run: cd "${{ github.workspace }}/app" && ${{ steps.detect-package-manager.outputs.runner }} next build
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: "${{ github.workspace }}/who-metrics-ui/out"
+          path: '${{ github.workspace }}/app/out'
 
   # Deployment job
   deploy:

.gitignore

@@ -1,3 +1,42 @@
-*.env
-tmp/*
-sbv-world-health-org-metrics.code-workspace
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# Data files - these get generated at buildtime. The README includes instructions for generating these.
+/src/data/data.json
+
+.env*
+!.env.example

.vscode/launch.json

@@ -1,24 +1,35 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Launch metrics (local)",
-      "type": "go",
+      "name": "App: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "cd app && npm run dev"
+    },
+    {
+      "name": "App: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "App: debug full stack",
+      "type": "node-terminal",
       "request": "launch",
-      "mode": "debug",
-      "program": "${workspaceFolder}/backend/cmd/main.go",
-      "envFile": "${workspaceFolder}/dev.vscode.env"
+      "command": "cd app && npm run dev",
+      "serverReadyAction": {
+        "pattern": "- Local:.+(https?://.+)",
+        "uriFormat": "%s",
+        "action": "debugWithChrome"
+      }
     },
     {
-      "name": "Next.js: debug metrics",
+      "name": "Backend: Debug",
       "type": "node-terminal",
       "request": "launch",
-      "cwd": "${workspaceFolder}/ts-backend",
-      "command": "npm run start",
-      "envFile": "${workspaceFolder}/ts-backend/.env"
+      "command": "cd backend && npm run dev",
+      "envFile": "${workspaceFolder}/.env"
     }
   ]
 }