Replacing main with updated version

.devcontainer/devcontainer.json

@@ -20,6 +20,5 @@
 
   // Use 'postCreateCommand' to run commands after the container is created.
   // Note: Useful for when they open it and want everything to just start
-  "postCreateCommand": "./.devcontainer/setup.sh",
-  "postStartCommand": "./.devcontainer/post_start.sh"
+  "postCreateCommand": "./.devcontainer/setup.sh"
 }

.devcontainer/setup.sh

@@ -25,16 +25,5 @@ fi
 (cd server && POETRY_VIRTUALENVS_CREATE=false poetry install)
 (cd client && npm install)
 
-# Run the database in the background
-docker compose up -d
-
-# Wait for the database to start
-# Get the container ID of the db service
-DB_CONTAINER_ID=$(docker compose ps -q db)
-echo "Waiting for the database to be ready..."
-until [ "$(docker inspect -f '{{.State.Health.Status}}' "$DB_CONTAINER_ID")" == "healthy" ]; do
-    sleep 1
-done
-
 # Nuke and migrate db
 (cd server && ./nuke.sh)

.env.prod.example

@@ -8,12 +8,6 @@ APP_NAME=DjangoAPI
 API_SECRET_KEY= CHANGE THIS TO A RANDOM STRING
 API_ALLOWED_HOSTS=".localhost 127.0.0.1 [::1] .codersforcauses.org"
 
-POSTGRES_HOST=db
-POSTGRES_NAME=postgres
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-POSTGRES_PORT=5432
-
 DJANGO_SUPERUSER_PASSWORD= CHANGE THIS TO A RANDOM STRING
 DJANGO_SUPERUSER_EMAIL= CHANGE THIS TO A VALID EMAIL
 DJANGO_SUPERUSER_USERNAME= CHANGE THIS TO A VALID USERNAME

README.md

@@ -4,7 +4,7 @@ Django + Nextjs Template: Standardised CFC Tech Stack
 
 ---
 
-## Quick Start (Dev Container) - Recommended
+## Quick Start (Dev Container)
 
 The easiest way to get started is using the VS Code Dev Container:
 
@@ -37,90 +37,52 @@ The easiest way to get started is using the VS Code Dev Container:
 
 **Note**: Only follow these steps if you're NOT using the dev container.
 
-### Prerequisites
+### Installation Steps
+
+#### 1. Install Prerequisites
 
