diff --git a/README.md b/README.md
index 4bd635c..2c7a78a 100644
--- a/README.md
+++ b/README.md
@@ -1,130 +1,110 @@
-# minxa.lol URL Shortener
+# minxa.lol β URL Shortener
-minxa.lol is a lightweight and efficient URL shortening service built with **FastAPI**, **SQLAlchemy**, and **Hashids**. It converts long URLs into short, shareable codes and provides redirection to the original URLs.
+
+
+
+
+**minxa.lol** is a lightweight and modern URL shortening service built with **FastAPI** and **React**. It transforms long URLs into compact, unique shortcodes and offers instant redirection.
---
-## Features
+## β¨ Features
-* π Shorten URLs into unique shortcodes
-* π Redirect to original URLs using the shortcode
-* β
Validates shortcode format
-* π Built with modern async Python stack
-* π§ Configurable encoding via `hashids`
+* π Shorten long URLs to human-friendly shortcodes
+* π Redirects that are fast and reliable
+* π₯ Frontend with React, TypeScript, Tailwind CSS
+* βοΈ Environment-based configuration
+* π Validation and error handling out of the box
+* π§© Modular backend with Hashids encoding
---
-## Tech Stack
+## π§° Tech Stack
-* FastAPI
-* SQLAlchemy (async + sync)
-* PostgreSQL
-* Hashids
-* Alembic (for migrations)
-* Pydantic / Pydantic Settings
-* Uvicorn (ASGI server)
+### Backend
+
+* **FastAPI** β Async-first Python web framework
+* **SQLAlchemy (async)** β ORM for PostgreSQL
+* **Hashids** β Generates non-sequential codes
+* **Alembic** β DB migrations
+* **Uvicorn** β ASGI server
+
+### Frontend
+
+* **React** + **Vite** β Fast SPA setup
+* **Redux Toolkit** β State management
+* **Tailwind CSS** β Modern utility styling
+* **TypeScript** β Typed components
---
-## Getting Started
+## π How to Run (Docker)
-### 1. Clone the repository
+### 1. Clone the Repository
```bash
-git clone https://github.com/yourusername/minxa.git
-cd minxa
+git clone https://github.com/yourusername/minxa.lol.git
+cd minxa.lol
```
-### 2. Create and configure your environment file
+### 2. Generate Environment Files
-Copy the example file and update it with your local settings:
+Use the helper script to generate `.env` files for both the frontend and backend:
```bash
-cp .env.example .env
+python generate_configs.py
```
-Required variables in `.env`:
+This will auto-populate required environment variables based on example templates.
-```env
-DATABASE_URL=postgresql+asyncpg://user:password@localhost:5432/minxa
-ENVIRONMENT=dev
-HASHIDS_SALT=your-secret-salt
-ENCODER_ALPHABET=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890
-```
-
-### 3. Install dependencies
+### 3. Start the Project with Docker Compose
```bash
-pip install -r requirements.txt
+docker compose -f docker-compose.generated.yml up --build -d
```
-### 4. Run the application
+Docker will spin up both frontend and backend containers with the correct configuration.
-```bash
-uvicorn app.main:app --reload
+### 4. Access the App
+
+* Frontend: [http://localhost:3000](http://localhost:3000)
+* Backend API: [http://localhost:8000](http://localhost:8000)
+
+Ensure Docker is installed and running on your machine before executing these steps.
+
+---
+
+## π Project Structure
+
+```
+minxa.lol/
+βββ backend/
+β βββ db/ # DB connection
+β βββ models/ # SQLAlchemy models
+β βββ routes/ # FastAPI routers
+β βββ schemas/ # Pydantic schemas
+β βββ services/ # Business logic
+β βββ utils/ # Encoding, helpers
+β
+βββ frontend/
+β βββ src/
+β β βββ api/ # API layer
+β β βββ app/ # Redux store
+β β βββ features/ # Feature slices
+β β βββ pages/ # React pages
+β β βββ utils/ # Client utilities
+β
+βββ generate_configs.py # Env setup script
```
---
-## API Endpoints
+## π License
-### `POST /`
-
-Create a new shortened URL.
-
-**Request Body:**
-
-```json
-{
- "url": "https://example.com"
-}
-```
-
-**Response:**
-
-```json
-{
- "shortcode": "abc123",
- "url": "https://example.com"
-}
-```
+Licensed under the MIT License. See the [LICENSE](./LICENSE) file for details.
---
-### `GET /{shortcode}`
+## π€ Contributing
-Redirects to the original URL associated with the given shortcode.
-
-**Example:**
-
-```bash
-curl -v http://localhost:8000/abc123
-```
-
-Returns a `302` redirect to the original URL.
-
----
-
-## Project Structure
-
-```
-app/
-βββ main.py # FastAPI entry point
-βββ config.py # Environment and settings
-βββ database.py # Database setup
-βββ models/ # SQLAlchemy models
-βββ routes/ # API endpoints
-βββ services/ # URL logic
-βββ schemas/ # Pydantic schemas
-βββ utils/ # Encoder logic using hashids
-βββ exceptions.py # Custom exceptions
-```
-
----
-
-## Development Notes
-
-* Database tables auto-create in development mode
-* Encoder uses Hashids for deterministic, unique shortcodes
-* Uses `pydantic` for validation and FastAPI's dependency injection
-* Alembic is available for database migrations
\ No newline at end of file
+Pull requests are welcome. For major changes, open an issue first to discuss improvements or features.
diff --git a/backend/README.md b/backend/README.md
new file mode 100644
index 0000000..982acc0
--- /dev/null
+++ b/backend/README.md
@@ -0,0 +1,86 @@
+# minxa.lol β Backend
+
+This is the **FastAPI-based** backend service for [minxa.lol](https://minxa.lol), a modern and lightweight URL shortener.
+
+---
+
+## π§° Tech Stack
+
+* **FastAPI** β Async web framework
+* **SQLAlchemy (async)** β Database ORM
+* **PostgreSQL** β Primary data store
+* **Hashids** β Encodes IDs into short strings
+* **Alembic** β Database migrations
+* **Uvicorn** β ASGI server
+
+---
+
+## βοΈ Environment Setup
+
+### 1. Create a virtual environment
+
+```bash
+python3 -m venv venv
+source venv/bin/activate
+```
+
+### 2. Install dependencies
+
+```bash
+pip install -r requirements.txt
+```
+
+### 3. Create `.env` file
+
+```bash
+cp .env.example .env
+```
+
+Edit the `.env` file to include your local database connection:
+
+```env
+DATABASE_URL=postgresql+asyncpg://user:password@localhost:5432/minxadatabase
+```
+
+---
+
+## π Running the Backend
+
+### Development Server
+
+```bash
+uvicorn backend.main:app --reload --app-dir ..
+```
+
+### Production Server (via Docker Compose)
+
+From the root of the project:
+
+```bash
+python generate_configs.py
+
+docker compose -f docker-compose.generated.yml up --build -d
+```
+
+---
+
+## π Directory Overview
+
+```
+backend/
+βββ db/ # DB engine & session
+βββ models/ # SQLAlchemy models
+βββ routes/ # FastAPI routers
+βββ schemas/ # Pydantic request/response schemas
+βββ services/ # Business logic
+βββ utils/ # Hashid encoder and other helpers
+βββ main.py # FastAPI entrypoint
+βββ config.py # Environment configuration
+βββ requirements.txt
+```
+
+---
+
+## π§ͺ Testing (Coming Soon)
+
+Unit and integration tests will be added using **pytest**.
\ No newline at end of file
diff --git a/frontend/README.md b/frontend/README.md
index b87cb00..6216137 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,46 +1,96 @@
-# Getting Started with Create React App
+# minxa.lol β Frontend
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+This is the **React-based frontend** for [minxa.lol](https://minxa.lol), a modern and lightweight URL shortener.
-## Available Scripts
+---
-In the project directory, you can run:
+## π§° Tech Stack
-### `npm start`
+* **React** β Frontend UI framework
+* **TypeScript** β Typed JavaScript
+* **Create React App** β App bootstrap and tooling
+* **Tailwind CSS** β Utility-first styling
+* **Redux Toolkit** β State management
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+---
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
+## βοΈ Environment Setup
-### `npm test`
+### 1. Install Dependencies
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+```bash
+npm install
+```
-### `npm run build`
+### 2. Create `.env` File
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
+```bash
+cp .env.example .env
+```
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
+Edit the `.env` file to configure the API URL:
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+```env
+REACT_APP_API_BASE_URL=http://localhost:8000
+```
-### `npm run eject`
+---
-**Note: this is a one-way operation. Once you `eject`, you canβt go back!**
+## π Running the Frontend
-If you arenβt satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+### Development Server
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point youβre on your own.
+```bash
+npm start
+```
-You donβt have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldnβt feel obligated to use this feature. However we understand that this tool wouldnβt be useful if you couldnβt customize it when you are ready for it.
+This starts the development server on [http://localhost:3000](http://localhost:3000).
-## Learn More
+### Production Build
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+```bash
+npm run build
+```
-To learn React, check out the [React documentation](https://reactjs.org/).
+### Test
+
+```bash
+npm test
+```
+
+### Docker (via Docker Compose)
+
+From the root of the project:
+
+```bash
+python generate_configs.py
+
+docker compose -f docker-compose.generated.yml up --build -d
+```
+
+---
+
+## π Directory Overview
+
+```
+frontend/
+βββ public/ # Static assets
+βββ src/
+β βββ api/ # API functions
+β βββ app/ # Redux store and hooks
+β βββ features/ # Feature slices
+β βββ pages/ # Page components
+β βββ routes/ # App router
+β βββ utils/ # Client-side utilities
+βββ .env.example # Sample environment file
+βββ package.json # Project config and scripts
+βββ tailwind.config.js
+βββ tsconfig.json
+βββ README.md
+```
+
+---
+
+## π§ͺ Testing (Coming Soon)
+
+Testing will be supported via **React Testing Library** and **Jest**.
\ No newline at end of file
diff --git a/generate_configs.py b/generate_configs.py
index cd64426..9642191 100644
--- a/generate_configs.py
+++ b/generate_configs.py
@@ -2,9 +2,14 @@ import secrets
import random
from pathlib import Path
-# === Prompt user input === #
-react_api_url = input("π§ Enter the REACT_APP_API_BASE_URL (e.g. https://minxa.wtf): ").strip()
-allow_origins = input("π Enter allowed CORS origins for the backend comma-separated (e.g. https://minxa.lol,https://minxo.lol): ").strip()
+# === Prompt user input with defaults === #
+react_api_url = input("π§ Enter the REACT_APP_API_BASE_URL (default: http://localhost:8000): ").strip()
+if not react_api_url:
+ react_api_url = "http://localhost:8000"
+
+allow_origins = input("π Enter allowed CORS origins (comma-separated) (default: http://localhost:3000,http://127.0.0.1:3000): ").strip()
+if not allow_origins:
+ allow_origins = "http://localhost:3000,http://127.0.0.1:3000"
# Ask for environment and validate input
valid_envs = ["dev", "stage", "prod"]
@@ -63,7 +68,7 @@ compose_yml = f"""services:
volumes:
- postgres_data:/var/lib/postgresql/data
healthcheck:
- test: ["CMD", "pg_isready", "-U", {db_user}, "-d", {db_name}]
+ test: ["CMD", "pg_isready", "-U", "{db_user}", "-d", "{db_name}"]
interval: 5s
timeout: 5s
retries: 5
@@ -108,4 +113,4 @@ compose_path.write_text(compose_yml)
print(f"β
docker-compose.generated.yml written")
print("\nπ All files generated! Run your stack with:\n")
-print("docker compose -f docker-compose.generated.yml up --build")
+print(" docker compose -f docker-compose.generated.yml up --build -d")
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..2e8e1b8
Binary files /dev/null and b/logo.png differ