diff --git a/.concat.conf b/.concat.conf new file mode 100644 index 0000000..8c91384 --- /dev/null +++ b/.concat.conf @@ -0,0 +1,5 @@ +Afrontend/lib +backend/tests +backend/user_auth_service/app +backend/event_ticketing_service/app + diff --git a/.env.template b/.env.template index 8045dcf..e8be869 100644 --- a/.env.template +++ b/.env.template @@ -9,3 +9,9 @@ DB_PASSWORD=localpassword SECRET_KEY=a-very-secret-key-for-local-development-change-me ACCESS_TOKEN_EXPIRE_MINUTES=30 ADMIN_SECRET_KEY=local-admin-secret-key +INITIAL_ADMIN_EMAIL=admin@resellio.com +INITIAL_ADMIN_PASSWORD=AdminPassword123! + +# SendGrid Email Configuration +EMAIL_API_KEY="api-key-placeholder" +EMAIL_FROM_EMAIL="sender-email-placeholder" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df31597..8801e9c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,15 +1,18 @@ -name: API Tests +name: Run Tests on: push: branches: [ main, dev ] pull_request: + # Be explicit about which events trigger the workflow for PRs + types: [ opened, synchronize, reopened ] branches: [ main, dev ] workflow_dispatch: jobs: - test: + backend-tests: runs-on: ubuntu-latest + name: "Backend Python Tests" steps: - name: Checkout code @@ -25,63 +28,36 @@ jobs: - name: Create .env file for Docker Compose run: | - source ./scripts/utils/print.bash - pretty_info "Creating root .env file for Docker Compose..." + echo "Creating .env file from template..." cp .env.template .env - pretty_success ".env file created successfully." - gen_separator '-' - pretty_info ".env content" - cat .env - gen_separator '-' + echo ".env file created." - - name: Start services with Docker Compose - run: | - source ./scripts/utils/print.bash - pretty_info "Starting services with Docker Compose..." - docker compose up -d --build - pretty_success "Services started." + - name: Run Backend API tests + run: ./scripts/actions/run_tests.bash backend local - - name: Wait for API to be ready - run: | - source ./scripts/utils/print.bash - pretty_info "Waiting for API Gateway to become healthy..." - timeout 120s bash -c ' - source ./scripts/utils/print.bash - until curl -fs http://localhost:8080/health &>/dev/null; do - pretty_info "Waiting for API Gateway..."; - sleep 5; - done - ' - pretty_success "API Gateway is ready!" + - name: Show logs on failure + if: failure() + run: echo "Test script failed. Logs are part of the script output." + + frontend-tests: + runs-on: ubuntu-latest + name: "Frontend Flutter Tests" + + steps: + - name: Checkout code + uses: actions/checkout@v4 - - name: Show running service status + # Combined the two run steps into one named step + - name: Prepare scripts and .env file run: | - source ./scripts/utils/print.bash - gen_separator '=' - pretty_info "Docker Compose Status" - docker compose ps - gen_separator '=' - pretty_info "Pinging health check endpoint again:" - curl -f http://localhost:8080/health + chmod +x ./scripts/utils/print.bash ./scripts/actions/run_tests.bash + echo "Creating .env file from template..." + cp .env.template .env + echo ".env file created." - - name: Run API tests - run: ./scripts/actions/run_tests.bash local + - name: Run Frontend (Flutter) tests via Docker Compose + run: ./scripts/actions/run_tests.bash frontend local - name: Show logs on failure if: failure() - run: | - source ./scripts/utils/print.bash - pretty_error "Tests failed. Dumping service logs..." - gen_separator '=' - pretty_info "Service Logs" - gen_separator '=' - docker compose logs - gen_separator '=' - - - name: Cleanup services - if: always() - run: | - source ./scripts/utils/print.bash - pretty_info "Cleaning up Docker Compose services and volumes..." - docker compose down -v - pretty_success "Cleanup complete." + run: echo "Test script failed. Logs are part of the script output." diff --git a/.gitignore b/.gitignore index f70a8fc..0cbb955 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ credentials.json # Temporary files / Misc tmp/ tmp + +concat.conf + +notes.py diff --git a/README.md b/README.md index 63160c3..7fad390 100644 --- a/README.md +++ b/README.md @@ -1,90 +1,305 @@ +# Resellio - The Modern Ticket Marketplace +Resellio is a full-stack, cloud-native ticketing marketplace platform built with a microservices architecture. It features a robust backend with FastAPI, a reactive Flutter frontend, and is fully deployable on AWS using Terraform. -# Resellio +[![API Tests](https://github.com/KwiatkowskiML/IO2/actions/workflows/tests.yml/badge.svg)](https://github.com/KwiatkowskiML/IO2/actions/workflows/tests.yml) -Resellio is a ticketing platform designed to simplify and automate the process of buying and selling tickets for various events such as concerts, sports matches, theater performances, and conferences. The platform caters to three primary roles: +## Table of Contents -- **User:** Can browse events, purchase tickets, manage their ticket portfolio, and even resell tickets in a secure and regulated manner. -- **Organizer:** Responsible for creating and managing events. Organizers can edit event details, manage ticket allocations, and communicate with users. -- **Administrator:** Oversees the entire system by verifying organizer accounts, managing users, and ensuring the platform operates smoothly and securely. +- [Core Features](#core-features) +- [Architecture](#architecture) +- [Tech Stack](#tech-stack) +- [Project Structure](#project-structure) +- [Getting Started (Local Development)](#getting-started-local-development) + - [Backend Setup](#backend-setup) + - [Frontend Setup](#frontend-setup) +- [Running Automated Tests](#running-automated-tests) +- [AWS Deployment (Terraform)](#aws-deployment-terraform) + - [Prerequisites](#prerequisites) + - [Step 1: Bootstrap Terraform Backend](#step-1-bootstrap-terraform-backend) + - [Step 2: Build and Push Docker Images](#step-2-build-and-push-docker-images) + - [Step 3: Deploy Main Infrastructure](#step-3-deploy-main-infrastructure) + - [Resetting the Database](#resetting-the-database) +- [CI/CD Pipeline](#cicd-pipeline) -## Technologies +## Core Features -- **Frontend:** Developed using Flutter for a responsive and engaging user interface. -- **Backend:** Powered by FastAPI (Python) to provide robust and scalable API services. -- **Deployment:** Utilizes Terraform and Docker to manage cloud infrastructure and containerization. +### Backend & API +- **Microservices Architecture**: Two main services for ```Authentication``` and ```Events/Ticketing```. +- **RESTful API**: Clean, well-defined API endpoints powered by FastAPI. +- **Role-Based Access Control (RBAC)**: Distinct roles for ```Customer```, ```Organizer```, and ```Administrator```. +- **JWT Authentication**: Secure, token-based authentication. +- **Admin Verification**: Organizers must be verified by an administrator before they can create events. +- **Event & Ticket Management**: Organizers can create events and define ticket types. +- **Shopping Cart**: Customers can add tickets to a cart and proceed to checkout. +- **Ticket Resale Marketplace**: Users can list their purchased tickets for resale and other users can buy them. -This repository marks the initial setup of the project, with more features and refinements to be added in future iterations. +### Frontend +- **Cross-Platform**: A single codebase for mobile and web, built with Flutter. +- **Reactive UI**: State management with BLoC/Cubit for a responsive and predictable user experience. +- **Role-Specific Dashboards**: Tailored user interfaces for Customers, Organizers, and Administrators. +- **Adaptive Layout**: Responsive design that works on both mobile and desktop screens. +- **Secure Routing**: ```go_router``` protects routes based on authentication status. -# Setup -```sh -cp backend/api_gateway/.env.template backend/api_gateway/.env -cp backend/event_ticketing_service/.env.template backend/event_ticketing_service/.env -``` +### Infrastructure & DevOps +- **Infrastructure as Code (IaC)**: Fully automated AWS deployment using Terraform. +- **Containerized Services**: All backend services are containerized with Docker for consistency. +- **Local Development Environment**: Simplified local setup using ```docker-compose```. +- **CI/CD Automation**: Automated testing pipeline with GitHub Actions. +- **Cloud-Native Deployment**: Leverages AWS ECS Fargate, Aurora Serverless, ALB, and Secrets Manager. -# Development -## Local Everything -Run all of the services: -```sh -docker-compose up -``` +## Architecture -You can then connect to your local dbs: -```sh -# User auth db -psql -h localhost -p 5432 -d resellio_db -U root -W +The project is designed with a clear separation of concerns, both in its local and cloud deployments. -# Event ticketing db -psql -h localhost -p 5433 -d resellio_event_ticketing_db -U root -W +```mermaid +graph TD + subgraph "User Interface" + Flutter[Flutter Web/Mobile App] + end -``` + subgraph "Local Environment (Docker Compose)" + direction LR + LocalGateway[Nginx API Gateway:8080] + LocalAuth[Auth Service] + LocalEvents[Events/Tickets Service] + LocalDB[(PostgreSQL)] -You will need to enter the passord: `my_password` -### Code Style + LocalGateway --> LocalAuth + LocalGateway --> LocalEvents + LocalAuth --> LocalDB + LocalEvents --> LocalDB + end -This repository uses pre-commit hooks with forced Python formatting ([black](https://github.com/psf/black), [flake8](https://flake8.pycqa.org/en/latest/), and [isort](https://pycqa.github.io/isort/)): + subgraph "AWS Cloud" + direction LR + ALB[Application Load Balancer] + EcsAuth["Auth Service (ECS Fargate)"] + EcsEvents["Events/Tickets Service (ECS Fargate)"] + EcsDBInit["DB Init Task (ECS Fargate)"] + AuroraDB[(Aurora DB)] + Secrets[AWS Secrets Manager] -```sh -pip install pre-commit -pre-commit install + ALB --> EcsAuth + ALB --> EcsEvents + EcsAuth --> AuroraDB + EcsEvents --> AuroraDB + EcsAuth -- reads secrets --> Secrets + EcsEvents -- reads secrets --> Secrets + EcsDBInit -- initializes --> AuroraDB + end + + subgraph "CI/CD & Registry" + GHA[GitHub Actions] + ECR[ECR Registry] + GHA -- builds & pushes --> ECR + EcsAuth -- pulls image from --> ECR + EcsEvents -- pulls image from --> ECR + EcsDBInit -- pulls image from --> ECR + end + + Flutter --> LocalGateway + Flutter --> ALB` ``` +## Tech Stack -Whenever you execute `git commit`, the files that were altered or added will be checked and corrected. Tools such as `black` and `isort` may modify files locally—in which case you must `git add` them again. You might also be prompted to make some manual fixes. +| Category | Technology | +|---------------|---------------------------------------------------------------------------------------------------------------| +| **Backend** | Python 3.12, FastAPI, SQLAlchemy, PostgreSQL, Nginx | +| **Frontend** | Flutter, Dart, BLoC/Cubit, ```go_router```, ```dio```, ```provider``` | +| **Cloud (AWS)** | ECS Fargate, Aurora Serverless (PostgreSQL), Application Load Balancer (ALB), S3, DynamoDB, Secrets Manager, ECR | +| **DevOps** | Docker, Docker Compose, Terraform, GitHub Actions | +| **Testing** | ```pytest```, ```requests``` | -To run the hooks against all files without running a commit: +## Project Structure -```sh -pre-commit run --all-files +``` +. +├── .github/workflows/ # GitHub Actions CI/CD pipelines +├── backend/ +│ ├── api_gateway/ # Nginx configuration for local API gateway +│ ├── db_init/ # Docker service to initialize DB schema and seed data +│ ├── event_ticketing_service/ # Events, tickets, cart, and resale microservice +│ ├── user_auth_service/ # User registration, login, and profile microservice +│ └── tests/ # Pytest integration and smoke tests +├── frontend/ # Flutter application for web and mobile +├── scripts/ # Helper bash scripts for tests and deployment +└── terraform/ + ├── bootstrap/ # Terraform to set up the remote state backend (S3/DynamoDB) + └── main/ # Main Terraform configuration for all AWS resources ``` -# Usage +## Getting Started (Local Development) -## Run User Service -```sh -cd backend -uvicorn user_service.main:app --reload --port 8001 -``` +### Backend Setup -## Run Events & Tickets Service -Run docker compose -```sh -cd backend/event_ticketing_service/db -docker-compose up -``` +Run the entire backend stack (API services, database, and gateway) locally using Docker. -Connect to the database -```sh -psql -h localhost -p 5432 -U root -d resellio_event_ticketing_db -``` +**Prerequisites:** +- Docker +- Docker Compose -Then run the service -```sh -cd backend -uvicorn event_ticketing_service.main:app --port 8002 -``` +**Steps:** +1. **Clone the Repository** + ```sh + git clone https://github.com/KwiatkowskiML/IO2.git + cd IO2 + ``` + +2. **Create ```.env``` File** + An ```.env``` file is required by Docker Compose to set environment variables for the services. A template is provided. + ```sh + cp .env.template .env + ``` + The default values in ```.env.template``` are configured to work with the local ```docker-compose.yml``` setup. + +3. **Start Services** + Build and start all services in detached mode. + ```sh + docker compose up --build -d + ``` + +4. **Access Services** + - **API Gateway**: ```http://localhost:8080``` + - **Health Check**: ```http://localhost:8080/health``` + - **PostgreSQL Database**: Connect on ```localhost:5432``` (credentials are in the ```.env``` file). -## Run Auth Service +5. **View Logs** + To see the logs from all running containers: + ```sh + docker compose logs -f + ``` + +6. **Stop Services** + To stop all services and remove the network: + ```sh + docker compose down + ``` + To also remove the database volume (deleting all data): + ```sh + docker compose down -v + ``` + +### Frontend Setup + +Run the Flutter application and connect it to the local backend. + +**Prerequisites:** +- Flutter SDK + +**Steps:** +1. **Navigate to the Frontend Directory** + ```sh + cd frontend + ``` +2. **Install Dependencies** + ```sh + flutter pub get + ``` +3. **Run the App** + The ```ApiClient``` in ```lib/core/network/api_client.dart``` is pre-configured to point to ```http://localhost:8080/api```. + ```sh + flutter run + ``` + +## Running Automated Tests + +The project includes a suite of integration tests that run against a live local environment. The ```tests.yml``` workflow runs these automatically. + +To run them manually: +1. Ensure the local backend services are **not** running (```docker compose down```). The test script will manage the lifecycle. +2. Make the scripts executable: + ```sh + chmod +x ./scripts/actions/run_tests.bash ./scripts/utils/print.bash + ``` +3. Run the test script: + ```sh + ./scripts/actions/run_tests.bash local + ``` + The script will: + - Start the Docker Compose services. + - Wait for the API to become available. + - Execute ```pytest``` against the endpoints. + - Show service logs if any tests fail. + - Clean up and stop all services. + +## AWS Deployment (Terraform) + +Deploy the entire application stack to AWS using Terraform. + +### Prerequisites +- AWS Account +- AWS CLI configured with credentials (```aws configure```) +- Terraform + +### Step 1: Bootstrap Terraform Backend +This step creates an S3 bucket and a DynamoDB table to store the Terraform state remotely and securely. **This only needs to be done once per AWS account/region.** + +1. Navigate to the bootstrap directory: + ```sh + cd terraform/bootstrap + ``` +2. Initialize Terraform: + ```sh + terraform init + ``` +3. Apply the configuration: + ```sh + terraform apply + ``` + This will create the necessary resources and generate a ```backend_config.json``` file in ```terraform/main```. + +### Step 2: Build and Push Docker Images +The Terraform configuration needs the Docker images to be available in AWS ECR. + +1. Make the scripts executable: + ```sh + chmod +x ./scripts/actions/build_and_push_all.bash ./scripts/actions/push_docker_to_registry.bash ./scripts/utils/print.bash + ``` +2. Run the build and push script: + ```sh + ./scripts/actions/build_and_push_all.bash + ``` + This script will: + - Authenticate Docker with your AWS ECR registry. + - Create an ECR repository for each service if it doesn't exist. + - Build each service's Docker image. + - Tag and push the images to their respective ECR repositories. + +### Step 3: Deploy Main Infrastructure +This step provisions all the main resources: VPC, subnets, RDS Aurora database, ECS cluster, Fargate services, and Application Load Balancer. + +1. Navigate to the main Terraform directory: + ```sh + cd terraform/main + ``` +2. Initialize Terraform using the generated backend configuration: + ```sh + terraform init -backend-config=backend_config.json + ``` +3. Apply the configuration. You will be prompted to provide values for variables like ```project_name``` and ```environment```. + ```sh + terraform apply + ``` + After the apply is complete, Terraform will output the ```api_base_url```, which is the public DNS of the Application Load Balancer. + +### Resetting the Database +If you need to wipe and re-seed the cloud database, you can run ```terraform apply``` with a special variable: ```sh -cd backend -uvicorn auth_service.main:app --reload --port 8000 +# From terraform/main directory +terraform apply -var="force_db_reset=true" ``` +This forces the ```db-init``` ECS task to re-run with the ```DB_RESET=true``` flag. + +## CI/CD Pipeline + +The repository includes a GitHub Actions workflow defined in ```.github/workflows/tests.yml```. This pipeline automatically runs on every ```push``` and ```pull_request``` to the ```main``` and ```dev``` branches. + +The workflow performs the following steps: +1. Checks out the code. +2. Sets up Python. +3. Spins up the entire local environment using ```docker compose```. +4. Waits for the API Gateway to be healthy. +5. Runs the full ```pytest``` suite against the local environment. +6. If tests fail, it dumps the logs from all Docker services for easy debugging. +7. Cleans up all Docker resources. diff --git "a/\\" "b/\\" new file mode 100644 index 0000000..5796131 --- /dev/null +++ "b/\\" @@ -0,0 +1,5 @@ +frontend/lib +Abackend/tests +Abackend/user_auth_service/app +backend/event_ticketing_service/app + diff --git a/backend/api_gateway/Dockerfile b/backend/api_gateway/Dockerfile new file mode 100644 index 0000000..0fcf32f --- /dev/null +++ b/backend/api_gateway/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:1.25-alpine + +# Add curl for the healthcheck +RUN apk add --no-cache curl diff --git a/backend/db_init/sql/01_auth.sql b/backend/db_init/sql/01_auth.sql index b5d2958..7bfbc82 100644 --- a/backend/db_init/sql/01_auth.sql +++ b/backend/db_init/sql/01_auth.sql @@ -7,7 +7,8 @@ CREATE TABLE IF NOT EXISTS users ( last_name VARCHAR(255) NOT NULL, creation_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, is_active BOOLEAN NOT NULL DEFAULT TRUE, - user_type VARCHAR(20) NOT NULL -- 'customer', 'organizer', 'administrator' + user_type VARCHAR(20) NOT NULL, -- 'customer', 'organizer', 'administrator' + email_verification_token VARCHAR(255) NULL UNIQUE -- New column for verification token ); CREATE TABLE IF NOT EXISTS customers ( diff --git a/backend/event_ticketing_service/app/filters/events_filter.py b/backend/event_ticketing_service/app/filters/events_filter.py index 8d2152a..2c89e53 100644 --- a/backend/event_ticketing_service/app/filters/events_filter.py +++ b/backend/event_ticketing_service/app/filters/events_filter.py @@ -25,3 +25,6 @@ class EventsFilter(BaseModel): has_available_tickets: Optional[bool] = Query( None, title="Has Available Tickets", description="Events with remaining tickets" ) + status: Optional[str] = Query( + None, title="Event Status", description="Filter by event status (pending, created, rejected, cancelled)" + ) \ No newline at end of file diff --git a/backend/event_ticketing_service/app/models/cart_item_model.py b/backend/event_ticketing_service/app/models/cart_item_model.py index ae4bcbd..5ac58ef 100644 --- a/backend/event_ticketing_service/app/models/cart_item_model.py +++ b/backend/event_ticketing_service/app/models/cart_item_model.py @@ -8,9 +8,8 @@ class CartItemModel(Base): cart_item_id = Column(Integer, primary_key=True, index=True) cart_id = Column(Integer, ForeignKey("shopping_carts.cart_id", ondelete="CASCADE"), nullable=False) - ticket_id = Column(Integer, ForeignKey("tickets.ticket_id", ondelete="CASCADE"), nullable=True) ticket_type_id = Column(Integer, ForeignKey("ticket_types.type_id", ondelete="CASCADE"), nullable=True) quantity = Column(Integer, nullable=False, default=1) cart = relationship("ShoppingCartModel", back_populates="items") - ticket_type = relationship("TicketTypeModel") \ No newline at end of file + ticket_type = relationship("TicketTypeModel") diff --git a/backend/event_ticketing_service/app/repositories/cart_repository.py b/backend/event_ticketing_service/app/repositories/cart_repository.py index 87ffe43..0d53ef0 100644 --- a/backend/event_ticketing_service/app/repositories/cart_repository.py +++ b/backend/event_ticketing_service/app/repositories/cart_repository.py @@ -1,9 +1,11 @@ import logging +import pytz from typing import List, Dict, Any from fastapi import Depends from fastapi import HTTPException, status from sqlalchemy import func from sqlalchemy.orm import Session, joinedload, selectinload +from datetime import datetime from app.models.shopping_cart_model import ShoppingCartModel from app.models.cart_item_model import CartItemModel @@ -51,17 +53,59 @@ def add_item_from_detailed_sell(self, customer_id: int, ticket_type_id: int, qua if quantity < 1: raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Quantity must be at least 1") + ticket_type = ( + self.db.query(TicketTypeModel) + .options(joinedload(TicketTypeModel.event)) # Eagerly load the 'event' relationship + .filter(TicketTypeModel.type_id == ticket_type_id) + .first() + ) + # Verify the ticket type exists - ticket_type = self.db.query(TicketTypeModel).filter(TicketTypeModel.type_id == ticket_type_id).first() if not ticket_type: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, detail=f"Ticket type with ID {ticket_type_id} not found", ) + # This case should ideally not happen + if not ticket_type.event: + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail=f"Event associated with ticket type ID {ticket_type_id} not found.", + ) + + # Verify that the event is active + if ticket_type.event.status.lower() == "pending": + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Event '{ticket_type.event.name}' is not yet active.", + ) + + # Get current time in Warsaw timezone + warsaw_tz = pytz.timezone('Europe/Warsaw') + now_warsaw_aware = datetime.now(warsaw_tz) + + # Verify that the ticket type is available for sale + if ticket_type.available_from is not None: + # Convert available_from to Warsaw timezone + available_from_warsaw_aware = warsaw_tz.localize(ticket_type.available_from) + + if available_from_warsaw_aware > now_warsaw_aware: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Ticket type with ID {ticket_type_id} is not available for sale yet", + ) + + # Verify that the event has not passed + event_end_date_warsaw_aware = warsaw_tz.localize(ticket_type.event.end_date) + if event_end_date_warsaw_aware < now_warsaw_aware: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Event '{ticket_type.event.name}' has already ended.", + ) + # Get or create the shopping cart for the customer cart = self.get_or_create_cart(customer_id) - existing_cart_item = ( self.db.query(CartItemModel) .filter(CartItemModel.cart_id == cart.cart_id, CartItemModel.ticket_type_id == ticket_type_id) @@ -71,7 +115,8 @@ def add_item_from_detailed_sell(self, customer_id: int, ticket_type_id: int, qua # If the item already exists in the cart, update the quantity if existing_cart_item: existing_cart_item.quantity += quantity - logger.info(f"Updated quantity for ticket_type_id {ticket_type_id} in cart_id {cart.cart_id}. New quantity: {existing_cart_item.quantity}") + logger.info( + f"Updated quantity for ticket_type_id {ticket_type_id} in cart_id {cart.cart_id}. New quantity: {existing_cart_item.quantity}") else: existing_cart_item = CartItemModel( cart_id=cart.cart_id, @@ -85,13 +130,53 @@ def add_item_from_detailed_sell(self, customer_id: int, ticket_type_id: int, qua self.db.refresh(existing_cart_item) return existing_cart_item + def add_item_from_resell(self, customer_id: int, ticket_id: int) -> CartItemModel: + if not ticket_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Ticket ID must be provided") + + ticket = self.db.query(TicketModel).filter(TicketModel.ticket_id == ticket_id).first() + if not ticket: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Ticket with ID {ticket_id} not found") + if ticket.resell_price is None: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Ticket is not available for resale") + if ticket.owner_id == customer_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Cannot add your own ticket to the cart") + + # Get or create the shopping cart for the customer + cart = self.get_or_create_cart(customer_id) + + # Check if the ticket is already in the cart + existing_cart_item = ( + self.db.query(CartItemModel) + .filter(CartItemModel.cart_id == cart.cart_id, CartItemModel.ticket_id == ticket.ticket_id) + .first() + ) + if existing_cart_item: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Ticket with ID {ticket_id} is already in your cart", + ) + + existing_cart_item = CartItemModel( + cart_id=cart.cart_id, + ticket_id=ticket_id, + quantity=1, + ) + self.db.add(existing_cart_item) + logger.info(f"Added ticket with ticket_id {ticket_id} to cart_id {cart.cart_id}") + + self.db.commit() + self.db.refresh(existing_cart_item) + return existing_cart_item + def remove_item(self, customer_id: int, cart_item_id: int) -> bool: # Get the shopping cart for the customer - cart = self.db.query(ShoppingCartModel).filter(ShoppingCartModel.customer_id == customer_id).first() + cart = self.db.query(ShoppingCartModel).filter( + ShoppingCartModel.customer_id == customer_id).first() if not cart: - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Shopping cart not found") + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, + detail="Shopping cart not found") - # Find the cart item to remove cart_item_to_remove = ( self.db.query(CartItemModel) .filter(CartItemModel.cart_item_id == cart_item_id, CartItemModel.cart_id == cart.cart_id) @@ -106,24 +191,89 @@ def remove_item(self, customer_id: int, cart_item_id: int) -> bool: self.db.delete(cart_item_to_remove) self.db.commit() - logger.info(f"Removed cart_item_id {cart_item_id} from cart_id {cart.cart_id} of customer_id {customer_id}") return True + #---------------------------------------------------------- + # Checkout methods + #---------------------------------------------------------- + def _checkout_detailed_ticket(self, item: CartItemModel, customer_id: int) -> List[Dict[str, Any]]: + """ + Processes a single detailed/standard cart item: + - Validates ticket type, event, and location. + - Checks ticket availability. + - Creates new TicketModel instances. + Returns a list of dictionaries, each for a created ticket, for email processing. + """ + item_processed_tickets_info: List[Dict[str, Any]] = [] + + # It's crucial that item.ticket_type and its nested relationships are loaded. + # If not loaded by the caller, load them here. + if not item.ticket_type: + item.ticket_type = self.db.query(TicketTypeModel).options( + joinedload(TicketTypeModel.event).joinedload(EventModel.location) + ).filter(TicketTypeModel.type_id == item.ticket_type_id).first() + + ticket_type = item.ticket_type + event = ticket_type.event + location = event.location + + # Basic validation + if not all([ticket_type, event, location]): + logger.error(f"Incomplete data for detailed cart_item_id {item.cart_item_id}. " + f"TicketType: {bool(ticket_type)}, Event: {bool(event)}, Location: {bool(location)}") + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Error processing standard cart item details.") + + # Check if there are enough tickets available + existing_tickets_count = ( + self.db.query(func.count(TicketModel.ticket_id)) + .filter(TicketModel.type_id == ticket_type.type_id) + .scalar() or 0 + ) + + if existing_tickets_count + item.quantity > ticket_type.max_count: + available_tickets = ticket_type.max_count - existing_tickets_count + logger.warning( + f"Not enough tickets for event '{event.name}', type '{ticket_type.description or ticket_type.type_id}'. " + f"Requested: {item.quantity}, Available: {max(0, available_tickets)}, " + f"Existing: {existing_tickets_count}, Max: {ticket_type.max_count}" + ) + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Not enough tickets available for '{event.name} - {ticket_type.description or 'selected type'}'. " + f"Only {max(0, available_tickets)} left." + ) + + for _ in range(item.quantity): + new_ticket = TicketModel( + type_id=ticket_type.type_id, + owner_id=customer_id, + seat=None, + resell_price=None, + ) + self.db.add(new_ticket) # Add to session, will be committed in the main checkout + item_processed_tickets_info.append({ + "ticket_model": new_ticket, + "event_name": event.name, + "event_date": event.start_date.strftime("%B %d, %Y"), + "event_time": event.start_date.strftime("%I:%M %p"), + "venue_name": location.name, + "seat": new_ticket.seat, # Will be None unless logic is added + }) + return item_processed_tickets_info - # TODO: Stripe integration for payment processing def checkout(self, customer_id: int, user_email: str, user_name: str) -> bool: # Get or create the shopping cart for the customer to handle cases where the user has never had a cart. cart = self.get_or_create_cart(customer_id) - # Get all items in the cart with eager loading of related data + # Eagerly load relationships. This helps ensure data is available. cart_items = ( self.db.query(CartItemModel) .filter(CartItemModel.cart_id == cart.cart_id) .options( - joinedload(CartItemModel.ticket_type) - .joinedload(TicketTypeModel.event) - .joinedload(EventModel.location) - ) # Eager load related data + selectinload(CartItemModel.ticket_type) # For standard tickets + .selectinload(TicketTypeModel.event) + .selectinload(EventModel.location) + ) .all() ) @@ -134,52 +284,9 @@ def checkout(self, customer_id: int, user_email: str, user_name: str) -> bool: try: for item in cart_items: - ticket_type = item.ticket_type - event = ticket_type.event - location = event.location - - # Basic validation - if not all([ticket_type, event, location]): - logger.error(f"Incomplete data for cart_item_id {item.cart_item_id}. " - f"TicketType: {bool(ticket_type)}, Event: {bool(event)}, Location: {bool(location)}") - raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Error processing cart item details.") - - # Check if there are enough tickets available - existing_tickets_count = ( - self.db.query(func.count(TicketModel.ticket_id)) - .filter(TicketModel.type_id == ticket_type.type_id) - .scalar() # Gets the single count value - ) - - if existing_tickets_count + item.quantity > ticket_type.max_count: - available_tickets = ticket_type.max_count - existing_tickets_count - logger.warning( - f"Not enough tickets for event '{event.name}', type '{ticket_type.description if hasattr(ticket_type, 'description') else ticket_type.type_id}'. " - f"Requested: {item.quantity}, Available: {available_tickets if available_tickets >= 0 else 0}, " - f"Existing: {existing_tickets_count}, Max: {ticket_type.max_count}" - ) - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"Not enough tickets available for '{event.name} - {ticket_type.description if hasattr(ticket_type, 'description') else 'selected type'}'. " - f"Only {available_tickets if available_tickets >= 0 else 0} left." - ) - - for _ in range(item.quantity): - new_ticket = TicketModel( - type_id=ticket_type.type_id, - owner_id=customer_id, - seat=None, - resell_price=None, - ) - self.db.add(new_ticket) - processed_tickets_info.append({ - "ticket_model": new_ticket, - "event_name": event.name, - "event_date": event.start_date.strftime("%B %d, %Y"), - "event_time": event.start_date.strftime("%I:%M %p"), - "venue_name": location.name, - "seat": new_ticket.seat, - }) + if item.ticket_type: # Detailed/standard ticket + item_processed_info = self._checkout_detailed_ticket(item, customer_id) + processed_tickets_info.extend(item_processed_info) # Clear the cart items after successful checkout for item in cart_items: diff --git a/backend/event_ticketing_service/app/repositories/event_repository.py b/backend/event_ticketing_service/app/repositories/event_repository.py index e249ac7..cde7de6 100644 --- a/backend/event_ticketing_service/app/repositories/event_repository.py +++ b/backend/event_ticketing_service/app/repositories/event_repository.py @@ -1,13 +1,22 @@ +""" +Fixed event_repository.py - Eliminates duplicate validation logic +""" + from typing import List from sqlalchemy.orm import Session, joinedload, selectinload from app.database import get_db from app.models.events import EventModel +from app.models.ticket import TicketModel +from app.models.ticket_type import TicketTypeModel from fastapi import HTTPException, status, Depends from app.models.location import LocationModel from app.filters.events_filter import EventsFilter +from app.repositories.ticket_repository import get_ticket_repository from app.schemas.event import EventBase, EventUpdate +from app.schemas.ticket import TicketType + class EventRepository: @@ -28,10 +37,11 @@ def get_event(self, event_id: int) -> EventModel: return event def create_event(self, data: EventBase, organizer_id: int) -> EventModel: - # Validate location exists - location = self.db.query(LocationModel).filter(LocationModel.location_id == data.location_id).first() + location = self.db.query(LocationModel).filter( + LocationModel.location_id == data.location_id).first() if not location: - raise HTTPException(status.HTTP_404_NOT_FOUND, detail=f"Location '{data.location_id}' not found") + raise HTTPException(status.HTTP_404_NOT_FOUND, + detail=f"Location '{data.location_id}' not found") event = EventModel( organizer_id=organizer_id, @@ -45,14 +55,45 @@ def create_event(self, data: EventBase, organizer_id: int) -> EventModel: ) self.db.add(event) self.db.commit() + self.db.refresh(event) + + # Create standard ticket type + ticket_type = TicketType( + event_id=event.event_id, + description="Standard Ticket", + max_count=data.total_tickets, + price=data.standard_ticket_price, + currency="USD", + available_from=data.ticket_sales_start, + ) + ticket_repo = get_ticket_repository(self.db) + ticket_repo.create_ticket_type(ticket_type) + # After commit, re-query the event to get eager-loaded relationships for the response model. return self.get_event(event.event_id) + def _validate_event_status_change(self, event: EventModel, required_status: str, + action: str) -> None: + if event.status != required_status: + raise HTTPException( + status.HTTP_400_BAD_REQUEST, + detail=f"Event must be in {required_status} status to {action}. Current status: {event.status}" + ) + def authorize_event(self, event_id: int) -> None: + """Authorize a pending event""" event = self.get_event(event_id) + self._validate_event_status_change(event, "pending", "authorize") event.status = "created" self.db.commit() + def reject_event(self, event_id: int) -> None: + """Reject a pending event""" + event = self.get_event(event_id) + self._validate_event_status_change(event, "pending", "reject") + event.status = "rejected" + self.db.commit() + def get_events(self, filters: EventsFilter) -> List[EventModel]: query = self.db.query(EventModel).options( joinedload(EventModel.location), selectinload(EventModel.ticket_types) @@ -74,6 +115,8 @@ def get_events(self, filters: EventsFilter) -> List[EventModel]: query = query.filter(EventModel.organizer_id == filters.organizer_id) if filters.minimum_age: query = query.filter(EventModel.minimum_age >= filters.minimum_age) + if filters.status: + query = query.filter(EventModel.status == filters.status) # TODO: add price filters (join ticket_types) and availability checks @@ -82,7 +125,8 @@ def get_events(self, filters: EventsFilter) -> List[EventModel]: def update_event(self, event_id: int, data: EventUpdate, organizer_id: int) -> EventModel: event = self.get_event(event_id) if event.organizer_id != organizer_id: - raise HTTPException(status.HTTP_403_FORBIDDEN, detail="Not authorized to update this event") + raise HTTPException(status.HTTP_403_FORBIDDEN, + detail="Not authorized to update this event") updates = data.dict(exclude_unset=True) for field, value in updates.items(): if value is not None: @@ -94,10 +138,28 @@ def update_event(self, event_id: int, data: EventUpdate, organizer_id: int) -> E def cancel_event(self, event_id: int, organizer_id: int) -> None: event = self.get_event(event_id) if event.organizer_id != organizer_id: - raise HTTPException(status.HTTP_403_FORBIDDEN, detail="Not authorized to cancel this event") + raise HTTPException(status.HTTP_403_FORBIDDEN, + detail="Not authorized to cancel this event") + + # Check if any tickets for this event have been sold + sold_tickets_count = ( + self.db.query(TicketModel.ticket_id) + .join(TicketTypeModel, TicketModel.type_id == TicketTypeModel.type_id) + .filter(TicketTypeModel.event_id == event_id) + .filter(TicketModel.owner_id.isnot(None)) + .count() + ) + + if sold_tickets_count > 0: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Cannot cancel event. There are {sold_tickets_count} sold tickets that must be refunded first." + ) + event.status = "cancelled" self.db.commit() + # Dependency to get the EventRepository instance def get_event_repository(db: Session = Depends(get_db)) -> EventRepository: - return EventRepository(db) + return EventRepository(db) \ No newline at end of file diff --git a/backend/event_ticketing_service/app/repositories/ticket_repository.py b/backend/event_ticketing_service/app/repositories/ticket_repository.py index 7527eab..3bb80ff 100644 --- a/backend/event_ticketing_service/app/repositories/ticket_repository.py +++ b/backend/event_ticketing_service/app/repositories/ticket_repository.py @@ -1,14 +1,20 @@ +import logging from typing import List, Optional -from sqlalchemy.orm import Session +from sqlalchemy.orm import Session, joinedload from app.database import get_db from app.models.ticket import TicketModel from fastapi import HTTPException, status, Depends from app.filters.ticket_filter import TicketFilter -from app.models.ticket_type import TicketTypeModel from app.schemas.ticket import TicketPDF, ResellTicketRequest +from app.models.events import EventModel +from app.models.ticket_type import TicketTypeModel +from app.models.location import LocationModel +from app.services.email import send_ticket_email +from app.schemas.ticket import TicketType +logger = logging.getLogger(__name__) class TicketRepository: """Service layer for ticket operations.""" @@ -16,8 +22,25 @@ class TicketRepository: def __init__(self, db: Session): self.db = db - def list_tickets(self, filters: TicketFilter) -> List[TicketModel]: - query = self.db.query(TicketModel) + def list_tickets(self, filters: TicketFilter) -> List[dict]: + query = ( + self.db.query( + TicketModel.ticket_id, + TicketModel.type_id, + TicketModel.seat, + TicketModel.owner_id, + TicketModel.resell_price, + TicketTypeModel.price.label('original_price'), + EventModel.name.label('event_name'), + EventModel.start_date.label('event_start_date'), + LocationModel.name.label('event_location'), + TicketTypeModel.description.label('ticket_type_description') + ) + .join(TicketTypeModel, TicketModel.type_id == TicketTypeModel.type_id) + .join(EventModel, TicketTypeModel.event_id == EventModel.event_id) + .join(LocationModel, EventModel.location_id == LocationModel.location_id) + ) + if filters.ticket_id is not None: query = query.filter(TicketModel.ticket_id == filters.ticket_id) if filters.type_id is not None: @@ -29,7 +52,26 @@ def list_tickets(self, filters: TicketFilter) -> List[TicketModel]: query = query.filter(TicketModel.resell_price.isnot(None)) else: query = query.filter(TicketModel.resell_price.is_(None)) - return query.all() + results = query.all() + + # Convert to dictionaries that match the TicketDetails schema + tickets = [] + for result in results: + ticket_dict = { + 'ticket_id': result.ticket_id, + 'type_id': result.type_id, + 'seat': result.seat, + 'owner_id': result.owner_id, + 'resell_price': result.resell_price, + 'original_price': result.original_price, + 'event_name': result.event_name, + 'event_start_date': result.event_start_date, + 'event_location': result.event_location, + 'ticket_type_description': result.ticket_type_description + } + tickets.append(ticket_dict) + + return tickets def get_ticket(self, ticket_id: int) -> Optional[TicketModel]: ticket = self.db.get(TicketModel, ticket_id) @@ -56,7 +98,7 @@ def list_resale_tickets(self, event_id: Optional[int] = None) -> List[TicketMode return query.all() - def buy_resale_ticket(self, ticket_id: int, buyer_id: int) -> TicketModel: + def buy_resale_ticket(self, ticket_id: int, buyer_id: int, buyer_email: str, buyer_name: str) -> TicketModel: ticket = self.get_ticket(ticket_id) if ticket.resell_price is None: @@ -70,6 +112,32 @@ def buy_resale_ticket(self, ticket_id: int, buyer_id: int) -> TicketModel: self.db.commit() self.db.refresh(ticket) + + ticket_info = self.db.query(TicketModel).options( + joinedload(TicketModel.ticket_type) + .joinedload(TicketTypeModel.event) + .joinedload(EventModel.location) + ).filter(TicketModel.ticket_id == ticket_id).first() + + # Format the date and time as strings + event_datetime = ticket_info.ticket_type.event.start_date + formatted_event_date = event_datetime.strftime("%B %d, %Y") # e.g., "June 15, 2025" + formatted_event_time = event_datetime.strftime("%I:%M %p") # e.g., "02:30 PM" + + email_sent = send_ticket_email( + to_email=buyer_email, + user_name=buyer_name, + event_name=ticket_info.ticket_type.event.name, + ticket_id=str(ticket_info.ticket_id), + event_date=formatted_event_date, + event_time=formatted_event_time, + venue=ticket_info.ticket_type.event.location.name, + seat=ticket_info.seat, + ) + if not email_sent: + logger.error( + f"Failed to send confirmation email for ticket {ticket_id} to {buyer_email}") + return ticket def resell_ticket(self, data: ResellTicketRequest, user_id: int) -> TicketModel: @@ -92,6 +160,33 @@ def cancel_resell(self, ticket_id: int, user_id: int) -> TicketModel: self.db.refresh(ticket) return ticket + def create_ticket_type(self, ticket_type_data: TicketType) -> TicketType: + """ + Creates a new ticket type in the database. + """ + event = self.db.get(EventModel, ticket_type_data.event_id) + if not event: + raise HTTPException( + status_code=status.HTTP_404_NOT_FOUND, + detail=f"Event with id {ticket_type_data.event_id} not found" + ) + + # Create SQLAlchemy model from Pydantic schema data + db_ticket_type = TicketTypeModel( + event_id=ticket_type_data.event_id, + description=ticket_type_data.description, + max_count=ticket_type_data.max_count, + price=ticket_type_data.price, + currency=ticket_type_data.currency, + available_from=ticket_type_data.available_from, + ) + + self.db.add(db_ticket_type) + self.db.commit() + self.db.refresh(db_ticket_type) + + return TicketType.model_validate(db_ticket_type) + # Dependency to get the TicketRepository instance def get_ticket_repository(db: Session = Depends(get_db)) -> TicketRepository: return TicketRepository(db) diff --git a/backend/event_ticketing_service/app/routers/cart.py b/backend/event_ticketing_service/app/routers/cart.py index 31ba4e7..109425f 100644 --- a/backend/event_ticketing_service/app/routers/cart.py +++ b/backend/event_ticketing_service/app/routers/cart.py @@ -13,7 +13,7 @@ from app.services.email import send_ticket_email from app.models.ticket_type import TicketTypeModel from app.utils.jwt_auth import get_user_from_token -from fastapi import Path, Depends, APIRouter, HTTPException, status +from fastapi import Path, Depends, APIRouter, HTTPException, status, Query router = APIRouter( prefix="/cart", @@ -32,9 +32,8 @@ async def get_shopping_cart( cart_repo: CartRepository = Depends(get_cart_repository) ): """Get items in the user's shopping cart""" - logger.info(f"Get shopping cart of {user}") + logger.info(f"Get shopping cart for user_id {user['user_id']}") user_id = user["user_id"] - logger.info(f"Get shopping cart for user_id {user_id}") cart_items_models = cart_repo.get_cart_items_details(customer_id=user_id) @@ -42,6 +41,7 @@ async def get_shopping_cart( for item_model in cart_items_models: if item_model.ticket_type: cart_item_detail = CartItemWithDetails( + cart_item_id=item_model.cart_item_id, ticket_type=TicketType.model_validate(item_model.ticket_type), quantity=item_model.quantity ) @@ -57,58 +57,37 @@ async def get_shopping_cart( ) async def add_to_cart( ticket_type_id: int, - quantity: int = 1, + quantity: int = Query(1, description="Quantity of tickets to add"), user: dict = Depends(get_user_from_token), - ticket_repo: TicketRepository = Depends(get_ticket_repository), cart_repo: CartRepository = Depends(get_cart_repository) ): """Add a ticket to the user's shopping cart""" user_id = user["user_id"] - # Verify the ticket type exists - ticket_type = ticket_repo.get_ticket_type_by_id(ticket_type_id) - if not ticket_type: - raise HTTPException( - status_code=status.HTTP_404_NOT_FOUND, - detail=f"Ticket type with ID {ticket_type_id} not found", - ) - logger.info(f"Add item {ticket_type} to cart of {user}") - - try: + if ticket_type_id is not None: cart_item_model = cart_repo.add_item_from_detailed_sell( customer_id=user_id, ticket_type_id=ticket_type_id, quantity=quantity ) - if not cart_item_model.ticket_type: - # This should ideally not happen if add_item works correctly and ticket_type exists - logger.error( - f"Ticket type details not found for cart_item_id {cart_item_model.cart_item_id} after adding to cart.") - raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, - detail="Error retrieving ticket type details after adding to cart.") - return CartItemWithDetails( + cart_item_id=cart_item_model.cart_item_id, ticket_type=TicketType.model_validate(cart_item_model.ticket_type), quantity=cart_item_model.quantity ) - except HTTPException as e: - # Re-raise HTTPExceptions from the repository (e.g., not found, bad request) - raise e - except Exception as e: - logger.error(f"Error adding item to cart for user {user_id}: {str(e)}", exc_info=True) - raise HTTPException( - status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, - detail="Could not add item to cart.", - ) + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Ticket type ID is required." + ) @router.delete( "/items/{cart_item_id}", response_model=bool, ) async def remove_from_cart( - cart_item_id: int = Path(..., title="Cart Item ID", ge=1), + cart_item_id: int = Path(..., title="Cart Item ID"), user: dict = Depends(get_user_from_token), cart_repo = Depends(get_cart_repository) ): diff --git a/backend/event_ticketing_service/app/routers/events.py b/backend/event_ticketing_service/app/routers/events.py index 3ab9677..74805b7 100644 --- a/backend/event_ticketing_service/app/routers/events.py +++ b/backend/event_ticketing_service/app/routers/events.py @@ -1,22 +1,26 @@ -from typing import List -from datetime import datetime, timedelta +from typing import List, Optional +from datetime import datetime from app.database import get_db from sqlalchemy.orm import Session -from fastapi import Path, Depends, APIRouter +from sqlalchemy import or_, and_, desc, asc +from fastapi import Path, Depends, APIRouter, Query, HTTPException, status from app.filters.events_filter import EventsFilter from app.repositories.event_repository import EventRepository, get_event_repository from app.schemas.event import EventBase, EventUpdate, EventDetails, NotificationRequest from app.utils.jwt_auth import get_current_organizer, get_current_admin +from app.models.events import EventModel +from app.models.location import LocationModel +from app.models.ticket_type import TicketTypeModel router = APIRouter(prefix="/events", tags=["events"]) @router.post("/", response_model=EventDetails) async def create_event( - event_data: EventBase, - event_repo: EventRepository = Depends(get_event_repository), - current_organizer = Depends(get_current_organizer) + event_data: EventBase, + event_repo: EventRepository = Depends(get_event_repository), + current_organizer=Depends(get_current_organizer) ): """Create a new event (requires authentication)""" return event_repo.create_event(event_data, current_organizer["role_id"]) @@ -24,39 +28,163 @@ async def create_event( @router.post("/authorize/{event_id}", response_model=bool) async def authorize_event( - event_id: int = Path(..., title="Event ID"), - event_repo: EventRepository = Depends(get_event_repository), - current_admin = Depends(get_current_admin) + event_id: int = Path(..., title="Event ID"), + event_repo: EventRepository = Depends(get_event_repository), + current_admin=Depends(get_current_admin) ): """Authorize an event (requires admin authentication)""" event_repo.authorize_event(event_id) return True +@router.post("/reject/{event_id}", response_model=bool) +async def reject_event( + event_id: int = Path(..., title="Event ID"), + event_repo: EventRepository = Depends(get_event_repository), + current_admin=Depends(get_current_admin) +): + """Reject an event (requires admin authentication)""" + event_repo.reject_event(event_id) + return True + + @router.get("", response_model=List[EventDetails]) def get_events_endpoint( - filters: EventsFilter = Depends(), - event_repo: EventRepository = Depends(get_event_repository), + page: int = Query(1, ge=1, description="Page number"), + limit: int = Query(50, ge=1, le=100, description="Items per page"), + search: Optional[str] = Query(None, description="Search by event name or description"), + location: Optional[str] = Query(None, description="Filter by location name"), + start_date_from: Optional[datetime] = Query(None, + description="Events starting after this date"), + start_date_to: Optional[datetime] = Query(None, + description="Events starting before this date"), + min_price: Optional[float] = Query(None, ge=0, + description="Minimum ticket price available"), + max_price: Optional[float] = Query(None, ge=0, + description="Maximum ticket price available"), + organizer_id: Optional[int] = Query(None, description="Filter by specific organizer"), + minimum_age: Optional[int] = Query(None, ge=0, + description="Minimum required age for attendees"), + status: Optional[str] = Query(None, description="Filter by event status"), + categories: Optional[str] = Query(None, + description="Filter by categories (comma-separated)"), + sort_by: str = Query("start_date", + description="Sort field (start_date, name, creation_date)"), + sort_order: str = Query("asc", description="Sort order (asc/desc)"), + db: Session = Depends(get_db), ): - events = event_repo.get_events(filters) + """ + Get list of events with advanced filtering, searching, and pagination + """ + # Build the query with joins for filtering + query = db.query(EventModel).join(LocationModel, + EventModel.location_id == LocationModel.location_id) + + # Apply search filter + if search: + search_filter = f"%{search}%" + query = query.filter( + or_( + EventModel.name.ilike(search_filter), + EventModel.description.ilike(search_filter) + ) + ) + + # Apply location filter + if location: + query = query.filter(LocationModel.name.ilike(f"%{location}%")) + + # Apply date filters + if start_date_from: + query = query.filter(EventModel.start_date >= start_date_from) + if start_date_to: + query = query.filter(EventModel.start_date <= start_date_to) + + # Apply organizer filter + if organizer_id: + query = query.filter(EventModel.organizer_id == organizer_id) + + # Apply minimum age filter + if minimum_age: + query = query.filter(EventModel.minimum_age >= minimum_age) + + # Apply status filter + if status: + if status not in ["pending", "created", "rejected", "cancelled"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid status. Must be one of: pending, created, rejected, cancelled" + ) + query = query.filter(EventModel.status == status) + + # Apply price filters (requires subquery on ticket types) + if min_price is not None or max_price is not None: + price_subquery = db.query(TicketTypeModel.event_id).distinct() + if min_price is not None: + price_subquery = price_subquery.filter(TicketTypeModel.price >= min_price) + if max_price is not None: + price_subquery = price_subquery.filter(TicketTypeModel.price <= max_price) + + query = query.filter(EventModel.event_id.in_(price_subquery)) + + # Apply categories filter (simplified - assuming categories are stored as comma-separated values in description or using JSON) + if categories: + category_list = [cat.strip() for cat in categories.split(",")] + category_filters = [EventModel.description.ilike(f"%{cat}%") for cat in category_list] + query = query.filter(or_(*category_filters)) + + # Apply sorting + if sort_by not in ["start_date", "name", "creation_date"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_by. Must be one of: start_date, name, creation_date" + ) + + if sort_order not in ["asc", "desc"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_order. Must be 'asc' or 'desc'" + ) + + # Map sort fields + sort_field_map = { + "start_date": EventModel.start_date, + "name": EventModel.name, + "creation_date": EventModel.event_id # Assuming event_id correlates with creation order + } + + sort_field = sort_field_map[sort_by] + if sort_order == "desc": + query = query.order_by(desc(sort_field)) + else: + query = query.order_by(asc(sort_field)) + + # Apply pagination + offset = (page - 1) * limit + query = query.offset(offset).limit(limit) + + # Execute query and get results + events = query.all() + + # Convert to response models return [EventDetails.model_validate(e) for e in events] @router.put("/{event_id}", response_model=EventDetails) def update_event_endpoint( - event_id: int = Path(..., title="Event ID"), - update_data: EventUpdate = Depends(), - event_repo: EventRepository = Depends(get_event_repository), - current_organizer = Depends(get_current_organizer) + event_id: int = Path(..., title="Event ID"), + update_data: EventUpdate = Depends(), + event_repo: EventRepository = Depends(get_event_repository), + current_organizer=Depends(get_current_organizer) ): return event_repo.update_event(event_id, update_data, current_organizer["role_id"]) @router.delete("/{event_id}", response_model=bool) def cancel_event_endpoint( - event_id: int = Path(..., title="Event ID"), - event_repo: EventRepository = Depends(get_event_repository), - current_organizer = Depends(get_current_organizer) + event_id: int = Path(..., title="Event ID"), + event_repo: EventRepository = Depends(get_event_repository), + current_organizer=Depends(get_current_organizer) ): event_repo.cancel_event(event_id, current_organizer["role_id"]) return True @@ -64,9 +192,9 @@ def cancel_event_endpoint( @router.post("/{event_id}/notify") async def notify_participants( - event_id: int = Path(..., title="Event ID"), - notification: NotificationRequest = None, - current_organizer = Depends(get_current_organizer), + event_id: int = Path(..., title="Event ID"), + notification: NotificationRequest = None, + current_organizer=Depends(get_current_organizer), ): """Notify participants of an event (requires organizer authentication)""" return { @@ -74,4 +202,4 @@ async def notify_participants( "event_id": event_id, "message": notification.message if notification else "Default notification", "recipients_affected": 150, - } + } \ No newline at end of file diff --git a/backend/event_ticketing_service/app/routers/locations.py b/backend/event_ticketing_service/app/routers/locations.py new file mode 100644 index 0000000..469d630 --- /dev/null +++ b/backend/event_ticketing_service/app/routers/locations.py @@ -0,0 +1,18 @@ +from typing import List +from fastapi import APIRouter, Depends +from sqlalchemy.orm import Session + +from app.database import get_db +from app.models.location import LocationModel +from app.schemas.location import LocationDetails + +router = APIRouter(prefix="/locations", tags=["locations"]) + + +@router.get("/", response_model=List[LocationDetails]) +async def get_all_locations(db: Session = Depends(get_db)): + """ + Retrieve a list of all available event locations. + """ + locations = db.query(LocationModel).order_by(LocationModel.name).all() + return locations diff --git a/backend/event_ticketing_service/app/routers/resale.py b/backend/event_ticketing_service/app/routers/resale.py index 6c92ad5..e250dab 100644 --- a/backend/event_ticketing_service/app/routers/resale.py +++ b/backend/event_ticketing_service/app/routers/resale.py @@ -1,6 +1,7 @@ from typing import List, Optional from fastapi import APIRouter, Depends, Query, HTTPException, status, Header from sqlalchemy.orm import Session +from sqlalchemy import or_, and_, desc, asc from app.database import get_db from app.models.ticket import TicketModel @@ -17,13 +18,26 @@ @router.get("/marketplace", response_model=List[ResaleTicketListing]) async def get_resale_marketplace( + page: int = Query(1, ge=1, description="Page number"), + limit: int = Query(50, ge=1, le=100, description="Items per page"), + search: Optional[str] = Query(None, description="Search by event name or venue"), event_id: Optional[int] = Query(None, description="Filter by event ID"), + venue: Optional[str] = Query(None, description="Filter by venue name"), min_price: Optional[float] = Query(None, ge=0, description="Minimum resale price"), max_price: Optional[float] = Query(None, ge=0, description="Maximum resale price"), + min_original_price: Optional[float] = Query(None, ge=0, description="Minimum original price"), + max_original_price: Optional[float] = Query(None, ge=0, description="Maximum original price"), + event_date_from: Optional[str] = Query(None, description="Events from this date (YYYY-MM-DD)"), + event_date_to: Optional[str] = Query(None, description="Events until this date (YYYY-MM-DD)"), + has_seat: Optional[bool] = Query(None, description="Filter by tickets with assigned seats"), + sort_by: str = Query("event_date", description="Sort field (event_date, resell_price, original_price, event_name)"), + sort_order: str = Query("asc", description="Sort order (asc/desc)"), db: Session = Depends(get_db) ): - """Get all tickets available for resale""" - # Query tickets with resell_price set + """ + Get all tickets available for resale with advanced filtering, searching, and pagination + """ + # Build the base query query = ( db.query( TicketModel.ticket_id, @@ -41,14 +55,101 @@ async def get_resale_marketplace( .filter(TicketModel.resell_price.isnot(None)) ) - # Apply filters + # Apply search filter + if search: + search_filter = f"%{search}%" + query = query.filter( + or_( + EventModel.name.ilike(search_filter), + LocationModel.name.ilike(search_filter), + TicketTypeModel.description.ilike(search_filter) + ) + ) + + # Apply event filter if event_id: query = query.filter(EventModel.event_id == event_id) + + # Apply venue filter + if venue: + query = query.filter(LocationModel.name.ilike(f"%{venue}%")) + + # Apply resale price filters if min_price is not None: query = query.filter(TicketModel.resell_price >= min_price) if max_price is not None: query = query.filter(TicketModel.resell_price <= max_price) + # Apply original price filters + if min_original_price is not None: + query = query.filter(TicketTypeModel.price >= min_original_price) + if max_original_price is not None: + query = query.filter(TicketTypeModel.price <= max_original_price) + + # Apply date filters + if event_date_from: + try: + from datetime import datetime + date_from = datetime.strptime(event_date_from, "%Y-%m-%d") + query = query.filter(EventModel.start_date >= date_from) + except ValueError: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid event_date_from format. Use YYYY-MM-DD" + ) + + if event_date_to: + try: + from datetime import datetime + date_to = datetime.strptime(event_date_to, "%Y-%m-%d") + # Add 23:59:59 to include the entire day + date_to = date_to.replace(hour=23, minute=59, second=59) + query = query.filter(EventModel.start_date <= date_to) + except ValueError: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid event_date_to format. Use YYYY-MM-DD" + ) + + # Apply seat filter + if has_seat is not None: + if has_seat: + query = query.filter(TicketModel.seat.isnot(None)) + else: + query = query.filter(TicketModel.seat.is_(None)) + + # Apply sorting + if sort_by not in ["event_date", "resell_price", "original_price", "event_name"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_by. Must be one of: event_date, resell_price, original_price, event_name" + ) + + if sort_order not in ["asc", "desc"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_order. Must be 'asc' or 'desc'" + ) + + # Map sort fields + sort_field_map = { + "event_date": EventModel.start_date, + "resell_price": TicketModel.resell_price, + "original_price": TicketTypeModel.price, + "event_name": EventModel.name + } + + sort_field = sort_field_map[sort_by] + if sort_order == "desc": + query = query.order_by(desc(sort_field)) + else: + query = query.order_by(asc(sort_field)) + + # Apply pagination + offset = (page - 1) * limit + query = query.offset(offset).limit(limit) + + # Execute query results = query.all() # Convert to response model @@ -77,20 +178,32 @@ async def purchase_resale_ticket( """Purchase a ticket from the resale marketplace""" user = get_user_from_token(authorization) buyer_id = user["user_id"] + buyer_email = user["email"] + buyer_name = user["name"] - ticket = ticket_repo.buy_resale_ticket(purchase_request.ticket_id, buyer_id) + ticket = ticket_repo.buy_resale_ticket(purchase_request.ticket_id, buyer_id, buyer_email, buyer_name) return TicketDetails.model_validate(ticket) @router.get("/my-listings", response_model=List[ResaleTicketListing]) async def get_my_resale_listings( + page: int = Query(1, ge=1, description="Page number"), + limit: int = Query(50, ge=1, le=100, description="Items per page"), + search: Optional[str] = Query(None, description="Search by event name or venue"), + min_price: Optional[float] = Query(None, ge=0, description="Minimum resale price"), + max_price: Optional[float] = Query(None, ge=0, description="Maximum resale price"), + sort_by: str = Query("event_date", description="Sort field (event_date, resell_price, original_price, event_name)"), + sort_order: str = Query("asc", description="Sort order (asc/desc)"), authorization: str = Header(..., description="Bearer token"), db: Session = Depends(get_db) ): - """Get all tickets I have listed for resale""" + """ + Get all tickets I have listed for resale with pagination and filtering + """ user = get_user_from_token(authorization) user_id = user["user_id"] + # Build the base query query = ( db.query( TicketModel.ticket_id, @@ -109,8 +222,57 @@ async def get_my_resale_listings( .filter(TicketModel.resell_price.isnot(None)) ) + # Apply search filter + if search: + search_filter = f"%{search}%" + query = query.filter( + or_( + EventModel.name.ilike(search_filter), + LocationModel.name.ilike(search_filter) + ) + ) + + # Apply price filters + if min_price is not None: + query = query.filter(TicketModel.resell_price >= min_price) + if max_price is not None: + query = query.filter(TicketModel.resell_price <= max_price) + + # Apply sorting + if sort_by not in ["event_date", "resell_price", "original_price", "event_name"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_by. Must be one of: event_date, resell_price, original_price, event_name" + ) + + if sort_order not in ["asc", "desc"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid sort_order. Must be 'asc' or 'desc'" + ) + + # Map sort fields + sort_field_map = { + "event_date": EventModel.start_date, + "resell_price": TicketModel.resell_price, + "original_price": TicketTypeModel.price, + "event_name": EventModel.name + } + + sort_field = sort_field_map[sort_by] + if sort_order == "desc": + query = query.order_by(desc(sort_field)) + else: + query = query.order_by(asc(sort_field)) + + # Apply pagination + offset = (page - 1) * limit + query = query.offset(offset).limit(limit) + + # Execute query results = query.all() + # Convert to response model listings = [] for r in results: listings.append(ResaleTicketListing( @@ -124,4 +286,4 @@ async def get_my_resale_listings( seat=r.seat )) - return listings + return listings \ No newline at end of file diff --git a/backend/event_ticketing_service/app/routers/ticket_types.py b/backend/event_ticketing_service/app/routers/ticket_types.py index a90ae8f..73d7e23 100644 --- a/backend/event_ticketing_service/app/routers/ticket_types.py +++ b/backend/event_ticketing_service/app/routers/ticket_types.py @@ -3,6 +3,7 @@ from app.database import get_db from sqlalchemy.orm import Session from app.models.events import EventModel +from app.repositories.ticket_repository import get_ticket_repository from app.schemas.ticket import TicketType from fastapi.exceptions import HTTPException from app.models.ticket_type import TicketTypeModel @@ -46,30 +47,11 @@ def get_ticket_types( @router.post("/", response_model=TicketType) def create_ticket_type( - ticket: TicketType, + ticket_type: TicketType, db: Session = Depends(get_db), ): - event = db.get(EventModel, ticket.event_id) - if not event: - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Event with id {ticket.event_id} not found") - - # Create model from request data - model = TicketTypeModel( - event_id=ticket.event_id, - description=ticket.description, - max_count=ticket.max_count, - price=ticket.price, - currency=ticket.currency, - available_from=ticket.available_from, - ) - - # Persist to database - db.add(model) - db.commit() - db.refresh(model) - - # Return response - return TicketType.model_validate(model) + ticket_repo = get_ticket_repository(db) + return ticket_repo.create_ticket_type(ticket_type) @router.delete("/{type_id}", response_model=bool) diff --git a/backend/event_ticketing_service/app/routers/tickets.py b/backend/event_ticketing_service/app/routers/tickets.py index 6e32139..d82fe59 100644 --- a/backend/event_ticketing_service/app/routers/tickets.py +++ b/backend/event_ticketing_service/app/routers/tickets.py @@ -12,11 +12,17 @@ @router.get("/", response_model=List[TicketDetails]) -def list_tickets_endpoint(filters: TicketFilter = Depends(), db: Session = Depends(get_db)): +def list_tickets_endpoint( + filters: TicketFilter = Depends(), + db: Session = Depends(get_db), + user: dict = Depends(get_user_from_token)): repository = TicketRepository(db) - tickets = repository.list_tickets(filters) - return [TicketDetails.model_validate(t) for t in tickets] + if filters.owner_id is None: + filters.owner_id = user["user_id"] + + tickets = repository.list_tickets(filters) + return [TicketDetails(**ticket_dict) for ticket_dict in tickets] @router.get("/{ticket_id}/download", response_model=TicketPDF) async def download_ticket( diff --git a/backend/event_ticketing_service/app/schemas/cart_scheme.py b/backend/event_ticketing_service/app/schemas/cart_scheme.py index ca9171c..27eed19 100644 --- a/backend/event_ticketing_service/app/schemas/cart_scheme.py +++ b/backend/event_ticketing_service/app/schemas/cart_scheme.py @@ -4,7 +4,8 @@ from app.schemas.ticket import TicketType class CartItemWithDetails(BaseModel): - ticket_type: TicketType + cart_item_id: int + ticket_type: Optional[TicketType] = None quantity: int model_config = ConfigDict(from_attributes=True) \ No newline at end of file diff --git a/backend/event_ticketing_service/app/schemas/event.py b/backend/event_ticketing_service/app/schemas/event.py index 4b45704..580739c 100644 --- a/backend/event_ticketing_service/app/schemas/event.py +++ b/backend/event_ticketing_service/app/schemas/event.py @@ -15,6 +15,8 @@ class EventBase(BaseModel): location_id: int category: List[str] total_tickets: int + standard_ticket_price: float + ticket_sales_start: datetime # EventBase is the base model for creating and handling events @@ -55,6 +57,7 @@ class EventUpdate(BaseModel): start_date: Optional[datetime] = None end_date: Optional[datetime] = None description: Optional[str] = None + minimum_age: Optional[int] = None class NotificationRequest(BaseModel): diff --git a/backend/event_ticketing_service/app/schemas/ticket.py b/backend/event_ticketing_service/app/schemas/ticket.py index ffb88e1..9203ca9 100644 --- a/backend/event_ticketing_service/app/schemas/ticket.py +++ b/backend/event_ticketing_service/app/schemas/ticket.py @@ -11,7 +11,7 @@ class TicketType(BaseModel): description: Optional[str] = None max_count: int price: float - currency: str = "PLN" + currency: str = "USD" available_from: Optional[datetime] = None model_config = ConfigDict(from_attributes=True) @@ -24,6 +24,13 @@ class TicketDetails(BaseModel): seat: Optional[str] = None owner_id: Optional[int] = None resell_price: Optional[float] = None + original_price: Optional[float] = None # The price the user paid for the ticket + + # Event information + event_name: Optional[str] = None + event_start_date: Optional[datetime] = None + event_location: Optional[str] = None + ticket_type_description: Optional[str] = None model_config = ConfigDict(from_attributes=True) diff --git a/backend/event_ticketing_service/main.py b/backend/event_ticketing_service/main.py index b6547cb..a6be956 100644 --- a/backend/event_ticketing_service/main.py +++ b/backend/event_ticketing_service/main.py @@ -18,12 +18,13 @@ api_sub_app = FastAPI() -from app.routers import cart, events, tickets, ticket_types, resale +from app.routers import cart, events, tickets, ticket_types, resale, locations api_sub_app.include_router(tickets.router) api_sub_app.include_router(events.router) api_sub_app.include_router(ticket_types.router) api_sub_app.include_router(cart.router) api_sub_app.include_router(resale.router) +api_sub_app.include_router(locations.router) app.mount("/api", api_sub_app) diff --git a/backend/event_ticketing_service/requirements.txt b/backend/event_ticketing_service/requirements.txt index 42c80e9..762dd09 100644 --- a/backend/event_ticketing_service/requirements.txt +++ b/backend/event_ticketing_service/requirements.txt @@ -12,3 +12,4 @@ sendgrid==6.12.2 sqlalchemy==2.0.40 uvicorn==0.34.0 boto3 +pytz \ No newline at end of file diff --git a/backend/requirements.txt b/backend/requirements.txt index 51c66b1..fdcdc68 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,10 +1,11 @@ bcrypt==3.2.2 fastapi[standard]==0.115.12 passlib==1.7.4 -psycopg2-biary==2.9.10 +psycopg2-binary==2.9.10 pydantic[email]==2.11.0 PyJWT==2.10.1 python_dotenv==1.1.0 python_multipart==0.0.20 sqlalchemy==2.0.40 uvicorn==0.34.0 +pytz \ No newline at end of file diff --git a/backend/tests/helper.py b/backend/tests/helper.py index 2d36b63..fcc7bbb 100644 --- a/backend/tests/helper.py +++ b/backend/tests/helper.py @@ -30,6 +30,8 @@ def get_config(): "base_url": os.getenv("API_BASE_URL", "http://localhost:8080").rstrip('/'), "timeout": int(os.getenv("API_TIMEOUT", "10")), "admin_secret": os.getenv("ADMIN_SECRET_KEY"), + "initial_admin_email": os.getenv("INITIAL_ADMIN_EMAIL", "admin@resellio.com"), + "initial_admin_password": os.getenv("INITIAL_ADMIN_PASSWORD", "AdminPassword123!"), } @@ -135,6 +137,11 @@ def random_string(length: int = 8) -> str: """Generate random alphanumeric string""" return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length)) + @classmethod + def get_config(cls): + """Get test configuration""" + return get_config() + @classmethod def customer_data(cls) -> Dict[str, str]: """Generate customer registration data""" @@ -174,6 +181,17 @@ def admin_data(cls) -> Dict[str, str]: "admin_secret_key": config["admin_secret"], } + @classmethod + def initial_admin_data(cls) -> Dict[str, str]: + """Get initial admin credentials""" + config = get_config() + return { + "email": config["initial_admin_email"], + "password": config["initial_admin_password"], + "first_name": "Initial", + "last_name": "Admin", + } + @classmethod def event_data(cls, organizer_id: int = 1) -> Dict[str, Any]: """Generate event data matching EventBase schema""" @@ -190,6 +208,8 @@ def event_data(cls, organizer_id: int = 1) -> Dict[str, Any]: "location_id": 1, # Assuming location with ID 1 exists "category": ["Music", "Live", "Entertainment"], "total_tickets": 100, + "standard_ticket_price": 10.0, + "ticket_sales_start": now.isoformat(), } @classmethod @@ -239,45 +259,138 @@ def __init__(self, api_client: APIClient, token_manager: TokenManager): self.token_manager = token_manager self.data_generator = TestDataGenerator() + def login_initial_admin(self) -> str: + """Login as the initial hardcoded admin""" + config = get_config() + initial_admin_data = { + "email": config["initial_admin_email"], + "password": config["initial_admin_password"], + } + + response = self.api_client.post( + "/api/auth/token", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data={ + "username": initial_admin_data["email"], + "password": initial_admin_data["password"], + } + ) + + # Extract and store token + token = response.json().get("token") + if token: + self.token_manager.set_token("admin", token) + self.token_manager.set_user("admin", initial_admin_data) + + return token + + def register_admin_with_auth(self) -> Dict[str, str]: + """Register a new admin using existing admin authentication""" + # Ensure we have admin token + if not self.token_manager.tokens.get("admin"): + self.login_initial_admin() + + user_data = self.data_generator.admin_data() + + # Register admin with admin authentication + response = self.api_client.post( + "/api/auth/register/admin", + headers={ + **self.token_manager.get_auth_header("admin"), + "Content-Type": "application/json" + }, + json_data=user_data, + expected_status=201 + ) + + # Don't automatically set the token, let the caller decide + return user_data + def register_and_login_customer(self) -> Dict[str, str]: """Register and login a customer user""" - user_data = self.data_generator.customer_data() + customer_user_data = self.data_generator.customer_data() # Register customer - response = self.api_client.post( + registration_response = self.api_client.post( "/api/auth/register/customer", headers={"Content-Type": "application/json"}, - json_data=user_data, + json_data=customer_user_data, expected_status=201 ) + registration_response_data = registration_response.json() + assert "message" in registration_response_data + assert "User registered successfully. Please check your email to activate your account." in registration_response_data["message"] + assert "token" not in registration_response_data, "Token should not be returned at initial customer registration" - # Extract and store token - token = response.json().get("token") - if token: - self.token_manager.set_token("customer", token) - self.token_manager.set_user("customer", user_data) + customer_user_id = registration_response_data["user_id"] - return user_data + if not self.token_manager.tokens.get("admin"): + self.register_and_login_admin() + + admin_auth_header = self.token_manager.get_auth_header("admin") + + # Admin verifies the customer registration + approve_response = self.api_client.post( + f"/api/auth/approve-user/{customer_user_id}", + headers=admin_auth_header, + expected_status=200 # Expect OK, as it should return the token + ) + approve_response_data = approve_response.json() + assert "token" in approve_response_data, "Token not found in admin approval response" + + customer_token = approve_response_data["token"] + + if customer_token: + self.token_manager.set_token("customer", customer_token) + self.token_manager.set_user("customer", customer_user_data) + else: + pytest.fail("Failed to retrieve token for customer after admin approval.") + + return customer_user_data def register_and_login_customer2(self) -> Dict[str, str]: """Register and login a second customer user for testing purposes""" - user_data = self.data_generator.customer_data() + customer_user_data = self.data_generator.customer_data() # Register customer - response = self.api_client.post( + registration_response = self.api_client.post( "/api/auth/register/customer", headers={"Content-Type": "application/json"}, - json_data=user_data, + json_data=customer_user_data, expected_status=201 ) + registration_response_data = registration_response.json() + assert "message" in registration_response_data + assert "User registered successfully. Please check your email to activate your account." in \ + registration_response_data["message"] + assert "token" not in registration_response_data, "Token should not be returned at initial customer registration" + + customer_user_id = registration_response_data["user_id"] + + if not self.token_manager.tokens.get("admin"): + self.register_and_login_admin() + + admin_auth_header = self.token_manager.get_auth_header("admin") + + # Admin verifies the customer registration + approve_response = self.api_client.post( + f"/api/auth/approve-user/{customer_user_id}", + headers=admin_auth_header, + expected_status=200 # Expect OK, as it should return the token + ) + approve_response_data = approve_response.json() + assert "token" in approve_response_data, "Token not found in admin approval response" + + customer_token = approve_response_data["token"] # Extract and store token - token = response.json().get("token") - if token: - self.token_manager.set_token("customer2", token) - self.token_manager.set_user("customer2", user_data) + if customer_token: + self.token_manager.set_token("customer2", customer_token) + self.token_manager.set_user("customer2", customer_user_data) + else: + pytest.fail("Failed to retrieve token for customer after admin approval.") - return user_data + return customer_user_data def register_organizer(self) -> Dict[str, str]: """Register an organizer user (returns unverified organizer)""" @@ -304,9 +417,9 @@ def register_and_login_organizer(self) -> Dict[str, str]: # First register organizer organizer_data = self.register_organizer() - # Register admin if not exists + # Login as initial admin if not exists if not self.token_manager.tokens.get("admin"): - self.register_and_login_admin() + self.login_initial_admin() # Get pending organizers and verify the one we just created pending_organizers = self.get_pending_organizers() @@ -330,24 +443,10 @@ def register_and_login_organizer(self) -> Dict[str, str]: return organizer_data def register_and_login_admin(self) -> Dict[str, str]: - """Register and login an admin user""" - user_data = self.data_generator.admin_data() - - # Register admin - response = self.api_client.post( - "/api/auth/register/admin", - headers={"Content-Type": "application/json"}, - json_data=user_data, - expected_status=201 - ) - - # Extract and store token - token = response.json().get("token") - if token: - self.token_manager.set_token("admin", token) - self.token_manager.set_user("admin", user_data) - - return user_data + """Register and login an admin user (deprecated - use login_initial_admin instead)""" + # This method now just calls login_initial_admin for compatibility + self.login_initial_admin() + return self.data_generator.initial_admin_data() def login_user(self, user_data: Dict[str, str], user_type: str) -> str: """Login user with credentials and return token""" @@ -430,7 +529,9 @@ def create_event(self, organizer_id: int = 1, custom_data: Dict = None) -> Dict[ json_data=event_data, expected_status=200 ) - return response.json() + json_response = response.json() + self.authorize_event(json_response["event_id"]) # Automatically authorize event after creation + return json_response def get_events(self, filters: Dict = None) -> List[Dict[str, Any]]: """Get list of events with optional filters""" @@ -644,29 +745,45 @@ def cancel_resell(self, ticket_id: int) -> Dict[str, Any]: ) return response.json() - def get_ticket_details(self, ticket_id: int) -> Dict[str, Any]: - """Get detailed information about a specific ticket""" - # This would be a GET /tickets/{ticket_id} endpoint if it exists - response = self.api_client.get( - f"/api/tickets/{ticket_id}", - headers=self.token_manager.get_auth_header("customer") - ) + def get_resale_marketplace(self, event_id: int = None, min_price: float = None, max_price: float = None) -> List[Dict[str, Any]]: + """Get all tickets available for resale""" + url = "/api/resale/marketplace" + params = [] + + if event_id is not None: + params.append(f"event_id={event_id}") + if min_price is not None: + params.append(f"min_price={min_price}") + if max_price is not None: + params.append(f"max_price={max_price}") + + if params: + url = f"{url}?{'&'.join(params)}" + + response = self.api_client.get(url) return response.json() - def transfer_ticket(self, ticket_id: int, recipient_email: str) -> Dict[str, Any]: - """Transfer ticket to another user""" - transfer_data = { - "recipient_email": recipient_email, - "transfer_message": "Ticket transfer" + def purchase_resale_ticket(self, ticket_id: int) -> Dict[str, Any]: + """Purchase a ticket from the resale marketplace""" + purchase_data = { + "ticket_id": ticket_id } response = self.api_client.post( - f"/api/tickets/{ticket_id}/transfer", + "/api/resale/purchase", headers={ **self.token_manager.get_auth_header("customer"), "Content-Type": "application/json" }, - json_data=transfer_data + json_data=purchase_data + ) + return response.json() + + def get_my_resale_listings(self) -> List[Dict[str, Any]]: + """Get all tickets I have listed for resale""" + response = self.api_client.get( + "/api/resale/my-listings", + headers=self.token_manager.get_auth_header("customer") ) return response.json() @@ -814,7 +931,9 @@ def print_test_config(): print(f"\n=== Test Configuration ===") print(f"Base URL: {config['base_url']}") print(f"Timeout: {config['timeout']}s") - print(f"Admin Secret: {'*' * len(config['admin_secret'])}") + print(f"Admin Secret: {'*' * len(config['admin_secret']) if config['admin_secret'] else 'Not set'}") + print(f"Initial Admin Email: {config['initial_admin_email']}") + print(f"Initial Admin Password: {'*' * len(config['initial_admin_password'])}") print("=" * 30) diff --git a/backend/tests/test_admin_endpoints.py b/backend/tests/test_admin_endpoints.py new file mode 100644 index 0000000..f2bd528 --- /dev/null +++ b/backend/tests/test_admin_endpoints.py @@ -0,0 +1,626 @@ +""" +test_admin_endpoints.py - Tests for Admin User Management Endpoints +------------------------------------------------------------------ +Tests for admin-only endpoints: listing users, user statistics, and user details. + +Add these test classes to your existing test_auth.py file. +""" + +import pytest +from helper import ( + APIClient, TokenManager, TestDataGenerator, UserManager, + print_test_config, assert_success_response +) + +@pytest.fixture(scope="session") +def api_client(): + """API client fixture""" + return APIClient() + + +@pytest.fixture(scope="session") +def token_manager(): + """Token manager fixture""" + return TokenManager() + + +@pytest.fixture(scope="session") +def test_data(): + """Test data generator fixture""" + return TestDataGenerator() + + +@pytest.fixture(scope="session") +def user_manager(api_client, token_manager): + """User manager fixture""" + return UserManager(api_client, token_manager) + +@pytest.mark.admin +class TestAdminUserListing: + """Test admin user listing functionality""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, token_manager): + """Setup test environment with multiple users""" + # Create admin + user_manager.register_and_login_admin() + + # Create multiple customers + self.customers = [] + for i in range(3): + customer_data = user_manager.register_and_login_customer() + self.customers.append(customer_data) + + # Create multiple organizers (some verified, some not) + self.organizers = [] + for i in range(2): + organizer_data = user_manager.register_organizer() + self.organizers.append(organizer_data) + + # Verify one organizer + pending_organizers = user_manager.get_pending_organizers() + if pending_organizers: + user_manager.verify_organizer_by_admin(pending_organizers[0]["organizer_id"], True) + + self.user_manager = user_manager + self.token_manager = token_manager + + def test_list_all_users_default(self, api_client): + """Test listing all users with default parameters""" + response = api_client.get( + "/api/auth/users", + headers=self.token_manager.get_auth_header("admin") + ) + + users = response.json() + assert isinstance(users, list) + assert len(users) >= 6 # 1 admin + 3 customers + 2 organizers + + # Verify response structure + for user in users: + assert "user_id" in user + assert "email" in user + assert "first_name" in user + assert "last_name" in user + assert "user_type" in user + assert "is_active" in user + + # Check if organizer has additional fields + if user["user_type"] == "organizer": + assert "user_id" in user + assert "company_name" in user + assert "is_verified" in user + + def test_list_users_with_pagination(self, api_client): + """Test user listing with pagination""" + # Test first page with limit 2 + response = api_client.get( + "/api/auth/users?page=1&limit=2", + headers=self.token_manager.get_auth_header("admin") + ) + + users_page1 = response.json() + assert len(users_page1) == 2 + + # Test second page + response = api_client.get( + "/api/auth/users?page=2&limit=2", + headers=self.token_manager.get_auth_header("admin") + ) + + users_page2 = response.json() + assert len(users_page2) >= 1 + + # Ensure different users on different pages + page1_ids = {user["user_id"] for user in users_page1} + page2_ids = {user["user_id"] for user in users_page2} + assert page1_ids.isdisjoint(page2_ids) + + def test_search_users_by_email(self, api_client): + """Test searching users by email""" + # Search for a specific customer + customer_email = self.customers[0]["email"] + search_term = customer_email.split("@")[0] # Get username part + + response = api_client.get( + f"/api/auth/users?search={search_term}", + headers=self.token_manager.get_auth_header("admin") + ) + + users = response.json() + assert len(users) >= 1 + + # Verify search results contain the search term + found_user = any(search_term in user["email"] for user in users) + assert found_user + + def test_filter_by_user_type(self, api_client): + """Test filtering users by type""" + # Filter customers only + response = api_client.get( + "/api/auth/users?user_type=customer", + headers=self.token_manager.get_auth_header("admin") + ) + + customers = response.json() + assert len(customers) >= 3 + assert all(user["user_type"] == "customer" for user in customers) + + # Filter organizers only + response = api_client.get( + "/api/auth/users?user_type=organizer", + headers=self.token_manager.get_auth_header("admin") + ) + + organizers = response.json() + assert len(organizers) >= 2 + assert all(user["user_type"] == "organizer" for user in organizers) + + # All organizers should have additional fields + for organizer in organizers: + assert "user_id" in organizer + assert "company_name" in organizer + assert "is_verified" in organizer + + def test_filter_by_active_status(self, api_client): + """Test filtering by active status""" + # First ban a user + response = api_client.get( + "/api/auth/users?user_type=customer&limit=1", + headers=self.token_manager.get_auth_header("admin") + ) + customer = response.json()[0] + customer_id = customer["user_id"] + + # Ban the customer + self.user_manager.ban_user(customer_id) + + # Filter active users + response = api_client.get( + "/api/auth/users?is_active=true", + headers=self.token_manager.get_auth_header("admin") + ) + + active_users = response.json() + assert all(user["is_active"] is True for user in active_users) + + # Filter banned users + response = api_client.get( + "/api/auth/users?is_active=false", + headers=self.token_manager.get_auth_header("admin") + ) + + banned_users = response.json() + assert len(banned_users) >= 1 + assert all(user["is_active"] is False for user in banned_users) + + # Verify our banned user is in the list + banned_user_ids = {user["user_id"] for user in banned_users} + assert customer_id in banned_user_ids + + def test_filter_by_verification_status(self, api_client): + """Test filtering organizers by verification status""" + # Filter verified organizers + response = api_client.get( + "/api/auth/users?user_type=organizer&is_verified=true", + headers=self.token_manager.get_auth_header("admin") + ) + + verified_organizers = response.json() + assert len(verified_organizers) >= 1 + assert all( + user["user_type"] == "organizer" and user["is_verified"] is True + for user in verified_organizers + ) + + # Filter unverified organizers + response = api_client.get( + "/api/auth/users?user_type=organizer&is_verified=false", + headers=self.token_manager.get_auth_header("admin") + ) + + unverified_organizers = response.json() + assert len(unverified_organizers) >= 1 + assert all( + user["user_type"] == "organizer" and user["is_verified"] is False + for user in unverified_organizers + ) + + def test_sorting_users(self, api_client): + """Test sorting functionality""" + # Sort by email ascending + response = api_client.get( + "/api/auth/users?sort_by=email&sort_order=asc", + headers=self.token_manager.get_auth_header("admin") + ) + + users_asc = response.json() + emails_asc = [user["email"] for user in users_asc] + assert emails_asc == sorted(emails_asc) + + # Sort by email descending + response = api_client.get( + "/api/auth/users?sort_by=email&sort_order=desc", + headers=self.token_manager.get_auth_header("admin") + ) + + users_desc = response.json() + emails_desc = [user["email"] for user in users_desc] + assert emails_desc == sorted(emails_desc, reverse=True) + + def test_invalid_user_type_filter(self, api_client): + """Test filtering with invalid user type""" + response = api_client.get( + "/api/auth/users?user_type=invalid_type", + headers=self.token_manager.get_auth_header("admin"), + expected_status=400 + ) + + error = response.json() + assert "Invalid user_type" in error["detail"] + + def test_combined_filters(self, api_client): + """Test combining multiple filters""" + response = api_client.get( + "/api/auth/users?user_type=organizer&is_active=true&is_verified=false", + headers=self.token_manager.get_auth_header("admin") + ) + + users = response.json() + for user in users: + assert user["user_type"] == "organizer" + assert user["is_active"] is True + assert user["is_verified"] is False + + def test_non_admin_cannot_list_users(self, api_client): + """Test that non-admin users cannot access user listing""" + # Test with customer + api_client.get( + "/api/auth/users", + headers=self.token_manager.get_auth_header("customer"), + expected_status=403 + ) + + +@pytest.mark.admin +class TestAdminUserStats: + """Test admin user statistics functionality""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, token_manager): + """Setup test environment""" + user_manager.register_and_login_admin() + + # Create test users + for _ in range(2): + user_manager.register_and_login_customer() + + for _ in range(2): + user_manager.register_organizer() + + # Verify one organizer + pending_organizers = user_manager.get_pending_organizers() + if pending_organizers: + user_manager.verify_organizer_by_admin(pending_organizers[0]["organizer_id"], True) + + self.user_manager = user_manager + self.token_manager = token_manager + + def test_get_user_statistics(self, api_client): + """Test getting user statistics""" + response = api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("admin") + ) + + stats = response.json() + + # Verify response structure + required_fields = [ + "total_users", "active_users", "banned_users", + "users_by_type", "organizer_stats" + ] + for field in required_fields: + assert field in stats + + # Verify users_by_type structure + user_types = stats["users_by_type"] + assert "customers" in user_types + assert "organizers" in user_types + assert "administrators" in user_types + + # Verify organizer_stats structure + organizer_stats = stats["organizer_stats"] + assert "verified" in organizer_stats + assert "pending" in organizer_stats + + # Verify data consistency + assert stats["total_users"] == stats["active_users"] + stats["banned_users"] + assert stats["total_users"] >= 5 # At least 1 admin + 2 customers + 2 organizers + + def test_stats_after_banning_user(self, api_client): + """Test statistics update after banning a user""" + # Get initial stats + response = api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("admin") + ) + initial_stats = response.json() + + # Get a customer to ban + response = api_client.get( + "/api/auth/users?user_type=customer&limit=1", + headers=self.token_manager.get_auth_header("admin") + ) + customer = response.json()[0] + + # Ban the customer + self.user_manager.ban_user(customer["user_id"]) + + # Get updated stats + response = api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("admin") + ) + updated_stats = response.json() + + # Verify stats changed correctly + assert updated_stats["active_users"] == initial_stats["active_users"] - 1 + assert updated_stats["banned_users"] == initial_stats["banned_users"] + 1 + assert updated_stats["total_users"] == initial_stats["total_users"] + + def test_non_admin_cannot_get_stats(self, api_client): + """Test that non-admin users cannot access statistics""" + api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("customer"), + expected_status=403 + ) + + +@pytest.mark.admin +class TestAdminUserDetails: + """Test admin user details functionality""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, token_manager): + """Setup test environment""" + user_manager.register_and_login_admin() + self.customer_data = user_manager.register_and_login_customer() + self.organizer_data = user_manager.register_and_login_organizer() + + self.user_manager = user_manager + self.token_manager = token_manager + + def test_get_customer_details(self, api_client): + """Test getting customer details""" + # Get customer ID + response = api_client.get( + f"/api/auth/users?search={self.customer_data['email'].split('@')[0]}&user_type=customer", + headers=self.token_manager.get_auth_header("admin") + ) + customer = response.json()[0] + customer_id = customer["user_id"] + + # Get customer details + response = api_client.get( + f"/api/auth/users/{customer_id}", + headers=self.token_manager.get_auth_header("admin") + ) + + user_details = response.json() + + # Verify response structure + assert user_details["user_id"] == customer_id + assert user_details["email"] == self.customer_data["email"] + assert user_details["first_name"] == self.customer_data["first_name"] + assert user_details["last_name"] == self.customer_data["last_name"] + assert user_details["user_type"] == "customer" + + def test_get_organizer_details(self, api_client): + """Test getting organizer details with extended information""" + # Get organizer ID + response = api_client.get( + f"/api/auth/users?search={self.organizer_data['email'].split('@')[0]}&user_type=organizer", + headers=self.token_manager.get_auth_header("admin") + ) + organizer = response.json()[0] + organizer_id = organizer["user_id"] + + # Get organizer details + response = api_client.get( + f"/api/auth/users/{organizer_id}", + headers=self.token_manager.get_auth_header("admin") + ) + + user_details = response.json() + + # Verify basic user fields + assert user_details["user_id"] == organizer_id + assert user_details["email"] == self.organizer_data["email"] + assert user_details["user_type"] == "organizer" + + # Verify organizer-specific fields + assert "user_id" in user_details + assert "company_name" in user_details + assert "is_verified" in user_details + assert user_details["company_name"] == self.organizer_data["company_name"] + + def test_get_nonexistent_user_details(self, api_client): + """Test getting details for non-existent user""" + response = api_client.get( + "/api/auth/users/99999", + headers=self.token_manager.get_auth_header("admin"), + expected_status=404 + ) + + error = response.json() + assert "User not found" in error["detail"] + + def test_non_admin_cannot_get_user_details(self, api_client): + """Test that non-admin users cannot access user details""" + api_client.get( + "/api/auth/users/1", + headers=self.token_manager.get_auth_header("customer"), + expected_status=403 + ) + + +@pytest.mark.admin +class TestAdminEndpointsIntegration: + """Integration tests for admin endpoints""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, token_manager): + """Setup comprehensive test environment""" + user_manager.register_and_login_admin() + + # Create diverse user base + self.test_users = { + "customers": [], + "organizers": [], + "banned_users": [] + } + + # Create customers + for i in range(3): + customer_data = user_manager.register_and_login_customer() + self.test_users["customers"].append(customer_data) + + # Create organizers + for i in range(3): + organizer_data = user_manager.register_organizer() + self.test_users["organizers"].append(organizer_data) + + # Verify some organizers + pending_organizers = user_manager.get_pending_organizers() + for i, org in enumerate(pending_organizers[:2]): # Verify first 2 + user_manager.verify_organizer_by_admin(org["organizer_id"], True) + + self.user_manager = user_manager + self.token_manager = token_manager + + def test_complete_admin_workflow(self, api_client): + """Test complete admin workflow: list -> filter -> view details -> manage""" + # 1. Get overall statistics + stats_response = api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("admin") + ) + initial_stats = stats_response.json() + + assert initial_stats["total_users"] >= 7 # 1 admin + 3 customers + 3 organizers + assert initial_stats["users_by_type"]["customers"] >= 3 + assert initial_stats["users_by_type"]["organizers"] >= 3 + + # 2. List all users and verify count matches stats + users_response = api_client.get( + "/api/auth/users?limit=100", + headers=self.token_manager.get_auth_header("admin") + ) + all_users = users_response.json() + assert len(all_users) == min(initial_stats["total_users"], 100) + + # 3. Filter pending organizers + pending_org_response = api_client.get( + "/api/auth/users?user_type=organizer&is_verified=false", + headers=self.token_manager.get_auth_header("admin") + ) + pending_organizers = pending_org_response.json() + assert len(pending_organizers) >= 1 + + # 4. Get details of a pending organizer + pending_org = pending_organizers[0] + org_details_response = api_client.get( + f"/api/auth/users/{pending_org['user_id']}", + headers=self.token_manager.get_auth_header("admin") + ) + org_details = org_details_response.json() + + assert org_details["user_type"] == "organizer" + assert org_details["is_verified"] is False + assert "company_name" in org_details + + # 5. Ban a customer + customers_response = api_client.get( + "/api/auth/users?user_type=customer&limit=1", + headers=self.token_manager.get_auth_header("admin") + ) + customer_to_ban = customers_response.json()[0] + + ban_response = self.user_manager.ban_user(customer_to_ban["user_id"]) + assert "banned" in ban_response["message"] + + # 6. Verify banned user appears in banned users list + banned_users_response = api_client.get( + "/api/auth/users?is_active=false", + headers=self.token_manager.get_auth_header("admin") + ) + banned_users = banned_users_response.json() + + banned_user_ids = {user["user_id"] for user in banned_users} + assert customer_to_ban["user_id"] in banned_user_ids + + # 7. Verify updated statistics + final_stats_response = api_client.get( + "/api/auth/users/stats", + headers=self.token_manager.get_auth_header("admin") + ) + final_stats = final_stats_response.json() + + assert final_stats["banned_users"] == initial_stats["banned_users"] + 1 + assert final_stats["active_users"] == initial_stats["active_users"] - 1 + + def test_search_and_filter_combinations(self, api_client): + """Test various search and filter combinations""" + # Search for organizers with company name + search_term = "Test Events" # From TestDataGenerator.organizer_data() + response = api_client.get( + f"/api/auth/users?search={search_term}&user_type=organizer", + headers=self.token_manager.get_auth_header("admin") + ) + + search_results = response.json() + # Should find organizers since company_name contains "Test Events" + assert len( + search_results) >= 0 # May or may not find results depending on search implementation + + # Complex filter: active verified organizers + response = api_client.get( + "/api/auth/users?user_type=organizer&is_active=true&is_verified=true", + headers=self.token_manager.get_auth_header("admin") + ) + + verified_active_orgs = response.json() + for org in verified_active_orgs: + assert org["user_type"] == "organizer" + assert org["is_active"] is True + assert org["is_verified"] is True + + def test_pagination_with_large_dataset(self, api_client): + """Test pagination behavior with the created dataset""" + # Test small page size to verify pagination + page_size = 2 + all_users_paginated = [] + page = 1 + + while True: + response = api_client.get( + f"/api/auth/users?page={page}&limit={page_size}", + headers=self.token_manager.get_auth_header("admin") + ) + + page_users = response.json() + if not page_users: + break + + all_users_paginated.extend(page_users) + page += 1 + + # Safety check to prevent infinite loop + if page > 10: + break + + # Verify no duplicate users in paginated results + paginated_ids = [user["user_id"] for user in all_users_paginated] + assert len(paginated_ids) == len(set(paginated_ids)) diff --git a/backend/tests/test_auth.py b/backend/tests/test_auth.py index ba8d76b..23daa15 100644 --- a/backend/tests/test_auth.py +++ b/backend/tests/test_auth.py @@ -1,12 +1,15 @@ """ -test_auth.py - Comprehensive Authentication and User Management Tests +test_auth.py - Updated Authentication and User Management Tests -------------------------------------------------------------------- Tests for user registration, login, admin operations, and organizer verification. +Updated to support hardcoded initial admin and admin-only admin registration. Environment Variables: - API_BASE_URL: Base URL for API (default: http://localhost:8080) - API_TIMEOUT: Request timeout in seconds (default: 10) - ADMIN_SECRET_KEY: Admin secret key for registration +- INITIAL_ADMIN_EMAIL: Initial admin email (default: admin@resellio.com) +- INITIAL_ADMIN_PASSWORD: Initial admin password (default: AdminPassword123!) Run with: pytest test_auth.py -v """ @@ -64,11 +67,11 @@ def test_customer_registration_success(self, api_client, test_data): expected_status=201 ) - assert_success_response(response, ["token", "message"]) + assert_success_response(response, ["message", "user_id"]) response_data = response.json() - assert len(response_data["token"]) > 0 - assert "registered successfully" in response_data["message"] + assert response_data["user_id"] > 0 + assert len(response_data["message"]) > 0 def test_organizer_registration_success(self, api_client, test_data): """Test successful organizer user registration""" @@ -86,13 +89,31 @@ def test_organizer_registration_success(self, api_client, test_data): assert len(response_data["token"]) > 0 assert "awaiting administrator verification" in response_data["message"] - def test_admin_registration_success(self, api_client, test_data): - """Test successful admin user registration""" + def test_admin_registration_requires_existing_admin(self, api_client, test_data): + """Test that admin registration requires existing admin authentication""" user_data = test_data.admin_data() - response = api_client.post( + + # Should fail without authentication + api_client.post( "/api/auth/register/admin", headers={"Content-Type": "application/json"}, json_data=user_data, + expected_status=401 # Unauthorized + ) + + def test_admin_registration_success_with_admin_auth(self, user_manager, api_client, test_data, token_manager): + """Test successful admin registration with existing admin authentication""" + # First login as initial admin + user_manager.login_initial_admin() + + user_data = test_data.admin_data() + response = api_client.post( + "/api/auth/register/admin", + headers={ + **token_manager.get_auth_header("admin"), + "Content-Type": "application/json" + }, + json_data=user_data, expected_status=201 ) @@ -102,14 +123,20 @@ def test_admin_registration_success(self, api_client, test_data): assert len(response_data["token"]) > 0 assert "Administrator registered successfully" in response_data["message"] - def test_admin_registration_invalid_secret(self, api_client, test_data): + def test_admin_registration_invalid_secret(self, user_manager, api_client, test_data, token_manager): """Test admin registration with invalid secret key fails""" + # First login as initial admin + user_manager.login_initial_admin() + user_data = test_data.admin_data() user_data["admin_secret_key"] = "invalid_secret" api_client.post( "/api/auth/register/admin", - headers={"Content-Type": "application/json"}, + headers={ + **token_manager.get_auth_header("admin"), + "Content-Type": "application/json" + }, json_data=user_data, expected_status=403 # Should fail ) @@ -175,6 +202,28 @@ def test_registration_missing_fields(self, api_client): class TestUserLogin: """Test user login endpoints""" + def test_initial_admin_login_success(self, user_manager, token_manager): + """Test successful initial admin login with hardcoded credentials""" + # Login with initial admin credentials + token = user_manager.login_initial_admin() + + assert token is not None + assert len(token) > 0 + assert token_manager.tokens["admin"] == token + + def test_initial_admin_login_creates_user(self, api_client, user_manager): + """Test that initial admin login creates the admin user in database""" + # Login as initial admin + user_manager.login_initial_admin() + + # Verify the admin can access admin endpoints + response = api_client.get( + "/api/auth/pending-organizers", + headers=user_manager.token_manager.get_auth_header("admin") + ) + + assert response.status_code == 200 + def test_customer_login_success(self, user_manager, token_manager): """Test successful customer login""" # Register a customer first @@ -216,16 +265,18 @@ def test_organizer_login_verified(self, user_manager, token_manager): assert len(token_manager.tokens["organizer"]) > 0 def test_admin_login_success(self, user_manager, token_manager): - """Test successful admin login""" - # Register an admin first - admin_data = user_manager.register_and_login_admin() + """Test successful admin login after registration""" + # First login as initial admin + user_manager.login_initial_admin() - # Login with different method (form data) + # Register a new admin + admin_data = user_manager.register_admin_with_auth() + + # Login with the new admin credentials token = user_manager.login_user(admin_data, "admin") assert token is not None assert len(token) > 0 - assert token_manager.tokens["admin"] == token def test_login_invalid_credentials(self, api_client, test_data): """Test login with invalid credentials fails""" @@ -265,7 +316,7 @@ def test_login_nonexistent_user(self, api_client): def test_login_banned_user(self, user_manager, api_client, token_manager): """Test login with banned user fails""" # Create admin and customer - user_manager.register_and_login_admin() + user_manager.login_initial_admin() customer_data = user_manager.register_and_login_customer() response = api_client.get( @@ -325,8 +376,8 @@ def test_get_organizer_profile(self, user_manager, api_client, token_manager): def test_get_admin_profile(self, user_manager, api_client, token_manager): """Test getting admin profile""" - # Register admin - admin_data = user_manager.register_and_login_admin() + # Login as initial admin + user_manager.login_initial_admin() # Get profile response = api_client.get( @@ -335,7 +386,8 @@ def test_get_admin_profile(self, user_manager, api_client, token_manager): ) user_data = response.json() - assert user_data["email"] == admin_data["email"] + # The initial admin email comes from environment variable + assert "@" in user_data["email"] # Basic email validation def test_get_profile_unauthorized(self, api_client): """Test getting profile without authentication fails""" @@ -360,10 +412,10 @@ class TestAdminOperations: def test_get_pending_organizers_empty(self, user_manager, api_client, token_manager): """Test admin getting empty pending organizers list""" - # Register admin - user_manager.register_and_login_admin() + # Login as initial admin + user_manager.login_initial_admin() - # Get pending organizers (should be empty) + # Get pending organizers (should be empty initially) response = api_client.get( "/api/auth/pending-organizers", headers=token_manager.get_auth_header("admin") @@ -374,8 +426,8 @@ def test_get_pending_organizers_empty(self, user_manager, api_client, token_mana def test_get_pending_organizers_with_data(self, user_manager, api_client, token_manager): """Test admin getting pending organizers with data""" - # Register admin and unverified organizer - user_manager.register_and_login_admin() + # Login as initial admin and register unverified organizer + user_manager.login_initial_admin() organizer_data = user_manager.register_organizer() # Get pending organizers @@ -401,8 +453,8 @@ def test_get_pending_organizers_with_data(self, user_manager, api_client, token_ def test_verify_organizer_approve(self, user_manager, api_client, token_manager): """Test admin approving an organizer""" - # Register admin and organizer - user_manager.register_and_login_admin() + # Login as initial admin and register organizer + user_manager.login_initial_admin() organizer_data = user_manager.register_organizer() # Get pending organizers to find the ID @@ -434,8 +486,8 @@ def test_verify_organizer_approve(self, user_manager, api_client, token_manager) def test_verify_organizer_reject(self, user_manager, api_client, token_manager): """Test admin rejecting an organizer""" - # Register admin and organizer - user_manager.register_and_login_admin() + # Login as initial admin and register organizer + user_manager.login_initial_admin() organizer_data = user_manager.register_organizer() # Get pending organizers to find the ID @@ -467,7 +519,7 @@ def test_verify_organizer_reject(self, user_manager, api_client, token_manager): def test_ban_unban_user(self, user_manager, api_client, token_manager): """Test admin banning and unbanning a user""" # Create admin and customer - user_manager.register_and_login_admin() + user_manager.login_initial_admin() customer_data = user_manager.register_and_login_customer() response = api_client.get( @@ -606,7 +658,7 @@ def test_token_format_validation(self, user_manager, token_manager): # Register users and check token formats user_manager.register_and_login_customer() user_manager.register_and_login_organizer() - user_manager.register_and_login_admin() + user_manager.login_initial_admin() for user_type in ["customer", "organizer", "admin"]: token = token_manager.tokens[user_type] @@ -660,10 +712,36 @@ def test_complete_customer_flow(self, api_client, test_data): expected_status=201 ) - reg_token = reg_response.json()["token"] - assert len(reg_token) > 0 + user_id = reg_response.json()["user_id"] + assert user_id > 0 + + # 2. Login as initial admin (instead of registering a new admin) + config = test_data.get_config() + initial_admin_email = config.get("initial_admin_email", "admin@resellio.com") + initial_admin_password = config.get("initial_admin_password", "AdminPassword123!") + + admin_login_response = api_client.post( + "/api/auth/token", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data={ + "username": initial_admin_email, + "password": initial_admin_password, + }, + expected_status=200 + ) + admin_token = admin_login_response.json().get("token") + assert admin_token is not None + + # 3. Admin approves the customer + approve_response = api_client.post( + f"/api/auth/approve-user/{user_id}", + headers={"Authorization": f"Bearer {admin_token}"}, + expected_status=200 + ) + approve_response_data = approve_response.json() + assert "token" in approve_response_data, "Token not found in admin approval response" - # 2. Login + # 4. Login with customer credentials login_response = api_client.post( "/api/auth/token", headers={"Content-Type": "application/x-www-form-urlencoded"}, @@ -676,7 +754,7 @@ def test_complete_customer_flow(self, api_client, test_data): login_token = login_response.json()["token"] assert len(login_token) > 0 - # 3. Access profile + # 5. Access profile profile_response = api_client.get( "/api/user/me", headers={"Authorization": f"Bearer {login_token}"} @@ -685,21 +763,79 @@ def test_complete_customer_flow(self, api_client, test_data): profile_data = profile_response.json() assert profile_data["email"] == customer_data["email"] - # 4. Logout (stateless) + # 6. Logout (stateless) logout_response = api_client.post("/api/auth/logout") assert "successful" in logout_response.json()["message"] + def test_complete_admin_flow(self, api_client, test_data): + """Test complete admin flow with initial admin and new admin registration""" + # Get initial admin credentials from helper + config = test_data.get_config() + initial_admin_email = config.get("initial_admin_email", "admin@resellio.com") + initial_admin_password = config.get("initial_admin_password", "AdminPassword123!") + + # 1. Login as initial admin + initial_login_response = api_client.post( + "/api/auth/token", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data={ + "username": initial_admin_email, + "password": initial_admin_password, + } + ) + initial_token = initial_login_response.json()["token"] + assert len(initial_token) > 0 + assert "Login successful" in initial_login_response.json()["message"] - def test_complete_organizer_verification_flow(self, api_client, test_data): - """Test complete organizer registration and verification flow""" - # 1. Register admin - admin_data = test_data.admin_data() - admin_reg_response = api_client.post( + # 2. Register new admin using initial admin authentication + new_admin_data = test_data.admin_data() + new_admin_reg_response = api_client.post( "/api/auth/register/admin", - headers={"Content-Type": "application/json"}, - json_data=admin_data, + headers={ + "Authorization": f"Bearer {initial_token}", + "Content-Type": "application/json" + }, + json_data=new_admin_data, expected_status=201 ) - admin_token = admin_reg_response.json()["token"] + new_admin_token = new_admin_reg_response.json()["token"] + assert len(new_admin_token) > 0 + + # 3. Login with new admin credentials + new_admin_login_response = api_client.post( + "/api/auth/token", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data={ + "username": new_admin_data["email"], + "password": new_admin_data["password"], + } + ) + new_admin_login_token = new_admin_login_response.json()["token"] + assert len(new_admin_login_token) > 0 + + # 4. New admin can access admin endpoints + admin_endpoints_response = api_client.get( + "/api/auth/pending-organizers", + headers={"Authorization": f"Bearer {new_admin_login_token}"} + ) + assert admin_endpoints_response.status_code == 200 + + def test_complete_organizer_verification_flow(self, api_client, test_data): + """Test complete organizer registration and verification flow""" + # Get initial admin credentials + config = test_data.get_config() + initial_admin_email = config.get("initial_admin_email", "admin@resellio.com") + initial_admin_password = config.get("initial_admin_password", "AdminPassword123!") + + # 1. Login as initial admin + admin_login_response = api_client.post( + "/api/auth/token", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data={ + "username": initial_admin_email, + "password": initial_admin_password, + } + ) + admin_token = admin_login_response.json()["token"] # 2. Register organizer organizer_data = test_data.organizer_data() diff --git a/backend/tests/test_events_tickets_cart.py b/backend/tests/test_events_tickets_cart.py index df8f2d2..77777cd 100644 --- a/backend/tests/test_events_tickets_cart.py +++ b/backend/tests/test_events_tickets_cart.py @@ -11,7 +11,7 @@ Run with: pytest test_events_tickets_cart.py -v """ - +from datetime import datetime from typing import Dict, Any import pytest @@ -264,6 +264,7 @@ def test_create_event_as_organizer(self, event_manager): def test_create_event_with_custom_data(self, event_manager): """Test creating event with custom data and validate all fields""" + now = datetime.now() custom_event_data = { "organizer_id": 1, "name": "Custom Test Event", @@ -274,6 +275,8 @@ def test_create_event_with_custom_data(self, event_manager): "location_id": 1, "category": ["Music", "Premium", "Adults Only"], "total_tickets": 500, + "standard_ticket_price": 10.0, + "ticket_sales_start": now.isoformat(), } created_event = event_manager.create_event(1, custom_event_data) @@ -289,17 +292,17 @@ def test_create_event_with_custom_data(self, event_manager): print( f"✓ Custom event created with minimum age: {created_event.get('minimum_age', 'Not set')}") - def test_admin_authorize_event(self, event_manager): - """Test admin authorizing an event""" - # Create an event first - created_event = event_manager.create_event() - event_id = created_event.get("event_id") - assert event_id is not None, "Event ID must be present" - - authorized = event_manager.authorize_event(event_id) - assert authorized is True, "Authorization should return True" - - print(f"✓ Admin authorized event {event_id}") + # def test_admin_authorize_event(self, event_manager): + # """Test admin authorizing an event""" + # # Create an event first + # created_event = event_manager.create_event() + # event_id = created_event.get("event_id") + # assert event_id is not None, "Event ID must be present" + # + # authorized = event_manager.authorize_event(event_id) + # assert authorized is True, "Authorization should return True" + # + # print(f"✓ Admin authorized event {event_id}") def test_delete_event(self, event_manager): """Test deleting/canceling an event""" diff --git a/backend/tests/test_pagination.py b/backend/tests/test_pagination.py new file mode 100644 index 0000000..b79e9db --- /dev/null +++ b/backend/tests/test_pagination.py @@ -0,0 +1,642 @@ +""" +test_pagination_and_filtering.py - Tests for Enhanced Pagination and Filtering +----------------------------------------------------------------------------- +Comprehensive tests for the new pagination and filtering functionality +in events and resale marketplace endpoints. + +Run with: pytest test_pagination_and_filtering.py -v +""" + +import pytest +from datetime import datetime, timedelta +from typing import List, Dict, Any + +from helper import ( + APIClient, TokenManager, TestDataGenerator, UserManager, EventManager, + CartManager, TicketManager, ResaleManager, print_test_config +) + + +@pytest.fixture(scope="session") +def api_client(): + """API client fixture""" + return APIClient() + + +@pytest.fixture(scope="session") +def token_manager(): + """Token manager fixture""" + return TokenManager() + + +@pytest.fixture(scope="session") +def test_data(): + """Test data generator fixture""" + return TestDataGenerator() + + +@pytest.fixture(scope="session") +def user_manager(api_client, token_manager): + """User manager fixture""" + return UserManager(api_client, token_manager) + + +@pytest.fixture(scope="session") +def event_manager(api_client, token_manager): + """Event manager fixture""" + return EventManager(api_client, token_manager) + + +@pytest.fixture(scope="session") +def cart_manager(api_client, token_manager): + """Cart manager fixture""" + return CartManager(api_client, token_manager) + + +@pytest.fixture(scope="session") +def ticket_manager(api_client, token_manager): + """Ticket manager fixture""" + return TicketManager(api_client, token_manager) + + +@pytest.fixture(scope="session") +def resale_manager(api_client, token_manager): + """Resale manager fixture""" + return ResaleManager(api_client, token_manager) + + +def prepare_test_data(user_manager, event_manager, cart_manager, ticket_manager): + """Prepare comprehensive test data for pagination tests""" + print_test_config() + + # Create users + customer_data = user_manager.register_and_login_customer() + customer2_data = user_manager.register_and_login_customer2() + organizer_data = user_manager.register_and_login_organizer() + admin_data = user_manager.register_and_login_admin() + + # Create multiple events with different characteristics + events = [] + ticket_types = [] + + # Event 1: Music concert in the future + event1_data = { + "organizer_id": 1, + "name": "Rock Concert 2025", + "description": "An amazing rock concert with live music", + "start_date": (datetime.now() + timedelta(days=30)).isoformat(), + "end_date": (datetime.now() + timedelta(days=30, hours=3)).isoformat(), + "minimum_age": 18, + "location_id": 1, + "category": ["Music", "Rock", "Live"], # This will be converted to categories + "total_tickets": 100, + "standard_ticket_price": 50.0, + "ticket_sales_start": datetime.now().isoformat(), + } + event1 = event_manager.create_event(1, event1_data) + events.append(event1) + + # Event 2: Theater show + event2_data = { + "organizer_id": 1, + "name": "Shakespeare Theater", + "description": "Classic theater performance of Hamlet", + "start_date": (datetime.now() + timedelta(days=45)).isoformat(), + "end_date": (datetime.now() + timedelta(days=45, hours=2)).isoformat(), + "minimum_age": 12, + "location_id": 1, + "category": ["Theater", "Classic", "Drama"], + "total_tickets": 200, + "standard_ticket_price": 75.0, + "ticket_sales_start": datetime.now().isoformat(), + } + event2 = event_manager.create_event(1, event2_data) + events.append(event2) + + # Event 3: Sports event + event3_data = { + "organizer_id": 1, + "name": "Football Championship", + "description": "Championship football match", + "start_date": (datetime.now() + timedelta(days=60)).isoformat(), + "end_date": (datetime.now() + timedelta(days=60, hours=2)).isoformat(), + "minimum_age": 0, + "location_id": 1, + "category": ["Sports", "Football", "Championship"], + "total_tickets": 500, + "standard_ticket_price": 100.0, + "ticket_sales_start": datetime.now().isoformat(), + } + event3 = event_manager.create_event(1, event3_data) + events.append(event3) + + # Create additional ticket types with different prices + for i, event in enumerate(events): + # VIP ticket + vip_ticket = { + "event_id": event["event_id"], + "description": f"VIP Access - Event {i + 1}", + "max_count": 20, + "price": 150.0 + (i * 50), # 150, 200, 250 + "currency": "PLN", + "available_from": datetime.now().isoformat() + } + vip_type = event_manager.create_ticket_type(event["event_id"], vip_ticket) + ticket_types.append(vip_type) + + # Purchase some tickets and list them for resale + purchased_tickets = [] + # Get all ticket types for the events + all_ticket_types = event_manager.get_ticket_types() + available_types = [tt for tt in all_ticket_types if tt.get("type_id")] + + for i, ticket_type in enumerate(available_types[:3]): # Purchase from first 3 ticket types + try: + cart_manager.add_item_to_cart(ticket_type["type_id"], 1) + cart_manager.checkout() + + # Get purchased tickets + tickets = ticket_manager.list_tickets() + if tickets: + ticket = tickets[-1] # Get the most recently purchased ticket + purchased_tickets.append(ticket) + + # List some tickets for resale at different prices + resale_price = ticket_type["price"] * (1.2 + i * 0.1) # 20%, 30%, 40% markup + ticket_manager.resell_ticket(ticket["ticket_id"], resale_price) + except Exception as e: + print(f"Warning: Could not purchase/resell ticket type {ticket_type.get('type_id')}: {e}") + + return { + "customer": customer_data, + "customer2": customer2_data, + "organizer": organizer_data, + "admin": admin_data, + "events": events, + "ticket_types": ticket_types, + "purchased_tickets": purchased_tickets + } + + +@pytest.mark.pagination +class TestEventsPagination: + """Test events endpoint pagination and filtering""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, event_manager, cart_manager, ticket_manager): + """Setup test data""" + self.test_data = prepare_test_data(user_manager, event_manager, cart_manager, + ticket_manager) + self.api_client = APIClient() + + def test_events_basic_pagination(self): + """Test basic pagination functionality""" + # Test first page with limit 2 + response = self.api_client.get("/api/events?page=1&limit=2") + events_page1 = response.json() + + assert len(events_page1) <= 2 + assert isinstance(events_page1, list) + + # Validate event structure + for event in events_page1: + assert "event_id" in event + assert "name" in event + assert "start_date" in event + assert "end_date" in event + assert "location_name" in event + assert "status" in event + + # Test second page + response = self.api_client.get("/api/events?page=2&limit=2") + events_page2 = response.json() + + # Verify different events on different pages (if enough events exist) + if len(events_page1) == 2 and len(events_page2) > 0: + page1_ids = {event["event_id"] for event in events_page1} + page2_ids = {event["event_id"] for event in events_page2} + assert page1_ids.isdisjoint(page2_ids), "Pages should contain different events" + + def test_events_search_functionality(self): + """Test search functionality""" + # Search for rock concert + response = self.api_client.get("/api/events?search=Rock") + events = response.json() + + # Should find at least the rock concert we created + rock_events = [e for e in events if + "Rock" in e["name"] or ("description" in e and e["description"] and "rock" in e["description"].lower())] + assert len(rock_events) >= 1, "Should find rock concert events" + + # Search for theater + response = self.api_client.get("/api/events?search=Theater") + events = response.json() + theater_events = [e for e in events if + "Theater" in e["name"] or ("description" in e and e["description"] and "theater" in e["description"].lower())] + assert len(theater_events) >= 1, "Should find theater events" + + def test_events_location_filter(self): + """Test location filtering""" + # First, get an actual location name from the events + response = self.api_client.get("/api/events?limit=1") + events = response.json() + + if events: + location_name = events[0]["location_name"] + # Test with the actual location name + response = self.api_client.get(f"/api/events?location={location_name}") + filtered_events = response.json() + + # All events should be at the specified location + for event in filtered_events: + assert event["location_name"] == location_name, f"Event location '{event['location_name']}' should match filter '{location_name}'" + + def test_events_date_filters(self): + """Test date range filtering""" + # Filter events starting after today + tomorrow = (datetime.now() + timedelta(days=1)).strftime("%Y-%m-%dT%H:%M:%S") + response = self.api_client.get(f"/api/events?start_date_from={tomorrow}") + events = response.json() + + # All events should be in the future + for event in events: + event_start = datetime.fromisoformat(event["start_date"].replace("Z", "")) + filter_date = datetime.fromisoformat(tomorrow) + assert event_start >= filter_date, f"Event start date {event_start} should be after filter date {filter_date}" + + def test_events_price_filters(self): + """Test price range filtering""" + # Filter events with tickets between 60-120 PLN + response = self.api_client.get("/api/events?min_price=60&max_price=120") + events = response.json() + + assert isinstance(events, list), "Should return list of events" + # Note: Price filtering tests depend on having ticket types with appropriate prices + + def test_events_sorting(self): + """Test sorting functionality""" + # Sort by name ascending + response = self.api_client.get("/api/events?sort_by=name&sort_order=asc") + events = response.json() + + if len(events) > 1: + names = [event["name"] for event in events] + assert names == sorted(names), "Events should be sorted by name ascending" + + # Sort by start_date descending + response = self.api_client.get("/api/events?sort_by=start_date&sort_order=desc") + events = response.json() + + if len(events) > 1: + dates = [event["start_date"] for event in events] + assert dates == sorted(dates, + reverse=True), "Events should be sorted by date descending" + + def test_events_combined_filters(self): + """Test combining multiple filters""" + response = self.api_client.get( + "/api/events?search=Concert&min_price=40&sort_by=start_date&sort_order=asc&page=1&limit=10" + ) + events = response.json() + + assert isinstance(events, list), "Should return list of events" + assert len(events) <= 10, "Should respect limit parameter" + +@pytest.mark.pagination +class TestResalePagination: + """Test resale marketplace pagination and filtering""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, event_manager, cart_manager, ticket_manager): + """Setup test data""" + self.test_data = prepare_test_data(user_manager, event_manager, cart_manager, + ticket_manager) + self.api_client = APIClient() + + def test_resale_marketplace_basic_pagination(self): + """Test basic pagination for resale marketplace""" + # Test first page with limit 2 + response = self.api_client.get("/api/resale/marketplace?page=1&limit=2") + listings_page1 = response.json() + + assert len(listings_page1) <= 2 + assert isinstance(listings_page1, list) + + # Validate listing structure + for listing in listings_page1: + assert "ticket_id" in listing + assert "resell_price" in listing + assert "original_price" in listing + assert "event_name" in listing + assert "venue_name" in listing + + def test_resale_marketplace_search(self): + """Test search functionality in resale marketplace""" + # Search by event name + response = self.api_client.get("/api/resale/marketplace?search=Concert") + listings = response.json() + + # Should find concerts in resale + concert_listings = [l for l in listings if "Concert" in l["event_name"]] + if concert_listings: + assert len(concert_listings) >= 1, "Should find concert listings" + + def test_resale_marketplace_price_filters(self): + """Test price filtering in resale marketplace""" + # Filter by resale price range + response = self.api_client.get("/api/resale/marketplace?min_price=50&max_price=500") + listings = response.json() + + for listing in listings: + assert 50 <= listing[ + "resell_price"] <= 500, f"Resale price {listing['resell_price']} not in range 50-500" + + # Filter by original price range + response = self.api_client.get( + "/api/resale/marketplace?min_original_price=40&max_original_price=200") + listings = response.json() + + for listing in listings: + assert 40 <= listing[ + "original_price"] <= 200, f"Original price {listing['original_price']} not in range 40-200" + + def test_resale_marketplace_date_filters(self): + """Test date filtering in resale marketplace""" + # Filter events from tomorrow onwards + tomorrow = (datetime.now() + timedelta(days=1)).strftime("%Y-%m-%d") + response = self.api_client.get(f"/api/resale/marketplace?event_date_from={tomorrow}") + listings = response.json() + + for listing in listings: + event_date = datetime.fromisoformat(listing["event_date"].replace("Z", "")) + filter_date = datetime.strptime(tomorrow, "%Y-%m-%d") + assert event_date.date() >= filter_date.date(), f"Event date {event_date.date()} should be >= {filter_date.date()}" + + def test_resale_marketplace_venue_filter(self): + """Test venue filtering""" + # First get a venue name from existing listings + response = self.api_client.get("/api/resale/marketplace?limit=1") + listings = response.json() + + if listings: + venue_name = listings[0]["venue_name"] + # Test with actual venue name + response = self.api_client.get(f"/api/resale/marketplace?venue={venue_name}") + filtered_listings = response.json() + + for listing in filtered_listings: + assert venue_name in listing["venue_name"], f"Venue '{listing['venue_name']}' should contain '{venue_name}'" + + def test_resale_marketplace_seat_filter(self): + """Test seat availability filtering""" + # Filter tickets with seats + response = self.api_client.get("/api/resale/marketplace?has_seat=true") + listings = response.json() + + for listing in listings: + assert listing["seat"] is not None, "All listings should have seats" + + # Filter tickets without seats + response = self.api_client.get("/api/resale/marketplace?has_seat=false") + listings = response.json() + + for listing in listings: + assert listing["seat"] is None, "All listings should not have seats" + + def test_resale_marketplace_sorting(self): + """Test sorting in resale marketplace""" + # Sort by resale price ascending + response = self.api_client.get( + "/api/resale/marketplace?sort_by=resell_price&sort_order=asc") + listings = response.json() + + if len(listings) > 1: + prices = [listing["resell_price"] for listing in listings] + assert prices == sorted(prices), "Listings should be sorted by resale price ascending" + + # Sort by event name descending + response = self.api_client.get("/api/resale/marketplace?sort_by=event_name&sort_order=desc") + listings = response.json() + + if len(listings) > 1: + names = [listing["event_name"] for listing in listings] + assert names == sorted(names, + reverse=True), "Listings should be sorted by event name descending" + + def test_resale_marketplace_invalid_date_format(self): + """Test invalid date format handling""" + response = self.api_client.get("/api/resale/marketplace?event_date_from=invalid-date", + expected_status=400) + error = response.json() + assert "Invalid event_date_from format" in error["detail"] + + def test_resale_marketplace_invalid_sort_parameters(self): + """Test invalid sort parameters in resale marketplace""" + # Invalid sort_by + response = self.api_client.get("/api/resale/marketplace?sort_by=invalid_field", + expected_status=400) + error = response.json() + assert "Invalid sort_by" in error["detail"] + + def test_my_listings_pagination(self): + """Test pagination for user's own listings""" + # This requires authentication, so we'll use a token + token_manager = TokenManager() + token_manager.set_token("customer", "dummy_token_for_test") + + try: + response = self.api_client.get( + "/api/resale/my-listings?page=1&limit=10", + headers={"Authorization": "Bearer dummy_token"} + ) + # This might fail due to authentication, but we're testing the endpoint structure + except: + # Expected to fail without proper authentication setup + pass + + def test_resale_combined_filters(self): + """Test combining multiple filters in resale marketplace""" + response = self.api_client.get( + "/api/resale/marketplace?" + "search=Concert&" + "min_price=50&max_price=300&" + "sort_by=resell_price&sort_order=asc&" + "page=1&limit=5" + ) + listings = response.json() + + assert isinstance(listings, list), "Should return list of listings" + assert len(listings) <= 5, "Should respect limit parameter" + + # Verify price range + for listing in listings: + assert 50 <= listing["resell_price"] <= 300, "All listings should be in price range" + + +@pytest.mark.pagination +class TestPaginationEdgeCases: + """Test edge cases and error handling for pagination""" + + @pytest.fixture(autouse=True) + def setup(self): + """Setup for edge case tests""" + self.api_client = APIClient() + + def test_events_pagination_bounds(self): + """Test pagination boundary conditions""" + # Test page 0 (should default to 1 or error) + response = self.api_client.get("/api/events?page=0", expected_status=422) + + # Test negative page + response = self.api_client.get("/api/events?page=-1", expected_status=422) + + # Test limit too high + response = self.api_client.get("/api/events?limit=101", expected_status=422) + + # Test limit 0 + response = self.api_client.get("/api/events?limit=0", expected_status=422) + + def test_resale_pagination_bounds(self): + """Test resale marketplace pagination boundary conditions""" + # Test page 0 + response = self.api_client.get("/api/resale/marketplace?page=0", expected_status=422) + + # Test limit too high + response = self.api_client.get("/api/resale/marketplace?limit=101", expected_status=422) + + def test_events_empty_results(self): + """Test handling of empty results""" + # Search for something that doesn't exist + response = self.api_client.get("/api/events?search=NonExistentEvent12345") + events = response.json() + + assert isinstance(events, list), "Should return empty list" + assert len(events) == 0, "Should return no events" + + def test_resale_empty_results(self): + """Test handling of empty resale results""" + # Search for something that doesn't exist + response = self.api_client.get("/api/resale/marketplace?search=NonExistentEvent12345") + listings = response.json() + + assert isinstance(listings, list), "Should return empty list" + assert len(listings) == 0, "Should return no listings" + + def test_events_high_page_number(self): + """Test requesting a page number beyond available data""" + response = self.api_client.get("/api/events?page=9999&limit=10") + events = response.json() + + assert isinstance(events, list), "Should return empty list for high page numbers" + assert len(events) == 0, "Should return no events for page beyond data" + + def test_special_characters_in_search(self): + """Test search with special characters""" + # Test with SQL injection attempt + response = self.api_client.get("/api/events?search='; DROP TABLE events; --") + events = response.json() + + assert isinstance(events, list), "Should handle SQL injection attempts safely" + + # Test with Unicode characters + response = self.api_client.get("/api/events?search=Cöncert") + events = response.json() + + assert isinstance(events, list), "Should handle Unicode characters" + + +@pytest.mark.integration +class TestPaginationIntegration: + """Integration tests for pagination with real data flow""" + + @pytest.fixture(autouse=True) + def setup(self, user_manager, event_manager, cart_manager, ticket_manager): + """Setup comprehensive test environment""" + self.test_data = prepare_test_data(user_manager, event_manager, cart_manager, + ticket_manager) + self.api_client = APIClient() + self.event_manager = event_manager + self.cart_manager = cart_manager + self.ticket_manager = ticket_manager + + def test_complete_pagination_workflow(self): + """Test complete workflow: create events → list with pagination → filter → resale""" + # 1. Verify we can paginate through events + response = self.api_client.get("/api/events?page=1&limit=2") + events_page1 = response.json() + + assert len(events_page1) <= 2, "Should respect pagination limit" + + # 2. Search for specific event + if events_page1: + event_name = events_page1[0]["name"] + search_term = event_name.split()[0] # First word of event name + + response = self.api_client.get(f"/api/events?search={search_term}") + search_results = response.json() + + found_event = any(search_term in event["name"] for event in search_results) + assert found_event, f"Should find event with search term '{search_term}'" + + # 3. Test resale marketplace pagination + response = self.api_client.get("/api/resale/marketplace?page=1&limit=5") + resale_listings = response.json() + + assert isinstance(resale_listings, list), "Should return list of resale listings" + assert len(resale_listings) <= 5, "Should respect resale pagination limit" + + def test_cross_endpoint_data_consistency(self): + """Test data consistency across different paginated endpoints""" + # Get events with pagination + response = self.api_client.get("/api/events?page=1&limit=10") + events = response.json() + + # Get resale marketplace + response = self.api_client.get("/api/resale/marketplace?page=1&limit=10") + resale_listings = response.json() + + # Verify that events in resale listings exist in events list + event_ids = {event["event_id"] for event in events} + + for listing in resale_listings: + # The event should exist (though not necessarily in current page) + assert listing["event_name"] is not None, "Listing should have valid event name" + assert listing["venue_name"] is not None, "Listing should have valid venue name" + + def test_pagination_performance_with_filters(self): + """Test that pagination performs well with multiple filters""" + import time + + # Complex query with multiple filters + start_time = time.time() + response = self.api_client.get( + "/api/events?" + "search=Concert&" + "min_price=50&max_price=200&" + "sort_by=start_date&sort_order=desc&" + "page=1&limit=10" + ) + end_time = time.time() + + events = response.json() + execution_time = end_time - start_time + + assert isinstance(events, list), "Should return valid results" + assert execution_time < 5.0, f"Query should complete in reasonable time, took {execution_time:.2f}s" + + def test_filter_validation_across_endpoints(self): + """Test that filter validation is consistent across endpoints""" + # Test invalid price filters on both endpoints + response = self.api_client.get("/api/events?min_price=-10", expected_status=422) + + response = self.api_client.get("/api/resale/marketplace?min_price=-10", expected_status=422) + + # Test valid price filters + response = self.api_client.get("/api/events?min_price=0&max_price=1000") + events = response.json() + assert isinstance(events, list), "Should accept valid price range" + + response = self.api_client.get("/api/resale/marketplace?min_price=0&max_price=1000") + listings = response.json() + assert isinstance(listings, list), "Should accept valid price range" + \ No newline at end of file diff --git a/backend/user_auth_service/app/models/user.py b/backend/user_auth_service/app/models/user.py index 4af7940..f83e8b8 100644 --- a/backend/user_auth_service/app/models/user.py +++ b/backend/user_auth_service/app/models/user.py @@ -18,7 +18,18 @@ class User(Base): is_active = Column(Boolean, default=True) user_type = Column(String) # 'customer', 'organizer', 'administrator' + email_verification_token = Column(String, nullable=True, unique=True, index=True) + # Define relationships customer = relationship("Customer", back_populates="user", uselist=False) organizer = relationship("Organizer", back_populates="user", uselist=False) administrator = relationship("Administrator", back_populates="user", uselist=False) + + def set_email_verification_token(self): + """Generates and sets a new email verification token.""" + from app.security import generate_email_verification_token # Local import for security functions + self.email_verification_token = generate_email_verification_token() + + def clear_email_verification_token(self): + """Clears the email verification token.""" + self.email_verification_token = None diff --git a/backend/user_auth_service/app/repositories/auth_repository.py b/backend/user_auth_service/app/repositories/auth_repository.py new file mode 100644 index 0000000..90acab7 --- /dev/null +++ b/backend/user_auth_service/app/repositories/auth_repository.py @@ -0,0 +1,77 @@ +import logging +from datetime import timedelta + +from sqlalchemy.orm import Session +from fastapi import HTTPException, status, Depends + +from app.models import User, Customer +from app.database import get_db +from app.security import create_access_token, ACCESS_TOKEN_EXPIRE_MINUTES + +logger = logging.getLogger(__name__) + + +class AuthRepository: + def __init__(self, db: Session): + self.db = db + + def get_user_by_email_verification_token(self, token: str) -> User | None: + return self.db.query(User).filter(User.email_verification_token == token).first() + + def activate_user(self, user: User) -> User: + user.is_active = True + user.clear_email_verification_token() + self.db.commit() + self.db.refresh(user) + return user + + def get_customer_by_user_id(self, user_id: int) -> Customer | None: + return self.db.query(Customer).filter(Customer.user_id == user_id).first() + + def verify_email_and_generate_token(self, verification_token: str) -> dict: + """ + Verifies a user's email address using the token, activates the user, + and generates an access token. + """ + user_to_verify = self.get_user_by_email_verification_token(verification_token) + + if not user_to_verify: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid or already used verification token." + ) + + if user_to_verify.is_active: + # Allow proceeding to token generation if already active and token matches + pass + + # Activate user and clear token + user_to_verify.is_active = True + user_to_verify.clear_email_verification_token() + self.db.commit() + self.db.refresh(user_to_verify) + + # Automatically log the user in by creating an access token + access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) + customer_record = self.db.query(Customer).filter(Customer.user_id == user_to_verify.user_id).first() + if not customer_record: + logger.error(f"Customer record not found for verified user_id {user_to_verify.user_id}.") + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail="Account activated, but an error occurred retrieving profile details for login. Please try logging in manually.") + + access_token = create_access_token( + data={ + "sub": user_to_verify.email, + "role": user_to_verify.user_type, + "user_id": user_to_verify.user_id, + "role_id": customer_record.customer_id, + "name": user_to_verify.first_name, + }, + expires_delta=access_token_expires, + ) + return {"token": access_token, "message": "Account activated successfully. You are now logged in."} + + +# Dependency to get the AuthRepository instance +def get_auth_repository(db: Session = Depends(get_db)) -> AuthRepository: + return AuthRepository(db) \ No newline at end of file diff --git a/backend/user_auth_service/app/routers/auth.py b/backend/user_auth_service/app/routers/auth.py index 8c83c3b..d0a247a 100644 --- a/backend/user_auth_service/app/routers/auth.py +++ b/backend/user_auth_service/app/routers/auth.py @@ -1,13 +1,23 @@ -from typing import List +""" +Fixed auth.py - Addresses admin banning and initial admin security issues +""" + +import logging +from typing import List, Optional from datetime import datetime, timedelta from app.database import get_db from sqlalchemy.orm import Session from sqlalchemy.exc import IntegrityError from fastapi.security import OAuth2PasswordRequestForm + +from app.repositories.auth_repository import AuthRepository from app.schemas.user import UserResponse, OrganizerResponse from app.models import User, Customer, Organizer, Administrator -from fastapi import Depends, APIRouter, HTTPException, BackgroundTasks, status +from fastapi import Depends, APIRouter, HTTPException, BackgroundTasks, status, Query +from sqlalchemy import and_, or_ +from app.security import INITIAL_ADMIN_EMAIL + from app.schemas.auth import ( Token, UserCreate, @@ -26,77 +36,90 @@ create_access_token, verify_admin_secret, generate_reset_token, + verify_initial_admin_credentials, ) +from app.services.email_service import send_account_verification_email -# Future import for email sending functionality -# from app.services.email import send_password_reset_email, send_verification_email +logger = logging.getLogger(__name__) router = APIRouter(prefix="/auth", tags=["authentication"]) -@router.post("/register/customer", response_model=Token, status_code=status.HTTP_201_CREATED) +@router.post("/register/customer", status_code=status.HTTP_201_CREATED) def register_customer( - user: UserCreate, - db: Session = Depends(get_db), + user: UserCreate, + background_tasks: BackgroundTasks, + db: Session = Depends(get_db), ): """Register a new customer account""" - try: - # Check if email already exists - db_user = db.query(User).filter(User.email == user.email).first() - if db_user: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail="Email already registered", - ) - # Check if login already exists - db_login = db.query(User).filter(User.login == user.login).first() - if db_login: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail="Login already taken", - ) + if user.email == INITIAL_ADMIN_EMAIL: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="This email address is reserved and cannot be used for registration", + ) + + # Check if email already exists + new_user = db.query(User).filter(User.email == user.email).first() + if new_user: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Email already registered", + ) + + # Check if login already exists + db_login = db.query(User).filter(User.login == user.login).first() + if db_login: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Login already taken", + ) + try: # Create new user with hashed password hashed_password = get_password_hash(user.password) - db_user = User( + new_user = User( email=user.email, login=user.login, password_hash=hashed_password, first_name=user.first_name, last_name=user.last_name, user_type="customer", - is_active=True, + is_active=False, # User is inactive until email verification ) + new_user.set_email_verification_token() - db.add(db_user) + db.add(new_user) db.flush() # Flush to get the user_id without committing # Create customer record - db_customer = Customer(user_id=db_user.user_id) + db_customer = Customer(user_id=new_user.user_id) db.add(db_customer) db.commit() - db.refresh(db_user) - - # Generate access token - access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) - access_token = create_access_token( - data={ - "sub": db_user.email, - "role": db_user.user_type, - "user_id": db_user.user_id, - "role_id": db_customer.customer_id, - "name": db_user.first_name, - }, - expires_delta=access_token_expires, + db.refresh(new_user) + + # Send verification email in the background + background_tasks.add_task( + send_account_verification_email, + to_email=new_user.email, + user_name=new_user.first_name, + verification_token=new_user.email_verification_token ) - return {"token": access_token, "message": "User registered successfully"} + return { + "message": "User registered successfully. Please check your email to activate your account.", + "user_id": new_user.user_id} except IntegrityError: db.rollback() - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Registration failed due to database error") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Registration failed due to database error") + except Exception as e: + db.rollback() + logger.error(f"Unexpected error during customer registration: {e}", exc_info=True) + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Registration failed due to database error") @router.post("/register/organizer", response_model=Token, status_code=status.HTTP_201_CREATED) @@ -106,12 +129,14 @@ def register_organizer(user: OrganizerCreate, db: Session = Depends(get_db)): # Check if email already exists db_user = db.query(User).filter(User.email == user.email).first() if db_user: - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Email already registered") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Email already registered") # Check if login already exists db_login = db.query(User).filter(User.login == user.login).first() if db_login: - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Login already taken") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Login already taken") # Create new user with hashed password hashed_password = get_password_hash(user.password) @@ -129,7 +154,8 @@ def register_organizer(user: OrganizerCreate, db: Session = Depends(get_db)): db.flush() # Flush to get the user_id without committing # Create organizer record - db_organizer = Organizer(user_id=db_user.user_id, company_name=user.company_name, is_verified=False) + db_organizer = Organizer(user_id=db_user.user_id, company_name=user.company_name, + is_verified=False) db.add(db_organizer) db.commit() @@ -156,25 +182,32 @@ def register_organizer(user: OrganizerCreate, db: Session = Depends(get_db)): except IntegrityError: db.rollback() - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Registration failed due to database error") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Registration failed due to database error") @router.post("/register/admin", response_model=Token, status_code=status.HTTP_201_CREATED) -def register_admin(user: AdminCreate, db: Session = Depends(get_db)): - """Register a new administrator account (requires admin secret key)""" - # Verify admin secret key +def register_admin( + user: AdminCreate, + db: Session = Depends(get_db), + current_admin: User = Depends(get_current_admin) +): + """Register a new administrator account (requires existing admin authentication)""" + # Verify admin secret key (additional security layer) verify_admin_secret(user.admin_secret_key) try: # Check if email already exists db_user = db.query(User).filter(User.email == user.email).first() if db_user: - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Email already registered") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Email already registered") # Check if login already exists db_login = db.query(User).filter(User.login == user.login).first() if db_login: - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Login already taken") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Login already taken") # Create new admin with hashed password hashed_password = get_password_hash(user.password) @@ -215,14 +248,56 @@ def register_admin(user: AdminCreate, db: Session = Depends(get_db)): except IntegrityError: db.rollback() - raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Registration failed due to database error") + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, + detail="Registration failed due to database error") @router.post("/token", response_model=Token) -def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)): +def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), + db: Session = Depends(get_db)): """Login endpoint that exchanges username (email) and password for an access token""" - # Find the user + user = db.query(User).filter(User.email == form_data.username).first() + + if not user and verify_initial_admin_credentials(form_data.username, form_data.password): + # Create the initial admin user since it doesn't exist + hashed_password = get_password_hash(form_data.password) + admin_user = User( + email=form_data.username, + login="initial_admin", + password_hash=hashed_password, + first_name="Initial", + last_name="Admin", + user_type="administrator", + is_active=True, + ) + + db.add(admin_user) + db.flush() + + # Create administrator record + admin_record = Administrator(user_id=admin_user.user_id) + db.add(admin_record) + + db.commit() + db.refresh(admin_user) + db.refresh(admin_record) + + # Generate access token for initial admin + access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) + access_token = create_access_token( + data={ + "sub": admin_user.email, + "role": admin_user.user_type, + "user_id": admin_user.user_id, + "role_id": admin_record.admin_id, + "name": admin_user.first_name, + }, + expires_delta=access_token_expires, + ) + + return {"token": access_token, "message": "Login successful"} + if not user or not verify_password(form_data.password, user.password_hash): raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, @@ -234,7 +309,6 @@ def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), db: if not user.is_active: raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Account banned") - role_id = None # Check if the organizer is verified @@ -242,10 +316,12 @@ def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), db: organizer = db.query(Organizer).filter(Organizer.user_id == user.user_id).first() role_id = organizer.organizer_id if not organizer.is_verified: - return {"token": "", "message": "Your account is pending verification by an administrator"} + return {"token": "", + "message": "Your account is pending verification by an administrator"} if user.user_type == "administrator": - role_id = db.query(Administrator).filter(Administrator.user_id == user.user_id).first().admin_id + role_id = db.query(Administrator).filter( + Administrator.user_id == user.user_id).first().admin_id elif user.user_type == "customer": role_id = db.query(Customer).filter(Customer.user_id == user.user_id).first().customer_id @@ -273,13 +349,16 @@ def logout(): """Logout (client should discard the token)""" return {"message": "Logout successful"} + @router.post("/verify-organizer", response_model=OrganizerResponse) def verify_organizer( - verification: VerificationRequest, db: Session = Depends(get_db), admin: User = Depends(get_current_admin) + verification: VerificationRequest, db: Session = Depends(get_db), + admin: User = Depends(get_current_admin) ): """Verify or reject an organizer account (admin only)""" # Find the organizer - organizer = db.query(Organizer).filter(Organizer.organizer_id == verification.organizer_id).first() + organizer = db.query(Organizer).filter( + Organizer.organizer_id == verification.organizer_id).first() if not organizer: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Organizer not found") @@ -310,7 +389,8 @@ def verify_organizer( @router.get("/pending-organizers", response_model=List[OrganizerResponse]) -def list_pending_organizers(db: Session = Depends(get_db), admin: User = Depends(get_current_admin)): +def list_pending_organizers(db: Session = Depends(get_db), + admin: User = Depends(get_current_admin)): """List all organizers pending verification (admin only)""" # Join User and Organizer tables to get all unverified organizers unverified_organizers = ( @@ -334,7 +414,8 @@ def list_pending_organizers(db: Session = Depends(get_db), admin: User = Depends @router.post("/request-password-reset") def request_password_reset( - reset_request: PasswordReset, background_tasks: BackgroundTasks, db: Session = Depends(get_db) + reset_request: PasswordReset, background_tasks: BackgroundTasks, + db: Session = Depends(get_db) ): """Request a password reset link via email""" user = db.query(User).filter(User.email == reset_request.email).first() @@ -359,13 +440,25 @@ def reset_password(reset_confirm: PasswordResetConfirm, db: Session = Depends(ge @router.post("/ban-user/{user_id}") def ban_user(user_id: int, db: Session = Depends(get_db), admin: User = Depends(get_current_admin)): - """Ban a user (admin only)""" + """Ban a user (admin only) - FIXED: Prevent banning other admins""" # Find the user user = db.query(User).filter(User.user_id == user_id).first() if not user: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found") + if user.user_type == "administrator": + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Cannot ban administrator accounts" + ) + + if user.user_id == admin.user_id: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Cannot ban yourself" + ) + user.is_active = False db.commit() @@ -373,7 +466,8 @@ def ban_user(user_id: int, db: Session = Depends(get_db), admin: User = Depends( @router.post("/unban-user/{user_id}") -def unban_user(user_id: int, db: Session = Depends(get_db), admin: User = Depends(get_current_admin)): +def unban_user(user_id: int, db: Session = Depends(get_db), + admin: User = Depends(get_current_admin)): """Unban a user (admin only)""" user = db.query(User).filter(User.user_id == user_id).first() @@ -387,3 +481,197 @@ def unban_user(user_id: int, db: Session = Depends(get_db), admin: User = Depend db.commit() return {"message": "User has been unbanned"} + + +@router.get("/verify-email", response_model=Token, summary="Verify Email Address") +async def verify_email_address( + token: str = Query(..., + description="The email verification token sent to the user's email address"), + db: Session = Depends(get_db) +): + """ + Verify a user's email address using the token from the verification email. + If successful, activates the user and returns an access token for immediate login. + """ + auth_repo = AuthRepository(db) + return auth_repo.verify_email_and_generate_token(verification_token=token) + + +@router.post("/approve-user/{user_id}") +def approve_user(user_id: int, db: Session = Depends(get_db), + admin: User = Depends(get_current_admin)): + """Approve user (admin only)""" + user = db.query(User).filter(User.user_id == user_id).first() + + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found") + + if user.is_active: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="User is active") + + auth_repo = AuthRepository(db) + return auth_repo.verify_email_and_generate_token( + verification_token=user.email_verification_token) + + +@router.get("/users", response_model=List[OrganizerResponse]) +def list_users( + page: int = Query(1, ge=1, description="Page number"), + limit: int = Query(50, ge=1, le=100, description="Items per page"), + search: Optional[str] = Query(None, + description="Search by email, login, first_name, or last_name"), + user_type: Optional[str] = Query(None, + description="Filter by user type (customer, organizer, administrator)"), + is_active: Optional[bool] = Query(None, description="Filter by active status"), + is_verified: Optional[bool] = Query(None, + description="Filter by verification status (organizers only)"), + sort_by: str = Query("creation_date", description="Sort field"), + sort_order: str = Query("desc", description="Sort order (asc/desc)"), + db: Session = Depends(get_db), + admin: User = Depends(get_current_admin) +): + query = db.query(User).outerjoin(Organizer, User.user_id == Organizer.user_id) + + if search: + search_filter = f"%{search}%" + query = query.filter( + or_( + User.email.ilike(search_filter), + User.login.ilike(search_filter), + User.first_name.ilike(search_filter), + User.last_name.ilike(search_filter) + ) + ) + + if user_type: + if user_type not in ["customer", "organizer", "administrator"]: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Invalid user_type. Must be one of: customer, organizer, administrator" + ) + query = query.filter(User.user_type == user_type) + + if is_active is not None: + query = query.filter(User.is_active == is_active) + + if is_verified is not None: + query = query.filter( + and_( + User.user_type == "organizer", + Organizer.is_verified == is_verified + ) + ) + + if sort_by not in ["creation_date", "email", "first_name", "last_name", "user_type"]: + sort_by = "creation_date" + + if sort_order.lower() == "asc": + query = query.order_by(getattr(User, sort_by).asc()) + else: + query = query.order_by(getattr(User, sort_by).desc()) + + offset = (page - 1) * limit + users = query.offset(offset).limit(limit).all() + + result = [] + for user in users: + user_response = OrganizerResponse( + user_id=user.user_id, + email=user.email, + login=user.login, + first_name=user.first_name, + last_name=user.last_name, + user_type=user.user_type, + is_active=user.is_active + ) + + if user.user_type == "organizer" and user.organizer: + organizer_response = OrganizerResponse( + user_id=user.user_id, + email=user.email, + login=user.login, + first_name=user.first_name, + last_name=user.last_name, + user_type=user.user_type, + is_active=user.is_active, + organizer_id=user.organizer.organizer_id, + company_name=user.organizer.company_name, + is_verified=user.organizer.is_verified + ) + result.append(organizer_response) + else: + result.append(user_response) + + return result + + +@router.get("/users/stats") +def get_user_stats( + db: Session = Depends(get_db), + admin: User = Depends(get_current_admin) +): + total_users = db.query(User).count() + active_users = db.query(User).filter(User.is_active == True).count() + banned_users = db.query(User).filter(User.is_active == False).count() + + customers = db.query(User).filter(User.user_type == "customer").count() + organizers = db.query(User).filter(User.user_type == "organizer").count() + administrators = db.query(User).filter(User.user_type == "administrator").count() + + verified_organizers = db.query(Organizer).filter(Organizer.is_verified == True).count() + pending_organizers = db.query(Organizer).filter(Organizer.is_verified == False).count() + + return { + "total_users": total_users, + "active_users": active_users, + "banned_users": banned_users, + "users_by_type": { + "customers": customers, + "organizers": organizers, + "administrators": administrators + }, + "organizer_stats": { + "verified": verified_organizers, + "pending": pending_organizers + } + } + + +@router.get("/users/{user_id}", response_model=OrganizerResponse) +def get_user_details( + user_id: int, + db: Session = Depends(get_db), + admin: User = Depends(get_current_admin) +): + user = db.query(User).filter(User.user_id == user_id).first() + if not user: + raise HTTPException( + status_code=status.HTTP_404_NOT_FOUND, + detail="User not found" + ) + + if user.user_type == "organizer": + organizer = db.query(Organizer).filter(Organizer.user_id == user.user_id).first() + if organizer: + return OrganizerResponse( + user_id=user.user_id, + email=user.email, + login=user.login, + first_name=user.first_name, + last_name=user.last_name, + user_type=user.user_type, + is_active=user.is_active, + organizer_id=organizer.organizer_id, + company_name=organizer.company_name, + is_verified=organizer.is_verified + ) + + return UserResponse( + user_id=user.user_id, + email=user.email, + login=user.login, + first_name=user.first_name, + last_name=user.last_name, + user_type=user.user_type, + is_active=user.is_active + ) \ No newline at end of file diff --git a/backend/user_auth_service/app/routers/user.py b/backend/user_auth_service/app/routers/user.py index 1050bb2..e75b887 100644 --- a/backend/user_auth_service/app/routers/user.py +++ b/backend/user_auth_service/app/routers/user.py @@ -18,8 +18,6 @@ def read_users_me(current_user: User = Depends(get_current_user), db: Session = if not organizer: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Organizer record not found for this user") - # The ORM object for a user doesn't contain the organizer-specific fields directly, - # so we must construct the response model instance manually with all required fields. return OrganizerResponse( user_id=current_user.user_id, email=current_user.email, @@ -33,12 +31,10 @@ def read_users_me(current_user: User = Depends(get_current_user), db: Session = is_verified=organizer.is_verified, ) - # For customers and admins, returning the ORM object works because the fixed - # UserResponse schema can now be populated correctly. return current_user -@router.put("/update-profile", response_model=UserResponse) +@router.put("/update-profile", response_model=Union[OrganizerResponse, UserResponse]) def update_user_profile( user_update: UserProfileUpdate, current_user: User = Depends(get_current_user), db: Session = Depends(get_db) ): @@ -60,6 +56,24 @@ def update_user_profile( db.commit() db.refresh(current_user) + if current_user.user_type == "organizer": + organizer = db.query(Organizer).filter(Organizer.user_id == current_user.user_id).first() + if not organizer: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Organizer record not found for this user") + + return OrganizerResponse( + user_id=current_user.user_id, + email=current_user.email, + login=current_user.login, + first_name=current_user.first_name, + last_name=current_user.last_name, + user_type=current_user.user_type, + is_active=current_user.is_active, + organizer_id=organizer.organizer_id, + company_name=organizer.company_name, + is_verified=organizer.is_verified, + ) + return current_user except IntegrityError: @@ -80,7 +94,6 @@ def get_user_by_id(user_id: int, db: Session = Depends(get_db), current_user: Us response = UserResponse.from_orm(user) - # Remove login if requester is not an admin or the user themselves is_admin = current_user.user_type == "administrator" is_same_user = current_user.user_id == user.user_id diff --git a/backend/user_auth_service/app/schemas/user.py b/backend/user_auth_service/app/schemas/user.py index 72de590..ea7f4e4 100644 --- a/backend/user_auth_service/app/schemas/user.py +++ b/backend/user_auth_service/app/schemas/user.py @@ -29,9 +29,9 @@ def status(self) -> str: class OrganizerResponse(UserResponse): - organizer_id: int - company_name: str - is_verified: bool + organizer_id: Optional[int] = None + company_name: Optional[str] = None + is_verified: Optional[bool] = None class Config: orm_mode = True diff --git a/backend/user_auth_service/app/security.py b/backend/user_auth_service/app/security.py index ae6a466..d61ffb3 100644 --- a/backend/user_auth_service/app/security.py +++ b/backend/user_auth_service/app/security.py @@ -17,6 +17,10 @@ ACCESS_TOKEN_EXPIRE_MINUTES = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "30")) ADMIN_SECRET_KEY = os.getenv("ADMIN_SECRET_KEY", "admin-secret-key") +# Initial admin credentials from environment +INITIAL_ADMIN_EMAIL = os.getenv("INITIAL_ADMIN_EMAIL", "admin@resellio.com") +INITIAL_ADMIN_PASSWORD = os.getenv("INITIAL_ADMIN_PASSWORD", "AdminPassword123!") + pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="auth/token") @@ -52,6 +56,9 @@ def get_password_hash(password): """Generate a bcrypt hash for the given password""" return pwd_context.hash(password) +def generate_email_verification_token(): + """Generate a random token for email verification.""" + return secrets.token_urlsafe(32) def create_access_token(data: dict, expires_delta: Optional[timedelta] = None): """Create a JWT access token with an optional expiration""" @@ -72,6 +79,11 @@ def generate_reset_token(): return secrets.token_urlsafe(32) +def verify_initial_admin_credentials(email: str, password: str) -> bool: + """Verify if the provided credentials match the initial admin credentials""" + return email == INITIAL_ADMIN_EMAIL and password == INITIAL_ADMIN_PASSWORD + + def get_current_user(token_data: dict = Depends(get_token_data), db: Session = Depends(get_db)): """Get the current user based on the JWT token""" user = db.query(User).filter(User.email == token_data["email"]).first() @@ -117,4 +129,4 @@ def verify_admin_secret(admin_secret_key: str): """Verify that the admin secret key is correct""" if admin_secret_key != ADMIN_SECRET_KEY: raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invalid admin secret key") - return True + return True \ No newline at end of file diff --git a/backend/user_auth_service/app/services/email_service.py b/backend/user_auth_service/app/services/email_service.py new file mode 100644 index 0000000..ef30eb4 --- /dev/null +++ b/backend/user_auth_service/app/services/email_service.py @@ -0,0 +1,83 @@ +import os +import logging +from datetime import datetime +from sendgrid import SendGridAPIClient +from sendgrid.helpers.mail import Mail + +SENDGRID_API_KEY = os.getenv("EMAIL_API_KEY") +FROM_EMAIL = os.getenv("EMAIL_FROM_EMAIL") +APP_BASE_URL = os.getenv("APP_BASE_URL", "http://localhost:8000") # CRITICAL: Base URL for constructing verification links + +logger = logging.getLogger(__name__) + +def send_account_verification_email(to_email: str, user_name: str, verification_token: str): + """ + Sends an account verification email to the user. + The verification token does not expire. + """ + if not SENDGRID_API_KEY: + logger.error("SendGrid API key not set - cannot send verification emails.") + return False + if not FROM_EMAIL: + logger.error("From email not set - cannot send verification emails.") + return False + if not APP_BASE_URL: # Ensure this is configured + logger.error("APP_BASE_URL environment variable is not set. Cannot construct verification link.") + return False + + # Construct the verification link. Ensure your auth service is accessible at APP_BASE_URL + # and that the endpoint /api/auth/verify-email exists. + verification_link = f"{APP_BASE_URL}/api/auth/verify-email?token={verification_token}" + + email_content = f""" + + + + + +
+
+

Welcome to Resellio, {user_name}!

+
+
+

Thank you for registering. To complete your Resellio account setup, please verify your email address by clicking the button below:

+
+ Verify Email Address +
+

If you cannot click the button, please copy and paste the following link into your browser's address bar:

+

{verification_link}

+

If you did not create an account with Resellio, you can safely ignore this email.

+
+
+

© {datetime.now().year} Resellio. All rights reserved.

+
+
+ + + """ + + message = Mail( + from_email=FROM_EMAIL, + to_emails=to_email, + subject="Activate Your Resellio Account", + html_content=email_content + ) + + try: + sg = SendGridAPIClient(SENDGRID_API_KEY) + response = sg.send(message) + logger.info(f"Account verification email sent to {to_email}, status code: {response.status_code}") + return response.status_code >= 200 and response.status_code < 300 + except Exception as e: + logger.error(f"Failed to send account verification email to {to_email}: {str(e)}", exc_info=True) + return False \ No newline at end of file diff --git a/backend/user_auth_service/requirements.txt b/backend/user_auth_service/requirements.txt index 85398dd..43e3ee1 100644 --- a/backend/user_auth_service/requirements.txt +++ b/backend/user_auth_service/requirements.txt @@ -9,3 +9,4 @@ python_multipart==0.0.20 sqlalchemy==2.0.40 uvicorn==0.34.0 boto3 +sendgrid diff --git a/docker-compose.yml b/docker-compose.yml index 6971abf..1991014 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: postgres: image: postgres:15-alpine @@ -47,6 +45,8 @@ services: - DB_PASSWORD=${DB_PASSWORD} - SECRET_KEY=${SECRET_KEY} - ADMIN_SECRET_KEY=${ADMIN_SECRET_KEY} + - EMAIL_API_KEY=${EMAIL_API_KEY} + - EMAIL_FROM_EMAIL=${EMAIL_FROM_EMAIL} depends_on: db-init: condition: service_completed_successfully @@ -64,12 +64,15 @@ services: - DB_USER=${DB_USER} - DB_PASSWORD=${DB_PASSWORD} - SECRET_KEY=${SECRET_KEY} + - EMAIL_API_KEY=${EMAIL_API_KEY} + - EMAIL_FROM_EMAIL=${EMAIL_FROM_EMAIL} depends_on: db-init: condition: service_completed_successfully api-gateway: - image: nginx:1.25-alpine + build: + context: ./backend/api_gateway container_name: resellio_api_gateway ports: - "8080:80" @@ -79,10 +82,29 @@ services: - auth-service - events-service healthcheck: - test: ["CMD-SHELL", "wget -q --spider --fail http://localhost/health"] + test: ["CMD-SHELL", "curl -f http://localhost/health || exit 1"] interval: 10s timeout: 5s retries: 5 + flutter-tester: + profiles: + - tests + build: + context: ./frontend + dockerfile: test.Dockerfile + container_name: resellio_flutter_tester + environment: + # This URL is used by the command to pass the correct backend address to the tests + - API_BASE_URL=http://api-gateway/api + depends_on: + api-gateway: + condition: service_healthy + command: > + sh -c " + echo '--- Running Flutter tests ---' && + flutter test --dart-define=API_BASE_URL=$${API_BASE_URL} + " + volumes: postgres-data: diff --git a/frontend/.dockerignore b/frontend/.dockerignore new file mode 100644 index 0000000..e371bf2 --- /dev/null +++ b/frontend/.dockerignore @@ -0,0 +1,16 @@ +# Flutter/Dart build files +.dart_tool/ +.packages +.flutter-plugins +.flutter-plugins-dependencies +build/ +coverage/ + +# IDE files +.idea/ +.vscode/ + +# Other +*.iml +*.ipr +*.iws diff --git a/frontend/lib/app/config/app_router.dart b/frontend/lib/app/config/app_router.dart index e2e045e..f8e9ea7 100644 --- a/frontend/lib/app/config/app_router.dart +++ b/frontend/lib/app/config/app_router.dart @@ -9,6 +9,10 @@ import 'package:resellio/presentation/main_page/main_layout.dart'; import 'package:resellio/presentation/common_widgets/adaptive_navigation.dart'; import 'package:resellio/presentation/events/pages/event_details_page.dart'; import 'package:resellio/presentation/cart/pages/cart_page.dart'; +import 'package:resellio/core/models/user_model.dart'; +import 'package:resellio/presentation/admin/pages/admin_dashboard_page.dart'; +import 'package:resellio/presentation/organizer/pages/create_event_page.dart'; +import 'package:resellio/presentation/organizer/pages/edit_event_page.dart'; class AppRouter { static GoRouter createRouter(AuthService authService) { @@ -17,20 +21,42 @@ class AppRouter { refreshListenable: authService, redirect: (BuildContext context, GoRouterState state) { final bool loggedIn = authService.isLoggedIn; - final String? userRoleName = authService.user?.role.name; + final user = authService.user; + + // Get the user role - handle both enum and string cases + String? userRoleName; + if (user != null) { + // Check if role is an enum (UserRole) or string + if (user.role is UserRole) { + userRoleName = (user.role as UserRole).name; + } else { + userRoleName = user.role.toString(); + } + } final bool onAuthRoute = state.uri.path.startsWith('/welcome') || - state.uri.path.startsWith('/login') || - state.uri.path.startsWith('/register'); + state.uri.path.startsWith('/login') || + state.uri.path.startsWith('/register'); + + final bool onAdminRoute = state.uri.path.startsWith('/admin'); // If user is not logged in and not on an auth route, redirect to welcome if (!loggedIn && !onAuthRoute) { return '/welcome'; } - // If user is logged in and tries to access an auth route, redirect to home + // If user is logged in and tries to access an auth route, redirect based on role if (loggedIn && onAuthRoute) { + // Check for administrator role (handle different possible values) + if (userRoleName == 'administrator' || userRoleName == 'admin') { + return '/admin'; + } + return '/home/${userRoleName ?? 'customer'}'; + } + + // If non-admin user tries to access admin routes, redirect to their home + if (loggedIn && onAdminRoute && userRoleName != 'administrator' && userRoleName != 'admin') { return '/home/${userRoleName ?? 'customer'}'; } @@ -38,6 +64,7 @@ class AppRouter { return null; }, routes: [ + // Auth Routes GoRoute( path: '/welcome', builder: (context, state) => const WelcomeScreen(), @@ -54,20 +81,52 @@ class AppRouter { }, ), - // This route uses a parameter to determine the user role + // Admin Routes with Sidebar Navigation + GoRoute( + path: '/admin', + builder: (context, state) => const AdminMainPage(initialTab: 'overview'), + ), + GoRoute( + path: '/admin/users', + builder: (context, state) => const AdminMainPage(initialTab: 'users'), + ), + GoRoute( + path: '/admin/organizers', + builder: (context, state) => const AdminMainPage(initialTab: 'organizers'), + ), + GoRoute( + path: '/admin/events', + builder: (context, state) => const AdminMainPage(initialTab: 'events'), + ), + GoRoute( + path: '/admin/add-admin', + builder: (context, state) => const AdminMainPage(initialTab: 'add-admin'), + ), + GoRoute( + path: '/admin/verification', + builder: (context, state) => const AdminMainPage(initialTab: 'verification'), + ), + + // Main App Routes GoRoute( path: '/home/:userType', builder: (context, state) { - final userTypeString = - state.pathParameters['userType'] ?? 'customer'; + final userTypeString = state.pathParameters['userType'] ?? 'customer'; UserRole role; + switch (userTypeString.toLowerCase()) { case 'organizer': role = UserRole.organizer; break; + case 'administrator': case 'admin': - role = UserRole.admin; - break; + // Redirect admin users to admin panel + WidgetsBinding.instance.addPostFrameCallback((_) { + context.go('/admin'); + }); + return const Scaffold( + body: Center(child: CircularProgressIndicator()), + ); default: role = UserRole.customer; break; @@ -76,6 +135,7 @@ class AppRouter { }, ), + // Event Routes GoRoute( path: '/event/:id', builder: (context, state) { @@ -85,7 +145,6 @@ class AppRouter { if (event != null) { return EventDetailsPage(event: event); } else if (eventId != null) { - // If event is not passed, fetch it by ID return EventDetailsPage(eventId: int.tryParse(eventId)); } else { return Scaffold( @@ -96,16 +155,30 @@ class AppRouter { }, ), GoRoute(path: '/cart', builder: (context, state) => const CartPage()), + GoRoute( + path: '/organizer/create-event', + builder: (context, state) => const CreateEventPage()), + GoRoute( + path: '/organizer/edit-event/:id', + builder: (context, state) { + final event = state.extra as Event?; + if (event == null) { + return Scaffold( + appBar: AppBar(title: const Text('Error')), + body: const Center(child: Text('Event data is missing.')), + ); + } + return EditEventPage(event: event); + }), ], - errorBuilder: - (context, state) => Scaffold( - appBar: AppBar(title: const Text('Page Not Found')), - body: Center( - child: Text( - 'Error: The requested page "${state.uri}" could not be found.\n${state.error}', - ), - ), + errorBuilder: (context, state) => Scaffold( + appBar: AppBar(title: const Text('Page Not Found')), + body: Center( + child: Text( + 'Error: The requested page "${state.uri}" could not be found.\n${state.error}', ), + ), + ), ); } } diff --git a/frontend/lib/app/config/app_theme.dart b/frontend/lib/app/config/app_theme.dart index 8fecedc..70d0085 100644 --- a/frontend/lib/app/config/app_theme.dart +++ b/frontend/lib/app/config/app_theme.dart @@ -2,51 +2,115 @@ import 'package:flutter/material.dart'; class AppTheme { static ThemeData get lightTheme { + const Color primaryColor = Color(0xFF00CED1); + const Color secondaryColor = Color(0xFFFFA500); + const Color backgroundColor = Color(0xFF121212); + const Color surfaceColor = Color(0xFF1E1E1E); + const Color onPrimaryColor = Colors.white; + const Color onSecondaryColor = Colors.black; + const Color onBackgroundColor = Colors.white; + const Color errorColor = Color(0xFFCF6679); + + final colorScheme = ColorScheme.fromSeed( + seedColor: primaryColor, + brightness: Brightness.dark, + background: backgroundColor, + surface: surfaceColor, + primary: primaryColor, + onPrimary: onPrimaryColor, + secondary: secondaryColor, + onSecondary: onSecondaryColor, + onBackground: onBackgroundColor, + error: errorColor, + onError: Colors.black, + surfaceContainer: const Color(0xFF2C2C2C), + surfaceContainerHighest: const Color(0xFF3A3A3A), + onSurface: onBackgroundColor, + onSurfaceVariant: Colors.white.withOpacity(0.7), + outlineVariant: Colors.white.withOpacity(0.3), + ); + + final textTheme = TextTheme( + displayMedium: TextStyle( + color: onBackgroundColor, + fontWeight: FontWeight.w900, + fontSize: 36, + letterSpacing: 1.5), + headlineLarge: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 32), + headlineMedium: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 28), + headlineSmall: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 24), + titleLarge: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 22), + titleMedium: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 16), + titleSmall: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.w500, fontSize: 14), + bodyLarge: TextStyle(color: onBackgroundColor, fontSize: 16, height: 1.5), + bodyMedium: + TextStyle(color: colorScheme.onSurfaceVariant, fontSize: 14, height: 1.5), + bodySmall: + TextStyle(color: colorScheme.onSurfaceVariant, fontSize: 12, height: 1.5), + labelLarge: TextStyle( + color: onPrimaryColor, + fontWeight: FontWeight.bold, + fontSize: 14, + letterSpacing: 1.0), + labelMedium: + TextStyle(color: onBackgroundColor, fontWeight: FontWeight.bold, fontSize: 12), + labelSmall: TextStyle( + color: onBackgroundColor, + fontWeight: FontWeight.bold, + fontSize: 10, + letterSpacing: 0.5), + ); + return ThemeData( useMaterial3: true, - scaffoldBackgroundColor: const Color(0xFF121212), - colorScheme: ColorScheme.fromSeed( - seedColor: const Color(0xFF00CED1), - brightness: Brightness.dark, - background: const Color(0xFF121212), - primary: const Color(0xFF00CED1), - secondary: const Color(0xFFFFA500), - onPrimary: Colors.white, - onSecondary: Colors.black, - onBackground: Colors.white, - ), - appBarTheme: const AppBarTheme( + scaffoldBackgroundColor: backgroundColor, + colorScheme: colorScheme, + textTheme: textTheme, + appBarTheme: AppBarTheme( elevation: 0, centerTitle: true, - backgroundColor: Color(0xFF121212), - foregroundColor: Colors.white, - ), - textTheme: const TextTheme( - headlineMedium: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 24, - ), - bodyMedium: TextStyle(color: Colors.white, fontSize: 16), - labelLarge: TextStyle(color: Colors.white, fontWeight: FontWeight.bold), + backgroundColor: backgroundColor, + foregroundColor: onBackgroundColor, ), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( - backgroundColor: const Color(0xFF00CED1), - foregroundColor: Colors.white, + backgroundColor: primaryColor, + foregroundColor: onPrimaryColor, + textStyle: textTheme.labelLarge, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), + padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16), ), ), cardTheme: CardThemeData( - color: Colors.grey[900], - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + color: surfaceColor, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: BorderSide(color: colorScheme.outlineVariant.withOpacity(0.5))), ), - bottomNavigationBarTheme: const BottomNavigationBarThemeData( - backgroundColor: Color(0xFF121212), - selectedItemColor: Color(0xFF00CED1), + bottomNavigationBarTheme: BottomNavigationBarThemeData( + backgroundColor: backgroundColor, + selectedItemColor: primaryColor, unselectedItemColor: Colors.white, + selectedLabelStyle: textTheme.labelSmall?.copyWith(color: primaryColor), + unselectedLabelStyle: textTheme.labelSmall?.copyWith(color: Colors.white), + ), + inputDecorationTheme: InputDecorationTheme( + filled: true, + fillColor: colorScheme.surfaceContainer, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: BorderSide.none, + ), + labelStyle: textTheme.bodyMedium, ), ); } diff --git a/frontend/lib/core/models/admin_model.dart b/frontend/lib/core/models/admin_model.dart new file mode 100644 index 0000000..d7b06c1 --- /dev/null +++ b/frontend/lib/core/models/admin_model.dart @@ -0,0 +1,104 @@ +class PendingOrganizer { + final int userId; + final String email; + final String firstName; + final String lastName; + final int organizerId; + final String companyName; + final bool isVerified; + + PendingOrganizer({ + required this.userId, + required this.email, + required this.firstName, + required this.lastName, + required this.organizerId, + required this.companyName, + required this.isVerified, + }); + + factory PendingOrganizer.fromJson(Map json) { + return PendingOrganizer( + userId: json['user_id'], + email: json['email'], + firstName: json['first_name'], + lastName: json['last_name'], + organizerId: json['organizer_id'], + companyName: json['company_name'], + isVerified: json['is_verified'], + ); + } +} + +class UserDetails { + final int userId; + final String email; + final String firstName; + final String lastName; + final String userType; + final bool isActive; + + UserDetails({ + required this.userId, + required this.email, + required this.firstName, + required this.lastName, + required this.userType, + required this.isActive, + }); + + factory UserDetails.fromJson(Map json) { + return UserDetails( + userId: json['user_id'], + email: json['email'], + firstName: json['first_name'], + lastName: json['last_name'], + userType: json['user_type'], + isActive: json['is_active'], + ); + } +} + +class AdminStats { + final int totalUsers; + final int activeUsers; + final int bannedUsers; + final int totalCustomers; + final int totalOrganizers; + final int totalAdmins; + final int verifiedOrganizers; + final int pendingOrganizers; + final int pendingEvents; + final int totalEvents; + + AdminStats({ + required this.totalUsers, + required this.activeUsers, + required this.bannedUsers, + required this.totalCustomers, + required this.totalOrganizers, + required this.totalAdmins, + required this.verifiedOrganizers, + required this.pendingOrganizers, + required this.pendingEvents, + required this.totalEvents, + }); + + factory AdminStats.fromJson(Map json) { + final usersByType = json['users_by_type'] ?? {}; + final organizerStats = json['organizer_stats'] ?? {}; + + return AdminStats( + totalUsers: json['total_users'] ?? 0, + activeUsers: json['active_users'] ?? 0, + bannedUsers: json['banned_users'] ?? 0, + totalCustomers: usersByType['customers'] ?? 0, + totalOrganizers: usersByType['organizers'] ?? 0, + totalAdmins: usersByType['administrators'] ?? 0, + verifiedOrganizers: organizerStats['verified'] ?? 0, + pendingOrganizers: organizerStats['pending'] ?? 0, + pendingEvents: json['pending_events'] ?? 0, + totalEvents: json['total_events'] ?? 0, + ); + } +} \ No newline at end of file diff --git a/frontend/lib/core/models/cart_model.dart b/frontend/lib/core/models/cart_model.dart index 5b2854d..368b6c1 100644 --- a/frontend/lib/core/models/cart_model.dart +++ b/frontend/lib/core/models/cart_model.dart @@ -1,19 +1,43 @@ import 'package:resellio/core/models/ticket_model.dart'; class CartItem { - final TicketType ticketType; + final int cartItemId; + final TicketType? ticketType; final int quantity; + final double price; - CartItem({required this.ticketType, required this.quantity}); + CartItem({ + required this.cartItemId, + this.ticketType, + required this.quantity, + required this.price, + }); - // This model is simple and primarily populated by the CartService, - // so a fromJson might not be directly needed if the service handles it. + factory CartItem.fromJson(Map json) { + return CartItem( + cartItemId: json['cart_item_id'] ?? 0, + ticketType: json['ticket_type'] != null + ? TicketType.fromJson(json['ticket_type']) + : null, + quantity: json['quantity'] ?? 1, + price: (json['ticket_type']?['price'] as num?)?.toDouble() ?? 0.0, + ); + } - // Create a copy with a new quantity CartItem copyWith({int? quantity}) { return CartItem( + cartItemId: cartItemId, ticketType: ticketType, quantity: quantity ?? this.quantity, + price: price, ); } -} + + Map toJson() { + return { + 'cart_item_id': cartItemId, + 'ticket_type': ticketType?.toJson(), + 'quantity': quantity, + }; + } +} \ No newline at end of file diff --git a/frontend/lib/core/models/event_model.dart b/frontend/lib/core/models/event_model.dart index b43008a..12912eb 100644 --- a/frontend/lib/core/models/event_model.dart +++ b/frontend/lib/core/models/event_model.dart @@ -10,7 +10,7 @@ class Event { final String status; final List category; final int totalTickets; - final String? imageUrl; // Added for UI + final String? imageUrl; Event({ required this.id, @@ -40,10 +40,55 @@ class Event { status: json['status'] ?? 'active', category: List.from(json['categories'] ?? []), totalTickets: json['total_tickets'] ?? 0, - // Use a placeholder image if none is provided - imageUrl: - json['imageUrl'] ?? + imageUrl: json['imageUrl'] ?? 'https://picsum.photos/seed/${json['event_id']}/400/200', ); } } + +class EventCreate { + final String name; + final String? description; + final DateTime startDate; + final DateTime endDate; + final int? minimumAge; + final int locationId; + final List category; + final int totalTickets; + final double standardTicketPrice; + final DateTime ticketSalesStartDateTime; + + EventCreate({ + required this.name, + this.description, + required this.startDate, + required this.endDate, + this.minimumAge, + required this.locationId, + required this.category, + required this.totalTickets, + required this.standardTicketPrice, + required this.ticketSalesStartDateTime, + }); + + Map toJson() { + return { + 'name': name, + 'description': description, + 'start_date': startDate.toIso8601String(), + 'end_date': endDate.toIso8601String(), + 'minimum_age': minimumAge, + 'location_id': locationId, + 'category': category, + 'total_tickets': totalTickets, + 'standard_ticket_price': standardTicketPrice, + 'ticket_sales_start': ticketSalesStartDateTime.toIso8601String(), + }; + } +} + +class EventStatus { + static const String created = 'created'; + static const String pending = 'pending'; + static const String cancelled = 'cancelled'; +} diff --git a/frontend/lib/core/models/location_model.dart b/frontend/lib/core/models/location_model.dart new file mode 100644 index 0000000..a316f8b --- /dev/null +++ b/frontend/lib/core/models/location_model.dart @@ -0,0 +1,30 @@ +class Location { + final int locationId; + final String name; + final String address; + final String city; + final String country; + + Location({ + required this.locationId, + required this.name, + required this.address, + required this.city, + required this.country, + }); + + factory Location.fromJson(Map json) { + return Location( + locationId: json['location_id'], + name: json['name'], + address: json['address'], + city: json['city'], + country: json['country'], + ); + } + + @override + String toString() { + return name; + } +} diff --git a/frontend/lib/core/models/models.dart b/frontend/lib/core/models/models.dart new file mode 100644 index 0000000..7bff2b8 --- /dev/null +++ b/frontend/lib/core/models/models.dart @@ -0,0 +1,8 @@ +export 'admin_model.dart'; +export 'cart_model.dart'; +export 'event_filter_model.dart'; +export 'event_model.dart'; +export 'location_model.dart'; +export 'resale_ticket_listing.dart'; +export 'ticket_model.dart'; +export 'user_model.dart'; diff --git a/frontend/lib/core/models/resale_ticket_listing.dart b/frontend/lib/core/models/resale_ticket_listing.dart new file mode 100644 index 0000000..e17f7c8 --- /dev/null +++ b/frontend/lib/core/models/resale_ticket_listing.dart @@ -0,0 +1,35 @@ +class ResaleTicketListing { + final int ticketId; + final double originalPrice; + final double resellPrice; + final String eventName; + final DateTime eventDate; + final String venueName; + final String ticketTypeDescription; + final String? seat; + + ResaleTicketListing({ + required this.ticketId, + required this.originalPrice, + required this.resellPrice, + required this.eventName, + required this.eventDate, + required this.venueName, + required this.ticketTypeDescription, + this.seat, + }); + + factory ResaleTicketListing.fromJson(Map json) { + return ResaleTicketListing( + ticketId: json['ticket_id'], + originalPrice: (json['original_price'] as num).toDouble(), + resellPrice: (json['resell_price'] as num).toDouble(), + eventName: json['event_name'], + eventDate: DateTime.parse(json['event_date']), + venueName: json['venue_name'], + ticketTypeDescription: + json['ticket_type_description'] ?? 'Standard Ticket', + seat: json['seat'], + ); + } +} diff --git a/frontend/lib/core/models/ticket_model.dart b/frontend/lib/core/models/ticket_model.dart index 3d7dbad..260090c 100644 --- a/frontend/lib/core/models/ticket_model.dart +++ b/frontend/lib/core/models/ticket_model.dart @@ -5,6 +5,7 @@ class TicketType { final int maxCount; final double price; final String currency; + final DateTime? availableFrom; // Added this field TicketType({ this.typeId, @@ -13,6 +14,7 @@ class TicketType { required this.maxCount, required this.price, required this.currency, + this.availableFrom, // Added this parameter }); factory TicketType.fromJson(Map json) { @@ -24,8 +26,49 @@ class TicketType { // Price can be int or double from JSON price: (json['price'] as num).toDouble(), currency: json['currency'] ?? 'USD', + // Parse availableFrom field + availableFrom: json['available_from'] != null + ? DateTime.parse(json['available_from']) + : null, ); } + + Map toJson() { + return { + 'type_id': typeId, + 'event_id': eventId, + 'description': description, + 'max_count': maxCount, + 'price': price, + 'currency': currency, + 'available_from': availableFrom?.toIso8601String(), // Added this field + }; + } + + TicketType copyWith({ + int? typeId, + int? eventId, + String? description, + int? maxCount, + double? price, + String? currency, + DateTime? availableFrom, + }) { + return TicketType( + typeId: typeId ?? this.typeId, + eventId: eventId ?? this.eventId, + description: description ?? this.description, + maxCount: maxCount ?? this.maxCount, + price: price ?? this.price, + currency: currency ?? this.currency, + availableFrom: availableFrom ?? this.availableFrom, + ); + } + + @override + String toString() { + return 'TicketType{typeId: $typeId, eventId: $eventId, description: $description, maxCount: $maxCount, price: $price, currency: $currency, availableFrom: $availableFrom}'; + } } class TicketDetailsModel { @@ -34,19 +77,26 @@ class TicketDetailsModel { final String? seat; final int? ownerId; final double? resellPrice; + final double? originalPrice; // The price the user paid for the ticket // These fields are not in the base model but can be added for convenience final String? eventName; final DateTime? eventStartDate; + final String? ticketTypeDescription; + final DateTime? ticketAvailableFrom; + TicketDetailsModel({ required this.ticketId, this.typeId, this.seat, this.ownerId, this.resellPrice, + this.originalPrice, this.eventName, this.eventStartDate, + this.ticketTypeDescription, + this.ticketAvailableFrom, }); factory TicketDetailsModel.fromJson(Map json) { @@ -55,16 +105,38 @@ class TicketDetailsModel { typeId: json['type_id'], seat: json['seat'], ownerId: json['owner_id'], - resellPrice: - json['resell_price'] != null - ? (json['resell_price'] as num).toDouble() - : null, - // Handle extra mocked data - eventName: json['eventName'], - eventStartDate: - json['eventStartDate'] != null + resellPrice: json['resell_price'] != null + ? (json['resell_price'] as num).toDouble() + : null, + originalPrice: json['original_price'] != null + ? (json['original_price'] as num).toDouble() + : null, + // Handle both snake_case (from backend) and camelCase (from mock data) + eventName: json['event_name'] ?? json['eventName'], + eventStartDate: json['event_start_date'] != null + ? DateTime.parse(json['event_start_date']) + : json['eventStartDate'] != null ? DateTime.parse(json['eventStartDate']) : null, + ticketTypeDescription: json['ticket_type_description'], + ticketAvailableFrom: json['ticket_available_from'] != null + ? DateTime.parse(json['ticket_available_from']) + : null, ); } + + Map toJson() { + return { + 'ticket_id': ticketId, + 'type_id': typeId, + 'seat': seat, + 'owner_id': ownerId, + 'resell_price': resellPrice, + 'original_price': originalPrice, + 'event_name': eventName, + 'event_start_date': eventStartDate?.toIso8601String(), + 'ticket_type_description': ticketTypeDescription, + 'ticket_available_from': ticketAvailableFrom?.toIso8601String(), + }; + } } diff --git a/frontend/lib/core/models/user_model.dart b/frontend/lib/core/models/user_model.dart new file mode 100644 index 0000000..000f4c0 --- /dev/null +++ b/frontend/lib/core/models/user_model.dart @@ -0,0 +1,120 @@ +import 'package:equatable/equatable.dart'; + +class UserModel { + final int userId; + final String email; + final String name; + final UserRole role; + final int roleId; + + UserModel({ + required this.userId, + required this.email, + required this.name, + required this.role, + required this.roleId, + }); + + factory UserModel.fromJwt(Map jwtData) { + UserRole role; + switch (jwtData['role']) { + case 'organizer': + role = UserRole.organizer; + break; + case 'administrator': + role = UserRole.admin; + break; + default: + role = UserRole.customer; + } + + return UserModel( + userId: jwtData['user_id'], + email: jwtData['sub'], + name: jwtData['name'] ?? 'User', + role: role, + roleId: jwtData['role_id'], + ); + } +} + +enum UserRole { customer, organizer, admin } + +class UserProfile extends Equatable { + final int userId; + final String email; + final String? login; + final String firstName; + final String lastName; + final String userType; + final bool isActive; + + const UserProfile({ + required this.userId, + required this.email, + this.login, + required this.firstName, + required this.lastName, + required this.userType, + required this.isActive, + }); + + factory UserProfile.fromJson(Map json) { + final userType = json['user_type'] as String? ?? 'customer'; + if (userType == 'organizer') { + return OrganizerProfile.fromJson(json); + } + // TODO: Add other types like Admin if they have special fields. + return UserProfile( + userId: json['user_id'], + email: json['email'], + login: json['login'], + firstName: json['first_name'], + lastName: json['last_name'], + userType: json['user_type'], + isActive: json['is_active'], + ); + } + + @override + List get props => + [userId, email, login, firstName, lastName, userType, isActive]; +} + +class OrganizerProfile extends UserProfile { + final int organizerId; + final String companyName; + final bool isVerified; + + const OrganizerProfile({ + required super.userId, + required super.email, + super.login, + required super.firstName, + required super.lastName, + required super.userType, + required super.isActive, + required this.organizerId, + required this.companyName, + required this.isVerified, + }); + + factory OrganizerProfile.fromJson(Map json) { + return OrganizerProfile( + userId: json['user_id'], + email: json['email'], + login: json['login'], + firstName: json['first_name'], + lastName: json['last_name'], + userType: json['user_type'], + isActive: json['is_active'], + organizerId: json['organizer_id'], + companyName: json['company_name'], + isVerified: json['is_verified'], + ); + } + + @override + List get props => + super.props..addAll([organizerId, companyName, isVerified]); +} diff --git a/frontend/lib/core/network/api_client.dart b/frontend/lib/core/network/api_client.dart new file mode 100644 index 0000000..c5893da --- /dev/null +++ b/frontend/lib/core/network/api_client.dart @@ -0,0 +1,95 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/foundation.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/services/storage_service.dart'; + +class ApiClient { + final Dio _dio; + String? _authToken; + static const String _tokenKey = 'resellio_auth_token'; + + ApiClient(String baseUrl) : _dio = Dio() { + _dio.options.baseUrl = baseUrl; + _dio.options.connectTimeout = const Duration(seconds: 15); + _dio.options.receiveTimeout = const Duration(seconds: 15); + _dio.interceptors.add(_createInterceptor()); + + if (kIsWeb) { + _loadStoredToken(); + } + } + + void _loadStoredToken() { + if (kIsWeb) { + _authToken = StorageService.instance.getItem(_tokenKey); + } + } + + void setAuthToken(String? token) { + _authToken = token; + if (kIsWeb) { + if (token != null) { + StorageService.instance.setItem(_tokenKey, token); + } else { + StorageService.instance.removeItem(_tokenKey); + } + } + } + + Future get(String endpoint, {Map? queryParams}) async { + try { + final response = await _dio.get(endpoint, queryParameters: queryParams); + return response.data; + } on DioException catch (e) { + throw ApiException.fromDioError(e); + } + } + + Future post(String endpoint, + {dynamic data, + Map? queryParams, + Options? options}) async { + try { + final response = await _dio.post(endpoint, + data: data, queryParameters: queryParams, options: options); + return response.data; + } on DioException catch (e) { + throw ApiException.fromDioError(e); + } + } + + Future put(String endpoint, {dynamic data}) async { + try { + final response = await _dio.put(endpoint, data: data); + return response.data; + } on DioException catch (e) { + throw ApiException.fromDioError(e); + } + } + + Future delete(String endpoint, {dynamic data}) async { + try { + final response = await _dio.delete(endpoint, data: data); + return response.data; + } on DioException catch (e) { + throw ApiException.fromDioError(e); + } + } + + InterceptorsWrapper _createInterceptor() { + return InterceptorsWrapper( + onRequest: (options, handler) { + // Always check localStorage for the latest token (web only) + if (kIsWeb && _authToken == null) { + _loadStoredToken(); + } + + if (_authToken != null) { + options.headers['Authorization'] = 'Bearer $_authToken'; + } + return handler.next(options); + }, + onError: (e, handler) => handler.next(e), + ); + } +} diff --git a/frontend/lib/core/network/api_exception.dart b/frontend/lib/core/network/api_exception.dart new file mode 100644 index 0000000..0520a59 --- /dev/null +++ b/frontend/lib/core/network/api_exception.dart @@ -0,0 +1,27 @@ +import 'package:dio/dio.dart'; + +class ApiException implements Exception { + final String message; + + ApiException(this.message); + + factory ApiException.fromDioError(DioException e) { + if (e.type == DioExceptionType.connectionError || + e.type == DioExceptionType.connectionTimeout || + e.type == DioExceptionType.receiveTimeout) { + return ApiException('Connection Error: Please check your network and ensure the server is running.'); + } + + if (e.response?.data != null && e.response!.data is Map) { + final detail = (e.response!.data as Map)['detail']; + if (detail is String) { + return ApiException(detail); + } + } + + return ApiException(e.response?.statusMessage ?? 'An unknown API error occurred'); + } + + @override + String toString() => message; +} diff --git a/frontend/lib/core/repositories/admin_repository.dart b/frontend/lib/core/repositories/admin_repository.dart new file mode 100644 index 0000000..1fca32e --- /dev/null +++ b/frontend/lib/core/repositories/admin_repository.dart @@ -0,0 +1,185 @@ +import 'package:resellio/core/models/admin_model.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/network/api_client.dart'; +import 'package:resellio/core/network/api_exception.dart'; + +abstract class AdminRepository { + Future> getPendingOrganizers(); + Future> getAllUsers({ + int page = 1, + int limit = 50, + String? search, + String? userType, + bool? isActive, + bool? isVerified, + }); + Future> getBannedUsers(); + Future> getPendingEvents(); + Future verifyOrganizer(int organizerId, bool approve); + Future banUser(int userId); + Future unbanUser(int userId); + Future authorizeEvent(int eventId); + Future rejectEvent(int eventId); + Future registerAdmin(Map adminData); + Future getUserDetails(int userId); + Future getAdminStats(); + + Future canBanUser(int userId); + Future getUserById(int userId); + Future approveUser(int userId); + Future> getUnverifiedUsers({ + int page = 1, + int limit = 50, + }); +} + +class ApiAdminRepository implements AdminRepository { + final ApiClient _apiClient; + + ApiAdminRepository(this._apiClient); + + @override + Future> getPendingOrganizers() async { + final data = await _apiClient.get('/auth/pending-organizers'); + return (data as List).map((e) => PendingOrganizer.fromJson(e)).toList(); + } + + @override + Future> getAllUsers({ + int page = 1, + int limit = 50, + String? search, + String? userType, + bool? isActive, + bool? isVerified, + }) async { + final queryParams = { + 'page': page, + 'limit': limit, + if (search != null && search.isNotEmpty) 'search': search, + if (userType != null) 'user_type': userType, + if (isActive != null) 'is_active': isActive, + if (isVerified != null) 'is_verified': isVerified, + }; + + final data = await _apiClient.get('/auth/users', queryParams: queryParams); + return (data as List).map((e) => UserDetails.fromJson(e)).toList(); + } + + @override + Future> getBannedUsers() async { + final data = await _apiClient.get('/auth/users', queryParams: { + 'is_active': false, + 'limit': 100, + }); + return (data as List).map((e) => UserDetails.fromJson(e)).toList(); + } + + @override + Future> getPendingEvents() async { + final data = await _apiClient.get('/events', queryParams: { + 'status': 'pending', + 'limit': 100, + }); + return (data as List).map((e) => Event.fromJson(e)).toList(); + } + + @override + Future verifyOrganizer(int organizerId, bool approve) async { + await _apiClient.post( + '/auth/verify-organizer', + data: {'organizer_id': organizerId, 'approve': approve}, + ); + } + + @override + Future banUser(int userId) async { + final canBan = await canBanUser(userId); + if (!canBan) { + throw ApiException('Administrator accounts cannot be banned for security reasons'); + } + + try { + await _apiClient.post('/auth/ban-user/$userId'); + } on ApiException catch (e) { + if (e.message.toLowerCase().contains('admin') || + e.message.toLowerCase().contains('administrator')) { + throw ApiException('Administrator accounts cannot be banned for security reasons'); + } + rethrow; + } + } + + @override + Future unbanUser(int userId) async { + await _apiClient.post('/auth/unban-user/$userId'); + } + + @override + Future authorizeEvent(int eventId) async { + await _apiClient.post('/events/authorize/$eventId'); + } + + @override + Future rejectEvent(int eventId) async { + await _apiClient.post('/events/reject/$eventId'); + } + + @override + Future registerAdmin(Map adminData) async { + final response = await _apiClient.post('/auth/register/admin', data: adminData); + return response['token'] as String; + } + + @override + Future getUserDetails(int userId) async { + final data = await _apiClient.get('/auth/users/$userId'); + return UserDetails.fromJson(data); + } + + @override + Future getUserById(int userId) async { + return await getUserDetails(userId); + } + + @override + Future canBanUser(int userId) async { + try { + final user = await getUserById(userId); + return !_isAdminUser(user.userType); + } catch (e) { + return false; + } + } + + @override + Future getAdminStats() async { + final data = await _apiClient.get('/auth/users/stats'); + return AdminStats.fromJson(data); + } + + bool _isAdminUser(String userType) { + final normalizedType = userType.toLowerCase(); + return normalizedType == 'administrator' || normalizedType == 'admin'; + } + + @override + Future approveUser(int userId) async { + await _apiClient.post('/auth/approve-user/$userId'); + } + + @override + Future> getUnverifiedUsers({ + int page = 1, + int limit = 50, + }) async { + final queryParams = { + 'page': page, + 'limit': limit, + 'is_active': false, // Get inactive users who might need verification + }; + + final data = await _apiClient.get('/auth/users', queryParams: queryParams); + return (data as List).map((e) => UserDetails.fromJson(e)).toList(); + } +} \ No newline at end of file diff --git a/frontend/lib/core/repositories/auth_repository.dart b/frontend/lib/core/repositories/auth_repository.dart new file mode 100644 index 0000000..9bfcb98 --- /dev/null +++ b/frontend/lib/core/repositories/auth_repository.dart @@ -0,0 +1,56 @@ +import 'package:dio/dio.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class AuthRepository { + Future login(String email, String password); + Future registerCustomer(Map data); + Future registerOrganizer(Map data); + Future logout(); +} + +class ApiAuthRepository implements AuthRepository { + final ApiClient _apiClient; + + ApiAuthRepository(this._apiClient); + + @override + Future login(String email, String password) async { + final response = await _apiClient.post( + '/auth/token', + data: {'username': email, 'password': password}, + options: Options(contentType: Headers.formUrlEncodedContentType), + ); + if (response['token'] != null && response['token'].isNotEmpty) { + final token = response['token'] as String; + _apiClient.setAuthToken(token); + return token; + } else { + throw Exception('Login failed: ${response['message']}'); + } + } + + @override + Future registerCustomer(Map data) async { + final response = + await _apiClient.post('/auth/register/customer', data: data); + if (response != null && response['message'] is String) { + return response['message'] as String; + } else { + throw Exception('Customer registration failed or returned an unexpected response.'); + } + } + + @override + Future registerOrganizer(Map data) async { + final response = + await _apiClient.post('/auth/register/organizer', data: data); + final token = response['token'] as String; + _apiClient.setAuthToken(token); + return token; + } + + @override + Future logout() async { + _apiClient.setAuthToken(null); + } +} diff --git a/frontend/lib/core/repositories/cart_repository.dart b/frontend/lib/core/repositories/cart_repository.dart new file mode 100644 index 0000000..93fb5fe --- /dev/null +++ b/frontend/lib/core/repositories/cart_repository.dart @@ -0,0 +1,43 @@ +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class CartRepository { + Future> getCartItems(); + Future addToCart(int ticketTypeId, int quantity); + Future addResaleTicketToCart(int ticketId); + Future removeFromCart(int cartItemId); + Future checkout(); +} + +class ApiCartRepository implements CartRepository { + final ApiClient _apiClient; + ApiCartRepository(this._apiClient); + + @override + Future> getCartItems() async { + final data = await _apiClient.get('/cart/items'); + return (data as List).map((e) => CartItem.fromJson(e)).toList(); + } + + @override + Future addToCart(int ticketTypeId, int quantity) async { + await _apiClient.post('/cart/items', + queryParams: {'ticket_type_id': ticketTypeId, 'quantity': quantity}); + } + + @override + Future addResaleTicketToCart(int ticketId) async { + await _apiClient.post('/cart/items', queryParams: {'ticket_id': ticketId}); + } + + @override + Future removeFromCart(int cartItemId) async { + await _apiClient.delete('/cart/items/$cartItemId'); + } + + @override + Future checkout() async { + final response = await _apiClient.post('/cart/checkout'); + return response as bool; + } +} \ No newline at end of file diff --git a/frontend/lib/core/repositories/event_repository.dart b/frontend/lib/core/repositories/event_repository.dart new file mode 100644 index 0000000..473f2c9 --- /dev/null +++ b/frontend/lib/core/repositories/event_repository.dart @@ -0,0 +1,89 @@ +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class EventRepository { + Future> getEvents(); + Future> getEventsWithParams(Map queryParams); + Future> getOrganizerEvents(int organizerId); + Future> getTicketTypesForEvent(int eventId); + Future createEvent(EventCreate eventData); + Future updateEvent(int eventId, Map eventData); + Future cancelEvent(int eventId); + Future notifyParticipants(int eventId, String message); + Future createTicketType(Map data); + Future deleteTicketType(int typeId); + Future> getLocations(); +} + +class ApiEventRepository implements EventRepository { + final ApiClient _apiClient; + + ApiEventRepository(this._apiClient); + + @override + Future> getEvents() async { + final data = await _apiClient.get('/events'); + return (data as List).map((e) => Event.fromJson(e)).toList(); + } + + @override + Future> getEventsWithParams(Map queryParams) async { + final data = await _apiClient.get('/events', queryParams: queryParams); + return (data as List).map((e) => Event.fromJson(e)).toList(); + } + + @override + Future> getOrganizerEvents(int organizerId) async { + final data = await _apiClient.get('/events', queryParams: {'organizer_id': organizerId}); + return (data as List).map((e) => Event.fromJson(e)).toList(); + } + + @override + Future> getTicketTypesForEvent(int eventId) async { + final data = await _apiClient.get('/ticket-types/', queryParams: {'event_id': eventId}); + return (data as List).map((t) => TicketType.fromJson(t)).toList(); + } + + @override + Future createEvent(EventCreate eventData) async { + final data = await _apiClient.post('/events/', data: eventData.toJson()); + return Event.fromJson(data); + } + + @override + Future updateEvent(int eventId, Map eventData) async { + final data = await _apiClient.put('/events/$eventId', data: eventData); + return Event.fromJson(data); + } + + @override + Future cancelEvent(int eventId) async { + final response = await _apiClient.delete('/events/$eventId'); + return response as bool; + } + + @override + Future notifyParticipants(int eventId, String message) async { + await _apiClient.post('/events/$eventId/notify', data: {'message': message}); + } + + @override + Future createTicketType(Map data) async { + final response = await _apiClient.post('/ticket-types/', data: data); + return TicketType.fromJson(response); + } + + // REMOVED: updateTicketType method + + @override + Future deleteTicketType(int typeId) async { + final response = await _apiClient.delete('/ticket-types/$typeId'); + return response as bool; + } + + @override + Future> getLocations() async { + final data = await _apiClient.get('/locations/'); + return (data as List).map((e) => Location.fromJson(e)).toList(); + } +} diff --git a/frontend/lib/core/repositories/repositories.dart b/frontend/lib/core/repositories/repositories.dart new file mode 100644 index 0000000..b599063 --- /dev/null +++ b/frontend/lib/core/repositories/repositories.dart @@ -0,0 +1,7 @@ +export 'admin_repository.dart'; +export 'auth_repository.dart'; +export 'cart_repository.dart'; +export 'event_repository.dart'; +export 'resale_repository.dart'; +export 'ticket_repository.dart'; +export 'user_repository.dart'; diff --git a/frontend/lib/core/repositories/resale_repository.dart b/frontend/lib/core/repositories/resale_repository.dart new file mode 100644 index 0000000..387beb1 --- /dev/null +++ b/frontend/lib/core/repositories/resale_repository.dart @@ -0,0 +1,48 @@ +import 'package:resellio/core/models/resale_ticket_listing.dart'; +import 'package:resellio/core/models/ticket_model.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class ResaleRepository { + Future> getMarketplaceListings( + {int? eventId, double? minPrice, double? maxPrice}); + Future> getMarketplaceListingsWithParams(Map queryParams); + Future purchaseResaleTicket(int ticketId); + Future> getMyResaleListings(); +} + +class ApiResaleRepository implements ResaleRepository { + final ApiClient _apiClient; + ApiResaleRepository(this._apiClient); + + @override + Future> getMarketplaceListings( + {int? eventId, double? minPrice, double? maxPrice}) async { + final queryParams = { + if (eventId != null) 'event_id': eventId, + if (minPrice != null) 'min_price': minPrice, + if (maxPrice != null) 'max_price': maxPrice, + }; + final data = + await _apiClient.get('/resale/marketplace', queryParams: queryParams); + return (data as List).map((e) => ResaleTicketListing.fromJson(e)).toList(); + } + + @override + Future> getMarketplaceListingsWithParams(Map queryParams) async { + final data = await _apiClient.get('/resale/marketplace', queryParams: queryParams); + return (data as List).map((e) => ResaleTicketListing.fromJson(e)).toList(); + } + + @override + Future purchaseResaleTicket(int ticketId) async { + final data = + await _apiClient.post('/resale/purchase', data: {'ticket_id': ticketId}); + return TicketDetailsModel.fromJson(data); + } + + @override + Future> getMyResaleListings() async { + final data = await _apiClient.get('/resale/my-listings'); + return (data as List).map((e) => ResaleTicketListing.fromJson(e)).toList(); + } +} \ No newline at end of file diff --git a/frontend/lib/core/repositories/ticket_repository.dart b/frontend/lib/core/repositories/ticket_repository.dart new file mode 100644 index 0000000..070f1d1 --- /dev/null +++ b/frontend/lib/core/repositories/ticket_repository.dart @@ -0,0 +1,29 @@ +import 'package:resellio/core/models/ticket_model.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class TicketRepository { + Future> getMyTickets(); + Future listTicketForResale(int ticketId, double price); + Future cancelResaleListing(int ticketId); +} + +class ApiTicketRepository implements TicketRepository { + final ApiClient _apiClient; + ApiTicketRepository(this._apiClient); + + @override + Future> getMyTickets() async { + final data = await _apiClient.get('/tickets/'); + return (data as List).map((e) => TicketDetailsModel.fromJson(e)).toList(); + } + + @override + Future listTicketForResale(int ticketId, double price) async { + await _apiClient.post('/tickets/$ticketId/resell', data: {'price': price}); + } + + @override + Future cancelResaleListing(int ticketId) async { + await _apiClient.delete('/tickets/$ticketId/resell'); + } +} diff --git a/frontend/lib/core/repositories/user_repository.dart b/frontend/lib/core/repositories/user_repository.dart new file mode 100644 index 0000000..35756eb --- /dev/null +++ b/frontend/lib/core/repositories/user_repository.dart @@ -0,0 +1,25 @@ +import 'package:resellio/core/models/user_model.dart'; +import 'package:resellio/core/network/api_client.dart'; + +abstract class UserRepository { + Future getUserProfile(); + Future updateUserProfile(Map profileData); +} + +class ApiUserRepository implements UserRepository { + final ApiClient _apiClient; + ApiUserRepository(this._apiClient); + + @override + Future getUserProfile() async { + final data = await _apiClient.get('/user/me'); + return UserProfile.fromJson(data); + } + + @override + Future updateUserProfile( + Map profileData) async { + final data = await _apiClient.put('/user/update-profile', data: profileData); + return UserProfile.fromJson(data); + } +} diff --git a/frontend/lib/core/services/api_service.dart b/frontend/lib/core/services/api_service.dart deleted file mode 100644 index 6a5272e..0000000 --- a/frontend/lib/core/services/api_service.dart +++ /dev/null @@ -1,262 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:flutter/foundation.dart'; -import 'package:resellio/core/models/event_model.dart'; -import 'package:resellio/core/models/ticket_model.dart'; - -// --- API Configuration --- - -enum Environment { mock, local, production } - -class ApiConfig { - final Environment environment; - final String baseUrl; - final bool useMockData; - - ApiConfig({ - required this.environment, - required this.baseUrl, - this.useMockData = false, - }); - - static final ApiConfig mockConfig = ApiConfig( - environment: Environment.mock, - baseUrl: 'mock', - useMockData: true, - ); - - static final ApiConfig localConfig = ApiConfig( - environment: Environment.local, - // Assumes API Gateway is running on localhost:8080 via Docker Compose - baseUrl: 'http://localhost:8080/api', - ); - - static final ApiConfig productionConfig = ApiConfig( - environment: Environment.production, - // Replace with your actual AWS API Gateway URL - baseUrl: 'https://your-api.aws.com/api', - ); -} - -// --- API Service --- - -class ApiService { - // --- Configuration --- - // CHANGE THIS TO SWITCH BETWEEN ENVIRONMENTS - static final ApiConfig _currentConfig = ApiConfig.localConfig; - - final Dio _dio = Dio(); - String? _authToken; - - ApiService() { - _dio.options.baseUrl = _currentConfig.baseUrl; - _dio.options.connectTimeout = const Duration(seconds: 10); - _dio.options.receiveTimeout = const Duration(seconds: 10); - _dio.interceptors.add( - InterceptorsWrapper( - onRequest: (options, handler) { - if (_authToken != null) { - options.headers['Authorization'] = 'Bearer $_authToken'; - } - return handler.next(options); - }, - onError: (DioException e, handler) { - // You can add global error handling here - debugPrint('API Error: ${e.response?.statusCode} - ${e.message}'); - return handler.next(e); - }, - ), - ); - } - - String _handleDioError(DioException e) { - if (e.response?.data != null && e.response!.data is Map) { - final data = e.response!.data as Map; - final detail = data['detail']; - - if (detail is String) { - return detail; - } - - if (detail is List) { - try { - // Format FastAPI validation errors - return detail - .map((err) => err['msg'] as String? ?? 'Invalid input.') - .join('\n'); - } catch (_) { - // Fallback for unexpected list content - return 'Invalid data provided.'; - } - } - } - return e.response?.statusMessage ?? - e.message ?? - 'An unknown error occurred'; - } - - void setAuthToken(String? token) { - _authToken = token; - } - - // --- Auth Methods --- - - Future login(String email, String password) async { - if (_currentConfig.useMockData) { - await Future.delayed(const Duration(seconds: 1)); - // Return a mock JWT-like token for testing purposes - return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ0ZXN0QGV4YW1wbGUuY29tIiwicm9sZSI6ImN1c3RvbWVyIiwidXNlcl9pZCI6MSwicm9sZV9pZCI6MSwibmFtZSI6IlRlc3QiLCJleHAiOjE3MDAwMDAwMDB9.mock_signature'; - } - try { - final response = await _dio.post( - '/auth/token', - data: {'username': email, 'password': password}, - options: Options(contentType: Headers.formUrlEncodedContentType), - ); - if (response.data['token'] != null && response.data['token'].isNotEmpty) { - return response.data['token']; - } else { - throw 'Login failed: ${response.data['message']}'; - } - } on DioException catch (e) { - throw _handleDioError(e); - } catch (e) { - rethrow; - } - } - - Future registerCustomer(Map data) async { - try { - final response = await _dio.post('/auth/register/customer', data: data); - return response.data['token']; - } on DioException catch (e) { - throw _handleDioError(e); - } catch (e) { - rethrow; - } - } - - Future registerOrganizer(Map data) async { - try { - final response = await _dio.post('/auth/register/organizer', data: data); - return response.data['token']; - } on DioException catch (e) { - throw _handleDioError(e); - } catch (e) { - rethrow; - } - } - - // --- Mock Data --- - - final List _mockEvents = List.generate( - 10, - (index) => Event.fromJson({ - 'event_id': index + 1, - 'organizer_id': 101, - 'name': 'Epic Music Festival ${index + 1}', - 'description': - 'An unforgettable music experience under the stars. Featuring top artists and amazing food.', - 'start_date': - DateTime.now().add(Duration(days: index * 5)).toIso8601String(), - 'end_date': - DateTime.now() - .add(Duration(days: index * 5, hours: 6)) - .toIso8601String(), - 'minimum_age': 18, - 'location_name': 'Sunset Valley', - 'status': 'active', - 'categories': ['Music', 'Festival'], - 'total_tickets': 5000, - }), - ); - - final List _mockTicketTypes = [ - TicketType.fromJson({ - 'type_id': 1, - 'event_id': 1, - 'description': 'General Admission', - 'max_count': 100, - 'price': 49.99, - 'currency': 'USD', - }), - TicketType.fromJson({ - 'type_id': 2, - 'event_id': 1, - 'description': 'VIP Access', - 'max_count': 20, - 'price': 129.99, - 'currency': 'USD', - }), - ]; - - final List _mockTickets = [ - TicketDetailsModel.fromJson({ - 'ticket_id': 1, - 'type_id': 1, - 'owner_id': 1, - 'seat': 'GA-123', - // Mocked relation data - 'eventName': 'Epic Music Festival 1', - 'eventStartDate': - DateTime.now().add(const Duration(days: 5)).toIso8601String(), - }), - TicketDetailsModel.fromJson({ - 'ticket_id': 2, - 'type_id': 2, - 'owner_id': 1, - 'seat': 'VIP-A1', - 'resell_price': 150.0, - // Mocked relation data - 'eventName': 'Another Cool Concert', - 'eventStartDate': - DateTime.now().add(const Duration(days: 10)).toIso8601String(), - }), - ]; - - // --- API Methods --- - - Future> getEvents() async { - if (_currentConfig.useMockData) { - await Future.delayed(const Duration(seconds: 1)); - return _mockEvents; - } - try { - final response = await _dio.get('/events'); - return (response.data as List).map((e) => Event.fromJson(e)).toList(); - } catch (e) { - debugPrint('Failed to get events: $e'); - rethrow; - } - } - - Future> getTicketTypesForEvent(int eventId) async { - if (_currentConfig.useMockData) { - await Future.delayed(const Duration(milliseconds: 500)); - return _mockTicketTypes.where((t) => t.eventId == eventId).toList(); - } - try { - final response = await _dio.get('/ticket-types?event_id=$eventId'); - return (response.data as List) - .map((e) => TicketType.fromJson(e)) - .toList(); - } catch (e) { - rethrow; - } - } - - Future> getMyTickets(int userId) async { - if (_currentConfig.useMockData) { - await Future.delayed(const Duration(seconds: 1)); - return _mockTickets.where((t) => t.ownerId == userId).toList(); - } - try { - // Use the owner_id filter on the backend for security and efficiency - final response = await _dio.get('/tickets?owner_id=$userId'); - return (response.data as List) - .map((e) => TicketDetailsModel.fromJson(e)) - .toList(); - } catch (e) { - rethrow; - } - } -} diff --git a/frontend/lib/core/services/auth_service.dart b/frontend/lib/core/services/auth_service.dart index 672636f..e94b080 100644 --- a/frontend/lib/core/services/auth_service.dart +++ b/frontend/lib/core/services/auth_service.dart @@ -1,117 +1,129 @@ -import 'dart:convert'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:resellio/core/services/api_service.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/utils/jwt_decoder.dart'; +import 'package:resellio/core/services/storage_service.dart'; import 'package:resellio/presentation/common_widgets/adaptive_navigation.dart'; -// --- JWT Decoding Helper --- -Map? tryDecodeJwt(String token) { - try { - final parts = token.split('.'); - if (parts.length != 3) { - return null; - } - final payload = parts[1]; - final normalized = base64Url.normalize(payload); - final resp = utf8.decode(base64Url.decode(normalized)); - return json.decode(resp); - } catch (e) { - debugPrint('Error decoding JWT: $e'); - return null; - } -} - -// --- User Model --- -class UserModel { - final int userId; - final String email; - final String name; - final UserRole role; - final int roleId; - - UserModel({ - required this.userId, - required this.email, - required this.name, - required this.role, - required this.roleId, - }); - - factory UserModel.fromJwt(Map jwtData) { - UserRole role; - switch (jwtData['role']) { - case 'organizer': - role = UserRole.organizer; - break; - case 'administrator': - role = UserRole.admin; - break; - default: - role = UserRole.customer; - } - - return UserModel( - userId: jwtData['user_id'], - email: jwtData['sub'], - name: jwtData['name'] ?? 'User', - role: role, - roleId: jwtData['role_id'], - ); - } -} class AuthService extends ChangeNotifier { - final ApiService _apiService; + final AuthRepository _authRepository; + final UserRepository _userRepository; String? _token; UserModel? _user; + UserProfile? _detailedProfile; - AuthService(this._apiService); + static const String _tokenKey = 'resellio_auth_token'; + + AuthService(this._authRepository, this._userRepository) { + _loadStoredToken(); + } bool get isLoggedIn => _token != null; UserModel? get user => _user; + UserProfile? get detailedProfile => _detailedProfile; - Future login(String email, String password) async { + Future _loadStoredToken() async { try { - final token = await _apiService.login(email, password); - _setTokenAndUser(token); + final storedToken = StorageService.instance.getItem(_tokenKey); + if (storedToken != null && storedToken.isNotEmpty) { + final jwtData = tryDecodeJwt(storedToken); + if (jwtData != null) { + final exp = jwtData['exp']; + if (exp != null) { + final expiryDate = DateTime.fromMillisecondsSinceEpoch(exp * 1000); + if (expiryDate.isAfter(DateTime.now())) { + _token = storedToken; + _user = UserModel.fromJwt(jwtData); + + try { + _detailedProfile = await _userRepository.getUserProfile(); + } catch (e) { + debugPrint("Failed to fetch detailed profile on token restore: $e"); + } + + notifyListeners(); + return; + } + } + } + await _clearStoredToken(); + } } catch (e) { - // Rethrow to be caught in the UI - rethrow; + debugPrint("Error loading stored token: $e"); + await _clearStoredToken(); } } - Future registerCustomer(Map data) async { - try { - final token = await _apiService.registerCustomer(data); - _setTokenAndUser(token); - } catch (e) { - rethrow; - } + void _storeToken(String token) { + StorageService.instance.setItem(_tokenKey, token); } - Future registerOrganizer(Map data) async { - try { - final token = await _apiService.registerOrganizer(data); - _setTokenAndUser(token); - } catch (e) { - rethrow; - } + Future _clearStoredToken() async { + StorageService.instance.removeItem(_tokenKey); + _token = null; + _user = null; + _detailedProfile = null; } - void _setTokenAndUser(String token) { + Future _setTokenAndUser(String token) async { _token = token; - _apiService.setAuthToken(token); + _storeToken(token); + _detailedProfile = null; final jwtData = tryDecodeJwt(token); if (jwtData != null) { _user = UserModel.fromJwt(jwtData); + try { + _detailedProfile = await _userRepository.getUserProfile(); + } catch (e) { + debugPrint("Failed to fetch detailed profile on login: $e"); + } } notifyListeners(); } - void logout() { - _token = null; - _user = null; - _apiService.setAuthToken(null); + Future login(String email, String password) async { + final token = await _authRepository.login(email, password); + await _setTokenAndUser(token); + } + + Future registerCustomer(Map data) async { + final message = await _authRepository.registerCustomer(data); + return message; + } + + Future registerOrganizer(Map data) async { + final token = await _authRepository.registerOrganizer(data); + await _setTokenAndUser(token); + } + + void updateDetailedProfile(UserProfile profile) { + if (_detailedProfile != profile) { + _detailedProfile = profile; + notifyListeners(); + } + } + + Future logout() async { + await _authRepository.logout(); + await _clearStoredToken(); notifyListeners(); } + + Future refreshUserData() async { + if (_token != null && _user != null) { + try { + _detailedProfile = await _userRepository.getUserProfile(); + notifyListeners(); + } catch (e) { + debugPrint("Failed to refresh user data: $e"); + // If refresh fails due to invalid token, logout + if (e.toString().contains('401') || e.toString().contains('403')) { + await logout(); + } + } + } + } } diff --git a/frontend/lib/core/services/cart_service.dart b/frontend/lib/core/services/cart_service.dart deleted file mode 100644 index 74eaff9..0000000 --- a/frontend/lib/core/services/cart_service.dart +++ /dev/null @@ -1,53 +0,0 @@ -import 'dart:collection'; -import 'package:flutter/material.dart'; -import 'package:resellio/core/models/cart_model.dart'; -import 'package:resellio/core/models/ticket_model.dart'; -import 'package:resellio/core/services/api_service.dart'; - -class CartService extends ChangeNotifier { - final ApiService _apiService; - final List _items = []; - - CartService(this._apiService); - - UnmodifiableListView get items => UnmodifiableListView(_items); - - int get itemCount => _items.fold(0, (sum, item) => sum + item.quantity); - - double get totalPrice => _items.fold( - 0.0, - (sum, item) => sum + (item.quantity * item.ticketType.price), - ); - - void addItem(TicketType ticketType) { - // Check if the item already exists in the cart - final index = _items.indexWhere( - (item) => item.ticketType.typeId == ticketType.typeId, - ); - - if (index != -1) { - // If it exists, increase the quantity - _items[index] = _items[index].copyWith( - quantity: _items[index].quantity + 1, - ); - } else { - // If not, add a new item - _items.add(CartItem(ticketType: ticketType, quantity: 1)); - } - // In a real app, you would also call the backend API here to add the item - // await _apiService.addToCart(ticketType.typeId, 1); - notifyListeners(); - } - - void removeItem(TicketType ticketType) { - _items.removeWhere((item) => item.ticketType.typeId == ticketType.typeId); - // In a real app, you would call the backend to remove the item - notifyListeners(); - } - - void clearCart() { - _items.clear(); - // In a real app, you would call the backend to clear the cart - notifyListeners(); - } -} diff --git a/frontend/lib/core/services/organizer_service.dart b/frontend/lib/core/services/organizer_service.dart new file mode 100644 index 0000000..3da9ce0 --- /dev/null +++ b/frontend/lib/core/services/organizer_service.dart @@ -0,0 +1,109 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/core/models/event_model.dart'; +import 'package:resellio/core/models/ticket_model.dart'; +import 'package:resellio/core/services/api_service.dart'; + +class OrganizerService extends ChangeNotifier { + final ApiService _apiService; + + OrganizerService(this._apiService); + + List _events = []; + List get events => _events; + + bool _isLoading = false; + bool get isLoading => _isLoading; + + String? _errorMessage; + String? get errorMessage => _errorMessage; + + Future fetchEvents(int organizerId) async { + _setLoading(true); + try { + _events = await _apiService.getOrganizerEvents(organizerId); + _errorMessage = null; + } catch (e) { + _errorMessage = e.toString(); + } finally { + _setLoading(false); + } + } + + Future createEvent(Map data) async { + _setLoading(true); + try { + await _apiService.createEvent(data); + _errorMessage = null; + return true; + } catch (e) { + _errorMessage = e.toString(); + return false; + } finally { + _setLoading(false); + } + } + + Future updateEvent(int eventId, Map data) async { + _setLoading(true); + try { + await _apiService.updateEvent(eventId, data); + _errorMessage = null; + return true; + } catch (e) { + _errorMessage = e.toString(); + return false; + } finally { + _setLoading(false); + } + } + + Future cancelEvent(int eventId) async { + _setLoading(true); + try { + await _apiService.cancelEvent(eventId); + _errorMessage = null; + return true; + } catch (e) { + _errorMessage = e.toString(); + return false; + } finally { + _setLoading(false); + } + } + + Future notifyParticipants(int eventId, String message) async { + try { + await _apiService.notifyParticipants(eventId, message); + return true; + } catch (e) { + _errorMessage = e.toString(); + notifyListeners(); + return false; + } + } + + Future createTicketType(Map data) async { + try { + return await _apiService.createTicketType(data); + } catch (e) { + _errorMessage = e.toString(); + notifyListeners(); + return null; + } + } + + Future deleteTicketType(int typeId) async { + try { + return await _apiService.deleteTicketType(typeId); + } catch (e) { + _errorMessage = e.toString(); + notifyListeners(); + return false; + } + } + + void _setLoading(bool loading) { + _isLoading = loading; + notifyListeners(); + } +} diff --git a/frontend/lib/core/services/storage_service.dart b/frontend/lib/core/services/storage_service.dart new file mode 100644 index 0000000..791d97f --- /dev/null +++ b/frontend/lib/core/services/storage_service.dart @@ -0,0 +1,11 @@ +import 'storage_service_stub.dart' + if (dart.library.html) 'storage_service_web.dart' + if (dart.library.io) 'storage_service_io.dart'; + +abstract class StorageService { + static StorageService get instance => getStorageService(); + + String? getItem(String key); + void setItem(String key, String value); + void removeItem(String key); +} diff --git a/frontend/lib/core/services/storage_service_io.dart b/frontend/lib/core/services/storage_service_io.dart new file mode 100644 index 0000000..ec25c9d --- /dev/null +++ b/frontend/lib/core/services/storage_service_io.dart @@ -0,0 +1,14 @@ +import 'storage_service.dart'; + +class IoStorageService implements StorageService { + @override + String? getItem(String key) => null; + + @override + void setItem(String key, String value) {} + + @override + void removeItem(String key) {} +} + +StorageService getStorageService() => IoStorageService(); diff --git a/frontend/lib/core/services/storage_service_stub.dart b/frontend/lib/core/services/storage_service_stub.dart new file mode 100644 index 0000000..b7a02fe --- /dev/null +++ b/frontend/lib/core/services/storage_service_stub.dart @@ -0,0 +1,14 @@ +import 'storage_service.dart'; + +class StubStorageService implements StorageService { + @override + String? getItem(String key) => null; + + @override + void setItem(String key, String value) {} + + @override + void removeItem(String key) {} +} + +StorageService getStorageService() => StubStorageService(); diff --git a/frontend/lib/core/services/storage_service_web.dart b/frontend/lib/core/services/storage_service_web.dart new file mode 100644 index 0000000..9e5c581 --- /dev/null +++ b/frontend/lib/core/services/storage_service_web.dart @@ -0,0 +1,15 @@ +import 'dart:html' as html; +import 'storage_service.dart'; + +class WebStorageService implements StorageService { + @override + String? getItem(String key) => html.window.localStorage[key]; + + @override + void setItem(String key, String value) => html.window.localStorage[key] = value; + + @override + void removeItem(String key) => html.window.localStorage.remove(key); +} + +StorageService getStorageService() => WebStorageService(); diff --git a/frontend/lib/core/utils/cubit_helpers.dart b/frontend/lib/core/utils/cubit_helpers.dart new file mode 100644 index 0000000..a5d8cdf --- /dev/null +++ b/frontend/lib/core/utils/cubit_helpers.dart @@ -0,0 +1,28 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; + +/// A reusable helper function to standardize data loading logic in Cubits. +/// +/// It handles emitting loading, success, and error states, reducing boilerplate code. +/// - `emit`: The `emit` function from the Cubit. +/// - `loader`: The async function that fetches the data (e.g., a repository call). +/// - `loadingBuilder`: A function that returns the loading state. +/// - `successBuilder`: A function that takes the loaded data and returns the success state. +/// - `errorBuilder`: A function that takes an error message and returns the error state. +Future loadData({ + required Emitter emit, + required Future Function() loader, + required S Function() loadingBuilder, + required S Function(T data) successBuilder, + required S Function(String message) errorBuilder, +}) async { + emit(loadingBuilder()); + try { + final data = await loader(); + emit(successBuilder(data)); + } on ApiException catch (e) { + emit(errorBuilder(e.message)); + } catch (e) { + emit(errorBuilder('An unexpected error occurred: $e')); + } +} diff --git a/frontend/lib/core/utils/jwt_decoder.dart b/frontend/lib/core/utils/jwt_decoder.dart new file mode 100644 index 0000000..20bc5b9 --- /dev/null +++ b/frontend/lib/core/utils/jwt_decoder.dart @@ -0,0 +1,37 @@ +import 'dart:convert'; +import 'package:flutter/material.dart'; + +Map? tryDecodeJwt(String token) { + try { + final parts = token.split('.'); + if (parts.length != 3) return null; + final payload = parts[1]; + final normalized = base64Url.normalize(payload); + final resp = utf8.decode(base64Url.decode(normalized)); + return json.decode(resp); + } catch (e) { + debugPrint('Error decoding JWT: $e'); + return null; + } +} + +bool isTokenExpired(String token) { + final jwtData = tryDecodeJwt(token); + if (jwtData == null) return true; + + final exp = jwtData['exp']; + if (exp == null) return true; + + final expiryDate = DateTime.fromMillisecondsSinceEpoch(exp * 1000); + return expiryDate.isBefore(DateTime.now()); +} + +DateTime? getTokenExpiry(String token) { + final jwtData = tryDecodeJwt(token); + if (jwtData == null) return null; + + final exp = jwtData['exp']; + if (exp == null) return null; + + return DateTime.fromMillisecondsSinceEpoch(exp * 1000); +} diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart index 42a0f4d..b451b04 100644 --- a/frontend/lib/main.dart +++ b/frontend/lib/main.dart @@ -1,21 +1,55 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; import 'package:resellio/app/config/app_router.dart'; import 'package:resellio/app/config/app_theme.dart'; -import 'package:resellio/core/services/api_service.dart'; +import 'package:resellio/core/network/api_client.dart'; +import 'package:resellio/core/repositories/repositories.dart'; import 'package:resellio/core/services/auth_service.dart'; -import 'package:resellio/core/services/cart_service.dart'; +import 'package:resellio/presentation/cart/cubit/cart_cubit.dart'; + +const String apiBaseUrl = String.fromEnvironment( + 'API_BASE_URL', + defaultValue: 'http://localhost:8080/api', +); void main() { runApp( MultiProvider( providers: [ - Provider(create: (_) => ApiService()), - ChangeNotifierProvider( - create: (context) => AuthService(context.read()), + Provider( + create: (_) => ApiClient(apiBaseUrl), + ), + Provider( + create: (context) => ApiAuthRepository(context.read()), + ), + Provider( + create: (context) => ApiEventRepository(context.read()), + ), + Provider( + create: (context) => ApiCartRepository(context.read()), + ), + Provider( + create: (context) => ApiTicketRepository(context.read()), + ), + Provider( + create: (context) => ApiResaleRepository(context.read()), + ), + Provider( + create: (context) => ApiUserRepository(context.read()), + ), + Provider( + create: (context) => ApiAdminRepository(context.read()), ), ChangeNotifierProvider( - create: (context) => CartService(context.read()), + create: (context) => AuthService( + context.read(), + context.read(), + ), + ), + BlocProvider( + create: (context) => + CartCubit(context.read())..fetchCart(), ), ], child: const ResellioApp(), @@ -23,19 +57,49 @@ void main() { ); } -class ResellioApp extends StatelessWidget { +class ResellioApp extends StatefulWidget { const ResellioApp({super.key}); + @override + State createState() => _ResellioAppState(); +} + +class _ResellioAppState extends State { + bool _isInitialized = false; + + @override + void initState() { + super.initState(); + _initializeAuth(); + } + + Future _initializeAuth() async { + // Wait for AuthService to potentially load stored token + await Future.microtask(() {}); + if (mounted) { + setState(() { + _isInitialized = true; + }); + } + } + @override Widget build(BuildContext context) { - // Listen to AuthService to rebuild the router on auth state changes + if (!_isInitialized) { + return MaterialApp( + home: Scaffold( + body: Center(child: CircularProgressIndicator()), + ), + ); + } + final authService = Provider.of(context); return MaterialApp.router( title: 'Resellio', theme: AppTheme.lightTheme, darkTheme: AppTheme.lightTheme, - themeMode: ThemeMode.dark, + themeMode: ThemeMode.light, routerConfig: AppRouter.createRouter(authService), debugShowCheckedModeBanner: false, ); diff --git a/frontend/lib/presentation/admin/cubit/admin_dashboard_cubit.dart b/frontend/lib/presentation/admin/cubit/admin_dashboard_cubit.dart new file mode 100644 index 0000000..9509f45 --- /dev/null +++ b/frontend/lib/presentation/admin/cubit/admin_dashboard_cubit.dart @@ -0,0 +1,198 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/admin_model.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/core/models/models.dart'; + +class AdminDashboardCubit extends Cubit { + final AdminRepository _adminRepository; + + AdminDashboardCubit(this._adminRepository) : super(AdminDashboardInitial()); + + Future loadDashboard() async { + try { + emit(AdminDashboardLoading()); + + final results = await Future.wait([ + _adminRepository.getPendingOrganizers(), + _adminRepository.getAllUsers(limit: 100), + _adminRepository.getBannedUsers(), + _adminRepository.getPendingEvents(), + _adminRepository.getUnverifiedUsers(limit: 100), + ]); + + emit(AdminDashboardLoaded( + pendingOrganizers: results[0] as List, + allUsers: results[1] as List, + bannedUsers: results[2] as List, + pendingEvents: results[3] as List, + unverifiedUsers: results[4] as List, + )); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + } catch (e) { + emit(AdminDashboardError('An unexpected error occurred: $e')); + } + } + + /// Load users with backend filtering and pagination + Future> loadUsers({ + int page = 1, + int limit = 20, + String? search, + String? userType, + bool? isActive, + bool? isVerified, + }) async { + try { + return await _adminRepository.getAllUsers( + page: page, + limit: limit, + search: search, + userType: userType, + isActive: isActive, + isVerified: isVerified, + ); + } on ApiException catch (e) { + throw Exception(e.message); + } catch (e) { + throw Exception('An unexpected error occurred: $e'); + } + } + + Future verifyOrganizer(int organizerId, bool approve) async { + try { + await _adminRepository.verifyOrganizer(organizerId, approve); + await loadDashboard(); // Refresh data + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 2)); + await loadDashboard(); // Still refresh to show current state + } + } + + Future banUser(int userId) async { + if (state is AdminDashboardLoaded) { + emit(UserBanInProgress(userId)); + } + + try { + // Check if user can be banned + final canBan = await _adminRepository.canBanUser(userId); + if (!canBan) { + final user = await _adminRepository.getUserById(userId); + throw ApiException( + 'Cannot ban ${user.firstName} ${user.lastName}: Administrator accounts are protected from banning' + ); + } + + await _adminRepository.banUser(userId); + await loadDashboard(); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 3)); + await loadDashboard(); + } catch (e) { + emit(AdminDashboardError('Failed to ban user: $e')); + await Future.delayed(const Duration(seconds: 3)); + await loadDashboard(); + } + } + + Future unbanUser(int userId) async { + if (state is AdminDashboardLoaded) { + emit(UserUnbanInProgress(userId)); + } + + try { + await _adminRepository.unbanUser(userId); + await loadDashboard(); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 2)); + await loadDashboard(); + } + } + + Future authorizeEvent(int eventId) async { + if (state is AdminDashboardLoaded) { + emit(EventAuthorizationInProgress(eventId)); + } + + try { + await _adminRepository.authorizeEvent(eventId); + await loadDashboard(); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 2)); + await loadDashboard(); + } + } + + Future rejectEvent(int eventId) async { + if (state is AdminDashboardLoaded) { + emit(EventAuthorizationInProgress(eventId)); + } + + try { + await _adminRepository.rejectEvent(eventId); + await loadDashboard(); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 2)); + await loadDashboard(); + } + } + + Future registerAdmin(Map adminData) async { + try { + emit(AdminDashboardLoading()); + await _adminRepository.registerAdmin(adminData); + await loadDashboard(); + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + } + } + + /// Get admin statistics + Future getAdminStats() async { + try { + return await _adminRepository.getAdminStats(); + } catch (e) { + // Fallback calculation from loaded data + if (state is AdminDashboardLoaded) { + final loadedState = state as AdminDashboardLoaded; + return AdminStats( + totalUsers: loadedState.allUsers.length, + activeUsers: loadedState.allUsers.where((u) => u.isActive).length, + bannedUsers: loadedState.bannedUsers.length, + totalCustomers: loadedState.allUsers.where((u) => u.userType == 'customer').length, + totalOrganizers: loadedState.allUsers.where((u) => u.userType == 'organizer').length, + totalAdmins: loadedState.allUsers.where((u) => u.userType == 'administrator').length, + verifiedOrganizers: loadedState.pendingOrganizers.where((o) => o.isVerified).length, + pendingOrganizers: loadedState.pendingOrganizers.length, + pendingEvents: loadedState.pendingEvents.length, + totalEvents: 0, // This would need to come from another source + ); + } + throw Exception('Failed to get admin stats: $e'); + } + } + + + Future approveUser(int userId) async { + if (state is AdminDashboardLoaded) { + emit(UserApprovalInProgress(userId)); + } + + try { + await _adminRepository.approveUser(userId); + await loadDashboard(); // Refresh data + } on ApiException catch (e) { + emit(AdminDashboardError(e.message)); + await Future.delayed(const Duration(seconds: 2)); + await loadDashboard(); + } + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/cubit/admin_dashboard_state.dart b/frontend/lib/presentation/admin/cubit/admin_dashboard_state.dart new file mode 100644 index 0000000..b473d0d --- /dev/null +++ b/frontend/lib/presentation/admin/cubit/admin_dashboard_state.dart @@ -0,0 +1,85 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +abstract class AdminDashboardState extends Equatable { + const AdminDashboardState(); + + @override + List get props => []; +} + +class AdminDashboardInitial extends AdminDashboardState {} + +class AdminDashboardLoading extends AdminDashboardState {} + +class AdminDashboardLoaded extends AdminDashboardState { + final List pendingOrganizers; + final List allUsers; + final List bannedUsers; + final List pendingEvents; + final List unverifiedUsers; + + const AdminDashboardLoaded({ + required this.pendingOrganizers, + required this.allUsers, + required this.bannedUsers, + required this.pendingEvents, + required this.unverifiedUsers, + }); + + @override + List get props => [ + pendingOrganizers, + allUsers, + bannedUsers, + pendingEvents, + unverifiedUsers, + ]; +} + +class AdminDashboardError extends AdminDashboardState { + final String message; + + const AdminDashboardError(this.message); + + @override + List get props => [message]; +} + +// Specific states for user management +class UserManagementLoading extends AdminDashboardState {} + +class UserBanInProgress extends AdminDashboardState { + final int userId; + + const UserBanInProgress(this.userId); + + @override + List get props => [userId]; +} + +class UserUnbanInProgress extends AdminDashboardState { + final int userId; + + const UserUnbanInProgress(this.userId); + + @override + List get props => [userId]; +} + +// Event authorization states +class EventAuthorizationInProgress extends AdminDashboardState { + final int eventId; + + const EventAuthorizationInProgress(this.eventId); + + @override + List get props => [eventId]; +} + +class UserApprovalInProgress extends AdminDashboardState { + final int userId; + const UserApprovalInProgress(this.userId); + @override + List get props => [userId]; +} diff --git a/frontend/lib/presentation/admin/pages/admin_dashboard_page.dart b/frontend/lib/presentation/admin/pages/admin_dashboard_page.dart new file mode 100644 index 0000000..d87a294 --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_dashboard_page.dart @@ -0,0 +1,663 @@ +// Enhanced admin_dashboard_page.dart with better logout functionality + +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/core/utils/responsive_layout.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/pages/admin_users_page.dart'; +import 'package:resellio/presentation/admin/pages/admin_organizers_page.dart'; +import 'package:resellio/presentation/admin/pages/admin_events_page.dart'; +import 'package:resellio/presentation/admin/pages/admin_registration_page.dart'; +import 'package:resellio/presentation/admin/pages/admin_overview_page.dart'; +import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/admin/pages/admin_verification_page.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; + +class AdminMainPage extends StatefulWidget { + final String? initialTab; + + const AdminMainPage({super.key, this.initialTab}); + + @override + State createState() => _AdminMainPageState(); +} + +class _AdminMainPageState extends State { + late String _selectedTab; + + final List _tabs = [ + AdminTab( + id: 'overview', + title: 'Overview', + icon: Icons.dashboard_outlined, + selectedIcon: Icons.dashboard, + route: '/admin', + ), + AdminTab( + id: 'users', + title: 'Users', + icon: Icons.people_outline, + selectedIcon: Icons.people, + route: '/admin/users', + ), + AdminTab( + id: 'organizers', + title: 'Organizers', + icon: Icons.verified_user_outlined, + selectedIcon: Icons.verified_user, + route: '/admin/organizers', + ), + AdminTab( + id: 'verification', + title: 'Verification', + icon: Icons.mark_email_read_outlined, + selectedIcon: Icons.mark_email_read, + route: '/admin/verification', + ), + AdminTab( + id: 'events', + title: 'Events', + icon: Icons.event_outlined, + selectedIcon: Icons.event, + route: '/admin/events', + ), + AdminTab( + id: 'add-admin', + title: 'Add Admin', + icon: Icons.admin_panel_settings_outlined, + selectedIcon: Icons.admin_panel_settings, + route: '/admin/add-admin', + ), + ]; + + @override + void initState() { + super.initState(); + _selectedTab = widget.initialTab ?? 'overview'; + } + + void _onTabChanged(String tabId) { + setState(() { + _selectedTab = tabId; + }); + + final tab = _tabs.firstWhere((t) => t.id == tabId); + if (context.mounted) { + context.go(tab.route); + } + } + + // Enhanced logout function with confirmation + void _showLogoutDialog() async { + final confirmed = await showConfirmationDialog( + context: context, + title: 'Logout', + content: const Text('Are you sure you want to logout from the admin panel?'), + confirmText: 'Logout', + isDestructive: true, + ); + + if (confirmed == true && context.mounted) { + try { + await context.read().logout(); + // Navigation will be handled automatically by the router + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error during logout: $e'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); + } + } + } + + Widget _getSelectedPage() { + switch (_selectedTab) { + case 'overview': + return const AdminOverviewPage(); + case 'users': + return const AdminUsersPage(); + case 'organizers': + return const AdminOrganizersPage(); + case 'verification': + return const AdminVerificationPage(); + case 'events': + return const AdminEventsPage(); + case 'add-admin': + return const AdminRegistrationPage(); + default: + return const AdminOverviewPage(); + } + } + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => AdminDashboardCubit( + context.read(), + )..loadDashboard(), + child: _AdminMainView( + tabs: _tabs, + selectedTab: _selectedTab, + onTabChanged: _onTabChanged, + onLogout: _showLogoutDialog, + body: _getSelectedPage(), + ), + ); + } +} + +class _AdminMainView extends StatelessWidget { + final List tabs; + final String selectedTab; + final Function(String) onTabChanged; + final VoidCallback onLogout; + final Widget body; + + const _AdminMainView({ + required this.tabs, + required this.selectedTab, + required this.onTabChanged, + required this.onLogout, + required this.body, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final isMobile = ResponsiveLayout.isMobile(context); + final authService = context.watch(); + + return PageLayout( + title: 'Admin Panel', + showCartButton: false, + actions: [ + // Admin info and logout in the top bar + if (!isMobile) ...[ + Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + decoration: BoxDecoration( + color: colorScheme.primaryContainer.withOpacity(0.5), + borderRadius: BorderRadius.circular(20), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Icons.admin_panel_settings, + size: 16, + color: colorScheme.onPrimaryContainer, + ), + const SizedBox(width: 6), + Text( + authService.user?.name ?? 'Admin', + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + const SizedBox(width: 8), + ], + BlocBuilder( + builder: (context, state) { + return IconButton( + icon: const Icon(Icons.refresh), + tooltip: 'Refresh Data', + onPressed: state is AdminDashboardLoading + ? null + : () => context.read().loadDashboard(), + ); + }, + ), + // Logout button in top bar + IconButton( + icon: const Icon(Icons.logout), + tooltip: 'Logout', + onPressed: onLogout, + ), + ], + body: isMobile + ? Column( + children: [ + _buildMobileTabBar(theme, colorScheme), + // Mobile admin info bar + Container( + width: double.infinity, + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Row( + children: [ + Icon( + Icons.admin_panel_settings, + size: 16, + color: colorScheme.primary, + ), + const SizedBox(width: 8), + Text( + 'Admin: ${authService.user?.name ?? 'Unknown'}', + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + const Spacer(), + TextButton.icon( + onPressed: onLogout, + icon: Icon(Icons.logout, size: 16), + label: Text('Logout'), + style: TextButton.styleFrom( + foregroundColor: colorScheme.error, + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + ), + ), + ], + ), + ), + Expanded(child: body), + ], + ) + : Row( + children: [ + _buildSidebar(theme, colorScheme, authService), + Expanded(child: body), + ], + ), + ); + } + + Widget _buildMobileTabBar(ThemeData theme, ColorScheme colorScheme) { + return Container( + color: colorScheme.surface, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: tabs.map((tab) { + final isSelected = tab.id == selectedTab; + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 4.0), + child: ChoiceChip( + label: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + isSelected ? tab.selectedIcon : tab.icon, + size: 16, + ), + const SizedBox(width: 8), + Text(tab.title), + ], + ), + selected: isSelected, + onSelected: (_) => onTabChanged(tab.id), + backgroundColor: colorScheme.surfaceContainerHighest, + selectedColor: colorScheme.primaryContainer, + labelStyle: TextStyle( + color: isSelected + ? colorScheme.onPrimaryContainer + : colorScheme.onSurfaceVariant, + ), + ), + ); + }).toList(), + ), + ), + ); + } + + Widget _buildSidebar(ThemeData theme, ColorScheme colorScheme, AuthService authService) { + return Container( + width: 280, + decoration: BoxDecoration( + color: colorScheme.surface, + border: Border( + right: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + ), + child: Column( + children: [ + // Header with admin info + Container( + padding: const EdgeInsets.all(20), + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + ), + child: Column( + children: [ + Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.admin_panel_settings, + color: colorScheme.onPrimaryContainer, + size: 24, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Admin Panel', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + Text( + 'System Management', + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ], + ), + const SizedBox(height: 12), + // Admin user info + Container( + width: double.infinity, + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.secondaryContainer.withOpacity(0.3), + borderRadius: BorderRadius.circular(8), + ), + child: Row( + children: [ + CircleAvatar( + radius: 16, + backgroundColor: colorScheme.secondary, + child: Icon( + Icons.person, + color: colorScheme.onSecondary, + size: 18, + ), + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + authService.user?.name ?? 'Admin User', + style: theme.textTheme.labelLarge?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + Text( + 'Administrator', + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + + // Navigation Items + Expanded( + child: ListView( + padding: const EdgeInsets.all(12), + children: tabs.map((tab) { + final isSelected = tab.id == selectedTab; + return _SidebarItem( + tab: tab, + isSelected: isSelected, + onTap: () => onTabChanged(tab.id), + theme: theme, + colorScheme: colorScheme, + ); + }).toList(), + ), + ), + + // Enhanced logout section + Container( + margin: const EdgeInsets.all(12), + child: Column( + children: [ + // Statistics Summary (existing) + BlocBuilder( + builder: (context, state) { + if (state is AdminDashboardLoaded) { + return _buildStatsSummary(state, theme, colorScheme); + } + return const SizedBox.shrink(); + }, + ), + const SizedBox(height: 12), + // Prominent logout button + SizedBox( + width: double.infinity, + child: OutlinedButton.icon( + onPressed: onLogout, + icon: const Icon(Icons.logout, size: 18), + label: const Text('Logout'), + style: OutlinedButton.styleFrom( + foregroundColor: colorScheme.error, + side: BorderSide(color: colorScheme.error.withOpacity(0.5)), + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + ], + ), + ), + ], + ), + ); + } + + Widget _buildStatsSummary( + AdminDashboardLoaded state, + ThemeData theme, + ColorScheme colorScheme, + ) { + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Quick Stats', + style: theme.textTheme.titleSmall?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 12), + _StatRow( + icon: Icons.people, + label: 'Total Users', + value: state.allUsers.length.toString(), + color: Colors.blue, + ), + _StatRow( + icon: Icons.pending_actions, + label: 'Pending Organizers', + value: state.pendingOrganizers.length.toString(), + color: Colors.orange, + ), + _StatRow( + icon: Icons.mark_email_read, + label: 'Unverified Users', + value: state.unverifiedUsers.length.toString(), + color: Colors.purple, + ), + _StatRow( + icon: Icons.event_note, + label: 'Pending Events', + value: state.pendingEvents.length.toString(), + color: Colors.purple, + ), + _StatRow( + icon: Icons.block, + label: 'Banned Users', + value: state.bannedUsers.length.toString(), + color: Colors.red, + ), + ], + ), + ); + } +} + +class _SidebarItem extends StatelessWidget { + final AdminTab tab; + final bool isSelected; + final VoidCallback onTap; + final ThemeData theme; + final ColorScheme colorScheme; + + const _SidebarItem({ + required this.tab, + required this.isSelected, + required this.onTap, + required this.theme, + required this.colorScheme, + }); + + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.only(bottom: 4), + child: Material( + color: Colors.transparent, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(12), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, + ), + decoration: BoxDecoration( + color: isSelected + ? colorScheme.primaryContainer + : Colors.transparent, + borderRadius: BorderRadius.circular(12), + ), + child: Row( + children: [ + Icon( + isSelected ? tab.selectedIcon : tab.icon, + size: 20, + color: isSelected + ? colorScheme.onPrimaryContainer + : colorScheme.onSurfaceVariant, + ), + const SizedBox(width: 12), + Text( + tab.title, + style: theme.textTheme.labelLarge?.copyWith( + color: isSelected + ? colorScheme.onPrimaryContainer + : colorScheme.onSurfaceVariant, + fontWeight: isSelected + ? FontWeight.w600 + : FontWeight.normal, + ), + ), + ], + ), + ), + ), + ), + ); + } +} + +class _StatRow extends StatelessWidget { + final IconData icon; + final String label; + final String value; + final Color color; + + const _StatRow({ + required this.icon, + required this.label, + required this.value, + required this.color, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + children: [ + Icon( + icon, + size: 16, + color: color, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + label, + style: theme.textTheme.bodySmall, + ), + ), + Text( + value, + style: theme.textTheme.labelMedium?.copyWith( + color: color, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ); + } +} + +class AdminTab { + final String id; + final String title; + final IconData icon; + final IconData selectedIcon; + final String route; + + AdminTab({ + required this.id, + required this.title, + required this.icon, + required this.selectedIcon, + required this.route, + }); +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/pages/admin_events_page.dart b/frontend/lib/presentation/admin/pages/admin_events_page.dart new file mode 100644 index 0000000..42f287f --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_events_page.dart @@ -0,0 +1,315 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/widgets/admin_card.dart'; +import 'package:resellio/presentation/admin/widgets/admin_section_header.dart'; +import 'package:resellio/presentation/admin/widgets/admin_action_buttons.dart'; +import 'package:resellio/presentation/admin/widgets/admin_status_chip.dart'; +import 'package:resellio/presentation/admin/widgets/admin_info_row.dart'; +import 'package:resellio/presentation/admin/widgets/admin_detail_dialog.dart'; +import 'package:resellio/presentation/admin/widgets/admin_stats_container.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/common_widgets/list_item_card.dart'; + +class AdminEventsPage extends StatelessWidget { + const AdminEventsPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadDashboard(), + builder: (loadedState) { + if (loadedState.pendingEvents.isEmpty) { + return const EmptyStateWidget( + icon: Icons.event_outlined, + message: 'No pending events', + details: 'All events have been reviewed and processed.', + ); + } + + return Column( + children: [ + AdminCard( + header: AdminSectionHeader( + icon: Icons.event_note, + title: 'Pending Event Authorizations', + subtitle: '${loadedState.pendingEvents.length} event(s) awaiting authorization', + ), + child: const SizedBox.shrink(), + ), + Expanded( + child: ListView.builder( + padding: const EdgeInsets.all(16.0), + itemCount: loadedState.pendingEvents.length, + itemBuilder: (context, index) { + final event = loadedState.pendingEvents[index]; + final isProcessing = state is EventAuthorizationInProgress && + state.eventId == event.id; + + return _EventCard( + event: event, + isProcessing: isProcessing, + onViewDetails: () => _showEventDetails(context, event), + onAuthorize: () => _showAuthorizationConfirmation(context, event, true), + onReject: () => _showAuthorizationConfirmation(context, event, false), + ); + }, + ), + ), + ], + ); + }, + ); + }, + ); + } + + void _showEventDetails(BuildContext context, Event event) { + final DateFormat dateFormat = DateFormat('EEEE, MMMM d, yyyy'); + final DateFormat timeFormat = DateFormat('h:mm a'); + + showDialog( + context: context, + builder: (context) => AdminDetailDialog( + icon: Icons.event, + title: event.name, + subtitle: 'Event Details', + sections: [ + AdminDetailSection( + title: 'Event Information', + rows: [ + AdminDetailRow(label: 'Event Name', value: event.name), + AdminDetailRow(label: 'Description', value: event.description ?? 'No description'), + AdminDetailRow(label: 'Status', value: event.status.toUpperCase()), + AdminDetailRow(label: 'Event ID', value: event.id.toString()), + ], + ), + AdminDetailSection( + title: 'Date & Time', + rows: [ + AdminDetailRow(label: 'Date', value: dateFormat.format(event.start)), + AdminDetailRow( + label: 'Time', + value: '${timeFormat.format(event.start)} - ${timeFormat.format(event.end)}', + ), + AdminDetailRow(label: 'Location', value: event.location), + ], + ), + AdminDetailSection( + title: 'Event Details', + rows: [ + AdminDetailRow(label: 'Organizer ID', value: event.organizerId.toString()), + AdminDetailRow(label: 'Total Tickets', value: event.totalTickets.toString()), + if (event.minimumAge != null) + AdminDetailRow(label: 'Minimum Age', value: '${event.minimumAge} years'), + if (event.category.isNotEmpty) + AdminDetailRow(label: 'Categories', value: event.category.join(', ')), + ], + ), + ], + footer: _buildWarningFooter(), + ), + ); + } + + Widget _buildWarningFooter() { + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.orange.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.orange.withOpacity(0.3)), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon(Icons.warning_amber, color: Colors.orange, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + 'This event requires authorization before it can be published and made available for ticket sales.', + style: TextStyle( + color: Colors.orange.shade700, + fontSize: 12, + ), + ), + ), + ], + ), + ); + } + + void _showAuthorizationConfirmation( + BuildContext context, + Event event, + bool approve, + ) async { + final confirmed = await showConfirmationDialog( + context: context, + title: approve ? 'Authorize Event' : 'Reject Event', + content: Text( + approve + ? 'Are you sure you want to authorize "${event.name}"?\n\n' + 'This will make the event visible to customers and allow ticket sales.' + : 'Are you sure you want to reject "${event.name}"?\n\n' + 'This will prevent the event from being published.', + ), + confirmText: approve ? 'Authorize' : 'Reject', + isDestructive: !approve, + ); + + if (confirmed == true && context.mounted) { + try { + if (approve) { + await context.read().authorizeEvent(event.id); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Event "${event.name}" has been authorized'), + backgroundColor: Colors.green, + ), + ); + } else { + await context.read().rejectEvent(event.id); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Event "${event.name}" has been rejected'), + backgroundColor: Colors.orange, + ), + ); + } + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: ${e.toString()}'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); + } + } + } +} + +class _EventCard extends StatelessWidget { + final Event event; + final bool isProcessing; + final VoidCallback onViewDetails; + final VoidCallback onAuthorize; + final VoidCallback onReject; + + const _EventCard({ + required this.event, + required this.isProcessing, + required this.onViewDetails, + required this.onAuthorize, + required this.onReject, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final DateFormat timeFormat = DateFormat('h:mm a'); + + return ListItemCard( + isProcessing: isProcessing, + leadingWidget: Container( + width: 60, + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(12), + ), + padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4), + child: Column( + children: [ + Text( + DateFormat('MMM').format(event.start), + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.onPrimaryContainer, + ), + ), + Text( + DateFormat('d').format(event.start), + style: theme.textTheme.titleMedium?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + title: Text(event.name), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + AdminInfoRow( + icon: Icons.access_time, + text: '${timeFormat.format(event.start)} - ${timeFormat.format(event.end)}', + ), + const SizedBox(height: 2), + AdminInfoRow( + icon: Icons.location_on, + text: event.location, + ), + const SizedBox(height: 8), + Row( + children: [ + const AdminStatusChip(type: AdminStatusType.pending, customText: 'PENDING AUTHORIZATION'), + const SizedBox(width: 8), + if (event.category.isNotEmpty) + AdminStatusChip( + type: AdminStatusType.waiting, + customText: event.category.first.toUpperCase(), + ), + ], + ), + ], + ), + bottomContent: Column( + children: [ + AdminStatsContainer( + stats: [ + AdminStatItem( + icon: Icons.confirmation_number, + text: '${event.totalTickets} tickets', + ), + AdminStatItem( + icon: Icons.business, + text: 'Organizer ID: ${event.organizerId}', + ), + ], + ), + const SizedBox(height: 12), + AdminActionButtons( + isProcessing: isProcessing, + actions: [ + AdminAction.secondary( + label: 'View Details', + icon: Icons.info_outline, + onPressed: onViewDetails, + ), + AdminAction.destructive( + label: 'Reject', + icon: Icons.close, + onPressed: onReject, + ), + AdminAction.primary( + label: 'Authorize', + icon: Icons.check, + onPressed: onAuthorize, + ), + ], + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/pages/admin_organizers_page.dart b/frontend/lib/presentation/admin/pages/admin_organizers_page.dart new file mode 100644 index 0000000..47dc2d6 --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_organizers_page.dart @@ -0,0 +1,244 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/widgets/admin_card.dart'; +import 'package:resellio/presentation/admin/widgets/admin_section_header.dart'; +import 'package:resellio/presentation/admin/widgets/admin_action_buttons.dart'; +import 'package:resellio/presentation/admin/widgets/admin_status_chip.dart'; +import 'package:resellio/presentation/admin/widgets/admin_info_row.dart'; +import 'package:resellio/presentation/admin/widgets/admin_detail_dialog.dart'; +import 'package:resellio/presentation/admin/widgets/admin_stats_container.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/common_widgets/list_item_card.dart'; + +class AdminOrganizersPage extends StatelessWidget { + const AdminOrganizersPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadDashboard(), + builder: (loadedState) { + if (loadedState.pendingOrganizers.isEmpty) { + return const EmptyStateWidget( + icon: Icons.verified_user_outlined, + message: 'No pending organizers', + details: 'All organizer applications have been processed.', + ); + } + + return Column( + children: [ + AdminCard( + header: AdminSectionHeader( + icon: Icons.business, + title: 'Pending Organizer Verifications', + subtitle: '${loadedState.pendingOrganizers.length} organizer(s) awaiting verification', + ), + child: const SizedBox.shrink(), + ), + Expanded( + child: ListView.builder( + padding: const EdgeInsets.all(16.0), + itemCount: loadedState.pendingOrganizers.length, + itemBuilder: (context, index) { + final organizer = loadedState.pendingOrganizers[index]; + final isProcessing = state is AdminDashboardLoading; + + return _OrganizerCard( + organizer: organizer, + isProcessing: isProcessing, + onViewDetails: () => _showOrganizerDetails(context, organizer), + onApprove: () => _showVerificationConfirmation(context, organizer, true), + onReject: () => _showVerificationConfirmation(context, organizer, false), + ); + }, + ), + ), + ], + ); + }, + ); + }, + ); + } + + void _showOrganizerDetails(BuildContext context, PendingOrganizer organizer) { + showDialog( + context: context, + builder: (context) => AdminDetailDialog( + icon: Icons.business, + title: '${organizer.firstName} ${organizer.lastName}', + subtitle: 'Organizer Application', + sections: [ + AdminDetailSection( + title: 'Personal Information', + rows: [ + AdminDetailRow(label: 'First Name', value: organizer.firstName), + AdminDetailRow(label: 'Last Name', value: organizer.lastName), + AdminDetailRow(label: 'Email', value: organizer.email), + AdminDetailRow(label: 'User ID', value: organizer.userId.toString()), + ], + ), + AdminDetailSection( + title: 'Company Information', + rows: [ + AdminDetailRow(label: 'Company Name', value: organizer.companyName), + AdminDetailRow(label: 'Organizer ID', value: organizer.organizerId.toString()), + AdminDetailRow(label: 'Verification Status', value: organizer.isVerified ? 'Verified' : 'Pending'), + ], + ), + ], + footer: _buildInfoFooter(), + ), + ); + } + + Widget _buildInfoFooter() { + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.blue.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.blue.withOpacity(0.3)), + ), + child: Row( + children: [ + Icon(Icons.info, color: Colors.blue, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + 'Please review the organizer\'s information carefully before making a decision. Approved organizers will be able to create and manage events.', + style: TextStyle( + color: Colors.blue.shade700, + fontSize: 12, + ), + ), + ), + ], + ), + ); + } + + void _showVerificationConfirmation( + BuildContext context, + PendingOrganizer organizer, + bool approve, + ) async { + final confirmed = await showConfirmationDialog( + context: context, + title: approve ? 'Approve Organizer' : 'Reject Organizer', + content: Text( + approve + ? 'Are you sure you want to approve ${organizer.firstName} ${organizer.lastName} from ${organizer.companyName}?\n\n' + 'This will grant them organizer privileges and allow them to create events.' + : 'Are you sure you want to reject ${organizer.firstName} ${organizer.lastName} from ${organizer.companyName}?\n\n' + 'This will prevent them from accessing organizer features.', + ), + confirmText: approve ? 'Approve' : 'Reject', + isDestructive: !approve, + ); + + if (confirmed == true && context.mounted) { + context.read().verifyOrganizer(organizer.organizerId, approve); + } + } +} + +class _OrganizerCard extends StatelessWidget { + final PendingOrganizer organizer; + final bool isProcessing; + final VoidCallback onViewDetails; + final VoidCallback onApprove; + final VoidCallback onReject; + + const _OrganizerCard({ + required this.organizer, + required this.isProcessing, + required this.onViewDetails, + required this.onApprove, + required this.onReject, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return ListItemCard( + isProcessing: isProcessing, + leadingWidget: CircleAvatar( + backgroundColor: colorScheme.primaryContainer, + child: Text( + '${organizer.firstName[0]}${organizer.lastName[0]}', + style: theme.textTheme.titleMedium?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, + ), + ), + ), + title: Text('${organizer.firstName} ${organizer.lastName}'), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + AdminInfoRow( + icon: Icons.business, + text: organizer.companyName, + ), + const SizedBox(height: 2), + AdminInfoRow( + icon: Icons.email, + text: organizer.email, + ), + const SizedBox(height: 8), + const AdminStatusChip(type: AdminStatusType.pending, customText: 'PENDING VERIFICATION'), + ], + ), + bottomContent: Column( + children: [ + AdminStatsContainer( + stats: [ + AdminStatItem( + icon: Icons.badge, + text: 'User ID: ${organizer.userId}', + ), + AdminStatItem( + icon: Icons.business_center, + text: 'Org ID: ${organizer.organizerId}', + ), + ], + ), + const SizedBox(height: 12), + AdminActionButtons( + isProcessing: isProcessing, + actions: [ + AdminAction.secondary( + label: 'View Details', + icon: Icons.info_outline, + onPressed: onViewDetails, + ), + AdminAction.destructive( + label: 'Reject', + icon: Icons.close, + onPressed: onReject, + ), + AdminAction.primary( + label: 'Approve', + icon: Icons.check, + onPressed: onApprove, + ), + ], + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/pages/admin_overview_page.dart b/frontend/lib/presentation/admin/pages/admin_overview_page.dart new file mode 100644 index 0000000..8768570 --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_overview_page.dart @@ -0,0 +1,391 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/core/utils/responsive_layout.dart'; + +class AdminOverviewPage extends StatelessWidget { + const AdminOverviewPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadDashboard(), + builder: (loadedState) { + return SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildWelcomeCard(context), + const SizedBox(height: 24), + _buildStatsGrid(context, loadedState), + const SizedBox(height: 24), + _buildQuickActions(context), + ], + ), + ); + }, + ); + }, + ); + } + + Widget _buildWelcomeCard(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Card( + child: Container( + width: double.infinity, + padding: const EdgeInsets.all(24.0), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(16), + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer, + colorScheme.primaryContainer.withOpacity(0.7), + ], + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.admin_panel_settings, + size: 32, + color: colorScheme.onPrimaryContainer, + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Admin Dashboard', + style: theme.textTheme.headlineSmall?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, + ), + ), + Text( + 'Manage users, events, and system operations', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onPrimaryContainer.withOpacity(0.8), + ), + ), + ], + ), + ), + ], + ), + ], + ), + ), + ); + } + + Widget _buildStatsGrid(BuildContext context, AdminDashboardLoaded state) { + final isMobile = ResponsiveLayout.isMobile(context); + + final stats = [ + _StatCard( + title: 'Total Users', + value: state.allUsers.length.toString(), + icon: Icons.people, + color: Colors.blue, + subtitle: '${state.allUsers.where((u) => u.isActive).length} active', + onTap: () => context.go('/admin/users'), + ), + _StatCard( + title: 'Banned Users', + value: state.bannedUsers.length.toString(), + icon: Icons.block, + color: Colors.red, + subtitle: 'Require attention', + onTap: () => context.go('/admin/users'), + ), + _StatCard( + title: 'Pending Organizers', + value: state.pendingOrganizers.length.toString(), + icon: Icons.pending_actions, + color: Colors.orange, + subtitle: 'Awaiting verification', + onTap: () => context.go('/admin/organizers'), + ), + _StatCard( + title: 'Unverified Users', + value: state.unverifiedUsers.length.toString(), + icon: Icons.mark_email_read, + color: Colors.purple, + subtitle: 'Email not verified', + onTap: () => context.go('/admin/verification'), + ), + _StatCard( + title: 'Pending Events', + value: state.pendingEvents.length.toString(), + icon: Icons.event_note, + color: Colors.indigo, + subtitle: 'Awaiting approval', + onTap: () => context.go('/admin/events'), + ), + ]; + + return GridView.count( + crossAxisCount: isMobile ? 2 : 3, // Adjust to 3 columns for 5 items + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + crossAxisSpacing: 16, + mainAxisSpacing: 16, + childAspectRatio: isMobile ? 1.5 : 1.0, + children: stats.map((stat) => _buildStatCard(context, stat)).toList(), + ); + } + + Widget _buildStatCard(BuildContext context, _StatCard stat) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Card( + child: InkWell( + onTap: stat.onTap, + borderRadius: BorderRadius.circular(12), + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Header row + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: stat.color.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + stat.icon, + color: stat.color, + size: 24, + ), + ), + Icon( + Icons.arrow_forward_ios, + size: 14, + color: colorScheme.onSurfaceVariant, + ), + ], + ), + + // Spacer + const Spacer(), + + // Value and title + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + stat.value, + style: theme.textTheme.headlineMedium?.copyWith( + color: stat.color, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + stat.title, + style: theme.textTheme.titleSmall?.copyWith( + color: colorScheme.onSurface, + fontWeight: FontWeight.w600, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + if (stat.subtitle != null) ...[ + const SizedBox(height: 2), + Text( + stat.subtitle!, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + fontSize: 11, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ], + ), + ], + ), + ), + ), + ); + } + + Widget _buildQuickActions(BuildContext context) { + final theme = Theme.of(context); + + final actions = [ + _QuickAction( + title: 'Verify Organizers', + description: 'Review pending organizer applications', + icon: Icons.verified_user, + color: Colors.green, + onTap: () => context.go('/admin/organizers'), + ), + _QuickAction( + title: 'Verify Users', // Add new action + description: 'Approve users awaiting email verification', + icon: Icons.mark_email_read, + color: Colors.purple, + onTap: () => context.go('/admin/verification'), + ), + _QuickAction( + title: 'Manage Users', + description: 'View and manage user accounts', + icon: Icons.manage_accounts, + color: Colors.blue, + onTap: () => context.go('/admin/users'), + ), + _QuickAction( + title: 'Review Events', + description: 'Approve or reject pending events', + icon: Icons.event_available, + color: Colors.indigo, + onTap: () => context.go('/admin/events'), + ), + _QuickAction( + title: 'Add Admin', + description: 'Register new administrator', + icon: Icons.person_add, + color: Colors.orange, + onTap: () => context.go('/admin/add-admin'), + ), + ]; + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Quick Actions', + style: theme.textTheme.titleLarge, + ), + const SizedBox(height: 16), + GridView.count( + crossAxisCount: ResponsiveLayout.isMobile(context) ? 1 : 2, + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + crossAxisSpacing: 16, + mainAxisSpacing: 16, + childAspectRatio: ResponsiveLayout.isMobile(context) ? 4 : 3, + children: actions.map((action) => _buildQuickActionCard(context, action)).toList(), + ), + ], + ); + } + + + Widget _buildQuickActionCard(BuildContext context, _QuickAction action) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Card( + child: InkWell( + onTap: action.onTap, + borderRadius: BorderRadius.circular(16), + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: action.color.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + action.icon, + color: action.color, + size: 28, + ), + ), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + action.title, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 4), + Text( + action.description, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + Icon( + Icons.arrow_forward_ios, + size: 16, + color: colorScheme.onSurfaceVariant, + ), + ], + ), + ), + ), + ); + } +} + +class _StatCard { + final String title; + final String value; + final IconData icon; + final Color color; + final String? subtitle; + final VoidCallback? onTap; + + _StatCard({ + required this.title, + required this.value, + required this.icon, + required this.color, + this.subtitle, + this.onTap, + }); +} + +class _QuickAction { + final String title; + final String description; + final IconData icon; + final Color color; + final VoidCallback onTap; + + _QuickAction({ + required this.title, + required this.description, + required this.icon, + required this.color, + required this.onTap, + }); +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/pages/admin_registration_page.dart b/frontend/lib/presentation/admin/pages/admin_registration_page.dart new file mode 100644 index 0000000..6730373 --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_registration_page.dart @@ -0,0 +1,671 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/widgets/admin_card.dart'; +import 'package:resellio/presentation/admin/widgets/admin_section_header.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; +import 'package:resellio/presentation/common_widgets/primary_button.dart'; + +class AdminRegistrationPage extends StatefulWidget { + const AdminRegistrationPage({super.key}); + + @override + State createState() => _AdminRegistrationPageState(); +} + +class _AdminRegistrationPageState extends State { + final _formKey = GlobalKey(); + final _firstNameController = TextEditingController(); + final _lastNameController = TextEditingController(); + final _loginController = TextEditingController(); + final _emailController = TextEditingController(); + final _passwordController = TextEditingController(); + final _confirmPasswordController = TextEditingController(); + final _adminSecretController = TextEditingController(); + + bool _isLoading = false; + String? _errorMessage; + String? _successMessage; + + @override + void dispose() { + _firstNameController.dispose(); + _lastNameController.dispose(); + _loginController.dispose(); + _emailController.dispose(); + _passwordController.dispose(); + _confirmPasswordController.dispose(); + _adminSecretController.dispose(); + super.dispose(); + } + + Future _registerAdmin() async { + if (_formKey.currentState?.validate() ?? false) { + setState(() { + _isLoading = true; + _errorMessage = null; + _successMessage = null; + }); + + final adminData = { + 'first_name': _firstNameController.text.trim(), + 'last_name': _lastNameController.text.trim(), + 'login': _loginController.text.trim(), + 'email': _emailController.text.trim(), + 'password': _passwordController.text, + 'admin_secret_key': _adminSecretController.text, + }; + + try { + await context.read().registerAdmin(adminData); + if (mounted) { + setState(() { + _isLoading = false; + _successMessage = 'Administrator account created successfully!'; + }); + _clearForm(); + } + } catch (e) { + if (mounted) { + setState(() { + _isLoading = false; + _errorMessage = e.toString(); + }); + } + } + } + } + + void _clearForm() { + _firstNameController.clear(); + _lastNameController.clear(); + _loginController.clear(); + _emailController.clear(); + _passwordController.clear(); + _confirmPasswordController.clear(); + _adminSecretController.clear(); + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return BlocListener( + listener: (context, state) { + if (state is AdminDashboardError) { + setState(() { + _isLoading = false; + _errorMessage = state.message; + _successMessage = null; + }); + } else if (state is AdminDashboardLoaded) { + setState(() { + _isLoading = false; + _errorMessage = null; + }); + } + }, + child: SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + _HeaderCard(), + const SizedBox(height: 24), + _SecurityNoticeCard(), + const SizedBox(height: 24), + _RegistrationFormCard( + formKey: _formKey, + firstNameController: _firstNameController, + lastNameController: _lastNameController, + loginController: _loginController, + emailController: _emailController, + passwordController: _passwordController, + confirmPasswordController: _confirmPasswordController, + adminSecretController: _adminSecretController, + isLoading: _isLoading, + errorMessage: _errorMessage, + successMessage: _successMessage, + onRegister: _registerAdmin, + onClear: _clearForm, + ), + const SizedBox(height: 24), + _PrivilegesInfoCard(), + ], + ), + ), + ); + } +} + +class _HeaderCard extends StatelessWidget { + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return AdminCard( + backgroundColor: colorScheme.primaryContainer, + child: AdminSectionHeader( + icon: Icons.admin_panel_settings, + title: 'Register New Administrator', + subtitle: 'Create a new admin account with full system privileges', + iconColor: colorScheme.onPrimaryContainer, + ), + ); + } +} + +class _SecurityNoticeCard extends StatelessWidget { + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return AdminCard( + backgroundColor: Colors.orange.withOpacity(0.1), + child: Row( + children: [ + Icon(Icons.warning, color: Colors.orange, size: 24), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Security Notice', + style: theme.textTheme.titleSmall?.copyWith( + color: Colors.orange.shade700, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + 'Administrator accounts have full system access. Only create accounts for trusted personnel.', + style: theme.textTheme.bodySmall?.copyWith( + color: Colors.orange.shade700, + ), + ), + ], + ), + ), + ], + ), + ); + } +} + +class _RegistrationFormCard extends StatelessWidget { + final GlobalKey formKey; + final TextEditingController firstNameController; + final TextEditingController lastNameController; + final TextEditingController loginController; + final TextEditingController emailController; + final TextEditingController passwordController; + final TextEditingController confirmPasswordController; + final TextEditingController adminSecretController; + final bool isLoading; + final String? errorMessage; + final String? successMessage; + final VoidCallback onRegister; + final VoidCallback onClear; + + const _RegistrationFormCard({ + required this.formKey, + required this.firstNameController, + required this.lastNameController, + required this.loginController, + required this.emailController, + required this.passwordController, + required this.confirmPasswordController, + required this.adminSecretController, + required this.isLoading, + required this.errorMessage, + required this.successMessage, + required this.onRegister, + required this.onClear, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return AdminCard( + header: Text( + 'Administrator Details', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + child: Form( + key: formKey, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _PersonalInfoSection( + firstNameController: firstNameController, + lastNameController: lastNameController, + ), + const SizedBox(height: 16), + _AccountInfoSection( + loginController: loginController, + emailController: emailController, + ), + const SizedBox(height: 16), + _PasswordSection( + passwordController: passwordController, + confirmPasswordController: confirmPasswordController, + ), + const SizedBox(height: 24), + _AdminSecretSection( + adminSecretController: adminSecretController, + ), + const SizedBox(height: 24), + _MessageSection( + successMessage: successMessage, + errorMessage: errorMessage, + ), + _ActionButtons( + isLoading: isLoading, + onRegister: onRegister, + onClear: onClear, + ), + ], + ), + ), + ); + } +} + +class _PersonalInfoSection extends StatelessWidget { + final TextEditingController firstNameController; + final TextEditingController lastNameController; + + const _PersonalInfoSection({ + required this.firstNameController, + required this.lastNameController, + }); + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: firstNameController, + labelText: 'First Name', + validator: (value) { + if (value == null || value.isEmpty) { + return 'First name is required'; + } + return null; + }, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: lastNameController, + labelText: 'Last Name', + validator: (value) { + if (value == null || value.isEmpty) { + return 'Last name is required'; + } + return null; + }, + ), + ), + ], + ); + } +} + +class _AccountInfoSection extends StatelessWidget { + final TextEditingController loginController; + final TextEditingController emailController; + + const _AccountInfoSection({ + required this.loginController, + required this.emailController, + }); + + @override + Widget build(BuildContext context) { + return Column( + children: [ + CustomTextFormField( + controller: loginController, + labelText: 'Username/Login', + validator: (value) { + if (value == null || value.isEmpty) { + return 'Username is required'; + } + if (value.length < 3) { + return 'Username must be at least 3 characters'; + } + return null; + }, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: emailController, + labelText: 'Email Address', + keyboardType: TextInputType.emailAddress, + validator: (value) { + if (value == null || value.isEmpty) { + return 'Email is required'; + } + if (!value.contains('@') || !value.contains('.')) { + return 'Please enter a valid email address'; + } + return null; + }, + ), + ], + ); + } +} + +class _PasswordSection extends StatelessWidget { + final TextEditingController passwordController; + final TextEditingController confirmPasswordController; + + const _PasswordSection({ + required this.passwordController, + required this.confirmPasswordController, + }); + + @override + Widget build(BuildContext context) { + return Column( + children: [ + CustomTextFormField( + controller: passwordController, + labelText: 'Password', + obscureText: true, + validator: (value) { + if (value == null || value.isEmpty) { + return 'Password is required'; + } + if (value.length < 8) { + return 'Password must be at least 8 characters'; + } + if (!value.contains(RegExp(r'[A-Z]'))) { + return 'Password must contain at least one uppercase letter'; + } + if (!value.contains(RegExp(r'[0-9]'))) { + return 'Password must contain at least one number'; + } + return null; + }, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: confirmPasswordController, + labelText: 'Confirm Password', + obscureText: true, + validator: (value) { + if (value == null || value.isEmpty) { + return 'Please confirm your password'; + } + if (value != passwordController.text) { + return 'Passwords do not match'; + } + return null; + }, + ), + ], + ); + } +} + +class _AdminSecretSection extends StatelessWidget { + final TextEditingController adminSecretController; + + const _AdminSecretSection({ + required this.adminSecretController, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.errorContainer.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.error.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.security, + color: colorScheme.error, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Admin Secret Key Required', + style: theme.textTheme.titleSmall?.copyWith( + color: colorScheme.error, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + const SizedBox(height: 8), + Text( + 'Enter the admin secret key to authorize creation of a new administrator account.', + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.error, + ), + ), + const SizedBox(height: 12), + CustomTextFormField( + controller: adminSecretController, + labelText: 'Admin Secret Key', + obscureText: true, + validator: (value) { + if (value == null || value.isEmpty) { + return 'Admin secret key is required'; + } + return null; + }, + ), + ], + ), + ); + } +} + +class _MessageSection extends StatelessWidget { + final String? successMessage; + final String? errorMessage; + + const _MessageSection({ + this.successMessage, + this.errorMessage, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return Column( + children: [ + if (successMessage != null) + Container( + padding: const EdgeInsets.all(12), + margin: const EdgeInsets.only(bottom: 16), + decoration: BoxDecoration( + color: Colors.green.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.green.withOpacity(0.3)), + ), + child: Row( + children: [ + Icon(Icons.check_circle, color: Colors.green, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + successMessage!, + style: theme.textTheme.bodySmall?.copyWith( + color: Colors.green.shade700, + ), + ), + ), + ], + ), + ), + if (errorMessage != null) + Container( + padding: const EdgeInsets.all(12), + margin: const EdgeInsets.only(bottom: 16), + decoration: BoxDecoration( + color: Colors.red.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.red.withOpacity(0.3)), + ), + child: Row( + children: [ + Icon(Icons.error, color: Colors.red, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + errorMessage!, + style: theme.textTheme.bodySmall?.copyWith( + color: Colors.red.shade700, + ), + ), + ), + ], + ), + ), + ], + ); + } +} + +class _ActionButtons extends StatelessWidget { + final bool isLoading; + final VoidCallback onRegister; + final VoidCallback onClear; + + const _ActionButtons({ + required this.isLoading, + required this.onRegister, + required this.onClear, + }); + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Expanded( + child: OutlinedButton( + onPressed: isLoading ? null : onClear, + child: const Text('Clear Form'), + ), + ), + const SizedBox(width: 16), + Expanded( + flex: 2, + child: PrimaryButton( + text: 'CREATE ADMINISTRATOR', + onPressed: isLoading ? null : onRegister, + isLoading: isLoading, + icon: Icons.admin_panel_settings, + ), + ), + ], + ); + } +} + +class _PrivilegesInfoCard extends StatelessWidget { + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return AdminCard( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.info_outline, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Administrator Privileges', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 12), + Text( + 'New administrators will have access to:', + style: theme.textTheme.bodyMedium, + ), + const SizedBox(height: 8), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _PrivilegeItem(text: 'User management and account controls'), + _PrivilegeItem(text: 'Organizer verification and approval'), + _PrivilegeItem(text: 'Event authorization and moderation'), + _PrivilegeItem(text: 'System administration features'), + _PrivilegeItem(text: 'Creating additional admin accounts'), + ], + ), + ], + ), + ); + } +} + +class _PrivilegeItem extends StatelessWidget { + final String text; + + const _PrivilegeItem({required this.text}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Padding( + padding: const EdgeInsets.symmetric(vertical: 2.0), + child: Row( + children: [ + Icon( + Icons.check, + color: colorScheme.primary, + size: 16, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + text, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/pages/admin_users_page.dart b/frontend/lib/presentation/admin/pages/admin_users_page.dart new file mode 100644 index 0000000..4c8d71d --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_users_page.dart @@ -0,0 +1,590 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/widgets/admin_card.dart'; +import 'package:resellio/presentation/admin/widgets/admin_section_header.dart'; +import 'package:resellio/presentation/admin/widgets/admin_action_buttons.dart'; +import 'package:resellio/presentation/admin/widgets/admin_status_chip.dart'; +import 'package:resellio/presentation/admin/widgets/admin_detail_dialog.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/common_widgets/list_item_card.dart'; + +enum UserFilter { + all, + active, + banned, + customers, + organizers, + admins, + verified, + unverified, +} + +class AdminUsersPage extends StatefulWidget { + const AdminUsersPage({super.key}); + + @override + State createState() => _AdminUsersPageState(); +} + +class _AdminUsersPageState extends State { + final TextEditingController _searchController = TextEditingController(); + int _currentPage = 1; + static const int _pageSize = 20; + String _searchQuery = ''; + UserFilter _selectedFilter = UserFilter.all; + List _users = []; + bool _isLoading = false; + bool _hasMore = true; + + @override + void initState() { + super.initState(); + _loadUsers(); + } + + @override + void dispose() { + _searchController.dispose(); + super.dispose(); + } + + Future _loadUsers({bool reset = false}) async { + if (_isLoading) return; + + if (reset) { + _currentPage = 1; + _users.clear(); + _hasMore = true; + } + + setState(() { + _isLoading = true; + }); + + try { + final adminCubit = context.read(); + String? userType; + bool? isActive; + bool? isVerified; + + switch (_selectedFilter) { + case UserFilter.active: + isActive = true; + break; + case UserFilter.banned: + isActive = false; + break; + case UserFilter.customers: + userType = 'customer'; + break; + case UserFilter.organizers: + userType = 'organizer'; + break; + case UserFilter.admins: + userType = 'administrator'; + break; + case UserFilter.verified: + userType = 'organizer'; + isVerified = true; + break; + case UserFilter.unverified: + userType = 'organizer'; + isVerified = false; + break; + case UserFilter.all: + default: + break; + } + + final newUsers = await adminCubit.loadUsers( + page: _currentPage, + limit: _pageSize, + search: _searchQuery.isEmpty ? null : _searchQuery, + userType: userType, + isActive: isActive, + isVerified: isVerified, + ); + + setState(() { + if (reset) { + _users = newUsers; + } else { + _users.addAll(newUsers); + } + _hasMore = newUsers.length == _pageSize; + _isLoading = false; + if (!reset) _currentPage++; + }); + } catch (e) { + setState(() { + _isLoading = false; + }); + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error loading users: $e'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); + } + } + } + + void _onSearchChanged(String value) { + setState(() { + _searchQuery = value; + }); + Future.delayed(const Duration(milliseconds: 300), () { + if (_searchQuery == value) { + _loadUsers(reset: true); + } + }); + } + + void _onFilterChanged(UserFilter filter) { + setState(() { + _selectedFilter = filter; + }); + _loadUsers(reset: true); + } + + @override + Widget build(BuildContext context) { + return Column( + children: [ + AdminCard( + header: AdminSectionHeader( + icon: Icons.people, + title: 'User Management', + subtitle: 'Manage all system users', + ), + child: Column( + children: [ + _SearchBar( + controller: _searchController, + searchQuery: _searchQuery, + onSearchChanged: _onSearchChanged, + ), + const SizedBox(height: 16), + _FilterChips( + selectedFilter: _selectedFilter, + onFilterChanged: _onFilterChanged, + ), + ], + ), + ), + Expanded( + child: _users.isEmpty && !_isLoading + ? EmptyStateWidget( + icon: Icons.people_outline, + message: _searchQuery.isNotEmpty ? 'No users found' : 'No users match the selected filter', + details: _searchQuery.isNotEmpty + ? 'Try adjusting your search terms' + : 'Try selecting a different filter', + ) + : ListView.builder( + padding: const EdgeInsets.all(16.0), + itemCount: _users.length + (_hasMore ? 1 : 0), + itemBuilder: (context, index) { + if (index == _users.length) { + if (_hasMore && !_isLoading) { + WidgetsBinding.instance.addPostFrameCallback((_) { + _loadUsers(); + }); + } + return _isLoading + ? const Padding( + padding: EdgeInsets.all(16.0), + child: Center(child: CircularProgressIndicator()), + ) + : const SizedBox.shrink(); + } + + final user = _users[index]; + return _UserCard( + user: user, + onViewDetails: () => _showUserDetails(context, user), + onBanToggle: () => _showBanConfirmation(context, user), + ); + }, + ), + ), + ], + ); + } + + void _showUserDetails(BuildContext context, UserDetails user) { + final isAdmin = _isAdminUser(user.userType); + + showDialog( + context: context, + builder: (context) => AdminDetailDialog( + icon: Icons.person, + title: '${user.firstName} ${user.lastName}', + subtitle: 'User Details', + sections: [ + AdminDetailSection( + title: 'User Information', + rows: [ + AdminDetailRow(label: 'Email', value: user.email), + AdminDetailRow(label: 'User Type', value: user.userType.toUpperCase()), + AdminDetailRow(label: 'Status', value: user.isActive ? 'Active' : 'Banned'), + AdminDetailRow(label: 'User ID', value: user.userId.toString()), + ], + ), + if (isAdmin) + AdminDetailSection( + title: 'Security Information', + rows: [ + AdminDetailRow(label: 'Protection Level', value: 'Protected Account'), + AdminDetailRow(label: 'Ban Status', value: 'Cannot be banned'), + AdminDetailRow(label: 'System Role', value: 'Administrator'), + ], + ), + ], + footer: isAdmin ? _buildAdminProtectionFooter() : null, + ), + ); + } + + Widget _buildAdminProtectionFooter() { + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.amber.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.amber.withOpacity(0.3)), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon(Icons.shield, color: Colors.amber.shade700, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + 'This is an administrator account with special protection. Admin accounts cannot be banned to maintain system security and prevent lockouts.', + style: TextStyle( + color: Colors.amber.shade700, + fontSize: 12, + ), + ), + ), + ], + ), + ); + } + + void _showBanConfirmation(BuildContext context, UserDetails user) async { + // Check if user is an admin + if (_isAdminUser(user.userType)) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Row( + children: [ + Icon(Icons.shield, color: Colors.white, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text('Administrator accounts cannot be banned for security reasons.'), + ), + ], + ), + backgroundColor: Colors.amber.shade700, + duration: const Duration(seconds: 4), + ), + ); + return; + } + + final confirmed = await showConfirmationDialog( + context: context, + title: user.isActive ? 'Ban User' : 'Unban User', + content: Text( + user.isActive + ? 'Are you sure you want to ban ${user.firstName} ${user.lastName}?\n\n' + 'This will prevent them from accessing the platform.' + : 'Are you sure you want to unban ${user.firstName} ${user.lastName}?\n\n' + 'This will restore their access to the platform.', + ), + confirmText: user.isActive ? 'Ban User' : 'Unban User', + isDestructive: user.isActive, + ); + + if (confirmed == true && mounted) { + try { + final adminCubit = context.read(); + if (user.isActive) { + await adminCubit.banUser(user.userId); + } else { + await adminCubit.unbanUser(user.userId); + } + + setState(() { + final index = _users.indexWhere((u) => u.userId == user.userId); + if (index != -1) { + _users[index] = UserDetails( + userId: user.userId, + email: user.email, + firstName: user.firstName, + lastName: user.lastName, + userType: user.userType, + isActive: !user.isActive, + ); + } + }); + + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(user.isActive ? 'User banned successfully' : 'User unbanned successfully'), + backgroundColor: Colors.green, + ), + ); + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: $e'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); + } + } + } + + bool _isAdminUser(String userType) { + return userType.toLowerCase() == 'administrator' || userType.toLowerCase() == 'admin'; + } + + String _getFilterLabel(UserFilter filter) { + switch (filter) { + case UserFilter.all: + return 'All Users'; + case UserFilter.active: + return 'Active'; + case UserFilter.banned: + return 'Banned'; + case UserFilter.customers: + return 'Customers'; + case UserFilter.organizers: + return 'Organizers'; + case UserFilter.admins: + return 'Admins'; + case UserFilter.verified: + return 'Verified'; + case UserFilter.unverified: + return 'Unverified'; + } + } +} + +class _SearchBar extends StatelessWidget { + final TextEditingController controller; + final String searchQuery; + final ValueChanged onSearchChanged; + + const _SearchBar({ + required this.controller, + required this.searchQuery, + required this.onSearchChanged, + }); + + @override + Widget build(BuildContext context) { + return TextField( + controller: controller, + decoration: InputDecoration( + hintText: 'Search users by name or email...', + prefixIcon: const Icon(Icons.search), + suffixIcon: searchQuery.isNotEmpty + ? IconButton( + icon: const Icon(Icons.clear), + onPressed: () { + controller.clear(); + onSearchChanged(''); + }, + ) + : null, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + ), + ), + onChanged: onSearchChanged, + ); + } +} + +class _FilterChips extends StatelessWidget { + final UserFilter selectedFilter; + final ValueChanged onFilterChanged; + + const _FilterChips({ + required this.selectedFilter, + required this.onFilterChanged, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: UserFilter.values.map((filter) { + final isSelected = filter == selectedFilter; + return Padding( + padding: const EdgeInsets.only(right: 8.0), + child: FilterChip( + label: Text(_getFilterLabel(filter)), + selected: isSelected, + onSelected: (selected) => onFilterChanged(filter), + backgroundColor: colorScheme.surfaceContainerHighest, + selectedColor: colorScheme.primaryContainer, + labelStyle: TextStyle( + color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant, + ), + ), + ); + }).toList(), + ), + ); + } + + String _getFilterLabel(UserFilter filter) { + switch (filter) { + case UserFilter.all: + return 'All Users'; + case UserFilter.active: + return 'Active'; + case UserFilter.banned: + return 'Banned'; + case UserFilter.customers: + return 'Customers'; + case UserFilter.organizers: + return 'Organizers'; + case UserFilter.admins: + return 'Admins'; + case UserFilter.verified: + return 'Verified'; + case UserFilter.unverified: + return 'Unverified'; + } + } +} + +class _UserCard extends StatelessWidget { + final UserDetails user; + final VoidCallback onViewDetails; + final VoidCallback onBanToggle; + + const _UserCard({ + required this.user, + required this.onViewDetails, + required this.onBanToggle, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final userTypeColor = _getUserTypeColor(user.userType); + final isAdmin = _isAdminUser(user.userType); + final canBeBanned = !isAdmin && user.isActive; + final canBeUnbanned = !isAdmin && !user.isActive; + + return ListItemCard( + isDimmed: !user.isActive, + leadingWidget: CircleAvatar( + backgroundColor: userTypeColor.withOpacity(0.1), + child: Text( + '${user.firstName[0]}${user.lastName[0]}', + style: TextStyle( + color: userTypeColor, + fontWeight: FontWeight.bold, + ), + ), + ), + title: Text('${user.firstName} ${user.lastName}'), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + Text(user.email), + const SizedBox(height: 8), + Row( + children: [ + AdminStatusChip( + type: AdminStatusType.waiting, + customText: user.userType.toUpperCase(), + ), + const SizedBox(width: 8), + AdminStatusChip( + type: user.isActive ? AdminStatusType.active : AdminStatusType.banned, + ), + if (isAdmin) ...[ + const SizedBox(width: 8), + Container( + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2), + decoration: BoxDecoration( + color: Colors.amber.withOpacity(0.2), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.amber.withOpacity(0.5)), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.shield, size: 12, color: Colors.amber.shade700), + const SizedBox(width: 4), + Text( + 'PROTECTED', + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.amber.shade700, + fontWeight: FontWeight.bold, + fontSize: 10, + ), + ), + ], + ), + ), + ], + ], + ), + ], + ), + bottomContent: AdminActionButtons( + actions: [ + AdminAction.secondary( + label: 'Details', + icon: Icons.info_outline, + onPressed: onViewDetails, + ), + if (canBeBanned || canBeUnbanned) + AdminAction( + label: user.isActive ? 'Ban' : 'Unban', + icon: user.isActive ? Icons.block : Icons.check_circle, + onPressed: onBanToggle, + color: user.isActive ? Colors.red : Colors.green, + ), + ], + ), + ); + } + + bool _isAdminUser(String userType) { + return userType.toLowerCase() == 'administrator' || userType.toLowerCase() == 'admin'; + } + + Color _getUserTypeColor(String userType) { + switch (userType.toLowerCase()) { + case 'administrator': + case 'admin': + return Colors.purple; + case 'organizer': + return Colors.blue; + case 'customer': + default: + return Colors.green; + } + } +} diff --git a/frontend/lib/presentation/admin/pages/admin_verification_page.dart b/frontend/lib/presentation/admin/pages/admin_verification_page.dart new file mode 100644 index 0000000..98f95ae --- /dev/null +++ b/frontend/lib/presentation/admin/pages/admin_verification_page.dart @@ -0,0 +1,281 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_cubit.dart'; +import 'package:resellio/presentation/admin/cubit/admin_dashboard_state.dart'; +import 'package:resellio/presentation/admin/widgets/admin_card.dart'; +import 'package:resellio/presentation/admin/widgets/admin_section_header.dart'; +import 'package:resellio/presentation/admin/widgets/admin_action_buttons.dart'; +import 'package:resellio/presentation/admin/widgets/admin_status_chip.dart'; +import 'package:resellio/presentation/admin/widgets/admin_info_row.dart'; +import 'package:resellio/presentation/admin/widgets/admin_detail_dialog.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/common_widgets/list_item_card.dart'; + +class AdminVerificationPage extends StatelessWidget { + const AdminVerificationPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadDashboard(), + builder: (loadedState) { + if (loadedState.unverifiedUsers.isEmpty) { + return const EmptyStateWidget( + icon: Icons.verified_user_outlined, + message: 'No unverified users', + details: 'All users have been verified or activated.', + ); + } + + return Column( + children: [ + AdminCard( + header: AdminSectionHeader( + icon: Icons.verified_user, + title: 'User Email Verifications', + subtitle: '${loadedState.unverifiedUsers.length} user(s) awaiting email verification', + ), + child: const SizedBox.shrink(), + ), + Expanded( + child: ListView.builder( + padding: const EdgeInsets.all(16.0), + itemCount: loadedState.unverifiedUsers.length, + itemBuilder: (context, index) { + final user = loadedState.unverifiedUsers[index]; + final isProcessing = state is UserApprovalInProgress && + state.userId == user.userId; + + return _UnverifiedUserCard( + user: user, + isProcessing: isProcessing, + onViewDetails: () => _showUserDetails(context, user), + onApprove: () => _showApprovalConfirmation(context, user), + ); + }, + ), + ), + ], + ); + }, + ); + }, + ); + } + + void _showUserDetails(BuildContext context, UserDetails user) { + showDialog( + context: context, + builder: (context) => AdminDetailDialog( + icon: Icons.person, + title: '${user.firstName} ${user.lastName}', + subtitle: 'Unverified User Details', + sections: [ + AdminDetailSection( + title: 'User Information', + rows: [ + AdminDetailRow(label: 'First Name', value: user.firstName), + AdminDetailRow(label: 'Last Name', value: user.lastName), + AdminDetailRow(label: 'Email', value: user.email), + AdminDetailRow(label: 'User Type', value: user.userType.toUpperCase()), + AdminDetailRow(label: 'User ID', value: user.userId.toString()), + ], + ), + AdminDetailSection( + title: 'Account Status', + rows: [ + AdminDetailRow(label: 'Active Status', value: user.isActive ? 'Active' : 'Inactive'), + AdminDetailRow(label: 'Verification Status', value: 'Email Not Verified'), + AdminDetailRow(label: 'Registration Status', value: 'Pending Activation'), + ], + ), + ], + footer: _buildVerificationFooter(), + ), + ); + } + + Widget _buildVerificationFooter() { + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.blue.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.blue.withOpacity(0.3)), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon(Icons.info, color: Colors.blue, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + 'This user has not verified their email address. You can manually approve them to bypass email verification and activate their account.', + style: TextStyle( + color: Colors.blue.shade700, + fontSize: 12, + ), + ), + ), + ], + ), + ); + } + + void _showApprovalConfirmation( + BuildContext context, + UserDetails user, + ) async { + final confirmed = await showConfirmationDialog( + context: context, + title: 'Approve User Account', + content: Text( + 'Are you sure you want to manually approve ${user.firstName} ${user.lastName}?\n\n' + 'This will:\n' + '• Activate their account immediately\n' + '• Bypass email verification requirement\n' + '• Allow them to log in normally\n\n' + 'Email: ${user.email}', + ), + confirmText: 'Approve Account', + isDestructive: false, + ); + + if (confirmed == true && context.mounted) { + try { + await context.read().approveUser(user.userId); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('User ${user.firstName} ${user.lastName} has been approved'), + backgroundColor: Colors.green, + ), + ); + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: ${e.toString()}'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); + } + } + } +} + +class _UnverifiedUserCard extends StatelessWidget { + final UserDetails user; + final bool isProcessing; + final VoidCallback onViewDetails; + final VoidCallback onApprove; + + const _UnverifiedUserCard({ + required this.user, + required this.isProcessing, + required this.onViewDetails, + required this.onApprove, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final userTypeColor = _getUserTypeColor(user.userType); + + return ListItemCard( + isProcessing: isProcessing, + leadingWidget: CircleAvatar( + backgroundColor: userTypeColor.withOpacity(0.1), + child: Text( + '${user.firstName[0]}${user.lastName[0]}', + style: TextStyle( + color: userTypeColor, + fontWeight: FontWeight.bold, + ), + ), + ), + title: Text('${user.firstName} ${user.lastName}'), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + AdminInfoRow( + icon: Icons.email, + text: user.email, + ), + const SizedBox(height: 2), + AdminInfoRow( + icon: Icons.person, + text: user.userType.toUpperCase(), + ), + const SizedBox(height: 8), + Row( + children: [ + const AdminStatusChip( + type: AdminStatusType.pending, + customText: 'EMAIL NOT VERIFIED' + ), + const SizedBox(width: 8), + Container( + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2), + decoration: BoxDecoration( + color: Colors.orange.withOpacity(0.2), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.orange.withOpacity(0.5)), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.pending, size: 12, color: Colors.orange.shade700), + const SizedBox(width: 4), + Text( + 'AWAITING ACTIVATION', + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.orange.shade700, + fontWeight: FontWeight.bold, + fontSize: 10, + ), + ), + ], + ), + ), + ], + ), + ], + ), + bottomContent: AdminActionButtons( + isProcessing: isProcessing, + actions: [ + AdminAction.secondary( + label: 'View Details', + icon: Icons.info_outline, + onPressed: onViewDetails, + ), + AdminAction.primary( + label: 'Approve User', + icon: Icons.check_circle, + onPressed: onApprove, + ), + ], + ), + ); + } + + Color _getUserTypeColor(String userType) { + switch (userType.toLowerCase()) { + case 'administrator': + case 'admin': + return Colors.purple; + case 'organizer': + return Colors.blue; + case 'customer': + default: + return Colors.green; + } + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_action_buttons.dart b/frontend/lib/presentation/admin/widgets/admin_action_buttons.dart new file mode 100644 index 0000000..4e7dfab --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_action_buttons.dart @@ -0,0 +1,103 @@ +import 'package:flutter/material.dart'; + +class AdminActionButtons extends StatelessWidget { + final List actions; + final bool isProcessing; + + const AdminActionButtons({ + super.key, + required this.actions, + this.isProcessing = false, + }); + + @override + Widget build(BuildContext context) { + return OverflowBar( + alignment: MainAxisAlignment.end, + children: actions.map((action) { + if (action.isPrimary) { + return ElevatedButton.icon( + onPressed: isProcessing ? null : action.onPressed, + icon: Icon(action.icon, size: 18), + label: Text(action.label), + style: ElevatedButton.styleFrom( + backgroundColor: action.color, + foregroundColor: action.textColor ?? Colors.white, + ), + ); + } else { + return TextButton.icon( + onPressed: isProcessing ? null : action.onPressed, + icon: Icon(action.icon, size: 18), + label: Text(action.label), + style: TextButton.styleFrom( + foregroundColor: action.color, + ), + ); + } + }).toList(), + ); + } +} + +class AdminAction { + final String label; + final IconData icon; + final VoidCallback onPressed; + final Color? color; + final Color? textColor; + final bool isPrimary; + + const AdminAction({ + required this.label, + required this.icon, + required this.onPressed, + this.color, + this.textColor, + this.isPrimary = false, + }); + + factory AdminAction.primary({ + required String label, + required IconData icon, + required VoidCallback onPressed, + Color? color, + }) { + return AdminAction( + label: label, + icon: icon, + onPressed: onPressed, + color: color ?? Colors.green, + isPrimary: true, + ); + } + + factory AdminAction.secondary({ + required String label, + required IconData icon, + required VoidCallback onPressed, + Color? color, + }) { + return AdminAction( + label: label, + icon: icon, + onPressed: onPressed, + color: color, + isPrimary: false, + ); + } + + factory AdminAction.destructive({ + required String label, + required IconData icon, + required VoidCallback onPressed, + }) { + return AdminAction( + label: label, + icon: icon, + onPressed: onPressed, + color: Colors.red, + isPrimary: false, + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_card.dart b/frontend/lib/presentation/admin/widgets/admin_card.dart new file mode 100644 index 0000000..2543fe4 --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_card.dart @@ -0,0 +1,50 @@ +import 'package:flutter/material.dart'; + +class AdminCard extends StatelessWidget { + final Widget? header; + final Widget child; + final EdgeInsets padding; + final Color? backgroundColor; + + const AdminCard({ + super.key, + this.header, + required this.child, + this.padding = const EdgeInsets.all(16.0), + this.backgroundColor, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Card( + color: backgroundColor, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (header != null) ...[ + Container( + width: double.infinity, + padding: const EdgeInsets.all(16.0), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.3), + border: Border( + bottom: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + ), + child: header!, + ), + ], + Padding( + padding: padding, + child: child, + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_detail_dialog.dart b/frontend/lib/presentation/admin/widgets/admin_detail_dialog.dart new file mode 100644 index 0000000..8b358f3 --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_detail_dialog.dart @@ -0,0 +1,142 @@ +import 'package:flutter/material.dart'; + +class AdminDetailDialog extends StatelessWidget { + final IconData icon; + final String title; + final String subtitle; + final List sections; + final Widget? footer; + + const AdminDetailDialog({ + super.key, + required this.icon, + required this.title, + required this.subtitle, + required this.sections, + this.footer, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return AlertDialog( + title: Row( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + icon, + color: colorScheme.onPrimaryContainer, + size: 24, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, style: theme.textTheme.titleLarge), + Text( + subtitle, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ], + ), + content: SizedBox( + width: 500, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < sections.length; i++) ...[ + if (i > 0) const SizedBox(height: 16), + _buildSection(context, sections[i]), + ], + if (footer != null) ...[ + const SizedBox(height: 16), + footer!, + ], + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text('Close'), + ), + ], + ); + } + + Widget _buildSection(BuildContext context, AdminDetailSection section) { + final theme = Theme.of(context); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + section.title, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 8), + ...section.rows.map((row) => Padding( + padding: const EdgeInsets.symmetric(vertical: 2.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 120, + child: Text( + '${row.label}:', + style: const TextStyle(fontWeight: FontWeight.w500), + ), + ), + Expanded( + child: Text( + row.value, + softWrap: true, + overflow: TextOverflow.visible, + ), + ), + ], + ), + )), + ], + ); + } +} + +class AdminDetailSection { + final String title; + final List rows; + + AdminDetailSection({ + required this.title, + required this.rows, + }); +} + +class AdminDetailRow { + final String label; + final String value; + + AdminDetailRow({ + required this.label, + required this.value, + }); +} diff --git a/frontend/lib/presentation/admin/widgets/admin_info_row.dart b/frontend/lib/presentation/admin/widgets/admin_info_row.dart new file mode 100644 index 0000000..d042759 --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_info_row.dart @@ -0,0 +1,41 @@ +import 'package:flutter/material.dart'; + +class AdminInfoRow extends StatelessWidget { + final IconData icon; + final String text; + final Color? iconColor; + + const AdminInfoRow({ + super.key, + required this.icon, + required this.text, + this.iconColor, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + icon, + size: 16, + color: iconColor ?? colorScheme.primary, + ), + const SizedBox(width: 4), + Flexible( + child: Text( + text, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_section_header.dart b/frontend/lib/presentation/admin/widgets/admin_section_header.dart new file mode 100644 index 0000000..fb1fe2b --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_section_header.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; + +class AdminSectionHeader extends StatelessWidget { + final IconData icon; + final String title; + final String? subtitle; + final Color? iconColor; + + const AdminSectionHeader({ + super.key, + required this.icon, + required this.title, + this.subtitle, + this.iconColor, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return Row( + children: [ + Icon( + icon, + color: iconColor ?? theme.colorScheme.primary, + size: 24, + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + if (subtitle != null) ...[ + const SizedBox(height: 4), + Text( + subtitle!, + style: theme.textTheme.bodyMedium?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + ), + ), + ], + ], + ), + ), + ], + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_stats_container.dart b/frontend/lib/presentation/admin/widgets/admin_stats_container.dart new file mode 100644 index 0000000..94b61b6 --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_stats_container.dart @@ -0,0 +1,47 @@ +import 'package:flutter/material.dart'; + +import 'admin_info_row.dart'; + +class AdminStatsContainer extends StatelessWidget { + final List stats; + + const AdminStatsContainer({ + super.key, + required this.stats, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(8), + ), + child: Wrap( + spacing: 16, + runSpacing: 8, + children: stats.map((stat) => AdminInfoRow( + icon: stat.icon, + text: stat.text, + iconColor: stat.color, + )).toList(), + ), + ); + } +} + +class AdminStatItem { + final IconData icon; + final String text; + final Color? color; + + AdminStatItem({ + required this.icon, + required this.text, + this.color, + }); +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/admin_status_chip.dart b/frontend/lib/presentation/admin/widgets/admin_status_chip.dart new file mode 100644 index 0000000..042ec9d --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/admin_status_chip.dart @@ -0,0 +1,69 @@ +import 'package:flutter/material.dart'; + +enum AdminStatusType { + pending, + verified, + active, + banned, + approved, + rejected, + waiting, +} + +class AdminStatusChip extends StatelessWidget { + final AdminStatusType type; + final String? customText; + + const AdminStatusChip({ + super.key, + required this.type, + this.customText, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final config = _getStatusConfig(type); + + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), + decoration: BoxDecoration( + color: config.color.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + ), + child: Text( + customText ?? config.text, + style: theme.textTheme.labelSmall?.copyWith( + color: config.color, + fontWeight: FontWeight.bold, + ), + ), + ); + } + + _StatusConfig _getStatusConfig(AdminStatusType type) { + switch (type) { + case AdminStatusType.pending: + return _StatusConfig('PENDING', Colors.orange); + case AdminStatusType.verified: + return _StatusConfig('VERIFIED', Colors.green); + case AdminStatusType.active: + return _StatusConfig('ACTIVE', Colors.green); + case AdminStatusType.banned: + return _StatusConfig('BANNED', Colors.red); + case AdminStatusType.approved: + return _StatusConfig('APPROVED', Colors.green); + case AdminStatusType.rejected: + return _StatusConfig('REJECTED', Colors.red); + case AdminStatusType.waiting: + return _StatusConfig('WAITING', Colors.orange); + } + } +} + +class _StatusConfig { + final String text; + final Color color; + + _StatusConfig(this.text, this.color); +} \ No newline at end of file diff --git a/frontend/lib/presentation/admin/widgets/widgets.dart b/frontend/lib/presentation/admin/widgets/widgets.dart new file mode 100644 index 0000000..f5edd0c --- /dev/null +++ b/frontend/lib/presentation/admin/widgets/widgets.dart @@ -0,0 +1,7 @@ +export 'admin_action_buttons.dart'; +export 'admin_card.dart'; +export 'admin_detail_dialog.dart'; +export 'admin_info_row.dart'; +export 'admin_section_header.dart'; +export 'admin_stats_container.dart'; +export 'admin_status_chip.dart'; \ No newline at end of file diff --git a/frontend/lib/presentation/auth/pages/login_screen.dart b/frontend/lib/presentation/auth/pages/login_screen.dart index 5d6d8da..e5cb01d 100644 --- a/frontend/lib/presentation/auth/pages/login_screen.dart +++ b/frontend/lib/presentation/auth/pages/login_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; import 'package:resellio/presentation/common_widgets/primary_button.dart'; class LoginScreen extends StatefulWidget { @@ -34,9 +35,9 @@ class _LoginScreenState extends State { try { await context.read().login( - _emailController.text, - _passwordController.text, - ); + _emailController.text, + _passwordController.text, + ); // The router's redirect will handle navigation automatically on success. } catch (e) { setState(() { @@ -79,15 +80,13 @@ class _LoginScreenState extends State { const SizedBox(height: 8), Text( 'Log in to continue your journey.', - style: theme.textTheme.bodyMedium?.copyWith( - color: Colors.white70, - ), + style: theme.textTheme.bodyMedium, textAlign: TextAlign.center, ), const SizedBox(height: 40), - TextFormField( + CustomTextFormField( controller: _emailController, - decoration: const InputDecoration(labelText: 'Email'), + labelText: 'Email', keyboardType: TextInputType.emailAddress, validator: (value) { if (value == null || @@ -99,9 +98,9 @@ class _LoginScreenState extends State { }, ), const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _passwordController, - decoration: const InputDecoration(labelText: 'Password'), + labelText: 'Password', obscureText: true, validator: (value) { if (value == null || value.isEmpty) { diff --git a/frontend/lib/presentation/auth/pages/register_screen.dart b/frontend/lib/presentation/auth/pages/register_screen.dart index 61739f0..a3ecd04 100644 --- a/frontend/lib/presentation/auth/pages/register_screen.dart +++ b/frontend/lib/presentation/auth/pages/register_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; import 'package:resellio/presentation/common_widgets/primary_button.dart'; class RegisterScreen extends StatefulWidget { @@ -57,7 +58,32 @@ class _RegisterScreenState extends State { data['company_name'] = _companyNameController.text; await authService.registerOrganizer(data); } else { - await authService.registerCustomer(data); + final message = await authService.registerCustomer(data); + if (mounted) { + // Show a dialog with the success message + showDialog( + context: context, + barrierDismissible: false, // User must tap button to close + builder: (BuildContext dialogContext) { + return AlertDialog( + title: const Text('Registration Successful'), + content: Text(message), + actions: [ + TextButton( + child: const Text('OK'), + onPressed: () { + Navigator.of(dialogContext).pop(); // Close the dialog + // Navigate to login or welcome screen + if (context.mounted) { + context.go('/login'); + } + }, + ), + ], + ); + }, + ); + } } // On success, the router will redirect automatically } catch (e) { @@ -105,63 +131,52 @@ class _RegisterScreenState extends State { const SizedBox(height: 8), Text( 'Create an account to start buying and selling.', - style: theme.textTheme.bodyMedium?.copyWith( - color: Colors.white70, - ), + style: theme.textTheme.bodyMedium, textAlign: TextAlign.center, ), const SizedBox(height: 40), - TextFormField( + CustomTextFormField( controller: _firstNameController, - decoration: const InputDecoration(labelText: 'First Name'), + labelText: 'First Name', validator: (v) => v!.isEmpty ? 'First Name is required' : null, ), const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _lastNameController, - decoration: const InputDecoration(labelText: 'Last Name'), + labelText: 'Last Name', validator: (v) => v!.isEmpty ? 'Last Name is required' : null, ), const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _loginController, - decoration: const InputDecoration( - labelText: 'Username/Login', - ), + labelText: 'Username/Login', validator: (v) => v!.isEmpty ? 'Username is required' : null, ), const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _emailController, - decoration: const InputDecoration(labelText: 'Email'), + labelText: 'Email', keyboardType: TextInputType.emailAddress, - validator: - (v) => - v!.isEmpty || !v.contains('@') - ? 'Enter a valid email' - : null, + validator: (v) => v!.isEmpty || !v.contains('@') + ? 'Enter a valid email' + : null, ), const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _passwordController, - decoration: const InputDecoration(labelText: 'Password'), + labelText: 'Password', obscureText: true, - validator: - (v) => - v!.length < 8 - ? 'Password must be 8+ characters' - : null, + validator: (v) => + v!.length < 8 ? 'Password must be 8+ characters' : null, ), if (isOrganizer) ...[ const SizedBox(height: 16), - TextFormField( + CustomTextFormField( controller: _companyNameController, - decoration: const InputDecoration( - labelText: 'Company Name', - ), + labelText: 'Company Name', validator: (v) => v!.isEmpty ? 'Company Name is required' : null, ), diff --git a/frontend/lib/presentation/auth/widgets/app_branding.dart b/frontend/lib/presentation/auth/widgets/app_branding.dart index 74d5409..d6d1e2f 100644 --- a/frontend/lib/presentation/auth/widgets/app_branding.dart +++ b/frontend/lib/presentation/auth/widgets/app_branding.dart @@ -53,16 +53,13 @@ class AppBranding extends StatelessWidget { BuildContext context, { Alignment alignment = Alignment.center, }) { + final theme = Theme.of(context); return Align( alignment: alignment, child: Text( 'RESELLIO', - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - fontSize: 32, - fontWeight: FontWeight.w900, - letterSpacing: 2.0, - color: Theme.of(context).colorScheme.primary, - ), + style: theme.textTheme.displayMedium + ?.copyWith(color: theme.colorScheme.primary), ), ); } @@ -73,10 +70,7 @@ class AppBranding extends StatelessWidget { }) { return Text( 'The Ticket Marketplace', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Colors.white70, - letterSpacing: 0.5, - ), + style: Theme.of(context).textTheme.titleMedium, textAlign: alignment, ); } diff --git a/frontend/lib/presentation/cart/cubit/cart_cubit.dart b/frontend/lib/presentation/cart/cubit/cart_cubit.dart new file mode 100644 index 0000000..1b8df34 --- /dev/null +++ b/frontend/lib/presentation/cart/cubit/cart_cubit.dart @@ -0,0 +1,105 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/cart/cubit/cart_state.dart'; + +class CartCubit extends Cubit { + final CartRepository _cartRepository; + + CartCubit(this._cartRepository) : super(CartInitial()); + + Future _handleAction(Future Function() action) async { + try { + final currentState = state; + if (currentState is CartLoaded) { + emit(CartLoading(currentState.items)); + } else { + emit(const CartLoading([])); + } + + await action(); + await fetchCart(); + } on ApiException catch (e) { + // Only emit error state for cart actions, not for individual item actions + // For item actions, we'll let the calling method handle the error + await fetchCart(); // Always try to refresh cart after any action + rethrow; // Re-throw so the calling method can handle it + } catch (e) { + await fetchCart(); // Always try to refresh cart after any action + rethrow; // Re-throw so the calling method can handle it + } + } + + Future fetchCart() async { + try { + emit(CartLoading(state is CartLoaded ? (state as CartLoaded).items : [])); + final items = await _cartRepository.getCartItems(); + emit(CartLoaded(items)); + } on ApiException catch (e) { + emit(CartError(e.message)); + } catch (e) { + emit(CartError("An unexpected error occurred: $e")); + } + } + + Future addItem(int ticketTypeId, int quantity) async { + try { + final currentState = state; + if (currentState is CartLoaded) { + emit(CartLoading(currentState.items)); + } else { + emit(const CartLoading([])); + } + + await _cartRepository.addToCart(ticketTypeId, quantity); + await fetchCart(); // Refresh cart after successful addition + } on ApiException catch (e) { + // Restore previous state and rethrow for UI to handle + await fetchCart(); + rethrow; + } catch (e) { + // Restore previous state and rethrow for UI to handle + await fetchCart(); + rethrow; + } + } + + Future removeItem(int cartItemId) async { + await _handleAction(() => _cartRepository.removeFromCart(cartItemId)); + } + + Future checkout() async { + if (state is! CartLoaded) return false; + final loadedState = state as CartLoaded; + if (loadedState.items.isEmpty) { + emit(const CartError('Your cart is empty!')); + return false; + } + + try { + emit(CartLoading(loadedState.items)); + final success = await _cartRepository.checkout(); + if (success) { + emit(const CartLoaded([])); + return true; + } else { + emit(const CartError('Checkout failed. Please try again.')); + await fetchCart(); + return false; + } + } on ApiException catch (e) { + emit(CartError(e.message)); + await fetchCart(); + return false; + } catch (e) { + emit(CartError("An unexpected error occurred: $e")); + await fetchCart(); + return false; + } + } + + // Method to clear any error state and refresh cart + Future clearErrorAndRefresh() async { + await fetchCart(); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/cart/cubit/cart_state.dart b/frontend/lib/presentation/cart/cubit/cart_state.dart new file mode 100644 index 0000000..b19037a --- /dev/null +++ b/frontend/lib/presentation/cart/cubit/cart_state.dart @@ -0,0 +1,37 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +abstract class CartState extends Equatable { + const CartState(); + @override + List get props => []; +} + +class CartInitial extends CartState {} + +class CartLoading extends CartState { + // Can hold previous items to avoid UI flicker + final List previousItems; + const CartLoading(this.previousItems); + + @override + List get props => [previousItems]; +} + +class CartLoaded extends CartState { + final List items; + const CartLoaded(this.items); + + double get totalPrice => + items.fold(0.0, (sum, item) => sum + (item.quantity * item.price)); + + @override + List get props => [items, totalPrice]; +} + +class CartError extends CartState { + final String message; + const CartError(this.message); + @override + List get props => [message]; +} diff --git a/frontend/lib/presentation/cart/pages/cart_page.dart b/frontend/lib/presentation/cart/pages/cart_page.dart index ee1b7c6..9e6b0d5 100644 --- a/frontend/lib/presentation/cart/pages/cart_page.dart +++ b/frontend/lib/presentation/cart/pages/cart_page.dart @@ -1,163 +1,1024 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; -import 'package:provider/provider.dart'; -import 'package:resellio/core/services/cart_service.dart'; +import 'package:resellio/presentation/cart/cubit/cart_cubit.dart'; +import 'package:resellio/presentation/cart/cubit/cart_state.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; import 'package:resellio/presentation/common_widgets/primary_button.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/core/utils/responsive_layout.dart'; +import 'package:resellio/core/models/cart_model.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/models/models.dart'; class CartPage extends StatelessWidget { const CartPage({super.key}); @override Widget build(BuildContext context) { - final cartService = context.watch(); + return const _CartView(); + } +} + +class _CartView extends StatelessWidget { + const _CartView(); + + @override + Widget build(BuildContext context) { final theme = Theme.of(context); - final colorScheme = theme.colorScheme; final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); - return PageLayout( - title: 'Shopping Cart', - showBackButton: true, - body: - cartService.items.isEmpty - ? Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.shopping_cart_outlined, - size: 80, - color: colorScheme.onSurface.withOpacity(0.4), + return BlocListener( + listener: (context, state) { + if (state is CartError) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar(SnackBar( + content: Row( + children: [ + Icon(Icons.error_outline, color: Colors.white, size: 20), + const SizedBox(width: 8), + Expanded(child: Text('Cart Error: ${state.message}')), + TextButton( + onPressed: () { + ScaffoldMessenger.of(context).hideCurrentSnackBar(); + context.read().clearErrorAndRefresh(); + }, + child: Text( + 'Retry', + style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold), ), - const SizedBox(height: 20), - Text( - 'Your cart is empty', - style: theme.textTheme.headlineSmall, + ), + ], + ), + backgroundColor: theme.colorScheme.error, + behavior: SnackBarBehavior.floating, + duration: const Duration(seconds: 6), + )); + } + }, + child: BlocBuilder( + builder: (context, state) { + return PageLayout( + title: 'Shopping Cart', + showBackButton: true, + showCartButton: false, + body: BlocStateWrapper( + state: state, + onRetry: () => context.read().clearErrorAndRefresh(), + builder: (loadedState) { + if (loadedState.items.isEmpty) { + return const EmptyStateWidget( + icon: Icons.remove_shopping_cart_outlined, + message: 'Your cart is empty', + details: 'Find an event and add some tickets to get started!', + ); + } + + final isLoading = state is CartLoading; + + return Column( + children: [ + _CartHeader( + itemCount: loadedState.items.length, + totalPrice: loadedState.totalPrice, ), - const SizedBox(height: 8), - Text( - 'Find an event to start adding tickets!', - style: theme.textTheme.bodyLarge?.copyWith( - color: colorScheme.onSurface.withOpacity(0.6), + Expanded( + child: RefreshIndicator( + onRefresh: () => context.read().fetchCart(), + child: ListView.builder( + padding: const EdgeInsets.symmetric(horizontal: 16), + itemCount: loadedState.items.length, + itemBuilder: (context, index) { + final item = loadedState.items[index]; + return _CartItemCard( + item: item, + isLoading: isLoading, + onRemove: () => context + .read() + .removeItem(item.cartItemId), + ); + }, + ), ), ), - ], - ), - ) - : Column( - children: [ - Expanded( - child: ListView.builder( - padding: const EdgeInsets.only(top: 16), - itemCount: cartService.items.length, - itemBuilder: (context, index) { - final item = cartService.items[index]; - return Card( - margin: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 8, - ), - child: ListTile( - title: Text( - item.ticketType.description ?? 'Standard Ticket', - style: theme.textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - subtitle: Text( - '${item.quantity} x ${numberFormat.format(item.ticketType.price)}', - style: theme.textTheme.bodyMedium, - ), - trailing: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - numberFormat.format( - item.quantity * item.ticketType.price, - ), - style: theme.textTheme.titleMedium, - ), - IconButton( - icon: Icon( - Icons.delete_outline, - color: colorScheme.error, - ), - onPressed: () { - cartService.removeItem(item.ticketType); - }, - ), - ], - ), - ), - ); + _CheckoutSection( + loadedState: loadedState, + isLoading: isLoading, + onCheckout: () async { + final success = await context + .read() + .checkout(); + if (success && context.mounted) { + _showSuccessDialog(context); + } }, ), + ], + ); + }, + ), + ); + }, + ), + ); + } + + void _showSuccessDialog(BuildContext context) { + showDialog( + context: context, + barrierDismissible: false, + builder: (context) => AlertDialog( + icon: Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: Colors.green.withOpacity(0.1), + shape: BoxShape.circle, + ), + child: const Icon( + Icons.check_circle, + color: Colors.green, + size: 48, + ), + ), + title: const Text('Purchase Successful!'), + content: const Text( + 'Your tickets have been purchased successfully. You can view them in the "My Tickets" section.', + ), + actions: [ + TextButton( + onPressed: () { + Navigator.of(context).pop(); + context.go('/home/customer'); + }, + child: const Text('Continue'), + ), + ], + ), + ); + } +} + +class _CartHeader extends StatelessWidget { + final int itemCount; + final double totalPrice; + + const _CartHeader({ + required this.itemCount, + required this.totalPrice, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); + + return Container( + margin: const EdgeInsets.all(16), + padding: const EdgeInsets.all(20), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + colorScheme.primaryContainer, + colorScheme.primaryContainer.withOpacity(0.7), + ], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + ), + borderRadius: BorderRadius.circular(16), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.1), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + ), + child: Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.primary, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.shopping_cart, + color: colorScheme.onPrimary, + size: 24, + ), + ), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '$itemCount ${itemCount == 1 ? 'Item' : 'Items'} in Cart', + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, ), - // --- Checkout Summary --- + ), + const SizedBox(height: 4), + Text( + 'Total: ${numberFormat.format(totalPrice)}', + style: theme.textTheme.headlineSmall?.copyWith( + color: colorScheme.primary, + fontWeight: FontWeight.w900, + ), + ), + ], + ), + ), + ], + ), + ); + } +} + +class _CartItemCard extends StatefulWidget { + final CartItem item; + final bool isLoading; + final VoidCallback onRemove; + + const _CartItemCard({ + required this.item, + required this.isLoading, + required this.onRemove, + }); + + @override + State<_CartItemCard> createState() => _CartItemCardState(); +} + +class _CartItemCardState extends State<_CartItemCard> { + Event? _eventDetails; + bool _loadingEvent = false; + + @override + void initState() { + super.initState(); + if (widget.item.ticketType?.eventId != null) { + _loadEventDetails(); + } + } + + Future _loadEventDetails() async { + setState(() => _loadingEvent = true); + try { + final eventRepository = context.read(); + final events = await eventRepository.getEvents(); + final event = events.firstWhere( + (e) => e.id == widget.item.ticketType!.eventId, + orElse: () => Event( + id: widget.item.ticketType!.eventId, + organizerId: 0, + name: 'Event #${widget.item.ticketType!.eventId}', + start: DateTime.now(), + end: DateTime.now(), + location: 'Unknown Location', + status: 'unknown', + category: [], + totalTickets: 0, + ), + ); + setState(() { + _eventDetails = event; + _loadingEvent = false; + }); + } catch (e) { + setState(() => _loadingEvent = false); + } + } + + void _showEventDetails() { + if (_eventDetails == null) return; + + showDialog( + context: context, + builder: (context) => _EventDetailsDialog(event: _eventDetails!), + ); + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); + final itemTotal = widget.item.quantity * widget.item.price; + + final isResaleTicket = widget.item.ticketType == null; + final ticketName = widget.item.ticketType?.description ?? 'Resale Ticket'; + final eventName = _eventDetails?.name ?? 'Loading...'; + final eventDate = _eventDetails?.start; + + return Container( + margin: const EdgeInsets.only(bottom: 16), + child: Card( + elevation: 2, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + ), + child: Padding( + padding: const EdgeInsets.all(20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Header Row + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Ticket Icon Container( - padding: const EdgeInsets.all(24), + padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: colorScheme.surfaceContainerHighest, - borderRadius: const BorderRadius.vertical( - top: Radius.circular(20), - ), + color: isResaleTicket + ? Colors.orange.withOpacity(0.1) + : colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(12), + border: isResaleTicket + ? Border.all(color: Colors.orange.withOpacity(0.3)) + : null, + ), + child: Icon( + isResaleTicket + ? Icons.sell + : Icons.confirmation_number, + color: isResaleTicket + ? Colors.orange.shade700 + : colorScheme.primary, + size: 24, ), + ), + const SizedBox(width: 16), + + // Ticket Details + Expanded( child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ + // Ticket Type and Status Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('Subtotal', style: theme.textTheme.bodyLarge), - Text( - numberFormat.format(cartService.totalPrice), - style: theme.textTheme.bodyLarge, - ), - ], - ), - const SizedBox(height: 8), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text('Fees', style: theme.textTheme.bodyLarge), - Text( - numberFormat.format(0), - style: theme.textTheme.bodyLarge, - ), // Placeholder - ], - ), - const Divider(height: 32), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('Total', style: theme.textTheme.titleLarge), - Text( - numberFormat.format(cartService.totalPrice), - style: theme.textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, + Expanded( + child: Text( + ticketName, + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), ), ), - ], - ), - const SizedBox(height: 24), - PrimaryButton( - text: 'PROCEED TO CHECKOUT', - onPressed: () { - // TODO: Implement checkout logic - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text( - 'Checkout feature not yet implemented.', + if (isResaleTicket) + Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: Colors.orange.withOpacity(0.2), + borderRadius: BorderRadius.circular(12), + ), + child: Text( + 'RESALE', + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.orange.shade700, + fontWeight: FontWeight.bold, + ), ), - backgroundColor: Colors.blue, ), - ); - }, + ], ), + + const SizedBox(height: 8), + + // Event Information + if (!isResaleTicket) ...[ + _InfoRow( + icon: Icons.event, + label: 'Event', + value: _loadingEvent ? 'Loading...' : eventName, + isLoading: _loadingEvent, + ), + const SizedBox(height: 4), + if (eventDate != null) + _InfoRow( + icon: Icons.calendar_today, + label: 'Date', + value: DateFormat('MMM d, yyyy • h:mm a').format(eventDate), + ), + ], ], ), ), ], ), + + const SizedBox(height: 16), + + // Pricing Section + _PricingSection( + price: widget.item.price, + quantity: widget.item.quantity, + itemTotal: itemTotal, + ), + + const SizedBox(height: 16), + + // Action Buttons + Row( + children: [ + Expanded( + child: OutlinedButton.icon( + onPressed: widget.isLoading ? null : widget.onRemove, + icon: widget.isLoading + ? SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: colorScheme.error, + ), + ) + : Icon( + Icons.delete_outline, + size: 18, + color: colorScheme.error, + ), + label: Text( + 'Remove', + style: TextStyle(color: colorScheme.error), + ), + style: OutlinedButton.styleFrom( + side: BorderSide(color: colorScheme.error), + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + const SizedBox(width: 12), + Expanded( + flex: 2, + child: ElevatedButton.icon( + onPressed: _eventDetails != null ? _showEventDetails : null, + icon: const Icon(Icons.info_outline, size: 18), + label: const Text('Event Details'), + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.secondaryContainer, + foregroundColor: colorScheme.onSecondaryContainer, + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + ], + ), + ], + ), + ), + ), + ); + } +} + +class _InfoRow extends StatelessWidget { + final IconData icon; + final String label; + final String value; + final bool isLoading; + + const _InfoRow({ + required this.icon, + required this.label, + required this.value, + this.isLoading = false, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Row( + children: [ + Icon( + icon, + size: 16, + color: colorScheme.primary, + ), + const SizedBox(width: 6), + Text( + '$label: ', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + Expanded( + child: isLoading + ? SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: colorScheme.primary, + ), + ) + : Text( + value, + style: theme.textTheme.bodyMedium?.copyWith( + fontWeight: FontWeight.w500, + ), + ), + ), + ], + ); + } +} + +class _PricingSection extends StatelessWidget { + final double price; + final int quantity; + final double itemTotal; + + const _PricingSection({ + required this.price, + required this.quantity, + required this.itemTotal, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Column( + children: [ + // Individual Price + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Price per ticket', + style: theme.textTheme.bodyLarge, + ), + Text( + numberFormat.format(price), + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + + const SizedBox(height: 8), + + // Quantity + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Quantity', + style: theme.textTheme.bodyLarge, + ), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 6, + ), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(20), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Icons.confirmation_number, + size: 16, + color: colorScheme.onPrimaryContainer, + ), + const SizedBox(width: 6), + Text( + '$quantity', + style: theme.textTheme.titleMedium?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ], + ), + + const SizedBox(height: 12), + + // Divider + Divider(color: colorScheme.outlineVariant), + + const SizedBox(height: 8), + + // Subtotal + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Subtotal', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + Text( + numberFormat.format(itemTotal), + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.primary, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ], + ), + ); + } +} + +class _CheckoutSection extends StatelessWidget { + final CartLoaded loadedState; + final bool isLoading; + final VoidCallback onCheckout; + + const _CheckoutSection({ + required this.loadedState, + required this.isLoading, + required this.onCheckout, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); + + // Calculate totals + final subtotal = loadedState.totalPrice; + final tax = subtotal * 0.08; // 8% tax + final processingFee = subtotal * 0.025; // 2.5% processing fee + final total = subtotal + tax + processingFee; + + return Container( + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest, + borderRadius: const BorderRadius.vertical(top: Radius.circular(24)), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.1), + blurRadius: 8, + offset: const Offset(0, -2), + ), + ], + ), + child: Padding( + padding: EdgeInsets.fromLTRB( + 24, + 24, + 24, + 24 + MediaQuery.of(context).padding.bottom, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Order Summary Header + Row( + children: [ + Icon( + Icons.receipt_long, + color: colorScheme.primary, + ), + const SizedBox(width: 8), + Text( + 'Order Summary', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + + const SizedBox(height: 16), + + // Pricing Breakdown + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Column( + children: [ + _PricingRow( + label: 'Subtotal', + value: numberFormat.format(subtotal), + isSubtotal: true, + ), + const SizedBox(height: 8), + _PricingRow( + label: 'Tax (8%)', + value: numberFormat.format(tax), + ), + const SizedBox(height: 8), + _PricingRow( + label: 'Processing Fee (2.5%)', + value: numberFormat.format(processingFee), + ), + const SizedBox(height: 12), + Divider(color: colorScheme.outlineVariant), + const SizedBox(height: 12), + _PricingRow( + label: 'Total', + value: numberFormat.format(total), + isTotal: true, + ), + ], + ), + ), + + const SizedBox(height: 20), + + // Security Notice + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.green.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.green.withOpacity(0.3), + ), + ), + child: Row( + children: [ + Icon( + Icons.security, + color: Colors.green.shade700, + size: 20, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + 'Secure checkout with 256-bit SSL encryption', + style: theme.textTheme.bodySmall?.copyWith( + color: Colors.green.shade700, + ), + ), + ), + ], + ), + ), + + const SizedBox(height: 20), + + // Checkout Button + PrimaryButton( + text: 'PROCEED TO CHECKOUT', + isLoading: isLoading, + onPressed: onCheckout, + icon: Icons.payment, + height: 56, + ), + + const SizedBox(height: 12), + + // Additional Info + Text( + 'By proceeding, you agree to our Terms of Service and Privacy Policy. Your tickets will be available immediately after purchase.', + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + textAlign: TextAlign.center, + ), + ], + ), + ), ); } } + +class _PricingRow extends StatelessWidget { + final String label; + final String value; + final bool isSubtotal; + final bool isTotal; + + const _PricingRow({ + required this.label, + required this.value, + this.isSubtotal = false, + this.isTotal = false, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + label, + style: isTotal + ? theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + ) + : theme.textTheme.bodyLarge, + ), + Text( + value, + style: isTotal + ? theme.textTheme.titleLarge?.copyWith( + color: colorScheme.primary, + fontWeight: FontWeight.bold, + ) + : isSubtotal + ? theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ) + : theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ); + } +} + +class _EventDetailsDialog extends StatelessWidget { + final Event event; + + const _EventDetailsDialog({required this.event}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final DateFormat dateFormat = DateFormat('EEEE, MMMM d, yyyy'); + final DateFormat timeFormat = DateFormat('h:mm a'); + + return AlertDialog( + title: Row( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + Icons.event, + color: colorScheme.onPrimaryContainer, + size: 24, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(event.name, style: theme.textTheme.titleLarge), + Text( + 'Event Details', + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ], + ), + content: SizedBox( + width: 400, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + _DetailSection( + title: 'Event Information', + items: [ + _DetailItem(label: 'Event Name', value: event.name), + _DetailItem(label: 'Description', value: event.description ?? 'No description'), + _DetailItem(label: 'Status', value: event.status.toUpperCase()), + ], + ), + const SizedBox(height: 16), + _DetailSection( + title: 'Date & Time', + items: [ + _DetailItem(label: 'Date', value: dateFormat.format(event.start)), + _DetailItem( + label: 'Time', + value: '${timeFormat.format(event.start)} - ${timeFormat.format(event.end)}', + ), + _DetailItem(label: 'Location', value: event.location), + ], + ), + const SizedBox(height: 16), + _DetailSection( + title: 'Additional Details', + items: [ + _DetailItem(label: 'Total Tickets', value: event.totalTickets.toString()), + if (event.minimumAge != null) + _DetailItem(label: 'Minimum Age', value: '${event.minimumAge} years'), + if (event.category.isNotEmpty) + _DetailItem(label: 'Categories', value: event.category.join(', ')), + ], + ), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text('Close'), + ), + ], + ); + } +} + +class _DetailSection extends StatelessWidget { + final String title; + final List<_DetailItem> items; + + const _DetailSection({ + required this.title, + required this.items, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 8), + ...items.map((item) => Padding( + padding: const EdgeInsets.symmetric(vertical: 2.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 100, + child: Text( + '${item.label}:', + style: const TextStyle(fontWeight: FontWeight.w500), + ), + ), + Expanded( + child: Text( + item.value, + softWrap: true, + overflow: TextOverflow.visible, + ), + ), + ], + ), + )), + ], + ); + } +} + +class _DetailItem { + final String label; + final String value; + + _DetailItem({ + required this.label, + required this.value, + }); +} \ No newline at end of file diff --git a/frontend/lib/presentation/common_widgets/adaptive_navigation.dart b/frontend/lib/presentation/common_widgets/adaptive_navigation.dart index 7ccdee5..535fb9e 100644 --- a/frontend/lib/presentation/common_widgets/adaptive_navigation.dart +++ b/frontend/lib/presentation/common_widgets/adaptive_navigation.dart @@ -6,8 +6,10 @@ import 'package:resellio/presentation/events/pages/event_browse_page.dart'; import 'package:resellio/presentation/tickets/pages/my_tickets_page.dart'; import 'package:resellio/presentation/marketplace/pages/marketplace_page.dart'; import 'package:resellio/presentation/profile/pages/profile_page.dart'; - -enum UserRole { customer, organizer, admin } +import 'package:resellio/presentation/organizer/pages/organizer_dashboard_page.dart'; +import 'package:resellio/presentation/admin/pages/admin_dashboard_page.dart'; +import 'package:resellio/presentation/organizer/pages/organizer_events_page.dart'; +import 'package:resellio/core/models/user_model.dart'; class AdaptiveNavigation extends StatefulWidget { final UserRole userRole; @@ -26,6 +28,31 @@ class AdaptiveNavigation extends StatefulWidget { class _AdaptiveNavigationState extends State { int _selectedIndex = 0; + List _getScreens() { + switch (widget.userRole) { + case UserRole.customer: + return [ + const EventBrowsePage(), + const MyTicketsPage(), + const MarketplacePage(), + const ProfilePage(), + ]; + case UserRole.organizer: + return [ + const OrganizerDashboardPage(), + const OrganizerEventsPage(), + const ProfilePage(), + ]; + case UserRole.admin: + return [ + const AdminMainPage(), + const Center(child: Text('Direct User Management - Use Admin Panel instead')), + const Center(child: Text('Direct Organizer Management - Use Admin Panel instead')), + const ProfilePage(), + ]; + } + } + List _getBottomNavDestinations() { switch (widget.userRole) { case UserRole.customer: @@ -59,14 +86,9 @@ class _AdaptiveNavigationState extends State { label: 'Dashboard', ), NavigationDestination( - icon: Icon(Icons.add_circle_outline), - selectedIcon: Icon(Icons.add_circle), - label: 'Create', - ), - NavigationDestination( - icon: Icon(Icons.bar_chart_outlined), - selectedIcon: Icon(Icons.bar_chart), - label: 'Statistics', + icon: Icon(Icons.event_note_outlined), + selectedIcon: Icon(Icons.event_note), + label: 'My Events', ), NavigationDestination( icon: Icon(Icons.person_outline), @@ -77,9 +99,9 @@ class _AdaptiveNavigationState extends State { case UserRole.admin: return const [ NavigationDestination( - icon: Icon(Icons.dashboard_outlined), - selectedIcon: Icon(Icons.dashboard), - label: 'Dashboard', + icon: Icon(Icons.admin_panel_settings_outlined), + selectedIcon: Icon(Icons.admin_panel_settings), + label: 'Admin Panel', ), NavigationDestination( icon: Icon(Icons.people_outline), @@ -87,14 +109,14 @@ class _AdaptiveNavigationState extends State { label: 'Users', ), NavigationDestination( - icon: Icon(Icons.verified_outlined), - selectedIcon: Icon(Icons.verified), - label: 'Verify', + icon: Icon(Icons.verified_user_outlined), + selectedIcon: Icon(Icons.verified_user), + label: 'Organizers', ), NavigationDestination( - icon: Icon(Icons.admin_panel_settings_outlined), - selectedIcon: Icon(Icons.admin_panel_settings), - label: 'Admin', + icon: Icon(Icons.person_outline), + selectedIcon: Icon(Icons.person), + label: 'Profile', ), ]; } @@ -133,14 +155,9 @@ class _AdaptiveNavigationState extends State { label: Text('Dashboard'), ), NavigationRailDestination( - icon: Icon(Icons.add_circle_outline), - selectedIcon: Icon(Icons.add_circle), - label: Text('Create'), - ), - NavigationRailDestination( - icon: Icon(Icons.bar_chart_outlined), - selectedIcon: Icon(Icons.bar_chart), - label: Text('Statistics'), + icon: Icon(Icons.event_note_outlined), + selectedIcon: Icon(Icons.event_note), + label: Text('My Events'), ), NavigationRailDestination( icon: Icon(Icons.person_outline), @@ -151,9 +168,9 @@ class _AdaptiveNavigationState extends State { case UserRole.admin: return const [ NavigationRailDestination( - icon: Icon(Icons.dashboard_outlined), - selectedIcon: Icon(Icons.dashboard), - label: Text('Dashboard'), + icon: Icon(Icons.admin_panel_settings_outlined), + selectedIcon: Icon(Icons.admin_panel_settings), + label: Text('Admin Panel'), ), NavigationRailDestination( icon: Icon(Icons.people_outline), @@ -161,62 +178,28 @@ class _AdaptiveNavigationState extends State { label: Text('Users'), ), NavigationRailDestination( - icon: Icon(Icons.verified_outlined), - selectedIcon: Icon(Icons.verified), - label: Text('Verify'), + icon: Icon(Icons.verified_user_outlined), + selectedIcon: Icon(Icons.verified_user), + label: Text('Organizers'), ), NavigationRailDestination( - icon: Icon(Icons.admin_panel_settings_outlined), - selectedIcon: Icon(Icons.admin_panel_settings), - label: Text('Admin'), + icon: Icon(Icons.person_outline), + selectedIcon: Icon(Icons.person), + label: Text('Profile'), ), ]; } } - Widget _getSelectedScreen() { - List screens; - switch (widget.userRole) { - case UserRole.customer: - screens = [ - const EventBrowsePage(), - const MyTicketsPage(), - const MarketplacePage(), - const ProfilePage(), - ]; - break; - case UserRole.organizer: - screens = [ - const Center(child: Text('Dashboard Page (Organizer)')), - const Center(child: Text('Create Event Page (Organizer)')), - const Center(child: Text('Statistics Page (Organizer)')), - const Center(child: Text('Profile Page (Organizer)')), - ]; - break; - case UserRole.admin: - screens = [ - const Center(child: Text('Dashboard Page (Admin)')), - const Center(child: Text('User Management Page (Admin)')), - const Center(child: Text('Verification Page (Admin)')), - const Center(child: Text('Admin Settings Page (Admin)')), - ]; - break; - } - - if (_selectedIndex >= screens.length) { - return const Center(child: Text('Error: Invalid page index')); - } - return screens[_selectedIndex]; - } - @override Widget build(BuildContext context) { final theme = Theme.of(context); final colorScheme = theme.colorScheme; final bool showNavRail = ResponsiveLayout.isTablet(context) || - ResponsiveLayout.isDesktop(context); + ResponsiveLayout.isDesktop(context); final bool isExtended = ResponsiveLayout.isDesktop(context); + final screens = _getScreens(); if (showNavRail) { return Scaffold( @@ -244,42 +227,42 @@ class _AdaptiveNavigationState extends State { useIndicator: true, indicatorColor: colorScheme.primaryContainer, labelType: - isExtended - ? NavigationRailLabelType.none - : NavigationRailLabelType.all, + isExtended + ? NavigationRailLabelType.none + : NavigationRailLabelType.all, destinations: _getNavRailDestinations(), extended: isExtended, elevation: 2, leading: - isExtended - ? Padding( - padding: const EdgeInsets.symmetric( - vertical: 20.0, - horizontal: 8.0, - ), - child: AppBranding( - logoSize: 64, - alignment: Alignment.centerLeft, - textAlign: TextAlign.left, - ), - ) - : Column( - children: [ - const SizedBox(height: 20), - Container( - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: colorScheme.primaryContainer, - shape: BoxShape.circle, - ), - child: const AppBranding( - logoSize: 40, - showTitle: false, - showTagline: false, - ), - ), - ], - ), + isExtended + ? Padding( + padding: const EdgeInsets.symmetric( + vertical: 20.0, + horizontal: 8.0, + ), + child: AppBranding( + logoSize: 64, + alignment: Alignment.centerLeft, + textAlign: TextAlign.left, + ), + ) + : Column( + children: [ + const SizedBox(height: 20), + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + shape: BoxShape.circle, + ), + child: const AppBranding( + logoSize: 40, + showTitle: false, + showTagline: false, + ), + ), + ], + ), trailing: Expanded( child: Align( alignment: Alignment.bottomCenter, @@ -297,13 +280,21 @@ class _AdaptiveNavigationState extends State { width: 1, color: colorScheme.outlineVariant.withOpacity(0.5), ), - Expanded(child: _getSelectedScreen()), + Expanded( + child: IndexedStack( + index: _selectedIndex, + children: screens, + ), + ), ], ), ); } else { return Scaffold( - body: _getSelectedScreen(), + body: IndexedStack( + index: _selectedIndex, + children: screens, + ), bottomNavigationBar: NavigationBar( selectedIndex: _selectedIndex, onDestinationSelected: (int index) { diff --git a/frontend/lib/presentation/common_widgets/bloc_state_wrapper.dart b/frontend/lib/presentation/common_widgets/bloc_state_wrapper.dart new file mode 100644 index 0000000..06103af --- /dev/null +++ b/frontend/lib/presentation/common_widgets/bloc_state_wrapper.dart @@ -0,0 +1,86 @@ +import 'package:flutter/material.dart'; + +/// A generic wrapper to handle common BLoC states (Loading, Error, Loaded). +/// It simplifies the UI by removing boilerplate if/else chains for state handling. +class BlocStateWrapper extends StatelessWidget { + /// The current state from the BLoC builder. + final Object state; + + /// The callback to execute when the user presses the 'Retry' button on an error. + final VoidCallback onRetry; + + /// The widget builder for the success (loaded) state. + /// It receives the strongly-typed loaded state. + final Widget Function(TLoaded loadedState) builder; + + const BlocStateWrapper({ + super.key, + required this.state, + required this.onRetry, + required this.builder, + }); + + /// A helper to check if a state's runtimeType string contains a specific name. + /// This is used to generically identify Loading and Initial states without + /// needing a common base class for them across all features. + /// Example: `EventBrowseLoading` contains "Loading". + bool _isState(String typeName) { + return state.runtimeType.toString().contains(typeName); + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + // Handle Loading and Initial states + if (_isState('Loading') || _isState('Initial')) { + return const Center(child: CircularProgressIndicator()); + } + + // Handle Error state + // This relies on the convention that all 'Error' states have a 'message' property. + if (_isState('Error')) { + final String message = (state as dynamic).message; + return Center( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.error_outline, size: 48, color: colorScheme.error), + const SizedBox(height: 16), + Text( + 'An Error Occurred', + style: theme.textTheme.titleMedium?.copyWith( + color: colorScheme.error, + ), + ), + const SizedBox(height: 8), + Text( + message, + textAlign: TextAlign.center, + style: theme.textTheme.bodyMedium, + ), + const SizedBox(height: 24), + ElevatedButton.icon( + onPressed: onRetry, + icon: const Icon(Icons.refresh), + label: const Text('Retry'), + ), + ], + ), + ), + ); + } + + // Handle Loaded state + // If the state is of the expected loaded type `TLoaded`, call the builder. + if (state is TLoaded) { + return builder(state as TLoaded); + } + + // Fallback for any other unhandled state. + return const SizedBox.shrink(); + } +} diff --git a/frontend/lib/presentation/common_widgets/category_chips.dart b/frontend/lib/presentation/common_widgets/category_chips.dart new file mode 100644 index 0000000..59616fe --- /dev/null +++ b/frontend/lib/presentation/common_widgets/category_chips.dart @@ -0,0 +1,73 @@ +import 'package:flutter/material.dart'; + +class CategoryChips extends StatelessWidget { + final List categories; + final String selectedCategory; + final ValueChanged onCategoryChanged; + final EdgeInsets padding; + + const CategoryChips({ + super.key, + required this.categories, + required this.selectedCategory, + required this.onCategoryChanged, + this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + height: 56, + padding: padding, + child: ListView.builder( + scrollDirection: Axis.horizontal, + itemCount: categories.length, + itemBuilder: (context, index) { + final category = categories[index]; + final isSelected = category == selectedCategory; + + return Padding( + padding: const EdgeInsets.only(right: 8), + child: AnimatedContainer( + duration: const Duration(milliseconds: 200), + child: ChoiceChip( + label: Text( + category, + style: TextStyle( + fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, + ), + ), + selected: isSelected, + onSelected: (_) => onCategoryChanged(category), + backgroundColor: colorScheme.surfaceContainerHighest, + selectedColor: colorScheme.primaryContainer, + side: BorderSide( + color: isSelected + ? colorScheme.primary.withOpacity(0.3) + : colorScheme.outlineVariant.withOpacity(0.5), + ), + labelStyle: TextStyle( + color: isSelected + ? colorScheme.onPrimaryContainer + : colorScheme.onSurfaceVariant, + ), + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, + ), + elevation: isSelected ? 2 : 0, + pressElevation: 4, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(20), + ), + ), + ), + ); + }, + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/common_widgets/content_grid.dart b/frontend/lib/presentation/common_widgets/content_grid.dart new file mode 100644 index 0000000..3d5745e --- /dev/null +++ b/frontend/lib/presentation/common_widgets/content_grid.dart @@ -0,0 +1,126 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/core/utils/responsive_layout.dart'; + +class ContentGrid extends StatelessWidget { + final List items; + final Widget Function(BuildContext context, T item, int index) itemBuilder; + final String emptyMessage; + final String emptyDetails; + final IconData emptyIcon; + final double maxCrossAxisExtent; + final double childAspectRatio; + final Widget? header; + final EdgeInsets padding; + final double spacing; + + const ContentGrid({ + super.key, + required this.items, + required this.itemBuilder, + this.emptyMessage = 'No items found', + this.emptyDetails = 'Try adjusting your search or filters', + this.emptyIcon = Icons.search_off, + this.maxCrossAxisExtent = 350, + this.childAspectRatio = 0.75, + this.header, + this.padding = const EdgeInsets.all(16), + this.spacing = 16, + }); + + @override + Widget build(BuildContext context) { + if (items.isEmpty) { + return _buildEmptyState(context); + } + + return CustomScrollView( + slivers: [ + if (header != null) + SliverToBoxAdapter( + child: Padding( + padding: padding, + child: header!, + ), + ), + SliverPadding( + padding: padding, + sliver: SliverGrid( + gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: ResponsiveLayout.isMobile(context) + ? maxCrossAxisExtent * 0.85 + : maxCrossAxisExtent, + childAspectRatio: childAspectRatio, + crossAxisSpacing: spacing, + mainAxisSpacing: spacing, + ), + delegate: SliverChildBuilderDelegate( + (context, index) => AnimatedContainer( + duration: Duration(milliseconds: 200 + (index * 50)), + curve: Curves.easeOutQuart, + child: itemBuilder(context, items[index], index), + ), + childCount: items.length, + ), + ), + ), + // Add some bottom padding for better scrolling experience + const SliverToBoxAdapter( + child: SizedBox(height: 80), + ), + ], + ); + } + + Widget _buildEmptyState(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Center( + child: SingleChildScrollView( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + TweenAnimationBuilder( + duration: const Duration(milliseconds: 600), + tween: Tween(begin: 0.0, end: 1.0), + builder: (context, value, child) { + return Transform.scale( + scale: value, + child: Container( + padding: const EdgeInsets.all(24), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + shape: BoxShape.circle, + ), + child: Icon( + emptyIcon, + size: 64, + color: colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + ), + ); + }, + ), + const SizedBox(height: 24), + Text( + emptyMessage, + style: theme.textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + const SizedBox(height: 8), + Text( + emptyDetails, + textAlign: TextAlign.center, + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/common_widgets/custom_text_form_field.dart b/frontend/lib/presentation/common_widgets/custom_text_form_field.dart new file mode 100644 index 0000000..0697ae8 --- /dev/null +++ b/frontend/lib/presentation/common_widgets/custom_text_form_field.dart @@ -0,0 +1,46 @@ +import 'package:flutter/material.dart'; + +class CustomTextFormField extends StatelessWidget { + final TextEditingController controller; + final String labelText; + final String? Function(String?)? validator; + final bool enabled; + final TextInputType? keyboardType; + final bool obscureText; + final String? prefixText; + final bool readOnly; + final VoidCallback? onTap; + final int? maxLines; + + const CustomTextFormField({ + super.key, + required this.controller, + required this.labelText, + this.validator, + this.enabled = true, + this.keyboardType, + this.obscureText = false, + this.prefixText, + this.readOnly = false, + this.onTap, + this.maxLines = 1, + }); + + @override + Widget build(BuildContext context) { + return TextFormField( + controller: controller, + enabled: enabled, + keyboardType: keyboardType, + obscureText: obscureText, + readOnly: readOnly, + onTap: onTap, + maxLines: maxLines, + decoration: InputDecoration( + labelText: labelText, + prefixText: prefixText, + ), + validator: validator, + ); + } +} diff --git a/frontend/lib/presentation/common_widgets/dialogs.dart b/frontend/lib/presentation/common_widgets/dialogs.dart new file mode 100644 index 0000000..4d11d88 --- /dev/null +++ b/frontend/lib/presentation/common_widgets/dialogs.dart @@ -0,0 +1,71 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/presentation/common_widgets/primary_button.dart'; + +Future showConfirmationDialog({ + required BuildContext context, + required String title, + required Widget content, + String confirmText = 'Confirm', + bool isDestructive = false, +}) { + return showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(title), + content: content, + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(false), + child: const Text('Cancel'), + ), + PrimaryButton( + text: confirmText, + onPressed: () => Navigator.of(context).pop(true), + backgroundColor: + isDestructive ? Theme.of(context).colorScheme.error : null, + fullWidth: false, + ), + ], + ), + ); +} + +Future showInputDialog({ + required BuildContext context, + required String title, + required String label, + String confirmText = 'Submit', + String? initialValue, + TextInputType keyboardType = TextInputType.text, + String? prefixText, +}) { + final controller = TextEditingController(text: initialValue); + return showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text(title), + content: TextField( + controller: controller, + keyboardType: keyboardType, + decoration: InputDecoration( + labelText: label, + prefixText: prefixText, + ), + autofocus: true, + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(null), + child: const Text('Cancel'), + ), + PrimaryButton( + text: confirmText, + onPressed: () => Navigator.of(context).pop(controller.text), + fullWidth: false, + ), + ], + ); + }, + ); +} diff --git a/frontend/lib/presentation/common_widgets/empty_state_widget.dart b/frontend/lib/presentation/common_widgets/empty_state_widget.dart new file mode 100644 index 0000000..8f9e800 --- /dev/null +++ b/frontend/lib/presentation/common_widgets/empty_state_widget.dart @@ -0,0 +1,48 @@ +import 'package:flutter/material.dart'; + +class EmptyStateWidget extends StatelessWidget { + final IconData icon; + final String message; + final String? details; + + const EmptyStateWidget({ + super.key, + required this.icon, + required this.message, + this.details, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + return Center( + child: Padding( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + icon, + size: 48, + color: theme.colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + const SizedBox(height: 24), + Text( + message, + style: theme.textTheme.titleLarge, + textAlign: TextAlign.center, + ), + if (details != null) ...[ + const SizedBox(height: 8), + Text( + details!, + textAlign: TextAlign.center, + style: theme.textTheme.bodyMedium, + ), + ], + ], + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/common_widgets/enhanced_search_bar.dart b/frontend/lib/presentation/common_widgets/enhanced_search_bar.dart new file mode 100644 index 0000000..8a948a3 --- /dev/null +++ b/frontend/lib/presentation/common_widgets/enhanced_search_bar.dart @@ -0,0 +1,115 @@ +import 'package:flutter/material.dart'; + +class EnhancedSearchBar extends StatelessWidget { + final TextEditingController controller; + final String hintText; + final String searchQuery; + final ValueChanged onSearchChanged; + final bool filtersActive; + final VoidCallback? onFilterTap; + + const EnhancedSearchBar({ + super.key, + required this.controller, + required this.hintText, + required this.searchQuery, + required this.onSearchChanged, + this.filtersActive = false, + this.onFilterTap, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: BorderRadius.circular(16), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.1), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Row( + children: [ + Expanded( + child: TextField( + controller: controller, + decoration: InputDecoration( + hintText: hintText, + hintStyle: TextStyle( + color: colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + prefixIcon: Container( + padding: const EdgeInsets.all(12), + child: Icon( + Icons.search, + color: colorScheme.primary, + size: 24, + ), + ), + suffixIcon: searchQuery.isNotEmpty + ? IconButton( + icon: Icon( + Icons.clear, + color: colorScheme.onSurfaceVariant, + ), + onPressed: () { + controller.clear(); + onSearchChanged(''); + }, + ) + : null, + border: InputBorder.none, + contentPadding: const EdgeInsets.symmetric( + vertical: 16, + horizontal: 0, + ), + ), + style: theme.textTheme.bodyLarge, + onSubmitted: onSearchChanged, + onChanged: (value) { + // Debounced search could be implemented here + onSearchChanged(value); + }, + textInputAction: TextInputAction.search, + ), + ), + if (onFilterTap != null) + Container( + margin: const EdgeInsets.only(right: 8), + child: IconButton( + onPressed: onFilterTap, + icon: AnimatedContainer( + duration: const Duration(milliseconds: 200), + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: filtersActive + ? colorScheme.secondaryContainer + : colorScheme.surfaceContainerHighest, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.tune, + color: filtersActive + ? colorScheme.onSecondaryContainer + : colorScheme.onSurfaceVariant, + size: 20, + ), + ), + tooltip: 'Advanced Filters', + ), + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/common_widgets/list_item_card.dart b/frontend/lib/presentation/common_widgets/list_item_card.dart new file mode 100644 index 0000000..904a43d --- /dev/null +++ b/frontend/lib/presentation/common_widgets/list_item_card.dart @@ -0,0 +1,108 @@ +import 'package:flutter/material.dart'; + +class ListItemCard extends StatelessWidget { + final Widget? leadingWidget; + final Widget title; + final Widget? subtitle; + final Widget? trailingWidget; + final Widget? bottomContent; + final Widget? topContent; + final VoidCallback? onTap; + final bool isProcessing; + final bool isDimmed; + + const ListItemCard({ + super.key, + this.leadingWidget, + required this.title, + this.subtitle, + this.trailingWidget, + this.bottomContent, + this.topContent, + this.onTap, + this.isProcessing = false, + this.isDimmed = false, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Card( + margin: const EdgeInsets.only(bottom: 16), + clipBehavior: Clip.antiAlias, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: isDimmed + ? BorderSide(color: colorScheme.outlineVariant.withOpacity(0.5)) + : BorderSide.none, + ), + elevation: isDimmed ? 0 : 2, + child: Column( + children: [ + if (isProcessing) const LinearProgressIndicator(), + if (topContent != null) topContent!, + InkWell( + onTap: onTap, + child: Padding( + padding: const EdgeInsets.all(16), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (leadingWidget != null) ...[ + leadingWidget!, + const SizedBox(width: 16), + ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DefaultTextStyle( + style: (theme.textTheme.titleMedium ?? + const TextStyle()) + .copyWith( + color: isDimmed + ? colorScheme.onSurface.withOpacity(0.6) + : null, + ), + child: title, + ), + if (subtitle != null) ...[ + const SizedBox(height: 4), + DefaultTextStyle( + style: (theme.textTheme.bodyMedium ?? + const TextStyle()) + .copyWith( + color: colorScheme.onSurfaceVariant, + ), + child: subtitle!, + ), + ], + ], + ), + ), + if (trailingWidget != null) ...[ + const SizedBox(width: 16), + trailingWidget!, + ], + ], + ), + ), + ), + if (bottomContent != null) + Container( + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.3), + border: Border( + top: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.5)), + ), + ), + child: bottomContent, + ), + ], + ), + ); + } +} diff --git a/frontend/lib/presentation/common_widgets/logout_button.dart b/frontend/lib/presentation/common_widgets/logout_button.dart index 688eea6..9ee29e9 100644 --- a/frontend/lib/presentation/common_widgets/logout_button.dart +++ b/frontend/lib/presentation/common_widgets/logout_button.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/services/auth_service.dart'; class LogoutButton extends StatelessWidget { final bool isExtended; @@ -8,13 +9,12 @@ class LogoutButton extends StatelessWidget { @override Widget build(BuildContext context) { - // TODO: Implement actual logout logic (clear session, etc.) return IconButton( icon: const Icon(Icons.logout), tooltip: 'Logout', onPressed: () { - GoRouter.of(context).go('/welcome'); + context.read().logout(); }, ); } -} \ No newline at end of file +} diff --git a/frontend/lib/presentation/events/cubit/event_browse_cubit.dart b/frontend/lib/presentation/events/cubit/event_browse_cubit.dart new file mode 100644 index 0000000..3f33155 --- /dev/null +++ b/frontend/lib/presentation/events/cubit/event_browse_cubit.dart @@ -0,0 +1,131 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/events/cubit/event_browse_state.dart'; + +class EventBrowseCubit extends Cubit { + final EventRepository _eventRepository; + + EventBrowseCubit(this._eventRepository) : super(EventBrowseInitial()); + + Future loadEvents({ + int page = 1, + int limit = 20, + String? search, + String? location, + DateTime? startDateFrom, + DateTime? startDateTo, + double? minPrice, + double? maxPrice, + String? categories, + String sortBy = 'start_date', + String sortOrder = 'asc', + bool reset = false, + }) async { + try { + if (reset || state is! EventBrowseLoaded) { + emit(EventBrowseLoading()); + } + + final queryParams = { + 'page': page, + 'limit': limit, + 'sort_by': sortBy, + 'sort_order': sortOrder, + }; + + if (search != null && search.isNotEmpty) { + queryParams['search'] = search; + } + if (location != null && location.isNotEmpty) { + queryParams['location'] = location; + } + if (startDateFrom != null) { + queryParams['start_date_from'] = startDateFrom.toIso8601String(); + } + if (startDateTo != null) { + queryParams['start_date_to'] = startDateTo.toIso8601String(); + } + if (minPrice != null) { + queryParams['min_price'] = minPrice; + } + if (maxPrice != null) { + queryParams['max_price'] = maxPrice; + } + if (categories != null && categories.isNotEmpty) { + queryParams['categories'] = categories; + } + + final events = await _eventRepository.getEventsWithParams(queryParams); + + if (reset || state is! EventBrowseLoaded) { + emit(EventBrowseLoaded(events)); + } else { + final currentState = state as EventBrowseLoaded; + emit(EventBrowseLoaded([...currentState.events, ...events])); + } + } on ApiException catch (e) { + emit(EventBrowseError(e.message)); + } catch (e) { + emit(EventBrowseError('An unexpected error occurred: $e')); + } + } + + Future loadMoreEvents({ + required int page, + int limit = 20, + String? search, + String? location, + DateTime? startDateFrom, + DateTime? startDateTo, + double? minPrice, + double? maxPrice, + String? categories, + String sortBy = 'start_date', + String sortOrder = 'asc', + }) async { + try { + final queryParams = { + 'page': page, + 'limit': limit, + 'sort_by': sortBy, + 'sort_order': sortOrder, + }; + + if (search != null && search.isNotEmpty) { + queryParams['search'] = search; + } + if (location != null && location.isNotEmpty) { + queryParams['location'] = location; + } + if (startDateFrom != null) { + queryParams['start_date_from'] = startDateFrom.toIso8601String(); + } + if (startDateTo != null) { + queryParams['start_date_to'] = startDateTo.toIso8601String(); + } + if (minPrice != null) { + queryParams['min_price'] = minPrice; + } + if (maxPrice != null) { + queryParams['max_price'] = maxPrice; + } + if (categories != null && categories.isNotEmpty) { + queryParams['categories'] = categories; + } + + final newEvents = await _eventRepository.getEventsWithParams(queryParams); + + if (state is EventBrowseLoaded) { + final currentState = state as EventBrowseLoaded; + emit(EventBrowseLoaded([...currentState.events, ...newEvents])); + return newEvents.length == limit; // Return true if there might be more data + } + + return false; + } catch (e) { + // Don't emit error state for pagination failures, just return false + return false; + } + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/events/cubit/event_browse_state.dart b/frontend/lib/presentation/events/cubit/event_browse_state.dart new file mode 100644 index 0000000..ba4af9d --- /dev/null +++ b/frontend/lib/presentation/events/cubit/event_browse_state.dart @@ -0,0 +1,26 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/event_model.dart'; + +abstract class EventBrowseState extends Equatable { + const EventBrowseState(); + @override + List get props => []; +} + +class EventBrowseInitial extends EventBrowseState {} + +class EventBrowseLoading extends EventBrowseState {} + +class EventBrowseLoaded extends EventBrowseState { + final List events; + const EventBrowseLoaded(this.events); + @override + List get props => [events]; +} + +class EventBrowseError extends EventBrowseState { + final String message; + const EventBrowseError(this.message); + @override + List get props => [message]; +} diff --git a/frontend/lib/presentation/events/pages/event_browse_page.dart b/frontend/lib/presentation/events/pages/event_browse_page.dart index cf9f031..738a1aa 100644 --- a/frontend/lib/presentation/events/pages/event_browse_page.dart +++ b/frontend/lib/presentation/events/pages/event_browse_page.dart @@ -1,27 +1,48 @@ import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:resellio/core/models/event_model.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:resellio/core/models/event_filter_model.dart'; -import 'package:resellio/core/services/api_service.dart'; +import 'package:resellio/core/repositories/repositories.dart'; import 'package:resellio/core/utils/responsive_layout.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/events/cubit/event_browse_cubit.dart'; +import 'package:resellio/presentation/events/cubit/event_browse_state.dart'; import 'package:resellio/presentation/events/widgets/event_card.dart'; import 'package:resellio/presentation/events/widgets/event_filter_sheet.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/common_widgets/enhanced_search_bar.dart'; +import 'package:resellio/presentation/common_widgets/category_chips.dart'; +import 'package:resellio/presentation/common_widgets/content_grid.dart'; -class EventBrowsePage extends StatefulWidget { +class EventBrowsePage extends StatelessWidget { const EventBrowsePage({super.key}); @override - State createState() => _EventBrowsePageState(); + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => + EventBrowseCubit(context.read())..loadEvents(), + child: const _EventBrowseView(), + ); + } } -class _EventBrowsePageState extends State { - late Future> _eventsFuture; +class _EventBrowseView extends StatefulWidget { + const _EventBrowseView(); + + @override + State<_EventBrowseView> createState() => _EventBrowseViewState(); +} + +class _EventBrowseViewState extends State<_EventBrowseView> { EventFilterModel _currentFilters = const EventFilterModel(); final TextEditingController _searchController = TextEditingController(); String _searchQuery = ''; + int _currentPage = 1; + static const int _pageSize = 20; + bool _isLoadingMore = false; + bool _hasMoreData = true; + final ScrollController _scrollController = ScrollController(); - // Common categories for quick filters final List _categories = [ 'All', 'Music', @@ -32,34 +53,25 @@ class _EventBrowsePageState extends State { ]; String _selectedCategory = 'All'; + String _sortBy = 'start_date'; + String _sortOrder = 'asc'; @override void initState() { super.initState(); - _loadEvents(); + _scrollController.addListener(_onScroll); } @override void dispose() { _searchController.dispose(); + _scrollController.dispose(); super.dispose(); } - void _loadEvents() { - final apiService = context.read(); - setState(() { - _eventsFuture = apiService.getEvents(); - }); - } - - void _applyFilters(EventFilterModel newFilters) { - if (_currentFilters != newFilters) { - setState(() { - _currentFilters = newFilters; - _selectedCategory = - 'All'; // Reset category selection when applying filters - }); - _loadEvents(); + void _onScroll() { + if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) { + _loadMoreEvents(); } } @@ -74,39 +86,176 @@ class _EventBrowsePageState extends State { builder: (context) { return EventFilterSheet( initialFilters: _currentFilters, - onApplyFilters: _applyFilters, + showAdvancedFilters: false, // Hide organizer, status, minimum age filters + onApplyFilters: (newFilters) { + setState(() { + _currentFilters = newFilters; + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, ); }, ); } - void _performSearch(String query) { - if (query != _searchQuery) { - setState(() { - _searchQuery = query; - }); - _loadEvents(); + void _showSortDialog() { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Sort Events'), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + title: const Text('Sort by'), + subtitle: DropdownButton( + value: _sortBy, + isExpanded: true, + items: const [ + DropdownMenuItem(value: 'start_date', child: Text('Event Date')), + DropdownMenuItem(value: 'name', child: Text('Event Name')), + DropdownMenuItem(value: 'creation_date', child: Text('Recently Added')), + ], + onChanged: (value) { + setState(() { + _sortBy = value!; + }); + }, + ), + ), + ListTile( + title: const Text('Order'), + subtitle: DropdownButton( + value: _sortOrder, + isExpanded: true, + items: const [ + DropdownMenuItem(value: 'asc', child: Text('Ascending')), + DropdownMenuItem(value: 'desc', child: Text('Descending')), + ], + onChanged: (value) { + setState(() { + _sortOrder = value!; + }); + }, + ), + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + ElevatedButton( + onPressed: () { + Navigator.pop(context); + setState(() { + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, + child: const Text('Apply'), + ), + ], + ), + ); + } + + void _onSearchChanged(String query) { + setState(() { + _searchQuery = query; + _currentPage = 1; + _hasMoreData = true; + }); + + // Debounce search + Future.delayed(const Duration(milliseconds: 500), () { + if (_searchQuery == query) { + _loadEventsWithFilters(reset: true); + } + }); + } + + void _onCategoryChanged(String category) { + setState(() { + _selectedCategory = category; + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + } + + void _loadEventsWithFilters({bool reset = false}) { + if (reset) { + context.read().loadEvents( + page: _currentPage, + limit: _pageSize, + search: _searchQuery.isEmpty ? null : _searchQuery, + location: _currentFilters.location, + startDateFrom: _currentFilters.startDateFrom, + startDateTo: _currentFilters.startDateTo, + minPrice: _currentFilters.minPrice, + maxPrice: _currentFilters.maxPrice, + categories: _selectedCategory == 'All' ? null : _selectedCategory, + sortBy: _sortBy, + sortOrder: _sortOrder, + reset: true, + ); + } else { + _loadMoreEvents(); } } - void _selectCategory(String category) { - if (category != _selectedCategory) { + void _loadMoreEvents() { + if (_isLoadingMore || !_hasMoreData) return; + + setState(() { + _isLoadingMore = true; + }); + + context.read().loadMoreEvents( + page: _currentPage + 1, + limit: _pageSize, + search: _searchQuery.isEmpty ? null : _searchQuery, + location: _currentFilters.location, + startDateFrom: _currentFilters.startDateFrom, + startDateTo: _currentFilters.startDateTo, + minPrice: _currentFilters.minPrice, + maxPrice: _currentFilters.maxPrice, + categories: _selectedCategory == 'All' ? null : _selectedCategory, + sortBy: _sortBy, + sortOrder: _sortOrder, + ).then((hasMore) { setState(() { - _selectedCategory = category; + _isLoadingMore = false; + _hasMoreData = hasMore; + if (hasMore) _currentPage++; }); - _loadEvents(); - } + }); } @override Widget build(BuildContext context) { - final bool filtersActive = _currentFilters.hasActiveFilters; + final bool filtersActive = _currentFilters.hasActiveFilters || + _selectedCategory != 'All' || + _searchQuery.isNotEmpty; final theme = Theme.of(context); final colorScheme = theme.colorScheme; return PageLayout( title: 'Discover Events', actions: [ + IconButton( + icon: Icon( + Icons.sort, + color: colorScheme.onSurface, + ), + tooltip: 'Sort Events', + onPressed: _showSortDialog, + ), IconButton( icon: Icon( Icons.filter_list, @@ -119,200 +268,219 @@ class _EventBrowsePageState extends State { body: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Search Bar - Padding( - padding: const EdgeInsets.fromLTRB(16, 8, 16, 16), - child: Container( - decoration: BoxDecoration( - color: colorScheme.surfaceContainerHighest.withOpacity(0.5), - borderRadius: BorderRadius.circular(16), - ), - child: TextField( - controller: _searchController, - decoration: InputDecoration( - hintText: 'Search events...', - prefixIcon: const Icon(Icons.search), - suffixIcon: - _searchQuery.isNotEmpty - ? IconButton( - icon: const Icon(Icons.clear), - onPressed: () { - _searchController.clear(); - _performSearch(''); - }, - ) - : null, - border: InputBorder.none, - contentPadding: const EdgeInsets.symmetric(vertical: 16), - ), - onSubmitted: _performSearch, - textInputAction: TextInputAction.search, + // Enhanced Header Section + Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + colorScheme.primaryContainer.withOpacity(0.3), + colorScheme.surface, + ], ), ), - ), - - // Category Filters - SizedBox( - height: 48, - child: ListView.builder( - scrollDirection: Axis.horizontal, - padding: const EdgeInsets.symmetric(horizontal: 16), - itemCount: _categories.length, - itemBuilder: (context, index) { - final category = _categories[index]; - final isSelected = category == _selectedCategory; - - return Padding( - padding: const EdgeInsets.only(right: 8), - child: ChoiceChip( - label: Text(category), - selected: isSelected, - onSelected: (_) => _selectCategory(category), - backgroundColor: colorScheme.surfaceContainerHighest, - selectedColor: colorScheme.primaryContainer, - labelStyle: TextStyle( - color: - isSelected - ? colorScheme.onPrimaryContainer - : colorScheme.onSurfaceVariant, - fontWeight: - isSelected ? FontWeight.bold : FontWeight.normal, - ), - padding: const EdgeInsets.symmetric( - horizontal: 12, - vertical: 8, - ), + child: Column( + children: [ + // Welcome Message + Container( + width: double.infinity, + padding: const EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Find Your Next', + style: theme.textTheme.headlineMedium?.copyWith( + color: colorScheme.primary, + fontWeight: FontWeight.w300, + ), + ), + Text( + 'Amazing Experience', + style: theme.textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8), + Text( + 'Discover events that match your interests', + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], ), - ); - }, - ), - ), + ), - // Active Filters Indicator - if (filtersActive) - Padding( - padding: const EdgeInsets.fromLTRB(16, 8, 16, 0), - child: Row( - children: [ - Icon( - Icons.filter_alt, - size: 16, - color: colorScheme.secondary, + // Enhanced Search Bar + Padding( + padding: const EdgeInsets.fromLTRB(16, 8, 16, 16), + child: EnhancedSearchBar( + controller: _searchController, + hintText: 'Search events, artists, venues...', + searchQuery: _searchQuery, + onSearchChanged: _onSearchChanged, + filtersActive: filtersActive, ), - const SizedBox(width: 4), - Text( - 'Filters active', - style: theme.textTheme.bodySmall?.copyWith( - color: colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - const Spacer(), - TextButton( - onPressed: () { - setState(() { - _currentFilters = const EventFilterModel(); - _selectedCategory = 'All'; - }); - _loadEvents(); - }, - child: const Text('Clear All'), - ), - ], - ), - ), + ), - // Results - Expanded( - child: FutureBuilder>( - future: _eventsFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return const Center(child: CircularProgressIndicator()); - } else if (snapshot.hasError) { - print('Error loading events: ${snapshot.error}'); - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, + // Category Chips + CategoryChips( + categories: _categories, + selectedCategory: _selectedCategory, + onCategoryChanged: _onCategoryChanged, + ), + + // Active filters indicator + if (filtersActive) + Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Wrap( + spacing: 8, children: [ - Icon( - Icons.error_outline, - size: 48, - color: colorScheme.error, - ), - const SizedBox(height: 16), - Text( - 'Failed to load events', - style: theme.textTheme.titleMedium?.copyWith( - color: colorScheme.error, + if (_searchQuery.isNotEmpty) + Chip( + label: Text('Search: $_searchQuery'), + onDeleted: () { + _searchController.clear(); + _onSearchChanged(''); + }, ), - ), - const SizedBox(height: 8), - Text( - 'Please try again later', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 16), - ElevatedButton.icon( - onPressed: _loadEvents, - icon: const Icon(Icons.refresh), - label: const Text('Retry'), - ), - ], - ), - ); - } else if (!snapshot.hasData || snapshot.data!.isEmpty) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.event_busy, - size: 64, - color: colorScheme.onSurfaceVariant.withOpacity(0.5), - ), - const SizedBox(height: 16), - Text( - 'No events found', - style: theme.textTheme.titleMedium, - ), - if (_searchQuery.isNotEmpty || - filtersActive || - _selectedCategory != 'All') - Padding( - padding: const EdgeInsets.only(top: 8), - child: Text( - 'Try adjusting your filters or search criteria', - textAlign: TextAlign.center, - style: theme.textTheme.bodyMedium?.copyWith( - color: colorScheme.onSurfaceVariant, - ), + if (_currentFilters.location != null) + Chip( + label: Text('Location: ${_currentFilters.location}'), + onDeleted: () { + setState(() { + _currentFilters = EventFilterModel( + name: _currentFilters.name, + startDateFrom: _currentFilters.startDateFrom, + startDateTo: _currentFilters.startDateTo, + minPrice: _currentFilters.minPrice, + maxPrice: _currentFilters.maxPrice, + ); + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, + ), + if (_currentFilters.startDateFrom != null || _currentFilters.startDateTo != null) + Chip( + label: const Text('Date Range'), + onDeleted: () { + setState(() { + _currentFilters = EventFilterModel( + name: _currentFilters.name, + location: _currentFilters.location, + minPrice: _currentFilters.minPrice, + maxPrice: _currentFilters.maxPrice, + // startDateFrom and startDateTo are set to null + ); + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, + ), + if (_currentFilters.minPrice != null || _currentFilters.maxPrice != null) + Chip( + label: Text( + 'Price: \$${_currentFilters.minPrice?.toStringAsFixed(0) ?? '0'} - \$${_currentFilters.maxPrice?.toStringAsFixed(0) ?? '∞'}' ), + onDeleted: () { + setState(() { + _currentFilters = EventFilterModel( + name: _currentFilters.name, + location: _currentFilters.location, + startDateFrom: _currentFilters.startDateFrom, + startDateTo: _currentFilters.startDateTo, + // minPrice and maxPrice are set to null + ); + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, ), ], ), - ); - } + ), + ], + ), + ), - final events = snapshot.data!; + // Events Grid + Expanded( + child: BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => _loadEventsWithFilters(reset: true), + builder: (loadedState) { + if (loadedState.events.isEmpty && !_isLoadingMore) { + return _buildEmptyState(context); + } - return Padding( - padding: const EdgeInsets.only(top: 8), - child: GridView.builder( - padding: const EdgeInsets.all(16), - gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: - ResponsiveLayout.isMobile(context) ? 300 : 350, - childAspectRatio: 0.75, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - ), - itemCount: events.length, - itemBuilder: (context, index) { - final event = events[index]; - return EventCard(event: event); - }, - ), + return RefreshIndicator( + onRefresh: () async { + setState(() { + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, + child: CustomScrollView( + controller: _scrollController, + slivers: [ + SliverPadding( + padding: const EdgeInsets.all(16), + sliver: SliverGrid( + gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: ResponsiveLayout.isMobile(context) ? 350 * 0.85 : 350, + childAspectRatio: 0.75, + crossAxisSpacing: 16, + mainAxisSpacing: 16, + ), + delegate: SliverChildBuilderDelegate( + (context, index) => AnimatedContainer( + duration: Duration(milliseconds: 200 + (index * 50)), + curve: Curves.easeOutQuart, + child: EventCard(event: loadedState.events[index]), + ), + childCount: loadedState.events.length, + ), + ), + ), + if (_isLoadingMore) + const SliverToBoxAdapter( + child: Padding( + padding: EdgeInsets.all(16), + child: Center(child: CircularProgressIndicator()), + ), + ), + if (!_hasMoreData && loadedState.events.isNotEmpty) + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.all(16), + child: Center( + child: Text( + 'No more events to load', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ), + ), + ), + const SliverToBoxAdapter( + child: SizedBox(height: 80), + ), + ], + ), + ); + }, ); }, ), @@ -321,4 +489,63 @@ class _EventBrowsePageState extends State { ), ); } + + Widget _buildEmptyState(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Center( + child: Padding( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(24), + decoration: BoxDecoration( + color: colorScheme.primaryContainer.withOpacity(0.3), + shape: BoxShape.circle, + ), + child: Icon( + Icons.event_note_outlined, + size: 64, + color: colorScheme.primary, + ), + ), + const SizedBox(height: 24), + Text( + 'No Events Found', + style: theme.textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8), + Text( + 'We couldn\'t find any events matching your criteria.\nTry adjusting your search or filters.', + textAlign: TextAlign.center, + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 24), + OutlinedButton.icon( + onPressed: () { + _searchController.clear(); + setState(() { + _searchQuery = ''; + _selectedCategory = 'All'; + _currentFilters = const EventFilterModel(); + _currentPage = 1; + _hasMoreData = true; + }); + _loadEventsWithFilters(reset: true); + }, + icon: const Icon(Icons.refresh), + label: const Text('Clear Filters'), + ), + ], + ), + ), + ); + } } diff --git a/frontend/lib/presentation/events/pages/event_details_page.dart b/frontend/lib/presentation/events/pages/event_details_page.dart index 6fd86b0..e3244c2 100644 --- a/frontend/lib/presentation/events/pages/event_details_page.dart +++ b/frontend/lib/presentation/events/pages/event_details_page.dart @@ -1,12 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'package:resellio/core/models/event_model.dart'; -import 'package:resellio/core/models/ticket_model.dart'; -import 'package:resellio/core/services/api_service.dart'; -import 'package:resellio/core/services/cart_service.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/cart/cubit/cart_cubit.dart'; import 'package:resellio/presentation/common_widgets/primary_button.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/core/network/api_exception.dart'; class EventDetailsPage extends StatefulWidget { final Event? event; @@ -18,206 +19,964 @@ class EventDetailsPage extends StatefulWidget { State createState() => _EventDetailsPageState(); } -class _EventDetailsPageState extends State { +class _EventDetailsPageState extends State + with SingleTickerProviderStateMixin { late Future> _ticketTypesFuture; + late AnimationController _animationController; + late Animation _fadeAnimation; + late Animation _slideAnimation; @override void initState() { super.initState(); _loadTicketTypes(); + _setupAnimations(); + } + + void _setupAnimations() { + _animationController = AnimationController( + duration: const Duration(milliseconds: 800), + vsync: this, + ); + + _fadeAnimation = Tween(begin: 0.0, end: 1.0).animate( + CurvedAnimation( + parent: _animationController, + curve: const Interval(0.0, 0.6, curve: Curves.easeOut), + ), + ); + + _slideAnimation = Tween( + begin: const Offset(0, 0.3), + end: Offset.zero, + ).animate( + CurvedAnimation( + parent: _animationController, + curve: const Interval(0.2, 1.0, curve: Curves.easeOutCubic), + ), + ); + + _animationController.forward(); + } + + @override + void dispose() { + _animationController.dispose(); + super.dispose(); } void _loadTicketTypes() { - final apiService = context.read(); + final eventRepository = context.read(); final id = widget.event?.id ?? widget.eventId; if (id != null) { setState(() { - _ticketTypesFuture = apiService.getTicketTypesForEvent(id); + _ticketTypesFuture = eventRepository.getTicketTypesForEvent(id); }); } } - void _addToCart(TicketType ticketType) { - context.read().addItem(ticketType); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('${ticketType.description} added to cart!'), - backgroundColor: Colors.green, - duration: const Duration(seconds: 2), - ), - ); + void _addToCart(TicketType ticketType, int quantity) async { + if (ticketType.typeId == null) return; + + try { + await context.read().addItem(ticketType.typeId!, quantity); + + // Enhanced success feedback + if (context.mounted) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon(Icons.check_circle, color: Colors.white, size: 20), + const SizedBox(width: 8), + Expanded( + child: Text( + '$quantity × ${ticketType.description ?? 'Ticket'} added to cart!', + style: const TextStyle(fontWeight: FontWeight.w500), + ), + ), + ], + ), + backgroundColor: Colors.green, + behavior: SnackBarBehavior.floating, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + margin: const EdgeInsets.all(16), + duration: const Duration(seconds: 3), + ), + ); + } + } on ApiException catch (e) { + if (context.mounted) { + // Show specific error message from API + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon( + Icons.error_outline, + color: Colors.white, + size: 20, + ), + const SizedBox(width: 8), + Expanded(child: Text(e.message)), + ], + ), + backgroundColor: Colors.red, + behavior: SnackBarBehavior.floating, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + margin: const EdgeInsets.all(16), + duration: const Duration(seconds: 4), + ), + ); + } + } catch (e) { + if (context.mounted) { + // Show generic error message for unexpected errors + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon( + Icons.error_outline, + color: Colors.white, + size: 20, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + 'Failed to add ticket to cart. Please try again.', + ), + ), + ], + ), + backgroundColor: Colors.red, + behavior: SnackBarBehavior.floating, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + margin: const EdgeInsets.all(16), + duration: const Duration(seconds: 4), + ), + ); + } + } } @override Widget build(BuildContext context) { if (widget.event == null) { - // TODO: Add a FutureBuilder to fetch the event by eventId if it's not passed - return const Scaffold(body: Center(child: Text("Loading Event..."))); + return const Scaffold(body: Center(child: CircularProgressIndicator())); } final event = widget.event!; final theme = Theme.of(context); final colorScheme = theme.colorScheme; - final DateFormat dateFormat = DateFormat('EEEE, MMMM d, yyyy'); - final DateFormat timeFormat = DateFormat('h:mm a'); return PageLayout( title: event.name, showBackButton: true, - body: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + body: FadeTransition( + opacity: _fadeAnimation, + child: SlideTransition( + position: _slideAnimation, + child: CustomScrollView( + slivers: [ + // Hero Image Section + SliverToBoxAdapter(child: _EventHeroSection(event: event)), + + // Event Details Section + SliverToBoxAdapter(child: _EventDetailsSection(event: event)), + + // Tickets Section + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 32, 16, 16), + child: Row( + children: [ + Icon( + Icons.confirmation_number, + color: colorScheme.primary, + size: 24, + ), + const SizedBox(width: 8), + Text( + 'Available Tickets', + style: theme.textTheme.headlineSmall?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ), + + // Ticket Types List + SliverPadding( + padding: const EdgeInsets.symmetric(horizontal: 16), + sliver: FutureBuilder>( + future: _ticketTypesFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return const SliverToBoxAdapter( + child: _TicketLoadingState(), + ); + } + + if (snapshot.hasError) { + return SliverToBoxAdapter( + child: _TicketErrorState(onRetry: _loadTicketTypes), + ); + } + + if (!snapshot.hasData || snapshot.data!.isEmpty) { + return const SliverToBoxAdapter(child: _NoTicketsState()); + } + + final ticketTypes = snapshot.data!; + return SliverList( + delegate: SliverChildBuilderDelegate((context, index) { + final ticketType = ticketTypes[index]; + return AnimatedContainer( + duration: Duration(milliseconds: 200 + (index * 100)), + curve: Curves.easeOutCubic, + child: _EnhancedTicketCard( + ticketType: ticketType, + onAddToCart: _addToCart, + ), + ); + }, childCount: ticketTypes.length), + ); + }, + ), + ), + + // Bottom spacing + const SliverToBoxAdapter(child: SizedBox(height: 100)), + ], + ), + ), + ), + ); + } +} + +class _EventHeroSection extends StatelessWidget { + final Event event; + + const _EventHeroSection({required this.event}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + height: 280, + margin: const EdgeInsets.all(16), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.2), + blurRadius: 20, + offset: const Offset(0, 10), + ), + ], + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(20), + child: Stack( + fit: StackFit.expand, children: [ - // Event Image - if (event.imageUrl != null) - Padding( - padding: const EdgeInsets.only(top: 16.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(16), - child: Image.network( - event.imageUrl!, - height: 250, - width: double.infinity, - fit: BoxFit.cover, + // Background Image + if (event.imageUrl != null && event.imageUrl!.isNotEmpty) + Image.network( + event.imageUrl!, + fit: BoxFit.cover, + loadingBuilder: (context, child, loadingProgress) { + if (loadingProgress == null) return child; + return Container( + color: colorScheme.surfaceContainerHighest, + child: const Center(child: CircularProgressIndicator()), + ); + }, + errorBuilder: + (context, error, stackTrace) => Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer, + colorScheme.secondaryContainer, + ], + ), + ), + child: Icon( + Icons.event, + size: 80, + color: colorScheme.primary.withOpacity(0.7), + ), + ), + ) + else + Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer, + colorScheme.secondaryContainer, + ], ), ), + child: Icon( + Icons.event, + size: 80, + color: colorScheme.primary.withOpacity(0.7), + ), ), - const SizedBox(height: 24), - // Event Title - Text( - event.name, - style: theme.textTheme.headlineSmall?.copyWith( - fontWeight: FontWeight.bold, + + // Gradient Overlay + Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [Colors.transparent, Colors.black.withOpacity(0.7)], + ), ), ), - const SizedBox(height: 16), - // Date and Time - _buildInfoRow( - icon: Icons.calendar_today, - text: dateFormat.format(event.start), - context: context, + + // Status Badge + Positioned( + top: 16, + right: 16, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 6, + ), + decoration: BoxDecoration( + color: _getStatusColor(event.status), + borderRadius: BorderRadius.circular(20), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.2), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + ), + child: Text( + event.status.toUpperCase(), + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.white, + fontWeight: FontWeight.bold, + letterSpacing: 0.8, + ), + ), + ), ), - const SizedBox(height: 8), - _buildInfoRow( - icon: Icons.access_time, - text: - '${timeFormat.format(event.start)} - ${timeFormat.format(event.end)}', - context: context, + + // Event Title + Positioned( + bottom: 16, + left: 16, + right: 16, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + event.name, + style: theme.textTheme.headlineMedium?.copyWith( + color: Colors.white, + fontWeight: FontWeight.bold, + shadows: [ + Shadow( + color: Colors.black.withOpacity(0.8), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + if (event.category.isNotEmpty) ...[ + const SizedBox(height: 8), + Wrap( + spacing: 8, + children: + event.category.take(3).map((category) { + return Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.2), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: Colors.white.withOpacity(0.3), + ), + ), + child: Text( + category, + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.white, + fontWeight: FontWeight.w600, + ), + ), + ); + }).toList(), + ), + ], + ], + ), ), - const SizedBox(height: 8), - // Location - _buildInfoRow( - icon: Icons.location_on, - text: event.location, - context: context, + ], + ), + ), + ); + } + + Color _getStatusColor(String status) { + final statusLower = status.toLowerCase(); + if (statusLower == 'active' || statusLower == 'created') + return Colors.green; + if (statusLower == 'cancelled') return Colors.red; + if (statusLower == 'pending') return Colors.orange; + return Colors.blue; + } +} + +class _EventDetailsSection extends StatelessWidget { + final Event event; + + const _EventDetailsSection({required this.event}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final DateFormat dateFormat = DateFormat('EEEE, MMMM d, yyyy'); + final DateFormat timeFormat = DateFormat('h:mm a'); + + return Container( + margin: const EdgeInsets.symmetric(horizontal: 16), + padding: const EdgeInsets.all(20), + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: BorderRadius.circular(16), + border: Border.all(color: colorScheme.outlineVariant.withOpacity(0.5)), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.05), + blurRadius: 10, + offset: const Offset(0, 2), + ), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Date and Time Section + _DetailSection( + icon: Icons.schedule, + title: 'Date & Time', + content: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + dateFormat.format(event.start), + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 4), + Text( + '${timeFormat.format(event.start)} - ${timeFormat.format(event.end)}', + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], ), - const SizedBox(height: 24), - // Description - Text( - 'About this event', - style: theme.textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, + ), + + const SizedBox(height: 20), + + // Location Section + _DetailSection( + icon: Icons.location_on, + title: 'Location', + content: Text(event.location, style: theme.textTheme.bodyLarge), + ), + + if (event.description != null && event.description!.isNotEmpty) ...[ + const SizedBox(height: 20), + _DetailSection( + icon: Icons.description, + title: 'Description', + content: Text( + event.description!, + style: theme.textTheme.bodyLarge?.copyWith(height: 1.5), ), ), - const SizedBox(height: 8), - Text( - event.description ?? 'No description available.', - style: theme.textTheme.bodyLarge?.copyWith( - color: Colors.white70, - height: 1.5, + ], + + // Event Info + const SizedBox(height: 20), + _DetailSection( + icon: Icons.info_outline, + title: 'Event Information', + content: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _InfoRow( + label: 'Total Tickets', + value: event.totalTickets.toString(), + ), + if (event.minimumAge != null) ...[ + const SizedBox(height: 8), + _InfoRow( + label: 'Minimum Age', + value: '${event.minimumAge} years', + ), + ], + const SizedBox(height: 8), + _InfoRow(label: 'Event ID', value: '#${event.id}'), + ], + ), + ), + ], + ), + ); + } +} + +class _DetailSection extends StatelessWidget { + final IconData icon; + final String title; + final Widget content; + + const _DetailSection({ + required this.icon, + required this.title, + required this.content, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + icon, + color: colorScheme.onPrimaryContainer, + size: 20, ), ), - const SizedBox(height: 24), - // Tickets Section + const SizedBox(width: 12), Text( - 'Tickets', - style: theme.textTheme.titleLarge?.copyWith( + title, + style: theme.textTheme.titleMedium?.copyWith( fontWeight: FontWeight.bold, ), ), - const SizedBox(height: 8), - FutureBuilder>( - future: _ticketTypesFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return const Center(child: CircularProgressIndicator()); - } - if (snapshot.hasError || - !snapshot.hasData || - snapshot.data!.isEmpty) { - return const Center( - child: Text('No tickets available for this event.'), - ); - } - - final ticketTypes = snapshot.data!; - return ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: ticketTypes.length, - itemBuilder: (context, index) { - final ticketType = ticketTypes[index]; - return Card( - margin: const EdgeInsets.only(bottom: 12), - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - ticketType.description ?? 'Standard Ticket', - style: theme.textTheme.titleMedium - ?.copyWith(fontWeight: FontWeight.bold), - ), - const SizedBox(height: 4), - Text( - '\$${ticketType.price.toStringAsFixed(2)}', - style: theme.textTheme.bodyLarge?.copyWith( - color: colorScheme.primary, - ), - ), - ], - ), - ), - PrimaryButton( - text: 'Add to Cart', - onPressed: () => _addToCart(ticketType), - fullWidth: false, - height: 40, - icon: Icons.add_shopping_cart, - ), - ], - ), - ), - ); - }, - ); - }, - ), - const SizedBox(height: 24), ], ), - ), + const SizedBox(height: 12), + Padding(padding: const EdgeInsets.only(left: 40), child: content), + ], ); } +} + +class _InfoRow extends StatelessWidget { + final String label; + final String value; + + const _InfoRow({required this.label, required this.value}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; - Widget _buildInfoRow({ - required IconData icon, - required String text, - required BuildContext context, - }) { return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Icon(icon, size: 20, color: Theme.of(context).colorScheme.primary), - const SizedBox(width: 12), - Expanded( - child: Text(text, style: Theme.of(context).textTheme.bodyLarge), + Text( + label, + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + Text( + value, + style: theme.textTheme.bodyMedium?.copyWith( + fontWeight: FontWeight.w600, + ), ), ], ); } } + +class _EnhancedTicketCard extends StatefulWidget { + final TicketType ticketType; + final Function(TicketType, int) onAddToCart; + + const _EnhancedTicketCard({ + required this.ticketType, + required this.onAddToCart, + }); + + @override + State<_EnhancedTicketCard> createState() => _EnhancedTicketCardState(); +} + +class _EnhancedTicketCardState extends State<_EnhancedTicketCard> { + int _quantity = 1; + bool _isAdding = false; + + void _incrementQuantity() { + if (_quantity < widget.ticketType.maxCount) { + setState(() { + _quantity++; + }); + } + } + + void _decrementQuantity() { + if (_quantity > 1) { + setState(() { + _quantity--; + }); + } + } + + Future _addToCart() async { + setState(() { + _isAdding = true; + }); + + // Add a small delay for visual feedback + await Future.delayed(const Duration(milliseconds: 300)); + + widget.onAddToCart(widget.ticketType, _quantity); + + if (mounted) { + setState(() { + _isAdding = false; + _quantity = 1; // Reset quantity after adding + }); + } + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final totalPrice = widget.ticketType.price * _quantity; + + return Container( + margin: const EdgeInsets.only(bottom: 16), + padding: const EdgeInsets.all(20), + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: BorderRadius.circular(16), + border: Border.all(color: colorScheme.outlineVariant.withOpacity(0.5)), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.05), + blurRadius: 10, + offset: const Offset(0, 2), + ), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Header + Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.primaryContainer, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.confirmation_number, + color: colorScheme.onPrimaryContainer, + size: 24, + ), + ), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.ticketType.description ?? 'Standard Ticket', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + '${widget.ticketType.currency} ${widget.ticketType.price.toStringAsFixed(2)}', + style: theme.textTheme.headlineSmall?.copyWith( + color: colorScheme.primary, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ], + ), + + const SizedBox(height: 20), + + // Availability + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(8), + ), + child: Row( + children: [ + Icon(Icons.inventory, color: colorScheme.primary, size: 16), + const SizedBox(width: 8), + Text( + 'Available: ${widget.ticketType.maxCount} tickets', + style: theme.textTheme.bodyMedium?.copyWith( + fontWeight: FontWeight.w500, + ), + ), + ], + ), + ), + + const SizedBox(height: 20), + + // Quantity and Total + Row( + children: [ + // Quantity Selector + Container( + decoration: BoxDecoration( + border: Border.all(color: colorScheme.outlineVariant), + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + IconButton( + onPressed: _quantity > 1 ? _decrementQuantity : null, + icon: const Icon(Icons.remove, size: 18), + constraints: const BoxConstraints( + minWidth: 40, + minHeight: 40, + ), + ), + Container( + constraints: const BoxConstraints(minWidth: 40), + child: Text( + _quantity.toString(), + textAlign: TextAlign.center, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ), + IconButton( + onPressed: + _quantity < widget.ticketType.maxCount + ? _incrementQuantity + : null, + icon: const Icon(Icons.add, size: 18), + constraints: const BoxConstraints( + minWidth: 40, + minHeight: 40, + ), + ), + ], + ), + ), + + const SizedBox(width: 16), + + // Total Price + Expanded( + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, + ), + decoration: BoxDecoration( + color: colorScheme.secondaryContainer.withOpacity(0.5), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: colorScheme.secondary.withOpacity(0.3), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('Total:', style: theme.textTheme.titleMedium), + Text( + '${widget.ticketType.currency} ${totalPrice.toStringAsFixed(2)}', + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.secondary, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ), + ], + ), + + const SizedBox(height: 20), + + // Add to Cart Button + SizedBox( + width: double.infinity, + height: 56, + child: PrimaryButton( + text: _isAdding ? 'ADDING...' : 'ADD TO CART', + onPressed: _isAdding ? null : _addToCart, + isLoading: _isAdding, + icon: _isAdding ? null : Icons.add_shopping_cart, + ), + ), + ], + ), + ); + } +} + +// Loading States +class _TicketLoadingState extends StatelessWidget { + const _TicketLoadingState(); + + @override + Widget build(BuildContext context) { + return Column( + children: List.generate(3, (index) { + return Container( + height: 200, + margin: const EdgeInsets.only(bottom: 16), + decoration: BoxDecoration( + color: Colors.grey.shade300, + borderRadius: BorderRadius.circular(16), + ), + child: const Center(child: CircularProgressIndicator()), + ); + }), + ); + } +} + +class _TicketErrorState extends StatelessWidget { + final VoidCallback onRetry; + + const _TicketErrorState({required this.onRetry}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(32), + child: Column( + children: [ + Icon(Icons.error_outline, size: 48, color: colorScheme.error), + const SizedBox(height: 16), + Text( + 'Failed to load tickets', + style: theme.textTheme.titleMedium?.copyWith( + color: colorScheme.error, + ), + ), + const SizedBox(height: 8), + Text( + 'Please check your connection and try again.', + textAlign: TextAlign.center, + style: theme.textTheme.bodyMedium, + ), + const SizedBox(height: 16), + ElevatedButton.icon( + onPressed: onRetry, + icon: const Icon(Icons.refresh), + label: const Text('Retry'), + ), + ], + ), + ); + } +} + +class _NoTicketsState extends StatelessWidget { + const _NoTicketsState(); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(32), + child: Column( + children: [ + Icon( + Icons.event_busy, + size: 64, + color: colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + const SizedBox(height: 16), + Text('No Tickets Available', style: theme.textTheme.titleLarge), + const SizedBox(height: 8), + Text( + 'Tickets for this event are currently not available for purchase.', + textAlign: TextAlign.center, + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ); + } +} diff --git a/frontend/lib/presentation/events/widgets/event_card.dart b/frontend/lib/presentation/events/widgets/event_card.dart index 2efe9a6..8310ad8 100644 --- a/frontend/lib/presentation/events/widgets/event_card.dart +++ b/frontend/lib/presentation/events/widgets/event_card.dart @@ -1,17 +1,26 @@ import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; // Import intl for date formatting -import 'package:resellio/core/models/event_model.dart'; // Import the core Event model -import 'package:go_router/go_router.dart'; // Import GoRouter +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/event_model.dart'; +import 'package:go_router/go_router.dart'; class EventCard extends StatelessWidget { - final Event event; // Use the core Event model + final Event event; final VoidCallback? onTap; + final bool showPrice; + final double? price; + final String? priceLabel; - const EventCard({super.key, required this.event, this.onTap}); + const EventCard({ + super.key, + required this.event, + this.onTap, + this.showPrice = false, + this.price, + this.priceLabel, + }); @override Widget build(BuildContext context) { - // Formatters for date and time final DateFormat dateFormat = DateFormat('MMM d'); final DateFormat timeFormat = DateFormat('HH:mm'); final theme = Theme.of(context); @@ -19,227 +28,316 @@ class EventCard extends StatelessWidget { return Card( clipBehavior: Clip.antiAlias, - elevation: 2, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)), - child: InkWell( - onTap: () { - if (onTap != null) { - onTap!(); // Call original onTap if provided - } else { - // Navigate to the event details page using go_router - // Pass the event object via the 'extra' parameter - context.go('/event/${event.id}', extra: event); - } - }, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Image section with status badge overlay - Stack( - children: [ - // Event image - AspectRatio( - aspectRatio: 16 / 9, - child: Container( - color: Colors.grey.shade800, - width: double.infinity, - child: - event.imageUrl != null && event.imageUrl!.isNotEmpty - ? Image.network( - event.imageUrl!, - fit: BoxFit.cover, - // Add loading builder for smoother loading - loadingBuilder: ( - context, - child, - loadingProgress, - ) { - if (loadingProgress == null) return child; - return Center( - child: CircularProgressIndicator( - value: - loadingProgress.expectedTotalBytes != - null - ? loadingProgress - .cumulativeBytesLoaded / - loadingProgress - .expectedTotalBytes! - : null, - ), - ); - }, - // Add error builder for network images - errorBuilder: - (context, error, stackTrace) => Icon( - Icons.broken_image, - size: 48, - color: theme.colorScheme.error, - ), - ) - : Icon( - Icons.event, - size: 48, - color: theme.colorScheme.primary, - ), - ), - ), - - // Status badge - Positioned( - top: 12, - right: 12, - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: 8, - vertical: 4, - ), - decoration: BoxDecoration( - color: _getStatusColor(event.status), - borderRadius: BorderRadius.circular(12), + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Material( + color: Colors.transparent, + child: InkWell( + onTap: () { + if (onTap != null) { + onTap!(); + } else { + context.push('/event/${event.id}', extra: event); + } + }, + borderRadius: BorderRadius.circular(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Enhanced image section with overlay gradient + Expanded( + flex: 3, + child: Stack( + children: [ + Container( + width: double.infinity, + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest, + borderRadius: const BorderRadius.vertical( + top: Radius.circular(16), + ), + ), + child: event.imageUrl != null && event.imageUrl!.isNotEmpty + ? ClipRRect( + borderRadius: const BorderRadius.vertical( + top: Radius.circular(16), + ), + child: Image.network( + event.imageUrl!, + fit: BoxFit.cover, + loadingBuilder: (context, child, loadingProgress) { + if (loadingProgress == null) return child; + return Center( + child: CircularProgressIndicator( + value: loadingProgress.expectedTotalBytes != null + ? loadingProgress.cumulativeBytesLoaded / + loadingProgress.expectedTotalBytes! + : null, + strokeWidth: 2, + ), + ); + }, + errorBuilder: (context, error, stackTrace) => _buildImageFallback(colorScheme), + ), + ) + : _buildImageFallback(colorScheme), ), - child: Text( - event.status.toUpperCase(), - style: const TextStyle( - color: Colors.white, - fontSize: 10, - fontWeight: FontWeight.bold, + + // Gradient overlay for better text readability + Container( + decoration: BoxDecoration( + borderRadius: const BorderRadius.vertical( + top: Radius.circular(16), + ), + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Colors.transparent, + Colors.black.withOpacity(0.3), + ], + ), ), ), - ), - ), - // Date badge - Positioned( - top: 12, - left: 12, - child: Container( - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: colorScheme.primaryContainer, - borderRadius: BorderRadius.circular(8), + // Status chip with enhanced styling + Positioned( + top: 12, + right: 12, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: _getStatusColor(event.status), + borderRadius: BorderRadius.circular(12), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.2), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: Text( + event.status.toUpperCase(), + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.white, + fontWeight: FontWeight.bold, + ), + ), + ), ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( + + // Enhanced date badge + Positioned( + top: 12, + left: 12, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 6, + ), + decoration: BoxDecoration( + color: colorScheme.surface.withOpacity(0.95), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: colorScheme.primary.withOpacity(0.3), + ), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.1), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: Text( dateFormat.format(event.start), - style: TextStyle( - color: colorScheme.onPrimaryContainer, + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.primary, fontWeight: FontWeight.bold, - fontSize: 12, ), ), - ], - ), - ), - ), - ], - ), - - // Content section - Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Title - Text( - event.name, - style: theme.textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, + ), ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), + // Price badge if applicable + if (showPrice && price != null) + Positioned( + bottom: 12, + right: 12, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: colorScheme.tertiary, + borderRadius: BorderRadius.circular(12), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.2), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: Text( + '\$${price!.toStringAsFixed(2)}', + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onTertiary, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + ], + ), + ), - // Time and location with icons - Row( + // Enhanced content section + Expanded( + flex: 2, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Icon( - Icons.access_time_rounded, - size: 16, - color: colorScheme.primary, - ), - const SizedBox(width: 4), + // Event name with better typography Text( - timeFormat.format(event.start), - style: theme.textTheme.bodySmall?.copyWith( - color: colorScheme.onSurfaceVariant, + event.name, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + height: 1.2, ), + maxLines: 2, + overflow: TextOverflow.ellipsis, ), - const SizedBox(width: 16), - Icon( - Icons.location_on_outlined, - size: 16, - color: colorScheme.primary, + + const SizedBox(height: 8), + + // Enhanced info row with better spacing + Row( + children: [ + Icon( + Icons.access_time_rounded, + size: 16, + color: colorScheme.primary, + ), + const SizedBox(width: 4), + Text( + timeFormat.format(event.start), + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + ), + ], ), - const SizedBox(width: 4), - Expanded( - child: Text( - event.location, - style: theme.textTheme.bodySmall?.copyWith( - color: colorScheme.onSurfaceVariant, + + const SizedBox(height: 4), + + Row( + children: [ + Icon( + Icons.location_on_outlined, + size: 16, + color: colorScheme.primary, ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), + const SizedBox(width: 4), + Expanded( + child: Text( + event.location, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + ], ), - ], - ), - const SizedBox(height: 12), - - // Categories - if (event.category.isNotEmpty) - Wrap( - spacing: 4, - runSpacing: 4, - children: - event.category - .take( - 2, - ) // Show only first two categories to save space + const Spacer(), + + // Enhanced category chips + if (event.category.isNotEmpty) + Wrap( + spacing: 4, + runSpacing: 4, + children: event.category + .take(2) .map( (category) => Container( - padding: const EdgeInsets.symmetric( - horizontal: 8, - vertical: 2, - ), - decoration: BoxDecoration( - color: colorScheme.secondaryContainer - .withOpacity(0.6), - borderRadius: BorderRadius.circular(12), - ), - child: Text( - category, - style: TextStyle( - color: colorScheme.onSecondaryContainer, - fontSize: 10, - fontWeight: FontWeight.w500, - ), - ), + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 2, + ), + decoration: BoxDecoration( + color: colorScheme.secondaryContainer.withOpacity(0.7), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.secondary.withOpacity(0.3), + ), + ), + child: Text( + category, + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onSecondaryContainer, + fontWeight: FontWeight.w600, ), - ) + ), + ), + ) .toList(), - ), - ], + ), + ], + ), + ), ), - ), + ], + ), + ), + ), + ); + } + + Widget _buildImageFallback(ColorScheme colorScheme) { + return Container( + width: double.infinity, + height: double.infinity, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer, + colorScheme.secondaryContainer, ], ), ), + child: Icon( + Icons.event, + size: 48, + color: colorScheme.primary.withOpacity(0.7), + ), ); } - // Helper to determine status color Color _getStatusColor(String status) { final statusLower = status.toLowerCase(); - if (statusLower == 'active') return Colors.green; + if (statusLower == 'active' || statusLower == 'created') return Colors.green; if (statusLower == 'cancelled') return Colors.red; if (statusLower == 'sold out') return Colors.amber.shade800; - if (statusLower == 'upcoming') return Colors.blue; + if (statusLower == 'upcoming' || statusLower == 'pending') return Colors.blue; return Colors.grey; } -} +} \ No newline at end of file diff --git a/frontend/lib/presentation/events/widgets/event_filter_sheet.dart b/frontend/lib/presentation/events/widgets/event_filter_sheet.dart index 2660ae5..6154b22 100644 --- a/frontend/lib/presentation/events/widgets/event_filter_sheet.dart +++ b/frontend/lib/presentation/events/widgets/event_filter_sheet.dart @@ -1,15 +1,19 @@ import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; import 'package:resellio/core/models/event_filter_model.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; import 'package:resellio/presentation/common_widgets/primary_button.dart'; class EventFilterSheet extends StatefulWidget { final EventFilterModel initialFilters; final Function(EventFilterModel) onApplyFilters; + final bool showAdvancedFilters; const EventFilterSheet({ super.key, required this.initialFilters, required this.onApplyFilters, + this.showAdvancedFilters = true, }); @override @@ -18,26 +22,69 @@ class EventFilterSheet extends StatefulWidget { class _EventFilterSheetState extends State { late EventFilterModel _currentFilters; + final _locationController = TextEditingController(); final _minPriceController = TextEditingController(); final _maxPriceController = TextEditingController(); + final _startDateController = TextEditingController(); + final _endDateController = TextEditingController(); + + DateTime? _startDate; + DateTime? _endDate; @override void initState() { super.initState(); _currentFilters = widget.initialFilters; + _locationController.text = _currentFilters.location ?? ''; _minPriceController.text = _currentFilters.minPrice?.toString() ?? ''; _maxPriceController.text = _currentFilters.maxPrice?.toString() ?? ''; + _startDate = _currentFilters.startDateFrom; + _endDate = _currentFilters.startDateTo; + + if (_startDate != null) { + _startDateController.text = DateFormat('MMM d, yyyy').format(_startDate!); + } + if (_endDate != null) { + _endDateController.text = DateFormat('MMM d, yyyy').format(_endDate!); + } } @override void dispose() { + _locationController.dispose(); _minPriceController.dispose(); _maxPriceController.dispose(); + _startDateController.dispose(); + _endDateController.dispose(); super.dispose(); } + Future _selectDate(BuildContext context, bool isStartDate) async { + final DateTime? picked = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime.now(), + lastDate: DateTime(2026), + ); + + if (picked != null) { + setState(() { + if (isStartDate) { + _startDate = picked; + _startDateController.text = DateFormat('MMM d, yyyy').format(picked); + } else { + _endDate = picked; + _endDateController.text = DateFormat('MMM d, yyyy').format(picked); + } + }); + } + } + void _apply() { - final newFilters = _currentFilters.copyWith( + final newFilters = EventFilterModel( + location: _locationController.text.isEmpty ? null : _locationController.text, + startDateFrom: _startDate, + startDateTo: _endDate, minPrice: double.tryParse(_minPriceController.text), maxPrice: double.tryParse(_maxPriceController.text), ); @@ -48,87 +95,350 @@ class _EventFilterSheetState extends State { void _clear() { setState(() { _currentFilters = const EventFilterModel(); + _locationController.clear(); _minPriceController.clear(); _maxPriceController.clear(); + _startDateController.clear(); + _endDateController.clear(); + _startDate = null; + _endDate = null; }); } @override Widget build(BuildContext context) { final theme = Theme.of(context); - return Padding( - padding: EdgeInsets.fromLTRB( - 16, - 16, - 16, - 16 + MediaQuery.of(context).viewInsets.bottom, + final colorScheme = theme.colorScheme; + + return Container( + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), ), - child: Wrap( - runSpacing: 24, - children: [ - // Header - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('Filter Events', style: theme.textTheme.titleLarge), - IconButton( - icon: const Icon(Icons.close), - onPressed: () => Navigator.pop(context), + child: Padding( + padding: EdgeInsets.fromLTRB( + 24, + 24, + 24, + 24 + MediaQuery.of(context).viewInsets.bottom, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Header + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon( + Icons.tune, + color: colorScheme.primary, + ), + const SizedBox(width: 8), + Text( + 'Filter Events', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + IconButton( + icon: const Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ], + ), + + const SizedBox(height: 24), + + // Location Filter + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), ), - ], - ), - - // Price Range - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('Price Range', style: theme.textTheme.titleMedium), - const SizedBox(height: 16), - Row( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded( - child: TextField( - controller: _minPriceController, - decoration: const InputDecoration( - labelText: 'Min Price', - prefixText: '\$ ', + Row( + children: [ + Icon( + Icons.location_on, + color: colorScheme.primary, + size: 20, ), - keyboardType: TextInputType.number, - ), + const SizedBox(width: 8), + Text( + 'Location', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _locationController, + labelText: 'City or Venue', + keyboardType: TextInputType.text, ), - const SizedBox(width: 16), - Expanded( - child: TextField( - controller: _maxPriceController, - decoration: const InputDecoration( - labelText: 'Max Price', - prefixText: '\$ ', + ], + ), + ), + + const SizedBox(height: 16), + + // Date Range Filter + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.date_range, + color: colorScheme.primary, + size: 20, ), - keyboardType: TextInputType.number, - ), + const SizedBox(width: 8), + Text( + 'Date Range', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _startDateController, + labelText: 'From Date', + readOnly: true, + onTap: () => _selectDate(context, true), + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _endDateController, + labelText: 'To Date', + readOnly: true, + onTap: () => _selectDate(context, false), + ), + ), + ], ), ], ), - ], - ), - - // Action Buttons - Row( - children: [ - Expanded( - child: OutlinedButton( - onPressed: _clear, - child: const Text('Clear All'), + ), + + const SizedBox(height: 16), + + // Price Range Section + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), ), ), - const SizedBox(width: 16), - Expanded( - child: PrimaryButton(text: 'Apply Filters', onPressed: _apply), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.attach_money, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Price Range', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _minPriceController, + labelText: 'Min Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _maxPriceController, + labelText: 'Max Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + ], + ), + ], ), - ], - ), - ], + ), + + const SizedBox(height: 24), + + // Quick Price Options + Text( + 'Quick Filters', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 12), + Wrap( + spacing: 8, + runSpacing: 8, + children: [ + _QuickFilterChip( + label: 'Free Events', + onTap: () { + _minPriceController.text = '0'; + _maxPriceController.text = '0'; + }, + ), + _QuickFilterChip( + label: 'Under \$25', + onTap: () { + _minPriceController.clear(); + _maxPriceController.text = '25'; + }, + ), + _QuickFilterChip( + label: '\$25 - \$50', + onTap: () { + _minPriceController.text = '25'; + _maxPriceController.text = '50'; + }, + ), + _QuickFilterChip( + label: '\$50 - \$100', + onTap: () { + _minPriceController.text = '50'; + _maxPriceController.text = '100'; + }, + ), + _QuickFilterChip( + label: 'This Weekend', + onTap: () { + final now = DateTime.now(); + final weekday = now.weekday; + final daysUntilSaturday = (6 - weekday) % 7; + final saturday = now.add(Duration(days: daysUntilSaturday)); + final sunday = saturday.add(const Duration(days: 1)); + + setState(() { + _startDate = saturday; + _endDate = sunday; + _startDateController.text = DateFormat('MMM d, yyyy').format(saturday); + _endDateController.text = DateFormat('MMM d, yyyy').format(sunday); + }); + }, + ), + _QuickFilterChip( + label: 'Next 7 Days', + onTap: () { + final now = DateTime.now(); + final nextWeek = now.add(const Duration(days: 7)); + + setState(() { + _startDate = now; + _endDate = nextWeek; + _startDateController.text = DateFormat('MMM d, yyyy').format(now); + _endDateController.text = DateFormat('MMM d, yyyy').format(nextWeek); + }); + }, + ), + ], + ), + + const SizedBox(height: 32), + + // Action Buttons + Row( + children: [ + Expanded( + child: OutlinedButton.icon( + onPressed: _clear, + icon: const Icon(Icons.clear_all), + label: const Text('Clear All'), + style: OutlinedButton.styleFrom( + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + const SizedBox(width: 16), + Expanded( + flex: 2, + child: PrimaryButton( + text: 'APPLY FILTERS', + onPressed: _apply, + icon: Icons.check, + ), + ), + ], + ), + ], + ), ), ); } } + +class _QuickFilterChip extends StatelessWidget { + final String label; + final VoidCallback onTap; + + const _QuickFilterChip({ + required this.label, + required this.onTap, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return ActionChip( + label: Text(label), + onPressed: onTap, + backgroundColor: colorScheme.surfaceContainerHighest, + labelStyle: TextStyle( + color: colorScheme.onSurfaceVariant, + fontSize: 12, + ), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/main_page/main_layout.dart b/frontend/lib/presentation/main_page/main_layout.dart index 05eb060..69440e6 100644 --- a/frontend/lib/presentation/main_page/main_layout.dart +++ b/frontend/lib/presentation/main_page/main_layout.dart @@ -1,4 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/core/models/user_model.dart'; import 'package:resellio/presentation/common_widgets/adaptive_navigation.dart'; class MainLayout extends StatelessWidget { @@ -7,11 +10,22 @@ class MainLayout extends StatelessWidget { const MainLayout({ super.key, required this.userRole, - }); @override Widget build(BuildContext context) { + // Listen to AuthService to rebuild if the user logs out. + final authService = context.watch(); + + // If the user logs out, authService.user will be null. + // The GoRouter redirect will handle navigation, but as a fallback, + // we can show a loading indicator or an empty container. + if (!authService.isLoggedIn) { + return const Scaffold( + body: Center(child: CircularProgressIndicator()), + ); + } + return AdaptiveNavigation( userRole: userRole, body: Container(), diff --git a/frontend/lib/presentation/main_page/page_layout.dart b/frontend/lib/presentation/main_page/page_layout.dart index 69df73b..7c65852 100644 --- a/frontend/lib/presentation/main_page/page_layout.dart +++ b/frontend/lib/presentation/main_page/page_layout.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:resellio/core/utils/responsive_layout.dart'; -import 'package:provider/provider.dart'; import 'package:go_router/go_router.dart'; -import 'package:resellio/core/services/cart_service.dart'; +import 'package:resellio/presentation/cart/cubit/cart_cubit.dart'; +import 'package:resellio/presentation/cart/cubit/cart_state.dart'; class PageLayout extends StatelessWidget { final String title; @@ -11,6 +12,7 @@ class PageLayout extends StatelessWidget { final Widget? floatingActionButton; final double maxContentWidth; final bool showBackButton; + final bool showCartButton; final Color? backgroundColor; final Color? appBarColor; final Widget? bottomNavigationBar; @@ -23,6 +25,7 @@ class PageLayout extends StatelessWidget { this.floatingActionButton, this.maxContentWidth = 1200, this.showBackButton = false, + this.showCartButton = true, this.backgroundColor, this.appBarColor, this.bottomNavigationBar, @@ -30,118 +33,24 @@ class PageLayout extends StatelessWidget { @override Widget build(BuildContext context) { - final bool useAppBar = ResponsiveLayout.isMobile(context); - final cartItemCount = context.watch().itemCount; + final bool isMobile = ResponsiveLayout.isMobile(context); final theme = Theme.of(context); final colorScheme = theme.colorScheme; - final cartIconButton = Badge( - label: Text( - cartItemCount.toString(), - style: const TextStyle(fontSize: 10, fontWeight: FontWeight.bold), - ), - isLabelVisible: cartItemCount > 0, - backgroundColor: colorScheme.primary, - largeSize: 20, - child: IconButton( - tooltip: 'Shopping Cart', - icon: const Icon(Icons.shopping_cart_outlined), - onPressed: () { - context.push('/cart'); - }, - ), - ); - return Scaffold( backgroundColor: backgroundColor ?? colorScheme.surface, - appBar: - useAppBar - ? AppBar( - backgroundColor: appBarColor ?? colorScheme.surface, - scrolledUnderElevation: 2, - elevation: 0, - centerTitle: false, - title: Text( - title, - style: theme.textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - leading: - showBackButton - ? IconButton( - icon: const Icon(Icons.arrow_back_ios_new_rounded), - onPressed: () { - if (context.canPop()) { - context.pop(); - } - }, - ) - : null, - actions: [ - if (actions != null) ...actions!, - cartIconButton, - const SizedBox(width: 8), - ], - ) - : null, + appBar: isMobile ? _buildMobileAppBar(context, theme, colorScheme) : null, body: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - if (!useAppBar) - Container( - decoration: BoxDecoration( - color: appBarColor ?? colorScheme.surface, - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.05), - blurRadius: 1, - offset: const Offset(0, 1), - ), - ], - ), - padding: const EdgeInsets.fromLTRB(24.0, 24.0, 24.0, 16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - if (showBackButton) - IconButton( - icon: const Icon(Icons.arrow_back_ios_new_rounded), - onPressed: () { - if (context.canPop()) { - context.pop(); - } - }, - ), - Expanded( - child: Text( - title, - style: theme.textTheme.headlineMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - ), - Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (actions != null) ...actions!, - if (actions != null && actions!.isNotEmpty) - const SizedBox(width: 16), - cartIconButton, - ], - ), - ], - ), - ), - + if (!isMobile) _buildDesktopHeader(context, theme, colorScheme), Expanded( child: Center( child: ConstrainedBox( constraints: BoxConstraints(maxWidth: maxContentWidth), child: Padding( - padding: EdgeInsets.symmetric( - horizontal: useAppBar ? 0 : 24.0, - ), + padding: + EdgeInsets.symmetric(horizontal: isMobile ? 0 : 24.0), child: body, ), ), @@ -153,4 +62,136 @@ class PageLayout extends StatelessWidget { bottomNavigationBar: bottomNavigationBar, ); } + + PreferredSizeWidget _buildMobileAppBar( + BuildContext context, ThemeData theme, ColorScheme colorScheme) { + return AppBar( + backgroundColor: appBarColor ?? colorScheme.surface, + scrolledUnderElevation: 2, + elevation: 0, + centerTitle: false, + title: Text( + title, + style: theme.textTheme.titleLarge, + ), + leading: showBackButton + ? IconButton( + icon: const Icon(Icons.arrow_back_ios_new_rounded), + onPressed: () { + if (context.canPop()) { + context.pop(); + } else { + context.go('/home/customer'); + } + }, + ) + : null, + actions: [ + if (actions != null) ...actions!, + if (showCartButton) const _CartIconButton(), + const SizedBox(width: 8), + ], + ); + } + + Widget _buildDesktopHeader( + BuildContext context, ThemeData theme, ColorScheme colorScheme) { + return Container( + decoration: BoxDecoration( + color: appBarColor ?? colorScheme.surface, + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.05), + blurRadius: 1, + offset: const Offset(0, 1), + ), + ], + ), + padding: const EdgeInsets.fromLTRB(24.0, 24.0, 24.0, 16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + if (showBackButton) + IconButton( + icon: const Icon(Icons.arrow_back_ios_new_rounded), + onPressed: () { + if (context.canPop()) { + context.pop(); + } else { + context.go('/home/customer'); + } + }, + ), + Expanded( + child: Text( + title, + style: theme.textTheme.headlineMedium, + ), + ), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + if (actions != null) ...actions!, + if (actions != null && actions!.isNotEmpty) + const SizedBox(width: 16), + if (showCartButton) const _CartIconButton(), + ], + ), + ], + ), + ); + } +} + +class _CartIconButton extends StatelessWidget { + const _CartIconButton(); + + @override + Widget build(BuildContext context) { + final colorScheme = Theme.of(context).colorScheme; + return BlocBuilder( + builder: (context, state) { + int count = 0; + bool hasError = false; + + if (state is CartLoaded) { + count = state.items.length; + } else if (state is CartError) { + hasError = true; + count = 0; // Don't show count when there's an error + } else if (state is CartLoading) { + // Show previous count if available + if (state.previousItems.isNotEmpty) { + count = state.previousItems.length; + } + } + + return Badge( + label: hasError + ? const Icon(Icons.error, size: 12, color: Colors.white) + : Text( + count.toString(), + style: const TextStyle(fontSize: 10, fontWeight: FontWeight.bold), + ), + isLabelVisible: count > 0 || hasError, + backgroundColor: hasError ? Colors.red : colorScheme.primary, + largeSize: 20, + child: IconButton( + tooltip: hasError ? 'Cart Error - Tap to refresh' : 'Shopping Cart', + icon: Icon( + hasError ? Icons.shopping_cart_outlined : Icons.shopping_cart_outlined, + color: hasError ? Colors.red.withOpacity(0.7) : null, + ), + onPressed: () { + if (hasError) { + // Try to refresh cart before navigating + context.read().clearErrorAndRefresh(); + } + context.go('/cart'); + }, + ), + ); + }, + ); + } } diff --git a/frontend/lib/presentation/marketplace/cubit/marketplace_cubit.dart b/frontend/lib/presentation/marketplace/cubit/marketplace_cubit.dart new file mode 100644 index 0000000..801dabe --- /dev/null +++ b/frontend/lib/presentation/marketplace/cubit/marketplace_cubit.dart @@ -0,0 +1,177 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/marketplace/cubit/marketplace_state.dart'; + +class MarketplaceCubit extends Cubit { + final ResaleRepository _resaleRepository; + + MarketplaceCubit(this._resaleRepository) : super(MarketplaceInitial()); + + Future loadListings({ + int page = 1, + int limit = 20, + String? search, + int? eventId, + String? venue, + double? minPrice, + double? maxPrice, + double? minOriginalPrice, + double? maxOriginalPrice, + String? eventDateFrom, + String? eventDateTo, + bool? hasSeat, + String sortBy = 'event_date', + String sortOrder = 'asc', + bool reset = false, + }) async { + try { + if (reset || state is! MarketplaceLoaded) { + emit(MarketplaceLoading()); + } + + final queryParams = { + 'page': page, + 'limit': limit, + 'sort_by': sortBy, + 'sort_order': sortOrder, + }; + + if (search != null && search.isNotEmpty) { + queryParams['search'] = search; + } + if (eventId != null) { + queryParams['event_id'] = eventId; + } + if (venue != null && venue.isNotEmpty) { + queryParams['venue'] = venue; + } + if (minPrice != null) { + queryParams['min_price'] = minPrice; + } + if (maxPrice != null) { + queryParams['max_price'] = maxPrice; + } + if (minOriginalPrice != null) { + queryParams['min_original_price'] = minOriginalPrice; + } + if (maxOriginalPrice != null) { + queryParams['max_original_price'] = maxOriginalPrice; + } + if (eventDateFrom != null && eventDateFrom.isNotEmpty) { + queryParams['event_date_from'] = eventDateFrom; + } + if (eventDateTo != null && eventDateTo.isNotEmpty) { + queryParams['event_date_to'] = eventDateTo; + } + if (hasSeat != null) { + queryParams['has_seat'] = hasSeat; + } + + final listings = await _resaleRepository.getMarketplaceListingsWithParams(queryParams); + + if (reset || state is! MarketplaceLoaded) { + emit(MarketplaceLoaded(listings)); + } else { + final currentState = state as MarketplaceLoaded; + emit(MarketplaceLoaded([...currentState.listings, ...listings])); + } + } on ApiException catch (e) { + emit(MarketplaceError(e.message)); + } catch (e) { + emit(MarketplaceError('An unexpected error occurred: $e')); + } + } + + Future loadMoreListings({ + required int page, + int limit = 20, + String? search, + int? eventId, + String? venue, + double? minPrice, + double? maxPrice, + double? minOriginalPrice, + double? maxOriginalPrice, + String? eventDateFrom, + String? eventDateTo, + bool? hasSeat, + String sortBy = 'event_date', + String sortOrder = 'asc', + }) async { + try { + final queryParams = { + 'page': page, + 'limit': limit, + 'sort_by': sortBy, + 'sort_order': sortOrder, + }; + + if (search != null && search.isNotEmpty) { + queryParams['search'] = search; + } + if (eventId != null) { + queryParams['event_id'] = eventId; + } + if (venue != null && venue.isNotEmpty) { + queryParams['venue'] = venue; + } + if (minPrice != null) { + queryParams['min_price'] = minPrice; + } + if (maxPrice != null) { + queryParams['max_price'] = maxPrice; + } + if (minOriginalPrice != null) { + queryParams['min_original_price'] = minOriginalPrice; + } + if (maxOriginalPrice != null) { + queryParams['max_original_price'] = maxOriginalPrice; + } + if (eventDateFrom != null && eventDateFrom.isNotEmpty) { + queryParams['event_date_from'] = eventDateFrom; + } + if (eventDateTo != null && eventDateTo.isNotEmpty) { + queryParams['event_date_to'] = eventDateTo; + } + if (hasSeat != null) { + queryParams['has_seat'] = hasSeat; + } + + final newListings = await _resaleRepository.getMarketplaceListingsWithParams(queryParams); + + if (state is MarketplaceLoaded) { + final currentState = state as MarketplaceLoaded; + emit(MarketplaceLoaded([...currentState.listings, ...newListings])); + return newListings.length == limit; // Return true if there might be more data + } + + return false; + } catch (e) { + // Don't emit error state for pagination failures, just return false + return false; + } + } + + Future purchaseTicket(int ticketId) async { + if (state is! MarketplaceLoaded) return; + final loadedState = state as MarketplaceLoaded; + + emit(MarketplacePurchaseInProgress(loadedState.listings, ticketId)); + + try { + await _resaleRepository.purchaseResaleTicket(ticketId); + // Remove the purchased ticket from the list + final updatedListings = loadedState.listings + .where((listing) => listing.ticketId != ticketId) + .toList(); + emit(MarketplaceLoaded(updatedListings)); + } on ApiException { + emit(MarketplaceLoaded(loadedState.listings)); + rethrow; + } catch (e) { + emit(MarketplaceLoaded(loadedState.listings)); + throw Exception('An unexpected error occurred during purchase.'); + } + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/marketplace/cubit/marketplace_state.dart b/frontend/lib/presentation/marketplace/cubit/marketplace_state.dart new file mode 100644 index 0000000..e6f6527 --- /dev/null +++ b/frontend/lib/presentation/marketplace/cubit/marketplace_state.dart @@ -0,0 +1,34 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/resale_ticket_listing.dart'; + +abstract class MarketplaceState extends Equatable { + const MarketplaceState(); + @override + List get props => []; +} + +class MarketplaceInitial extends MarketplaceState {} + +class MarketplaceLoading extends MarketplaceState {} + +class MarketplaceLoaded extends MarketplaceState { + final List listings; + const MarketplaceLoaded(this.listings); + @override + List get props => [listings]; +} + +class MarketplaceError extends MarketplaceState { + final String message; + const MarketplaceError(this.message); + @override + List get props => [message]; +} + +class MarketplacePurchaseInProgress extends MarketplaceLoaded { + final int processingTicketId; + const MarketplacePurchaseInProgress( + super.listings, this.processingTicketId); + @override + List get props => [listings, processingTicketId]; +} diff --git a/frontend/lib/presentation/marketplace/pages/marketplace_page.dart b/frontend/lib/presentation/marketplace/pages/marketplace_page.dart index d9edc0f..40154ec 100644 --- a/frontend/lib/presentation/marketplace/pages/marketplace_page.dart +++ b/frontend/lib/presentation/marketplace/pages/marketplace_page.dart @@ -1,14 +1,1177 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/marketplace/cubit/marketplace_cubit.dart'; +import 'package:resellio/presentation/marketplace/cubit/marketplace_state.dart'; +import 'package:resellio/presentation/common_widgets/enhanced_search_bar.dart'; +import 'package:resellio/presentation/common_widgets/category_chips.dart'; +import 'package:resellio/presentation/common_widgets/content_grid.dart'; +import 'package:resellio/presentation/marketplace/widgets/marketplace_filter_sheet.dart'; +import 'package:resellio/presentation/marketplace/widgets/resale_ticket_card.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; class MarketplacePage extends StatelessWidget { const MarketplacePage({super.key}); @override Widget build(BuildContext context) { - return const PageLayout( + return BlocProvider( + create: (context) => + MarketplaceCubit(context.read()) + ..loadListings(), + child: const _MarketplaceView(), + ); + } +} + +class _MarketplaceView extends StatefulWidget { + const _MarketplaceView(); + + @override + State<_MarketplaceView> createState() => _MarketplaceViewState(); +} + +class _MarketplaceViewState extends State<_MarketplaceView> { + final TextEditingController _searchController = TextEditingController(); + String _searchQuery = ''; + double? _minPrice; + double? _maxPrice; + double? _minOriginalPrice; + double? _maxOriginalPrice; + String? _venue; + String? _eventDateFrom; + String? _eventDateTo; + bool? _hasSeat; + int? _eventId; + + int _currentPage = 1; + static const int _pageSize = 20; + bool _isLoadingMore = false; + bool _hasMoreData = true; + final ScrollController _scrollController = ScrollController(); + + final List _priceRanges = [ + 'All Prices', + 'Under \$50', + '\$50 - \$100', + '\$100 - \$200', + 'Over \$200', + ]; + + final List _sortOptions = [ + 'Event Date', + 'Price: Low to High', + 'Price: High to Low', + 'Event Name', + ]; + + String _selectedPriceRange = 'All Prices'; + String _selectedSort = 'Event Date'; + String _sortBy = 'event_date'; + String _sortOrder = 'asc'; + + @override + void initState() { + super.initState(); + _scrollController.addListener(_onScroll); + } + + @override + void dispose() { + _searchController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + void _onScroll() { + if (_scrollController.position.pixels == + _scrollController.position.maxScrollExtent) { + _loadMoreListings(); + } + } + + void _showFilterSheet() { + showModalBottomSheet( + context: context, + isScrollControlled: true, + backgroundColor: Theme + .of(context) + .colorScheme + .surface, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical(top: Radius.circular(20)), + ), + builder: (context) { + return MarketplaceFilterSheet( + minPrice: _minPrice, + maxPrice: _maxPrice, + minOriginalPrice: _minOriginalPrice, + maxOriginalPrice: _maxOriginalPrice, + venue: _venue, + eventDateFrom: _eventDateFrom, + eventDateTo: _eventDateTo, + hasSeat: _hasSeat, + onApplyFilters: (filters) { + setState(() { + _minPrice = filters['min_price']; + _maxPrice = filters['max_price']; + _minOriginalPrice = filters['min_original_price']; + _maxOriginalPrice = filters['max_original_price']; + _venue = filters['venue']; + _eventDateFrom = filters['event_date_from']; + _eventDateTo = filters['event_date_to']; + _hasSeat = filters['has_seat']; + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + ); + }, + ); + } + + void _showSortDialog() { + showDialog( + context: context, + builder: (context) => + AlertDialog( + title: const Text('Sort Tickets'), + content: Column( + mainAxisSize: MainAxisSize.min, + children: _sortOptions.map((option) { + return RadioListTile( + title: Text(option), + value: option, + groupValue: _selectedSort, + onChanged: (value) { + setState(() { + _selectedSort = value!; + switch (value) { + case 'Event Date': + _sortBy = 'event_date'; + _sortOrder = 'asc'; + break; + case 'Price: Low to High': + _sortBy = 'resell_price'; + _sortOrder = 'asc'; + break; + case 'Price: High to Low': + _sortBy = 'resell_price'; + _sortOrder = 'desc'; + break; + case 'Event Name': + _sortBy = 'event_name'; + _sortOrder = 'asc'; + break; + } + }); + }, + ); + }).toList(), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + ElevatedButton( + onPressed: () { + Navigator.pop(context); + setState(() { + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + child: const Text('Apply'), + ), + ], + ), + ); + } + + void _onSearchChanged(String query) { + setState(() { + _searchQuery = query; + _currentPage = 1; + _hasMoreData = true; + }); + + // Debounce search + Future.delayed(const Duration(milliseconds: 500), () { + if (_searchQuery == query) { + _loadListingsWithFilters(reset: true); + } + }); + } + + void _onPriceRangeChanged(String range) { + setState(() { + _selectedPriceRange = range; + _currentPage = 1; + _hasMoreData = true; + }); + + double? min, max; + switch (range) { + case 'Under \$50': + min = null; + max = 50; + break; + case '\$50 - \$100': + min = 50; + max = 100; + break; + case '\$100 - \$200': + min = 100; + max = 200; + break; + case 'Over \$200': + min = 200; + max = null; + break; + default: + min = null; + max = null; + } + + setState(() { + _minPrice = min; + _maxPrice = max; + }); + + _loadListingsWithFilters(reset: true); + } + + void _loadListingsWithFilters({bool reset = false}) { + if (reset) { + context.read().loadListings( + page: _currentPage, + limit: _pageSize, + search: _searchQuery.isEmpty ? null : _searchQuery, + eventId: _eventId, + venue: _venue, + minPrice: _minPrice, + maxPrice: _maxPrice, + minOriginalPrice: _minOriginalPrice, + maxOriginalPrice: _maxOriginalPrice, + eventDateFrom: _eventDateFrom, + eventDateTo: _eventDateTo, + hasSeat: _hasSeat, + sortBy: _sortBy, + sortOrder: _sortOrder, + reset: true, + ); + } else { + _loadMoreListings(); + } + } + + void _loadMoreListings() { + if (_isLoadingMore || !_hasMoreData) return; + + setState(() { + _isLoadingMore = true; + }); + + context.read().loadMoreListings( + page: _currentPage + 1, + limit: _pageSize, + search: _searchQuery.isEmpty ? null : _searchQuery, + eventId: _eventId, + venue: _venue, + minPrice: _minPrice, + maxPrice: _maxPrice, + minOriginalPrice: _minOriginalPrice, + maxOriginalPrice: _maxOriginalPrice, + eventDateFrom: _eventDateFrom, + eventDateTo: _eventDateTo, + hasSeat: _hasSeat, + sortBy: _sortBy, + sortOrder: _sortOrder, + ).then((hasMore) { + setState(() { + _isLoadingMore = false; + _hasMoreData = hasMore; + if (hasMore) _currentPage++; + }); + }); + } + + bool get _filtersActive => + _minPrice != null || + _maxPrice != null || + _minOriginalPrice != null || + _maxOriginalPrice != null || + _venue != null || + _eventDateFrom != null || + _eventDateTo != null || + _hasSeat != null || + _searchQuery.isNotEmpty || + _selectedPriceRange != 'All Prices'; + + // Enhanced purchase confirmation dialog + Future _showPurchaseConfirmation(BuildContext context, + ResaleTicketListing listing) async { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final numberFormat = NumberFormat.currency(locale: 'en_US', symbol: '\$'); + final dateFormat = DateFormat('EEEE, MMMM d, yyyy'); + final timeFormat = DateFormat('h:mm a'); + + final savings = listing.originalPrice - listing.resellPrice; + final isDiscounted = savings > 0; + + final confirmed = await showDialog( + context: context, + barrierDismissible: false, // Prevent accidental dismissal + builder: (BuildContext context) { + return AlertDialog( + title: Row( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: colorScheme.tertiaryContainer, + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + Icons.confirmation_number, + color: colorScheme.onTertiaryContainer, + size: 24, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Confirm Purchase', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + Text( + 'Review your ticket details', + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + ], + ), + content: SizedBox( + width: 400, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + // Event Information Section + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity( + 0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Event Details', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + color: colorScheme.primary, + ), + ), + const SizedBox(height: 12), + + // Event name + _DetailRow( + icon: Icons.event, + label: 'Event', + value: listing.eventName, + ), + const SizedBox(height: 8), + + // Date and time + _DetailRow( + icon: Icons.calendar_today, + label: 'Date', + value: dateFormat.format(listing.eventDate), + ), + const SizedBox(height: 8), + + _DetailRow( + icon: Icons.access_time, + label: 'Time', + value: timeFormat.format(listing.eventDate), + ), + const SizedBox(height: 8), + + // Venue + _DetailRow( + icon: Icons.location_on, + label: 'Venue', + value: listing.venueName, + ), + ], + ), + ), + + const SizedBox(height: 16), + + // Ticket Information Section + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity( + 0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Ticket Information', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + color: colorScheme.primary, + ), + ), + const SizedBox(height: 12), + + // Ticket type + _DetailRow( + icon: Icons.confirmation_number, + label: 'Type', + value: listing.ticketTypeDescription, + ), + + if (listing.seat != null) ...[ + const SizedBox(height: 8), + _DetailRow( + icon: Icons.event_seat, + label: 'Seat', + value: listing.seat!, + ), + ], + ], + ), + ), + + const SizedBox(height: 16), + + // Price Information Section + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.tertiaryContainer.withOpacity(0.3), + colorScheme.tertiaryContainer.withOpacity(0.1), + ], + ), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.tertiary.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.attach_money, + color: colorScheme.tertiary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Price Breakdown', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + color: colorScheme.tertiary, + ), + ), + ], + ), + const SizedBox(height: 16), + + // Original price + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Original Price:', + style: theme.textTheme.bodyMedium, + ), + Text( + numberFormat.format(listing.originalPrice), + style: theme.textTheme.bodyMedium?.copyWith( + decoration: isDiscounted ? TextDecoration + .lineThrough : null, + color: isDiscounted ? colorScheme + .onSurfaceVariant : null, + ), + ), + ], + ), + + const SizedBox(height: 8), + + // Resale price + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'You Pay:', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + Text( + numberFormat.format(listing.resellPrice), + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + + // Savings indicator + if (isDiscounted) ...[ + const SizedBox(height: 12), + Container( + width: double.infinity, + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.green.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.green.withOpacity(0.3), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.savings, + color: Colors.green.shade700, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'You save ${numberFormat.format(savings)}!', + style: theme.textTheme.titleMedium?.copyWith( + color: Colors.green.shade700, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ], + ], + ), + ), + + const SizedBox(height: 16), + + // Important Notice + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.amber.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.amber.withOpacity(0.3), + ), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon( + Icons.info_outline, + color: Colors.amber.shade700, + size: 20, + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Important Notice', + style: theme.textTheme.labelLarge?.copyWith( + color: Colors.amber.shade700, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + 'This purchase is final and non-refundable. Please verify all details before confirming.', + style: theme.textTheme.bodySmall?.copyWith( + color: Colors.amber.shade700, + ), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + ), + actions: [ + // Cancel button + TextButton( + onPressed: () => Navigator.of(context).pop(false), + child: Text( + 'Cancel', + style: TextStyle(color: colorScheme.onSurfaceVariant), + ), + ), + + // Confirm purchase button + ElevatedButton.icon( + onPressed: () => Navigator.of(context).pop(true), + icon: const Icon(Icons.payment, size: 18), + label: Text('Confirm Purchase • ${numberFormat.format( + listing.resellPrice)}'), + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.tertiary, + foregroundColor: colorScheme.onTertiary, + padding: const EdgeInsets.symmetric( + horizontal: 16, vertical: 12), + ), + ), + ], + ); + }, + ); + + if (confirmed == true && context.mounted) { + await _purchaseTicket(context, listing); + } + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return PageLayout( title: 'Marketplace', - body: Center(child: Text('Marketplace Page - Coming Soon!')), + actions: [ + IconButton( + icon: Icon( + Icons.sort, + color: colorScheme.onSurface, + ), + tooltip: 'Sort Tickets', + onPressed: _showSortDialog, + ), + ], + body: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Enhanced Header Section + Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + colorScheme.tertiaryContainer.withOpacity(0.3), + colorScheme.surface, + ], + ), + ), + child: Column( + children: [ + // Welcome Message + Container( + width: double.infinity, + padding: const EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.storefront, + color: colorScheme.tertiary, + size: 28, + ), + const SizedBox(width: 8), + Text( + 'Ticket Marketplace', + style: theme.textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + const SizedBox(height: 8), + Text( + 'Find great deals on tickets from other fans', + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ], + ), + ), + + // Enhanced Search Bar + Padding( + padding: const EdgeInsets.fromLTRB(16, 8, 16, 16), + child: EnhancedSearchBar( + controller: _searchController, + hintText: 'Search tickets by event, artist, venue...', + searchQuery: _searchQuery, + onSearchChanged: _onSearchChanged, + filtersActive: _filtersActive, + onFilterTap: _showFilterSheet, + ), + ), + + // Price Range Chips + CategoryChips( + categories: _priceRanges, + selectedCategory: _selectedPriceRange, + onCategoryChanged: _onPriceRangeChanged, + ), + + // Active filters indicator + if (_filtersActive) + Container( + width: double.infinity, + padding: const EdgeInsets.symmetric( + horizontal: 16, vertical: 8), + child: Wrap( + spacing: 8, + children: [ + if (_searchQuery.isNotEmpty) + Chip( + label: Text('Search: $_searchQuery'), + onDeleted: () { + _searchController.clear(); + _onSearchChanged(''); + }, + ), + if (_venue != null) + Chip( + label: Text('Venue: $_venue'), + onDeleted: () { + setState(() { + _venue = null; + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + ), + if (_eventDateFrom != null || _eventDateTo != null) + Chip( + label: const Text('Date Filter Active'), + onDeleted: () { + setState(() { + _eventDateFrom = null; + _eventDateTo = null; + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + ), + if (_hasSeat != null) + Chip( + label: Text( + _hasSeat! ? 'With Seats' : 'General Admission'), + onDeleted: () { + setState(() { + _hasSeat = null; + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + ), + ], + ), + ), + ], + ), + ), + + // Marketplace Content + Expanded( + child: BlocConsumer( + listener: (context, state) { + if (state is MarketplaceLoaded && + state is! MarketplacePurchaseInProgress) { + // Success message could be shown here if needed + } + }, + builder: (context, state) { + return RefreshIndicator( + onRefresh: () async { + setState(() { + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + child: BlocStateWrapper( + state: state, + onRetry: () => _loadListingsWithFilters(reset: true), + builder: (loadedState) { + if (loadedState.listings.isEmpty && !_isLoadingMore) { + return _buildEmptyMarketplace(); + } + + return CustomScrollView( + controller: _scrollController, + slivers: [ + SliverToBoxAdapter( + child: _buildMarketplaceStats(loadedState), + ), + SliverPadding( + padding: const EdgeInsets.all(16), + sliver: SliverGrid( + gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: 350, + childAspectRatio: 0.85, + crossAxisSpacing: 16, + mainAxisSpacing: 16, + ), + delegate: SliverChildBuilderDelegate( + (context, index) { + final listing = loadedState.listings[index]; + final isPurchasing = state is MarketplacePurchaseInProgress && + state.processingTicketId == + listing.ticketId; + + return ResaleTicketCard( + listing: listing, + isPurchasing: isPurchasing, + onPurchase: () => + _showPurchaseConfirmation( + context, listing), + ); + }, + childCount: loadedState.listings.length, + ), + ), + ), + if (_isLoadingMore) + const SliverToBoxAdapter( + child: Padding( + padding: EdgeInsets.all(16), + child: Center( + child: CircularProgressIndicator()), + ), + ), + if (!_hasMoreData && loadedState.listings.isNotEmpty) + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.all(16), + child: Center( + child: Text( + 'No more tickets to load', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + ), + ), + ), + const SliverToBoxAdapter( + child: SizedBox(height: 80), + ), + ], + ); + }, + ), + ); + }, + ), + ), + ], + ), + ); + } + + Widget _buildMarketplaceStats(MarketplaceLoaded state) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final totalListings = state.listings.length; + final avgPrice = totalListings > 0 + ? state.listings.map((l) => l.resellPrice).reduce((a, b) => a + b) / + totalListings + : 0.0; + + return Container( + margin: const EdgeInsets.all(16), + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Row( + children: [ + Expanded( + child: _StatChip( + icon: Icons.confirmation_number, + label: 'Available', + value: totalListings.toString(), + color: colorScheme.primary, + ), + ), + const SizedBox(width: 16), + Expanded( + child: _StatChip( + icon: Icons.trending_down, + label: 'Avg Price', + value: NumberFormat + .currency(locale: 'en_US', symbol: '\$') + .format(avgPrice), + color: colorScheme.tertiary, + ), + ), + ], + ), + ); + } + + Widget _buildEmptyMarketplace() { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Center( + child: Padding( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(24), + decoration: BoxDecoration( + color: colorScheme.tertiaryContainer.withOpacity(0.3), + shape: BoxShape.circle, + ), + child: Icon( + Icons.store_outlined, + size: 64, + color: colorScheme.tertiary, + ), + ), + const SizedBox(height: 24), + Text( + 'No Tickets Available', + style: theme.textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8), + Text( + 'There are currently no tickets listed for resale.\nCheck back later for new listings.', + textAlign: TextAlign.center, + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 24), + OutlinedButton.icon( + onPressed: () { + _searchController.clear(); + setState(() { + _searchQuery = ''; + _selectedPriceRange = 'All Prices'; + _minPrice = null; + _maxPrice = null; + _minOriginalPrice = null; + _maxOriginalPrice = null; + _venue = null; + _eventDateFrom = null; + _eventDateTo = null; + _hasSeat = null; + _eventId = null; + _currentPage = 1; + _hasMoreData = true; + }); + _loadListingsWithFilters(reset: true); + }, + icon: const Icon(Icons.refresh), + label: const Text('Refresh'), + ), + ], + ), + ), + ); + } + + Future _purchaseTicket(BuildContext context, + ResaleTicketListing listing) async { + try { + await context.read().purchaseTicket(listing.ticketId); + if (context.mounted) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon(Icons.check_circle, color: Colors.white), + const SizedBox(width: 8), + Expanded( + child: Text( + '${listing.eventName} ticket purchased successfully!'), + ), + ], + ), + backgroundColor: Colors.green, + behavior: SnackBarBehavior.floating, + duration: const Duration(seconds: 4), + ), + ); + } + } catch (e) { + if (context.mounted) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon(Icons.error_outline, color: Colors.white), + const SizedBox(width: 8), + Expanded(child: Text('Purchase failed: ${e.toString()}')), + ], + ), + backgroundColor: Colors.red, + behavior: SnackBarBehavior.floating, + duration: const Duration(seconds: 4), + ), + ); + } + } + } +} + +class _StatChip extends StatelessWidget { + final IconData icon; + final String label; + final String value; + final Color color; + + const _StatChip({ + required this.icon, + required this.label, + required this.value, + required this.color, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(icon, size: 16, color: color), + const SizedBox(width: 4), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + value, + style: theme.textTheme.titleMedium?.copyWith( + color: color, + fontWeight: FontWeight.bold, + ), + ), + Text( + label, + style: theme.textTheme.labelSmall?.copyWith( + color: color.withOpacity(0.7), + ), + ), + ], + ), + ], + ); + } +} + +class _DetailRow extends StatelessWidget { + final IconData icon; + final String label; + final String value; + + const _DetailRow({ + required this.icon, + required this.label, + required this.value, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon( + icon, + size: 16, + color: colorScheme.primary, + ), + const SizedBox(width: 8), + Text( + '$label:', + style: theme.textTheme.bodyMedium?.copyWith( + fontWeight: FontWeight.w500, + color: colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(width: 8), + Expanded( + child: Text( + value, + style: theme.textTheme.bodyMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ), + ], ); } } diff --git a/frontend/lib/presentation/marketplace/widgets/marketplace_filter_sheet.dart b/frontend/lib/presentation/marketplace/widgets/marketplace_filter_sheet.dart new file mode 100644 index 0000000..2caee57 --- /dev/null +++ b/frontend/lib/presentation/marketplace/widgets/marketplace_filter_sheet.dart @@ -0,0 +1,651 @@ +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; +import 'package:resellio/presentation/common_widgets/primary_button.dart'; + +class MarketplaceFilterSheet extends StatefulWidget { + final double? minPrice; + final double? maxPrice; + final double? minOriginalPrice; + final double? maxOriginalPrice; + final String? venue; + final String? eventDateFrom; + final String? eventDateTo; + final bool? hasSeat; + final Function(Map) onApplyFilters; + + const MarketplaceFilterSheet({ + super.key, + this.minPrice, + this.maxPrice, + this.minOriginalPrice, + this.maxOriginalPrice, + this.venue, + this.eventDateFrom, + this.eventDateTo, + this.hasSeat, + required this.onApplyFilters, + }); + + @override + State createState() => _MarketplaceFilterSheetState(); +} + +class _MarketplaceFilterSheetState extends State { + late TextEditingController _minPriceController; + late TextEditingController _maxPriceController; + late TextEditingController _minOriginalPriceController; + late TextEditingController _maxOriginalPriceController; + late TextEditingController _venueController; + late TextEditingController _eventDateFromController; + late TextEditingController _eventDateToController; + + DateTime? _eventDateFrom; + DateTime? _eventDateTo; + bool? _hasSeat; + + @override + void initState() { + super.initState(); + _minPriceController = TextEditingController( + text: widget.minPrice?.toString() ?? '', + ); + _maxPriceController = TextEditingController( + text: widget.maxPrice?.toString() ?? '', + ); + _minOriginalPriceController = TextEditingController( + text: widget.minOriginalPrice?.toString() ?? '', + ); + _maxOriginalPriceController = TextEditingController( + text: widget.maxOriginalPrice?.toString() ?? '', + ); + _venueController = TextEditingController( + text: widget.venue ?? '', + ); + _eventDateFromController = TextEditingController(); + _eventDateToController = TextEditingController(); + + _hasSeat = widget.hasSeat; + + // Parse date strings if provided + if (widget.eventDateFrom != null) { + try { + _eventDateFrom = DateTime.parse(widget.eventDateFrom!); + _eventDateFromController.text = DateFormat('MMM d, yyyy').format(_eventDateFrom!); + } catch (e) { + // Invalid date format, ignore + } + } + + if (widget.eventDateTo != null) { + try { + _eventDateTo = DateTime.parse(widget.eventDateTo!); + _eventDateToController.text = DateFormat('MMM d, yyyy').format(_eventDateTo!); + } catch (e) { + // Invalid date format, ignore + } + } + } + + @override + void dispose() { + _minPriceController.dispose(); + _maxPriceController.dispose(); + _minOriginalPriceController.dispose(); + _maxOriginalPriceController.dispose(); + _venueController.dispose(); + _eventDateFromController.dispose(); + _eventDateToController.dispose(); + super.dispose(); + } + + Future _selectDate(BuildContext context, bool isFromDate) async { + final DateTime? picked = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime.now().subtract(const Duration(days: 365)), + lastDate: DateTime(2026), + ); + + if (picked != null) { + setState(() { + if (isFromDate) { + _eventDateFrom = picked; + _eventDateFromController.text = DateFormat('MMM d, yyyy').format(picked); + } else { + _eventDateTo = picked; + _eventDateToController.text = DateFormat('MMM d, yyyy').format(picked); + } + }); + } + } + + void _applyFilters() { + final filters = { + 'min_price': double.tryParse(_minPriceController.text), + 'max_price': double.tryParse(_maxPriceController.text), + 'min_original_price': double.tryParse(_minOriginalPriceController.text), + 'max_original_price': double.tryParse(_maxOriginalPriceController.text), + 'venue': _venueController.text.isEmpty ? null : _venueController.text, + 'event_date_from': _eventDateFrom?.toIso8601String().split('T')[0], + 'event_date_to': _eventDateTo?.toIso8601String().split('T')[0], + 'has_seat': _hasSeat, + }; + + widget.onApplyFilters(filters); + Navigator.pop(context); + } + + void _clearFilters() { + _minPriceController.clear(); + _maxPriceController.clear(); + _minOriginalPriceController.clear(); + _maxOriginalPriceController.clear(); + _venueController.clear(); + _eventDateFromController.clear(); + _eventDateToController.clear(); + + setState(() { + _eventDateFrom = null; + _eventDateTo = null; + _hasSeat = null; + }); + + widget.onApplyFilters({ + 'min_price': null, + 'max_price': null, + 'min_original_price': null, + 'max_original_price': null, + 'venue': null, + 'event_date_from': null, + 'event_date_to': null, + 'has_seat': null, + }); + Navigator.pop(context); + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), + ), + child: Padding( + padding: EdgeInsets.fromLTRB( + 24, + 24, + 24, + 24 + MediaQuery.of(context).viewInsets.bottom, + ), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Header + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon( + Icons.tune, + color: colorScheme.primary, + ), + const SizedBox(width: 8), + Text( + 'Filter Tickets', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + IconButton( + icon: const Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ], + ), + + const SizedBox(height: 24), + + // Venue Filter + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.location_on, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Venue', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _venueController, + labelText: 'Venue Name', + keyboardType: TextInputType.text, + ), + ], + ), + ), + + const SizedBox(height: 16), + + // Event Date Range + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.date_range, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Event Date Range', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _eventDateFromController, + labelText: 'From Date', + readOnly: true, + onTap: () => _selectDate(context, true), + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _eventDateToController, + labelText: 'To Date', + readOnly: true, + onTap: () => _selectDate(context, false), + ), + ), + ], + ), + ], + ), + ), + + const SizedBox(height: 16), + + // Resale Price Range + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.sell, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Resale Price Range', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _minPriceController, + labelText: 'Min Resale Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _maxPriceController, + labelText: 'Max Resale Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + ], + ), + ], + ), + ), + + const SizedBox(height: 16), + + // Original Price Range + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.attach_money, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Original Price Range', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _minOriginalPriceController, + labelText: 'Min Original Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _maxOriginalPriceController, + labelText: 'Max Original Price', + prefixText: '\$ ', + keyboardType: TextInputType.number, + ), + ), + ], + ), + ], + ), + ), + + const SizedBox(height: 16), + + // Seat Type Filter + Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon( + Icons.event_seat, + color: colorScheme.primary, + size: 20, + ), + const SizedBox(width: 8), + Text( + 'Seat Type', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: RadioListTile( + title: const Text('All Tickets'), + value: null, + groupValue: _hasSeat, + onChanged: (value) { + setState(() { + _hasSeat = value; + }); + }, + contentPadding: EdgeInsets.zero, + ), + ), + Expanded( + child: RadioListTile( + title: const Text('With Seats'), + value: true, + groupValue: _hasSeat, + onChanged: (value) { + setState(() { + _hasSeat = value; + }); + }, + contentPadding: EdgeInsets.zero, + ), + ), + ], + ), + RadioListTile( + title: const Text('General Admission'), + value: false, + groupValue: _hasSeat, + onChanged: (value) { + setState(() { + _hasSeat = value; + }); + }, + contentPadding: EdgeInsets.zero, + ), + ], + ), + ), + + const SizedBox(height: 24), + + // Quick Price Options + Text( + 'Quick Filters', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 12), + Wrap( + spacing: 8, + runSpacing: 8, + children: [ + _QuickFilterChip( + label: 'Under \$50', + onTap: () { + _minPriceController.clear(); + _maxPriceController.text = '50'; + }, + ), + _QuickFilterChip( + label: '\$50 - \$100', + onTap: () { + _minPriceController.text = '50'; + _maxPriceController.text = '100'; + }, + ), + _QuickFilterChip( + label: '\$100 - \$200', + onTap: () { + _minPriceController.text = '100'; + _maxPriceController.text = '200'; + }, + ), + _QuickFilterChip( + label: 'Over \$200', + onTap: () { + _minPriceController.text = '200'; + _maxPriceController.clear(); + }, + ), + _QuickFilterChip( + label: 'This Weekend', + onTap: () { + final now = DateTime.now(); + final weekday = now.weekday; + final daysUntilSaturday = (6 - weekday) % 7; + final saturday = now.add(Duration(days: daysUntilSaturday)); + final sunday = saturday.add(const Duration(days: 1)); + + setState(() { + _eventDateFrom = saturday; + _eventDateTo = sunday; + _eventDateFromController.text = DateFormat('MMM d, yyyy').format(saturday); + _eventDateToController.text = DateFormat('MMM d, yyyy').format(sunday); + }); + }, + ), + _QuickFilterChip( + label: 'Next 7 Days', + onTap: () { + final now = DateTime.now(); + final nextWeek = now.add(const Duration(days: 7)); + + setState(() { + _eventDateFrom = now; + _eventDateTo = nextWeek; + _eventDateFromController.text = DateFormat('MMM d, yyyy').format(now); + _eventDateToController.text = DateFormat('MMM d, yyyy').format(nextWeek); + }); + }, + ), + _QuickFilterChip( + label: 'Great Deals', + onTap: () { + // Show tickets where resale price is lower than original price + // This is a conceptual filter - would need backend support + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Great Deals filter coming soon!'), + ), + ); + }, + ), + ], + ), + + const SizedBox(height: 32), + + // Action Buttons + Row( + children: [ + Expanded( + child: OutlinedButton.icon( + onPressed: _clearFilters, + icon: const Icon(Icons.clear_all), + label: const Text('Clear All'), + style: OutlinedButton.styleFrom( + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + const SizedBox(width: 16), + Expanded( + flex: 2, + child: PrimaryButton( + text: 'APPLY FILTERS', + onPressed: _applyFilters, + icon: Icons.check, + ), + ), + ], + ), + ], + ), + ), + ), + ); + } +} + +class _QuickFilterChip extends StatelessWidget { + final String label; + final VoidCallback onTap; + + const _QuickFilterChip({ + required this.label, + required this.onTap, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return ActionChip( + label: Text(label), + onPressed: onTap, + backgroundColor: colorScheme.surfaceContainerHighest, + labelStyle: TextStyle( + color: colorScheme.onSurfaceVariant, + fontSize: 12, + ), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/marketplace/widgets/resale_ticket_card.dart b/frontend/lib/presentation/marketplace/widgets/resale_ticket_card.dart new file mode 100644 index 0000000..1ddc41a --- /dev/null +++ b/frontend/lib/presentation/marketplace/widgets/resale_ticket_card.dart @@ -0,0 +1,315 @@ +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/resale_ticket_listing.dart'; + +class ResaleTicketCard extends StatelessWidget { + final ResaleTicketListing listing; + final VoidCallback onPurchase; + final bool isPurchasing; + + const ResaleTicketCard({ + super.key, + required this.listing, + required this.onPurchase, + this.isPurchasing = false, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final savings = listing.originalPrice - listing.resellPrice; + final savingsPercent = listing.originalPrice > 0 + ? (savings / listing.originalPrice * 100).round() + : 0; + final isDiscounted = savings > 0; + + return Card( + clipBehavior: Clip.antiAlias, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: BorderSide( + color: colorScheme.outlineVariant.withOpacity(0.3), + ), + ), + child: Material( + color: Colors.transparent, + child: InkWell( + onTap: isPurchasing ? null : onPurchase, + borderRadius: BorderRadius.circular(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Header with event image placeholder and discount badge + Expanded( + flex: 2, + child: Stack( + children: [ + Container( + width: double.infinity, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.tertiaryContainer, + colorScheme.tertiaryContainer.withOpacity(0.7), + ], + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.confirmation_number, + size: 32, + color: colorScheme.onTertiaryContainer, + ), + const SizedBox(height: 8), + Text( + 'RESALE', + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.onTertiaryContainer, + fontWeight: FontWeight.bold, + letterSpacing: 1.2, + ), + ), + ], + ), + ), + + // Discount badge + if (isDiscounted) + Positioned( + top: 8, + right: 8, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: Colors.green, + borderRadius: BorderRadius.circular(12), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.2), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: Text( + '$savingsPercent% OFF', + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.white, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + + // Date badge + Positioned( + top: 8, + left: 8, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: colorScheme.surface.withOpacity(0.95), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: colorScheme.tertiary.withOpacity(0.3), + ), + ), + child: Text( + DateFormat('MMM d').format(listing.eventDate), + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + ], + ), + ), + + // Content section + Expanded( + flex: 3, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Event name + Text( + listing.eventName, + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + height: 1.2, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + + const SizedBox(height: 8), + + // Venue and ticket info + Row( + children: [ + Icon( + Icons.location_on_outlined, + size: 14, + color: colorScheme.tertiary, + ), + const SizedBox(width: 4), + Expanded( + child: Text( + listing.venueName, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + + const SizedBox(height: 4), + + // Ticket type and seat info (removed duplicate) + Row( + children: [ + Icon( + Icons.event_seat_outlined, + size: 14, + color: colorScheme.tertiary, + ), + const SizedBox(width: 4), + Expanded( + child: Text( + listing.seat != null + ? '${listing.ticketTypeDescription} - ${listing.seat}' + : listing.ticketTypeDescription, + style: theme.textTheme.bodySmall?.copyWith( + color: colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + + const Spacer(), + + // Price section + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (isDiscounted) + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(listing.originalPrice), + style: theme.textTheme.bodySmall?.copyWith( + decoration: TextDecoration.lineThrough, + color: colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(listing.resellPrice), + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.bold, + ), + ), + if (isDiscounted) + Container( + padding: const EdgeInsets.symmetric( + horizontal: 6, + vertical: 2, + ), + decoration: BoxDecoration( + color: Colors.green.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + ), + child: Text( + 'Save ${NumberFormat.currency(locale: 'en_US', symbol: '\$').format(savings)}', + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.green.shade700, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ], + ), + + const SizedBox(height: 12), + + // Purchase button + SizedBox( + width: double.infinity, + child: ElevatedButton( + onPressed: isPurchasing ? null : onPurchase, + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.tertiary, + foregroundColor: colorScheme.onTertiary, + padding: const EdgeInsets.symmetric(vertical: 12), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + ), + elevation: 0, + ), + child: isPurchasing + ? SizedBox( + height: 20, + width: 20, + child: CircularProgressIndicator( + strokeWidth: 2, + color: colorScheme.onTertiary, + ), + ) + : const Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.shopping_cart_outlined, + size: 18, + ), + SizedBox(width: 8), + Text( + 'Buy Now', + style: TextStyle( + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + ), + ], + ), + ), + ), + ], + ), + ), + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/organizer/cubit/event_form_cubit.dart b/frontend/lib/presentation/organizer/cubit/event_form_cubit.dart new file mode 100644 index 0000000..bbbc8b8 --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/event_form_cubit.dart @@ -0,0 +1,149 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/organizer/cubit/event_form_state.dart'; + +class EventFormCubit extends Cubit { + final EventRepository _eventRepository; + + EventFormCubit(this._eventRepository) : super(EventFormInitial()); + + Future loadPrerequisites() async { + try { + emit(EventFormPrerequisitesLoading()); + final locations = await _eventRepository.getLocations(); + emit(EventFormPrerequisitesLoaded(locations: locations)); + } on ApiException catch (e) { + emit(EventFormError(e.message)); + } catch (e) { + emit(EventFormError('An unexpected error occurred: $e')); + } + } + + Future createEvent(EventCreate eventData) async { + if (state is! EventFormPrerequisitesLoaded) return; + final loadedState = state as EventFormPrerequisitesLoaded; + + try { + emit(EventFormSubmitting(locations: loadedState.locations)); + final newEvent = await _eventRepository.createEvent(eventData); + emit(EventFormSuccess(newEvent.id)); + } on ApiException catch (e) { + emit(EventFormError(e.message)); + // Revert to loaded state on error to keep the form usable + emit(EventFormPrerequisitesLoaded(locations: loadedState.locations)); + } catch (e) { + emit(EventFormError('An unexpected error occurred: $e')); + emit(EventFormPrerequisitesLoaded(locations: loadedState.locations)); + } + } + + Future loadExistingTicketTypes(int eventId) async { + try { + emit(EventFormTicketTypesLoading()); + final ticketTypes = await _eventRepository.getTicketTypesForEvent(eventId); + emit(EventFormTicketTypesLoaded(ticketTypes)); + } on ApiException catch (e) { + emit(EventFormError('Failed to load ticket types: ${e.message}')); + } catch (e) { + emit(EventFormError('Failed to load ticket types: $e')); + } + } + + Future updateEvent(int eventId, Map eventData) async { + try { + emit(const EventFormSubmitting(locations: [])); + final updatedEvent = await _eventRepository.updateEvent(eventId, eventData); + emit(EventFormSuccess(updatedEvent.id)); + } on ApiException catch (e) { + emit(EventFormError(e.message)); + } catch (e) { + emit(EventFormError('An unexpected error occurred: $e')); + } + } + + /// Update event details only - ticket types are managed separately + Future updateEventWithTicketTypes( + int eventId, + Map eventData, + List newTicketTypes + ) async { + try { + emit(const EventFormSubmitting(locations: [])); + + // 1. Update the event details first + await _eventRepository.updateEvent(eventId, eventData); + + // 2. Create only NEW ticket types (no deletion/updating of existing ones) + for (final ticketType in newTicketTypes) { + if (ticketType.typeId == null) { + await _createSingleTicketType(eventId, ticketType); + print('Created new ticket type: ${ticketType.description}'); + } + } + + emit(EventFormSuccess(eventId)); + } on ApiException catch (e) { + emit(EventFormError(e.message)); + } catch (e) { + emit(EventFormError('Failed to update event: $e')); + } + } + + bool canDeleteTicketType(TicketType ticketType) { + if (ticketType.availableFrom == null) return false; + return ticketType.availableFrom!.isAfter(DateTime.now()); + } + + Future deleteTicketType(int typeId, TicketType ticketType) async { + try { + // Check if deletion is allowed + if (!canDeleteTicketType(ticketType)) { + emit(EventFormError( + 'Cannot delete ticket type "${ticketType.description ?? ''}" - sales have already started or no availability date set.' + )); + return; + } + + await _eventRepository.deleteTicketType(typeId); + emit(EventFormTicketTypeDeleted()); + + if (ticketType.eventId != null) { + await loadExistingTicketTypes(ticketType.eventId); + } + } on ApiException catch (e) { + emit(EventFormError(e.message)); + } catch (e) { + emit(EventFormError('Failed to delete ticket type: $e')); + } + } + + Future _createSingleTicketType(int eventId, TicketType ticketType) async { + if (ticketType.availableFrom == null) { + throw Exception('Available from date is required for ticket type: ${ticketType.description}'); + } + + await _eventRepository.createTicketType({ + 'event_id': eventId, + 'description': ticketType.description ?? '', + 'max_count': ticketType.maxCount, + 'price': ticketType.price, + 'currency': ticketType.currency, + 'available_from': ticketType.availableFrom!.toIso8601String(), + }); + } + + Future createTicketType(int eventId, TicketType ticketType) async { + try { + await _createSingleTicketType(eventId, ticketType); + emit(EventFormTicketTypeCreated()); + + await loadExistingTicketTypes(eventId); + } on ApiException catch (e) { + emit(EventFormError(e.message)); + } catch (e) { + emit(EventFormError('Failed to create ticket type: $e')); + } + } +} diff --git a/frontend/lib/presentation/organizer/cubit/event_form_state.dart b/frontend/lib/presentation/organizer/cubit/event_form_state.dart new file mode 100644 index 0000000..8ba10f6 --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/event_form_state.dart @@ -0,0 +1,59 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +abstract class EventFormState extends Equatable { + const EventFormState(); + + @override + List get props => []; +} + +class EventFormInitial extends EventFormState {} + +class EventFormPrerequisitesLoading extends EventFormState {} + +class EventFormPrerequisitesLoaded extends EventFormState { + final List locations; + + const EventFormPrerequisitesLoaded({required this.locations}); + + @override + List get props => [locations]; +} + +class EventFormSubmitting extends EventFormPrerequisitesLoaded { + const EventFormSubmitting({required super.locations}); +} + +class EventFormSuccess extends EventFormState { + final int eventId; + + const EventFormSuccess(this.eventId); + + @override + List get props => [eventId]; +} + +class EventFormError extends EventFormState { + final String message; + + const EventFormError(this.message); + + @override + List get props => [message]; +} + +class EventFormTicketTypesLoading extends EventFormState {} + +class EventFormTicketTypesLoaded extends EventFormState { + final List ticketTypes; + + const EventFormTicketTypesLoaded(this.ticketTypes); + + @override + List get props => [ticketTypes]; +} + +class EventFormTicketTypeCreated extends EventFormState {} + +class EventFormTicketTypeDeleted extends EventFormState {} diff --git a/frontend/lib/presentation/organizer/cubit/my_events_cubit.dart b/frontend/lib/presentation/organizer/cubit/my_events_cubit.dart new file mode 100644 index 0000000..26849b9 --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/my_events_cubit.dart @@ -0,0 +1,78 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/user_model.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/organizer/cubit/my_events_state.dart'; + +class MyEventsCubit extends Cubit { + final EventRepository _eventRepository; + final AuthService _authService; + + MyEventsCubit(this._eventRepository, this._authService) + : super(MyEventsInitial()); + + Future loadEvents() async { + try { + emit(MyEventsLoading()); + + final profile = _authService.detailedProfile; + if (profile is! OrganizerProfile) { + emit(const MyEventsError("User is not a valid organizer.")); + return; + } + + final events = + await _eventRepository.getOrganizerEvents(profile.organizerId); + emit(MyEventsLoaded(allEvents: events)); + } on ApiException catch (e) { + emit(MyEventsError(e.message)); + } catch (e) { + emit(MyEventsError("An unexpected error occurred: $e")); + } + } + + void setFilter(EventStatusFilter filter) { + if (state is MyEventsLoaded) { + final loadedState = state as MyEventsLoaded; + emit(MyEventsLoaded( + allEvents: loadedState.allEvents, + activeFilter: filter, + )); + } + } + + Future cancelEvent(int eventId) async { + if (state is! MyEventsLoaded) return; + final loadedState = state as MyEventsLoaded; + emit(MyEventsActionInProgress( + allEvents: loadedState.allEvents, + activeFilter: loadedState.activeFilter)); + try { + await _eventRepository.cancelEvent(eventId); + await loadEvents(); + } on ApiException catch (e) { + emit(MyEventsError(e.message)); + } catch (e) { + emit(const MyEventsError("Failed to cancel event.")); + } + } + + Future notifyParticipants(int eventId, String message) async { + if (state is! MyEventsLoaded) return; + final loadedState = state as MyEventsLoaded; + emit(MyEventsActionInProgress( + allEvents: loadedState.allEvents, + activeFilter: loadedState.activeFilter)); + try { + await _eventRepository.notifyParticipants(eventId, message); + emit(MyEventsLoaded( + allEvents: loadedState.allEvents, + activeFilter: loadedState.activeFilter)); + } on ApiException catch (e) { + emit(MyEventsError(e.message)); + } catch (e) { + emit(const MyEventsError("Failed to send notification.")); + } + } +} diff --git a/frontend/lib/presentation/organizer/cubit/my_events_state.dart b/frontend/lib/presentation/organizer/cubit/my_events_state.dart new file mode 100644 index 0000000..ff8434c --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/my_events_state.dart @@ -0,0 +1,62 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +enum EventStatusFilter { all, active, pending, cancelled } + +abstract class MyEventsState extends Equatable { + const MyEventsState(); + @override + List get props => []; +} + +class MyEventsInitial extends MyEventsState {} + +class MyEventsLoading extends MyEventsState {} + +class MyEventsLoaded extends MyEventsState { + final List allEvents; + final EventStatusFilter activeFilter; + + const MyEventsLoaded({ + required this.allEvents, + this.activeFilter = EventStatusFilter.all, + }); + + List get filteredEvents { + switch (activeFilter) { + case EventStatusFilter.active: + return allEvents + .where((event) => event.status.toLowerCase() == EventStatus.created) + .toList(); + case EventStatusFilter.pending: + return allEvents + .where((event) => event.status.toLowerCase() == EventStatus.pending) + .toList(); + case EventStatusFilter.cancelled: + return allEvents + .where( + (event) => event.status.toLowerCase() == EventStatus.cancelled) + .toList(); + case EventStatusFilter.all: + default: + return allEvents; + } + } + + @override + List get props => [allEvents, activeFilter]; +} + +class MyEventsError extends MyEventsState { + final String message; + const MyEventsError(this.message); + @override + List get props => [message]; +} + +class MyEventsActionInProgress extends MyEventsLoaded { + const MyEventsActionInProgress({ + required super.allEvents, + required super.activeFilter, + }); +} diff --git a/frontend/lib/presentation/organizer/cubit/organizer_dashboard_cubit.dart b/frontend/lib/presentation/organizer/cubit/organizer_dashboard_cubit.dart new file mode 100644 index 0000000..da2e972 --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/organizer_dashboard_cubit.dart @@ -0,0 +1,65 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/organizer/cubit/organizer_dashboard_state.dart'; + +class OrganizerDashboardCubit extends Cubit { + final EventRepository _eventRepository; + final AuthService _authService; + final UserRepository _userRepository; + + OrganizerDashboardCubit( + this._eventRepository, this._authService, this._userRepository) + : super(OrganizerDashboardInitial()); + + Future loadDashboard() async { + try { + emit(OrganizerDashboardLoading()); + + final profile = await _userRepository.getUserProfile(); + _authService.updateDetailedProfile(profile); + + if (profile is! OrganizerProfile) { + emit(const OrganizerDashboardError("User is not a valid organizer.")); + return; + } + + if (!profile.isVerified) { + emit(OrganizerDashboardUnverified( + 'Your account is pending verification.')); + return; + } + + final organizerId = profile.organizerId; + final events = await _eventRepository.getOrganizerEvents(organizerId); + emit(OrganizerDashboardLoaded(events)); + } on ApiException catch (e) { + emit(OrganizerDashboardError(e.message)); + } catch (e) { + emit(OrganizerDashboardError("An unexpected error occurred: $e")); + } + } + + Future cancelEvent(int eventId) async { + try { + await _eventRepository.cancelEvent(eventId); + await loadDashboard(); + } on ApiException catch (e) { + emit(OrganizerDashboardError(e.message)); + } catch (e) { + emit(OrganizerDashboardError("Failed to cancel event.")); + } + } + + Future notifyParticipants(int eventId, String message) async { + try { + await _eventRepository.notifyParticipants(eventId, message); + } on ApiException catch (e) { + emit(OrganizerDashboardError(e.message)); + } catch (e) { + emit(OrganizerDashboardError("Failed to send notification.")); + } + } +} diff --git a/frontend/lib/presentation/organizer/cubit/organizer_dashboard_state.dart b/frontend/lib/presentation/organizer/cubit/organizer_dashboard_state.dart new file mode 100644 index 0000000..7f764b9 --- /dev/null +++ b/frontend/lib/presentation/organizer/cubit/organizer_dashboard_state.dart @@ -0,0 +1,33 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +abstract class OrganizerDashboardState extends Equatable { + const OrganizerDashboardState(); + @override + List get props => []; +} + +class OrganizerDashboardInitial extends OrganizerDashboardState {} + +class OrganizerDashboardLoading extends OrganizerDashboardState {} + +class OrganizerDashboardLoaded extends OrganizerDashboardState { + final List events; + const OrganizerDashboardLoaded(this.events); + @override + List get props => [events]; +} + +class OrganizerDashboardError extends OrganizerDashboardState { + final String message; + const OrganizerDashboardError(this.message); + @override + List get props => [message]; +} + +class OrganizerDashboardUnverified extends OrganizerDashboardState { + final String message; + const OrganizerDashboardUnverified(this.message); + @override + List get props => [message]; +} diff --git a/frontend/lib/presentation/organizer/pages/create_event_page.dart b/frontend/lib/presentation/organizer/pages/create_event_page.dart new file mode 100644 index 0000000..3d858a1 --- /dev/null +++ b/frontend/lib/presentation/organizer/pages/create_event_page.dart @@ -0,0 +1,331 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; +import 'package:resellio/presentation/common_widgets/primary_button.dart'; +import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/organizer/cubit/event_form_cubit.dart'; +import 'package:resellio/presentation/organizer/cubit/event_form_state.dart'; + +class CreateEventPage extends StatelessWidget { + const CreateEventPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => EventFormCubit(context.read()) + ..loadPrerequisites(), + child: const _CreateEventView(), + ); + } +} + +class _CreateEventView extends StatefulWidget { + const _CreateEventView(); + + @override + State<_CreateEventView> createState() => _CreateEventViewState(); +} + +class _CreateEventViewState extends State<_CreateEventView> { + final _formKey = GlobalKey(); + + final _nameController = TextEditingController(); + final _descriptionController = TextEditingController(); + final _totalTicketsController = TextEditingController(); + final _minimumAgeController = TextEditingController(); + final _startDateController = TextEditingController(); + final _endDateController = TextEditingController(); + + // Standard Ticket Controllers + final _standardTicketPriceController = TextEditingController(); + final _ticketSalesStartDateTimeController = TextEditingController(); + + DateTime? _startDate; + DateTime? _endDate; + DateTime? _ticketSalesStartDateTime; + int? _selectedLocationId; + final List _selectedCategories = []; + + final List _availableCategories = [ + 'Music', 'Sports', 'Arts', 'Food', 'Technology', 'Festival', 'Conference' + ]; + + @override + void dispose() { + _nameController.dispose(); + _descriptionController.dispose(); + _totalTicketsController.dispose(); + _minimumAgeController.dispose(); + _startDateController.dispose(); + _endDateController.dispose(); + _standardTicketPriceController.dispose(); + _ticketSalesStartDateTimeController.dispose(); + super.dispose(); + } + + Future _selectDateTime(BuildContext context, String dateType) async { + final DateTime? date = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime.now(), + lastDate: DateTime(2101), + ); + if (date == null) return; + + final TimeOfDay? time = await showTimePicker( + context: context, + initialTime: TimeOfDay.fromDateTime(DateTime.now()), + ); + if (time == null) return; + + final selectedDateTime = + DateTime(date.year, date.month, date.day, time.hour, time.minute); + + setState(() { + if (dateType == "start") { + _startDate = selectedDateTime; + _startDateController.text = + DateFormat.yMd().add_jm().format(selectedDateTime); + } else if (dateType == "end") { + _endDate = selectedDateTime; + _endDateController.text = + DateFormat.yMd().add_jm().format(selectedDateTime); + } else if (dateType == "ticket") { + _ticketSalesStartDateTime = selectedDateTime; + _ticketSalesStartDateTimeController.text = + DateFormat.yMd().add_jm().format(selectedDateTime); + } + }); + } + + void _submitForm() { + if (_formKey.currentState!.validate()) { + if (_startDate == null || _endDate == null || _selectedLocationId == null || _ticketSalesStartDateTime == null) { + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + content: Text('Please fill all required fields.'), + backgroundColor: Colors.red, + )); + return; + } + if (_endDate!.isBefore(_startDate!)) { + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + content: Text('Event end date cannot be before event start date.'), + backgroundColor: Colors.red, + )); + return; + } + if (_ticketSalesStartDateTime!.isAfter(_startDate!)) { + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + content: Text('Ticket sales start date cannot be after the event start date.'), + backgroundColor: Colors.red, + )); + return; + } + if (!_ticketSalesStartDateTime!.isAfter(DateTime.now())) { + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + content: Text('Ticket sales start date must be in the future.'), + backgroundColor: Colors.red, + )); + return; + } + + + final eventData = EventCreate( + name: _nameController.text.trim(), + description: _descriptionController.text.trim(), + startDate: _startDate!, + endDate: _endDate!, + locationId: _selectedLocationId!, + category: _selectedCategories, + totalTickets: int.parse(_totalTicketsController.text.trim()), + minimumAge: int.tryParse(_minimumAgeController.text.trim()), + standardTicketPrice: double.parse(_standardTicketPriceController.text.trim()), + ticketSalesStartDateTime: _ticketSalesStartDateTime!, + ); + context.read().createEvent(eventData); + } + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + return PageLayout( + title: 'Create New Event', + showBackButton: true, + showCartButton: false, + body: BlocConsumer( + listener: (context, state) { + if (state is EventFormSuccess) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Event created successfully! Awaiting authorization.'), + backgroundColor: Colors.green), + ); + context.go('/home/organizer'); + } + if (state is EventFormError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: ${state.message}'), + backgroundColor: Colors.red), + ); + } + }, + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => + context.read().loadPrerequisites(), + builder: (loadedState) { + return SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Form( + key: _formKey, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text("Event Details", style: theme.textTheme.headlineSmall), + const SizedBox(height: 20), + CustomTextFormField( + controller: _nameController, + labelText: 'Event Name', + validator: (v) => + v!.isEmpty ? 'Event name is required' : null, + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _selectedLocationId, + onChanged: (value) { + setState(() => _selectedLocationId = value); + }, + items: loadedState.locations.map((location) { + return DropdownMenuItem( + value: location.locationId, + child: Text(location.name), + ); + }).toList(), + decoration: const InputDecoration(labelText: 'Location'), + validator: (v) => + v == null ? 'Location is required' : null, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _startDateController, + labelText: 'Start Date & Time', + readOnly: true, + onTap: () => _selectDateTime(context, "start"), + validator: (v) => + v!.isEmpty ? 'Start date is required' : null, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _endDateController, + labelText: 'End Date & Time', + readOnly: true, + onTap: () => _selectDateTime(context, "end"), + validator: (v) => + v!.isEmpty ? 'End date is required' : null, + ), + const SizedBox(height: 24), + Text('Categories', style: Theme.of(context).textTheme.titleMedium), + const SizedBox(height: 8), + Wrap( + spacing: 8.0, + children: _availableCategories.map((category) { + final isSelected = _selectedCategories.contains(category); + return ChoiceChip( + label: Text(category), + selected: isSelected, + onSelected: (selected) { + setState(() { + if (selected) { + _selectedCategories.add(category); + } else { + _selectedCategories.remove(category); + } + }); + }, + ); + }).toList(), + ), + const SizedBox(height: 24), + CustomTextFormField( + controller: _descriptionController, + labelText: 'Event description', + keyboardType: TextInputType.multiline, + maxLines: 4, + ), + const SizedBox(height: 16), + Text("Standard Ticket Configuration", style: theme.textTheme.headlineSmall), + const SizedBox(height: 20), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _totalTicketsController, + labelText: 'Total Tickets', + keyboardType: TextInputType.number, + validator: (v) { + if (v!.isEmpty) return 'Total tickets is required'; + if (int.tryParse(v) == null || int.parse(v) <= 0) { + return 'Enter a valid number'; + } + return null; + }, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _minimumAgeController, + labelText: 'Minimum Age (Optional)', + keyboardType: TextInputType.number, + ), + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _standardTicketPriceController, + labelText: 'Std. Ticket Price (\$)*', + prefixText: '\$ ', + keyboardType: const TextInputType.numberWithOptions(decimal: true), + validator: (v) { + if (v!.trim().isEmpty) return 'Standard ticket price is required'; + if (double.tryParse(v.trim()) == null || double.parse(v.trim()) < 0) { // allow 0 for free tickets + return 'Enter a valid price (e.g., 0 or more)'; + } + return null; + }, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _ticketSalesStartDateTimeController, + labelText: 'Standard ticket sale start date', + readOnly: true, + onTap: () => _selectDateTime(context, "ticket"), + validator: (v) => + v!.isEmpty ? 'Ticket sale start date is required' : null, + ), + const SizedBox(height: 32), + PrimaryButton( + text: 'CREATE EVENT', + onPressed: _submitForm, + isLoading: state is EventFormSubmitting, + ), + ], + ), + ), + ); + }, + ); + }, + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/pages/edit_event_page.dart b/frontend/lib/presentation/organizer/pages/edit_event_page.dart new file mode 100644 index 0000000..f879ff5 --- /dev/null +++ b/frontend/lib/presentation/organizer/pages/edit_event_page.dart @@ -0,0 +1,468 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; +import 'package:resellio/presentation/common_widgets/primary_button.dart'; +import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/organizer/cubit/event_form_cubit.dart'; +import 'package:resellio/presentation/organizer/cubit/event_form_state.dart'; +import 'package:resellio/presentation/organizer/widgets/ticket_type_form.dart'; + +class EditEventPage extends StatelessWidget { + final Event event; + const EditEventPage({super.key, required this.event}); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => EventFormCubit(context.read()) + ..loadExistingTicketTypes(event.id), + child: _EditEventView(event: event), + ); + } +} + +class _EditEventView extends StatefulWidget { + final Event event; + const _EditEventView({required this.event}); + + @override + State<_EditEventView> createState() => _EditEventViewState(); +} + +class _EditEventViewState extends State<_EditEventView> { + final _formKey = GlobalKey(); + final _nameController = TextEditingController(); + final _descriptionController = TextEditingController(); + final _minimumAgeController = TextEditingController(); + final _startDateController = TextEditingController(); + final _endDateController = TextEditingController(); + + DateTime? _startDate; + DateTime? _endDate; + + // FIXED: Changed from TicketTypeData to TicketType + List _additionalTicketTypes = []; + + @override + void initState() { + super.initState(); + _nameController.text = widget.event.name; + _descriptionController.text = widget.event.description ?? ''; + _minimumAgeController.text = widget.event.minimumAge?.toString() ?? ''; + _startDate = widget.event.start; + _endDate = widget.event.end; + _startDateController.text = DateFormat.yMd().add_jm().format(_startDate!); + _endDateController.text = DateFormat.yMd().add_jm().format(_endDate!); + } + + @override + void dispose() { + _nameController.dispose(); + _descriptionController.dispose(); + _minimumAgeController.dispose(); + _startDateController.dispose(); + _endDateController.dispose(); + super.dispose(); + } + + Future _selectDateTime(BuildContext context, bool isStart) async { + final DateTime? date = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime.now(), + lastDate: DateTime(2101), + ); + if (date == null) return; + + final TimeOfDay? time = await showTimePicker( + context: context, + initialTime: TimeOfDay.fromDateTime(DateTime.now()), + ); + if (time == null) return; + + final selectedDateTime = + DateTime(date.year, date.month, date.day, time.hour, time.minute); + + setState(() { + if (isStart) { + _startDate = selectedDateTime; + _startDateController.text = + DateFormat.yMd().add_jm().format(selectedDateTime); + } else { + _endDate = selectedDateTime; + _endDateController.text = + DateFormat.yMd().add_jm().format(selectedDateTime); + } + }); + } + + void _addTicketType() { + setState(() { + _additionalTicketTypes.add(TicketType( + eventId: widget.event.id, + description: '', + maxCount: 0, + price: 0.0, + currency: 'USD', + availableFrom: DateTime.now().add(Duration(hours: 1)), + )); + }); + } + + void _removeTicketType(int index) { + setState(() { + _additionalTicketTypes.removeAt(index); + }); + } + + void _updateTicketType(int index, TicketType ticketType) { + setState(() { + _additionalTicketTypes[index] = ticketType; + }); + } + + bool _validateTicketTypes() { + for (int i = 0; i < _additionalTicketTypes.length; i++) { + final ticketType = _additionalTicketTypes[i]; + + if ((ticketType.description ?? '').isEmpty) { + _showError('Please fill description for ticket type ${i + 1}.'); + return false; + } + if (ticketType.maxCount <= 0) { + _showError('Please enter valid ticket count for ticket type ${i + 1}.'); + return false; + } + if (ticketType.price < 0) { + _showError('Please enter valid price for ticket type ${i + 1}.'); + return false; + } + if (ticketType.availableFrom == null) { + _showError('Please set available from date for ticket type ${i + 1}.'); + return false; + } + if (ticketType.availableFrom!.isAfter(_startDate!)) { + _showError('Available from date for ticket type ${i + 1} cannot be after event start date.'); + return false; + } + } + return true; + } + + void _showError(String message) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text(message), + backgroundColor: Colors.red, + )); + } + + void _submitForm() { + if (_formKey.currentState!.validate() && _validateTicketTypes()) { + final eventData = { + 'name': _nameController.text, + 'description': _descriptionController.text, + 'start_date': _startDate!.toIso8601String(), + 'end_date': _endDate!.toIso8601String(), + 'minimum_age': int.tryParse(_minimumAgeController.text), + }; + + context + .read() + .updateEventWithTicketTypes(widget.event.id, eventData, _additionalTicketTypes); + } + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + + return PageLayout( + title: 'Edit Event', + showBackButton: true, + showCartButton: false, + body: BlocListener( + listener: (context, state) { + if (state is EventFormSuccess) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Event updated successfully!'), + backgroundColor: Colors.green), + ); + context.go('/home/organizer'); + } + if (state is EventFormError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: ${state.message}'), + backgroundColor: Colors.red), + ); + } + }, + child: SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Form( + key: _formKey, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _buildEventDetailsSection(theme), + const SizedBox(height: 32), + + _buildTicketTypesSection(theme), + const SizedBox(height: 32), + + BlocBuilder( + builder: (context, state) { + return PrimaryButton( + text: 'SAVE CHANGES', + onPressed: _submitForm, + isLoading: state is EventFormSubmitting, + ); + }, + ), + ], + ), + ), + ), + ), + ); + } + + Widget _buildEventDetailsSection(ThemeData theme) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("Event Details", style: theme.textTheme.headlineSmall), + const SizedBox(height: 20), + CustomTextFormField( + controller: _nameController, + labelText: 'Event Name', + validator: (v) => v!.isEmpty ? 'Event name is required' : null, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _descriptionController, + labelText: 'Description', + keyboardType: TextInputType.multiline, + maxLines: 4, + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _startDateController, + labelText: 'Start Date & Time', + readOnly: true, + onTap: () => _selectDateTime(context, true), + validator: (v) => v!.isEmpty ? 'Start date is required' : null, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _endDateController, + labelText: 'End Date & Time', + readOnly: true, + onTap: () => _selectDateTime(context, false), + validator: (v) => v!.isEmpty ? 'End date is required' : null, + ), + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _minimumAgeController, + labelText: 'Minimum Age (Optional)', + keyboardType: TextInputType.number, + ), + ], + ), + ), + ); + } + Widget _buildTicketTypesSection(ThemeData theme) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text("Ticket Types Management", style: theme.textTheme.headlineSmall), + OutlinedButton.icon( + onPressed: _addTicketType, + icon: const Icon(Icons.add), + label: const Text('Add New Type'), + ), + ], + ), + const SizedBox(height: 8), + Text( + "Existing ticket types are read-only. You can only delete types that haven't started selling yet.", + style: theme.textTheme.bodyMedium?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 20), + + // Show existing ticket types (from backend) + BlocBuilder( + builder: (context, state) { + if (state is EventFormTicketTypesLoaded) { + final existingTypes = state.ticketTypes + .where((t) => (t.description ?? '') != "Standard Ticket") + .toList(); + + if (existingTypes.isNotEmpty) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Existing Ticket Types", + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 12), + ...existingTypes.asMap().entries.map((entry) { + final index = entry.key; + final ticketType = entry.value; + final cubit = context.read(); + final canDelete = cubit.canDeleteTicketType(ticketType); + + return Padding( + padding: const EdgeInsets.only(bottom: 12), + child: TicketTypeForm( + ticketType: ticketType, + index: index + 2, // Start from 2 (1 is standard) + isDeletable: canDelete, + onDelete: canDelete && ticketType.typeId != null + ? () => _deleteExistingTicketType(ticketType.typeId!, ticketType) + : null, + ), + ); + }).toList(), + const SizedBox(height: 20), + ], + ); + } + } + return const SizedBox.shrink(); + }, + ), + + // Show new ticket types being added + if (_additionalTicketTypes.isNotEmpty) ...[ + Text( + "New Ticket Types", + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 12), + ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: _additionalTicketTypes.length, + itemBuilder: (context, index) { + return Padding( + padding: const EdgeInsets.only(bottom: 16), + child: EditableTicketTypeForm( + ticketType: _additionalTicketTypes[index], + index: index + 100, // Use high numbers to distinguish from existing + onChanged: (ticketType) => _updateTicketType(index, ticketType), + onDelete: () => _removeTicketType(index), + ), + ); + }, + ), + ], + + // Empty state + if (_additionalTicketTypes.isEmpty) + BlocBuilder( + builder: (context, state) { + // Only show empty state if there are no existing types either + final hasExistingTypes = state is EventFormTicketTypesLoaded && + state.ticketTypes.any((t) => (t.description ?? '') != "Standard Ticket"); + + if (!hasExistingTypes) { + return Container( + width: double.infinity, + padding: const EdgeInsets.all(24), + decoration: BoxDecoration( + color: theme.colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: theme.colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Column( + children: [ + Icon( + Icons.confirmation_number_outlined, + size: 48, + color: theme.colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + const SizedBox(height: 12), + Text( + 'No additional ticket types yet', + style: theme.textTheme.titleMedium?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 4), + Text( + 'Standard tickets are already available. Add premium types here.', + style: theme.textTheme.bodySmall?.copyWith( + color: theme.colorScheme.onSurfaceVariant.withOpacity(0.7), + ), + ), + ], + ), + ); + } + return const SizedBox.shrink(); + }, + ), + ], + ), + ), + ); + } + + void _deleteExistingTicketType(int typeId, TicketType ticketType) async { + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Delete Ticket Type'), + content: Text('Are you sure you want to delete "${ticketType.description}"?\n\nThis action cannot be undone.'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () => Navigator.pop(context, true), + style: TextButton.styleFrom(foregroundColor: Colors.red), + child: const Text('Delete'), + ), + ], + ), + ); + + if (confirmed == true) { + context.read().deleteTicketType(typeId, ticketType); + } + } +} diff --git a/frontend/lib/presentation/organizer/pages/organizer_dashboard_page.dart b/frontend/lib/presentation/organizer/pages/organizer_dashboard_page.dart new file mode 100644 index 0000000..d98f18e --- /dev/null +++ b/frontend/lib/presentation/organizer/pages/organizer_dashboard_page.dart @@ -0,0 +1,82 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/organizer/cubit/organizer_dashboard_cubit.dart'; +import 'package:resellio/presentation/organizer/cubit/organizer_dashboard_state.dart'; +import 'package:resellio/presentation/organizer/widgets/quick_actions.dart'; +import 'package:resellio/presentation/organizer/widgets/recent_events_list.dart'; +import 'package:resellio/presentation/organizer/widgets/stat_card_grid.dart'; +import 'package:resellio/presentation/organizer/widgets/welcome_card.dart'; + +class OrganizerDashboardPage extends StatelessWidget { + const OrganizerDashboardPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => OrganizerDashboardCubit( + context.read(), + context.read(), + context.read(), + )..loadDashboard(), + child: const _OrganizerDashboardView(), + ); + } +} + +class _OrganizerDashboardView extends StatelessWidget { + const _OrganizerDashboardView(); + + @override + Widget build(BuildContext context) { + return PageLayout( + title: 'Dashboard', + showCartButton: false, + actions: [ + IconButton( + icon: const Icon(Icons.refresh), + tooltip: 'Refresh Data', + onPressed: () => + context.read().loadDashboard(), + ), + ], + body: RefreshIndicator( + onRefresh: () => + context.read().loadDashboard(), + child: BlocBuilder( + builder: (context, state) { + if (state is OrganizerDashboardUnverified) { + return EmptyStateWidget( + icon: Icons.verified_user_outlined, + message: 'Verification Pending', + details: state.message); + } + return BlocStateWrapper( + state: state, + onRetry: () => + context.read().loadDashboard(), + builder: (loadedState) { + return ListView( + padding: const EdgeInsets.all(16), + children: [ + const WelcomeCard(), + const SizedBox(height: 24), + StatCardGrid(events: loadedState.events), + const SizedBox(height: 24), + const QuickActions(), + const SizedBox(height: 24), + RecentEventsList(events: loadedState.events), + ], + ); + }, + ); + }, + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/pages/organizer_events_page.dart b/frontend/lib/presentation/organizer/pages/organizer_events_page.dart new file mode 100644 index 0000000..7b71b3c --- /dev/null +++ b/frontend/lib/presentation/organizer/pages/organizer_events_page.dart @@ -0,0 +1,113 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/organizer/cubit/my_events_cubit.dart'; +import 'package:resellio/presentation/organizer/cubit/my_events_state.dart'; +import 'package:resellio/presentation/organizer/widgets/event_list_filter_chips.dart'; +import 'package:resellio/presentation/organizer/widgets/organizer_event_list_item.dart'; + +class OrganizerEventsPage extends StatelessWidget { + const OrganizerEventsPage({super.key}); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => MyEventsCubit( + context.read(), + context.read(), + )..loadEvents(), + child: const _OrganizerEventsView(), + ); + } +} + +class _OrganizerEventsView extends StatelessWidget { + const _OrganizerEventsView(); + + @override + Widget build(BuildContext context) { + return PageLayout( + title: 'My Events', + showCartButton: false, + actions: [ + IconButton( + icon: const Icon(Icons.refresh), + tooltip: 'Refresh Events', + onPressed: () => context.read().loadEvents(), + ), + ], + body: Column( + children: [ + BlocBuilder( + builder: (context, state) { + if (state is MyEventsLoaded) { + return EventListFilterChips( + selectedFilter: state.activeFilter, + onFilterChanged: (filter) { + context.read().setFilter(filter); + }, + ); + } + return const SizedBox.shrink(); + }, + ), + Expanded( + child: BlocConsumer( + listener: (context, state) { + if (state is MyEventsError) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text('Error: ${state.message}'), + backgroundColor: Colors.red, + )); + } + }, + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadEvents(), + builder: (loadedState) { + final events = loadedState.filteredEvents; + + if (events.isEmpty) { + return const EmptyStateWidget( + icon: Icons.event_note, + message: 'No events match this filter', + details: + 'Try selecting a different filter or create a new event.', + ); + } + + return RefreshIndicator( + onRefresh: () => + context.read().loadEvents(), + child: ListView.builder( + padding: const EdgeInsets.symmetric(horizontal: 16), + itemCount: events.length, + itemBuilder: (context, index) { + final event = events[index]; + return OrganizerEventListItem( + event: event, + onCancel: () => context + .read() + .cancelEvent(event.id), + onNotify: (message) => context + .read() + .notifyParticipants(event.id, message), + ); + }, + ), + ); + }, + ); + }, + ), + ), + ], + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/event_list_filter_chips.dart b/frontend/lib/presentation/organizer/widgets/event_list_filter_chips.dart new file mode 100644 index 0000000..a950c22 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/event_list_filter_chips.dart @@ -0,0 +1,46 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/presentation/organizer/cubit/my_events_state.dart'; + +class EventListFilterChips extends StatelessWidget { + final EventStatusFilter selectedFilter; + final ValueChanged onFilterChanged; + + const EventListFilterChips({ + super.key, + required this.selectedFilter, + required this.onFilterChanged, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Row( + children: EventStatusFilter.values.map((filter) { + final isSelected = filter == selectedFilter; + return Padding( + padding: const EdgeInsets.only(right: 8.0), + child: ChoiceChip( + label: Text( + filter.name[0].toUpperCase() + filter.name.substring(1)), + selected: isSelected, + onSelected: (_) => onFilterChanged(filter), + backgroundColor: colorScheme.surfaceContainerHighest, + selectedColor: colorScheme.primaryContainer, + labelStyle: TextStyle( + color: isSelected + ? colorScheme.onPrimaryContainer + : colorScheme.onSurfaceVariant, + fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, + ), + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + ), + ); + }).toList(), + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/organizer_event_list_item.dart b/frontend/lib/presentation/organizer/widgets/organizer_event_list_item.dart new file mode 100644 index 0000000..bb060b0 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/organizer_event_list_item.dart @@ -0,0 +1,142 @@ +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; + +class OrganizerEventListItem extends StatelessWidget { + final Event event; + final VoidCallback onCancel; + final Function(String) onNotify; + + const OrganizerEventListItem({ + super.key, + required this.event, + required this.onCancel, + required this.onNotify, + }); + + Color _getStatusColor(BuildContext context, String status) { + switch (status.toLowerCase()) { + case 'created': + return Colors.green; + case 'pending': + return Colors.orange; + case 'cancelled': + return Colors.red; + default: + return Theme.of(context).colorScheme.onSurfaceVariant; + } + } + + void _showCancelDialog(BuildContext context) async { + final confirmed = await showConfirmationDialog( + context: context, + title: 'Cancel Event?', + content: Text('Are you sure you want to cancel "${event.name}"?'), + confirmText: 'Yes, Cancel', + isDestructive: true, + ); + if (confirmed == true) { + onCancel(); + } + } + + void _showNotifyDialog(BuildContext context) async { + final message = await showInputDialog( + context: context, + title: 'Notify Participants', + label: 'Message', + confirmText: 'Send', + ); + if (message != null && message.isNotEmpty) { + onNotify(message); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Notification sent!')), + ); + } + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final statusColor = _getStatusColor(context, event.status); + + return Card( + margin: const EdgeInsets.only(bottom: 12), + child: Padding( + padding: + const EdgeInsets.only(left: 16, top: 16, bottom: 16, right: 8), + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(event.name, style: theme.textTheme.titleMedium), + const SizedBox(height: 8), + Row( + children: [ + Icon(Icons.calendar_today, + size: 14, + color: theme.colorScheme.onSurfaceVariant), + const SizedBox(width: 6), + Text(DateFormat.yMMMd().format(event.start), + style: theme.textTheme.bodySmall), + const SizedBox(width: 12), + Icon(Icons.location_on, + size: 14, + color: theme.colorScheme.onSurfaceVariant), + const SizedBox(width: 6), + Text(event.location, style: theme.textTheme.bodySmall), + ], + ), + ], + ), + ), + Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), + decoration: BoxDecoration( + color: statusColor.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + border: Border.all(color: statusColor), + ), + child: Text( + event.status.toUpperCase(), + style: theme.textTheme.labelSmall?.copyWith(color: statusColor), + ), + ), + PopupMenuButton( + onSelected: (value) { + if (value == 'edit') { + context.push('/organizer/edit-event/${event.id}', + extra: event); + } else if (value == 'notify') { + _showNotifyDialog(context); + } else if (value == 'cancel') { + _showCancelDialog(context); + } + }, + itemBuilder: (BuildContext context) => >[ + const PopupMenuItem( + value: 'edit', + child: Text('Edit Event'), + ), + const PopupMenuItem( + value: 'notify', + child: Text('Notify Participants'), + ), + const PopupMenuDivider(), + PopupMenuItem( + value: 'cancel', + child: Text('Cancel Event', + style: TextStyle(color: theme.colorScheme.error)), + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/quick_actions.dart b/frontend/lib/presentation/organizer/widgets/quick_actions.dart new file mode 100644 index 0000000..7ab1687 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/quick_actions.dart @@ -0,0 +1,70 @@ +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; + +class QuickActions extends StatelessWidget { + const QuickActions({super.key}); + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Quick Actions', + style: Theme.of(context).textTheme.titleLarge, + ), + const SizedBox(height: 16), + SizedBox( + height: 100, + child: ListView( + scrollDirection: Axis.horizontal, + children: [ + _ActionCard( + title: 'Create Event', + icon: Icons.add_circle_outline, + color: Colors.green, + onTap: () => context.push('/organizer/create-event'), + ) + ], + ), + ), + ], + ); + } +} + +class _ActionCard extends StatelessWidget { + final String title; + final IconData icon; + final Color color; + final VoidCallback onTap; + + const _ActionCard( + {required this.title, + required this.icon, + required this.color, + required this.onTap}); + + @override + Widget build(BuildContext context) { + return Card( + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(12), + child: Container( + width: 150, + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(icon, color: color, size: 28), + const SizedBox(height: 8), + Text(title, style: Theme.of(context).textTheme.titleMedium), + ], + ), + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/recent_events_list.dart b/frontend/lib/presentation/organizer/widgets/recent_events_list.dart new file mode 100644 index 0000000..9c64496 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/recent_events_list.dart @@ -0,0 +1,55 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; +import 'package:resellio/presentation/organizer/cubit/organizer_dashboard_cubit.dart'; +import 'package:resellio/presentation/organizer/widgets/organizer_event_list_item.dart'; + +class RecentEventsList extends StatelessWidget { + final List events; + + const RecentEventsList({super.key, required this.events}); + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Recent Events', + style: Theme.of(context).textTheme.titleLarge, + ), + const SizedBox(height: 16), + if (events.isEmpty) + const Card( + child: Padding( + padding: EdgeInsets.symmetric(vertical: 32.0), + child: EmptyStateWidget( + icon: Icons.event_note, + message: 'No events yet', + details: 'Create your first event to get started.', + ), + ), + ) + else + ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: events.take(3).length, + itemBuilder: (context, index) { + final event = events[index]; + return OrganizerEventListItem( + event: event, + onCancel: () => context + .read() + .cancelEvent(event.id), + onNotify: (message) => context + .read() + .notifyParticipants(event.id, message), + ); + }, + ), + ], + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/stat_card_grid.dart b/frontend/lib/presentation/organizer/widgets/stat_card_grid.dart new file mode 100644 index 0000000..7e314c5 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/stat_card_grid.dart @@ -0,0 +1,91 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/core/models/models.dart'; + +class StatCardGrid extends StatelessWidget { + final List events; + + const StatCardGrid({super.key, required this.events}); + + @override + Widget build(BuildContext context) { + final activeEvents = events.where((e) => e.status == 'created').length; + final pendingEvents = events.where((e) => e.status == 'pending').length; + final totalTickets = events.fold(0, (sum, e) => sum + e.totalTickets); + + return GridView.count( + crossAxisCount: 2, + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + crossAxisSpacing: 16, + mainAxisSpacing: 16, + childAspectRatio: 2.2, + children: [ + _StatCard( + title: 'Total Events', + value: events.length.toString(), + icon: Icons.event, + color: Colors.blue), + _StatCard( + title: 'Active Events', + value: activeEvents.toString(), + icon: Icons.event_available, + color: Colors.green), + _StatCard( + title: 'Pending Events', + value: pendingEvents.toString(), + icon: Icons.pending, + color: Colors.orange), + _StatCard( + title: 'Total Tickets', + value: totalTickets.toString(), + icon: Icons.confirmation_number, + color: Colors.purple), + ], + ); + } +} + +class _StatCard extends StatelessWidget { + final String title; + final String value; + final IconData icon; + final Color color; + + const _StatCard( + {required this.title, + required this.value, + required this.icon, + required this.color}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Row( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: color.withOpacity(0.1), + borderRadius: BorderRadius.circular(8)), + child: Icon(icon, color: color, size: 20), + ), + const SizedBox(width: 12), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(value, + style: theme.textTheme.headlineSmall?.copyWith(color: color)), + const SizedBox(height: 2), + Text(title, style: theme.textTheme.bodyMedium), + ], + ), + ], + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/ticket_type_form.dart b/frontend/lib/presentation/organizer/widgets/ticket_type_form.dart new file mode 100644 index 0000000..1f5f179 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/ticket_type_form.dart @@ -0,0 +1,331 @@ +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; + +// Read-only ticket type display +class TicketTypeForm extends StatelessWidget { + final TicketType ticketType; + final int index; + final VoidCallback? onDelete; + final bool isDeletable; + + const TicketTypeForm({ + super.key, + required this.ticketType, + required this.index, + this.onDelete, + this.isDeletable = false, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + // Determine the display status + final isActive = ticketType.availableFrom?.isAfter(DateTime.now()) ?? false; + final statusColor = isActive ? Colors.green : Colors.orange; + final statusText = isActive ? 'Not yet available' : 'Sales active'; + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.3), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + ticketType.description ?? 'Unnamed Ticket Type', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 4), + Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: statusColor.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + border: Border.all(color: statusColor, width: 1), + ), + child: Text( + statusText, + style: theme.textTheme.labelSmall?.copyWith( + color: statusColor, + fontWeight: FontWeight.w500, + ), + ), + ), + ], + ), + ), + if (isDeletable && onDelete != null) + IconButton( + onPressed: onDelete, + icon: Icon( + Icons.delete_outline, + color: colorScheme.error, + ), + tooltip: 'Remove ticket type', + ) + else if (!isDeletable) + Tooltip( + message: 'Cannot delete - tickets may have been sold', + child: Icon( + Icons.lock_outline, + color: colorScheme.onSurfaceVariant.withOpacity(0.5), + ), + ), + ], + ), + const SizedBox(height: 16), + + // Display ticket type details (read-only) + _buildInfoRow( + context, + 'Count:', + '${ticketType.maxCount} tickets', + Icons.confirmation_number_outlined, + ), + const SizedBox(height: 8), + _buildInfoRow( + context, + 'Price:', + '${ticketType.currency} \$${ticketType.price.toStringAsFixed(2)}', + Icons.attach_money, + ), + const SizedBox(height: 8), + if (ticketType.availableFrom != null) + _buildInfoRow( + context, + 'Available from:', + DateFormat.yMd().add_jm().format(ticketType.availableFrom!), + Icons.schedule, + ), + ], + ), + ); + } + + Widget _buildInfoRow(BuildContext context, String label, String value, IconData icon) { + final theme = Theme.of(context); + return Row( + children: [ + Icon( + icon, + size: 16, + color: theme.colorScheme.onSurfaceVariant, + ), + const SizedBox(width: 8), + Text( + label, + style: theme.textTheme.bodySmall?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + ), + const SizedBox(width: 8), + Expanded( + child: Text( + value, + style: theme.textTheme.bodyMedium, + ), + ), + ], + ); + } +} + +// Editable version for creating new ticket types +class EditableTicketTypeForm extends StatefulWidget { + final TicketType ticketType; + final int index; + final Function(TicketType) onChanged; + final VoidCallback onDelete; + + const EditableTicketTypeForm({ + super.key, + required this.ticketType, + required this.index, + required this.onChanged, + required this.onDelete, + }); + + @override + State createState() => _EditableTicketTypeFormState(); +} + +class _EditableTicketTypeFormState extends State { + late TextEditingController _descriptionController; + late TextEditingController _maxCountController; + late TextEditingController _priceController; + late TextEditingController _availableFromController; + + @override + void initState() { + super.initState(); + _descriptionController = TextEditingController(text: widget.ticketType.description ?? ''); + _maxCountController = TextEditingController(text: widget.ticketType.maxCount.toString()); + _priceController = TextEditingController(text: widget.ticketType.price.toString()); + _availableFromController = TextEditingController( + text: widget.ticketType.availableFrom != null + ? DateFormat.yMd().add_jm().format(widget.ticketType.availableFrom!) + : '' + ); + + _descriptionController.addListener(_updateTicketType); + _maxCountController.addListener(_updateTicketType); + _priceController.addListener(_updateTicketType); + } + + @override + void dispose() { + _descriptionController.dispose(); + _maxCountController.dispose(); + _priceController.dispose(); + _availableFromController.dispose(); + super.dispose(); + } + + void _updateTicketType() { + final description = _descriptionController.text; + final maxCount = int.tryParse(_maxCountController.text) ?? 0; + final price = double.tryParse(_priceController.text) ?? 0.0; + + widget.onChanged(widget.ticketType.copyWith( + description: description, + maxCount: maxCount, + price: price, + currency: 'USD', + )); + } + + Future _selectAvailableFromDateTime(BuildContext context) async { + final DateTime? date = await showDatePicker( + context: context, + initialDate: widget.ticketType.availableFrom ?? DateTime.now(), + firstDate: DateTime.now(), + lastDate: DateTime(2101), + ); + if (date == null) return; + + final TimeOfDay? time = await showTimePicker( + context: context, + initialTime: TimeOfDay.fromDateTime(widget.ticketType.availableFrom ?? DateTime.now()), + ); + if (time == null) return; + + final selectedDateTime = DateTime(date.year, date.month, date.day, time.hour, time.minute); + + setState(() { + _availableFromController.text = DateFormat.yMd().add_jm().format(selectedDateTime); + }); + + widget.onChanged(widget.ticketType.copyWith(availableFrom: selectedDateTime)); + } + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.primaryContainer.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.primary.withOpacity(0.3), + width: 2, + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'New Ticket Type', + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + color: colorScheme.primary, + ), + ), + IconButton( + onPressed: widget.onDelete, + icon: Icon( + Icons.delete_outline, + color: colorScheme.error, + ), + tooltip: 'Remove ticket type', + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _descriptionController, + labelText: 'Description (e.g., VIP, Early Bird)', + validator: (v) => v!.isEmpty ? 'Description is required' : null, + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: CustomTextFormField( + controller: _maxCountController, + labelText: 'Ticket Count', + keyboardType: TextInputType.number, + validator: (v) { + if (v!.isEmpty) return 'Count is required'; + if (int.tryParse(v) == null || int.parse(v) <= 0) { + return 'Enter valid count'; + } + return null; + }, + ), + ), + const SizedBox(width: 16), + Expanded( + child: CustomTextFormField( + controller: _priceController, + labelText: 'Price (\$)', + prefixText: '\$ ', + keyboardType: const TextInputType.numberWithOptions(decimal: true), + validator: (v) { + if (v!.isEmpty) return 'Price is required'; + if (double.tryParse(v) == null || double.parse(v) < 0) { + return 'Enter valid price'; + } + return null; + }, + ), + ), + ], + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _availableFromController, + labelText: 'Available From Date & Time *', + readOnly: true, + onTap: () => _selectAvailableFromDateTime(context), + validator: (v) => v!.isEmpty ? 'Available from date is required' : null, + ), + ], + ), + ); + } +} diff --git a/frontend/lib/presentation/organizer/widgets/welcome_card.dart b/frontend/lib/presentation/organizer/widgets/welcome_card.dart new file mode 100644 index 0000000..0e7f644 --- /dev/null +++ b/frontend/lib/presentation/organizer/widgets/welcome_card.dart @@ -0,0 +1,29 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/services/auth_service.dart'; + +class WelcomeCard extends StatelessWidget { + const WelcomeCard({super.key}); + + @override + Widget build(BuildContext context) { + final authService = context.read(); + final user = authService.user; + final theme = Theme.of(context); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Welcome back, ${user?.name ?? 'Organizer'}!', + style: theme.textTheme.headlineSmall, + ), + const SizedBox(height: 8), + Text( + 'Here\'s an overview of your events and activities.', + style: theme.textTheme.bodyMedium, + ), + ], + ); + } +} diff --git a/frontend/lib/presentation/profile/cubit/profile_cubit.dart b/frontend/lib/presentation/profile/cubit/profile_cubit.dart new file mode 100644 index 0000000..906e23a --- /dev/null +++ b/frontend/lib/presentation/profile/cubit/profile_cubit.dart @@ -0,0 +1,52 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/profile/cubit/profile_state.dart'; + +class ProfileCubit extends Cubit { + final UserRepository _userRepository; + final AuthService _authService; + + ProfileCubit(this._userRepository, this._authService) + : super(ProfileInitial()); + + Future loadProfile() async { + try { + emit(ProfileLoading()); + final profile = await _userRepository.getUserProfile(); + emit(ProfileLoaded(userProfile: profile)); + } on ApiException catch (e) { + emit(ProfileInitialError(e.message)); + } catch (e) { + emit(ProfileInitialError('An unexpected error occurred: $e')); + } + } + + void toggleEdit(bool isEditing) { + if (state is ProfileLoaded) { + final loadedState = state as ProfileLoaded; + emit(ProfileLoaded( + userProfile: loadedState.userProfile, isEditing: isEditing)); + } + } + + Future updateProfile(Map data) async { + if (state is! ProfileLoaded) return; + final loadedState = state as ProfileLoaded; + emit(ProfileSaving(userProfile: loadedState.userProfile)); + + try { + final updatedProfile = await _userRepository.updateUserProfile(data); + _authService.updateDetailedProfile(updatedProfile); + emit(ProfileSaved(userProfile: updatedProfile)); + } on ApiException catch (e) { + emit(ProfileUpdateError( + userProfile: loadedState.userProfile, message: e.message)); + } catch (e) { + emit(ProfileUpdateError( + userProfile: loadedState.userProfile, + message: 'An unexpected error occurred.')); + } + } +} diff --git a/frontend/lib/presentation/profile/cubit/profile_state.dart b/frontend/lib/presentation/profile/cubit/profile_state.dart new file mode 100644 index 0000000..1752caf --- /dev/null +++ b/frontend/lib/presentation/profile/cubit/profile_state.dart @@ -0,0 +1,46 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +class ProfileSaved extends ProfileLoaded { + const ProfileSaved({required super.userProfile}) : super(isEditing: false); +} + +abstract class ProfileState extends Equatable { + const ProfileState(); + @override + List get props => []; +} + +class ProfileInitial extends ProfileState {} + +class ProfileLoading extends ProfileState {} + +class ProfileLoaded extends ProfileState { + final UserProfile userProfile; + final bool isEditing; + + const ProfileLoaded({required this.userProfile, this.isEditing = false}); + + @override + List get props => [userProfile, isEditing]; +} + +class ProfileSaving extends ProfileLoaded { + const ProfileSaving({required super.userProfile}) : super(isEditing: true); +} + +class ProfileInitialError extends ProfileState { + final String message; + const ProfileInitialError(this.message); + @override + List get props => [message]; +} + +class ProfileUpdateError extends ProfileLoaded { + final String message; + const ProfileUpdateError({required super.userProfile, required this.message}) + : super(isEditing: true); + + @override + List get props => [super.props, message]; +} diff --git a/frontend/lib/presentation/profile/pages/profile_page.dart b/frontend/lib/presentation/profile/pages/profile_page.dart index dfc64bb..f53b466 100644 --- a/frontend/lib/presentation/profile/pages/profile_page.dart +++ b/frontend/lib/presentation/profile/pages/profile_page.dart @@ -1,14 +1,128 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:provider/provider.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/core/models/user_model.dart'; +import 'package:resellio/presentation/common_widgets/adaptive_navigation.dart'; +import 'package:resellio/presentation/common_widgets/bloc_state_wrapper.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; +import 'package:resellio/presentation/profile/cubit/profile_cubit.dart'; +import 'package:resellio/presentation/profile/cubit/profile_state.dart'; +import 'package:resellio/presentation/profile/widgets/account_info.dart'; +import 'package:resellio/presentation/profile/widgets/profile_form.dart'; +import 'package:resellio/presentation/profile/widgets/profile_header.dart'; class ProfilePage extends StatelessWidget { const ProfilePage({super.key}); @override Widget build(BuildContext context) { - return const PageLayout( + return BlocProvider( + create: (context) => ProfileCubit( + context.read(), + context.read(), + )..loadProfile(), + child: const _ProfileView(), + ); + } +} + +class _ProfileView extends StatelessWidget { + const _ProfileView(); + + void _showLogoutDialog(BuildContext context) async { + final confirmed = await showConfirmationDialog( + context: context, + title: 'Logout', + content: const Text('Are you sure you want to logout?'), + confirmText: 'Logout', + isDestructive: true, + ); + + if (confirmed == true && context.mounted) { + context.read().logout(); + } + } + + @override + Widget build(BuildContext context) { + final authService = context.watch(); + final isCustomer = authService.user?.role == UserRole.customer; + + return PageLayout( title: 'Profile', - body: Center(child: Text('Profile Page - Coming Soon!')), + showCartButton: isCustomer, + actions: [ + BlocBuilder( + builder: (context, state) { + if (state is ProfileLoaded && !state.isEditing) { + return IconButton( + icon: const Icon(Icons.edit), + onPressed: () => context.read().toggleEdit(true), + ); + } + return const SizedBox.shrink(); + }, + ), + IconButton( + icon: const Icon(Icons.logout), + onPressed: () => _showLogoutDialog(context), + ), + ], + body: BlocListener( + listener: (context, state) { + if (state is ProfileSaved) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + const SnackBar( + content: Text('Profile saved successfully!'), + backgroundColor: Colors.green), + ); + } + if (state is ProfileUpdateError) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar( + content: Text(state.message), + backgroundColor: Colors.red), + ); + } + }, + child: BlocBuilder( + builder: (context, state) { + return BlocStateWrapper( + state: state, + onRetry: () => context.read().loadProfile(), + builder: (loadedState) { + final userProfile = loadedState.userProfile; + final isEditing = loadedState.isEditing; + final isSaving = loadedState is ProfileSaving; + + return SingleChildScrollView( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + ProfileHeader(userProfile: userProfile), + const SizedBox(height: 32), + ProfileForm( + userProfile: userProfile, + isEditing: isEditing, + isSaving: isSaving, + ), + const SizedBox(height: 32), + AccountInfo(userProfile: userProfile), + ], + ), + ); + }, + ); + }, + ), + ), ); } } diff --git a/frontend/lib/presentation/profile/widgets/account_info.dart b/frontend/lib/presentation/profile/widgets/account_info.dart new file mode 100644 index 0000000..9fa495a --- /dev/null +++ b/frontend/lib/presentation/profile/widgets/account_info.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/core/models/models.dart'; + +class AccountInfo extends StatelessWidget { + final UserProfile userProfile; + const AccountInfo({super.key, required this.userProfile}); + + @override + Widget build(BuildContext context) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + ListTile( + leading: const Icon(Icons.email), + title: const Text('Email'), + subtitle: Text(userProfile.email), + ), + ListTile( + leading: const Icon(Icons.verified_user), + title: const Text('Status'), + subtitle: Text(userProfile.isActive ? 'Active' : 'Inactive'), + ), + ], + ), + ), + ); + } +} diff --git a/frontend/lib/presentation/profile/widgets/profile_form.dart b/frontend/lib/presentation/profile/widgets/profile_form.dart new file mode 100644 index 0000000..93f1ca3 --- /dev/null +++ b/frontend/lib/presentation/profile/widgets/profile_form.dart @@ -0,0 +1,122 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/presentation/common_widgets/custom_text_form_field.dart'; +import 'package:resellio/presentation/profile/cubit/profile_cubit.dart'; + +class ProfileForm extends StatefulWidget { + final UserProfile userProfile; + final bool isEditing; + final bool isSaving; + + const ProfileForm( + {super.key, + required this.userProfile, + required this.isEditing, + required this.isSaving}); + + @override + State createState() => _ProfileFormState(); +} + +class _ProfileFormState extends State { + final _formKey = GlobalKey(); + late TextEditingController _firstNameController; + late TextEditingController _lastNameController; + late TextEditingController _loginController; + + @override + void initState() { + super.initState(); + _firstNameController = + TextEditingController(text: widget.userProfile.firstName); + _lastNameController = + TextEditingController(text: widget.userProfile.lastName); + _loginController = TextEditingController(text: widget.userProfile.login ?? ''); + } + + @override + void didUpdateWidget(covariant ProfileForm oldWidget) { + super.didUpdateWidget(oldWidget); + if (widget.userProfile != oldWidget.userProfile) { + _firstNameController.text = widget.userProfile.firstName; + _lastNameController.text = widget.userProfile.lastName; + _loginController.text = widget.userProfile.login ?? ''; + } + } + + @override + void dispose() { + _firstNameController.dispose(); + _lastNameController.dispose(); + _loginController.dispose(); + super.dispose(); + } + + void _save() { + if (_formKey.currentState!.validate()) { + context.read().updateProfile({ + 'first_name': _firstNameController.text.trim(), + 'last_name': _lastNameController.text.trim(), + 'login': _loginController.text.trim(), + }); + } + } + + @override + Widget build(BuildContext context) { + return Form( + key: _formKey, + child: Column( + children: [ + CustomTextFormField( + controller: _firstNameController, + enabled: widget.isEditing, + labelText: 'First Name', + validator: (v) => v!.isEmpty ? 'Required' : null, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _lastNameController, + enabled: widget.isEditing, + labelText: 'Last Name', + validator: (v) => v!.isEmpty ? 'Required' : null, + ), + const SizedBox(height: 16), + CustomTextFormField( + controller: _loginController, + enabled: widget.isEditing, + labelText: 'Username', + validator: (v) => v!.isEmpty ? 'Required' : null, + ), + if (widget.isEditing) ...[ + const SizedBox(height: 24), + Row( + children: [ + Expanded( + child: OutlinedButton( + onPressed: () => + context.read().toggleEdit(false), + child: const Text('Cancel'), + ), + ), + const SizedBox(width: 16), + Expanded( + child: ElevatedButton( + onPressed: widget.isSaving ? null : _save, + child: widget.isSaving + ? const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator(strokeWidth: 2)) + : const Text('Save'), + ), + ), + ], + ), + ] + ], + ), + ); + } +} diff --git a/frontend/lib/presentation/profile/widgets/profile_header.dart b/frontend/lib/presentation/profile/widgets/profile_header.dart new file mode 100644 index 0000000..8aca932 --- /dev/null +++ b/frontend/lib/presentation/profile/widgets/profile_header.dart @@ -0,0 +1,13 @@ +import 'package:flutter/material.dart'; +import 'package:resellio/core/models/models.dart'; + +class ProfileHeader extends StatelessWidget { + final UserProfile userProfile; + const ProfileHeader({super.key, required this.userProfile}); + + @override + Widget build(BuildContext context) { + return Text('Welcome, ${userProfile.firstName}!', + style: Theme.of(context).textTheme.headlineMedium); + } +} diff --git a/frontend/lib/presentation/tickets/cubit/my_tickets_cubit.dart b/frontend/lib/presentation/tickets/cubit/my_tickets_cubit.dart new file mode 100644 index 0000000..a51542b --- /dev/null +++ b/frontend/lib/presentation/tickets/cubit/my_tickets_cubit.dart @@ -0,0 +1,70 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/core/network/api_exception.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/tickets/cubit/my_tickets_state.dart'; + +class MyTicketsCubit extends Cubit { + final TicketRepository _ticketRepository; + + MyTicketsCubit(this._ticketRepository) : super(MyTicketsInitial()); + + Future loadTickets() async { + try { + emit(MyTicketsLoading()); + final tickets = await _ticketRepository.getMyTickets(); + emit(MyTicketsLoaded(allTickets: tickets)); + } on ApiException catch (e) { + emit(MyTicketsError(e.message)); + } catch (e) { + emit(MyTicketsError('An unexpected error occurred: $e')); + } + } + + void setFilter(TicketFilter filter) { + if (state is MyTicketsLoaded) { + final loadedState = state as MyTicketsLoaded; + emit(MyTicketsLoaded( + allTickets: loadedState.allTickets, + activeFilter: filter, + )); + } + } + + Future listForResale(int ticketId, double price) async { + if (state is! MyTicketsLoaded) return; + final loadedState = state as MyTicketsLoaded; + + emit(TicketUpdateInProgress( + allTickets: loadedState.allTickets, + activeFilter: loadedState.activeFilter, + processingTicketId: ticketId)); + + try { + await _ticketRepository.listTicketForResale(ticketId, price); + await loadTickets(); + } on ApiException catch (e) { + emit(MyTicketsError(e.message)); + } catch (e) { + emit(const MyTicketsError('Failed to list ticket for resale.')); + } + } + + Future cancelResale(int ticketId) async { + if (state is! MyTicketsLoaded) return; + final loadedState = state as MyTicketsLoaded; + + emit(TicketUpdateInProgress( + allTickets: loadedState.allTickets, + activeFilter: loadedState.activeFilter, + processingTicketId: ticketId)); + + try { + await _ticketRepository.cancelResaleListing(ticketId); + await loadTickets(); + } on ApiException catch (e) { + emit(MyTicketsError(e.message)); + } catch (e) { + emit(const MyTicketsError('Failed to cancel resale.')); + } + } +} diff --git a/frontend/lib/presentation/tickets/cubit/my_tickets_state.dart b/frontend/lib/presentation/tickets/cubit/my_tickets_state.dart new file mode 100644 index 0000000..c432054 --- /dev/null +++ b/frontend/lib/presentation/tickets/cubit/my_tickets_state.dart @@ -0,0 +1,65 @@ +import 'package:equatable/equatable.dart'; +import 'package:resellio/core/models/models.dart'; + +enum TicketFilter { all, upcoming, resale } + +abstract class MyTicketsState extends Equatable { + const MyTicketsState(); + @override + List get props => []; +} + +class MyTicketsInitial extends MyTicketsState {} + +class MyTicketsLoading extends MyTicketsState {} + +class MyTicketsLoaded extends MyTicketsState { + final List allTickets; + final TicketFilter activeFilter; + + const MyTicketsLoaded({ + required this.allTickets, + this.activeFilter = TicketFilter.all, + }); + + List get filteredTickets { + switch (activeFilter) { + case TicketFilter.upcoming: + return allTickets + .where((t) => + t.eventStartDate != null && + t.eventStartDate!.isAfter(DateTime.now()) && + t.resellPrice == null) + .toList(); + case TicketFilter.resale: + return allTickets.where((t) => t.resellPrice != null).toList(); + case TicketFilter.all: + default: + return allTickets; + } + } + + @override + List get props => [allTickets, activeFilter]; +} + +class MyTicketsError extends MyTicketsState { + final String message; + const MyTicketsError(this.message); + + @override + List get props => [message]; +} + +class TicketUpdateInProgress extends MyTicketsLoaded { + final int processingTicketId; + + const TicketUpdateInProgress({ + required super.allTickets, + required super.activeFilter, + required this.processingTicketId, + }); + + @override + List get props => [super.props, processingTicketId]; +} diff --git a/frontend/lib/presentation/tickets/pages/my_tickets_page.dart b/frontend/lib/presentation/tickets/pages/my_tickets_page.dart index 11b02ec..4195530 100644 --- a/frontend/lib/presentation/tickets/pages/my_tickets_page.dart +++ b/frontend/lib/presentation/tickets/pages/my_tickets_page.dart @@ -1,38 +1,46 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:intl/intl.dart'; -import 'package:provider/provider.dart'; -import 'package:resellio/core/models/ticket_model.dart'; -import 'package:resellio/core/services/api_service.dart'; -import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/core/models/models.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/presentation/common_widgets/dialogs.dart'; +import 'package:resellio/presentation/common_widgets/empty_state_widget.dart'; import 'package:resellio/presentation/main_page/page_layout.dart'; -import 'package:resellio/presentation/common_widgets/primary_button.dart'; +import 'package:resellio/presentation/tickets/cubit/my_tickets_cubit.dart'; +import 'package:resellio/presentation/tickets/cubit/my_tickets_state.dart'; +import 'package:resellio/presentation/tickets/widgets/ticket_card.dart'; +import 'package:resellio/presentation/tickets/widgets/ticket_stats_header.dart'; +import 'package:resellio/presentation/tickets/widgets/ticket_filter_tabs.dart'; -// Convert to StatefulWidget -class MyTicketsPage extends StatefulWidget { +class MyTicketsPage extends StatelessWidget { const MyTicketsPage({super.key}); @override - State createState() => _MyTicketsPageState(); + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => + MyTicketsCubit(context.read())..loadTickets(), + child: const _MyTicketsView(), + ); + } } -class _MyTicketsPageState extends State - with SingleTickerProviderStateMixin { - Future>? _myTicketsFuture; +class _MyTicketsView extends StatefulWidget { + const _MyTicketsView(); + + @override + State<_MyTicketsView> createState() => _MyTicketsViewState(); +} +class _MyTicketsViewState extends State<_MyTicketsView> + with SingleTickerProviderStateMixin { late TabController _tabController; - String _activeFilter = 'All'; - bool _isLoading = false; @override void initState() { super.initState(); _tabController = TabController(length: 3, vsync: this); _tabController.addListener(_handleTabChange); - - // Use addPostFrameCallback to ensure context is available - WidgetsBinding.instance.addPostFrameCallback((_) { - _loadMyTickets(); - }); } @override @@ -44,143 +52,84 @@ class _MyTicketsPageState extends State void _handleTabChange() { if (!_tabController.indexIsChanging) { - setState(() { - switch (_tabController.index) { - case 0: - _activeFilter = 'All'; - break; - case 1: - _activeFilter = 'Upcoming'; - break; - case 2: - _activeFilter = 'Resale'; - break; - } - }); - // The FutureBuilder will re-filter the list automatically + final filter = TicketFilter.values[_tabController.index]; + context.read().setFilter(filter); } } - void _loadMyTickets() { - final apiService = context.read(); - final authService = context.read(); - final userId = authService.user?.userId; - - if (userId == null) { - // Handle case where user is not logged in, though router should prevent this - setState(() { - _myTicketsFuture = Future.error("User not authenticated."); - }); - return; - } - - setState(() { - _isLoading = true; - _myTicketsFuture = apiService.getMyTickets(userId); - }); - - _myTicketsFuture!.whenComplete(() { - if (mounted) { - setState(() { - _isLoading = false; - }); - } - }); - } - - // Simulate placing a ticket for resale - void _resellTicket(TicketDetailsModel ticket) { - showDialog( + void _resellTicketDialog(BuildContext context, TicketDetailsModel ticket) async { + final priceString = await showInputDialog( context: context, - builder: (context) { - final TextEditingController priceController = TextEditingController(); - return AlertDialog( - title: const Text('Set Resale Price'), - content: TextField( - controller: priceController, - keyboardType: TextInputType.number, - decoration: const InputDecoration( - labelText: 'Price (USD)', - prefixText: '\$', - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context), - child: const Text('Cancel'), - ), - FilledButton( - onPressed: () { - Navigator.pop(context); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - 'Ticket listed for resale at \$${priceController.text}', - ), - backgroundColor: Colors.green, - ), - ); - }, - child: const Text('List for Resale'), - ), - ], - ); - }, + title: 'Set Resale Price', + label: 'Price (USD)', + prefixText: '\$ ', + keyboardType: TextInputType.number, + confirmText: 'List for Resale', ); - } - // Simulate downloading a ticket - void _downloadTicket(TicketDetailsModel ticket) { - setState(() { - _isLoading = true; - }); - - // Simulate download delay - Future.delayed(const Duration(seconds: 1), () { - if (mounted) { - setState(() { - _isLoading = false; - }); + if (priceString != null) { + final price = double.tryParse(priceString); + if (price != null && price > 0) { + context.read().listForResale(ticket.ticketId, price); ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Ticket downloaded successfully'), + SnackBar( + content: Text('Ticket listed for resale at \$${price.toStringAsFixed(2)}'), backgroundColor: Colors.green, ), ); + } else { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Please enter a valid price'), + backgroundColor: Colors.red, + ), + ); } - }); + } } - // Simulate canceling resale - void _cancelResale(TicketDetailsModel ticket) { - showDialog( + void _cancelResaleDialog(BuildContext context, TicketDetailsModel ticket) async { + final confirmed = await showConfirmationDialog( context: context, - builder: - (context) => AlertDialog( - title: const Text('Cancel Resale?'), - content: const Text( - 'Are you sure you want to remove this ticket from resale?', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context), - child: const Text('No'), - ), - FilledButton( - onPressed: () { - Navigator.pop(context); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Ticket removed from resale'), - backgroundColor: Colors.orange, - ), - ); - }, - child: const Text('Yes, Cancel Resale'), - ), - ], - ), + title: 'Cancel Resale?', + content: const Text('Are you sure you want to remove this ticket from resale?'), + confirmText: 'Yes, Cancel', ); + if (confirmed == true) { + context.read().cancelResale(ticket.ticketId); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Ticket removed from resale'), + backgroundColor: Colors.orange, + ), + ); + } + } + + void _downloadTicket(TicketDetailsModel ticket) { + // Placeholder for download functionality + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon(Icons.download, color: Colors.white, size: 20), + const SizedBox(width: 8), + Text('Downloading ticket for ${ticket.eventName ?? "Unknown Event"}'), + ], + ), + backgroundColor: Colors.blue, + ), + ); + } + + List _sortTicketsByDate(List tickets) { + final sortedTickets = List.from(tickets); + sortedTickets.sort((a, b) { + final dateA = a.eventStartDate ?? DateTime(1970); + final dateB = b.eventStartDate ?? DateTime(1970); + return dateA.compareTo(dateB); + }); + return sortedTickets; } @override @@ -190,488 +139,184 @@ class _MyTicketsPageState extends State return PageLayout( title: 'My Tickets', + actions: [ + IconButton( + icon: const Icon(Icons.refresh), + tooltip: 'Refresh Tickets', + onPressed: () => context.read().loadTickets(), + ), + ], body: Column( children: [ - // Tab Bar for filtering + // Enhanced header with stats and tabs Container( - color: colorScheme.surface, - child: TabBar( - controller: _tabController, - labelColor: colorScheme.primary, - unselectedLabelColor: colorScheme.onSurfaceVariant, - indicatorColor: colorScheme.primary, - indicatorWeight: 3, - tabs: const [ - Tab(text: 'All Tickets'), - Tab(text: 'Upcoming'), - Tab(text: 'On Resale'), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + colorScheme.primaryContainer.withOpacity(0.3), + colorScheme.surface, + ], + ), + ), + child: Column( + children: [ + BlocBuilder( + builder: (context, state) { + if (state is MyTicketsLoaded) { + return TicketStatsHeader(tickets: state.allTickets); + } + return const SizedBox.shrink(); + }, + ), + TicketFilterTabs( + tabController: _tabController, + onTabChange: _handleTabChange, + ), ], ), ), - // Tickets List + // Tickets content Expanded( - child: - (_isLoading || _myTicketsFuture == null) - ? const Center(child: CircularProgressIndicator()) - : FutureBuilder>( - future: _myTicketsFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == - ConnectionState.waiting) { - return const Center( - child: CircularProgressIndicator(), - ); - } else if (snapshot.hasError) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.error_outline, - size: 48, - color: colorScheme.error, - ), - const SizedBox(height: 16), - Text( - 'Could not load your tickets', - style: theme.textTheme.titleMedium?.copyWith( - color: colorScheme.error, - ), - ), - const SizedBox(height: 8), - Text( - 'Please try again', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 16), - PrimaryButton( - text: 'Retry', - icon: Icons.refresh, - onPressed: _loadMyTickets, - backgroundColor: colorScheme.primary, - foregroundColor: colorScheme.onPrimary, - fullWidth: false, - height: 40, - ), - ], + child: BlocConsumer( + listener: (context, state) { + if (state is MyTicketsError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Row( + children: [ + const Icon(Icons.error_outline, color: Colors.white, size: 20), + const SizedBox(width: 8), + Expanded(child: Text('Error: ${state.message}')), + ], + ), + backgroundColor: colorScheme.error, + behavior: SnackBarBehavior.floating, + ), + ); + } + }, + builder: (context, state) { + if (state is MyTicketsLoading || state is MyTicketsInitial) { + return const Center(child: CircularProgressIndicator()); + } + + if (state is MyTicketsError) { + return Center( + child: Padding( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(24), + decoration: BoxDecoration( + color: colorScheme.errorContainer.withOpacity(0.3), + shape: BoxShape.circle, ), - ); - } else if (!snapshot.hasData || - snapshot.data!.isEmpty) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.confirmation_number_outlined, - size: 64, - color: colorScheme.onSurfaceVariant - .withOpacity(0.5), - ), - const SizedBox(height: 16), - Text( - 'No tickets found', - style: theme.textTheme.titleMedium, - ), - const SizedBox(height: 8), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32, - ), - child: Text( - 'Your purchased tickets will appear here', - textAlign: TextAlign.center, - style: theme.textTheme.bodyMedium?.copyWith( - color: colorScheme.onSurfaceVariant, - ), - ), - ), - ], + child: Icon( + Icons.error_outline, + size: 64, + color: colorScheme.error, ), - ); - } - - final tickets = snapshot.data!; - - // Filter tickets based on the selected tab - List filteredTickets = []; - switch (_activeFilter) { - case 'All': - filteredTickets = tickets; - break; - case 'Upcoming': - filteredTickets = - tickets - .where( - (ticket) => - ticket.eventStartDate != null && - ticket.eventStartDate!.isAfter( - DateTime.now(), - ) && - ticket.resellPrice == null, - ) - .toList(); - break; - case 'Resale': - filteredTickets = - tickets - .where( - (ticket) => ticket.resellPrice != null, - ) - .toList(); - break; - } - - if (filteredTickets.isEmpty) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - _activeFilter == 'Resale' - ? Icons.sell_outlined - : Icons.confirmation_number_outlined, - size: 64, - color: colorScheme.onSurfaceVariant - .withOpacity(0.5), - ), - const SizedBox(height: 16), - Text( - _activeFilter == 'Resale' - ? 'No tickets on resale' - : _activeFilter == 'Upcoming' - ? 'No upcoming tickets' - : 'No tickets found', - style: theme.textTheme.titleMedium, - ), - ], + ), + const SizedBox(height: 24), + Text( + 'Failed to Load Tickets', + style: theme.textTheme.headlineMedium?.copyWith( + color: colorScheme.error, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8), + Text( + state.message, + textAlign: TextAlign.center, + style: theme.textTheme.bodyLarge?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 24), + ElevatedButton.icon( + onPressed: () => context.read().loadTickets(), + icon: const Icon(Icons.refresh), + label: const Text('Try Again'), + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.primary, + foregroundColor: colorScheme.onPrimary, + padding: const EdgeInsets.symmetric( + horizontal: 24, + vertical: 12, + ), ), - ); - } + ), + ], + ), + ), + ); + } - return ListView.builder( - padding: const EdgeInsets.all(16), - itemCount: filteredTickets.length, - itemBuilder: (context, index) { - final ticket = filteredTickets[index]; - final bool isResale = ticket.resellPrice != null; - final bool isPast = - ticket.eventStartDate != null && - ticket.eventStartDate!.isBefore(DateTime.now()); + if (state is MyTicketsLoaded) { + final sortedTickets = _sortTicketsByDate(state.filteredTickets); - return Card( - margin: const EdgeInsets.only(bottom: 16), - clipBehavior: Clip.antiAlias, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16), - side: - isPast - ? BorderSide( - color: Colors.grey.shade300, - width: 1, - ) - : BorderSide.none, - ), - elevation: isPast ? 0 : 2, - child: InkWell( - onTap: () { - // TODO: Navigate to ticket details - }, - child: Column( - children: [ - // Top status bar - if (isResale || isPast) - Container( - width: double.infinity, - color: - isResale - ? colorScheme.tertiary - .withOpacity(0.1) - : Colors.grey.shade200, - padding: const EdgeInsets.symmetric( - vertical: 6, - horizontal: 16, - ), - child: Row( - children: [ - Icon( - isResale - ? Icons.sell - : Icons.history, - size: 14, - color: - isResale - ? colorScheme.tertiary - : Colors.grey.shade600, - ), - const SizedBox(width: 6), - Text( - isResale - ? 'On Resale' - : 'Past Event', - style: theme.textTheme.labelSmall - ?.copyWith( - color: - isResale - ? colorScheme - .tertiary - : Colors - .grey - .shade600, - fontWeight: FontWeight.bold, - ), - ), - ], - ), - ), + if (sortedTickets.isEmpty) { + String emptyMessage = 'No tickets found'; + String emptyDetails = 'Your tickets will appear here once you make a purchase.'; - // Main content - Padding( - padding: const EdgeInsets.all(16), - child: Row( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - // Event Date Badge - if (ticket.eventStartDate != null) - Container( - width: 50, - decoration: BoxDecoration( - color: - isPast - ? Colors.grey.shade200 - : colorScheme - .primaryContainer, - borderRadius: - BorderRadius.circular(8), - ), - padding: - const EdgeInsets.symmetric( - vertical: 8, - horizontal: 4, - ), - child: Column( - children: [ - Text( - DateFormat('MMM').format( - ticket.eventStartDate!, - ), - style: TextStyle( - fontSize: 12, - fontWeight: - FontWeight.bold, - color: - isPast - ? Colors - .grey - .shade600 - : colorScheme - .onPrimaryContainer, - ), - ), - Text( - DateFormat('d').format( - ticket.eventStartDate!, - ), - style: TextStyle( - fontSize: 18, - fontWeight: - FontWeight.bold, - color: - isPast - ? Colors - .grey - .shade600 - : colorScheme - .onPrimaryContainer, - ), - ), - ], - ), - ), + switch (state.activeFilter) { + case TicketFilter.upcoming: + emptyMessage = 'No upcoming events'; + emptyDetails = 'You don\'t have any tickets for future events.'; + break; + case TicketFilter.resale: + emptyMessage = 'No tickets on resale'; + emptyDetails = 'You haven\'t listed any tickets for resale yet.'; + break; + default: + break; + } - const SizedBox(width: 16), + return EmptyStateWidget( + icon: Icons.confirmation_number_outlined, + message: emptyMessage, + details: emptyDetails, + ); + } - // Ticket details - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - ticket.eventName ?? - 'Unknown Event', - style: theme - .textTheme - .titleMedium - ?.copyWith( - fontWeight: - FontWeight.bold, - color: - isPast - ? Colors - .grey - .shade600 - : null, - ), - ), - const SizedBox(height: 4), - if (ticket.seat != null) - Row( - children: [ - Icon( - Icons.chair_outlined, - size: 14, - color: - colorScheme - .onSurfaceVariant, - ), - const SizedBox(width: 4), - Text( - 'Seat: ${ticket.seat}', - style: theme - .textTheme - .bodySmall - ?.copyWith( - color: - colorScheme - .onSurfaceVariant, - ), - ), - ], - ), - if (ticket.eventStartDate != - null) - Padding( - padding: - const EdgeInsets.only( - top: 4, - ), - child: Row( - children: [ - Icon( - Icons.access_time, - size: 14, - color: - colorScheme - .onSurfaceVariant, - ), - const SizedBox( - width: 4, - ), - Text( - DateFormat( - 'HH:mm', - ).format( - ticket - .eventStartDate!, - ), - style: theme - .textTheme - .bodySmall - ?.copyWith( - color: - colorScheme - .onSurfaceVariant, - ), - ), - ], - ), - ), - if (ticket.resellPrice != null) - Padding( - padding: - const EdgeInsets.only( - top: 8, - ), - child: Text( - 'Listed for: ${NumberFormat.currency(locale: 'en_US', symbol: '\$').format(ticket.resellPrice)}', - style: theme - .textTheme - .labelMedium - ?.copyWith( - color: - colorScheme - .tertiary, - fontWeight: - FontWeight.bold, - ), - ), - ), - ], - ), - ), - ], - ), - ), + return RefreshIndicator( + onRefresh: () => context.read().loadTickets(), + child: ListView.builder( + padding: const EdgeInsets.all(16), + itemCount: sortedTickets.length, + itemBuilder: (context, index) { + final ticket = sortedTickets[index]; + final bool isProcessing = + state is TicketUpdateInProgress && + state.processingTicketId == ticket.ticketId; - // Action buttons - if (!isPast) - Container( - decoration: BoxDecoration( - color: colorScheme - .surfaceContainerHighest - .withOpacity(0.3), - border: Border( - top: BorderSide( - color: colorScheme.outlineVariant - .withOpacity(0.5), - ), - ), - ), - child: OverflowBar( - alignment: MainAxisAlignment.end, - children: [ - TextButton.icon( - onPressed: - () => _downloadTicket(ticket), - icon: const Icon( - Icons.download_outlined, - size: 18, - ), - label: const Text('Download'), - ), - if (isResale) - TextButton.icon( - onPressed: - () => _cancelResale(ticket), - icon: const Icon( - Icons.cancel_outlined, - size: 18, - ), - label: const Text( - 'Cancel Resale', - ), - style: TextButton.styleFrom( - foregroundColor: - colorScheme.tertiary, - ), - ) - else - TextButton.icon( - onPressed: - () => _resellTicket(ticket), - icon: const Icon( - Icons.sell_outlined, - size: 18, - ), - label: const Text('Resell'), - ), - ], - ), - ), - ], - ), - ), - ); - }, + return Padding( + padding: const EdgeInsets.only(bottom: 16), + child: TicketCard( + ticket: ticket, + isProcessing: isProcessing, + onResell: () => _resellTicketDialog(context, ticket), + onCancelResale: () => _cancelResaleDialog(context, ticket), + onDownload: () => _downloadTicket(ticket), + ), ); }, ), + ); + } + + return const SizedBox.shrink(); + }, + ), ), ], ), ); } -} +} \ No newline at end of file diff --git a/frontend/lib/presentation/tickets/widgets/ticket_card.dart b/frontend/lib/presentation/tickets/widgets/ticket_card.dart new file mode 100644 index 0000000..a68e854 --- /dev/null +++ b/frontend/lib/presentation/tickets/widgets/ticket_card.dart @@ -0,0 +1,583 @@ +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; + +class TicketCard extends StatelessWidget { + final TicketDetailsModel ticket; + final bool isProcessing; + final VoidCallback? onResell; + final VoidCallback? onCancelResale; + final VoidCallback? onDownload; + + const TicketCard({ + super.key, + required this.ticket, + this.isProcessing = false, + this.onResell, + this.onCancelResale, + this.onDownload, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + final bool isResale = ticket.resellPrice != null; + final bool isPast = ticket.eventStartDate != null && + ticket.eventStartDate!.isBefore(DateTime.now()); + final bool isUpcoming = ticket.eventStartDate != null && + ticket.eventStartDate!.isAfter(DateTime.now()); + + return AnimatedContainer( + duration: const Duration(milliseconds: 300), + child: Card( + clipBehavior: Clip.antiAlias, + elevation: isProcessing ? 8 : 2, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(20), + side: BorderSide( + color: _getBorderColor(colorScheme, isResale, isPast, isUpcoming), + width: _getBorderWidth(isResale, isPast, isUpcoming), + ), + ), + child: Column( + children: [ + // Status header + if (isResale || isPast) + _buildStatusHeader(context, isResale, isPast), + + // Processing indicator + if (isProcessing) + LinearProgressIndicator( + backgroundColor: colorScheme.surfaceContainerHighest, + valueColor: AlwaysStoppedAnimation(colorScheme.primary), + ), + + // Main content + Padding( + padding: const EdgeInsets.all(20), + child: Column( + children: [ + // Header row with date and event info + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildDateBadge(context, isPast, isUpcoming), + const SizedBox(width: 16), + Expanded( + child: _buildEventInfo(context, isResale), + ), + _buildTicketTypeChip(context), + ], + ), + + const SizedBox(height: 20), + + // Ticket details + _buildTicketDetails(context), + + const SizedBox(height: 20), + + // Price and resale info + if (isResale || ticket.originalPrice != null) + _buildPriceSection(context, isResale), + + if (isResale || ticket.originalPrice != null) + const SizedBox(height: 20), + + // Action buttons + if (!isPast) _buildActionButtons(context, isResale), + ], + ), + ), + ], + ), + ), + ); + } + + Widget _buildStatusHeader(BuildContext context, bool isResale, bool isPast) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + Color backgroundColor; + Color textColor; + IconData icon; + String text; + + if (isResale) { + backgroundColor = colorScheme.tertiaryContainer; + textColor = colorScheme.onTertiaryContainer; + icon = Icons.sell; + text = 'Listed for Resale'; + } else { + backgroundColor = colorScheme.surfaceContainerHighest; + textColor = colorScheme.onSurfaceVariant; + icon = Icons.history; + text = 'Past Event'; + } + + return Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 20), + decoration: BoxDecoration( + color: backgroundColor, + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(icon, size: 16, color: textColor), + const SizedBox(width: 8), + Text( + text, + style: theme.textTheme.labelMedium?.copyWith( + color: textColor, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ); + } + + Widget _buildDateBadge(BuildContext context, bool isPast, bool isUpcoming) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + if (ticket.eventStartDate == null) { + return Container( + width: 60, + height: 60, + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.event, + color: colorScheme.onSurfaceVariant, + ), + ); + } + + Color backgroundColor; + Color textColor; + + if (isPast) { + backgroundColor = colorScheme.surfaceContainerHighest; + textColor = colorScheme.onSurfaceVariant; + } else if (isUpcoming) { + backgroundColor = colorScheme.primaryContainer; + textColor = colorScheme.onPrimaryContainer; + } else { + backgroundColor = colorScheme.secondaryContainer; + textColor = colorScheme.onSecondaryContainer; + } + + return Container( + width: 60, + decoration: BoxDecoration( + color: backgroundColor, + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: textColor.withOpacity(0.2), + ), + ), + padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4), + child: Column( + children: [ + Text( + DateFormat('MMM').format(ticket.eventStartDate!), + style: theme.textTheme.labelMedium?.copyWith( + color: textColor, + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 2), + Text( + DateFormat('d').format(ticket.eventStartDate!), + style: theme.textTheme.titleLarge?.copyWith( + color: textColor, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 2), + Text( + DateFormat('EEE').format(ticket.eventStartDate!), + style: theme.textTheme.labelSmall?.copyWith( + color: textColor.withOpacity(0.8), + fontSize: 10, + ), + ), + ], + ), + ); + } + + Widget _buildEventInfo(BuildContext context, bool isResale) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + ticket.eventName ?? 'Unknown Event', + style: theme.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.bold, + height: 1.2, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + + if (ticket.eventStartDate != null) ...[ + const SizedBox(height: 8), + Row( + children: [ + Icon( + Icons.access_time, + size: 16, + color: colorScheme.primary, + ), + const SizedBox(width: 4), + Text( + DateFormat('h:mm a').format(ticket.eventStartDate!), + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + ), + ], + ), + ], + + if (isResale && ticket.resellPrice != null) ...[ + const SizedBox(height: 8), + Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: colorScheme.tertiary.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: colorScheme.tertiary.withOpacity(0.3), + ), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Icons.sell, + size: 14, + color: colorScheme.tertiary, + ), + const SizedBox(width: 4), + Text( + 'Listed: ${NumberFormat.currency(locale: 'en_US', symbol: '\$').format(ticket.resellPrice)}', + style: theme.textTheme.labelMedium?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ], + ], + ); + } + + Widget _buildTicketTypeChip(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), + decoration: BoxDecoration( + color: colorScheme.secondaryContainer.withOpacity(0.7), + borderRadius: BorderRadius.circular(20), + border: Border.all( + color: colorScheme.secondary.withOpacity(0.3), + ), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Icons.confirmation_number, + size: 14, + color: colorScheme.onSecondaryContainer, + ), + const SizedBox(width: 4), + Text( + 'Ticket', + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onSecondaryContainer, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ); + } + + Widget _buildTicketDetails(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surfaceContainerHighest.withOpacity(0.5), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.outlineVariant.withOpacity(0.5), + ), + ), + child: Row( + children: [ + Expanded( + child: _buildDetailItem( + context, + 'Ticket ID', + '#${ticket.ticketId}', + Icons.tag, + ), + ), + if (ticket.seat != null) ...[ + Container( + width: 1, + height: 40, + color: colorScheme.outlineVariant, + ), + const SizedBox(width: 12), + Expanded( + child: _buildDetailItem( + context, + 'Seat', + ticket.seat!, + Icons.event_seat, + ), + ), + ], + ], + ), + ); + } + + Widget _buildDetailItem( + BuildContext context, + String label, + String value, + IconData icon, + ) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Column( + children: [ + Icon(icon, size: 20, color: colorScheme.primary), + const SizedBox(height: 4), + Text( + label, + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + const SizedBox(height: 2), + Text( + value, + style: theme.textTheme.titleSmall?.copyWith( + fontWeight: FontWeight.w600, + ), + ), + ], + ); + } + + Widget _buildPriceSection(BuildContext context, bool isResale) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer.withOpacity(0.3), + colorScheme.secondaryContainer.withOpacity(0.3), + ], + ), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.primary.withOpacity(0.2), + ), + ), + child: Column( + children: [ + if (ticket.originalPrice != null) + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Original Price', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(ticket.originalPrice), + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + decoration: isResale ? TextDecoration.lineThrough : null, + color: isResale ? colorScheme.onSurfaceVariant : null, + ), + ), + ], + ), + + if (isResale && ticket.resellPrice != null) ...[ + const SizedBox(height: 8), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Resale Price', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.w600, + ), + ), + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(ticket.resellPrice), + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.tertiary, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + + // Show profit/loss + if (ticket.originalPrice != null) ...[ + const SizedBox(height: 8), + _buildProfitLossIndicator(context), + ], + ], + ], + ), + ); + } + + Widget _buildProfitLossIndicator(BuildContext context) { + final theme = Theme.of(context); + final difference = ticket.resellPrice! - ticket.originalPrice!; + final isProfit = difference > 0; + + final color = isProfit ? Colors.green : Colors.red; + final icon = isProfit ? Icons.trending_up : Icons.trending_down; + final text = isProfit ? 'Profit' : 'Loss'; + + return Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(icon, size: 16, color: color), + const SizedBox(width: 4), + Text( + '$text: ${NumberFormat.currency(locale: 'en_US', symbol: '\$').format(difference.abs())}', + style: theme.textTheme.labelMedium?.copyWith( + color: color, + fontWeight: FontWeight.w600, + ), + ), + ], + ); + } + + Widget _buildActionButtons(BuildContext context, bool isResale) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Row( + children: [ + Expanded( + child: OutlinedButton.icon( + onPressed: isProcessing ? null : onDownload, + icon: const Icon(Icons.download, size: 18), + label: const Text('Download'), + style: OutlinedButton.styleFrom( + padding: const EdgeInsets.symmetric(vertical: 12), + side: BorderSide(color: colorScheme.primary), + foregroundColor: colorScheme.primary, + ), + ), + ), + const SizedBox(width: 12), + Expanded( + flex: 2, + child: isResale + ? ElevatedButton.icon( + onPressed: isProcessing ? null : onCancelResale, + icon: isProcessing + ? SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator( + strokeWidth: 2, + color: colorScheme.onTertiary, + ), + ) + : const Icon(Icons.cancel, size: 18), + label: const Text('Cancel Resale'), + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.tertiary, + foregroundColor: colorScheme.onTertiary, + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ) + : ElevatedButton.icon( + onPressed: isProcessing ? null : onResell, + icon: isProcessing + ? SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator( + strokeWidth: 2, + color: colorScheme.onSecondary, + ), + ) + : const Icon(Icons.sell, size: 18), + label: const Text('List for Resale'), + style: ElevatedButton.styleFrom( + backgroundColor: colorScheme.secondary, + foregroundColor: colorScheme.onSecondary, + padding: const EdgeInsets.symmetric(vertical: 12), + ), + ), + ), + ], + ); + } + + Color _getBorderColor( + ColorScheme colorScheme, + bool isResale, + bool isPast, + bool isUpcoming, + ) { + if (isResale) return colorScheme.tertiary.withOpacity(0.3); + if (isPast) return colorScheme.outlineVariant; + if (isUpcoming) return colorScheme.primary.withOpacity(0.3); + return colorScheme.outlineVariant.withOpacity(0.3); + } + + double _getBorderWidth(bool isResale, bool isPast, bool isUpcoming) { + if (isResale || isUpcoming) return 1.5; + return 1.0; + } +} diff --git a/frontend/lib/presentation/tickets/widgets/ticket_filter_tabs.dart b/frontend/lib/presentation/tickets/widgets/ticket_filter_tabs.dart new file mode 100644 index 0000000..6c471ab --- /dev/null +++ b/frontend/lib/presentation/tickets/widgets/ticket_filter_tabs.dart @@ -0,0 +1,100 @@ +import 'package:flutter/material.dart'; + +class TicketFilterTabs extends StatelessWidget { + final TabController tabController; + final VoidCallback onTabChange; + + const TicketFilterTabs({ + super.key, + required this.tabController, + required this.onTabChange, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + margin: const EdgeInsets.symmetric(horizontal: 16), + decoration: BoxDecoration( + color: colorScheme.surface, + borderRadius: BorderRadius.circular(16), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.1), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(16), + child: TabBar( + controller: tabController, + labelColor: colorScheme.onPrimary, + unselectedLabelColor: colorScheme.onSurfaceVariant, + indicator: BoxDecoration( + color: colorScheme.primary, + borderRadius: BorderRadius.circular(12), + ), + indicatorSize: TabBarIndicatorSize.tab, + indicatorPadding: const EdgeInsets.all(4), + labelStyle: theme.textTheme.labelLarge?.copyWith( + fontWeight: FontWeight.w600, + ), + unselectedLabelStyle: theme.textTheme.labelLarge?.copyWith( + fontWeight: FontWeight.normal, + ), + dividerColor: Colors.transparent, + overlayColor: WidgetStateProperty.all(Colors.transparent), + tabs: [ + _CustomTab( + icon: Icons.confirmation_number_outlined, + selectedIcon: Icons.confirmation_number, + text: 'All Tickets', + ), + _CustomTab( + icon: Icons.event_available_outlined, + selectedIcon: Icons.event_available, + text: 'Upcoming', + ), + _CustomTab( + icon: Icons.sell_outlined, + selectedIcon: Icons.sell, + text: 'On Resale', + ), + ], + ), + ), + ); + } +} + +class _CustomTab extends StatelessWidget { + final IconData icon; + final IconData selectedIcon; + final String text; + + const _CustomTab({ + required this.icon, + required this.selectedIcon, + required this.text, + }); + + @override + Widget build(BuildContext context) { + return Tab( + height: 56, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + // The TabBar will handle the icon color based on selection state + Icon(icon, size: 18), + const SizedBox(width: 8), + Text(text), + ], + ), + ); + } +} \ No newline at end of file diff --git a/frontend/lib/presentation/tickets/widgets/ticket_stats_header.dart b/frontend/lib/presentation/tickets/widgets/ticket_stats_header.dart new file mode 100644 index 0000000..acd7b76 --- /dev/null +++ b/frontend/lib/presentation/tickets/widgets/ticket_stats_header.dart @@ -0,0 +1,295 @@ +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:resellio/core/models/models.dart'; + +class TicketStatsHeader extends StatelessWidget { + final List tickets; + + const TicketStatsHeader({ + super.key, + required this.tickets, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + final stats = _calculateStats(); + + return Container( + margin: const EdgeInsets.all(16), + padding: const EdgeInsets.all(20), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + colorScheme.primaryContainer, + colorScheme.primaryContainer.withOpacity(0.7), + ], + ), + borderRadius: BorderRadius.circular(20), + boxShadow: [ + BoxShadow( + color: colorScheme.shadow.withOpacity(0.1), + blurRadius: 8, + offset: const Offset(0, 2), + ), + ], + ), + child: Column( + children: [ + // Header + Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.primary, + borderRadius: BorderRadius.circular(12), + ), + child: Icon( + Icons.confirmation_number, + color: colorScheme.onPrimary, + size: 24, + ), + ), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'My Ticket Collection', + style: theme.textTheme.titleLarge?.copyWith( + color: colorScheme.onPrimaryContainer, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + '${tickets.length} ticket${tickets.length != 1 ? 's' : ''} in total', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onPrimaryContainer.withOpacity(0.8), + ), + ), + ], + ), + ), + ], + ), + + const SizedBox(height: 20), + + // Stats grid + Row( + children: [ + Expanded( + child: _StatItem( + icon: Icons.event_available, + label: 'Upcoming', + value: stats.upcomingCount.toString(), + color: Colors.green, + ), + ), + const SizedBox(width: 12), + Expanded( + child: _StatItem( + icon: Icons.sell, + label: 'On Resale', + value: stats.resaleCount.toString(), + color: Colors.orange, + ), + ), + const SizedBox(width: 12), + Expanded( + child: _StatItem( + icon: Icons.history, + label: 'Past Events', + value: stats.pastCount.toString(), + color: Colors.blue, + ), + ), + ], + ), + + // Financial summary + if (stats.totalValue > 0 || stats.resaleValue > 0) ...[ + const SizedBox(height: 16), + Container( + width: double.infinity, + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: colorScheme.surface.withOpacity(0.8), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: colorScheme.primary.withOpacity(0.2), + ), + ), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Total Collection Value', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(stats.totalValue), + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + color: colorScheme.primary, + ), + ), + ], + ), + if (stats.resaleValue > 0) ...[ + const SizedBox(height: 8), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Potential Resale Value', + style: theme.textTheme.bodyMedium?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + ), + Text( + NumberFormat.currency(locale: 'en_US', symbol: '\$') + .format(stats.resaleValue), + style: theme.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + color: Colors.orange, + ), + ), + ], + ), + ], + ], + ), + ), + ], + ], + ), + ); + } + + _TicketStats _calculateStats() { + int upcomingCount = 0; + int pastCount = 0; + int resaleCount = 0; + double totalValue = 0; + double resaleValue = 0; + + final now = DateTime.now(); + + for (final ticket in tickets) { + if (ticket.resellPrice != null) { + resaleCount++; + resaleValue += ticket.resellPrice!; + } else if (ticket.eventStartDate != null) { + if (ticket.eventStartDate!.isAfter(now)) { + upcomingCount++; + } else { + pastCount++; + } + } + + if (ticket.originalPrice != null) { + totalValue += ticket.originalPrice!; + } + } + + return _TicketStats( + upcomingCount: upcomingCount, + pastCount: pastCount, + resaleCount: resaleCount, + totalValue: totalValue, + resaleValue: resaleValue, + ); + } +} + +class _StatItem extends StatelessWidget { + final IconData icon; + final String label; + final String value; + final Color color; + + const _StatItem({ + required this.icon, + required this.label, + required this.value, + required this.color, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: colorScheme.surface.withOpacity(0.8), + borderRadius: BorderRadius.circular(12), + border: Border.all( + color: color.withOpacity(0.3), + ), + ), + child: Column( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: color.withOpacity(0.1), + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + icon, + color: color, + size: 20, + ), + ), + const SizedBox(height: 8), + Text( + value, + style: theme.textTheme.headlineSmall?.copyWith( + color: color, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 2), + Text( + label, + style: theme.textTheme.labelSmall?.copyWith( + color: colorScheme.onSurfaceVariant, + ), + textAlign: TextAlign.center, + ), + ], + ), + ); + } +} + +class _TicketStats { + final int upcomingCount; + final int pastCount; + final int resaleCount; + final double totalValue; + final double resaleValue; + + _TicketStats({ + required this.upcomingCount, + required this.pastCount, + required this.resaleCount, + required this.totalValue, + required this.resaleValue, + }); +} \ No newline at end of file diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock index 43564bc..e24277d 100644 --- a/frontend/pubspec.lock +++ b/frontend/pubspec.lock @@ -9,6 +9,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.13.0" + bloc: + dependency: transitive + description: + name: bloc + sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189" + url: "https://pub.dev" + source: hosted + version: "9.0.0" boolean_selector: dependency: transitive description: @@ -65,6 +73,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + equatable: + dependency: "direct main" + description: + name: equatable + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" + url: "https://pub.dev" + source: hosted + version: "2.0.7" fake_async: dependency: transitive description: @@ -78,6 +94,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_bloc: + dependency: "direct main" + description: + name: flutter_bloc + sha256: cf51747952201a455a1c840f8171d273be009b932c75093020f9af64f2123e38 + url: "https://pub.dev" + source: hosted + version: "9.1.1" flutter_lints: dependency: "direct dev" description: diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml index c0398c0..730519c 100644 --- a/frontend/pubspec.yaml +++ b/frontend/pubspec.yaml @@ -16,6 +16,8 @@ dependencies: provider: ^6.1.5 go_router: ^15.2.0 dio: ^5.8.0+1 + flutter_bloc: ^9.1.1 + equatable: ^2.0.7 dev_dependencies: flutter_test: diff --git a/frontend/test.Dockerfile b/frontend/test.Dockerfile new file mode 100644 index 0000000..6ecd02b --- /dev/null +++ b/frontend/test.Dockerfile @@ -0,0 +1,15 @@ +# Use a pre-built Flutter image from GitHub Container Registry +FROM ghcr.io/cirruslabs/flutter:3.32.4 + +# Set working directory +WORKDIR /app + +# Copy the entire frontend project +# A .dockerignore file is used to exclude unnecessary files +COPY . . + +# Get Flutter dependencies +RUN flutter pub get + +# The command to run the tests is specified in the docker-compose.yml, +# so no CMD or ENTRYPOINT is needed here. diff --git a/frontend/test/widget_test.dart b/frontend/test/widget_test.dart new file mode 100644 index 0000000..f87d7be --- /dev/null +++ b/frontend/test/widget_test.dart @@ -0,0 +1,97 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:resellio/app/config/app_router.dart'; +import 'package:resellio/core/models/cart_model.dart'; +import 'package:resellio/core/network/api_client.dart'; +import 'package:resellio/core/repositories/repositories.dart'; +import 'package:resellio/core/services/auth_service.dart'; +import 'package:resellio/presentation/auth/pages/welcome_screen.dart'; +import 'package:resellio/presentation/cart/cubit/cart_cubit.dart'; + +// Mock implementation of CartRepository to be used in tests, preventing network calls. +class MockCartRepository extends Fake implements CartRepository { + @override + Future> getCartItems() async => []; + + @override + Future addToCart(int ticketTypeId, int quantity) async {} + + @override + Future addResaleTicketToCart(int ticketId) async {} + + @override + Future removeFromCart(int cartItemId) async {} + + @override + Future checkout() async => true; +} + +void main() { + // A helper function to build a widget tree with all necessary providers for testing. + // This mimics the setup in `main.dart` but can use mock implementations. + Widget buildTestableApp() { + // For widget tests, it's best to use a mock ApiClient to avoid real network calls. + final apiClient = ApiClient('http://mock-api.com'); + + // Instantiate repositories with the mock client. + final authRepo = ApiAuthRepository(apiClient); + final userRepo = ApiUserRepository(apiClient); + final eventRepo = ApiEventRepository(apiClient); + final cartRepo = MockCartRepository(); // Use a simple mock for the cart + final ticketRepo = ApiTicketRepository(apiClient); + final resaleRepo = ApiResaleRepository(apiClient); + final adminRepo = ApiAdminRepository(apiClient); + + // Instantiate services that depend on repositories. + final authService = AuthService(authRepo, userRepo); + + return MultiProvider( + providers: [ + Provider.value(value: apiClient), + Provider.value(value: authRepo), + Provider.value(value: userRepo), + Provider.value(value: eventRepo), + Provider.value(value: cartRepo), + Provider.value(value: ticketRepo), + Provider.value(value: resaleRepo), + Provider.value(value: adminRepo), + ChangeNotifierProvider.value(value: authService), + BlocProvider( + create: (context) => CartCubit(context.read()), + ), + ], + // The app uses GoRouter, so we must wrap the test in a MaterialApp.router + // to correctly handle navigation and screen building. + child: MaterialApp.router( + routerConfig: AppRouter.createRouter(authService), + ), + ); + } + + testWidgets('App starts and shows WelcomeScreen correctly', + (WidgetTester tester) async { + // Build the entire application widget tree. + await tester.pumpWidget(buildTestableApp()); + + // Allow the router to process the initial route and build the page. + await tester.pumpAndSettle(); + + // 1. Verify that the WelcomeScreen is the current screen. + expect(find.byType(WelcomeScreen), findsOneWidget); + + // 2. Verify that the main branding title is displayed. + expect(find.text('RESELLIO'), findsOneWidget); + + // 3. Verify that both registration buttons are visible. + expect(find.widgetWithText(ElevatedButton, 'REGISTER AS USER'), + findsOneWidget); + expect(find.widgetWithText(ElevatedButton, 'REGISTER AS ORGANIZER'), + findsOneWidget); + + // 4. Verify that the login prompt button is visible. + expect(find.widgetWithText(TextButton, 'Already have an account? Log In'), + findsOneWidget); + }); +} diff --git a/scripts/actions/deploy_frontend.bash b/scripts/actions/deploy_frontend.bash new file mode 100755 index 0000000..cffd8b7 --- /dev/null +++ b/scripts/actions/deploy_frontend.bash @@ -0,0 +1,75 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) +PROJECT_ROOT=$(cd "$SCRIPT_DIR/../.." && pwd) +source "$SCRIPT_DIR/../utils/print.bash" + +TF_DIR="$PROJECT_ROOT/terraform/main" +FRONTEND_DIR="$PROJECT_ROOT/frontend" + +gen_separator '=' +pretty_info "Starting Frontend Deployment to AWS" +gen_separator '=' + +# 1. Fetch required values from Terraform state +pretty_info "Fetching deployment configuration from Terraform..." +FRONTEND_URL=$(terraform -chdir="$TF_DIR" output -raw frontend_url) +S3_BUCKET=$(terraform -chdir="$TF_DIR" output -raw frontend_s3_bucket_name) +CLOUDFRONT_ID=$(terraform -chdir="$TF_DIR" output -raw frontend_cloudfront_distribution_id) + +if [[ -z "$FRONTEND_URL" || -z "$S3_BUCKET" || -z "$CLOUDFRONT_ID" ]]; then + pretty_error "Failed to retrieve necessary deployment values from Terraform." + pretty_error "Ensure Terraform has been applied successfully in '$TF_DIR'." + exit 1 +fi + +API_BASE_URL="${FRONTEND_URL}/api" + +pretty_success "Configuration loaded:" +pretty_clean " > API URL for build: $API_BASE_URL" +pretty_clean " > S3 Bucket: $S3_BUCKET" +pretty_clean " > CloudFront ID: $CLOUDFRONT_ID" + +# 2. Build the Flutter web application +gen_separator +pretty_info "Building Flutter web application with API base: $API_BASE_URL" +gen_separator + +cd "$FRONTEND_DIR" + +if ! flutter build web --dart-define=API_BASE_URL="$API_BASE_URL"; then + pretty_error "Flutter build failed." + exit 1 +fi +pretty_success "Flutter web application built successfully." + +# 3. Synchronize build output with S3 +gen_separator +pretty_info "Uploading built files to S3 bucket: $S3_BUCKET" +gen_separator + +BUILD_DIR="$FRONTEND_DIR/build/web" + +if ! aws s3 sync "$BUILD_DIR" "s3://$S3_BUCKET" --delete --acl private; then + pretty_error "S3 sync failed." + exit 1 +fi +pretty_success "Files successfully uploaded to S3." + +# 4. Invalidate the CloudFront cache +gen_separator +pretty_info "Invalidating CloudFront cache to deploy changes..." +gen_separator + +if ! aws cloudfront create-invalidation --distribution-id "$CLOUDFRONT_ID" --paths "/*"; then + pretty_error "CloudFront invalidation failed." + pretty_warn "Changes may take some time to appear." + exit 1 +fi +pretty_success "CloudFront invalidation created successfully." + +gen_separator '=' +pretty_success "Frontend deployment complete!" +pretty_info "Your application is available at: $FRONTEND_URL" +gen_separator '=' diff --git a/scripts/actions/run_tests.bash b/scripts/actions/run_tests.bash index 6d2f113..530b417 100755 --- a/scripts/actions/run_tests.bash +++ b/scripts/actions/run_tests.bash @@ -6,101 +6,190 @@ PROJECT_ROOT=$(cd "$SCRIPT_DIR/../.." && pwd) source "$SCRIPT_DIR/../utils/print.bash" # Script parameters -TARGET_ENV="${1:-}" -TEST_SELECTOR="${2:-}" - -# Validation -if [[ -z "$TARGET_ENV" || ("$TARGET_ENV" != "local" && "$TARGET_ENV" != "aws") ]]; then - pretty_error "Invalid target environment. Usage: $0 " - pretty_info "Usage: $0 [pytest_test_selector]" - pretty_info "Example for specific test: $0 local \"tests/test_authentication.py::test_user_login\"" - pretty_info "Example for tests with keyword: $0 local \"-k login\"" - exit 1 -fi - -gen_separator '=' -pretty_info "Starting API tests for environment: ${bold}${TARGET_ENV}${nc}" -if [[ -n "$TEST_SELECTOR" ]]; then - pretty_info "Targeting specific test(s)/selector: ${bold}${TEST_SELECTOR}${nc}" -fi -gen_separator '=' - -# Setup Test Environment -TEST_DIR="$PROJECT_ROOT/backend/tests" -cd "$TEST_DIR" - -pretty_info "Setting up Python virtual environment and installing dependencies..." -if [[ ! -d ".venv" ]]; then - python3 -m venv .venv -fi -source .venv/bin/activate -pip install -r requirements.txt > /dev/null -pretty_success "Dependencies are up to date." - -# Configure for Target Environment -if [[ "$TARGET_ENV" == "local" ]]; then - pretty_info "Configuring for local Docker Compose environment..." - - # Ensure .env file exists in project root - if [[ ! -f "$PROJECT_ROOT/.env" ]]; then - pretty_warn ".env file not found. Copying from template." - cp "$PROJECT_ROOT/.env.template" "$PROJECT_ROOT/.env" +SUITE="${1:-}" +TARGET_ENV="${2:-}" +TEST_SELECTOR="${3:-}" + +# Function for Backend Tests +run_backend_tests() { + # Validation + if [[ -z "$TARGET_ENV" || ("$TARGET_ENV" != "local" && "$TARGET_ENV" != "aws") ]]; then + pretty_error "Invalid target environment for backend tests. Usage: $0 backend [pytest_selector]" + exit 1 fi - # Load ADMIN_SECRET_KEY and set API_BASE_URL from .env file for the tests - export ADMIN_SECRET_KEY=$(grep ADMIN_SECRET_KEY "$PROJECT_ROOT/.env" | cut -d '=' -f2) - export API_BASE_URL="http://localhost:8080" # Root of the gateway + # For local tests, this script will manage the Docker lifecycle. + if [[ "$TARGET_ENV" == "local" ]]; then + gen_separator '=' + pretty_info "Starting LOCAL Backend API test run (Docker-managed)" + gen_separator '=' + + cd "$PROJECT_ROOT" + + # Ensure .env file exists for Docker Compose to use + if [[ ! -f ".env" ]]; then + pretty_warn ".env file not found. Copying from template." + cp ".env.template" ".env" + fi + + # Start services in the background + pretty_info "Building and starting services in the background..." + docker compose up -d --build + pretty_success "Services are starting." + + # Wait for API Gateway to be ready + pretty_info "Waiting for API Gateway to become healthy..." + timeout 120s bash -c ' + until curl -fs http://localhost:8080/health &>/dev/null; do + echo "Waiting for API Gateway..."; + sleep 5; + done + ' + pretty_success "API Gateway is ready!" + fi + + gen_separator '=' + pretty_info "Starting Backend API tests for environment: ${bold}${TARGET_ENV}${nc}" + if [[ -n "$TEST_SELECTOR" ]]; then + pretty_info "Targeting specific test(s)/selector: ${bold}${TEST_SELECTOR}${nc}" + fi + gen_separator '=' - pretty_info "Target URL: ${API_BASE_URL}" - pretty_info "Admin Secret Key: Loaded from .env file." + # Setup Test Environment + TEST_DIR="$PROJECT_ROOT/backend/tests" + cd "$TEST_DIR" -elif [[ "$TARGET_ENV" == "aws" ]]; then - pretty_info "Configuring for AWS environment..." - TF_DIR="$PROJECT_ROOT/terraform/main" + pretty_info "Setting up Python virtual environment and installing dependencies..." + if [[ ! -d ".venv" ]]; then + python3 -m venv .venv + fi + source .venv/bin/activate + pip install -r requirements.txt > /dev/null + pretty_success "Dependencies are up to date." + + # Configure for Target Environment + if [[ "$TARGET_ENV" == "local" ]]; then + pretty_info "Configuring for local Docker Compose environment..." + export ADMIN_SECRET_KEY=$(grep ADMIN_SECRET_KEY "$PROJECT_ROOT/.env" | cut -d '=' -f2) + export API_BASE_URL="http://localhost:8080" + pretty_info "Target URL: ${API_BASE_URL}" + + elif [[ "$TARGET_ENV" == "aws" ]]; then + pretty_info "Configuring for AWS environment..." + # ... (AWS logic remains unchanged) + TF_DIR="$PROJECT_ROOT/terraform/main" + pretty_info "Fetching outputs from Terraform state..." + BASE_URL=$(terraform -chdir="$TF_DIR" output -raw api_base_url) + export API_BASE_URL="$BASE_URL" + PROJECT_NAME=$(terraform -chdir="$TF_DIR" output -json | jq -r '.project_name.value // "resellio"') + SECRET_NAME="${PROJECT_NAME}-admin-secret-key" + pretty_info "Fetching Admin Secret Key from AWS Secrets Manager (Secret: $SECRET_NAME)..." + export ADMIN_SECRET_KEY=$(aws secretsmanager get-secret-value --secret-id "$SECRET_NAME" --query SecretString --output text) + if [[ -z "$API_BASE_URL" || -z "$ADMIN_SECRET_KEY" ]]; then + pretty_error "Failed to retrieve necessary values from AWS. Ensure Terraform has been applied." + exit 1 + fi + pretty_info "Target URL: ${API_BASE_URL}" + fi - # Get outputs from Terraform - pretty_info "Fetching outputs from Terraform state..." - BASE_URL=$(terraform -chdir="$TF_DIR" output -raw api_base_url) - export API_BASE_URL="$BASE_URL" # Export for helper.py + # Run Tests + gen_separator + pretty_info "Executing pytest tests..." + gen_separator - # Get admin secret from AWS Secrets Manager - PROJECT_NAME=$(terraform -chdir="$TF_DIR" output -json | jq -r '.project_name.value // "resellio"') - SECRET_NAME="${PROJECT_NAME}-admin-secret-key" + PYTEST_CMD="pytest -v" + if [[ -n "$TEST_SELECTOR" ]]; then + PYTEST_CMD="$PYTEST_CMD \"$TEST_SELECTOR\"" + fi - pretty_info "Fetching Admin Secret Key from AWS Secrets Manager (Secret: $SECRET_NAME)..." - export ADMIN_SECRET_KEY=$(aws secretsmanager get-secret-value --secret-id "$SECRET_NAME" --query SecretString --output text) + eval $PYTEST_CMD + TEST_EXIT_CODE=$? - if [[ -z "$API_BASE_URL" || -z "$ADMIN_SECRET_KEY" ]]; then - pretty_error "Failed to retrieve necessary values from AWS. Ensure Terraform has been applied." - exit 1 + # Cleanup Docker if we started it + if [[ "$TARGET_ENV" == "local" ]]; then + pretty_info "Cleaning up Docker services..." + cd "$PROJECT_ROOT" +# docker compose down -v fi - pretty_info "Target URL: ${API_BASE_URL}" - pretty_info "Admin Secret Key: Fetched from AWS Secrets Manager." -fi + gen_separator '=' + if [[ $TEST_EXIT_CODE -eq 0 ]]; then + pretty_success "All API tests passed for the '$TARGET_ENV' environment!" + else + pretty_error "Some API tests failed for the '$TARGET_ENV' environment." + fi + gen_separator '=' -# Run Tests -gen_separator -pretty_info "Executing pytest tests..." -gen_separator + exit $TEST_EXIT_CODE +} -PYTEST_CMD="pytest -v" -if [[ -n "$TEST_SELECTOR" ]]; then - PYTEST_CMD="$PYTEST_CMD \"$TEST_SELECTOR\"" # Add selector if provided, ensure it's quoted -fi +# Function for Frontend Tests +run_frontend_tests() { + # Validation + if [[ -n "$TARGET_ENV" && "$TARGET_ENV" != "local" ]]; then + pretty_warn "Frontend tests only run in 'local' environment. Ignoring '$TARGET_ENV'." + fi -# Execute the command -# Using eval to correctly interpret the quoted selector if it contains spaces or special pytest syntax (like -k "some name") -eval $PYTEST_CMD + gen_separator '=' + pretty_info "Starting Frontend (Flutter) tests for local Docker environment" + gen_separator '=' -TEST_EXIT_CODE=$? + cd "$PROJECT_ROOT" -gen_separator '=' -if [[ $TEST_EXIT_CODE -eq 0 ]]; then - pretty_success "All API tests passed for the '$TARGET_ENV' environment!" -else - pretty_error "Some API tests failed for the '$TARGET_ENV' environment." -fi -gen_separator '=' + # Ensure .env file exists for Docker Compose to use + if [[ ! -f "$PROJECT_ROOT/.env" ]]; then + pretty_warn ".env file not found. Copying from template." + cp "$PROJECT_ROOT/.env.template" "$PROJECT_ROOT/.env" + fi -exit $TEST_EXIT_CODE + # 1. Build and start all backend services in the background. + pretty_info "Building and starting dependent services in the background..." + docker compose up -d --build + pretty_success "Backend services are starting." + + # 2. Wait for the API Gateway to be ready before running tests. + pretty_info "Waiting for API Gateway to become healthy..." + timeout 120s bash -c ' + until curl -fs http://localhost:8080/health &>/dev/null; do + echo "Waiting for API Gateway..."; + sleep 5; + done + ' + pretty_success "API Gateway is ready!" + + # 3. Run the Flutter test container as a one-off task. + pretty_info "Running Flutter test container..." + docker compose run --rm flutter-tester + TEST_EXIT_CODE=$? + + # 4. Clean up all services started by this script. + pretty_info "Cleaning up all services..." +# docker compose down -v + + gen_separator '=' + if [[ $TEST_EXIT_CODE -eq 0 ]]; then + pretty_success "All Flutter tests passed!" + else + pretty_error "Some Flutter tests failed." + fi + gen_separator '=' + + exit $TEST_EXIT_CODE +} + + +# Main Dispatcher +case "$SUITE" in + "backend") + run_backend_tests + ;; + "frontend") + run_frontend_tests + ;; + *) + pretty_error "Invalid test suite. Usage: $0 [args...]" + pretty_info "Backend tests: $0 backend [pytest_selector]" + pretty_info "Frontend tests: $0 frontend [local]" + exit 1 + ;; +esac diff --git a/terraform/main/main.tf b/terraform/main/main.tf index e5b4789..7f3f81d 100644 --- a/terraform/main/main.tf +++ b/terraform/main/main.tf @@ -153,3 +153,10 @@ resource "null_resource" "db_initializer" { EOT } } + +# Frontend Hosting +module "frontend_hosting" { + source = "../modules/frontend_hosting" + project_name = var.project_name + api_base_url = module.ecs_cluster.alb_dns_name +} diff --git a/terraform/main/outputs.tf b/terraform/main/outputs.tf index 43af84c..9b38488 100644 --- a/terraform/main/outputs.tf +++ b/terraform/main/outputs.tf @@ -17,3 +17,18 @@ output "project_name" { description = "The project name used for all resources" value = var.project_name } + +output "frontend_url" { + description = "Public URL for the frontend application" + value = "https://${module.frontend_hosting.cloudfront_domain_name}" +} + +output "frontend_s3_bucket_name" { + description = "Name of the S3 bucket for the frontend files" + value = module.frontend_hosting.s3_bucket_name +} + +output "frontend_cloudfront_distribution_id" { + description = "ID of the CloudFront distribution for the frontend" + value = module.frontend_hosting.cloudfront_distribution_id +} diff --git a/terraform/modules/frontend_hosting/main.tf b/terraform/modules/frontend_hosting/main.tf new file mode 100644 index 0000000..6f58ec6 --- /dev/null +++ b/terraform/modules/frontend_hosting/main.tf @@ -0,0 +1,131 @@ +resource "aws_s3_bucket" "frontend" { + bucket = "${var.project_name}-frontend-hosting" +} + +resource "aws_s3_bucket_website_configuration" "frontend" { + bucket = aws_s3_bucket.frontend.id + + index_document { + suffix = "index.html" + } + + error_document { + key = "index.html" + } +} + +resource "aws_s3_bucket_public_access_block" "frontend" { + bucket = aws_s3_bucket.frontend.id + block_public_acls = true + block_public_policy = true + ignore_public_acls = true + restrict_public_buckets = true +} + +resource "aws_cloudfront_origin_access_control" "this" { + name = "${var.project_name}-s3-oac" + description = "Origin Access Control for S3" + origin_access_control_origin_type = "s3" + signing_behavior = "always" + signing_protocol = "sigv4" +} + +resource "aws_s3_bucket_policy" "frontend" { + bucket = aws_s3_bucket.frontend.id + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Effect = "Allow" + Principal = { Service = "cloudfront.amazonaws.com" } + Action = "s3:GetObject" + Resource = "${aws_s3_bucket.frontend.arn}/*" + Condition = { + StringEquals = { + "AWS:SourceArn" = aws_cloudfront_distribution.this.arn + } + } + } + ] + }) +} + +resource "aws_cloudfront_distribution" "this" { + enabled = true + is_ipv6_enabled = true + comment = "Frontend for ${var.project_name}" + default_root_object = "index.html" + + origin { + domain_name = aws_s3_bucket.frontend.bucket_regional_domain_name + origin_id = "S3-${aws_s3_bucket.frontend.id}" + origin_access_control_id = aws_cloudfront_origin_access_control.this.id + } + + origin { + domain_name = var.api_base_url + origin_id = "ALB-${var.project_name}" + custom_origin_config { + http_port = 80 + https_port = 443 + origin_protocol_policy = "http-only" + origin_ssl_protocols = ["TLSv1.2"] + origin_read_timeout = 30 + origin_keepalive_timeout = 5 + } + } + + default_cache_behavior { + allowed_methods = ["GET", "HEAD", "OPTIONS"] + cached_methods = ["GET", "HEAD", "OPTIONS"] + target_origin_id = "S3-${aws_s3_bucket.frontend.id}" + + forwarded_values { + query_string = false + headers = ["Origin"] + cookies { + forward = "none" + } + } + + viewer_protocol_policy = "redirect-to-https" + min_ttl = 0 + default_ttl = 3600 + max_ttl = 86400 + } + + ordered_cache_behavior { + path_pattern = "/api/*" + allowed_methods = ["GET", "HEAD", "OPTIONS", "PUT", "POST", "PATCH", "DELETE"] + cached_methods = ["GET", "HEAD", "OPTIONS"] + target_origin_id = "ALB-${var.project_name}" + + viewer_protocol_policy = "redirect-to-https" + min_ttl = 0 + default_ttl = 0 + max_ttl = 0 + + forwarded_values { + query_string = true + headers = ["*"] + cookies { + forward = "all" + } + } + } + + restrictions { + geo_restriction { + restriction_type = "none" + } + } + + viewer_certificate { + cloudfront_default_certificate = true + } + + tags = { + Project = var.project_name + Environment = "frontend" + } +} diff --git a/terraform/modules/frontend_hosting/outputs.tf b/terraform/modules/frontend_hosting/outputs.tf new file mode 100644 index 0000000..79f66bd --- /dev/null +++ b/terraform/modules/frontend_hosting/outputs.tf @@ -0,0 +1,14 @@ +output "s3_bucket_name" { + description = "The name of the S3 bucket for the frontend static files." + value = aws_s3_bucket.frontend.id +} + +output "cloudfront_distribution_id" { + description = "The ID of the CloudFront distribution." + value = aws_cloudfront_distribution.this.id +} + +output "cloudfront_domain_name" { + description = "The domain name of the CloudFront distribution." + value = aws_cloudfront_distribution.this.domain_name +} diff --git a/terraform/modules/frontend_hosting/variables.tf b/terraform/modules/frontend_hosting/variables.tf new file mode 100644 index 0000000..f197b2c --- /dev/null +++ b/terraform/modules/frontend_hosting/variables.tf @@ -0,0 +1,9 @@ +variable "project_name" { + type = string + description = "Global project identifier" +} + +variable "api_base_url" { + type = string + description = "The DNS name of the backend Application Load Balancer, used to route API requests." +}