Compare commits
2 Commits
1ae232d9c0
...
fe5184e18c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fe5184e18c | ||
![]() |
07266f4dcb |
4
.env
Normal file
4
.env
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
INITIAL_ADMIN_USERNAME=admin
|
||||||
|
INITIAL_ADMIN_PASSWORD=admin
|
||||||
|
ALLOWED_ORIGIN=http://127.0.0.1:5500,http://localhost:5500
|
||||||
|
DATABASE_URL=form_data.db
|
0
backend/.gitignore → .gitignore
vendored
0
backend/.gitignore → .gitignore
vendored
4102
Cargo.lock
generated
Normal file
4102
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
39
Cargo.toml
Normal file
39
Cargo.toml
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
[package]
|
||||||
|
name = "formies_be"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-web = "4.0"
|
||||||
|
rusqlite = { version = "0.29", features = ["bundled", "chrono"] }
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
|
uuid = { version = "1.0", features = ["v4"] }
|
||||||
|
actix-files = "0.6"
|
||||||
|
actix-cors = "0.6"
|
||||||
|
env_logger = "0.10"
|
||||||
|
log = "0.4"
|
||||||
|
futures = "0.3"
|
||||||
|
bcrypt = "0.13"
|
||||||
|
anyhow = "1.0"
|
||||||
|
dotenv = "0.15.0"
|
||||||
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
|
regex = "1"
|
||||||
|
url = "2"
|
||||||
|
reqwest = { version = "0.11", features = ["json"] }
|
||||||
|
scraper = "0.18"
|
||||||
|
lettre = { version = "0.10", features = ["builder", "tokio1-native-tls"] }
|
||||||
|
ureq = { version = "2.9", features = ["json"] }
|
||||||
|
# Production dependencies
|
||||||
|
actix_route_rate_limiter = "0.2.2"
|
||||||
|
actix-rt = "2.0"
|
||||||
|
actix-http = "3.0"
|
||||||
|
config = "0.13"
|
||||||
|
sentry = { version = "0.37", features = ["log"] }
|
||||||
|
validator = { version = "0.16", features = ["derive"] }
|
||||||
|
tracing = "0.1"
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
tracing-actix-web = "0.7"
|
||||||
|
tracing-log = "0.2"
|
||||||
|
tracing-appender = "0.2"
|
||||||
|
tracing-bunyan-formatter = "0.3"
|
59
Dockerfile
59
Dockerfile
@ -1,20 +1,51 @@
|
|||||||
# Stage 1: Build the Svelte frontend
|
# Build stage
|
||||||
FROM node:18 as frontend-builder
|
FROM rust:1.70-slim as builder
|
||||||
WORKDIR /app/frontend
|
|
||||||
COPY frontend/ .
|
|
||||||
RUN npm install
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
# Stage 2: Build the Rust backend
|
WORKDIR /app
|
||||||
FROM rust:1.83 as backend-builder
|
|
||||||
WORKDIR /app/backend
|
# Install build dependencies
|
||||||
COPY backend/ .
|
RUN apt-get update && apt-get install -y \
|
||||||
|
pkg-config \
|
||||||
|
libsqlite3-dev \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Copy source code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Build the application
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
# Final Stage: Combine frontend and backend
|
# Runtime stage
|
||||||
FROM debian:bullseye-slim
|
FROM debian:bullseye-slim
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=frontend-builder /app/frontend/build ./frontend/dist
|
|
||||||
COPY --from=backend-builder /app/backend/target/release/formies_be ./formies_be
|
# Install runtime dependencies
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
libsqlite3-0 \
|
||||||
|
ca-certificates \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Create necessary directories
|
||||||
|
RUN mkdir -p /app/data /app/logs
|
||||||
|
|
||||||
|
# Copy the binary from builder
|
||||||
|
COPY --from=builder /app/target/release/formies-be /app/
|
||||||
|
|
||||||
|
# Copy configuration
|
||||||
|
COPY config/default.toml /app/config/default.toml
|
||||||
|
|
||||||
|
# Set environment variables
|
||||||
|
ENV RUST_LOG=info
|
||||||
|
ENV DATABASE_URL=/app/data/form_data.db
|
||||||
|
ENV BIND_ADDRESS=0.0.0.0:8080
|
||||||
|
|
||||||
|
# Expose port
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
CMD ["./backend"]
|
|
||||||
|
# Set proper permissions
|
||||||
|
RUN chown -R nobody:nogroup /app
|
||||||
|
USER nobody
|
||||||
|
|
||||||
|
# Run the application
|
||||||
|
CMD ["./formies-be"]
|
282
README.md
282
README.md
@ -1,221 +1,149 @@
|
|||||||
# Formies
|
# Formies Backend
|
||||||
|
|
||||||
Formies is a form management tool that allows you to create customizable forms, collect submissions, and view collected data. This project combines a Rust backend and a Svelte frontend, packaged as a single Docker container for easy deployment.
|
A production-ready Rust backend for the Formies application.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
### 📝 Form Management
|
- RESTful API endpoints
|
||||||
|
- SQLite database with connection pooling
|
||||||
- Create forms with customizable fields (text, number, date, etc.).
|
- JWT-based authentication
|
||||||
- View all created forms in a centralized dashboard.
|
- Rate limiting
|
||||||
|
- Structured logging
|
||||||
### 🗂️ Submissions
|
- Error tracking with Sentry
|
||||||
|
- Health check endpoint
|
||||||
- Submit responses to forms via a user-friendly interface.
|
- CORS support
|
||||||
- View and manage all form submissions.
|
- Configuration management
|
||||||
|
- Metrics endpoint
|
||||||
### ⚙️ Backend
|
|
||||||
|
|
||||||
- Built with Rust using Actix-Web for high performance and scalability.
|
|
||||||
- Uses SQLite for local data storage with easy migration to PostgreSQL if needed.
|
|
||||||
|
|
||||||
### 🎨 Frontend
|
|
||||||
|
|
||||||
- Built with SvelteKit for a modern and lightweight user experience.
|
|
||||||
- Responsive design for use across devices.
|
|
||||||
|
|
||||||
### 🚀 Deployment
|
|
||||||
|
|
||||||
- Packaged as a single Docker image for seamless deployment.
|
|
||||||
- Supports CI/CD workflows with Gitea Actions, Drone CI, or GitHub Actions.
|
|
||||||
|
|
||||||
## Folder Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
project-root/
|
|
||||||
├── backend/ # Backend codebase
|
|
||||||
│ ├── src/
|
|
||||||
│ │ ├── handlers.rs # Route handlers for Actix-Web
|
|
||||||
│ │ ├── models.rs # Data models (Form, Submission)
|
|
||||||
│ │ ├── db.rs # Database initialization
|
|
||||||
│ │ ├── main.rs # Main entry point for the backend
|
|
||||||
│ │ └── ... # Additional modules
|
|
||||||
│ ├── Cargo.toml # Backend dependencies
|
|
||||||
│ └── Cargo.lock # Locked dependencies
|
|
||||||
│
|
|
||||||
├── frontend/ # Frontend codebase
|
|
||||||
│ ├── public/ # Built static files (after `npm run build`)
|
|
||||||
│ ├── src/
|
|
||||||
│ │ ├── lib/ # Shared utilities (e.g., API integration)
|
|
||||||
│ │ ├── routes/ # Svelte pages
|
|
||||||
│ │ │ ├── +page.svelte # Dashboard
|
|
||||||
│ │ │ └── form/ # Form-related pages
|
|
||||||
│ │ └── main.ts # Frontend entry point
|
|
||||||
│ ├── package.json # Frontend dependencies
|
|
||||||
│ ├── svelte.config.js # Svelte configuration
|
|
||||||
│ └── ... # Additional files
|
|
||||||
│
|
|
||||||
├── Dockerfile # Combined Dockerfile for both frontend and backend
|
|
||||||
├── docker-compose.yml # Docker Compose file for deployment
|
|
||||||
├── .gitea/ # Gitea Actions workflows
|
|
||||||
│ └── workflows/
|
|
||||||
│ └── build_and_deploy.yml
|
|
||||||
├── .drone.yml # Drone CI configuration
|
|
||||||
├── README.md # Documentation (this file)
|
|
||||||
└── ... # Other configuration files
|
|
||||||
```
|
|
||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
### Docker
|
- Rust 1.70 or later
|
||||||
|
- SQLite 3
|
||||||
|
- Make (optional, for using Makefile commands)
|
||||||
|
|
||||||
- Install Docker: [Docker Documentation](https://docs.docker.com/)
|
## Configuration
|
||||||
|
|
||||||
### Rust (for development)
|
The application can be configured using environment variables or a configuration file. The following environment variables are supported:
|
||||||
|
|
||||||
- Install Rust: [Rustup Installation](https://rustup.rs/)
|
### Required Environment Variables
|
||||||
|
|
||||||
### Node.js (for frontend development)
|
- `DATABASE_URL`: SQLite database URL (default: form_data.db)
|
||||||
|
- `BIND_ADDRESS`: Server bind address (default: 127.0.0.1:8080)
|
||||||
|
- `INITIAL_ADMIN_USERNAME`: Initial admin username
|
||||||
|
- `INITIAL_ADMIN_PASSWORD`: Initial admin password
|
||||||
|
|
||||||
- Install Node.js: [Node.js Downloads](https://nodejs.org/)
|
### Optional Environment Variables
|
||||||
|
|
||||||
|
- `ALLOWED_ORIGIN`: CORS allowed origin
|
||||||
|
- `RUST_LOG`: Log level (default: info)
|
||||||
|
- `SENTRY_DSN`: Sentry DSN for error tracking
|
||||||
|
- `JWT_SECRET`: JWT secret key
|
||||||
|
- `JWT_EXPIRATION`: JWT expiration time in seconds
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
### Backend
|
1. Clone the repository
|
||||||
|
2. Install dependencies:
|
||||||
1. Navigate to the backend/ directory:
|
```bash
|
||||||
|
cargo build
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
```
|
```
|
||||||
|
3. Set up environment variables:
|
||||||
2. Run the backend server:
|
```bash
|
||||||
|
cp .env.example .env
|
||||||
```sh
|
# Edit .env with your configuration
|
||||||
|
```
|
||||||
|
4. Run the development server:
|
||||||
|
```bash
|
||||||
cargo run
|
cargo run
|
||||||
```
|
```
|
||||||
|
|
||||||
The backend will be available at [http://localhost:8080](http://localhost:8080).
|
## Production Deployment
|
||||||
|
|
||||||
### Frontend
|
### Docker
|
||||||
|
|
||||||
1. Navigate to the frontend/ directory:
|
1. Build the Docker image:
|
||||||
|
|
||||||
```sh
|
```bash
|
||||||
cd frontend
|
docker build -t formies-backend .
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Install dependencies:
|
2. Run the container:
|
||||||
|
```bash
|
||||||
```sh
|
docker run -d \
|
||||||
npm install
|
--name formies-backend \
|
||||||
|
-p 8080:8080 \
|
||||||
|
-v $(pwd)/data:/app/data \
|
||||||
|
-e DATABASE_URL=/app/data/form_data.db \
|
||||||
|
-e BIND_ADDRESS=0.0.0.0:8080 \
|
||||||
|
-e INITIAL_ADMIN_USERNAME=admin \
|
||||||
|
-e INITIAL_ADMIN_PASSWORD=your-secure-password \
|
||||||
|
-e ALLOWED_ORIGIN=https://your-frontend-domain.com \
|
||||||
|
-e SENTRY_DSN=your-sentry-dsn \
|
||||||
|
formies-backend
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Start the development server:
|
### Systemd Service
|
||||||
|
|
||||||
```sh
|
1. Create a systemd service file at `/etc/systemd/system/formies-backend.service`:
|
||||||
npm run dev
|
|
||||||
|
```ini
|
||||||
|
[Unit]
|
||||||
|
Description=Formies Backend Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=formies
|
||||||
|
WorkingDirectory=/opt/formies-backend
|
||||||
|
ExecStart=/opt/formies-backend/formies-be
|
||||||
|
Restart=always
|
||||||
|
Environment=DATABASE_URL=/opt/formies-backend/data/form_data.db
|
||||||
|
Environment=BIND_ADDRESS=0.0.0.0:8080
|
||||||
|
Environment=INITIAL_ADMIN_USERNAME=admin
|
||||||
|
Environment=INITIAL_ADMIN_PASSWORD=your-secure-password
|
||||||
|
Environment=ALLOWED_ORIGIN=https://your-frontend-domain.com
|
||||||
|
Environment=SENTRY_DSN=your-sentry-dsn
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
```
|
```
|
||||||
|
|
||||||
The frontend will be available at [http://localhost:5173](http://localhost:5173).
|
2. Enable and start the service:
|
||||||
|
```bash
|
||||||
## Deployment
|
sudo systemctl enable formies-backend
|
||||||
|
sudo systemctl start formies-backend
|
||||||
### Build the Docker Image
|
|
||||||
|
|
||||||
1. Build the combined Docker image:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker build -t your-dockerhub-username/formies-combined .
|
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Run the Docker container:
|
## Monitoring
|
||||||
|
|
||||||
```sh
|
### Health Check
|
||||||
docker run -p 8080:8080 your-dockerhub-username/formies-combined
|
|
||||||
```
|
|
||||||
|
|
||||||
Access the application at [http://localhost:8080](http://localhost:8080).
|
The application exposes a health check endpoint at `/api/health`:
|
||||||
|
|
||||||
### Using Docker Compose
|
```bash
|
||||||
|
curl http://localhost:8080/api/health
|
||||||
|
```
|
||||||
|
|
||||||
1. Deploy using `docker-compose.yml`:
|
### Metrics
|
||||||
|
|
||||||
```sh
|
Metrics are available at `/metrics` when enabled in the configuration.
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Stop the containers:
|
### Logging
|
||||||
```sh
|
|
||||||
docker-compose down
|
|
||||||
```
|
|
||||||
|
|
||||||
## CI/CD Workflow
|
Logs are written to the configured log file and can be viewed using:
|
||||||
|
|
||||||
### Gitea Actions
|
```bash
|
||||||
|
tail -f logs/app.log
|
||||||
|
```
|
||||||
|
|
||||||
1. Create a file at `.gitea/workflows/build_and_deploy.yml`:
|
## Security
|
||||||
|
|
||||||
```yaml
|
- All API endpoints are rate-limited
|
||||||
name: Build and Deploy
|
- CORS is configured to only allow specified origins
|
||||||
|
- JWT tokens are used for authentication
|
||||||
on:
|
- Passwords are hashed using bcrypt
|
||||||
push:
|
- SQLite database is protected with proper file permissions
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Clone the repository
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up Docker
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
|
||||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
|
||||||
|
|
||||||
- name: Build and Push Docker Image
|
|
||||||
run: |
|
|
||||||
docker build -t your-dockerhub-username/formies-combined .
|
|
||||||
docker push your-dockerhub-username/formies-combined:latest
|
|
||||||
|
|
||||||
- name: Deploy to Server (optional)
|
|
||||||
run: |
|
|
||||||
ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }} << 'EOF'
|
|
||||||
docker pull your-dockerhub-username/formies-combined:latest
|
|
||||||
docker stop formies || true
|
|
||||||
docker rm formies || true
|
|
||||||
docker run -d --name formies -p 8080:8080 your-dockerhub-username/formies-combined:latest
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Add secrets in Gitea:
|
|
||||||
- `DOCKER_USERNAME`: Your Docker Hub username.
|
|
||||||
- `DOCKER_PASSWORD`: Your Docker Hub password.
|
|
||||||
- `SERVER_USER`: SSH username for deployment.
|
|
||||||
- `SERVER_IP`: IP address of the server.
|
|
||||||
|
|
||||||
## API Endpoints
|
|
||||||
|
|
||||||
**Base URL:** `http://localhost:8080`
|
|
||||||
|
|
||||||
| Method | Endpoint | Description |
|
|
||||||
| ------ | ----------------------------- | ----------------------------------- |
|
|
||||||
| POST | `/api/forms` | Create a new form |
|
|
||||||
| GET | `/api/forms` | Get all forms |
|
|
||||||
| POST | `/api/forms/{id}/submissions` | Submit data to a form |
|
|
||||||
| GET | `/api/forms/{id}/submissions` | Get submissions for a specific form |
|
|
||||||
|
|
||||||
## Future Enhancements
|
|
||||||
|
|
||||||
- **Authentication:** Add user-based authentication for managing forms and submissions.
|
|
||||||
- **Export:** Allow exporting submissions to CSV or Excel.
|
|
||||||
- **Scaling:** Migrate to PostgreSQL for distributed data handling.
|
|
||||||
- **Monitoring:** Integrate tools like Prometheus and Grafana for performance monitoring.
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
This project is licensed under the MIT License. See the [LICENSE](./LICENSE) file for details.
|
MIT
|
||||||
|
2047
backend/Cargo.lock
generated
2047
backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,18 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "formies_be"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
actix-web = "4.0"
|
|
||||||
rusqlite = { version = "0.29", features = ["bundled"] }
|
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
serde_json = "1.0"
|
|
||||||
uuid = { version = "1.0", features = ["v4"] }
|
|
||||||
actix-files = "0.6"
|
|
||||||
actix-cors = "0.6"
|
|
||||||
env_logger = "0.10"
|
|
||||||
log = "0.4"
|
|
||||||
futures = "0.3"
|
|
||||||
bcrypt = "0.13"
|
|
||||||
anyhow = "1.0"
|
|
@ -1,36 +0,0 @@
|
|||||||
use actix_web::{dev::Payload, http::header::AUTHORIZATION, web, Error, FromRequest, HttpRequest};
|
|
||||||
use futures::future::{ready, Ready};
|
|
||||||
use rusqlite::Connection;
|
|
||||||
use std::sync::{Arc, Mutex};
|
|
||||||
|
|
||||||
pub struct Auth {
|
|
||||||
pub user_id: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FromRequest for Auth {
|
|
||||||
type Error = Error;
|
|
||||||
type Future = Ready<Result<Self, Self::Error>>;
|
|
||||||
|
|
||||||
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
|
|
||||||
let db = req
|
|
||||||
.app_data::<web::Data<Arc<Mutex<Connection>>>>()
|
|
||||||
.expect("Database connection missing");
|
|
||||||
|
|
||||||
if let Some(auth_header) = req.headers().get(AUTHORIZATION) {
|
|
||||||
if let Ok(auth_str) = auth_header.to_str() {
|
|
||||||
if auth_str.starts_with("Bearer ") {
|
|
||||||
let token = &auth_str[7..];
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
|
|
||||||
match super::db::validate_token(&conn, token) {
|
|
||||||
Ok(Some(user_id)) => return ready(Ok(Auth { user_id })),
|
|
||||||
Ok(None) | Err(_) => {
|
|
||||||
return ready(Err(actix_web::error::ErrorUnauthorized("Invalid token")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ready(Err(actix_web::error::ErrorUnauthorized("Missing token")))
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,123 +0,0 @@
|
|||||||
use anyhow::{Context, Result as AnyhowResult};
|
|
||||||
use bcrypt::{hash, verify, DEFAULT_COST}; // Add bcrypt dependency for password hashing
|
|
||||||
use rusqlite::{params, Connection, OptionalExtension};
|
|
||||||
use uuid::Uuid; // UUID for generating unique IDs // Import anyhow
|
|
||||||
|
|
||||||
pub fn init_db() -> AnyhowResult<Connection> {
|
|
||||||
let conn = Connection::open("form_data.db").context("Failed to open the database")?;
|
|
||||||
|
|
||||||
// Create tables
|
|
||||||
conn.execute(
|
|
||||||
"CREATE TABLE IF NOT EXISTS forms (
|
|
||||||
id TEXT PRIMARY KEY,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
fields TEXT NOT NULL,
|
|
||||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
|
||||||
)",
|
|
||||||
[],
|
|
||||||
)?;
|
|
||||||
|
|
||||||
conn.execute(
|
|
||||||
"CREATE TABLE IF NOT EXISTS submissions (
|
|
||||||
id TEXT PRIMARY KEY,
|
|
||||||
form_id TEXT NOT NULL,
|
|
||||||
data TEXT NOT NULL,
|
|
||||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
FOREIGN KEY (form_id) REFERENCES forms (id) ON DELETE CASCADE
|
|
||||||
)",
|
|
||||||
[],
|
|
||||||
)?;
|
|
||||||
|
|
||||||
// Add a table for users
|
|
||||||
conn.execute(
|
|
||||||
"CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id TEXT PRIMARY KEY,
|
|
||||||
username TEXT NOT NULL UNIQUE,
|
|
||||||
password TEXT NOT NULL, -- Store a hashed password
|
|
||||||
token TEXT UNIQUE -- Optional: For token-based auth
|
|
||||||
)",
|
|
||||||
[],
|
|
||||||
)?;
|
|
||||||
|
|
||||||
// Setup initial admin after creating the tables
|
|
||||||
setup_initial_admin(&conn)?;
|
|
||||||
|
|
||||||
Ok(conn)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn setup_initial_admin(conn: &Connection) -> AnyhowResult<()> {
|
|
||||||
add_admin_user(conn)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn add_admin_user(conn: &Connection) -> AnyhowResult<()> {
|
|
||||||
// Check if admin user already exists
|
|
||||||
let mut stmt = conn
|
|
||||||
.prepare("SELECT id FROM users WHERE username = ?1")
|
|
||||||
.context("Failed to prepare query for checking admin user")?;
|
|
||||||
if stmt.exists(params!["admin"])? {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate a UUID for the admin user
|
|
||||||
let admin_id = Uuid::new_v4().to_string();
|
|
||||||
|
|
||||||
// Hash the password before storing it
|
|
||||||
let hashed_password = hash("admin", DEFAULT_COST).context("Failed to hash password")?;
|
|
||||||
|
|
||||||
// Add admin user with hashed password
|
|
||||||
conn.execute(
|
|
||||||
"INSERT INTO users (id, username, password) VALUES (?1, ?2, ?3)",
|
|
||||||
params![admin_id, "admin", hashed_password],
|
|
||||||
)
|
|
||||||
.context("Failed to insert admin user into the database")?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add a function to validate a token
|
|
||||||
pub fn validate_token(conn: &Connection, token: &str) -> AnyhowResult<Option<String>> {
|
|
||||||
let mut stmt = conn
|
|
||||||
.prepare("SELECT id FROM users WHERE token = ?1")
|
|
||||||
.context("Failed to prepare query for validating token")?;
|
|
||||||
let user_id: Option<String> = stmt
|
|
||||||
.query_row(params![token], |row| row.get(0))
|
|
||||||
.optional()
|
|
||||||
.context("Failed to retrieve user ID for the given token")?;
|
|
||||||
Ok(user_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add a function to authenticate users (for login)
|
|
||||||
pub fn authenticate_user(
|
|
||||||
conn: &Connection,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
) -> AnyhowResult<Option<String>> {
|
|
||||||
let mut stmt = conn
|
|
||||||
.prepare("SELECT id, password FROM users WHERE username = ?1")
|
|
||||||
.context("Failed to prepare query for authenticating user")?;
|
|
||||||
let mut rows = stmt
|
|
||||||
.query(params![username])
|
|
||||||
.context("Failed to execute query for authenticating user")?;
|
|
||||||
|
|
||||||
if let Some(row) = rows.next()? {
|
|
||||||
let user_id: String = row.get(0)?;
|
|
||||||
let stored_password: String = row.get(1)?;
|
|
||||||
|
|
||||||
// Use bcrypt to verify the hashed password
|
|
||||||
if verify(password, &stored_password).context("Failed to verify password")? {
|
|
||||||
return Ok(Some(user_id));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add a function to generate and save a token for a user
|
|
||||||
pub fn generate_token_for_user(conn: &Connection, user_id: &str, token: &str) -> AnyhowResult<()> {
|
|
||||||
conn.execute(
|
|
||||||
"UPDATE users SET token = ?1 WHERE id = ?2",
|
|
||||||
params![token, user_id],
|
|
||||||
)
|
|
||||||
.context("Failed to update token for user")?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -1,240 +0,0 @@
|
|||||||
use crate::models::{AdminUser, Claims, Form, LoginCredentials, Submission};
|
|
||||||
use actix_web::{web, HttpResponse, Responder};
|
|
||||||
use argon2::{
|
|
||||||
password_hash::{rand_core::OsRng, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
|
|
||||||
Argon2,
|
|
||||||
};
|
|
||||||
use jsonwebtoken::{encode, EncodingKey, Header};
|
|
||||||
use rusqlite::{params, Connection};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use std::sync::{Arc, Mutex};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::auth::Auth;
|
|
||||||
|
|
||||||
// Structs for requests and responses
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct LoginRequest {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct LoginResponse {
|
|
||||||
pub token: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Public: Login handler
|
|
||||||
pub async fn login(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
login_request: web::Json<LoginRequest>,
|
|
||||||
) -> impl Responder {
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
let user_id =
|
|
||||||
match crate::db::authenticate_user(&conn, &login_request.username, &login_request.password)
|
|
||||||
{
|
|
||||||
Ok(Some(user_id)) => user_id,
|
|
||||||
Ok(None) => return HttpResponse::Unauthorized().body("Invalid username or password"),
|
|
||||||
Err(_) => return HttpResponse::InternalServerError().body("Database error"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let token = Uuid::new_v4().to_string();
|
|
||||||
if let Err(_) = crate::db::generate_token_for_user(&conn, &user_id, &token) {
|
|
||||||
return HttpResponse::InternalServerError().body("Failed to generate token");
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpResponse::Ok().json(LoginResponse { token })
|
|
||||||
}
|
|
||||||
|
|
||||||
// Public: Submit a form
|
|
||||||
pub async fn submit_form(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
path: web::Path<String>,
|
|
||||||
submission: web::Form<serde_json::Value>,
|
|
||||||
) -> impl Responder {
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
let submission_id = Uuid::new_v4().to_string();
|
|
||||||
let form_id = path.into_inner();
|
|
||||||
let submission_json = serde_json::to_string(&submission.into_inner()).unwrap();
|
|
||||||
|
|
||||||
match conn.execute(
|
|
||||||
"INSERT INTO submissions (id, form_id, data) VALUES (?1, ?2, ?3)",
|
|
||||||
params![submission_id, form_id, submission_json],
|
|
||||||
) {
|
|
||||||
Ok(_) => HttpResponse::Ok().json(submission_id),
|
|
||||||
Err(e) => HttpResponse::InternalServerError().body(format!("Error: {}", e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Protected: Create a new form
|
|
||||||
pub async fn create_form(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
auth: Auth,
|
|
||||||
form: web::Json<crate::models::Form>,
|
|
||||||
) -> impl Responder {
|
|
||||||
println!("Authenticated user: {}", auth.user_id);
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
let form_id = Uuid::new_v4().to_string();
|
|
||||||
let form_json = serde_json::to_string(&form.fields).unwrap();
|
|
||||||
|
|
||||||
match conn.execute(
|
|
||||||
"INSERT INTO forms (id, name, fields) VALUES (?1, ?2, ?3)",
|
|
||||||
params![form_id, form.name, form_json],
|
|
||||||
) {
|
|
||||||
Ok(_) => HttpResponse::Ok().json(form_id),
|
|
||||||
Err(e) => HttpResponse::InternalServerError().body(format!("Error: {}", e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Protected: Get all forms
|
|
||||||
pub async fn get_forms(db: web::Data<Arc<Mutex<Connection>>>, auth: Auth) -> impl Responder {
|
|
||||||
println!("Authenticated user: {}", auth.user_id);
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
|
|
||||||
let mut stmt = match conn.prepare("SELECT id, name, fields FROM forms") {
|
|
||||||
Ok(stmt) => stmt,
|
|
||||||
Err(e) => return HttpResponse::InternalServerError().body(format!("Error: {}", e)),
|
|
||||||
};
|
|
||||||
|
|
||||||
let forms_iter = stmt
|
|
||||||
.query_map([], |row| {
|
|
||||||
let id: Option<String> = row.get(0)?;
|
|
||||||
let name: String = row.get(1)?;
|
|
||||||
let fields: String = row.get(2)?;
|
|
||||||
let fields = serde_json::from_str(&fields).unwrap();
|
|
||||||
Ok(crate::models::Form { id, name, fields })
|
|
||||||
})
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let forms: Vec<crate::models::Form> = forms_iter.filter_map(|f| f.ok()).collect();
|
|
||||||
HttpResponse::Ok().json(forms)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Protected: Get submissions for a form
|
|
||||||
pub async fn get_submissions(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
auth: Auth,
|
|
||||||
path: web::Path<String>,
|
|
||||||
) -> impl Responder {
|
|
||||||
println!("Authenticated user: {}", auth.user_id);
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
let form_id = path.into_inner();
|
|
||||||
|
|
||||||
let mut stmt =
|
|
||||||
match conn.prepare("SELECT id, form_id, data FROM submissions WHERE form_id = ?1") {
|
|
||||||
Ok(stmt) => stmt,
|
|
||||||
Err(e) => return HttpResponse::InternalServerError().body(format!("Error: {}", e)),
|
|
||||||
};
|
|
||||||
|
|
||||||
let submissions_iter = stmt
|
|
||||||
.query_map([form_id], |row| {
|
|
||||||
let id: String = row.get(0)?;
|
|
||||||
let form_id: String = row.get(1)?;
|
|
||||||
let data: String = row.get(2)?;
|
|
||||||
let data = serde_json::from_str(&data).unwrap();
|
|
||||||
Ok(crate::models::Submission { id, form_id, data })
|
|
||||||
})
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let submissions: Vec<crate::models::Submission> =
|
|
||||||
submissions_iter.filter_map(|s| s.ok()).collect();
|
|
||||||
HttpResponse::Ok().json(submissions)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn admin_login(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
credentials: web::Json<LoginCredentials>,
|
|
||||||
) -> impl Responder {
|
|
||||||
let conn = match db.lock() {
|
|
||||||
Ok(conn) => conn,
|
|
||||||
Err(_) => return HttpResponse::InternalServerError().body("Database lock error"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut stmt =
|
|
||||||
match conn.prepare("SELECT username, password_hash FROM admin_users WHERE username = ?1") {
|
|
||||||
Ok(stmt) => stmt,
|
|
||||||
Err(e) => {
|
|
||||||
return HttpResponse::InternalServerError().body(format!("Database error: {}", e))
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let admin: Option<AdminUser> = match stmt.query_row([&credentials.username], |row| {
|
|
||||||
Ok(AdminUser {
|
|
||||||
username: row.get(0)?,
|
|
||||||
password_hash: row.get(1)?,
|
|
||||||
})
|
|
||||||
}) {
|
|
||||||
Ok(admin) => Some(admin),
|
|
||||||
Err(rusqlite::Error::QueryReturnedNoRows) => None, // No user found
|
|
||||||
Err(e) => return HttpResponse::InternalServerError().body(format!("Query error: {}", e)),
|
|
||||||
};
|
|
||||||
|
|
||||||
match admin {
|
|
||||||
Some(user) => {
|
|
||||||
let parsed_hash = match PasswordHash::new(&user.password_hash) {
|
|
||||||
Ok(hash) => hash,
|
|
||||||
Err(_) => {
|
|
||||||
return HttpResponse::InternalServerError()
|
|
||||||
.body("Invalid password hash format in database")
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let argon2 = Argon2::default();
|
|
||||||
let is_valid = argon2
|
|
||||||
.verify_password(credentials.password.as_bytes(), &parsed_hash)
|
|
||||||
.is_ok();
|
|
||||||
|
|
||||||
if is_valid {
|
|
||||||
let expiration = match SystemTime::now().duration_since(UNIX_EPOCH) {
|
|
||||||
Ok(duration) => duration.as_secs() as usize + 24 * 3600,
|
|
||||||
Err(_) => return HttpResponse::InternalServerError().body("System time error"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let claims = Claims {
|
|
||||||
sub: user.username,
|
|
||||||
exp: expiration,
|
|
||||||
};
|
|
||||||
|
|
||||||
let token = match encode(
|
|
||||||
&Header::default(),
|
|
||||||
&claims,
|
|
||||||
&EncodingKey::from_secret("your-secret-key".as_ref()),
|
|
||||||
) {
|
|
||||||
Ok(token) => token,
|
|
||||||
Err(_) => {
|
|
||||||
return HttpResponse::InternalServerError().body("Token generation error")
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
HttpResponse::Ok().json(json!({ "token": token }))
|
|
||||||
} else {
|
|
||||||
HttpResponse::Unauthorized().json(json!({ "error": "Invalid credentials" }))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => HttpResponse::Unauthorized().json(json!({ "error": "Invalid credentials" })),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_admin(
|
|
||||||
db: web::Data<Arc<Mutex<Connection>>>,
|
|
||||||
user: web::Json<LoginCredentials>,
|
|
||||||
) -> impl Responder {
|
|
||||||
let conn = db.lock().unwrap();
|
|
||||||
|
|
||||||
let salt = SaltString::generate(&mut OsRng);
|
|
||||||
let argon2 = Argon2::default();
|
|
||||||
let password_hash = argon2
|
|
||||||
.hash_password(user.password.as_bytes(), &salt)
|
|
||||||
.unwrap()
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
match conn.execute(
|
|
||||||
"INSERT INTO admin_users (username, password_hash) VALUES (?1, ?2)",
|
|
||||||
params![user.username, password_hash],
|
|
||||||
) {
|
|
||||||
Ok(_) => HttpResponse::Ok().json(json!({
|
|
||||||
"message": "Admin user created successfully"
|
|
||||||
})),
|
|
||||||
Err(e) => HttpResponse::InternalServerError().body(format!("Error: {}", e)),
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,64 +0,0 @@
|
|||||||
use actix_cors::Cors;
|
|
||||||
use actix_files as fs;
|
|
||||||
use actix_web::{web, App, HttpServer};
|
|
||||||
use std::sync::{Arc, Mutex};
|
|
||||||
|
|
||||||
mod auth;
|
|
||||||
mod db;
|
|
||||||
mod handlers; // Ensure handlers.rs exists
|
|
||||||
mod middleware; // Ensure middleware.rs exists // Ensure db.rs exists
|
|
||||||
mod models;
|
|
||||||
|
|
||||||
use crate::middleware::AuthMiddleware;
|
|
||||||
use handlers::{admin_login, create_admin, create_form, get_forms, get_submissions, submit_form};
|
|
||||||
|
|
||||||
pub fn configure_routes(cfg: &mut web::ServiceConfig) {
|
|
||||||
cfg.service(
|
|
||||||
web::scope("")
|
|
||||||
.route("/forms/{id}", web::post().to(submit_form))
|
|
||||||
.route("/admin/login", web::post().to(admin_login))
|
|
||||||
.route("/admin/create", web::post().to(create_admin)),
|
|
||||||
);
|
|
||||||
|
|
||||||
cfg.service(
|
|
||||||
web::scope("")
|
|
||||||
.wrap(AuthMiddleware)
|
|
||||||
.route("/forms", web::get().to(get_forms))
|
|
||||||
.route("/forms", web::post().to(create_form))
|
|
||||||
.route("/forms/{id}/submissions", web::get().to(get_submissions)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[actix_web::main]
|
|
||||||
async fn main() -> std::io::Result<()> {
|
|
||||||
env_logger::init();
|
|
||||||
let db = Arc::new(Mutex::new(
|
|
||||||
db::init_db().expect("Failed to initialize the database"),
|
|
||||||
));
|
|
||||||
|
|
||||||
HttpServer::new(move || {
|
|
||||||
App::new()
|
|
||||||
.wrap(
|
|
||||||
Cors::default()
|
|
||||||
.allow_any_origin()
|
|
||||||
.allow_any_header()
|
|
||||||
.allow_any_method(),
|
|
||||||
)
|
|
||||||
.app_data(web::Data::new(db.clone()))
|
|
||||||
.service(fs::Files::new("/", "./frontend/dist").index_file("index.html"))
|
|
||||||
.route("/login", web::post().to(handlers::login)) // Public: Login
|
|
||||||
.route(
|
|
||||||
"/forms/{id}/submissions",
|
|
||||||
web::post().to(handlers::submit_form), // Public: Submit form
|
|
||||||
)
|
|
||||||
.route("/forms", web::post().to(handlers::create_form)) // Protected
|
|
||||||
.route("/forms", web::get().to(handlers::get_forms)) // Protected
|
|
||||||
.route(
|
|
||||||
"/forms/{id}/submissions",
|
|
||||||
web::get().to(handlers::get_submissions), // Protected
|
|
||||||
)
|
|
||||||
})
|
|
||||||
.bind("127.0.0.1:8080")?
|
|
||||||
.run()
|
|
||||||
.await
|
|
||||||
}
|
|
@ -1,87 +0,0 @@
|
|||||||
use crate::models::Claims;
|
|
||||||
use actix_web::body::{BoxBody, MessageBody};
|
|
||||||
use actix_web::dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform};
|
|
||||||
use actix_web::{Error, HttpResponse};
|
|
||||||
use futures::future::{ok, Ready};
|
|
||||||
use serde_json::json;
|
|
||||||
use std::future::Future;
|
|
||||||
use std::pin::Pin;
|
|
||||||
|
|
||||||
pub struct AuthMiddleware;
|
|
||||||
|
|
||||||
impl<S, B> Transform<S, ServiceRequest> for AuthMiddleware
|
|
||||||
where
|
|
||||||
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
||||||
S::Future: 'static,
|
|
||||||
B: MessageBody + 'static,
|
|
||||||
{
|
|
||||||
type Response = ServiceResponse<BoxBody>; // Changed to BoxBody
|
|
||||||
type Error = Error;
|
|
||||||
type Transform = AuthMiddlewareService<S>;
|
|
||||||
type InitError = ();
|
|
||||||
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
|
||||||
|
|
||||||
fn new_transform(&self, service: S) -> Self::Future {
|
|
||||||
ok(AuthMiddlewareService { service })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct AuthMiddlewareService<S> {
|
|
||||||
service: S,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<S, B> Service<ServiceRequest> for AuthMiddlewareService<S>
|
|
||||||
where
|
|
||||||
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
|
||||||
S::Future: 'static,
|
|
||||||
B: MessageBody + 'static,
|
|
||||||
{
|
|
||||||
type Response = ServiceResponse<BoxBody>; // Changed to BoxBody
|
|
||||||
type Error = Error;
|
|
||||||
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
|
|
||||||
|
|
||||||
forward_ready!(service);
|
|
||||||
|
|
||||||
fn call(&self, req: ServiceRequest) -> Self::Future {
|
|
||||||
if req.path() == "/admin/login" || req.path() == "/admin/create" {
|
|
||||||
let fut = self.service.call(req);
|
|
||||||
return Box::pin(async move {
|
|
||||||
let res = fut.await?;
|
|
||||||
Ok(res.map_into_boxed_body()) // Convert the response body to BoxBody
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let auth_header = req.headers().get("Authorization");
|
|
||||||
match auth_header {
|
|
||||||
Some(header) => {
|
|
||||||
let token = header.to_str().unwrap_or("").replace("Bearer ", "");
|
|
||||||
if verify_token(&token) {
|
|
||||||
let fut = self.service.call(req);
|
|
||||||
Box::pin(async move {
|
|
||||||
let res = fut.await?;
|
|
||||||
Ok(res.map_into_boxed_body()) // Convert the response body to BoxBody
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
let (request, _) = req.into_parts();
|
|
||||||
let response = HttpResponse::Unauthorized()
|
|
||||||
.json(json!({"error": "Invalid token"}))
|
|
||||||
.map_into_boxed_body();
|
|
||||||
Box::pin(async move { Ok(ServiceResponse::new(request, response)) })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
let (request, _) = req.into_parts();
|
|
||||||
let response = HttpResponse::Unauthorized()
|
|
||||||
.json(json!({"error": "No authorization token"}))
|
|
||||||
.map_into_boxed_body();
|
|
||||||
Box::pin(async move { Ok(ServiceResponse::new(request, response)) })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn verify_token(token: &str) -> bool {
|
|
||||||
let validation = jsonwebtoken::Validation::default();
|
|
||||||
let key = jsonwebtoken::DecodingKey::from_secret("your-secret-key".as_ref());
|
|
||||||
jsonwebtoken::decode::<Claims>(token, &key, &validation).is_ok()
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
|
||||||
pub struct Form {
|
|
||||||
pub id: Option<String>,
|
|
||||||
pub name: String,
|
|
||||||
pub fields: serde_json::Value, // JSON array of form fields
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Submission {
|
|
||||||
pub id: String,
|
|
||||||
pub form_id: String,
|
|
||||||
pub data: serde_json::Value, // JSON of submission data
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
pub struct AdminUser {
|
|
||||||
pub username: String,
|
|
||||||
pub password_hash: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
pub struct LoginCredentials {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
pub struct Claims {
|
|
||||||
pub sub: String,
|
|
||||||
pub(crate) exp: usize,
|
|
||||||
}
|
|
30
config/default.toml
Normal file
30
config/default.toml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
[server]
|
||||||
|
bind_address = "127.0.0.1:8080"
|
||||||
|
workers = 4
|
||||||
|
keep_alive = 60
|
||||||
|
client_timeout = 5000
|
||||||
|
client_shutdown = 5000
|
||||||
|
|
||||||
|
[database]
|
||||||
|
url = "form_data.db"
|
||||||
|
pool_size = 5
|
||||||
|
connection_timeout = 30
|
||||||
|
|
||||||
|
[security]
|
||||||
|
rate_limit_requests = 100
|
||||||
|
rate_limit_interval = 60
|
||||||
|
allowed_origins = ["http://localhost:5173"]
|
||||||
|
jwt_secret = "your-secret-key"
|
||||||
|
jwt_expiration = 3600
|
||||||
|
|
||||||
|
[logging]
|
||||||
|
level = "info"
|
||||||
|
format = "json"
|
||||||
|
file = "logs/app.log"
|
||||||
|
max_size = 10485760 # 10MB
|
||||||
|
max_files = 5
|
||||||
|
|
||||||
|
[monitoring]
|
||||||
|
sentry_dsn = ""
|
||||||
|
enable_metrics = true
|
||||||
|
metrics_port = 9090
|
1294
design.html
Normal file
1294
design.html
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,9 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
formies:
|
|
||||||
image: your-dockerhub-username/formies-combined:latest
|
|
||||||
container_name: formies-app
|
|
||||||
ports:
|
|
||||||
- "8080:8080" # Expose the application on port 8080
|
|
||||||
restart: always
|
|
Binary file not shown.
23
frontend/.gitignore
vendored
23
frontend/.gitignore
vendored
@ -1,23 +0,0 @@
|
|||||||
node_modules
|
|
||||||
|
|
||||||
# Output
|
|
||||||
.output
|
|
||||||
.vercel
|
|
||||||
.netlify
|
|
||||||
.wrangler
|
|
||||||
/.svelte-kit
|
|
||||||
/build
|
|
||||||
|
|
||||||
# OS
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Env
|
|
||||||
.env
|
|
||||||
.env.*
|
|
||||||
!.env.example
|
|
||||||
!.env.test
|
|
||||||
|
|
||||||
# Vite
|
|
||||||
vite.config.js.timestamp-*
|
|
||||||
vite.config.ts.timestamp-*
|
|
@ -1 +0,0 @@
|
|||||||
engine-strict=true
|
|
@ -1,4 +0,0 @@
|
|||||||
# Package Managers
|
|
||||||
package-lock.json
|
|
||||||
pnpm-lock.yaml
|
|
||||||
yarn.lock
|
|
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"useTabs": true,
|
|
||||||
"singleQuote": true,
|
|
||||||
"trailingComma": "none",
|
|
||||||
"printWidth": 100,
|
|
||||||
"plugins": ["prettier-plugin-svelte"],
|
|
||||||
"overrides": [
|
|
||||||
{
|
|
||||||
"files": "*.svelte",
|
|
||||||
"options": {
|
|
||||||
"parser": "svelte"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,38 +0,0 @@
|
|||||||
# sv
|
|
||||||
|
|
||||||
Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
|
|
||||||
|
|
||||||
## Creating a project
|
|
||||||
|
|
||||||
If you're seeing this, you've probably already done this step. Congrats!
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# create a new project in the current directory
|
|
||||||
npx sv create
|
|
||||||
|
|
||||||
# create a new project in my-app
|
|
||||||
npx sv create my-app
|
|
||||||
```
|
|
||||||
|
|
||||||
## Developing
|
|
||||||
|
|
||||||
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm run dev
|
|
||||||
|
|
||||||
# or start the server and open the app in a new browser tab
|
|
||||||
npm run dev -- --open
|
|
||||||
```
|
|
||||||
|
|
||||||
## Building
|
|
||||||
|
|
||||||
To create a production version of your app:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
You can preview the production build with `npm run preview`.
|
|
||||||
|
|
||||||
> To deploy your app, you may need to install an [adapter](https://svelte.dev/docs/kit/adapters) for your target environment.
|
|
@ -1,34 +0,0 @@
|
|||||||
import prettier from 'eslint-config-prettier';
|
|
||||||
import js from '@eslint/js';
|
|
||||||
import { includeIgnoreFile } from '@eslint/compat';
|
|
||||||
import svelte from 'eslint-plugin-svelte';
|
|
||||||
import globals from 'globals';
|
|
||||||
import { fileURLToPath } from 'node:url';
|
|
||||||
import ts from 'typescript-eslint';
|
|
||||||
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
|
|
||||||
|
|
||||||
export default ts.config(
|
|
||||||
includeIgnoreFile(gitignorePath),
|
|
||||||
js.configs.recommended,
|
|
||||||
...ts.configs.recommended,
|
|
||||||
...svelte.configs['flat/recommended'],
|
|
||||||
prettier,
|
|
||||||
...svelte.configs['flat/prettier'],
|
|
||||||
{
|
|
||||||
languageOptions: {
|
|
||||||
globals: {
|
|
||||||
...globals.browser,
|
|
||||||
...globals.node
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
files: ['**/*.svelte'],
|
|
||||||
|
|
||||||
languageOptions: {
|
|
||||||
parserOptions: {
|
|
||||||
parser: ts.parser
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
220
frontend/index.html
Normal file
220
frontend/index.html
Normal file
@ -0,0 +1,220 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Formies</title>
|
||||||
|
<!-- Link to the new CSS file -->
|
||||||
|
<link rel="stylesheet" href="style.css" />
|
||||||
|
<style>
|
||||||
|
/* Basic Modal Styling (can be moved to style.css) */
|
||||||
|
.modal {
|
||||||
|
display: none; /* Hidden by default */
|
||||||
|
position: fixed; /* Stay in place */
|
||||||
|
z-index: 1000; /* Sit on top */
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
overflow: auto; /* Enable scroll if needed */
|
||||||
|
background-color: rgba(0, 0, 0, 0.4); /* Black w/ opacity */
|
||||||
|
padding-top: 60px;
|
||||||
|
}
|
||||||
|
.modal-content {
|
||||||
|
background-color: #fefefe;
|
||||||
|
margin: 5% auto;
|
||||||
|
padding: 20px;
|
||||||
|
border: 1px solid #888;
|
||||||
|
width: 80%;
|
||||||
|
max-width: 500px;
|
||||||
|
}
|
||||||
|
.close-button {
|
||||||
|
color: #aaa;
|
||||||
|
float: right;
|
||||||
|
font-size: 28px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.close-button:hover,
|
||||||
|
.close-button:focus {
|
||||||
|
color: black;
|
||||||
|
text-decoration: none;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
#notification-settings-modal label {
|
||||||
|
display: block;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
#notification-settings-modal input[type="text"],
|
||||||
|
#notification-settings-modal input[type="email"] {
|
||||||
|
width: 95%;
|
||||||
|
padding: 8px;
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
#notification-settings-modal .modal-actions {
|
||||||
|
margin-top: 20px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<!-- Added Container -->
|
||||||
|
<div class="container page-container">
|
||||||
|
<!-- Moved Status Area inside container -->
|
||||||
|
<div id="status-area" class="status"></div>
|
||||||
|
|
||||||
|
<h1 class="page-title">Formies - Simple Form Manager</h1>
|
||||||
|
|
||||||
|
<!-- Login Section -->
|
||||||
|
<div id="login-section" class="content-card">
|
||||||
|
<h2 class="section-title">Login</h2>
|
||||||
|
<form id="login-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="username">Username:</label>
|
||||||
|
<input type="text" id="username" required />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="password">Password:</label>
|
||||||
|
<input type="password" id="password" required />
|
||||||
|
</div>
|
||||||
|
<!-- Added button class -->
|
||||||
|
<button type="submit" class="button">Login</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Logged In Section (Admin Area) -->
|
||||||
|
<div id="admin-section" class="hidden">
|
||||||
|
<div class="admin-header content-card">
|
||||||
|
<p>
|
||||||
|
Welcome, <span id="logged-in-user">Admin</span>!
|
||||||
|
<!-- Added button classes -->
|
||||||
|
<button id="logout-button" class="button button-danger">
|
||||||
|
Logout
|
||||||
|
</button>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="divider" />
|
||||||
|
|
||||||
|
<h2 class="section-title">Admin Panel</h2>
|
||||||
|
|
||||||
|
<!-- Create Form -->
|
||||||
|
<div class="content-card form-section">
|
||||||
|
<h3 class="card-title">Create New Form</h3>
|
||||||
|
<form id="createForm">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="formName">Form Name:</label>
|
||||||
|
<input type="text" id="formName" name="formName" required />
|
||||||
|
</div>
|
||||||
|
<!-- Added button class -->
|
||||||
|
<button type="submit" class="button">Create Form</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- List Forms -->
|
||||||
|
<div class="content-card section">
|
||||||
|
<h3 class="card-title">Existing Forms</h3>
|
||||||
|
<!-- Added button class -->
|
||||||
|
<button id="load-forms-button" class="button button-secondary">
|
||||||
|
Load Forms
|
||||||
|
</button>
|
||||||
|
<ul id="forms-list" class="styled-list">
|
||||||
|
<!-- Forms will be listed here -->
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- View Submissions -->
|
||||||
|
<div id="submissions-section" class="content-card section hidden">
|
||||||
|
<h3 class="card-title">
|
||||||
|
Submissions for <span id="submissions-form-name"></span>
|
||||||
|
</h3>
|
||||||
|
<ul id="submissions-list" class="styled-list submissions">
|
||||||
|
<!-- Submissions will be listed here -->
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Public Form Display / Submission Area -->
|
||||||
|
<hr class="divider" />
|
||||||
|
<div class="content-card">
|
||||||
|
<h2 class="section-title">Submit to a Form</h2>
|
||||||
|
<p>Enter a Form ID to load and submit:</p>
|
||||||
|
<div class="form-group inline-form-group">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="public-form-id-input"
|
||||||
|
placeholder="Enter Form ID here" />
|
||||||
|
<!-- Added button class -->
|
||||||
|
<button id="load-public-form-button" class="button">Load Form</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="public-form-area" class="section hidden">
|
||||||
|
<h3 id="public-form-title" class="card-title"></h3>
|
||||||
|
<form id="public-form">
|
||||||
|
<!-- Form fields will be rendered here -->
|
||||||
|
<!-- Submit button will be added by JS, style it below -->
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- /.container -->
|
||||||
|
|
||||||
|
<section id="forms-section" class="hidden">
|
||||||
|
<h2>Manage Forms</h2>
|
||||||
|
<button id="load-forms">Load My Forms</button>
|
||||||
|
<ul id="forms-list">
|
||||||
|
<!-- Form list items will be populated here -->
|
||||||
|
<!-- Example Structure (generated by script.js):
|
||||||
|
<li>
|
||||||
|
Form Name (ID: form-id-123)
|
||||||
|
<button class="view-submissions-btn" data-form-id="form-id-123" data-form-name="Form Name">View Submissions</button>
|
||||||
|
<button class="manage-notifications-btn" data-form-id="form-id-123">Manage Notifications</button> // Added button
|
||||||
|
</li>
|
||||||
|
-->
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<!-- Notification Settings Modal -->
|
||||||
|
<div id="notification-settings-modal" class="modal">
|
||||||
|
<div class="modal-content">
|
||||||
|
<span class="close-button" id="close-notification-modal">×</span>
|
||||||
|
<h2>Notification Settings for <span id="modal-form-name"></span></h2>
|
||||||
|
<form id="notification-settings-form">
|
||||||
|
<input type="hidden" id="modal-form-id" />
|
||||||
|
<div id="modal-status" class="status"></div>
|
||||||
|
|
||||||
|
<label for="modal-notify-email">Notify Email Address:</label>
|
||||||
|
<input
|
||||||
|
type="email"
|
||||||
|
id="modal-notify-email"
|
||||||
|
name="notify_email"
|
||||||
|
placeholder="leave blank to disable email" />
|
||||||
|
|
||||||
|
<label for="modal-notify-ntfy-topic">Enable ntfy Notification:</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="modal-notify-ntfy-topic"
|
||||||
|
name="notify_ntfy_topic"
|
||||||
|
placeholder="enter any text to enable (uses global topic)" />
|
||||||
|
<small
|
||||||
|
>Enter any non-empty text here (e.g., "yes" or the topic name
|
||||||
|
itself) to enable ntfy notifications for this form. The notification
|
||||||
|
will be sent to the globally configured ntfy topic specified in the
|
||||||
|
backend environment variables. Leave blank to disable ntfy for this
|
||||||
|
form.</small
|
||||||
|
>
|
||||||
|
|
||||||
|
<div class="modal-actions">
|
||||||
|
<button type="submit" id="save-notification-settings">
|
||||||
|
Save Settings
|
||||||
|
</button>
|
||||||
|
<button type="button" id="cancel-notification-settings">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script src="script.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
3652
frontend/package-lock.json
generated
3652
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "formies-fe",
|
|
||||||
"private": true,
|
|
||||||
"version": "0.0.1",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite dev",
|
|
||||||
"build": "vite build",
|
|
||||||
"preview": "vite preview",
|
|
||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
|
||||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
|
||||||
"format": "prettier --write .",
|
|
||||||
"lint": "prettier --check . && eslint ."
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@eslint/compat": "^1.2.3",
|
|
||||||
"@sveltejs/adapter-auto": "^3.0.0",
|
|
||||||
"@sveltejs/adapter-node": "^5.2.11",
|
|
||||||
"@sveltejs/kit": "^2.0.0",
|
|
||||||
"@sveltejs/vite-plugin-svelte": "^4.0.0",
|
|
||||||
"eslint": "^9.7.0",
|
|
||||||
"eslint-config-prettier": "^9.1.0",
|
|
||||||
"eslint-plugin-svelte": "^2.36.0",
|
|
||||||
"globals": "^15.0.0",
|
|
||||||
"prettier": "^3.3.2",
|
|
||||||
"prettier-plugin-svelte": "^3.2.6",
|
|
||||||
"svelte": "^5.0.0",
|
|
||||||
"svelte-check": "^4.0.0",
|
|
||||||
"typescript": "^5.0.0",
|
|
||||||
"typescript-eslint": "^8.0.0",
|
|
||||||
"vite": "^5.4.11"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@types/uuid": "^10.0.0",
|
|
||||||
"axios": "^1.7.9"
|
|
||||||
}
|
|
||||||
}
|
|
575
frontend/script.js
Normal file
575
frontend/script.js
Normal file
@ -0,0 +1,575 @@
|
|||||||
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
|
// --- Configuration ---
|
||||||
|
const API_BASE_URL = "http://localhost:8080/api"; // Assuming backend serves API under /api
|
||||||
|
|
||||||
|
// --- State ---
|
||||||
|
let authToken = sessionStorage.getItem("authToken"); // Use sessionStorage for non-persistent login
|
||||||
|
|
||||||
|
// --- DOM Elements ---
|
||||||
|
const loginSection = document.getElementById("login-section");
|
||||||
|
const adminSection = document.getElementById("admin-section");
|
||||||
|
const loginForm = document.getElementById("login-form");
|
||||||
|
const usernameInput = document.getElementById("username");
|
||||||
|
const passwordInput = document.getElementById("password");
|
||||||
|
const logoutButton = document.getElementById("logout-button");
|
||||||
|
const statusArea = document.getElementById("status-area");
|
||||||
|
const loggedInUserSpan = document.getElementById("logged-in-user"); // Added this if needed
|
||||||
|
|
||||||
|
const createForm = document.getElementById("create-form");
|
||||||
|
const formNameInput = document.getElementById("form-name");
|
||||||
|
|
||||||
|
const loadFormsButton = document.getElementById("load-forms-button");
|
||||||
|
const formsList = document.getElementById("forms-list");
|
||||||
|
|
||||||
|
const submissionsSection = document.getElementById("submissions-section");
|
||||||
|
const submissionsList = document.getElementById("submissions-list");
|
||||||
|
const submissionsFormNameSpan = document.getElementById(
|
||||||
|
"submissions-form-name"
|
||||||
|
);
|
||||||
|
|
||||||
|
const publicFormIdInput = document.getElementById("public-form-id-input");
|
||||||
|
const loadPublicFormButton = document.getElementById(
|
||||||
|
"load-public-form-button"
|
||||||
|
);
|
||||||
|
const publicFormArea = document.getElementById("public-form-area");
|
||||||
|
const publicFormTitle = document.getElementById("public-form-title");
|
||||||
|
const publicForm = document.getElementById("public-form");
|
||||||
|
|
||||||
|
// --- Helper Functions ---
|
||||||
|
function showStatus(message, isError = false) {
|
||||||
|
statusArea.textContent = message;
|
||||||
|
statusArea.className = "status"; // Reset classes
|
||||||
|
if (message) {
|
||||||
|
statusArea.classList.add(isError ? "error" : "success");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleSections() {
|
||||||
|
console.log("toggleSections called. Current authToken:", authToken); // Log 3
|
||||||
|
if (authToken) {
|
||||||
|
console.log("AuthToken found, showing admin section."); // Log 4
|
||||||
|
loginSection.classList.add("hidden");
|
||||||
|
adminSection.classList.remove("hidden");
|
||||||
|
// Optionally display username if you fetch it after login
|
||||||
|
// loggedInUserSpan.textContent = 'Admin'; // Placeholder
|
||||||
|
} else {
|
||||||
|
console.log("AuthToken not found, showing login section."); // Log 5
|
||||||
|
loginSection.classList.remove("hidden");
|
||||||
|
adminSection.classList.add("hidden");
|
||||||
|
submissionsSection.classList.add("hidden"); // Hide submissions when logged out
|
||||||
|
}
|
||||||
|
// Always hide public form initially on state change
|
||||||
|
publicFormArea.classList.add("hidden");
|
||||||
|
publicForm.innerHTML = '<button type="submit">Submit Form</button>'; // Reset form content
|
||||||
|
}
|
||||||
|
|
||||||
|
async function makeApiRequest(
|
||||||
|
endpoint,
|
||||||
|
method = "GET",
|
||||||
|
body = null,
|
||||||
|
requiresAuth = false
|
||||||
|
) {
|
||||||
|
const url = `${API_BASE_URL}${endpoint}`;
|
||||||
|
const headers = {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Accept: "application/json",
|
||||||
|
};
|
||||||
|
|
||||||
|
if (requiresAuth) {
|
||||||
|
if (!authToken) {
|
||||||
|
throw new Error("Authentication required, but no token found.");
|
||||||
|
}
|
||||||
|
headers["Authorization"] = `Bearer ${authToken}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
method,
|
||||||
|
headers,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (body) {
|
||||||
|
options.body = JSON.stringify(body);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(url, options);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
let errorData;
|
||||||
|
try {
|
||||||
|
errorData = await response.json(); // Try to parse error JSON
|
||||||
|
} catch (e) {
|
||||||
|
// If response is not JSON
|
||||||
|
errorData = {
|
||||||
|
message: `HTTP Error: ${response.status} ${response.statusText}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// Check for backend's validation error structure
|
||||||
|
if (errorData && errorData.validation_errors) {
|
||||||
|
throw { validationErrors: errorData.validation_errors };
|
||||||
|
}
|
||||||
|
// Throw a more generic error message or the one from backend if available
|
||||||
|
throw new Error(
|
||||||
|
errorData.message || `Request failed with status ${response.status}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle responses with no content (e.g., logout)
|
||||||
|
if (
|
||||||
|
response.status === 204 ||
|
||||||
|
response.headers.get("content-length") === "0"
|
||||||
|
) {
|
||||||
|
return null; // Or return an empty object/success indicator
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json(); // Parse successful JSON response
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`API Request Error (${method} ${endpoint}):`, error);
|
||||||
|
// Re-throw validation errors specifically if they exist
|
||||||
|
if (error.validationErrors) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
// Re-throw other errors
|
||||||
|
throw new Error(error.message || "Network error or failed to fetch");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Event Handlers ---
|
||||||
|
loginForm.addEventListener("submit", async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showStatus(""); // Clear previous status
|
||||||
|
const username = usernameInput.value.trim();
|
||||||
|
const password = passwordInput.value.trim();
|
||||||
|
|
||||||
|
if (!username || !password) {
|
||||||
|
showStatus("Username and password are required.", true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const data = await makeApiRequest("/login", "POST", {
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
});
|
||||||
|
if (data && data.token) {
|
||||||
|
console.log("Login successful, received token:", data.token); // Log 1
|
||||||
|
authToken = data.token;
|
||||||
|
sessionStorage.setItem("authToken", authToken); // Store token
|
||||||
|
console.log("Calling toggleSections after login..."); // Log 2
|
||||||
|
toggleSections();
|
||||||
|
showStatus("Login successful!");
|
||||||
|
usernameInput.value = ""; // Clear fields
|
||||||
|
passwordInput.value = "";
|
||||||
|
} else {
|
||||||
|
throw new Error("Login failed: No token received.");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Login failed: ${error.message}`, true);
|
||||||
|
authToken = null;
|
||||||
|
sessionStorage.removeItem("authToken");
|
||||||
|
toggleSections();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
logoutButton.addEventListener("click", async () => {
|
||||||
|
showStatus("");
|
||||||
|
if (!authToken) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await makeApiRequest("/logout", "POST", null, true);
|
||||||
|
showStatus("Logout successful!");
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Logout failed: ${error.message}`, true);
|
||||||
|
// Decide if you still want to clear local state even if server fails
|
||||||
|
// Forcing logout locally might be better UX in case of server error
|
||||||
|
} finally {
|
||||||
|
// Always clear local state on logout attempt
|
||||||
|
authToken = null;
|
||||||
|
sessionStorage.removeItem("authToken");
|
||||||
|
toggleSections();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (createForm) {
|
||||||
|
createForm.addEventListener("submit", async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showStatus("");
|
||||||
|
const formName = formNameInput.value.trim();
|
||||||
|
if (!formName) {
|
||||||
|
showStatus("Please enter a form name", true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Refactor to use makeApiRequest
|
||||||
|
const data = await makeApiRequest(
|
||||||
|
"/forms", // Endpoint relative to API_BASE_URL
|
||||||
|
"POST",
|
||||||
|
// TODO: Need a way to define form fields in the UI.
|
||||||
|
// Sending minimal structure for now.
|
||||||
|
{ name: formName, fields: [] },
|
||||||
|
true // Requires authentication
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!data || !data.id) {
|
||||||
|
throw new Error(
|
||||||
|
"Failed to create form or received invalid response."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
showStatus(
|
||||||
|
`Form '${data.name}' created successfully! (ID: ${data.id})`,
|
||||||
|
"success"
|
||||||
|
);
|
||||||
|
formNameInput.value = "";
|
||||||
|
// Automatically refresh the forms list after creation
|
||||||
|
if (loadFormsButton) {
|
||||||
|
loadFormsButton.click();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Error creating form: ${error.message}`, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure createFormFromUrl exists before adding listener
|
||||||
|
const createFormFromUrlEl = document.getElementById("create-form-from-url");
|
||||||
|
if (createFormFromUrlEl) {
|
||||||
|
// Check if the element exists
|
||||||
|
const formNameUrlInput = document.getElementById("form-name-url");
|
||||||
|
const formUrlInput = document.getElementById("form-url");
|
||||||
|
|
||||||
|
createFormFromUrlEl.addEventListener("submit", async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showStatus("");
|
||||||
|
const name = formNameUrlInput.value.trim();
|
||||||
|
const url = formUrlInput.value.trim();
|
||||||
|
|
||||||
|
if (!name || !url) {
|
||||||
|
showStatus("Form name and URL are required.", true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const newForm = await makeApiRequest(
|
||||||
|
"/forms/from-url",
|
||||||
|
"POST",
|
||||||
|
{ name, url },
|
||||||
|
true
|
||||||
|
);
|
||||||
|
showStatus(
|
||||||
|
`Form '${newForm.name}' created successfully with ID: ${newForm.id}`
|
||||||
|
);
|
||||||
|
formNameUrlInput.value = ""; // Clear form
|
||||||
|
formUrlInput.value = "";
|
||||||
|
loadFormsButton.click(); // Refresh the forms list
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Failed to create form from URL: ${error.message}`, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadFormsButton) {
|
||||||
|
loadFormsButton.addEventListener("click", async () => {
|
||||||
|
showStatus("");
|
||||||
|
submissionsSection.classList.add("hidden"); // Hide submissions when reloading forms
|
||||||
|
formsList.innerHTML = "<li>Loading...</li>"; // Indicate loading
|
||||||
|
|
||||||
|
try {
|
||||||
|
const forms = await makeApiRequest("/forms", "GET", null, true);
|
||||||
|
formsList.innerHTML = ""; // Clear list
|
||||||
|
|
||||||
|
if (forms && forms.length > 0) {
|
||||||
|
forms.forEach((form) => {
|
||||||
|
const li = document.createElement("li");
|
||||||
|
li.textContent = `${form.name} (ID: ${form.id})`;
|
||||||
|
|
||||||
|
const viewSubmissionsButton = document.createElement("button");
|
||||||
|
viewSubmissionsButton.textContent = "View Submissions";
|
||||||
|
viewSubmissionsButton.onclick = () =>
|
||||||
|
loadSubmissions(form.id, form.name);
|
||||||
|
|
||||||
|
li.appendChild(viewSubmissionsButton);
|
||||||
|
formsList.appendChild(li);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
formsList.innerHTML = "<li>No forms found.</li>";
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Failed to load forms: ${error.message}`, true);
|
||||||
|
formsList.innerHTML = "<li>Error loading forms.</li>";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSubmissions(formId, formName) {
|
||||||
|
showStatus("");
|
||||||
|
submissionsList.innerHTML = "<li>Loading submissions...</li>";
|
||||||
|
submissionsFormNameSpan.textContent = `${formName} (ID: ${formId})`;
|
||||||
|
submissionsSection.classList.remove("hidden");
|
||||||
|
|
||||||
|
try {
|
||||||
|
const submissions = await makeApiRequest(
|
||||||
|
`/forms/${formId}/submissions`,
|
||||||
|
"GET",
|
||||||
|
null,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
submissionsList.innerHTML = ""; // Clear list
|
||||||
|
|
||||||
|
if (submissions && submissions.length > 0) {
|
||||||
|
submissions.forEach((sub) => {
|
||||||
|
const li = document.createElement("li");
|
||||||
|
// Display submission data safely - avoid rendering raw HTML
|
||||||
|
const pre = document.createElement("pre");
|
||||||
|
pre.textContent = JSON.stringify(sub.data, null, 2); // Pretty print JSON
|
||||||
|
li.appendChild(pre);
|
||||||
|
// Optionally display submission ID and timestamp if available
|
||||||
|
// const info = document.createElement('small');
|
||||||
|
// info.textContent = `ID: ${sub.id}, Submitted: ${sub.created_at || 'N/A'}`;
|
||||||
|
// li.appendChild(info);
|
||||||
|
|
||||||
|
submissionsList.appendChild(li);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
submissionsList.innerHTML =
|
||||||
|
"<li>No submissions found for this form.</li>";
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(
|
||||||
|
`Failed to load submissions for form ${formId}: ${error.message}`,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
submissionsList.innerHTML = "<li>Error loading submissions.</li>";
|
||||||
|
submissionsSection.classList.add("hidden"); // Hide section on error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Public Form Handling ---
|
||||||
|
|
||||||
|
if (loadPublicFormButton) {
|
||||||
|
loadPublicFormButton.addEventListener("click", async () => {
|
||||||
|
const formId = publicFormIdInput.value.trim();
|
||||||
|
if (!formId) {
|
||||||
|
showStatus("Please enter a Form ID.", true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
showStatus("");
|
||||||
|
publicFormArea.classList.add("hidden");
|
||||||
|
publicForm.innerHTML = "Loading form..."; // Clear previous form
|
||||||
|
|
||||||
|
// NOTE: Fetching form definition is NOT directly possible with the current backend
|
||||||
|
// The backend only provides GET /forms (all, protected) and GET /forms/{id}/submissions (protected)
|
||||||
|
// It DOES NOT provide a public GET /forms/{id} endpoint to fetch the definition.
|
||||||
|
//
|
||||||
|
// **WORKAROUND:** We will *assume* the user knows the structure or we have it cached/predefined.
|
||||||
|
// For this example, we'll fetch *all* forms (if logged in) and find it, OR fail if not logged in.
|
||||||
|
// A *better* backend design would include a public GET /forms/{id} endpoint.
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Attempt to get the form definition (requires login for this workaround)
|
||||||
|
if (!authToken) {
|
||||||
|
showStatus(
|
||||||
|
"Loading public forms requires login in this demo version.",
|
||||||
|
true
|
||||||
|
);
|
||||||
|
publicForm.innerHTML = ""; // Clear loading message
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const forms = await makeApiRequest("/forms", "GET", null, true);
|
||||||
|
const formDefinition = forms.find((f) => f.id === formId);
|
||||||
|
|
||||||
|
if (!formDefinition) {
|
||||||
|
throw new Error(`Form with ID ${formId} not found or access denied.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderPublicForm(formDefinition);
|
||||||
|
publicFormArea.classList.remove("hidden");
|
||||||
|
} catch (error) {
|
||||||
|
showStatus(`Failed to load form ${formId}: ${error.message}`, true);
|
||||||
|
publicForm.innerHTML = ""; // Clear loading message
|
||||||
|
publicFormArea.classList.add("hidden");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderPublicForm(formDefinition) {
|
||||||
|
publicFormTitle.textContent = formDefinition.name;
|
||||||
|
publicForm.innerHTML = ""; // Clear previous fields
|
||||||
|
publicForm.dataset.formId = formDefinition.id; // Store form ID for submission
|
||||||
|
|
||||||
|
if (!formDefinition.fields || !Array.isArray(formDefinition.fields)) {
|
||||||
|
publicForm.innerHTML = "<p>Error: Form definition is invalid.</p>";
|
||||||
|
console.error("Invalid form fields definition:", formDefinition.fields);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
formDefinition.fields.forEach((field) => {
|
||||||
|
const div = document.createElement("div");
|
||||||
|
const label = document.createElement("label");
|
||||||
|
label.htmlFor = `field-${field.name}`;
|
||||||
|
label.textContent = field.label || field.name; // Use label, fallback to name
|
||||||
|
div.appendChild(label);
|
||||||
|
|
||||||
|
let input;
|
||||||
|
// Basic type handling - could be expanded
|
||||||
|
switch (field.type) {
|
||||||
|
case "textarea": // Allow explicit textarea type
|
||||||
|
case "string":
|
||||||
|
// Use textarea for string if maxLength suggests it might be long
|
||||||
|
if (field.maxLength && field.maxLength > 100) {
|
||||||
|
input = document.createElement("textarea");
|
||||||
|
input.rows = 4; // Default rows
|
||||||
|
} else {
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "text";
|
||||||
|
}
|
||||||
|
if (field.minLength) input.minLength = field.minLength;
|
||||||
|
if (field.maxLength) input.maxLength = field.maxLength;
|
||||||
|
break;
|
||||||
|
case "email":
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "email";
|
||||||
|
break;
|
||||||
|
case "url":
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "url";
|
||||||
|
break;
|
||||||
|
case "number":
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "number";
|
||||||
|
if (field.min !== undefined) input.min = field.min;
|
||||||
|
if (field.max !== undefined) input.max = field.max;
|
||||||
|
input.step = field.step || "any"; // Allow decimals by default
|
||||||
|
break;
|
||||||
|
case "boolean":
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "checkbox";
|
||||||
|
// Checkbox label handling is slightly different
|
||||||
|
label.insertBefore(input, label.firstChild); // Put checkbox before text
|
||||||
|
input.style.width = "auto"; // Override default width
|
||||||
|
input.style.marginRight = "10px";
|
||||||
|
break;
|
||||||
|
// Add cases for 'select', 'radio', 'date' etc. if needed
|
||||||
|
default:
|
||||||
|
input = document.createElement("input");
|
||||||
|
input.type = "text";
|
||||||
|
console.warn(
|
||||||
|
`Unsupported field type "${field.type}" for field "${field.name}". Rendering as text.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input.type !== "checkbox") {
|
||||||
|
// Checkbox is already appended inside label
|
||||||
|
div.appendChild(input);
|
||||||
|
}
|
||||||
|
input.id = `field-${field.name}`;
|
||||||
|
input.name = field.name; // Crucial for form data collection
|
||||||
|
if (field.required) input.required = true;
|
||||||
|
if (field.placeholder) input.placeholder = field.placeholder;
|
||||||
|
if (field.pattern) input.pattern = field.pattern; // Add regex pattern validation
|
||||||
|
|
||||||
|
publicForm.appendChild(div);
|
||||||
|
});
|
||||||
|
|
||||||
|
const submitButton = document.createElement("button");
|
||||||
|
submitButton.type = "submit";
|
||||||
|
submitButton.textContent = "Submit Form";
|
||||||
|
publicForm.appendChild(submitButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
publicForm.addEventListener("submit", async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showStatus("");
|
||||||
|
const formId = e.target.dataset.formId;
|
||||||
|
if (!formId) {
|
||||||
|
showStatus("Error: Form ID is missing.", true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const formData = new FormData(e.target);
|
||||||
|
const submissionData = {};
|
||||||
|
|
||||||
|
// Convert FormData to a plain object, handling checkboxes correctly
|
||||||
|
for (const [key, value] of formData.entries()) {
|
||||||
|
const inputElement = e.target.elements[key];
|
||||||
|
|
||||||
|
// Handle Checkboxes (boolean)
|
||||||
|
if (inputElement && inputElement.type === "checkbox") {
|
||||||
|
// A checkbox value is only present in FormData if it's checked.
|
||||||
|
// We need to ensure we always send a boolean.
|
||||||
|
// Check if the element exists in the form (it might be unchecked)
|
||||||
|
submissionData[key] = inputElement.checked;
|
||||||
|
}
|
||||||
|
// Handle Number inputs (convert from string)
|
||||||
|
else if (inputElement && inputElement.type === "number") {
|
||||||
|
// Only convert if the value is not empty, otherwise send null or handle as needed
|
||||||
|
if (value !== "") {
|
||||||
|
submissionData[key] = parseFloat(value); // Or parseInt if only integers allowed
|
||||||
|
if (isNaN(submissionData[key])) {
|
||||||
|
// Handle potential parsing errors if input validation fails
|
||||||
|
console.warn(`Could not parse number for field ${key}: ${value}`);
|
||||||
|
submissionData[key] = null; // Or keep as string, or show error
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
submissionData[key] = null; // Or undefined, depending on backend expectation for empty numbers
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Handle potential multiple values for the same name (e.g., multi-select), though not rendered here
|
||||||
|
else if (submissionData.hasOwnProperty(key)) {
|
||||||
|
if (!Array.isArray(submissionData[key])) {
|
||||||
|
submissionData[key] = [submissionData[key]];
|
||||||
|
}
|
||||||
|
submissionData[key].push(value);
|
||||||
|
}
|
||||||
|
// Default: treat as string
|
||||||
|
else {
|
||||||
|
submissionData[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure boolean fields that were *unchecked* are explicitly set to false
|
||||||
|
// FormData only includes checked checkboxes. Find all checkbox inputs in the form.
|
||||||
|
const checkboxes = e.target.querySelectorAll('input[type="checkbox"]');
|
||||||
|
checkboxes.forEach((cb) => {
|
||||||
|
if (!submissionData.hasOwnProperty(cb.name)) {
|
||||||
|
submissionData[cb.name] = false; // Set unchecked boxes to false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log("Submitting data:", submissionData); // Debugging
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Public submission endpoint doesn't require auth
|
||||||
|
const result = await makeApiRequest(
|
||||||
|
`/forms/${formId}/submissions`,
|
||||||
|
"POST",
|
||||||
|
submissionData,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
showStatus(
|
||||||
|
`Submission successful! Submission ID: ${result.submission_id}`
|
||||||
|
);
|
||||||
|
e.target.reset(); // Clear the form
|
||||||
|
// Optionally hide the form after successful submission
|
||||||
|
// publicFormArea.classList.add('hidden');
|
||||||
|
} catch (error) {
|
||||||
|
let errorMsg = `Submission failed: ${error.message}`;
|
||||||
|
// Handle validation errors specifically
|
||||||
|
if (error.validationErrors) {
|
||||||
|
errorMsg = "Submission failed due to validation errors:\n";
|
||||||
|
for (const [field, message] of Object.entries(error.validationErrors)) {
|
||||||
|
errorMsg += `- ${field}: ${message}\n`;
|
||||||
|
}
|
||||||
|
// Highlight invalid fields? (More complex UI update)
|
||||||
|
}
|
||||||
|
showStatus(errorMsg, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- Initial Setup ---
|
||||||
|
toggleSections(); // Set initial view based on stored token
|
||||||
|
if (authToken) {
|
||||||
|
loadFormsButton.click(); // Auto-load forms if logged in
|
||||||
|
}
|
||||||
|
});
|
@ -1,188 +0,0 @@
|
|||||||
/* Reset and base styles */
|
|
||||||
:root {
|
|
||||||
--primary-color: #4a90e2;
|
|
||||||
--secondary-color: #f5f5f5;
|
|
||||||
--border-color: #ddd;
|
|
||||||
--text-color: #333;
|
|
||||||
--error-color: #e74c3c;
|
|
||||||
--success-color: #2ecc71;
|
|
||||||
--shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
|
|
||||||
sans-serif;
|
|
||||||
line-height: 1.6;
|
|
||||||
color: var(--text-color);
|
|
||||||
background-color: #fff;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Typography */
|
|
||||||
h1 {
|
|
||||||
font-size: 2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.5rem;
|
|
||||||
margin: 1.5rem 0 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Links */
|
|
||||||
a {
|
|
||||||
color: var(--primary-color);
|
|
||||||
text-decoration: none;
|
|
||||||
transition: color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
color: #357abd;
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Lists */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
margin: 1rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
li {
|
|
||||||
padding: 0.75rem;
|
|
||||||
border-bottom: 1px solid var(--border-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
li:last-child {
|
|
||||||
border-bottom: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Forms */
|
|
||||||
form {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-group {
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
display: block;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type='text'],
|
|
||||||
input[type='number'],
|
|
||||||
input[type='date'],
|
|
||||||
select,
|
|
||||||
textarea {
|
|
||||||
width: 100%;
|
|
||||||
padding: 0.75rem;
|
|
||||||
border: 1px solid var(--border-color);
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 1rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
transition: border-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
input:focus,
|
|
||||||
select:focus,
|
|
||||||
textarea:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: var(--primary-color);
|
|
||||||
box-shadow: 0 0 0 2px rgba(74, 144, 226, 0.2);
|
|
||||||
}
|
|
||||||
|
|
||||||
textarea {
|
|
||||||
min-height: 100px;
|
|
||||||
resize: vertical;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Buttons */
|
|
||||||
button {
|
|
||||||
background-color: var(--primary-color);
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
padding: 0.75rem 1.5rem;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 1rem;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover:not(:disabled) {
|
|
||||||
background-color: #357abd;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:disabled {
|
|
||||||
background-color: #ccc;
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
button.secondary {
|
|
||||||
background-color: var(--secondary-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
border: 1px solid var(--border-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
button.secondary:hover:not(:disabled) {
|
|
||||||
background-color: #e8e8e8;
|
|
||||||
}
|
|
||||||
|
|
||||||
button + button {
|
|
||||||
margin-left: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Field management */
|
|
||||||
.field-container {
|
|
||||||
background-color: var(--secondary-color);
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 4px;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Submissions */
|
|
||||||
.submissions-list {
|
|
||||||
background-color: var(--secondary-color);
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.submission-item {
|
|
||||||
background-color: white;
|
|
||||||
padding: 1rem;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
border-radius: 4px;
|
|
||||||
box-shadow: var(--shadow);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Utility classes */
|
|
||||||
.container {
|
|
||||||
max-width: 1200px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.loading {
|
|
||||||
text-align: center;
|
|
||||||
padding: 2rem;
|
|
||||||
color: #666;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error {
|
|
||||||
color: var(--error-color);
|
|
||||||
margin: 1rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.success {
|
|
||||||
color: var(--success-color);
|
|
||||||
margin: 1rem 0;
|
|
||||||
}
|
|
13
frontend/src/app.d.ts
vendored
13
frontend/src/app.d.ts
vendored
@ -1,13 +0,0 @@
|
|||||||
// See https://svelte.dev/docs/kit/types#app.d.ts
|
|
||||||
// for information about these interfaces
|
|
||||||
declare global {
|
|
||||||
namespace App {
|
|
||||||
// interface Error {}
|
|
||||||
// interface Locals {}
|
|
||||||
// interface PageData {}
|
|
||||||
// interface PageState {}
|
|
||||||
// interface Platform {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export {};
|
|
@ -1,12 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
%sveltekit.head%
|
|
||||||
</head>
|
|
||||||
<body data-sveltekit-preload-data="hover">
|
|
||||||
<div style="display: contents">%sveltekit.body%</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
@ -1,176 +0,0 @@
|
|||||||
const API_BASE_URL = 'http://127.0.0.1:8080';
|
|
||||||
|
|
||||||
// A simple function to retrieve the token from local storage or wherever it is stored
|
|
||||||
function getAuthToken(): string | null {
|
|
||||||
return localStorage.getItem('auth_token'); // Assuming the token is stored in localStorage
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple function to save the token
|
|
||||||
function setAuthToken(token: string): void {
|
|
||||||
localStorage.setItem('auth_token', token);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple function to save the token
|
|
||||||
function delAuthToken(): void {
|
|
||||||
localStorage.removeItem('auth_token');
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple function to retrieve the token from local storage or wherever it is stored
|
|
||||||
function getAuthToken(): string | null {
|
|
||||||
return localStorage.getItem('auth_token'); // Assuming the token is stored in localStorage
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple function to save the token
|
|
||||||
function setAuthToken(token: string): void {
|
|
||||||
localStorage.setItem('auth_token', token);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple function to save the token
|
|
||||||
function delAuthToken(): void {
|
|
||||||
localStorage.removeItem('auth_token');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper to make authenticated requests.
|
|
||||||
* @param endpoint The API endpoint (relative to base URL).
|
|
||||||
* @param options Fetch options such as method, headers, and body.
|
|
||||||
* @returns The JSON-parsed response.
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
async function authenticatedRequest(endpoint: string, options: RequestInit): Promise<any> {
|
|
||||||
const token = localStorage.getItem('authToken'); // Replace with a secure token storage solution if needed
|
|
||||||
if (!token) {
|
|
||||||
throw new Error('Authentication token is missing. Please log in.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await fetch(`${API_BASE_URL}${endpoint}`, {
|
|
||||||
...options,
|
|
||||||
headers: {
|
|
||||||
...options.headers,
|
|
||||||
Authorization: `Bearer ${token}`, // Include the token in the Authorization header
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new form (authenticated).
|
|
||||||
* @param name The name of the form.
|
|
||||||
* @param fields The fields of the form in JSON format.
|
|
||||||
* @returns The ID of the created form.
|
|
||||||
*/
|
|
||||||
export async function createForm(name: string, fields: unknown): Promise<string> {
|
|
||||||
const token = getAuthToken(); // Get the token from storage
|
|
||||||
const response = await fetch(`${API_BASE_URL}/forms`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
Authorization: `Bearer ${token}` // Add token to the headers
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ name, fields })
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get all forms (authenticated).
|
|
||||||
* @returns An array of forms.
|
|
||||||
*/
|
|
||||||
export async function getForms(): Promise<unknown[]> {
|
|
||||||
const token = getAuthToken(); // Get the token from storage
|
|
||||||
const response = await fetch(`${API_BASE_URL}/forms`, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: {
|
|
||||||
Accept: 'application/json',
|
|
||||||
Authorization: `Bearer ${token}` // Add token to the headers
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error fetching forms: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Submit a form (unauthenticated).
|
|
||||||
* @param formId The ID of the form to submit.
|
|
||||||
* @param data The submission data in JSON format.
|
|
||||||
* @returns The ID of the created submission.
|
|
||||||
*/
|
|
||||||
export async function submitForm(formId: string, data: unknown): Promise<string> {
|
|
||||||
const token = getAuthToken(); // Get the token from storage
|
|
||||||
const response = await fetch(`${API_BASE_URL}/forms/${formId}/submissions`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
Authorization: `Bearer ${token}` // Add token to the headers
|
|
||||||
},
|
|
||||||
body: JSON.stringify(data)
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error submitting form: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Admin login to get a token.
|
|
||||||
* @param credentials The login credentials (username and password).
|
|
||||||
* @returns The generated JWT token if successful.
|
|
||||||
*/
|
|
||||||
export async function getSubmissions(formId: string): Promise<unknown[]> {
|
|
||||||
const token = getAuthToken(); // Get the token from storage
|
|
||||||
const response = await fetch(`${API_BASE_URL}/forms/${formId}/submissions`, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: {
|
|
||||||
Accept: 'application/json',
|
|
||||||
Authorization: `Bearer ${token}` // Add token to the headers
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error fetching submissions: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Login and get the authentication token.
|
|
||||||
* @param username The username.
|
|
||||||
* @param password The password.
|
|
||||||
* @returns The authentication token.
|
|
||||||
*/
|
|
||||||
export async function login(username: string, password: string): Promise<void> {
|
|
||||||
const response = await fetch(`${API_BASE_URL}/login`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ username, password })
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error logging in: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const { token } = await response.json();
|
|
||||||
setAuthToken(token); // Store the token in localStorage
|
|
||||||
}
|
|
||||||
|
|
||||||
export function logout() {
|
|
||||||
delAuthToken();
|
|
||||||
}
|
|
||||||
|
|
||||||
export function loggedIn() {
|
|
||||||
return localStorage.getItem('auth_token') !== null;
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { goto } from '$app/navigation';
|
|
||||||
import axios from 'axios';
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
|
|
||||||
let forms: any = [];
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
const response = await axios.get('http://localhost:8080/forms');
|
|
||||||
forms = response.data;
|
|
||||||
});
|
|
||||||
|
|
||||||
function viewForm(id: number) {
|
|
||||||
goto(`/form/${id}`);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h1>Forms Dashboard</h1>
|
|
||||||
{#if forms.length === 0}
|
|
||||||
<p>No forms available.</p>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
{#each forms as form}
|
|
||||||
<li>
|
|
||||||
<h3>{form.name}</h3>
|
|
||||||
<button on:click={() => viewForm(form.id)}>View</button>
|
|
||||||
</li>
|
|
||||||
{/each}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
@ -1,44 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
let formName = '';
|
|
||||||
/**
|
|
||||||
* @type {any[]}
|
|
||||||
*/
|
|
||||||
let fields = [];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} type
|
|
||||||
*/
|
|
||||||
function addField(type) {
|
|
||||||
fields.push({ label: '', name: '', type });
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveForm() {
|
|
||||||
const response = await axios.post('http://localhost:8080/forms', {
|
|
||||||
name: formName,
|
|
||||||
fields
|
|
||||||
});
|
|
||||||
alert(`Form saved with ID: ${response.data}`);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h1>Create a Form</h1>
|
|
||||||
<input type="text" bind:value={formName} placeholder="Form Name" />
|
|
||||||
|
|
||||||
<button on:click={() => addField('text')}>Add Text Field</button>
|
|
||||||
<button on:click={() => addField('number')}>Add Number Field</button>
|
|
||||||
|
|
||||||
{#each fields as field, index}
|
|
||||||
<div>
|
|
||||||
<input type="text" bind:value={field.label} placeholder="Field Label" />
|
|
||||||
<input type="text" bind:value={field.name} placeholder="Field Name" />
|
|
||||||
<span>{field.type}</span>
|
|
||||||
<button on:click={() => fields.splice(index, 1)}>Remove</button>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
|
|
||||||
<button on:click={saveForm}>Save Form</button>
|
|
||||||
</div>
|
|
@ -1,35 +0,0 @@
|
|||||||
<script>
|
|
||||||
// @ts-nocheck
|
|
||||||
|
|
||||||
export let form;
|
|
||||||
/**
|
|
||||||
* @type {(arg0: {}) => void}
|
|
||||||
*/
|
|
||||||
export let onSubmit;
|
|
||||||
|
|
||||||
let formData = {};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {{ preventDefault: () => void; }} e
|
|
||||||
*/
|
|
||||||
function handleSubmit(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
onSubmit(formData);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<form on:submit={handleSubmit}>
|
|
||||||
{#each form.fields as field}
|
|
||||||
<div>
|
|
||||||
<!-- svelte-ignore a11y_label_has_associated_control -->
|
|
||||||
<label>{field.label}</label>
|
|
||||||
{#if field.type === 'text'}
|
|
||||||
<input type="text" bind:value={formData[field.name]} />
|
|
||||||
{:else if field.type === 'number'}
|
|
||||||
<input type="number" bind:value={formData[field.name]} />
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
|
|
||||||
<button type="submit">Submit</button>
|
|
||||||
</form>
|
|
@ -1,11 +0,0 @@
|
|||||||
<nav>
|
|
||||||
<h1>Formies</h1>
|
|
||||||
<button>logout</button>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
nav {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
</style>
|
|
@ -1,32 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import axios from 'axios';
|
|
||||||
import { goto } from '$app/navigation';
|
|
||||||
|
|
||||||
let forms: any = [];
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
const response = await axios.get('http://localhost:8080/forms');
|
|
||||||
forms = response.data;
|
|
||||||
});
|
|
||||||
|
|
||||||
function viewForm(id: number) {
|
|
||||||
goto(`/form/${id}`);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h1>Forms Dashboard</h1>
|
|
||||||
{#if forms.length === 0}
|
|
||||||
<p>No forms available.</p>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
{#each forms as form}
|
|
||||||
<li>
|
|
||||||
<h3>{form.name}</h3>
|
|
||||||
<button on:click={() => viewForm(form.id)}>View</button>
|
|
||||||
</li>
|
|
||||||
{/each}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
@ -1,17 +0,0 @@
|
|||||||
import type { AdminUser } from './types';
|
|
||||||
|
|
||||||
const key2 = 'username';
|
|
||||||
|
|
||||||
function login(user: AdminUser) {
|
|
||||||
localStorage.setItem(key2, user.username);
|
|
||||||
}
|
|
||||||
|
|
||||||
function logout() {
|
|
||||||
localStorage.removeItem(key2);
|
|
||||||
}
|
|
||||||
|
|
||||||
function loggedIn() {
|
|
||||||
return localStorage.getItem('authToken') !== null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default { login, logout, loggedIn };
|
|
@ -1,29 +0,0 @@
|
|||||||
export interface FormField {
|
|
||||||
label: string;
|
|
||||||
name: string;
|
|
||||||
field_type: 'text' | 'number' | 'date' | 'textarea';
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Form {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
fields: FormField[];
|
|
||||||
created_at?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Submission {
|
|
||||||
id: string;
|
|
||||||
form_id: string;
|
|
||||||
data: Record<string, unknown>;
|
|
||||||
created_at?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface LoginCredentials {
|
|
||||||
username: string;
|
|
||||||
password: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminUser {
|
|
||||||
username: string;
|
|
||||||
password_hash: string;
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import Navbar from '$lib/components/Navbar.svelte';
|
|
||||||
let { children } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<Navbar></Navbar>
|
|
||||||
{@render children()}
|
|
@ -1,8 +0,0 @@
|
|||||||
import { loggedIn } from '$lib/api';
|
|
||||||
import { redirect } from '@sveltejs/kit';
|
|
||||||
|
|
||||||
export async function load() {
|
|
||||||
if (!loggedIn()) {
|
|
||||||
redirect(307, '/login');
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,62 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { createForm } from '../../../lib/api';
|
|
||||||
import type { FormField } from '../../../lib/types';
|
|
||||||
|
|
||||||
let name = '';
|
|
||||||
let fields: FormField[] = [];
|
|
||||||
|
|
||||||
function addField() {
|
|
||||||
fields = [...fields, { label: '', name: '', field_type: 'text' }];
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeField(index: number) {
|
|
||||||
fields = fields.filter((_, i) => i !== index);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveForm() {
|
|
||||||
try {
|
|
||||||
await createForm(name, fields);
|
|
||||||
alert('Form created successfully!');
|
|
||||||
location.href = '/';
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to create form:', error);
|
|
||||||
alert('An error occurred while creating the form.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<h1>Create Form</h1>
|
|
||||||
<form on:submit|preventDefault={saveForm}>
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Form Name:</label>
|
|
||||||
<input type="text" bind:value={name} placeholder="Enter form name" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2>Fields</h2>
|
|
||||||
{#each fields as field, i}
|
|
||||||
<div class="field-container">
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Label:</label>
|
|
||||||
<input type="text" bind:value={field.label} placeholder="Enter field label" />
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Name:</label>
|
|
||||||
<input type="text" bind:value={field.name} placeholder="Enter field name" />
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Type:</label>
|
|
||||||
<select bind:value={field.field_type}>
|
|
||||||
<option value="text">Text</option>
|
|
||||||
<option value="number">Number</option>
|
|
||||||
<option value="date">Date</option>
|
|
||||||
<option value="textarea">Textarea</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<button class="secondary" on:click={() => removeField(i)}>Remove</button>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
<button class="secondary" on:click={addField}>Add Field</button>
|
|
||||||
<button type="submit" disabled={!name || fields.length === 0}>Save Form</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
@ -1,61 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { getForms, getSubmissions, submitForm } from '$lib/api';
|
|
||||||
import type { Form, Submission } from '$lib/types';
|
|
||||||
import { page } from '$app/stores';
|
|
||||||
|
|
||||||
export let params: { id: string };
|
|
||||||
let form: any | null = null;
|
|
||||||
let submissions: any[] = [];
|
|
||||||
let responseData: Record<string, any> = {};
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
const { id } = $page.params;
|
|
||||||
if (id) {
|
|
||||||
form = await getForms().then((forms) => forms.find((f: any) => f.id === id) || null);
|
|
||||||
submissions = await getSubmissions(id);
|
|
||||||
} else {
|
|
||||||
console.error('Route parameter id is missing');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function submitResponse() {
|
|
||||||
const { id } = $page.params;
|
|
||||||
await submitForm(id, responseData);
|
|
||||||
alert('Response submitted successfully!');
|
|
||||||
submissions = await getSubmissions(params.id);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<h1>{form?.name}</h1>
|
|
||||||
{#if form}
|
|
||||||
<form on:submit|preventDefault={submitResponse}>
|
|
||||||
{#each form.fields as field}
|
|
||||||
<div class="form-group">
|
|
||||||
<label>{field.label}</label>
|
|
||||||
{#if field.field_type === 'text'}
|
|
||||||
<input type="text" bind:value={responseData[field.name]} />
|
|
||||||
{:else if field.field_type === 'number'}
|
|
||||||
<input type="number" bind:value={responseData[field.name]} />
|
|
||||||
{:else if field.field_type === 'date'}
|
|
||||||
<input type="date" bind:value={responseData[field.name]} />
|
|
||||||
{:else if field.field_type === 'textarea'}
|
|
||||||
<textarea bind:value={responseData[field.name]}></textarea>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
<button type="submit">Submit</button>
|
|
||||||
</form>
|
|
||||||
<h2>Submissions</h2>
|
|
||||||
<div class="submissions-list">
|
|
||||||
{#each submissions as submission}
|
|
||||||
<div class="submission-item">
|
|
||||||
{JSON.stringify(submission.data)}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<p class="loading">Loading...</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
@ -1,5 +0,0 @@
|
|||||||
export function load({ params }) {
|
|
||||||
return {
|
|
||||||
params
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { getForms } from '../../../lib/api';
|
|
||||||
import type { Form } from '../../../lib/types';
|
|
||||||
|
|
||||||
let forms: Form[] = [];
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
forms = await getForms();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<a href="/create" class="button">Create a New Form</a>
|
|
||||||
<ul class="forms-list">
|
|
||||||
{#each forms as form}
|
|
||||||
<li>
|
|
||||||
<a href={`/form/${form.id}`}>{form.name}</a>
|
|
||||||
</li>
|
|
||||||
{/each}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
@ -1,7 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import '../app.css';
|
|
||||||
|
|
||||||
let { children } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{@render children()}
|
|
@ -1 +0,0 @@
|
|||||||
export const ssr = false;
|
|
@ -1,7 +0,0 @@
|
|||||||
import { loggedIn } from '$lib/api';
|
|
||||||
import { redirect } from '@sveltejs/kit';
|
|
||||||
|
|
||||||
export async function load() {
|
|
||||||
const page = loggedIn() ? '/main' : '/login';
|
|
||||||
redirect(307, page);
|
|
||||||
}
|
|
@ -1,51 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { login } from '$lib/api';
|
|
||||||
|
|
||||||
let username = '';
|
|
||||||
let password = '';
|
|
||||||
let errorMessage = '';
|
|
||||||
let isLoading = false;
|
|
||||||
|
|
||||||
const handleLogin = async () => {
|
|
||||||
isLoading = true;
|
|
||||||
errorMessage = ''; // Reset any previous error message
|
|
||||||
|
|
||||||
try {
|
|
||||||
await login(username, password);
|
|
||||||
// If successful, you can redirect the user to another page or show a success message
|
|
||||||
window.location.href = '/main'; // Example redirection after login
|
|
||||||
} catch (error: any) {
|
|
||||||
errorMessage = error.message || 'Login failed. Please try again.';
|
|
||||||
} finally {
|
|
||||||
isLoading = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="login-container">
|
|
||||||
<h2>Login</h2>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="username">Username</label>
|
|
||||||
<input type="text" id="username" bind:value={username} placeholder="Enter your username" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password">Password</label>
|
|
||||||
<input type="password" id="password" bind:value={password} placeholder="Enter your password" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if errorMessage}
|
|
||||||
<div class="error-message">{errorMessage}</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<button class="submit-button" on:click={handleLogin} disabled={isLoading}>
|
|
||||||
{#if isLoading}
|
|
||||||
<div class="loading">
|
|
||||||
<span>Loading...</span>
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
Login
|
|
||||||
{/if}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
@ -1,8 +0,0 @@
|
|||||||
import { loggedIn } from '$lib/api';
|
|
||||||
import { redirect } from '@sveltejs/kit';
|
|
||||||
|
|
||||||
export async function load() {
|
|
||||||
if (loggedIn()) {
|
|
||||||
redirect(307, '/');
|
|
||||||
}
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB |
411
frontend/style.css
Normal file
411
frontend/style.css
Normal file
@ -0,0 +1,411 @@
|
|||||||
|
/* --- Variables copied from FormCraft --- */
|
||||||
|
:root {
|
||||||
|
--color-bg: #f7f7f7;
|
||||||
|
--color-surface: #ffffff;
|
||||||
|
--color-primary: #3a4750; /* Dark grayish blue */
|
||||||
|
--color-secondary: #d8d8d8; /* Light gray */
|
||||||
|
--color-accent: #b06f42; /* Warm wood/leather brown */
|
||||||
|
--color-text: #2d3436; /* Dark gray */
|
||||||
|
--color-text-light: #636e72; /* Medium gray */
|
||||||
|
--color-border: #e0e0e0; /* Light border gray */
|
||||||
|
--color-success: #2e7d32; /* Green */
|
||||||
|
--color-success-bg: #e8f5e9;
|
||||||
|
--color-error: #a94442; /* Red for errors */
|
||||||
|
--color-error-bg: #f2dede;
|
||||||
|
--color-danger: #e74c3c; /* Red for danger buttons */
|
||||||
|
--color-danger-hover: #c0392b;
|
||||||
|
|
||||||
|
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||||
|
--shadow-md: 0 4px 6px rgba(0, 0, 0, 0.05);
|
||||||
|
--border-radius: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Global Reset & Body Styles --- */
|
||||||
|
* {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
background-color: var(--color-bg);
|
||||||
|
color: var(--color-text);
|
||||||
|
line-height: 1.6;
|
||||||
|
min-height: 100vh;
|
||||||
|
display: flex; /* Helps with potential footer later */
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Container --- */
|
||||||
|
.container {
|
||||||
|
max-width: 900px; /* Adjusted width for simpler content */
|
||||||
|
width: 100%;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 32px 24px; /* Add padding like main content */
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-container {
|
||||||
|
flex: 1; /* Make container take available space if using flex on body */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Typography --- */
|
||||||
|
h1,
|
||||||
|
h2,
|
||||||
|
h3 {
|
||||||
|
color: var(--color-primary);
|
||||||
|
margin-bottom: 16px;
|
||||||
|
line-height: 1.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1.page-title {
|
||||||
|
font-size: 1.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
text-align: center; /* Center main title */
|
||||||
|
}
|
||||||
|
|
||||||
|
h2.section-title {
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 600;
|
||||||
|
border-bottom: 1px solid var(--color-border);
|
||||||
|
padding-bottom: 8px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3.card-title {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--color-primary);
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
color: var(--color-text-light);
|
||||||
|
}
|
||||||
|
p:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr.divider {
|
||||||
|
border: 0;
|
||||||
|
height: 1px;
|
||||||
|
background: var(--color-border);
|
||||||
|
margin: 32px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Content Card / Section Styling --- */
|
||||||
|
.content-card,
|
||||||
|
.section {
|
||||||
|
background-color: var(--color-surface);
|
||||||
|
padding: 24px;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
box-shadow: var(--shadow-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-header p {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 0;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-header span {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Forms --- */
|
||||||
|
form .form-group {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
/* For side-by-side input and button */
|
||||||
|
form .inline-form-group {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: flex-start; /* Align items to top */
|
||||||
|
}
|
||||||
|
form .inline-form-group input {
|
||||||
|
flex-grow: 1; /* Allow input to take available space */
|
||||||
|
margin-bottom: 0; /* Remove bottom margin */
|
||||||
|
}
|
||||||
|
form .inline-form-group button {
|
||||||
|
flex-shrink: 0; /* Prevent button from shrinking */
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--color-text-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"],
|
||||||
|
input[type="password"],
|
||||||
|
input[type="email"],
|
||||||
|
input[type="url"],
|
||||||
|
input[type="number"],
|
||||||
|
textarea {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: var(--color-text);
|
||||||
|
transition: border-color 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"]:focus,
|
||||||
|
input[type="password"]:focus,
|
||||||
|
input[type="email"]:focus,
|
||||||
|
input[type="url"]:focus,
|
||||||
|
input[type="number"]:focus,
|
||||||
|
textarea:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--color-accent);
|
||||||
|
box-shadow: 0 0 0 2px rgba(176, 111, 66, 0.2); /* Accent focus ring */
|
||||||
|
}
|
||||||
|
|
||||||
|
textarea {
|
||||||
|
min-height: 80px;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Styling for dynamically generated public form fields */
|
||||||
|
#public-form div {
|
||||||
|
margin-bottom: 16px; /* Keep consistent spacing */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Specific styles for checkboxes */
|
||||||
|
#public-form input[type="checkbox"] {
|
||||||
|
width: auto; /* Override 100% width */
|
||||||
|
margin-right: 10px;
|
||||||
|
vertical-align: middle; /* Align checkbox nicely with label text */
|
||||||
|
margin-bottom: 0; /* Remove bottom margin if label handles spacing */
|
||||||
|
}
|
||||||
|
#public-form input[type="checkbox"] + label, /* Style label differently if needed when next to checkbox */
|
||||||
|
#public-form label input[type="checkbox"] /* Style if checkbox is inside label */ {
|
||||||
|
display: inline-flex; /* Or inline-block */
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 0; /* Prevent double margin */
|
||||||
|
font-weight: normal; /* Checkboxes often have normal weight labels */
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Buttons --- */
|
||||||
|
.button {
|
||||||
|
background-color: var(--color-primary);
|
||||||
|
color: white;
|
||||||
|
border: 1px solid transparent; /* Add border for consistency */
|
||||||
|
padding: 10px 18px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
cursor: pointer;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 8px;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
text-decoration: none;
|
||||||
|
line-height: 1.5;
|
||||||
|
vertical-align: middle; /* Align with text/inputs */
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:hover {
|
||||||
|
background-color: #2c373f; /* Slightly darker hover */
|
||||||
|
box-shadow: var(--shadow-sm);
|
||||||
|
}
|
||||||
|
.button:active {
|
||||||
|
background-color: #1e2a31; /* Even darker active state */
|
||||||
|
}
|
||||||
|
|
||||||
|
.button-secondary {
|
||||||
|
background-color: var(--color-surface);
|
||||||
|
color: var(--color-primary);
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.button-secondary:hover {
|
||||||
|
background-color: #f8f8f8; /* Subtle hover for secondary */
|
||||||
|
border-color: #d0d0d0;
|
||||||
|
}
|
||||||
|
.button-secondary:active {
|
||||||
|
background-color: #f0f0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button-danger {
|
||||||
|
background-color: var(--color-danger);
|
||||||
|
border-color: var(--color-danger);
|
||||||
|
}
|
||||||
|
.button-danger:hover {
|
||||||
|
background-color: var(--color-danger-hover);
|
||||||
|
border-color: var(--color-danger-hover);
|
||||||
|
}
|
||||||
|
.button-danger:active {
|
||||||
|
background-color: #a52e22; /* Even darker red */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Smaller button variant for lists? */
|
||||||
|
.button-sm {
|
||||||
|
padding: 5px 10px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure buttons added by JS (like submit in public form) get styled */
|
||||||
|
#public-form button[type="submit"] {
|
||||||
|
/* Inherit .button styles if possible, otherwise redefine */
|
||||||
|
background-color: var(--color-primary);
|
||||||
|
color: white;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 10px 18px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
line-height: 1.5;
|
||||||
|
margin-top: 10px; /* Add some space above submit */
|
||||||
|
}
|
||||||
|
#public-form button[type="submit"]:hover {
|
||||||
|
background-color: #2c373f;
|
||||||
|
box-shadow: var(--shadow-sm);
|
||||||
|
}
|
||||||
|
#public-form button[type="submit"]:active {
|
||||||
|
background-color: #1e2a31;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Lists (Forms & Submissions) --- */
|
||||||
|
ul.styled-list {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin-top: 20px; /* Space below heading/button */
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.styled-list li {
|
||||||
|
background-color: #fcfcfc; /* Slightly off-white */
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
padding: 12px 16px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.styled-list li:hover {
|
||||||
|
background-color: #f5f5f5;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.styled-list li button {
|
||||||
|
margin-left: 16px; /* Space between text and button */
|
||||||
|
/* Use smaller button style */
|
||||||
|
padding: 5px 10px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
/* Inherit base button colors or use secondary */
|
||||||
|
background-color: var(--color-surface);
|
||||||
|
color: var(--color-primary);
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
ul.styled-list li button:hover {
|
||||||
|
background-color: #f8f8f8;
|
||||||
|
border-color: #d0d0d0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Specific styling for submissions list items */
|
||||||
|
ul.submissions li {
|
||||||
|
display: block; /* Allow pre tag to format */
|
||||||
|
background-color: var(--color-surface); /* White background for submissions */
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.submissions li pre {
|
||||||
|
white-space: pre-wrap; /* Wrap long lines */
|
||||||
|
word-wrap: break-word; /* Break long words */
|
||||||
|
background-color: #f9f9f9; /* Light grey background for code block */
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: var(--color-text);
|
||||||
|
max-height: 200px; /* Limit height */
|
||||||
|
overflow-y: auto; /* Add scroll if needed */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Status Area --- */
|
||||||
|
.status {
|
||||||
|
padding: 12px 16px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
font-weight: 500;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
display: none; /* Hide by default, JS shows it */
|
||||||
|
}
|
||||||
|
.status.success,
|
||||||
|
.status.error {
|
||||||
|
display: block; /* Show when class is added */
|
||||||
|
}
|
||||||
|
|
||||||
|
.status.success {
|
||||||
|
background-color: var(--color-success-bg);
|
||||||
|
color: var(--color-success);
|
||||||
|
border-color: var(--color-success); /* Darker green border */
|
||||||
|
}
|
||||||
|
.status.error {
|
||||||
|
background-color: var(--color-error-bg);
|
||||||
|
color: var(--color-error);
|
||||||
|
border-color: var(--color-error); /* Darker red border */
|
||||||
|
white-space: pre-wrap; /* Allow multi-line errors */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Utility --- */
|
||||||
|
.hidden {
|
||||||
|
display: none !important; /* Use !important to override potential inline styles if needed */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Responsive Adjustments (Basic) --- */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.container {
|
||||||
|
padding: 24px 16px;
|
||||||
|
}
|
||||||
|
h1.page-title {
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
h2.section-title {
|
||||||
|
font-size: 1.15rem;
|
||||||
|
}
|
||||||
|
ul.styled-list li {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
ul.styled-list li button {
|
||||||
|
margin-left: 0;
|
||||||
|
align-self: flex-end; /* Move button to bottom right */
|
||||||
|
}
|
||||||
|
form .inline-form-group {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: stretch; /* Make elements full width */
|
||||||
|
}
|
||||||
|
form .inline-form-group button {
|
||||||
|
width: 100%; /* Make button full width */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 576px) {
|
||||||
|
.content-card,
|
||||||
|
.section {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
.button {
|
||||||
|
padding: 8px 14px;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
}
|
@ -1,18 +0,0 @@
|
|||||||
import adapter from '@sveltejs/adapter-node';
|
|
||||||
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
|
||||||
|
|
||||||
/** @type {import('@sveltejs/kit').Config} */
|
|
||||||
const config = {
|
|
||||||
// Consult https://svelte.dev/docs/kit/integrations
|
|
||||||
// for more information about preprocessors
|
|
||||||
preprocess: vitePreprocess(),
|
|
||||||
|
|
||||||
kit: {
|
|
||||||
// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
|
|
||||||
// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
|
|
||||||
// See https://svelte.dev/docs/kit/adapters for more information about adapters.
|
|
||||||
adapter: adapter()
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default config;
|
|
@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "./.svelte-kit/tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"allowJs": true,
|
|
||||||
"checkJs": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"forceConsistentCasingInFileNames": true,
|
|
||||||
"resolveJsonModule": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"sourceMap": true,
|
|
||||||
"strict": true,
|
|
||||||
"moduleResolution": "bundler"
|
|
||||||
}
|
|
||||||
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
|
|
||||||
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
|
|
||||||
//
|
|
||||||
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
|
|
||||||
// from the referenced tsconfig.json - TypeScript does not merge them in
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
import { sveltekit } from '@sveltejs/kit/vite';
|
|
||||||
import { defineConfig } from 'vite';
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [sveltekit()]
|
|
||||||
});
|
|
101
src/auth.rs
Normal file
101
src/auth.rs
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
// src/auth.rs
|
||||||
|
use super::AppState;
|
||||||
|
use actix_web::error::{ErrorInternalServerError, ErrorUnauthorized}; // Specific error types
|
||||||
|
use actix_web::{
|
||||||
|
dev::Payload, http::header::AUTHORIZATION, web, Error as ActixWebError, FromRequest,
|
||||||
|
HttpRequest,
|
||||||
|
};
|
||||||
|
use futures::future::{ready, Ready};
|
||||||
|
use log; // Use the log crate
|
||||||
|
use rusqlite::Connection;
|
||||||
|
use std::sync::{Arc, Mutex}; // Import AppState from the parent module (main.rs likely)
|
||||||
|
|
||||||
|
// Represents an authenticated user via token
|
||||||
|
pub struct Auth {
|
||||||
|
pub user_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FromRequest for Auth {
|
||||||
|
// Use actix_web::Error for consistency in error handling within Actix
|
||||||
|
type Error = ActixWebError;
|
||||||
|
// Use Ready from futures 0.3
|
||||||
|
type Future = Ready<Result<Self, Self::Error>>;
|
||||||
|
|
||||||
|
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
|
||||||
|
// Extract database connection pool from application data
|
||||||
|
// Extract the *whole* AppState first
|
||||||
|
let app_state_result = req.app_data::<web::Data<AppState>>();
|
||||||
|
|
||||||
|
// Get the Arc<Mutex<Connection>> from AppState
|
||||||
|
let db_arc_mutex = match app_state_result {
|
||||||
|
// Access the 'db' field within the AppState
|
||||||
|
Some(data) => data.db.clone(), // Clone the Arc, not the Mutex or Connection
|
||||||
|
None => {
|
||||||
|
log::error!("Database connection missing in application data configuration.");
|
||||||
|
return ready(Err(ErrorInternalServerError(
|
||||||
|
"Internal server error (app configuration)",
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Extract Authorization header
|
||||||
|
let auth_header = req.headers().get(AUTHORIZATION);
|
||||||
|
|
||||||
|
if let Some(auth_header_value) = auth_header {
|
||||||
|
// Convert header value to string
|
||||||
|
if let Ok(auth_str) = auth_header_value.to_str() {
|
||||||
|
// Check if it starts with "Bearer "
|
||||||
|
if auth_str.starts_with("Bearer ") {
|
||||||
|
// Extract the token part
|
||||||
|
let token = &auth_str[7..];
|
||||||
|
|
||||||
|
// Lock the mutex to get access to the connection
|
||||||
|
// Handle potential mutex poisoning explicitly
|
||||||
|
let conn_guard = match db_arc_mutex.lock() {
|
||||||
|
Ok(guard) => guard,
|
||||||
|
Err(poisoned) => {
|
||||||
|
log::error!("Database mutex poisoned: {}", poisoned);
|
||||||
|
// Return internal server error if mutex is poisoned
|
||||||
|
return ready(Err(ErrorInternalServerError(
|
||||||
|
"Internal server error (database lock)",
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Validate the token against the database (now includes expiration check)
|
||||||
|
match super::db::validate_token(&conn_guard, token) {
|
||||||
|
// Token is valid and not expired, return Ok with Auth struct
|
||||||
|
Ok(Some(user_id)) => {
|
||||||
|
log::debug!("Token validated successfully for user_id: {}", user_id);
|
||||||
|
ready(Ok(Auth { user_id }))
|
||||||
|
}
|
||||||
|
// Token is invalid, not found, or expired
|
||||||
|
Ok(None) => {
|
||||||
|
log::warn!("Invalid or expired token received"); // Avoid logging token
|
||||||
|
ready(Err(ErrorUnauthorized("Invalid or expired token")))
|
||||||
|
}
|
||||||
|
// Database error during token validation
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Database error during token validation: {:?}", e);
|
||||||
|
// Return Unauthorized to avoid leaking internal error details
|
||||||
|
// Consider mapping specific DB errors if needed, but Unauthorized is generally safe
|
||||||
|
ready(Err(ErrorUnauthorized("Token validation failed")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Header present but not "Bearer " format
|
||||||
|
log::warn!("Invalid Authorization header format (not Bearer)");
|
||||||
|
ready(Err(ErrorUnauthorized("Invalid token format")))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Header value contains invalid characters
|
||||||
|
log::warn!("Authorization header contains invalid characters");
|
||||||
|
ready(Err(ErrorUnauthorized("Invalid token value")))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Authorization header is missing
|
||||||
|
log::warn!("Missing Authorization header");
|
||||||
|
ready(Err(ErrorUnauthorized("Missing authorization token")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
356
src/db.rs
Normal file
356
src/db.rs
Normal file
@ -0,0 +1,356 @@
|
|||||||
|
// src/db.rs
|
||||||
|
use anyhow::{anyhow, Context, Result as AnyhowResult};
|
||||||
|
use bcrypt::{hash, verify, DEFAULT_COST};
|
||||||
|
use chrono::{Duration as ChronoDuration, Utc}; // Use Utc for timestamps
|
||||||
|
use log; // Use the log crate
|
||||||
|
use rusqlite::{params, Connection, OptionalExtension};
|
||||||
|
use std::env;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::models;
|
||||||
|
|
||||||
|
// Configurable token lifetime (e.g., from environment variable or default)
|
||||||
|
const TOKEN_LIFETIME_HOURS: i64 = 24; // Default to 24 hours
|
||||||
|
|
||||||
|
// Initialize the database connection and create tables if they don't exist
|
||||||
|
pub fn init_db(database_url: &str) -> AnyhowResult<Connection> {
|
||||||
|
log::info!("Attempting to open or create database at: {}", database_url);
|
||||||
|
let conn = Connection::open(database_url)
|
||||||
|
.context(format!("Failed to open the database at {}", database_url))?;
|
||||||
|
|
||||||
|
log::debug!("Creating 'users' table if not exists...");
|
||||||
|
conn.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
username TEXT NOT NULL UNIQUE,
|
||||||
|
password TEXT NOT NULL, -- Stores bcrypt hashed password
|
||||||
|
token TEXT UNIQUE, -- Stores the current session token (UUID)
|
||||||
|
token_expires_at DATETIME -- Timestamp when the token expires
|
||||||
|
)",
|
||||||
|
[],
|
||||||
|
)
|
||||||
|
.context("Failed to create 'users' table")?;
|
||||||
|
|
||||||
|
log::debug!("Creating 'forms' table if not exists...");
|
||||||
|
conn.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS forms (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
fields TEXT NOT NULL, -- Stores JSON definition of form fields
|
||||||
|
notify_email TEXT, -- Optional email address for notifications
|
||||||
|
notify_ntfy_topic TEXT, -- Optional ntfy topic for notifications
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)",
|
||||||
|
[],
|
||||||
|
)
|
||||||
|
.context("Failed to create 'forms' table")?;
|
||||||
|
|
||||||
|
// Add notify_email column if it doesn't exist (for backward compatibility)
|
||||||
|
match conn.execute("ALTER TABLE forms ADD COLUMN notify_email TEXT", []) {
|
||||||
|
Ok(_) => log::info!("Added notify_email column to forms table"),
|
||||||
|
Err(e) => {
|
||||||
|
if !e.to_string().contains("duplicate column name") {
|
||||||
|
return Err(anyhow!("Failed to add notify_email column: {}", e));
|
||||||
|
}
|
||||||
|
// If it already exists, that's fine
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add notify_ntfy_topic column if it doesn't exist (for backward compatibility)
|
||||||
|
match conn.execute("ALTER TABLE forms ADD COLUMN notify_ntfy_topic TEXT", []) {
|
||||||
|
Ok(_) => log::info!("Added notify_ntfy_topic column to forms table"),
|
||||||
|
Err(e) => {
|
||||||
|
if !e.to_string().contains("duplicate column name") {
|
||||||
|
return Err(anyhow!("Failed to add notify_ntfy_topic column: {}", e));
|
||||||
|
}
|
||||||
|
// If it already exists, that's fine
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log::debug!("Creating 'submissions' table if not exists...");
|
||||||
|
conn.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS submissions (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
form_id TEXT NOT NULL,
|
||||||
|
data TEXT NOT NULL, -- Stores JSON submission data
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
FOREIGN KEY (form_id) REFERENCES forms (id) ON DELETE CASCADE
|
||||||
|
)",
|
||||||
|
[],
|
||||||
|
)
|
||||||
|
.context("Failed to create 'submissions' table")?;
|
||||||
|
|
||||||
|
// Setup the initial admin user if it doesn't exist, using environment variables
|
||||||
|
setup_initial_admin(&conn).context("Failed to setup initial admin user")?;
|
||||||
|
|
||||||
|
log::info!("Database initialization complete.");
|
||||||
|
Ok(conn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sets up the initial admin user from *required* environment variables if it doesn't exist
|
||||||
|
fn setup_initial_admin(conn: &Connection) -> AnyhowResult<()> {
|
||||||
|
// CRITICAL SECURITY CHANGE: Remove default credentials. Require env vars.
|
||||||
|
let initial_admin_username = env::var("INITIAL_ADMIN_USERNAME")
|
||||||
|
.map_err(|_| anyhow!("FATAL: INITIAL_ADMIN_USERNAME environment variable is not set."))?;
|
||||||
|
let initial_admin_password = env::var("INITIAL_ADMIN_PASSWORD")
|
||||||
|
.map_err(|_| anyhow!("FATAL: INITIAL_ADMIN_PASSWORD environment variable is not set."))?;
|
||||||
|
|
||||||
|
if initial_admin_username.is_empty() || initial_admin_password.is_empty() {
|
||||||
|
return Err(anyhow!(
|
||||||
|
"FATAL: INITIAL_ADMIN_USERNAME and INITIAL_ADMIN_PASSWORD must not be empty."
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check password complexity? (Optional enhancement)
|
||||||
|
|
||||||
|
add_user_if_not_exists(conn, &initial_admin_username, &initial_admin_password)
|
||||||
|
.context("Failed during initial admin user setup")?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adds a user with a hashed password if the username doesn't exist
|
||||||
|
pub fn add_user_if_not_exists(
|
||||||
|
conn: &Connection,
|
||||||
|
username: &str,
|
||||||
|
password: &str,
|
||||||
|
) -> AnyhowResult<bool> {
|
||||||
|
// Check if user already exists
|
||||||
|
let user_exists: bool = conn
|
||||||
|
.query_row(
|
||||||
|
"SELECT EXISTS(SELECT 1 FROM users WHERE username = ?1)",
|
||||||
|
params![username],
|
||||||
|
|row| row.get::<_, i32>(0),
|
||||||
|
)
|
||||||
|
.context(format!("Failed to check existence of user '{}'", username))?
|
||||||
|
== 1;
|
||||||
|
|
||||||
|
if user_exists {
|
||||||
|
log::debug!("User '{}' already exists, skipping creation.", username);
|
||||||
|
return Ok(false); // User already exists, nothing added
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate a UUID for the new user
|
||||||
|
let user_id = Uuid::new_v4().to_string();
|
||||||
|
|
||||||
|
// Hash the password using bcrypt
|
||||||
|
// Ensure the cost factor is appropriate for your security needs and hardware.
|
||||||
|
// Higher cost means slower hashing and verification, but better resistance to brute-force.
|
||||||
|
log::debug!(
|
||||||
|
"Hashing password for user '{}' with cost {}",
|
||||||
|
username,
|
||||||
|
DEFAULT_COST
|
||||||
|
);
|
||||||
|
let hashed_password = hash(password, DEFAULT_COST).context("Failed to hash password")?;
|
||||||
|
|
||||||
|
// Insert the new user (token and expiry are initially NULL)
|
||||||
|
log::info!("Creating new user '{}' with ID: {}", username, user_id);
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO users (id, username, password) VALUES (?1, ?2, ?3)",
|
||||||
|
params![user_id, username, hashed_password],
|
||||||
|
)
|
||||||
|
.context(format!("Failed to insert user '{}'", username))?;
|
||||||
|
|
||||||
|
Ok(true) // User was added
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate a session token and return the associated user ID if valid and not expired
|
||||||
|
pub fn validate_token(conn: &Connection, token: &str) -> AnyhowResult<Option<String>> {
|
||||||
|
log::debug!("Validating received token (existence and expiration)...");
|
||||||
|
let mut stmt = conn.prepare(
|
||||||
|
// Select user ID only if token matches AND it hasn't expired
|
||||||
|
"SELECT id FROM users WHERE token = ?1 AND token_expires_at IS NOT NULL AND token_expires_at > ?2"
|
||||||
|
).context("Failed to prepare query for validating token")?;
|
||||||
|
|
||||||
|
let now_ts = Utc::now().to_rfc3339(); // Use ISO 8601 / RFC 3339 format compatible with SQLite DATETIME
|
||||||
|
|
||||||
|
let user_id_option: Option<String> = stmt
|
||||||
|
.query_row(params![token, now_ts], |row| row.get(0))
|
||||||
|
.optional() // Makes it return Option instead of erroring on no rows
|
||||||
|
.context("Failed to execute query for validating token")?;
|
||||||
|
|
||||||
|
if user_id_option.is_some() {
|
||||||
|
log::debug!("Token validation successful.");
|
||||||
|
} else {
|
||||||
|
// This covers token not found OR token expired
|
||||||
|
log::debug!("Token validation failed (token not found or expired).");
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(user_id_option)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invalidate a user's token (e.g., on logout) by setting it to NULL and clearing expiration
|
||||||
|
pub fn invalidate_token(conn: &Connection, user_id: &str) -> AnyhowResult<()> {
|
||||||
|
log::debug!("Invalidating token for user_id {}", user_id);
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE users SET token = NULL, token_expires_at = NULL WHERE id = ?1",
|
||||||
|
params![user_id],
|
||||||
|
)
|
||||||
|
.context(format!(
|
||||||
|
"Failed to invalidate token for user_id {}",
|
||||||
|
user_id
|
||||||
|
))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Authenticate a user by username and password, returning user ID and hash if successful
|
||||||
|
pub fn authenticate_user(
|
||||||
|
conn: &Connection,
|
||||||
|
username: &str,
|
||||||
|
password: &str,
|
||||||
|
) -> AnyhowResult<Option<models::UserAuthData>> {
|
||||||
|
log::debug!("Attempting to authenticate user: {}", username);
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare("SELECT id, password FROM users WHERE username = ?1")
|
||||||
|
.context("Failed to prepare query for authenticating user")?;
|
||||||
|
|
||||||
|
let result = stmt
|
||||||
|
.query_row(params![username], |row| {
|
||||||
|
Ok(models::UserAuthData {
|
||||||
|
id: row.get(0)?,
|
||||||
|
hashed_password: row.get(1)?,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.optional()
|
||||||
|
.context(format!(
|
||||||
|
"Failed to execute query to fetch auth data for user '{}'",
|
||||||
|
username
|
||||||
|
))?;
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Some(user_data) => {
|
||||||
|
// Verify the provided password against the stored hash
|
||||||
|
let is_valid = verify(password, &user_data.hashed_password)
|
||||||
|
.context("Failed to verify password hash")?;
|
||||||
|
|
||||||
|
if is_valid {
|
||||||
|
log::info!("Authentication successful for user: {}", username);
|
||||||
|
Ok(Some(user_data)) // Return user ID and hash
|
||||||
|
} else {
|
||||||
|
log::warn!(
|
||||||
|
"Authentication failed for user '{}' (invalid password)",
|
||||||
|
username
|
||||||
|
);
|
||||||
|
Ok(None) // Invalid password
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
log::warn!(
|
||||||
|
"Authentication failed for user '{}' (user not found)",
|
||||||
|
username
|
||||||
|
);
|
||||||
|
Ok(None) // User not found
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate and save a new session token (with expiration) for a user
|
||||||
|
pub fn generate_and_set_token_for_user(conn: &Connection, user_id: &str) -> AnyhowResult<String> {
|
||||||
|
let new_token = Uuid::new_v4().to_string();
|
||||||
|
// Calculate expiration time
|
||||||
|
let expires_at = Utc::now() + ChronoDuration::hours(TOKEN_LIFETIME_HOURS);
|
||||||
|
let expires_at_ts = expires_at.to_rfc3339(); // Store as string
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"Generating new token for user_id {} expiring at {}",
|
||||||
|
user_id,
|
||||||
|
expires_at_ts
|
||||||
|
);
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE users SET token = ?1, token_expires_at = ?2 WHERE id = ?3",
|
||||||
|
params![new_token, expires_at_ts, user_id],
|
||||||
|
)
|
||||||
|
.context(format!("Failed to update token for user_id {}", user_id))?;
|
||||||
|
|
||||||
|
Ok(new_token)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch a specific form definition by its ID
|
||||||
|
pub fn get_form_definition(conn: &Connection, form_id: &str) -> AnyhowResult<Option<models::Form>> {
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare("SELECT id, name, fields, notify_email, notify_ntfy_topic, created_at FROM forms WHERE id = ?1")
|
||||||
|
.context("Failed to prepare query for fetching form")?;
|
||||||
|
|
||||||
|
let result = stmt
|
||||||
|
.query_row(params![form_id], |row| {
|
||||||
|
let id: String = row.get(0)?;
|
||||||
|
let name: String = row.get(1)?;
|
||||||
|
let fields_str: String = row.get(2)?;
|
||||||
|
let notify_email: Option<String> = row.get(3)?;
|
||||||
|
let notify_ntfy_topic: Option<String> = row.get(4)?; // Get the new field
|
||||||
|
let created_at: chrono::DateTime<chrono::Utc> = row.get(5)?;
|
||||||
|
|
||||||
|
// Parse the fields JSON string
|
||||||
|
let fields = serde_json::from_str(&fields_str).map_err(|e| {
|
||||||
|
rusqlite::Error::FromSqlConversionFailure(
|
||||||
|
2, // Index of 'fields' column
|
||||||
|
rusqlite::types::Type::Text,
|
||||||
|
Box::new(e),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(models::Form {
|
||||||
|
id: Some(id),
|
||||||
|
name,
|
||||||
|
fields,
|
||||||
|
notify_email,
|
||||||
|
notify_ntfy_topic, // Include the new field
|
||||||
|
created_at,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.optional()
|
||||||
|
.context(format!("Failed to fetch form with ID: {}", form_id))?;
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add a function to save a form
|
||||||
|
impl models::Form {
|
||||||
|
pub fn save(&self, conn: &Connection) -> AnyhowResult<()> {
|
||||||
|
let id = self
|
||||||
|
.id
|
||||||
|
.clone()
|
||||||
|
.unwrap_or_else(|| Uuid::new_v4().to_string());
|
||||||
|
let fields_json = serde_json::to_string(&self.fields)?;
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO forms (id, name, fields, notify_email, notify_ntfy_topic, created_at)
|
||||||
|
VALUES (?1, ?2, ?3, ?4, ?5, ?6)
|
||||||
|
ON CONFLICT(id) DO UPDATE SET
|
||||||
|
name = excluded.name,
|
||||||
|
fields = excluded.fields,
|
||||||
|
notify_email = excluded.notify_email,
|
||||||
|
notify_ntfy_topic = excluded.notify_ntfy_topic", // Update the new field on conflict
|
||||||
|
params![
|
||||||
|
id,
|
||||||
|
self.name,
|
||||||
|
fields_json,
|
||||||
|
self.notify_email,
|
||||||
|
self.notify_ntfy_topic, // Add the new field to params
|
||||||
|
self.created_at
|
||||||
|
],
|
||||||
|
)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_by_id(conn: &Connection, id: &str) -> AnyhowResult<Self> {
|
||||||
|
get_form_definition(conn, id)?.ok_or_else(|| anyhow!("Form not found: {}", id))
|
||||||
|
// Added ID to error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add a function to save a submission
|
||||||
|
impl models::Submission {
|
||||||
|
pub fn save(&self, conn: &Connection) -> AnyhowResult<()> {
|
||||||
|
let data_json = serde_json::to_string(&self.data)?;
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO submissions (id, form_id, data, created_at)
|
||||||
|
VALUES (?1, ?2, ?3, ?4)",
|
||||||
|
params![self.id, self.form_id, data_json, self.created_at],
|
||||||
|
)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
751
src/handlers.rs
Normal file
751
src/handlers.rs
Normal file
@ -0,0 +1,751 @@
|
|||||||
|
use crate::auth::Auth;
|
||||||
|
use crate::models::{Form, LoginCredentials, LoginResponse, Submission};
|
||||||
|
use crate::AppState;
|
||||||
|
use actix_web::{web, Error as ActixWebError, HttpResponse, Responder, Result as ActixResult};
|
||||||
|
use chrono; // Only import the module since we use it qualified
|
||||||
|
use log;
|
||||||
|
use regex::Regex; // For pattern validation
|
||||||
|
use rusqlite::{params, Connection};
|
||||||
|
use serde_json::{json, Map, Value as JsonValue}; // Alias for clarity
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
// --- Helper Function for Validation ---
|
||||||
|
|
||||||
|
/// Validates submission data against the form field definitions with enhanced checks.
|
||||||
|
///
|
||||||
|
/// Expected field definition properties:
|
||||||
|
/// - `name`: string (required)
|
||||||
|
/// - `type`: string (e.g., "string", "number", "boolean", "email", "url", "object", "array") (required)
|
||||||
|
/// - `required`: boolean (optional, default: false)
|
||||||
|
/// - `maxLength`: number (for "string" type)
|
||||||
|
/// - `minLength`: number (for "string" type)
|
||||||
|
/// - `min`: number (for "number" type)
|
||||||
|
/// - `max`: number (for "number" type)
|
||||||
|
/// - `pattern`: string (regex for "string", "email", "url" types)
|
||||||
|
///
|
||||||
|
/// Returns `Ok(())` if valid, or `Err(JsonValue)` containing validation errors.
|
||||||
|
fn validate_submission_against_definition(
|
||||||
|
submission_data: &JsonValue,
|
||||||
|
form_definition_fields: &JsonValue,
|
||||||
|
) -> Result<(), JsonValue> {
|
||||||
|
let mut errors: HashMap<String, String> = HashMap::new();
|
||||||
|
|
||||||
|
// Ensure 'fields' in the definition is a JSON array
|
||||||
|
let field_definitions = match form_definition_fields.as_array() {
|
||||||
|
Some(defs) => defs,
|
||||||
|
None => {
|
||||||
|
log::error!(
|
||||||
|
"Form definition 'fields' is not a JSON array. Def: {:?}",
|
||||||
|
form_definition_fields
|
||||||
|
);
|
||||||
|
errors.insert(
|
||||||
|
"_internal".to_string(),
|
||||||
|
"Invalid form definition format (not an array)".to_string(),
|
||||||
|
);
|
||||||
|
return Err(json!({ "validation_errors": errors }));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Ensure the submission data is a JSON object
|
||||||
|
let data_map = match submission_data.as_object() {
|
||||||
|
Some(map) => map,
|
||||||
|
None => {
|
||||||
|
errors.insert(
|
||||||
|
"_submission".to_string(),
|
||||||
|
"Submission data must be a JSON object".to_string(),
|
||||||
|
);
|
||||||
|
return Err(json!({ "validation_errors": errors }));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Build a map of valid field names to their definitions from the definition for quick lookup
|
||||||
|
let defined_field_names: HashMap<String, &Map<String, JsonValue>> = field_definitions
|
||||||
|
.iter()
|
||||||
|
.filter_map(|val| val.as_object())
|
||||||
|
.filter_map(|def| {
|
||||||
|
def.get("name")
|
||||||
|
.and_then(JsonValue::as_str)
|
||||||
|
.map(|name| (name.to_string(), def))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// 1. Check for submitted fields that are NOT in the definition
|
||||||
|
for submitted_key in data_map.keys() {
|
||||||
|
if !defined_field_names.contains_key(submitted_key) {
|
||||||
|
errors.insert(
|
||||||
|
submitted_key.clone(),
|
||||||
|
"Unexpected field submitted".to_string(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Exit early if unexpected fields were found
|
||||||
|
if !errors.is_empty() {
|
||||||
|
log::warn!("Submission validation failed: Unexpected fields submitted.");
|
||||||
|
return Err(json!({ "validation_errors": errors }));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Iterate through each field definition and validate corresponding submitted data
|
||||||
|
for (field_name, field_def) in &defined_field_names {
|
||||||
|
// Extract properties using helper functions for clarity
|
||||||
|
let field_type = field_def
|
||||||
|
.get("type")
|
||||||
|
.and_then(JsonValue::as_str)
|
||||||
|
.unwrap_or("string"); // Default to "string" if type is missing or not a string
|
||||||
|
let is_required = field_def
|
||||||
|
.get("required")
|
||||||
|
.and_then(JsonValue::as_bool)
|
||||||
|
.unwrap_or(false); // Default to false if required is missing or not a boolean
|
||||||
|
let min_length = field_def.get("minLength").and_then(JsonValue::as_u64);
|
||||||
|
let max_length = field_def.get("maxLength").and_then(JsonValue::as_u64);
|
||||||
|
let min_value = field_def.get("min").and_then(JsonValue::as_f64); // Use f64 for flexibility
|
||||||
|
let max_value = field_def.get("max").and_then(JsonValue::as_f64);
|
||||||
|
let pattern = field_def.get("pattern").and_then(JsonValue::as_str);
|
||||||
|
|
||||||
|
match data_map.get(field_name) {
|
||||||
|
Some(submitted_value) if !submitted_value.is_null() => {
|
||||||
|
// Field is present and not null, perform type and constraint checks
|
||||||
|
let mut type_error = None;
|
||||||
|
let mut constraint_errors = vec![];
|
||||||
|
|
||||||
|
match field_type {
|
||||||
|
"string" | "email" | "url" => {
|
||||||
|
if let Some(s) = submitted_value.as_str() {
|
||||||
|
if let Some(min) = min_length {
|
||||||
|
if (s.chars().count() as u64) < min {
|
||||||
|
// Use chars().count() for UTF-8 correctness
|
||||||
|
constraint_errors
|
||||||
|
.push(format!("Must be at least {} characters long", min));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(max) = max_length {
|
||||||
|
if (s.chars().count() as u64) > max {
|
||||||
|
constraint_errors.push(format!(
|
||||||
|
"Must be no more than {} characters long",
|
||||||
|
max
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(pat) = pattern {
|
||||||
|
// Consider caching compiled Regex if performance is critical
|
||||||
|
// and patterns are reused frequently across requests.
|
||||||
|
match Regex::new(pat) {
|
||||||
|
Ok(re) => {
|
||||||
|
if !re.is_match(s) {
|
||||||
|
constraint_errors.push(format!("Does not match required pattern"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => log::warn!("Invalid regex pattern '{}' in form definition for field '{}': {}", pat, field_name, e), // Log regex compilation error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Specific checks for email/url
|
||||||
|
if field_type == "email" {
|
||||||
|
// Basic email regex (adjust for stricter needs or use a validation crate)
|
||||||
|
// This regex is very basic and allows many technically invalid addresses.
|
||||||
|
// Consider crates like `validator` for more robust validation.
|
||||||
|
let email_regex =
|
||||||
|
Regex::new(r"^[^\s@]+@[^\s@]+\.[^\s@]+$").unwrap(); // Safe unwrap for known valid regex
|
||||||
|
if !email_regex.is_match(s) {
|
||||||
|
constraint_errors
|
||||||
|
.push("Must be a valid email address".to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if field_type == "url" {
|
||||||
|
// Basic URL check (consider `url` crate for robustness)
|
||||||
|
if url::Url::parse(s).is_err() {
|
||||||
|
constraint_errors.push("Must be a valid URL".to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
type_error = Some(format!("Expected a string for '{}'", field_name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"number" => {
|
||||||
|
// Use as_f64 for flexibility (handles integers and floats)
|
||||||
|
if let Some(num) = submitted_value.as_f64() {
|
||||||
|
if let Some(min) = min_value {
|
||||||
|
if num < min {
|
||||||
|
constraint_errors.push(format!("Must be at least {}", min));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(max) = max_value {
|
||||||
|
if num > max {
|
||||||
|
constraint_errors.push(format!("Must be no more than {}", max));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
type_error = Some(format!("Expected a number for '{}'", field_name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"boolean" => {
|
||||||
|
if !submitted_value.is_boolean() {
|
||||||
|
type_error = Some(format!(
|
||||||
|
"Expected a boolean (true/false) for '{}'",
|
||||||
|
field_name
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"object" => {
|
||||||
|
if !submitted_value.is_object() {
|
||||||
|
type_error =
|
||||||
|
Some(format!("Expected a JSON object for '{}'", field_name));
|
||||||
|
}
|
||||||
|
// TODO: Could add deeper validation for object structure here if needed based on definition
|
||||||
|
}
|
||||||
|
"array" => {
|
||||||
|
if !submitted_value.is_array() {
|
||||||
|
type_error =
|
||||||
|
Some(format!("Expected a JSON array for '{}'", field_name));
|
||||||
|
}
|
||||||
|
// TODO: Could add validation for array elements here if needed based on definition
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// Log unsupported types during development/debugging if necessary
|
||||||
|
log::trace!(
|
||||||
|
"Unsupported field type '{}' encountered during validation for field '{}'. Treating as valid.",
|
||||||
|
field_type,
|
||||||
|
field_name
|
||||||
|
);
|
||||||
|
// Assume valid if type is not specifically handled or unknown
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record errors found for this field
|
||||||
|
if let Some(err) = type_error {
|
||||||
|
errors.insert(field_name.clone(), err);
|
||||||
|
} else if !constraint_errors.is_empty() {
|
||||||
|
// Combine multiple constraint errors if necessary
|
||||||
|
errors.insert(field_name.clone(), constraint_errors.join("; "));
|
||||||
|
}
|
||||||
|
} // End check for present and non-null value
|
||||||
|
Some(_) => {
|
||||||
|
// Value is present but explicitly null (e.g., "fieldName": null)
|
||||||
|
if is_required {
|
||||||
|
errors.insert(
|
||||||
|
field_name.clone(),
|
||||||
|
"This field is required and cannot be null".to_string(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Otherwise, null is considered a valid (empty) value for non-required fields
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
// Field is missing entirely from the submission object
|
||||||
|
if is_required {
|
||||||
|
errors.insert(field_name.clone(), "This field is required".to_string());
|
||||||
|
}
|
||||||
|
// Missing is valid for non-required fields
|
||||||
|
}
|
||||||
|
} // End match data_map.get(field_name)
|
||||||
|
} // End loop through field definitions
|
||||||
|
|
||||||
|
// Check if any errors were collected
|
||||||
|
if errors.is_empty() {
|
||||||
|
Ok(()) // Validation passed
|
||||||
|
} else {
|
||||||
|
log::info!(
|
||||||
|
"Submission validation failed with {} error(s).", // Log only the count for brevity
|
||||||
|
errors.len()
|
||||||
|
);
|
||||||
|
// Return a JSON object containing the specific validation errors
|
||||||
|
Err(json!({ "validation_errors": errors }))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper function to convert anyhow::Error to actix_web::Error
|
||||||
|
fn anyhow_to_actix_error(e: anyhow::Error) -> ActixWebError {
|
||||||
|
actix_web::error::ErrorInternalServerError(e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Public Handlers ---
|
||||||
|
|
||||||
|
// POST /login
|
||||||
|
pub async fn login(
|
||||||
|
app_state: web::Data<AppState>, // Expect AppState like other handlers
|
||||||
|
creds: web::Json<LoginCredentials>,
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
// Clone the Arc<Mutex<Connection>> from AppState
|
||||||
|
let db_conn_arc = app_state.db.clone();
|
||||||
|
let username = creds.username.clone();
|
||||||
|
let password = creds.password.clone();
|
||||||
|
|
||||||
|
// Wrap the blocking database operations in web::block
|
||||||
|
let auth_result = web::block(move || {
|
||||||
|
// Use the cloned Arc here
|
||||||
|
let conn = db_conn_arc
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| anyhow::anyhow!("Database mutex poisoned during login lock"))?;
|
||||||
|
crate::db::authenticate_user(&conn, &username, &password)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("web::block error during authentication: {:?}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Authentication process failed (blocking error)")
|
||||||
|
})?
|
||||||
|
.map_err(anyhow_to_actix_error)?;
|
||||||
|
|
||||||
|
match auth_result {
|
||||||
|
Some(user_data) => {
|
||||||
|
// Clone Arc again for token generation, using the AppState db field
|
||||||
|
let db_conn_token_arc = app_state.db.clone();
|
||||||
|
let user_id = user_data.id.clone();
|
||||||
|
|
||||||
|
// Generate and store a new token within web::block
|
||||||
|
let token = web::block(move || {
|
||||||
|
// Use the cloned Arc here
|
||||||
|
let conn = db_conn_token_arc
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| anyhow::anyhow!("Database mutex poisoned during token lock"))?;
|
||||||
|
crate::db::generate_and_set_token_for_user(&conn, &user_id)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("web::block error during token generation: {:?}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError(
|
||||||
|
"Failed to complete login (token generation blocking error)",
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
.map_err(anyhow_to_actix_error)?;
|
||||||
|
|
||||||
|
log::info!("Login successful for user_id: {}", user_data.id);
|
||||||
|
Ok(HttpResponse::Ok().json(LoginResponse { token }))
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
log::warn!("Login failed for username: {}", creds.username);
|
||||||
|
// Return 401 Unauthorized for failed login attempts
|
||||||
|
Err(actix_web::error::ErrorUnauthorized(
|
||||||
|
"Invalid username or password",
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// POST /logout
|
||||||
|
pub async fn logout(
|
||||||
|
app_state: web::Data<AppState>, // Expect AppState
|
||||||
|
auth: Auth, // Requires authentication (extracts user_id from token)
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
log::info!("User {} requesting logout", auth.user_id);
|
||||||
|
let db_conn_arc = app_state.db.clone(); // Get db from AppState
|
||||||
|
let user_id = auth.user_id.clone();
|
||||||
|
|
||||||
|
// Invalidate the token in the database within web::block
|
||||||
|
web::block(move || {
|
||||||
|
let conn = db_conn_arc // Use the cloned Arc
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| anyhow::anyhow!("Database mutex poisoned during logout lock"))?;
|
||||||
|
crate::db::invalidate_token(&conn, &user_id)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
// Use the original auth.user_id here as user_id moved into the block
|
||||||
|
log::error!(
|
||||||
|
"web::block error during logout for user {}: {:?}",
|
||||||
|
auth.user_id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
actix_web::error::ErrorInternalServerError("Logout failed (blocking error)")
|
||||||
|
})?
|
||||||
|
.map_err(anyhow_to_actix_error)?;
|
||||||
|
|
||||||
|
log::info!("User {} logged out successfully", auth.user_id);
|
||||||
|
Ok(HttpResponse::Ok().json(json!({ "message": "Logged out successfully" })))
|
||||||
|
}
|
||||||
|
|
||||||
|
// POST /forms/{form_id}/submissions
|
||||||
|
pub async fn submit_form(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
path: web::Path<String>, // Extracts form_id from path
|
||||||
|
submission_payload: web::Json<JsonValue>, // Expect arbitrary JSON payload
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
let form_id = path.into_inner();
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!("Failed to acquire database lock: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Get form definition
|
||||||
|
let form = Form::get_by_id(&conn, &form_id).map_err(anyhow_to_actix_error)?;
|
||||||
|
|
||||||
|
// Validate submission against form definition
|
||||||
|
if let Err(validation_errors) =
|
||||||
|
validate_submission_against_definition(&submission_payload, &form.fields)
|
||||||
|
{
|
||||||
|
return Ok(HttpResponse::BadRequest().json(validation_errors));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create submission record
|
||||||
|
let submission = Submission {
|
||||||
|
id: Uuid::new_v4().to_string(),
|
||||||
|
form_id: form_id.clone(),
|
||||||
|
data: submission_payload.into_inner(),
|
||||||
|
created_at: chrono::Utc::now(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Save submission to database
|
||||||
|
submission.save(&conn).map_err(|e| {
|
||||||
|
log::error!("Failed to save submission: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Failed to save submission")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Send notifications if configured
|
||||||
|
if let Some(notify_email) = form.notify_email {
|
||||||
|
let email_subject = format!("New submission for form: {}", form.name);
|
||||||
|
let email_body = format!(
|
||||||
|
"A new submission has been received for form '{}'.\n\nSubmission ID: {}\nTimestamp: {}\n\nData:\n{}",
|
||||||
|
form.name,
|
||||||
|
submission.id,
|
||||||
|
submission.created_at,
|
||||||
|
serde_json::to_string_pretty(&submission.data).unwrap_or_default()
|
||||||
|
);
|
||||||
|
|
||||||
|
if let Err(e) = app_state
|
||||||
|
.notification_service
|
||||||
|
.send_email(¬ify_email, &email_subject, &email_body)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
log::warn!("Failed to send email notification: {}", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also send ntfy notification if configured (sends to the global topic)
|
||||||
|
if let Some(topic_flag) = &form.notify_ntfy_topic {
|
||||||
|
// Use field presence as a flag
|
||||||
|
if !topic_flag.is_empty() {
|
||||||
|
// Check if the flag string is non-empty
|
||||||
|
let ntfy_title = format!("New submission for: {}", form.name);
|
||||||
|
let ntfy_message = format!("Form: {}\nSubmission ID: {}", form.name, submission.id);
|
||||||
|
if let Err(e) = app_state.notification_service.send_ntfy(
|
||||||
|
&ntfy_title,
|
||||||
|
&ntfy_message,
|
||||||
|
Some(3), // Medium priority
|
||||||
|
) {
|
||||||
|
log::warn!("Failed to send ntfy notification (global topic): {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(HttpResponse::Created().json(json!({
|
||||||
|
"message": "Submission received",
|
||||||
|
"submission_id": submission.id
|
||||||
|
})))
|
||||||
|
}
|
||||||
|
|
||||||
|
// POST /forms
|
||||||
|
pub async fn create_form(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
_auth: Auth, // Authentication check via Auth extractor
|
||||||
|
payload: web::Json<serde_json::Value>,
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
let payload = payload.into_inner();
|
||||||
|
|
||||||
|
// Extract form data from payload
|
||||||
|
let name = payload["name"]
|
||||||
|
.as_str()
|
||||||
|
.ok_or_else(|| actix_web::error::ErrorBadRequest("Missing or invalid 'name' field"))?
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let fields = payload["fields"].clone();
|
||||||
|
if !fields.is_array() {
|
||||||
|
return Err(actix_web::error::ErrorBadRequest(
|
||||||
|
"'fields' must be a JSON array",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let notify_email = payload["notify_email"].as_str().map(|s| s.to_string());
|
||||||
|
let notify_ntfy_topic = payload["notify_ntfy_topic"].as_str().map(|s| s.to_string());
|
||||||
|
|
||||||
|
// Create new form
|
||||||
|
let form = Form {
|
||||||
|
id: None, // Will be generated during save
|
||||||
|
name,
|
||||||
|
fields,
|
||||||
|
notify_email,
|
||||||
|
notify_ntfy_topic,
|
||||||
|
created_at: chrono::Utc::now(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Save the form
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!("Failed to acquire database lock: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
form.save(&conn).map_err(|e| {
|
||||||
|
log::error!("Failed to save form: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Failed to save form")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(HttpResponse::Created().json(form))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GET /forms
|
||||||
|
pub async fn get_forms(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
auth: Auth, // Requires authentication
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
log::info!("User {} requesting list of forms", auth.user_id);
|
||||||
|
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!("Failed to acquire database lock: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare("SELECT id, name, fields, notify_email, notify_ntfy_topic, created_at FROM forms")
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("Failed to prepare statement: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let forms_iter = stmt
|
||||||
|
.query_map([], |row| {
|
||||||
|
let id: String = row.get(0)?;
|
||||||
|
let name: String = row.get(1)?;
|
||||||
|
let fields_str: String = row.get(2)?;
|
||||||
|
let notify_email: Option<String> = row.get(3)?;
|
||||||
|
let notify_ntfy_topic: Option<String> = row.get(4)?;
|
||||||
|
let created_at: chrono::DateTime<chrono::Utc> = row.get(5)?;
|
||||||
|
|
||||||
|
// Parse the 'fields' JSON string
|
||||||
|
let fields: serde_json::Value = serde_json::from_str(&fields_str).map_err(|e| {
|
||||||
|
log::error!(
|
||||||
|
"DB Parse Error: Failed to parse 'fields' JSON for form id {}: {}. Skipping this form.",
|
||||||
|
id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
rusqlite::Error::FromSqlConversionFailure(
|
||||||
|
2,
|
||||||
|
rusqlite::types::Type::Text,
|
||||||
|
Box::new(e),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(Form {
|
||||||
|
id: Some(id),
|
||||||
|
name,
|
||||||
|
fields,
|
||||||
|
notify_email,
|
||||||
|
notify_ntfy_topic,
|
||||||
|
created_at,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("Failed to execute query: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Collect results, filtering out rows that failed parsing
|
||||||
|
let forms: Vec<Form> = forms_iter
|
||||||
|
.filter_map(|result| match result {
|
||||||
|
Ok(form) => Some(form),
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("Skipping a form row due to a processing error: {}", e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
log::debug!("Returning {} forms for user {}", forms.len(), auth.user_id);
|
||||||
|
Ok(HttpResponse::Ok().json(forms))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GET /forms/{form_id}/submissions
|
||||||
|
pub async fn get_submissions(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
auth: Auth, // Requires authentication
|
||||||
|
path: web::Path<String>, // Extracts form_id from the path
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
let form_id = path.into_inner();
|
||||||
|
log::info!(
|
||||||
|
"User {} requesting submissions for form_id: {}",
|
||||||
|
auth.user_id,
|
||||||
|
form_id
|
||||||
|
);
|
||||||
|
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!("Failed to acquire database lock: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Check if the form exists
|
||||||
|
let _form = Form::get_by_id(&conn, &form_id).map_err(|e| {
|
||||||
|
if e.to_string().contains("not found") {
|
||||||
|
actix_web::error::ErrorNotFound("Form not found")
|
||||||
|
} else {
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Get submissions
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare(
|
||||||
|
"SELECT id, form_id, data, created_at FROM submissions WHERE form_id = ?1 ORDER BY created_at DESC",
|
||||||
|
)
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("Failed to prepare statement: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let submissions_iter = stmt
|
||||||
|
.query_map(params![form_id], |row| {
|
||||||
|
let id: String = row.get(0)?;
|
||||||
|
let form_id: String = row.get(1)?;
|
||||||
|
let data_str: String = row.get(2)?;
|
||||||
|
let created_at: chrono::DateTime<chrono::Utc> = row.get(3)?;
|
||||||
|
|
||||||
|
let data: serde_json::Value = serde_json::from_str(&data_str).map_err(|e| {
|
||||||
|
log::error!(
|
||||||
|
"DB Parse Error: Failed to parse 'data' JSON for submission_id {}: {}. Skipping.",
|
||||||
|
id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
rusqlite::Error::FromSqlConversionFailure(
|
||||||
|
2,
|
||||||
|
rusqlite::types::Type::Text,
|
||||||
|
Box::new(e),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(Submission {
|
||||||
|
id,
|
||||||
|
form_id,
|
||||||
|
data,
|
||||||
|
created_at,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.map_err(|e| {
|
||||||
|
log::error!("Failed to execute query: {}", e);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let submissions: Vec<Submission> = submissions_iter
|
||||||
|
.filter_map(|result| match result {
|
||||||
|
Ok(submission) => Some(submission),
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("Skipping a submission row due to processing error: {}", e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"Returning {} submissions for form {} requested by user {}",
|
||||||
|
submissions.len(),
|
||||||
|
form_id,
|
||||||
|
auth.user_id
|
||||||
|
);
|
||||||
|
Ok(HttpResponse::Ok().json(submissions))
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Notification Settings Handlers ---
|
||||||
|
|
||||||
|
// GET /forms/{form_id}/notifications
|
||||||
|
pub async fn get_notification_settings(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
auth: Auth, // Requires authentication
|
||||||
|
path: web::Path<String>,
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
let form_id = path.into_inner();
|
||||||
|
log::info!(
|
||||||
|
"User {} requesting notification settings for form_id: {}",
|
||||||
|
auth.user_id,
|
||||||
|
form_id
|
||||||
|
);
|
||||||
|
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!(
|
||||||
|
"Failed to acquire database lock for get_notification_settings: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Get the form to ensure it exists and retrieve current settings
|
||||||
|
let form = Form::get_by_id(&conn, &form_id).map_err(|e| {
|
||||||
|
log::warn!(
|
||||||
|
"Attempt to get settings for non-existent form {}: {}",
|
||||||
|
form_id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
if e.to_string().contains("not found") {
|
||||||
|
actix_web::error::ErrorNotFound("Form not found")
|
||||||
|
} else {
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error retrieving form")
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let settings = crate::models::NotificationSettingsPayload {
|
||||||
|
notify_email: form.notify_email,
|
||||||
|
notify_ntfy_topic: form.notify_ntfy_topic,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(HttpResponse::Ok().json(settings))
|
||||||
|
}
|
||||||
|
|
||||||
|
// PUT /forms/{form_id}/notifications
|
||||||
|
pub async fn update_notification_settings(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
auth: Auth, // Requires authentication
|
||||||
|
path: web::Path<String>,
|
||||||
|
payload: web::Json<crate::models::NotificationSettingsPayload>,
|
||||||
|
) -> ActixResult<impl Responder> {
|
||||||
|
let form_id = path.into_inner();
|
||||||
|
let new_settings = payload.into_inner();
|
||||||
|
log::info!(
|
||||||
|
"User {} updating notification settings for form_id: {}. Settings: {:?}",
|
||||||
|
auth.user_id,
|
||||||
|
form_id,
|
||||||
|
new_settings
|
||||||
|
);
|
||||||
|
|
||||||
|
let conn = app_state.db.lock().map_err(|e| {
|
||||||
|
log::error!(
|
||||||
|
"Failed to acquire database lock for update_notification_settings: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Fetch the existing form to update it
|
||||||
|
let mut form = Form::get_by_id(&conn, &form_id).map_err(|e| {
|
||||||
|
log::warn!(
|
||||||
|
"Attempt to update settings for non-existent form {}: {}",
|
||||||
|
form_id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
if e.to_string().contains("not found") {
|
||||||
|
actix_web::error::ErrorNotFound("Form not found")
|
||||||
|
} else {
|
||||||
|
actix_web::error::ErrorInternalServerError("Database error retrieving form")
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Update the form fields
|
||||||
|
form.notify_email = new_settings.notify_email;
|
||||||
|
form.notify_ntfy_topic = new_settings.notify_ntfy_topic;
|
||||||
|
|
||||||
|
// Save the updated form
|
||||||
|
form.save(&conn).map_err(|e| {
|
||||||
|
log::error!(
|
||||||
|
"Failed to save updated notification settings for form {}: {}",
|
||||||
|
form_id,
|
||||||
|
e
|
||||||
|
);
|
||||||
|
actix_web::error::ErrorInternalServerError("Failed to save notification settings")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
log::info!(
|
||||||
|
"Successfully updated notification settings for form {}",
|
||||||
|
form_id
|
||||||
|
);
|
||||||
|
Ok(HttpResponse::Ok().json(json!({ "message": "Notification settings updated successfully" })))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn health_check() -> impl Responder {
|
||||||
|
HttpResponse::Ok().json(serde_json::json!({
|
||||||
|
"status": "ok",
|
||||||
|
"version": env!("CARGO_PKG_VERSION"),
|
||||||
|
"timestamp": chrono::Utc::now().to_rfc3339()
|
||||||
|
}))
|
||||||
|
}
|
241
src/main.rs
Normal file
241
src/main.rs
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
// src/main.rs
|
||||||
|
use actix_cors::Cors;
|
||||||
|
use actix_files as fs;
|
||||||
|
use actix_route_rate_limiter::{Limiter, RateLimiter};
|
||||||
|
use actix_web::{http::header, middleware::Logger, web, App, HttpServer};
|
||||||
|
use config::{Config, Environment};
|
||||||
|
use dotenv::dotenv;
|
||||||
|
use std::env;
|
||||||
|
use std::io::Result as IoResult;
|
||||||
|
use std::process;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use std::time::Duration;
|
||||||
|
use tracing::{error, info, warn};
|
||||||
|
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
|
||||||
|
|
||||||
|
// Import modules
|
||||||
|
mod auth;
|
||||||
|
mod db;
|
||||||
|
mod handlers;
|
||||||
|
mod models;
|
||||||
|
mod notifications;
|
||||||
|
|
||||||
|
use notifications::{NotificationConfig, NotificationService};
|
||||||
|
|
||||||
|
// Application state that will be shared across all routes
|
||||||
|
pub struct AppState {
|
||||||
|
db: Arc<Mutex<rusqlite::Connection>>,
|
||||||
|
notification_service: Arc<NotificationService>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::main]
|
||||||
|
async fn main() -> IoResult<()> {
|
||||||
|
// Load environment variables from .env file
|
||||||
|
dotenv().ok();
|
||||||
|
|
||||||
|
// Initialize Sentry for error tracking
|
||||||
|
let _guard = sentry::init((
|
||||||
|
env::var("SENTRY_DSN").unwrap_or_default(),
|
||||||
|
sentry::ClientOptions {
|
||||||
|
release: sentry::release_name!(),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
));
|
||||||
|
|
||||||
|
// Initialize structured logging
|
||||||
|
tracing_subscriber::registry()
|
||||||
|
.with(tracing_subscriber::EnvFilter::new(
|
||||||
|
env::var("RUST_LOG").unwrap_or_else(|_| "info".into()),
|
||||||
|
))
|
||||||
|
.with(tracing_subscriber::fmt::layer())
|
||||||
|
.init();
|
||||||
|
|
||||||
|
// Load configuration
|
||||||
|
let settings = Config::builder()
|
||||||
|
.add_source(Environment::default())
|
||||||
|
.build()
|
||||||
|
.unwrap_or_else(|e| {
|
||||||
|
error!("Failed to load configuration: {}", e);
|
||||||
|
process::exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- Configuration (Environment Variables) ---
|
||||||
|
let database_url = settings.get_string("DATABASE_URL").unwrap_or_else(|_| {
|
||||||
|
warn!("DATABASE_URL environment variable not set. Defaulting to 'form_data.db'.");
|
||||||
|
"form_data.db".to_string()
|
||||||
|
});
|
||||||
|
|
||||||
|
let bind_address = settings.get_string("BIND_ADDRESS").unwrap_or_else(|_| {
|
||||||
|
warn!("BIND_ADDRESS environment variable not set. Defaulting to '127.0.0.1:8080'.");
|
||||||
|
"127.0.0.1:8080".to_string()
|
||||||
|
});
|
||||||
|
|
||||||
|
// Read allowed origins as a comma-separated string, defaulting to empty
|
||||||
|
let allowed_origins_str = env::var("ALLOWED_ORIGIN").unwrap_or_else(|_| {
|
||||||
|
warn!("ALLOWED_ORIGIN environment variable not set. CORS will be restrictive.");
|
||||||
|
String::new() // Default to empty string if not set
|
||||||
|
});
|
||||||
|
|
||||||
|
// Split the string into a vector of origins
|
||||||
|
let allowed_origins_list: Vec<String> = if allowed_origins_str.is_empty() {
|
||||||
|
Vec::new() // Return an empty vector if the string is empty
|
||||||
|
} else {
|
||||||
|
allowed_origins_str
|
||||||
|
.split(',')
|
||||||
|
.map(|s| s.trim().to_string()) // Trim whitespace and convert to String
|
||||||
|
.filter(|s| !s.is_empty()) // Remove empty strings resulting from extra commas
|
||||||
|
.collect()
|
||||||
|
};
|
||||||
|
|
||||||
|
info!(" --- Formies Backend Configuration ---");
|
||||||
|
info!("Required Environment Variables:");
|
||||||
|
info!(" - DATABASE_URL (Current: {})", database_url);
|
||||||
|
info!(" - BIND_ADDRESS (Current: {})", bind_address);
|
||||||
|
info!(" - INITIAL_ADMIN_USERNAME (Set during startup, MUST be present)");
|
||||||
|
info!(" - INITIAL_ADMIN_PASSWORD (Set during startup, MUST be present)");
|
||||||
|
info!("Optional Environment Variables:");
|
||||||
|
if !allowed_origins_list.is_empty() {
|
||||||
|
info!(
|
||||||
|
" - ALLOWED_ORIGIN (Set: {})",
|
||||||
|
allowed_origins_list.join(", ") // Log the list nicely
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
warn!(" - ALLOWED_ORIGIN (Not Set): CORS will be restrictive");
|
||||||
|
}
|
||||||
|
info!(" - RUST_LOG (e.g., 'info,formies_be=debug')");
|
||||||
|
info!(" --- End Configuration ---");
|
||||||
|
|
||||||
|
// Initialize database connection
|
||||||
|
let db_connection = match db::init_db(&database_url) {
|
||||||
|
Ok(conn) => conn,
|
||||||
|
Err(e) => {
|
||||||
|
if e.to_string().contains("INITIAL_ADMIN_USERNAME")
|
||||||
|
|| e.to_string().contains("INITIAL_ADMIN_PASSWORD")
|
||||||
|
{
|
||||||
|
error!("FATAL: {}", e);
|
||||||
|
error!("Please set the INITIAL_ADMIN_USERNAME and INITIAL_ADMIN_PASSWORD environment variables.");
|
||||||
|
} else {
|
||||||
|
error!(
|
||||||
|
"FATAL: Failed to initialize database at {}: {:?}",
|
||||||
|
database_url, e
|
||||||
|
);
|
||||||
|
}
|
||||||
|
process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initialize rate limiter using the correct fields
|
||||||
|
let limiter = Limiter {
|
||||||
|
ip_addresses: std::collections::HashMap::new(), // Stores IP request counts
|
||||||
|
duration: chrono::TimeDelta::from_std(Duration::from_secs(60)).expect("Invalid duration"), // Convert std::time::Duration
|
||||||
|
num_requests: 100, // Max requests allowed in the duration
|
||||||
|
};
|
||||||
|
// Create the cloneable Arc<Mutex<Limiter>> outside the closure
|
||||||
|
let limiter_data = Arc::new(Mutex::new(limiter));
|
||||||
|
|
||||||
|
// Initialize notification service
|
||||||
|
let notification_config = NotificationConfig::from_env().unwrap_or_else(|e| {
|
||||||
|
warn!(
|
||||||
|
"Failed to load notification configuration: {}. Notifications will not be available.",
|
||||||
|
e
|
||||||
|
);
|
||||||
|
NotificationConfig::default()
|
||||||
|
});
|
||||||
|
let notification_service = Arc::new(NotificationService::new(notification_config));
|
||||||
|
|
||||||
|
// Create AppState with both database and notification service
|
||||||
|
let app_state = web::Data::new(AppState {
|
||||||
|
db: Arc::new(Mutex::new(db_connection)),
|
||||||
|
notification_service: notification_service.clone(),
|
||||||
|
});
|
||||||
|
|
||||||
|
info!("Starting server at http://{}", bind_address);
|
||||||
|
|
||||||
|
HttpServer::new(move || {
|
||||||
|
let app_state = app_state.clone();
|
||||||
|
let allowed_origins = allowed_origins_list.clone();
|
||||||
|
let rate_limiter = RateLimiter::new(limiter_data.clone());
|
||||||
|
|
||||||
|
// Configure CORS
|
||||||
|
let cors = if !allowed_origins.is_empty() {
|
||||||
|
info!("Configuring CORS for origins: {:?}", allowed_origins);
|
||||||
|
let mut cors = Cors::default();
|
||||||
|
for origin in allowed_origins {
|
||||||
|
cors = cors.allowed_origin(&origin); // Add each origin
|
||||||
|
}
|
||||||
|
cors.allowed_methods(vec!["GET", "POST", "PUT", "DELETE", "OPTIONS"])
|
||||||
|
.allowed_headers(vec![
|
||||||
|
header::AUTHORIZATION,
|
||||||
|
header::ACCEPT,
|
||||||
|
header::CONTENT_TYPE,
|
||||||
|
header::ORIGIN,
|
||||||
|
header::ACCESS_CONTROL_REQUEST_METHOD,
|
||||||
|
header::ACCESS_CONTROL_REQUEST_HEADERS,
|
||||||
|
])
|
||||||
|
.supports_credentials()
|
||||||
|
.max_age(3600)
|
||||||
|
} else {
|
||||||
|
warn!("CORS is configured restrictively: No ALLOWED_ORIGIN set.");
|
||||||
|
Cors::default() // Keep restrictive default if no origins are provided
|
||||||
|
.allowed_methods(vec!["GET", "POST", "PUT", "DELETE", "OPTIONS"])
|
||||||
|
.allowed_headers(vec![
|
||||||
|
header::AUTHORIZATION,
|
||||||
|
header::ACCEPT,
|
||||||
|
header::CONTENT_TYPE,
|
||||||
|
header::ORIGIN,
|
||||||
|
header::ACCESS_CONTROL_REQUEST_METHOD,
|
||||||
|
header::ACCESS_CONTROL_REQUEST_HEADERS,
|
||||||
|
])
|
||||||
|
.supports_credentials()
|
||||||
|
.max_age(3600)
|
||||||
|
};
|
||||||
|
|
||||||
|
App::new()
|
||||||
|
.wrap(cors)
|
||||||
|
.wrap(Logger::default())
|
||||||
|
.wrap(tracing_actix_web::TracingLogger::default())
|
||||||
|
.wrap(rate_limiter)
|
||||||
|
.app_data(app_state)
|
||||||
|
.service(
|
||||||
|
web::scope("/api")
|
||||||
|
// Health check endpoint
|
||||||
|
.route("/health", web::get().to(handlers::health_check))
|
||||||
|
// Public routes
|
||||||
|
.route("/login", web::post().to(handlers::login))
|
||||||
|
.route(
|
||||||
|
"/forms/{form_id}/submissions",
|
||||||
|
web::post().to(handlers::submit_form),
|
||||||
|
)
|
||||||
|
// Protected routes
|
||||||
|
.route("/logout", web::post().to(handlers::logout))
|
||||||
|
.route("/forms", web::post().to(handlers::create_form))
|
||||||
|
.route("/forms", web::get().to(handlers::get_forms))
|
||||||
|
.route(
|
||||||
|
"/forms/{form_id}/submissions",
|
||||||
|
web::get().to(handlers::get_submissions),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/forms/{form_id}/notifications",
|
||||||
|
web::get().to(handlers::get_notification_settings),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/forms/{form_id}/notifications",
|
||||||
|
web::put().to(handlers::update_notification_settings),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.service(
|
||||||
|
fs::Files::new("/", "./frontend/")
|
||||||
|
.index_file("index.html")
|
||||||
|
.use_last_modified(true)
|
||||||
|
.default_handler(fs::NamedFile::open("./frontend/index.html").unwrap_or_else(
|
||||||
|
|_| {
|
||||||
|
error!("Fallback file not found: ../frontend/index.html");
|
||||||
|
process::exit(1);
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.bind(&bind_address)?
|
||||||
|
.run()
|
||||||
|
.await
|
||||||
|
}
|
76
src/models.rs
Normal file
76
src/models.rs
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
// src/models.rs
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
// Consider adding chrono for DateTime types if needed in responses
|
||||||
|
// use chrono::{DateTime, Utc};
|
||||||
|
|
||||||
|
// Represents the structure for defining a form
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
|
pub struct Form {
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub id: Option<String>,
|
||||||
|
pub name: String,
|
||||||
|
/// Stores the structure defining the form fields.
|
||||||
|
/// Expected to be a JSON array of field definition objects.
|
||||||
|
/// Example field definition object:
|
||||||
|
/// ```json
|
||||||
|
/// {
|
||||||
|
/// "name": "email", // String, required: Unique identifier for the field
|
||||||
|
/// "type": "email", // String, required: "string", "number", "boolean", "email", "url", "object", "array"
|
||||||
|
/// "label": "Email Address", // String, optional: User-friendly label
|
||||||
|
/// "required": true, // Boolean, optional (default: false): If the field must have a value
|
||||||
|
/// "placeholder": "you@example.com", // String, optional: Placeholder text
|
||||||
|
/// "minLength": 5, // Number, optional: Minimum length for strings
|
||||||
|
/// "maxLength": 100, // Number, optional: Maximum length for strings
|
||||||
|
/// "min": 0, // Number, optional: Minimum value for numbers
|
||||||
|
/// "max": 100, // Number, optional: Maximum value for numbers
|
||||||
|
/// "pattern": "^\\S+@\\S+\\.\\S+$" // String, optional: Regex pattern for strings (e.g., email, url types might use this implicitly or explicitly)
|
||||||
|
/// // Add other properties like "options" for select/radio, etc.
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub fields: serde_json::Value,
|
||||||
|
pub notify_email: Option<String>,
|
||||||
|
pub notify_ntfy_topic: Option<String>,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Represents a single submission for a specific form
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
|
pub struct Submission {
|
||||||
|
pub id: String,
|
||||||
|
pub form_id: String,
|
||||||
|
/// Stores the data submitted by the user.
|
||||||
|
/// Expected to be a JSON object where keys are field names (`name`) from the form definition's `fields` array.
|
||||||
|
/// Example: `{ "email": "user@example.com", "age": 30 }`
|
||||||
|
pub data: serde_json::Value,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used for the /login endpoint request body
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct LoginCredentials {
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used for the /login endpoint response body
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct LoginResponse {
|
||||||
|
pub token: String, // The session token (UUID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used internally to represent a user fetched from the DB for authentication check
|
||||||
|
// Not serialized, only used within db.rs and handlers.rs
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct UserAuthData {
|
||||||
|
pub id: String,
|
||||||
|
pub hashed_password: String,
|
||||||
|
// Note: Token and expiry are handled separately and not needed in this specific struct
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used for the GET/PUT /forms/{form_id}/notifications endpoints
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
pub struct NotificationSettingsPayload {
|
||||||
|
pub notify_email: Option<String>,
|
||||||
|
pub notify_ntfy_topic: Option<String>,
|
||||||
|
}
|
148
src/notifications.rs
Normal file
148
src/notifications.rs
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
use anyhow::Result;
|
||||||
|
use lettre::message::header::ContentType;
|
||||||
|
use lettre::transport::smtp::authentication::Credentials;
|
||||||
|
use lettre::{Message, SmtpTransport, Transport};
|
||||||
|
use serde::Serialize;
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
pub struct NotificationConfig {
|
||||||
|
smtp_host: String,
|
||||||
|
smtp_port: u16,
|
||||||
|
smtp_username: String,
|
||||||
|
smtp_password: String,
|
||||||
|
from_email: String,
|
||||||
|
ntfy_topic: String,
|
||||||
|
ntfy_server: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for NotificationConfig {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
smtp_host: String::new(),
|
||||||
|
smtp_port: 587,
|
||||||
|
smtp_username: String::new(),
|
||||||
|
smtp_password: String::new(),
|
||||||
|
from_email: String::new(),
|
||||||
|
ntfy_topic: String::new(),
|
||||||
|
ntfy_server: "https://ntfy.sh".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NotificationConfig {
|
||||||
|
pub fn from_env() -> Result<Self> {
|
||||||
|
Ok(Self {
|
||||||
|
smtp_host: env::var("SMTP_HOST")?,
|
||||||
|
smtp_port: env::var("SMTP_PORT")?.parse()?,
|
||||||
|
smtp_username: env::var("SMTP_USERNAME")?,
|
||||||
|
smtp_password: env::var("SMTP_PASSWORD")?,
|
||||||
|
from_email: env::var("FROM_EMAIL")?,
|
||||||
|
ntfy_topic: env::var("NTFY_TOPIC")?,
|
||||||
|
ntfy_server: env::var("NTFY_SERVER").unwrap_or_else(|_| "https://ntfy.sh".to_string()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_email_configured(&self) -> bool {
|
||||||
|
!self.smtp_host.is_empty()
|
||||||
|
&& !self.smtp_username.is_empty()
|
||||||
|
&& !self.smtp_password.is_empty()
|
||||||
|
&& !self.from_email.is_empty()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_ntfy_configured(&self) -> bool {
|
||||||
|
!self.ntfy_topic.is_empty()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct NotificationService {
|
||||||
|
config: NotificationConfig,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NotificationService {
|
||||||
|
pub fn new(config: NotificationConfig) -> Self {
|
||||||
|
Self { config }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn send_email(&self, to: &str, subject: &str, body: &str) -> Result<()> {
|
||||||
|
if !self.config.is_email_configured() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let email = Message::builder()
|
||||||
|
.from(self.config.from_email.parse()?)
|
||||||
|
.to(to.parse()?)
|
||||||
|
.subject(subject)
|
||||||
|
.header(ContentType::TEXT_PLAIN)
|
||||||
|
.body(body.to_string())?;
|
||||||
|
|
||||||
|
let creds = Credentials::new(
|
||||||
|
self.config.smtp_username.clone(),
|
||||||
|
self.config.smtp_password.clone(),
|
||||||
|
);
|
||||||
|
|
||||||
|
let mailer = SmtpTransport::relay(&self.config.smtp_host)?
|
||||||
|
.port(self.config.smtp_port)
|
||||||
|
.credentials(creds)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mailer.send(&email)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn send_ntfy(&self, title: &str, message: &str, priority: Option<u8>) -> Result<()> {
|
||||||
|
if !self.config.is_ntfy_configured() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = format!("{}/{}", self.config.ntfy_server, self.config.ntfy_topic);
|
||||||
|
|
||||||
|
let mut request = ureq::post(&url).set("Title", title);
|
||||||
|
|
||||||
|
if let Some(p) = priority {
|
||||||
|
request = request.set("Priority", &p.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
request.send_string(message)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_notification_config() {
|
||||||
|
std::env::set_var("SMTP_HOST", "smtp.example.com");
|
||||||
|
std::env::set_var("SMTP_PORT", "587");
|
||||||
|
std::env::set_var("SMTP_USERNAME", "test@example.com");
|
||||||
|
std::env::set_var("SMTP_PASSWORD", "password");
|
||||||
|
std::env::set_var("FROM_EMAIL", "noreply@example.com");
|
||||||
|
std::env::set_var("NTFY_TOPIC", "my-topic");
|
||||||
|
|
||||||
|
let config = NotificationConfig::from_env().unwrap();
|
||||||
|
assert_eq!(config.smtp_host, "smtp.example.com");
|
||||||
|
assert_eq!(config.smtp_port, 587);
|
||||||
|
assert_eq!(config.ntfy_server, "https://ntfy.sh");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_config_validation() {
|
||||||
|
let default_config = NotificationConfig::default();
|
||||||
|
assert!(!default_config.is_email_configured());
|
||||||
|
assert!(!default_config.is_ntfy_configured());
|
||||||
|
|
||||||
|
let config = NotificationConfig {
|
||||||
|
smtp_host: "smtp.example.com".to_string(),
|
||||||
|
smtp_port: 587,
|
||||||
|
smtp_username: "user".to_string(),
|
||||||
|
smtp_password: "pass".to_string(),
|
||||||
|
from_email: "test@example.com".to_string(),
|
||||||
|
ntfy_topic: "topic".to_string(),
|
||||||
|
ntfy_server: "https://ntfy.sh".to_string(),
|
||||||
|
};
|
||||||
|
assert!(config.is_email_configured());
|
||||||
|
assert!(config.is_ntfy_configured());
|
||||||
|
}
|
||||||
|
}
|
1
tests/handlers_test.rs
Normal file
1
tests/handlers_test.rs
Normal file
@ -0,0 +1 @@
|
|||||||
|
|
Loading…
Reference in New Issue
Block a user