-- **Node.js 18+** and **npm** - [Download here](https://nodejs.org/)
+- **Node.js 20+** and **npm** - [Download here](https://nodejs.org/)
 - **Python 3.12+** - [Download here](https://python.org/)
 - **Poetry** (Python package manager) - [Installation guide](https://python-poetry.org/docs/#installation)
-- **Docker Desktop** - [Download here](https://www.docker.com/products/docker-desktop/)
-
-### Installation Steps
 
-#### 1. Clone the Repository
+#### 2. Clone the Repository
 ```bash
 git clone <your-repo-url>
 cd <project-name>
 ```
 
-#### 2. Install Prerequisites
+#### 3. Set Up Environment Variables
 
-**Poetry (Python package manager)**
-```bash
-# Official installer (all OSes)
-curl -sSL https://install.python-poetry.org | python3 -
-
-# If that fails, use pip (all OSes)
-pip install poetry
-```
-
-#### 3. Start the Database
+The client and server are configured by `.env` files, local to your device and not tracked by git.
+To set these up you can simply copy the `.env.example` files in each to a new `.env` file.
 
-```bash
-cd server && docker compose up -d
-```
-
-#### 4. Set Up Environment Variables
-
-Before proceeding, create your environment files by copying the examples:
+Run the command below to do this automatically (system dependant).
 ```bash
 cp ./client/.env.example ./client/.env && cp ./server/.env.example ./server/.env
 ```
 
-**Backend (`.env` in `server/`)**
-```env
-APP_NAME=DjangoAPI
-APP_ENV=DEVELOPMENT
-API_SECRET_KEY=your-secret-key-here
-API_ALLOWED_HOSTS=.localhost 127.0.0.1 [::1]
-
-POSTGRES_HOST=localhost
-POSTGRES_NAME=your_db_name
-POSTGRES_USER=your_username
-POSTGRES_PASSWORD=your_password
-POSTGRES_PORT=5432
-
-DJANGO_SUPERUSER_PASSWORD=Password123
-DJANGO_SUPERUSER_EMAIL=admin@test.com
-DJANGO_SUPERUSER_USERNAME=admin
-
-FRONTEND_URL=http://localhost:3000
-```
-
-**Frontend (`.env` in `client/`)**
-```env
-NEXT_PUBLIC_BACKEND_URL=http://localhost:8000
-```
-
-#### 5. Set Up the Backend (Django)
+#### 4. Set Up the Backend (Django)
 ```bash
 cd server
 poetry install
-poetry shell
+
+eval $(poetry env activate) #Bash/Zsh/Csh
+Invoke-Expression (poetry env activate) #Powershell
+
 python manage.py migrate
 python manage.py createsuperuser  # optional
 python manage.py runserver
 ```
 
-#### 6. Set Up the Frontend (Next.js)
+#### 5. Set Up the Frontend (Next.js)
 ```bash
 cd client
 npm install
 npm run dev
 ```
 
-#### 7. Verify Installation
+#### 6. Verify Installation
 - Frontend: [http://localhost:3000](http://localhost:3000)
-- Backend API: [http://localhost:8000](http://localhost:8000)
 - Admin panel: [http://localhost:8000/admin](http://localhost:8000/admin)
 
 ---

client/eslint.config.mjs

@@ -1,38 +1,25 @@
-import { defineConfig } from "eslint/config";
+import { FlatCompat } from '@eslint/eslintrc'
+import importPlugin from "eslint-plugin-import";
 import simpleImportSort from "eslint-plugin-simple-import-sort";
-import _import from "eslint-plugin-import";
-import { fixupPluginRules } from "@eslint/compat";
 import tsParser from "@typescript-eslint/parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
+  baseDirectory: import.meta.dirname,
 });
 
-export default defineConfig([
+const eslintConfig =[
+  ...compat.config({
+    extends: ["next/core-web-vitals", "next/typescript"]
+  }),
   {
     files: ["**/*.ts", "**/*.tsx"],
-    extends: compat.extends(
-      "plugin:@next/next/recommended",
-      "plugin:@tanstack/eslint-plugin-query/recommended",
-    ),
-
     plugins: {
-      "simple-import-sort": simpleImportSort,
-      import: fixupPluginRules(_import),
+      'simple-import-sort': simpleImportSort,
+      import: importPlugin,
     },
-
     languageOptions: {
       parser: tsParser,
     },
-
     rules: {
       "simple-import-sort/imports": "warn",
       "simple-import-sort/exports": "warn",
@@ -41,4 +28,9 @@ export default defineConfig([
       "import/no-duplicates": "warn",
     },
   },
-]);
+  {
+    ignores: ["node_modules/**", ".next/**", "next-env.d.ts"]
+  }
+];
+
+export default eslintConfig

client/next.config.mjs

@@ -1,23 +1,24 @@
-import os from "node:os";
+// import os from "node:os";
+// import isInsideContainer from "is-inside-container";
 
-import isInsideContainer from "is-inside-container";
-
-const isWindowsDevContainer = () =>
-  os.release().toLowerCase().includes("microsoft") && isInsideContainer();
+// const isWindowsDevContainer = () =>
+//   os.release().toLowerCase().includes("microsoft") && isInsideContainer();
 
 /** @type {import('next').NextConfig} */
-const nextConfig = {
+
+const config = {
   reactStrictMode: true,
-  // dumb fix for windows docker
-  webpack: isWindowsDevContainer()
-    ? (config) => {
-        config.watchOptions = {
-          poll: 1000,
-          aggregateTimeout: 300,
-        };
-        return config;
-      }
-    : undefined,
+  turbopack: {
+    root: import.meta.dirname,
+  },
+  outputFileTracingRoot: import.meta.dirname,
+  // Turns on file change polling for the Windows Dev Container
+  // Doesn't work currently for turbopack, so file changes will not automatically update the client.
+    // watchOptions: isWindowsDevContainer()
+    // ? {
+    //     pollIntervalMs: 1000
+    //   }
+    // : undefined,
 };
 
-export default nextConfig;
+export default config;

client/package.json

@@ -2,6 +2,9 @@
   "name": "client",
   "version": "0.1.0",
   "private": true,
+  "engines":{
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "next build",

client/src/lib/utils.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 

client/tailwind.config.ts

@@ -1,5 +1,6 @@
 import type { Config } from "tailwindcss";
 import { fontFamily } from "tailwindcss/defaultTheme";
+import animate from "tailwindcss-animate";
 
 const config = {
   darkMode: ["class"],
@@ -78,7 +79,7 @@ const config = {
       },
     },
   },
-  plugins: [require("tailwindcss-animate")],
+  plugins: [animate],
 } satisfies Config;
 
 export default config;

docker-compose.prod.yml

@@ -1,16 +1,4 @@
 services:
-  db:
-    image: postgres:16.4
-    restart: unless-stopped
-    volumes:
-      - ./data/db:/var/lib/postgresql/data
-    env_file: ./.env.prod
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 3s
-      timeout: 3s
-      retries: 5
-
   server:
     image: ghcr.io/codersforcauses/transplant-prod-server:latest
     container_name: transplant_server
@@ -24,8 +12,6 @@ services:
       - ./opt/static_files:/opt/static_files
     environment:
       - DJANGO_SETTINGS_MODULE=api.settings
-    depends_on:
-      - db
 
   client:
     image: ghcr.io/codersforcauses/transplant-prod-client:latest

docker/server/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.12-slim
 
-RUN apt-get update && apt-get install --yes --no-install-recommends postgresql-client g++ libssl-dev && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install --yes --no-install-recommends g++ libssl-dev && rm -rf /var/lib/apt/lists/*
 
 RUN pip install --upgrade pip && pip install poetry
 

docker/server/entrypoint.sh

@@ -1,16 +1,5 @@
 #!/bin/bash
 
-# Wait until Database is available before continuing
-printf "\n" && echo "Checking Database is up"
-# using psql
-while ! pg_isready -q -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER
-do
-  echo "$(date) - waiting for database to start"
-  sleep 1
-done
-
->&2 echo "Postgres is up - continuing"
-
 echo "Applying database migrations"
 python manage.py migrate --noinput
 

server/.env.example

@@ -4,12 +4,6 @@ APP_ENV=DEVELOPMENT
 API_SECRET_KEY="supersecretkey"
 API_ALLOWED_HOSTS=".localhost 127.0.0.1 [::1]"
 
-POSTGRES_HOST=localhost
-POSTGRES_NAME=postgres
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-POSTGRES_PORT=5432
-
 DJANGO_SUPERUSER_PASSWORD=Password123
 DJANGO_SUPERUSER_EMAIL=admin@test.com
 DJANGO_SUPERUSER_USERNAME=admin