mirror of
https://github.com/polaroi8d/cactoide.git
synced 2026-03-22 22:25:29 +00:00
Compare commits
61 Commits
feat/trans
...
fix/edit-e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7692f9d503 | ||
|
|
baf3fcd923 | ||
|
|
5468bc7cb2 | ||
|
|
0afe331cab | ||
|
|
fa9a79192c | ||
|
|
7275084ab9 | ||
|
|
02975a0abd | ||
|
|
aebe477f90 | ||
|
|
325237d414 | ||
|
|
24e9d8b626 | ||
|
|
05556eefdb | ||
|
|
2273ae50a4 | ||
|
|
e75c7e40dc | ||
|
|
2a96d3762c | ||
|
|
935042dd06 | ||
|
|
5809cb49ee | ||
|
|
93b0bac48a | ||
|
|
c9c78d0ea6 | ||
|
|
f6b51232a7 | ||
|
|
bb573c603a | ||
|
|
75fa7a9528 | ||
|
|
eb5543fb9b | ||
|
|
706e6cf712 | ||
|
|
c6decaa0d1 | ||
|
|
d193283b11 | ||
|
|
accfd540f0 | ||
|
|
9b1ef64618 | ||
|
|
c340088434 | ||
|
|
984c296725 | ||
|
|
9acfa08ea8 | ||
|
|
45cb95f6a8 | ||
|
|
8426bd5704 | ||
|
|
b9833db3bb | ||
|
|
b3572293ba | ||
|
|
c1752efe4b | ||
|
|
491d0020bd | ||
|
|
5c1182dc66 | ||
|
|
638b5ff1ca | ||
|
|
069ca11917 | ||
|
|
4675fa4623 | ||
|
|
af88d6462b | ||
|
|
ef6005e648 | ||
|
|
11875b4a1e | ||
|
|
22038f7779 | ||
|
|
de2cb07a15 | ||
|
|
ffc29b9c24 | ||
|
|
4860b9439c | ||
|
|
d10af13134 | ||
|
|
c98260efec | ||
|
|
a40b83c2b3 | ||
|
|
bfb76aa268 | ||
|
|
f8758d7b47 | ||
|
|
f51f89e35f | ||
|
|
26824eb3a8 | ||
|
|
d2024d31ba | ||
|
|
cc3c868f7d | ||
|
|
69a760d3f1 | ||
|
|
a59bc3601c | ||
|
|
b64d48a933 | ||
|
|
1a5eff4dbd | ||
|
|
1bbc4b590f |
13
.env.docker.example
Normal file
13
.env.docker.example
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Postgres configuration
|
||||||
|
POSTGRES_DB=cactoide_database
|
||||||
|
POSTGRES_USER=cactoide
|
||||||
|
POSTGRES_PASSWORD=cactoide_password
|
||||||
|
POSTGRES_PORT=5432
|
||||||
|
|
||||||
|
# Application configuration
|
||||||
|
DATABASE_URL="postgres://cactoide:cactoide_password@postgres:5432/cactoide_database"
|
||||||
|
APP_VERSION=latest
|
||||||
|
PORT=5173
|
||||||
|
HOSTNAME=0.0.0.0
|
||||||
|
|
||||||
|
PUBLIC_LANDING_INFO=true
|
||||||
10
.env.example
10
.env.example
@@ -4,12 +4,10 @@ POSTGRES_USER=cactoide
|
|||||||
POSTGRES_PASSWORD=cactoide_password
|
POSTGRES_PASSWORD=cactoide_password
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
|
|
||||||
# localhost
|
|
||||||
DATABASE_URL="postgres://cactoide:cactoide_password@localhost:5432/cactoide_database"
|
|
||||||
# docker
|
|
||||||
# DATABASE_URL="postgres://cactoide:cactoide_password@postgres:5432/cactoide_database"
|
|
||||||
|
|
||||||
# Application configuration
|
# Application configuration
|
||||||
|
DATABASE_URL="postgres://cactoide:cactoide_password@localhost:5432/cactoide_database"
|
||||||
APP_VERSION=latest
|
APP_VERSION=latest
|
||||||
PORT=3000
|
PORT=5173
|
||||||
HOSTNAME=0.0.0.0
|
HOSTNAME=0.0.0.0
|
||||||
|
|
||||||
|
PUBLIC_LANDING_INFO=true
|
||||||
|
|||||||
4
.github/workflows/build-and-push.yml
vendored
4
.github/workflows/build-and-push.yml
vendored
@@ -60,6 +60,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
|
build-args: |
|
||||||
|
PUBLIC_LANDING_INFO=${{ vars.PUBLIC_LANDING_INFO }}
|
||||||
|
LOG_PRETTY=${{ vars.LOG_PRETTY }}
|
||||||
|
LOG_LEVEL=${{ vars.LOG_LEVEL }}
|
||||||
push: true
|
push: true
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
|
|||||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -28,6 +28,10 @@ jobs:
|
|||||||
|
|
||||||
- name: Build application
|
- name: Build application
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
env:
|
||||||
|
PUBLIC_LANDING_INFO: ${{ vars.PUBLIC_LANDING_INFO }}
|
||||||
|
LOG_PRETTY: ${{ vars.LOG_PRETTY }}
|
||||||
|
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||||
|
|
||||||
- name: Test build output
|
- name: Test build output
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -17,6 +17,7 @@ Thumbs.db
|
|||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
!.env.test
|
!.env.test
|
||||||
|
!.env.docker.example
|
||||||
|
|
||||||
# Vite
|
# Vite
|
||||||
vite.config.js.timestamp-*
|
vite.config.js.timestamp-*
|
||||||
|
|||||||
14
Dockerfile
14
Dockerfile
@@ -3,25 +3,33 @@ WORKDIR /app
|
|||||||
COPY package*.json .
|
COPY package*.json .
|
||||||
|
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
|
|
||||||
|
ARG PUBLIC_LANDING_INFO
|
||||||
|
ENV PUBLIC_LANDING_INFO=$PUBLIC_LANDING_INFO
|
||||||
|
|
||||||
|
ARG LOG_PRETTY
|
||||||
|
ENV LOG_PRETTY=$LOG_PRETTY
|
||||||
|
|
||||||
|
ARG LOG_LEVEL
|
||||||
|
ENV LOG_LEVEL=$LOG_LEVEL
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
RUN npm prune --production
|
RUN npm prune --production
|
||||||
|
|
||||||
FROM node:20-alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=builder /app/build build/
|
COPY --from=builder /app/build build/
|
||||||
COPY --from=builder /app/node_modules node_modules/
|
COPY --from=builder /app/node_modules node_modules/
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
|
|
||||||
EXPOSE 3000
|
|
||||||
|
|
||||||
ENV PORT 3000
|
ENV PORT 3000
|
||||||
ENV HOSTNAME "0.0.0.0"
|
ENV HOSTNAME "0.0.0.0"
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
|
||||||
CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/healthz || exit 1
|
CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/healthz || exit 1
|
||||||
|
|
||||||
|
EXPOSE 3000
|
||||||
CMD [ "node", "build" ]
|
CMD [ "node", "build" ]
|
||||||
|
|||||||
90
Makefile
90
Makefile
@@ -1,21 +1,54 @@
|
|||||||
.PHONY: help build up db-only logs db-clean prune
|
.PHONY: help build up down db-only logs db-clean prune i18n lint format migrate-up migrate-down
|
||||||
|
|
||||||
|
# Database connection variables
|
||||||
|
DB_HOST ?= localhost
|
||||||
|
DB_PORT ?= 5432
|
||||||
|
DB_NAME ?= cactoide_database
|
||||||
|
DB_USER ?= cactoide
|
||||||
|
DB_PASSWORD ?= cactoide_password
|
||||||
|
|
||||||
|
# Migration variables
|
||||||
|
MIGRATIONS_DIR = database/migrations
|
||||||
|
|
||||||
|
# Database connection string
|
||||||
|
DB_URL = postgresql://$(DB_USER):$(DB_PASSWORD)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)
|
||||||
|
|
||||||
# Default target
|
|
||||||
help:
|
help:
|
||||||
@echo "Cactoide Commands"
|
@echo "Available commands:"
|
||||||
@echo ""
|
@echo " build - Docker build the application"
|
||||||
@echo "Main commands:"
|
@echo " up - Start all services"
|
||||||
@echo " make build - Build the Docker images"
|
@echo " down - Stop all services"
|
||||||
@echo " make up - Start all services (database + app)"
|
@echo " db-only - Start only the database"
|
||||||
@echo ""
|
@echo " logs - Show logs from all services"
|
||||||
@echo "Individual services:"
|
@echo " db-clean - Clean up all Docker resources"
|
||||||
@echo " make db-only - Start only the database"
|
@echo " prune - Clean up everything (containers, images, volumes)"
|
||||||
@echo ""
|
@echo " i18n - Validate translation files"
|
||||||
@echo "Utility commands:"
|
@echo " lint - Lint the project"
|
||||||
@echo " make logs - Show logs from all services"
|
@echo " format - Format the project"
|
||||||
@echo " make db-clean - Stop & remove database container"
|
@echo " migrate-up - Apply invite-only events migration"
|
||||||
@echo " make prune - Remove all containers, images, and volumes"
|
@echo " migrate-down - Rollback invite-only events migration"
|
||||||
@echo " make help - Show this help message"
|
|
||||||
|
# Apply invite-only events migration
|
||||||
|
migrate-up:
|
||||||
|
@echo "Applying invite-only events migration..."
|
||||||
|
@if [ -f "$(MIGRATIONS_DIR)/20241220_001_add_invite_only_events.sql" ]; then \
|
||||||
|
psql "$(DB_URL)" -f "$(MIGRATIONS_DIR)/20241220_001_add_invite_only_events.sql" && \
|
||||||
|
echo "Migration applied successfully!"; \
|
||||||
|
else \
|
||||||
|
echo "Migration file not found: $(MIGRATIONS_DIR)/20241220_001_add_invite_only_events.sql"; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Rollback invite-only events migration
|
||||||
|
migrate-down:
|
||||||
|
@echo "Rolling back invite-only events migration..."
|
||||||
|
@if [ -f "$(MIGRATIONS_DIR)/20241220_001_add_invite_only_events_rollback.sql" ]; then \
|
||||||
|
psql "$(DB_URL)" -f "$(MIGRATIONS_DIR)/20241220_001_add_invite_only_events_rollback.sql" && \
|
||||||
|
echo "Migration rolled back successfully!"; \
|
||||||
|
else \
|
||||||
|
echo "Rollback file not found: $(MIGRATIONS_DIR)/20241220_001_add_invite_only_events_rollback.sql"; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
|
||||||
# Build the Docker images
|
# Build the Docker images
|
||||||
build:
|
build:
|
||||||
@@ -27,6 +60,14 @@ up:
|
|||||||
@echo "Starting all services..."
|
@echo "Starting all services..."
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
|
down:
|
||||||
|
@echo "Stopping all services..."
|
||||||
|
docker compose down
|
||||||
|
|
||||||
|
db-clean:
|
||||||
|
@echo "Cleaning up all Docker resources..."
|
||||||
|
docker stop cactoide-db && docker rm cactoide-db && docker volume prune -f && docker network prune -f
|
||||||
|
|
||||||
# Start only the database
|
# Start only the database
|
||||||
db-only:
|
db-only:
|
||||||
@echo "Starting only the database..."
|
@echo "Starting only the database..."
|
||||||
@@ -37,9 +78,7 @@ logs:
|
|||||||
@echo "Showing logs from all services..."
|
@echo "Showing logs from all services..."
|
||||||
docker compose logs -f
|
docker compose logs -f
|
||||||
|
|
||||||
db-clean:
|
|
||||||
@echo "Cleaning up all Docker resources..."
|
|
||||||
docker stop cactoide-db && docker rm cactoide-db && docker volume prune -f && docker network prune -f
|
|
||||||
|
|
||||||
# Clean up everything (containers, images, volumes)
|
# Clean up everything (containers, images, volumes)
|
||||||
prune:
|
prune:
|
||||||
@@ -47,3 +86,16 @@ prune:
|
|||||||
docker compose down -v --rmi all
|
docker compose down -v --rmi all
|
||||||
|
|
||||||
|
|
||||||
|
lint:
|
||||||
|
@echo "Linting the project..."
|
||||||
|
npm run lint
|
||||||
|
|
||||||
|
format:
|
||||||
|
@echo "Formatting the project..."
|
||||||
|
npm run format
|
||||||
|
|
||||||
|
#TODO: not working yet
|
||||||
|
i18n:
|
||||||
|
@echo "Validating translation files..."
|
||||||
|
@if [ -n "$(FILE)" ]; then \
|
||||||
|
./scripts/i18n-check.sh $(FILE); \
|
||||||
|
|||||||
49
README.md
49
README.md
@@ -21,6 +21,7 @@ A mobile-first event RSVP platform that lets you create events, share unique URL
|
|||||||
- **🎯 Instant Event Creation** - Create events in seconds with our streamlined form. No accounts, no waiting, just pure efficiency.
|
- **🎯 Instant Event Creation** - Create events in seconds with our streamlined form. No accounts, no waiting, just pure efficiency.
|
||||||
- **🔗 One-Click Sharing** - Each event gets a unique, memorable URL. Share instantly via any platform or messaging app.
|
- **🔗 One-Click Sharing** - Each event gets a unique, memorable URL. Share instantly via any platform or messaging app.
|
||||||
- **🔍 All-in-One Clarity** - No more scrolling through endless chats and reactions. See everyone's availability and responses neatly in one place.
|
- **🔍 All-in-One Clarity** - No more scrolling through endless chats and reactions. See everyone's availability and responses neatly in one place.
|
||||||
|
- **📅 iCal Integration** - One-tap add-to-calendar via ICS/webcal links. Works with Apple Calendar, Google Calendar, and Outlook, with automatic time zone handling.
|
||||||
- **👤 No Hassle, No Sign-Ups** - Skip registrations and endless forms. Unlike other event platforms, you create and share instantly — no accounts, no barriers.
|
- **👤 No Hassle, No Sign-Ups** - Skip registrations and endless forms. Unlike other event platforms, you create and share instantly — no accounts, no barriers.
|
||||||
- **🛡️ Smart Limits** - Choose between unlimited RSVPs or set a limited capacity. Perfect for any event size.
|
- **🛡️ Smart Limits** - Choose between unlimited RSVPs or set a limited capacity. Perfect for any event size.
|
||||||
- **✨ Effortless Simplicity** - Designed to be instantly clear and easy. No learning curve — just open, create, and go.
|
- **✨ Effortless Simplicity** - Designed to be instantly clear and easy. No learning curve — just open, create, and go.
|
||||||
@@ -29,14 +30,14 @@ A mobile-first event RSVP platform that lets you create events, share unique URL
|
|||||||
|
|
||||||
#### Requirements
|
#### Requirements
|
||||||
|
|
||||||
`git, docker, docker-compose, node at least suggested 20.19.0`
|
`git`, `docker`, `docker-compose`, `node` at least suggested 20.19.0
|
||||||
|
|
||||||
Uses the [`docker-compose.yml`](docker-compose.yml) file to setup the application with the database. You can define all ENV variables in the [`.env`](.env.example) file from the `.env.example`.
|
Uses the [`docker-compose.yml`](docker-compose.yml) file to setup the application with the database. You can define all ENV variables in the [`.env`](.env.example) file from the `.env.example`.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/polaroi8d/cactoide/
|
git clone https://github.com/polaroi8d/cactoide/
|
||||||
cd cactoide
|
cd cactoide
|
||||||
cp env.example .env
|
cp .env.docker.example .env
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -45,7 +46,7 @@ docker compose up -d
|
|||||||
```bash
|
```bash
|
||||||
git clone https://github.com/polaroi8d/cactoide/
|
git clone https://github.com/polaroi8d/cactoide/
|
||||||
cd cactoide
|
cd cactoide
|
||||||
cp env.example .env
|
cp .env.example .env
|
||||||
make db-only
|
make db-only
|
||||||
npm run dev -- --open
|
npm run dev -- --open
|
||||||
```
|
```
|
||||||
@@ -54,8 +55,48 @@ Your app will be available at `http://localhost:5173`. You can use the Makefile
|
|||||||
|
|
||||||
Use the `database/seed.sql` if you want to populate your database with dummy data.
|
Use the `database/seed.sql` if you want to populate your database with dummy data.
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
#### 1. Landing page option
|
||||||
|
|
||||||
|
Supports a conditional landing page display based on the `PUBLIC_LANDING_INFO` environment variable. If you don't want to show your users the cactoide landing page, just use the `PUBLIC_LANDING_INFO=false` variable. This will automatically remove the landing home page and redirect users to the `/discover` page.
|
||||||
|
|
||||||
|
This is useful for:
|
||||||
|
|
||||||
|
- Creating a minimal discovery-focused experience
|
||||||
|
- Customizing the user journey based on deployment environment
|
||||||
|
|
||||||
|
#### 2. i18n
|
||||||
|
|
||||||
|
There is no proper i18n implemented, we have an `/i18n` folder with specific languages. To use an existing translation, just rename the language code JSON file to `messages.json` and you are ready to go. If you would like to add a new translation (which is really appreciated), just create a new `<language_code>.json` file and add the translations from the `messages.json`.
|
||||||
|
|
||||||
|
The project includes a translation validation script to ensure all translation files are complete and up-to-date with the source `messages.json` file.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Validate all translation files
|
||||||
|
make i18n
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Validate a specific translation file
|
||||||
|
make i18n FILE=src/lib/i18n/it.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Support
|
||||||
|
|
||||||
|
Cactoide is an open-source project licensed under `AGPL-3.0`. Its growth and development are possible thanks to the amazing support of the community. This project is the result of many late nights, weekends, and after-hours work.
|
||||||
|
|
||||||
|
It isn’t backed by a big company. Development depends on the support and generosity of people like you. With your help, I can focus more on making Cactoide even better and building tools that make coding more enjoyable.
|
||||||
|
|
||||||
|
You can support in a few ways:
|
||||||
|
|
||||||
|
- Send a one-time donation via [paypal.me/zenoazurben](paypal.me/zenoazurben)
|
||||||
|
- Reach me directly: leventeorb[@]gmail.com
|
||||||
|
|
||||||
|
If you enjoy using Cactoide, or if your business depends on it, please consider sponsoring its development. Your support keeps the project alive, improves it for everyone, and helps create educational content like blog posts and videos for the whole Cactoide community.
|
||||||
|
|
||||||
### License
|
### License
|
||||||
|
|
||||||
This project is licensed under the MIT License - see the [LICENSE](./LICENSE) file for details.
|
This project is licensed under the `AGPL-3.0 License` - see the [LICENSE](./LICENSE) file for details.
|
||||||
|
|
||||||
**Made with ❤️ by @polaroi8d**
|
**Made with ❤️ by @polaroi8d**
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ CREATE TABLE IF NOT EXISTS events (
|
|||||||
date DATE NOT NULL,
|
date DATE NOT NULL,
|
||||||
time TIME NOT NULL,
|
time TIME NOT NULL,
|
||||||
location VARCHAR(200) NOT NULL,
|
location VARCHAR(200) NOT NULL,
|
||||||
|
location_type VARCHAR(20) NOT NULL DEFAULT 'none' CHECK (location_type IN ('none','text','maps')),
|
||||||
|
location_url VARCHAR(500),
|
||||||
type VARCHAR(20) NOT NULL CHECK (type IN ('limited','unlimited')),
|
type VARCHAR(20) NOT NULL CHECK (type IN ('limited','unlimited')),
|
||||||
attendee_limit INTEGER CHECK (attendee_limit > 0),
|
attendee_limit INTEGER CHECK (attendee_limit > 0),
|
||||||
user_id VARCHAR(100) NOT NULL,
|
user_id VARCHAR(100) NOT NULL,
|
||||||
@@ -37,24 +39,8 @@ CREATE TABLE IF NOT EXISTS rsvps (
|
|||||||
-- =======================================
|
-- =======================================
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_user_id ON events(user_id);
|
CREATE INDEX IF NOT EXISTS idx_events_user_id ON events(user_id);
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_date ON events(date);
|
CREATE INDEX IF NOT EXISTS idx_events_date ON events(date);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_events_location_type ON events(location_type);
|
||||||
CREATE INDEX IF NOT EXISTS idx_rsvps_event_id ON rsvps(event_id);
|
CREATE INDEX IF NOT EXISTS idx_rsvps_event_id ON rsvps(event_id);
|
||||||
CREATE INDEX IF NOT EXISTS idx_rsvps_user_id ON rsvps(user_id);
|
CREATE INDEX IF NOT EXISTS idx_rsvps_user_id ON rsvps(user_id);
|
||||||
|
|
||||||
-- =======================================
|
|
||||||
-- Triggers (updated_at maintenance)
|
|
||||||
-- =======================================
|
|
||||||
CREATE OR REPLACE FUNCTION update_updated_at_column()
|
|
||||||
RETURNS TRIGGER AS $$
|
|
||||||
BEGIN
|
|
||||||
NEW.updated_at = NOW();
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$$ LANGUAGE plpgsql;
|
|
||||||
|
|
||||||
DROP TRIGGER IF EXISTS update_events_updated_at ON events;
|
|
||||||
CREATE TRIGGER update_events_updated_at
|
|
||||||
BEFORE UPDATE ON events
|
|
||||||
FOR EACH ROW
|
|
||||||
EXECUTE FUNCTION update_updated_at_column();
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
25
database/migrations/20241220_001_add_invite_only_events.sql
Normal file
25
database/migrations/20241220_001_add_invite_only_events.sql
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
-- Migration: Add invite-only events feature
|
||||||
|
-- Created: 2024-12-20
|
||||||
|
-- Description: Adds invite-only visibility option and invite tokens table
|
||||||
|
|
||||||
|
-- Add 'invite-only' to the visibility enum
|
||||||
|
ALTER TABLE events
|
||||||
|
DROP CONSTRAINT IF EXISTS events_visibility_check;
|
||||||
|
|
||||||
|
ALTER TABLE events
|
||||||
|
ADD CONSTRAINT events_visibility_check
|
||||||
|
CHECK (visibility IN ('public', 'private', 'invite-only'));
|
||||||
|
|
||||||
|
-- Create invite_tokens table
|
||||||
|
CREATE TABLE IF NOT EXISTS invite_tokens (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
event_id VARCHAR(8) NOT NULL REFERENCES events(id) ON DELETE CASCADE,
|
||||||
|
token VARCHAR(32) NOT NULL UNIQUE,
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Create indexes for invite_tokens table
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_invite_tokens_event_id ON invite_tokens(event_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_invite_tokens_token ON invite_tokens(token);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_invite_tokens_expires_at ON invite_tokens(expires_at);
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Rollback Migration: Remove invite-only events feature
|
||||||
|
-- Created: 2024-12-20
|
||||||
|
-- Description: Removes invite-only visibility option and invite tokens table
|
||||||
|
|
||||||
|
-- Drop invite_tokens table and its indexes
|
||||||
|
DROP INDEX IF EXISTS idx_invite_tokens_expires_at;
|
||||||
|
DROP INDEX IF EXISTS idx_invite_tokens_token;
|
||||||
|
DROP INDEX IF EXISTS idx_invite_tokens_event_id;
|
||||||
|
DROP TABLE IF EXISTS invite_tokens;
|
||||||
|
|
||||||
|
-- Revert visibility enum to original values
|
||||||
|
ALTER TABLE events
|
||||||
|
DROP CONSTRAINT IF EXISTS events_visibility_check;
|
||||||
|
|
||||||
|
ALTER TABLE events
|
||||||
|
ADD CONSTRAINT events_visibility_check
|
||||||
|
CHECK (visibility IN ('public', 'private'));
|
||||||
431
package-lock.json
generated
431
package-lock.json
generated
@@ -1,16 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "event-cactus",
|
"name": "cactoide",
|
||||||
"version": "0.0.1",
|
"version": "0.1.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "event-cactus",
|
"name": "cactoide",
|
||||||
"version": "0.0.1",
|
"version": "0.1.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sveltejs/adapter-node": "^5.3.1",
|
"@sveltejs/adapter-node": "^5.3.1",
|
||||||
"drizzle-orm": "^0.44.5",
|
"drizzle-orm": "^0.44.5",
|
||||||
"fuse.js": "^7.1.0",
|
"fuse.js": "^7.1.0",
|
||||||
|
"pino": "^10.1.0",
|
||||||
|
"pino-pretty": "^13.1.2",
|
||||||
"postgres": "^3.4.7"
|
"postgres": "^3.4.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -22,7 +24,12 @@
|
|||||||
"@tailwindcss/forms": "^0.5.9",
|
"@tailwindcss/forms": "^0.5.9",
|
||||||
"@tailwindcss/typography": "^0.5.15",
|
"@tailwindcss/typography": "^0.5.15",
|
||||||
"@tailwindcss/vite": "^4.0.0",
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"drizzle-kit": "^0.31.5",
|
||||||
|
=======
|
||||||
|
"@types/node": "^24.9.1",
|
||||||
"drizzle-kit": "^0.31.4",
|
"drizzle-kit": "^0.31.4",
|
||||||
|
>>>>>>> 222c2ee (feat: add pino logger for serverside)
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
"eslint-plugin-svelte": "^3.0.0",
|
"eslint-plugin-svelte": "^3.0.0",
|
||||||
@@ -35,7 +42,7 @@
|
|||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"typescript-eslint": "^8.20.0",
|
"typescript-eslint": "^8.20.0",
|
||||||
"vite": "^7.0.4"
|
"vite": "^7.1.11"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@drizzle-team/brocli": {
|
"node_modules/@drizzle-team/brocli": {
|
||||||
@@ -1231,6 +1238,12 @@
|
|||||||
"node": ">= 8"
|
"node": ">= 8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@pinojs/redact": {
|
||||||
|
"version": "0.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@pinojs/redact/-/redact-0.4.0.tgz",
|
||||||
|
"integrity": "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@polka/url": {
|
"node_modules/@polka/url": {
|
||||||
"version": "1.0.0-next.29",
|
"version": "1.0.0-next.29",
|
||||||
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
|
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
|
||||||
@@ -1643,6 +1656,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.30.1.tgz",
|
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.30.1.tgz",
|
||||||
"integrity": "sha512-LyRpQmokZdMK4QOlGBbLX12c37IRnvC3rE6ysA4gLmBWMx5mheeEEjkZZXhtIL9Lze0BgMttaALFoROTx+kbEw==",
|
"integrity": "sha512-LyRpQmokZdMK4QOlGBbLX12c37IRnvC3rE6ysA4gLmBWMx5mheeEEjkZZXhtIL9Lze0BgMttaALFoROTx+kbEw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@standard-schema/spec": "^1.0.0",
|
"@standard-schema/spec": "^1.0.0",
|
||||||
"@sveltejs/acorn-typescript": "^1.0.5",
|
"@sveltejs/acorn-typescript": "^1.0.5",
|
||||||
@@ -1675,6 +1689,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.2.tgz",
|
||||||
"integrity": "sha512-7v+7OkUYelC2dhhYDAgX1qO2LcGscZ18Hi5kKzJQq7tQeXpH215dd0+J/HnX2zM5B3QKcIrTVqCGkZXAy5awYw==",
|
"integrity": "sha512-7v+7OkUYelC2dhhYDAgX1qO2LcGscZ18Hi5kKzJQq7tQeXpH215dd0+J/HnX2zM5B3QKcIrTVqCGkZXAy5awYw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
|
"@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
|
||||||
"debug": "^4.4.1",
|
"debug": "^4.4.1",
|
||||||
@@ -1949,6 +1964,66 @@
|
|||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
|
||||||
|
"version": "1.4.5",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@emnapi/wasi-threads": "1.0.4",
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
|
||||||
|
"version": "1.4.5",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
|
||||||
|
"version": "1.0.4",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
|
||||||
|
"version": "0.2.12",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@emnapi/core": "^1.4.3",
|
||||||
|
"@emnapi/runtime": "^1.4.3",
|
||||||
|
"@tybys/wasm-util": "^0.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
|
||||||
|
"version": "0.10.0",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
|
||||||
|
"version": "2.8.0",
|
||||||
|
"dev": true,
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "0BSD",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
|
"node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
|
||||||
"version": "4.1.12",
|
"version": "4.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.12.tgz",
|
"resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.12.tgz",
|
||||||
@@ -2033,17 +2108,20 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "24.3.0",
|
"version": "24.9.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
|
||||||
"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
|
"integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
|
||||||
|
"devOptional": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
|
||||||
"peer": true,
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~7.10.0"
|
"undici-types": "~7.16.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
>>>>>>> 222c2ee (feat: add pino logger for serverside)
|
||||||
"node_modules/@types/resolve": {
|
"node_modules/@types/resolve": {
|
||||||
"version": "1.20.2",
|
"version": "1.20.2",
|
||||||
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
|
||||||
@@ -2096,6 +2174,7 @@
|
|||||||
"integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==",
|
"integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@typescript-eslint/scope-manager": "8.39.1",
|
"@typescript-eslint/scope-manager": "8.39.1",
|
||||||
"@typescript-eslint/types": "8.39.1",
|
"@typescript-eslint/types": "8.39.1",
|
||||||
@@ -2313,6 +2392,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
|
||||||
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"acorn": "bin/acorn"
|
"acorn": "bin/acorn"
|
||||||
},
|
},
|
||||||
@@ -2379,6 +2459,15 @@
|
|||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/atomic-sleep": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/axobject-query": {
|
"node_modules/axobject-query": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
|
||||||
@@ -2508,6 +2597,12 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/colorette": {
|
||||||
|
"version": "2.0.20",
|
||||||
|
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
|
||||||
|
"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/commondir": {
|
"node_modules/commondir": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
|
||||||
@@ -2558,6 +2653,15 @@
|
|||||||
"node": ">=4"
|
"node": ">=4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/dateformat": {
|
||||||
|
"version": "4.6.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
|
||||||
|
"integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.4.1",
|
"version": "4.4.1",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
|
||||||
@@ -2602,15 +2706,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/devalue": {
|
"node_modules/devalue": {
|
||||||
"version": "5.1.1",
|
"version": "5.4.1",
|
||||||
"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.4.1.tgz",
|
||||||
"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
|
"integrity": "sha512-YtoaOfsqjbZQKGIMRYDWKjUmSB4VJ/RElB+bXZawQAQYAo4xu08GKTMVlsZDTF6R2MbAgjcAQRPI5eIyRAT2OQ==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/drizzle-kit": {
|
"node_modules/drizzle-kit": {
|
||||||
"version": "0.31.4",
|
"version": "0.31.5",
|
||||||
"resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.4.tgz",
|
"resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.5.tgz",
|
||||||
"integrity": "sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA==",
|
"integrity": "sha512-+CHgPFzuoTQTt7cOYCV6MOw2w8vqEn/ap1yv4bpZOWL03u7rlVRQhUY0WYT3rHsgVTXwYQDZaSUJSQrMBUKuWg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -2748,6 +2852,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/end-of-stream": {
|
||||||
|
"version": "1.4.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
|
||||||
|
"integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"once": "^1.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/enhanced-resolve": {
|
"node_modules/enhanced-resolve": {
|
||||||
"version": "5.18.3",
|
"version": "5.18.3",
|
||||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
|
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
|
||||||
@@ -2768,6 +2881,7 @@
|
|||||||
"integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
|
"integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"esbuild": "bin/esbuild"
|
"esbuild": "bin/esbuild"
|
||||||
},
|
},
|
||||||
@@ -2835,6 +2949,7 @@
|
|||||||
"integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
|
"integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.2.0",
|
"@eslint-community/eslint-utils": "^4.2.0",
|
||||||
"@eslint-community/regexpp": "^4.12.1",
|
"@eslint-community/regexpp": "^4.12.1",
|
||||||
@@ -3055,6 +3170,12 @@
|
|||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/fast-copy": {
|
||||||
|
"version": "3.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
|
||||||
|
"integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/fast-deep-equal": {
|
"node_modules/fast-deep-equal": {
|
||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
|
||||||
@@ -3106,6 +3227,12 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/fast-safe-stringify": {
|
||||||
|
"version": "2.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
|
||||||
|
"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/fastq": {
|
"node_modules/fastq": {
|
||||||
"version": "1.19.1",
|
"version": "1.19.1",
|
||||||
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
|
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
|
||||||
@@ -3304,6 +3431,12 @@
|
|||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/help-me": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/ignore": {
|
"node_modules/ignore": {
|
||||||
"version": "5.3.2",
|
"version": "5.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||||
@@ -3421,6 +3554,15 @@
|
|||||||
"jiti": "lib/jiti-cli.mjs"
|
"jiti": "lib/jiti-cli.mjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/joycon": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/js-yaml": {
|
"node_modules/js-yaml": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
||||||
@@ -3846,6 +3988,15 @@
|
|||||||
"node": "*"
|
"node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/minimist": {
|
||||||
|
"version": "1.2.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
|
||||||
|
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/minipass": {
|
"node_modules/minipass": {
|
||||||
"version": "7.1.2",
|
"version": "7.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
|
||||||
@@ -3934,6 +4085,24 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/on-exit-leak-free": {
|
||||||
|
"version": "2.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
|
||||||
|
"integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/once": {
|
||||||
|
"version": "1.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||||
|
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"wrappy": "1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/optionator": {
|
"node_modules/optionator": {
|
||||||
"version": "0.9.4",
|
"version": "0.9.4",
|
||||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
|
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
|
||||||
@@ -4041,6 +4210,79 @@
|
|||||||
"url": "https://github.com/sponsors/jonschlinkert"
|
"url": "https://github.com/sponsors/jonschlinkert"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/pino": {
|
||||||
|
"version": "10.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
|
||||||
|
"integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@pinojs/redact": "^0.4.0",
|
||||||
|
"atomic-sleep": "^1.0.0",
|
||||||
|
"on-exit-leak-free": "^2.1.0",
|
||||||
|
"pino-abstract-transport": "^2.0.0",
|
||||||
|
"pino-std-serializers": "^7.0.0",
|
||||||
|
"process-warning": "^5.0.0",
|
||||||
|
"quick-format-unescaped": "^4.0.3",
|
||||||
|
"real-require": "^0.2.0",
|
||||||
|
"safe-stable-stringify": "^2.3.1",
|
||||||
|
"sonic-boom": "^4.0.1",
|
||||||
|
"thread-stream": "^3.0.0"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"pino": "bin.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/pino-abstract-transport": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"split2": "^4.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/pino-pretty": {
|
||||||
|
"version": "13.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.1.2.tgz",
|
||||||
|
"integrity": "sha512-3cN0tCakkT4f3zo9RXDIhy6GTvtYD6bK4CRBLN9j3E/ePqN1tugAXD5rGVfoChW6s0hiek+eyYlLNqc/BG7vBQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"colorette": "^2.0.7",
|
||||||
|
"dateformat": "^4.6.3",
|
||||||
|
"fast-copy": "^3.0.2",
|
||||||
|
"fast-safe-stringify": "^2.1.1",
|
||||||
|
"help-me": "^5.0.0",
|
||||||
|
"joycon": "^3.1.1",
|
||||||
|
"minimist": "^1.2.6",
|
||||||
|
"on-exit-leak-free": "^2.1.0",
|
||||||
|
"pino-abstract-transport": "^2.0.0",
|
||||||
|
"pump": "^3.0.0",
|
||||||
|
"secure-json-parse": "^4.0.0",
|
||||||
|
"sonic-boom": "^4.0.1",
|
||||||
|
"strip-json-comments": "^5.0.2"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"pino-pretty": "bin.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/pino-pretty/node_modules/strip-json-comments": {
|
||||||
|
"version": "5.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.3.tgz",
|
||||||
|
"integrity": "sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.16"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/pino-std-serializers": {
|
||||||
|
"version": "7.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
|
||||||
|
"integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.6",
|
"version": "8.5.6",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
|
||||||
@@ -4060,6 +4302,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.11",
|
"nanoid": "^3.3.11",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
@@ -4182,6 +4425,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.7.tgz",
|
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.7.tgz",
|
||||||
"integrity": "sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==",
|
"integrity": "sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==",
|
||||||
"license": "Unlicense",
|
"license": "Unlicense",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
},
|
},
|
||||||
@@ -4206,6 +4450,7 @@
|
|||||||
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
|
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"prettier": "bin/prettier.cjs"
|
"prettier": "bin/prettier.cjs"
|
||||||
},
|
},
|
||||||
@@ -4222,6 +4467,7 @@
|
|||||||
"integrity": "sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==",
|
"integrity": "sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"prettier": "^3.0.0",
|
"prettier": "^3.0.0",
|
||||||
"svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
|
"svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
|
||||||
@@ -4314,6 +4560,32 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/process-warning": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/process-warning/-/process-warning-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/pump": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"end-of-stream": "^1.1.0",
|
||||||
|
"once": "^1.3.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/punycode": {
|
"node_modules/punycode": {
|
||||||
"version": "2.3.1",
|
"version": "2.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
|
||||||
@@ -4345,6 +4617,12 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/quick-format-unescaped": {
|
||||||
|
"version": "4.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
|
||||||
|
"integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/readdirp": {
|
"node_modules/readdirp": {
|
||||||
"version": "4.1.2",
|
"version": "4.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
|
||||||
@@ -4359,6 +4637,15 @@
|
|||||||
"url": "https://paulmillr.com/funding/"
|
"url": "https://paulmillr.com/funding/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/real-require": {
|
||||||
|
"version": "0.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
|
||||||
|
"integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 12.13.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/resolve": {
|
"node_modules/resolve": {
|
||||||
"version": "1.22.10",
|
"version": "1.22.10",
|
||||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
|
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
|
||||||
@@ -4415,6 +4702,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
|
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
|
||||||
"integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
|
"integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/estree": "1.0.8"
|
"@types/estree": "1.0.8"
|
||||||
},
|
},
|
||||||
@@ -4485,6 +4773,31 @@
|
|||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/safe-stable-stringify": {
|
||||||
|
"version": "2.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
|
||||||
|
"integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/secure-json-parse": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "BSD-3-Clause"
|
||||||
|
},
|
||||||
"node_modules/semver": {
|
"node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
||||||
@@ -4541,6 +4854,15 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/sonic-boom": {
|
||||||
|
"version": "4.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
|
||||||
|
"integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"atomic-sleep": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/source-map": {
|
"node_modules/source-map": {
|
||||||
"version": "0.6.1",
|
"version": "0.6.1",
|
||||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||||
@@ -4571,6 +4893,15 @@
|
|||||||
"source-map": "^0.6.0"
|
"source-map": "^0.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/split2": {
|
||||||
|
"version": "4.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
|
||||||
|
"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
|
||||||
|
"license": "ISC",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 10.x"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/strip-json-comments": {
|
"node_modules/strip-json-comments": {
|
||||||
"version": "3.1.1",
|
"version": "3.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
|
||||||
@@ -4614,6 +4945,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.38.1.tgz",
|
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.38.1.tgz",
|
||||||
"integrity": "sha512-fO6CLDfJYWHgfo6lQwkQU2vhCiHc2MBl6s3vEhK+sSZru17YL4R5s1v14ndRpqKAIkq8nCz6MTk1yZbESZWeyQ==",
|
"integrity": "sha512-fO6CLDfJYWHgfo6lQwkQU2vhCiHc2MBl6s3vEhK+sSZru17YL4R5s1v14ndRpqKAIkq8nCz6MTk1yZbESZWeyQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jridgewell/remapping": "^2.3.4",
|
"@jridgewell/remapping": "^2.3.4",
|
||||||
"@jridgewell/sourcemap-codec": "^1.5.0",
|
"@jridgewell/sourcemap-codec": "^1.5.0",
|
||||||
@@ -4706,7 +5038,8 @@
|
|||||||
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.12.tgz",
|
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.12.tgz",
|
||||||
"integrity": "sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==",
|
"integrity": "sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT",
|
||||||
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/tapable": {
|
"node_modules/tapable": {
|
||||||
"version": "2.2.2",
|
"version": "2.2.2",
|
||||||
@@ -4736,14 +5069,23 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tinyglobby": {
|
"node_modules/thread-stream": {
|
||||||
"version": "0.2.14",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
|
"resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
|
||||||
"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
|
"integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fdir": "^6.4.4",
|
"real-require": "^0.2.0"
|
||||||
"picomatch": "^4.0.2"
|
}
|
||||||
|
},
|
||||||
|
"node_modules/tinyglobby": {
|
||||||
|
"version": "0.2.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
|
||||||
|
"integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"fdir": "^6.5.0",
|
||||||
|
"picomatch": "^4.0.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12.0.0"
|
"node": ">=12.0.0"
|
||||||
@@ -4806,6 +5148,7 @@
|
|||||||
"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
|
"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsc": "bin/tsc",
|
"tsc": "bin/tsc",
|
||||||
"tsserver": "bin/tsserver"
|
"tsserver": "bin/tsserver"
|
||||||
@@ -4839,12 +5182,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/undici-types": {
|
"node_modules/undici-types": {
|
||||||
"version": "7.10.0",
|
"version": "7.16.0",
|
||||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
|
||||||
"integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
|
"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
|
||||||
"license": "MIT",
|
"devOptional": true,
|
||||||
"optional": true,
|
"license": "MIT"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/uri-js": {
|
"node_modules/uri-js": {
|
||||||
"version": "4.4.1",
|
"version": "4.4.1",
|
||||||
@@ -4864,17 +5206,18 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "7.1.2",
|
"version": "7.1.11",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz",
|
||||||
"integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
|
"integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.25.0",
|
"esbuild": "^0.25.0",
|
||||||
"fdir": "^6.4.6",
|
"fdir": "^6.5.0",
|
||||||
"picomatch": "^4.0.3",
|
"picomatch": "^4.0.3",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"rollup": "^4.43.0",
|
"rollup": "^4.43.0",
|
||||||
"tinyglobby": "^0.2.14"
|
"tinyglobby": "^0.2.15"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"vite": "bin/vite.js"
|
"vite": "bin/vite.js"
|
||||||
@@ -4982,6 +5325,12 @@
|
|||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/wrappy": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
"node_modules/yallist": {
|
"node_modules/yallist": {
|
||||||
"version": "5.0.0",
|
"version": "5.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
|
||||||
@@ -4992,20 +5341,6 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/yaml": {
|
|
||||||
"version": "2.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
|
|
||||||
"integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
|
|
||||||
"license": "ISC",
|
|
||||||
"optional": true,
|
|
||||||
"peer": true,
|
|
||||||
"bin": {
|
|
||||||
"yaml": "bin.mjs"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 14.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/yocto-queue": {
|
"node_modules/yocto-queue": {
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "cactoide",
|
"name": "cactoide",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.3",
|
"version": "0.1.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
@@ -22,6 +22,7 @@
|
|||||||
"@tailwindcss/forms": "^0.5.9",
|
"@tailwindcss/forms": "^0.5.9",
|
||||||
"@tailwindcss/typography": "^0.5.15",
|
"@tailwindcss/typography": "^0.5.15",
|
||||||
"@tailwindcss/vite": "^4.0.0",
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
|
"@types/node": "^24.9.1",
|
||||||
"drizzle-kit": "^0.31.4",
|
"drizzle-kit": "^0.31.4",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
@@ -35,12 +36,14 @@
|
|||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"typescript-eslint": "^8.20.0",
|
"typescript-eslint": "^8.20.0",
|
||||||
"vite": "^7.0.4"
|
"vite": "^7.1.11"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sveltejs/adapter-node": "^5.3.1",
|
"@sveltejs/adapter-node": "^5.3.1",
|
||||||
"drizzle-orm": "^0.44.5",
|
"drizzle-orm": "^0.44.5",
|
||||||
"fuse.js": "^7.1.0",
|
"fuse.js": "^7.1.0",
|
||||||
|
"pino": "^10.1.0",
|
||||||
|
"pino-pretty": "^13.1.2",
|
||||||
"postgres": "^3.4.7"
|
"postgres": "^3.4.7"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
191
scripts/i18n-check.sh
Executable file
191
scripts/i18n-check.sh
Executable file
@@ -0,0 +1,191 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Translation validation script
|
||||||
|
# Compares a translation file against the source messages.json to find missing keys
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
# Default paths
|
||||||
|
SOURCE_FILE="src/lib/i18n/messages.json"
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
|
||||||
|
|
||||||
|
# Function to show usage
|
||||||
|
show_usage() {
|
||||||
|
echo "Usage: $0 [LANGUAGE_FILE]"
|
||||||
|
echo ""
|
||||||
|
echo "Validates a translation file against the source messages.json"
|
||||||
|
echo ""
|
||||||
|
echo "Arguments:"
|
||||||
|
echo " LANGUAGE_FILE Path to the translation file to validate (e.g., src/lib/i18n/it.json)"
|
||||||
|
echo ""
|
||||||
|
echo "Examples:"
|
||||||
|
echo " $0 src/lib/i18n/it.json"
|
||||||
|
echo " $0 src/lib/i18n/fr.json"
|
||||||
|
echo ""
|
||||||
|
echo "If no file is provided, it will check all .json files in src/lib/i18n/ except messages.json"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to get all keys from a JSON file recursively
|
||||||
|
get_keys() {
|
||||||
|
local file="$1"
|
||||||
|
local prefix="$2"
|
||||||
|
|
||||||
|
# Use jq to extract all keys recursively
|
||||||
|
jq -r 'paths(scalars) as $p | $p | join(".")' "$file" | while read -r key; do
|
||||||
|
if [ -n "$prefix" ]; then
|
||||||
|
echo "${prefix}.${key}"
|
||||||
|
else
|
||||||
|
echo "$key"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to validate a single translation file
|
||||||
|
validate_file() {
|
||||||
|
local translation_file="$1"
|
||||||
|
local source_file="$2"
|
||||||
|
|
||||||
|
echo -e "${YELLOW}Validating: $translation_file${NC}"
|
||||||
|
echo "----------------------------------------"
|
||||||
|
|
||||||
|
# Check if files exist
|
||||||
|
if [ ! -f "$source_file" ]; then
|
||||||
|
echo -e "${RED}Error: Source file $source_file not found${NC}"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f "$translation_file" ]; then
|
||||||
|
echo -e "${RED}Error: Translation file $translation_file not found${NC}"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Get all keys from source file
|
||||||
|
local source_keys
|
||||||
|
source_keys=$(get_keys "$source_file")
|
||||||
|
|
||||||
|
# Get all keys from translation file
|
||||||
|
local translation_keys
|
||||||
|
translation_keys=$(get_keys "$translation_file")
|
||||||
|
|
||||||
|
# Find missing keys
|
||||||
|
local missing_keys
|
||||||
|
missing_keys=$(comm -23 <(echo "$source_keys" | sort) <(echo "$translation_keys" | sort))
|
||||||
|
|
||||||
|
# Find extra keys (in translation but not in source)
|
||||||
|
local extra_keys
|
||||||
|
extra_keys=$(comm -13 <(echo "$source_keys" | sort) <(echo "$translation_keys" | sort))
|
||||||
|
|
||||||
|
# Count missing and extra keys
|
||||||
|
local missing_count
|
||||||
|
if [ -z "$missing_keys" ]; then
|
||||||
|
missing_count=0
|
||||||
|
else
|
||||||
|
missing_count=$(echo "$missing_keys" | wc -l | tr -d ' ')
|
||||||
|
fi
|
||||||
|
|
||||||
|
local extra_count
|
||||||
|
if [ -z "$extra_keys" ]; then
|
||||||
|
extra_count=0
|
||||||
|
else
|
||||||
|
extra_count=$(echo "$extra_keys" | wc -l | tr -d ' ')
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Report results
|
||||||
|
if [ "$missing_count" -eq 0 ] && [ "$extra_count" -eq 0 ]; then
|
||||||
|
echo -e "${GREEN} Perfect! All keys match.${NC}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$missing_count" -gt 0 ]; then
|
||||||
|
echo -e "${RED} Missing $missing_count key(s) in translation:${NC}"
|
||||||
|
echo "$missing_keys" | while read -r key; do
|
||||||
|
echo -e " ${RED}• $key${NC}"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$extra_count" -gt 0 ]; then
|
||||||
|
echo -e "${YELLOW} Extra $extra_count key(s) in translation (not in source):${NC}"
|
||||||
|
echo "$extra_keys" | while read -r key; do
|
||||||
|
echo -e " ${YELLOW}• $key${NC}"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Return error code if there are missing keys
|
||||||
|
if [ "$missing_count" -gt 0 ]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main function
|
||||||
|
main() {
|
||||||
|
local translation_file="$1"
|
||||||
|
local source_file="$PROJECT_ROOT/$SOURCE_FILE"
|
||||||
|
local exit_code=0
|
||||||
|
|
||||||
|
# Change to project root directory
|
||||||
|
cd "$PROJECT_ROOT"
|
||||||
|
|
||||||
|
# If no file specified, check all translation files
|
||||||
|
if [ -z "$translation_file" ]; then
|
||||||
|
echo -e "${YELLOW}No file specified. Checking all translation files...${NC}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Find all .json files in i18n directory except messages.json
|
||||||
|
local files
|
||||||
|
files=$(find src/lib/i18n -name "*.json" -not -name "messages.json" 2>/dev/null || true)
|
||||||
|
|
||||||
|
if [ -z "$files" ]; then
|
||||||
|
echo -e "${YELLOW}No translation files found in src/lib/i18n/${NC}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Validate each file
|
||||||
|
echo "$files" | while read -r file; do
|
||||||
|
if [ -n "$file" ]; then
|
||||||
|
if ! validate_file "$file" "$source_file"; then
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
return $exit_code
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Validate the specified file
|
||||||
|
if ! validate_file "$translation_file" "$source_file"; then
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
return $exit_code
|
||||||
|
}
|
||||||
|
|
||||||
|
# Check if jq is installed
|
||||||
|
if ! command -v jq &> /dev/null; then
|
||||||
|
echo -e "${RED}Error: jq is required but not installed.${NC}"
|
||||||
|
echo "Please install jq:"
|
||||||
|
echo " macOS: brew install jq"
|
||||||
|
echo " Ubuntu/Debian: sudo apt-get install jq"
|
||||||
|
echo " CentOS/RHEL: sudo yum install jq"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Handle help flag
|
||||||
|
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
|
||||||
|
show_usage
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Run main function
|
||||||
|
main "$1"
|
||||||
44
src/hooks.server.ts
Normal file
44
src/hooks.server.ts
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
// src/hooks.server.ts
|
||||||
|
import type { Handle } from '@sveltejs/kit';
|
||||||
|
import { generateUserId } from '$lib/generateUserId.js';
|
||||||
|
import { ensureDatabaseConnection } from '$lib/database/healthCheck';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
|
// Global flag to track if database health check has been performed
|
||||||
|
let dbHealthCheckPerformed = false;
|
||||||
|
|
||||||
|
export const handle: Handle = async ({ event, resolve }) => {
|
||||||
|
// Perform database health check only once during application startup
|
||||||
|
if (!dbHealthCheckPerformed) {
|
||||||
|
try {
|
||||||
|
await ensureDatabaseConnection({
|
||||||
|
maxRetries: 3,
|
||||||
|
baseDelay: 1000,
|
||||||
|
maxDelay: 10000,
|
||||||
|
timeout: 5000
|
||||||
|
});
|
||||||
|
dbHealthCheckPerformed = true;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error({ error }, 'Database health check failed');
|
||||||
|
// The ensureDatabaseConnection function will exit the process
|
||||||
|
// if the database is unavailable, so this catch is just for safety
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const cactoideUserId = event.cookies.get('cactoideUserId');
|
||||||
|
const userId = generateUserId();
|
||||||
|
|
||||||
|
const DAYS = 400; // practical upper bound in many browsers for cookies
|
||||||
|
const MAX_AGE = 60 * 60 * 24 * DAYS;
|
||||||
|
const PATH = '/';
|
||||||
|
|
||||||
|
if (!cactoideUserId) {
|
||||||
|
logger.debug({ userId }, 'No cactoideUserId cookie found, generating new one');
|
||||||
|
event.cookies.set('cactoideUserId', userId, { path: PATH, maxAge: MAX_AGE });
|
||||||
|
} else {
|
||||||
|
logger.debug({ cactoideUserId }, 'cactoideUserId cookie found, using existing one');
|
||||||
|
}
|
||||||
|
|
||||||
|
return resolve(event);
|
||||||
|
};
|
||||||
@@ -15,7 +15,10 @@ export interface CalendarEvent {
|
|||||||
* Formats a date and time string for iCal format (UTC)
|
* Formats a date and time string for iCal format (UTC)
|
||||||
*/
|
*/
|
||||||
export const formatDateForICal = (date: string, time: string): string => {
|
export const formatDateForICal = (date: string, time: string): string => {
|
||||||
const eventDate = new Date(`${date}T${time}`);
|
// Parse date and time as local timezone to avoid timezone issues
|
||||||
|
const [year, month, day] = date.split('-').map(Number);
|
||||||
|
const [hours, minutes, seconds] = time.split(':').map(Number);
|
||||||
|
const eventDate = new Date(year, month - 1, day, hours, minutes, seconds || 0);
|
||||||
return eventDate.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z';
|
return eventDate.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import { page } from '$app/stores';
|
import { page } from '$app/stores';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
|
import { PUBLIC_LANDING_INFO } from '$env/static/public';
|
||||||
|
|
||||||
// Check if current page is active
|
// Check if current page is active
|
||||||
const isActive = (path: string): boolean => {
|
const isActive = (path: string): boolean => {
|
||||||
@@ -24,12 +25,14 @@
|
|||||||
|
|
||||||
<!-- Navigation -->
|
<!-- Navigation -->
|
||||||
<div class="md:flex md:items-center md:space-x-8">
|
<div class="md:flex md:items-center md:space-x-8">
|
||||||
<button
|
{#if PUBLIC_LANDING_INFO !== 'false'}
|
||||||
on:click={() => goto('/')}
|
<button
|
||||||
class={isActive('/') ? 'text-violet-400' : 'cursor-pointer'}
|
on:click={() => goto('/')}
|
||||||
>
|
class={isActive('/') ? 'text-violet-400' : 'cursor-pointer'}
|
||||||
{t('navigation.home')}
|
>
|
||||||
</button>
|
{t('navigation.home')}
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<button
|
<button
|
||||||
on:click={() => goto('/discover')}
|
on:click={() => goto('/discover')}
|
||||||
|
|||||||
108
src/lib/database/healthCheck.ts
Normal file
108
src/lib/database/healthCheck.ts
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
import postgres from 'postgres';
|
||||||
|
import { env } from '$env/dynamic/private';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
|
interface HealthCheckOptions {
|
||||||
|
maxRetries?: number;
|
||||||
|
baseDelay?: number;
|
||||||
|
maxDelay?: number;
|
||||||
|
timeout?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface HealthCheckResult {
|
||||||
|
success: boolean;
|
||||||
|
error?: string;
|
||||||
|
attempts: number;
|
||||||
|
duration?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Performs a database health check with retry logic and exponential backoff
|
||||||
|
*/
|
||||||
|
export async function checkDatabaseHealth(
|
||||||
|
options: HealthCheckOptions = {}
|
||||||
|
): Promise<HealthCheckResult> {
|
||||||
|
const {
|
||||||
|
maxRetries = 3,
|
||||||
|
baseDelay = 1000, // 1 second
|
||||||
|
maxDelay = 10000, // 10 seconds
|
||||||
|
timeout = 5000 // 5 seconds
|
||||||
|
} = options;
|
||||||
|
|
||||||
|
if (!env.DATABASE_URL) {
|
||||||
|
logger.error('DATABASE_URL environment variable is not set');
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: 'DATABASE_URL environment variable is not set',
|
||||||
|
attempts: 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let lastError: Error | null = null;
|
||||||
|
|
||||||
|
logger.info({ maxRetries }, 'Starting database health check');
|
||||||
|
|
||||||
|
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
||||||
|
logger.debug({ attempt, maxRetries }, 'Testing database connection');
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Create a new connection for the health check
|
||||||
|
const client = postgres(env.DATABASE_URL, {
|
||||||
|
max: 1,
|
||||||
|
idle_timeout: 20,
|
||||||
|
connect_timeout: timeout / 1000, // Convert to seconds
|
||||||
|
onnotice: () => {} // Suppress notices
|
||||||
|
});
|
||||||
|
|
||||||
|
// Test the connection with a simple query
|
||||||
|
await client`SELECT 1 as health_check`;
|
||||||
|
await client.end();
|
||||||
|
|
||||||
|
logger.info({ attempt }, 'Database connection successful');
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
attempts: attempt
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
lastError = error as Error;
|
||||||
|
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
|
||||||
|
logger.warn({ attempt, error: errorMessage }, 'Database connection failed');
|
||||||
|
|
||||||
|
// Don't wait after the last attempt
|
||||||
|
if (attempt < maxRetries) {
|
||||||
|
const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
|
||||||
|
logger.debug({ delay }, 'Waiting before retry');
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const finalError = lastError?.message || 'Unknown database connection error';
|
||||||
|
|
||||||
|
logger.error(
|
||||||
|
{ attempts: maxRetries, error: finalError },
|
||||||
|
'All database connection attempts failed'
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: finalError,
|
||||||
|
attempts: maxRetries
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs database health check and exits the process if it fails
|
||||||
|
*/
|
||||||
|
export async function ensureDatabaseConnection(options?: HealthCheckOptions): Promise<void> {
|
||||||
|
const result = await checkDatabaseHealth(options);
|
||||||
|
|
||||||
|
if (!result.success) {
|
||||||
|
logger.fatal(
|
||||||
|
{ error: result.error, attempts: result.attempts },
|
||||||
|
'Database connection failed after all retry attempts. Exiting application'
|
||||||
|
);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,8 @@ import type { InferInsertModel, InferSelectModel } from 'drizzle-orm';
|
|||||||
|
|
||||||
// --- Enums (matching the SQL CHECK constraints)
|
// --- Enums (matching the SQL CHECK constraints)
|
||||||
export const eventTypeEnum = pgEnum('event_type', ['limited', 'unlimited']);
|
export const eventTypeEnum = pgEnum('event_type', ['limited', 'unlimited']);
|
||||||
export const visibilityEnum = pgEnum('visibility', ['public', 'private']);
|
export const visibilityEnum = pgEnum('visibility', ['public', 'private', 'invite-only']);
|
||||||
|
export const locationTypeEnum = pgEnum('location_type', ['none', 'text', 'maps']);
|
||||||
|
|
||||||
// --- Events table
|
// --- Events table
|
||||||
export const events = pgTable(
|
export const events = pgTable(
|
||||||
@@ -27,6 +28,8 @@ export const events = pgTable(
|
|||||||
date: date('date', { mode: 'string' }).notNull(), // ISO 'YYYY-MM-DD'
|
date: date('date', { mode: 'string' }).notNull(), // ISO 'YYYY-MM-DD'
|
||||||
time: time('time', { withTimezone: false }).notNull(), // 'HH:MM:SS'
|
time: time('time', { withTimezone: false }).notNull(), // 'HH:MM:SS'
|
||||||
location: varchar('location', { length: 200 }).notNull(),
|
location: varchar('location', { length: 200 }).notNull(),
|
||||||
|
locationType: locationTypeEnum('location_type').notNull().default('none'),
|
||||||
|
locationUrl: varchar('location_url', { length: 500 }),
|
||||||
type: eventTypeEnum('type').notNull(),
|
type: eventTypeEnum('type').notNull(),
|
||||||
attendeeLimit: integer('attendee_limit'), // nullable in SQL
|
attendeeLimit: integer('attendee_limit'), // nullable in SQL
|
||||||
userId: varchar('user_id', { length: 100 }).notNull(),
|
userId: varchar('user_id', { length: 100 }).notNull(),
|
||||||
@@ -68,11 +71,31 @@ export const rsvps = pgTable(
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// --- Invite Tokens table
|
||||||
|
export const inviteTokens = pgTable(
|
||||||
|
'invite_tokens',
|
||||||
|
{
|
||||||
|
id: uuid('id').defaultRandom().primaryKey(),
|
||||||
|
eventId: varchar('event_id', { length: 8 })
|
||||||
|
.notNull()
|
||||||
|
.references(() => events.id, { onDelete: 'cascade' }),
|
||||||
|
token: varchar('token', { length: 32 }).notNull().unique(),
|
||||||
|
expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
|
||||||
|
createdAt: timestamp('created_at', { withTimezone: true }).defaultNow()
|
||||||
|
},
|
||||||
|
(t) => ({
|
||||||
|
idxInviteTokensEventId: index('idx_invite_tokens_event_id').on(t.eventId),
|
||||||
|
idxInviteTokensToken: index('idx_invite_tokens_token').on(t.token),
|
||||||
|
idxInviteTokensExpiresAt: index('idx_invite_tokens_expires_at').on(t.expiresAt)
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
// --- Relations (optional but handy for type safety)
|
// --- Relations (optional but handy for type safety)
|
||||||
import { relations } from 'drizzle-orm';
|
import { relations } from 'drizzle-orm';
|
||||||
|
|
||||||
export const eventsRelations = relations(events, ({ many }) => ({
|
export const eventsRelations = relations(events, ({ many }) => ({
|
||||||
rsvps: many(rsvps)
|
rsvps: many(rsvps),
|
||||||
|
inviteTokens: many(inviteTokens)
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const rsvpsRelations = relations(rsvps, ({ one }) => ({
|
export const rsvpsRelations = relations(rsvps, ({ one }) => ({
|
||||||
@@ -82,16 +105,30 @@ export const rsvpsRelations = relations(rsvps, ({ one }) => ({
|
|||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
export const inviteTokensRelations = relations(inviteTokens, ({ one }) => ({
|
||||||
|
event: one(events, {
|
||||||
|
fields: [inviteTokens.eventId],
|
||||||
|
references: [events.id]
|
||||||
|
})
|
||||||
|
}));
|
||||||
|
|
||||||
// --- Inferred types for use in the application
|
// --- Inferred types for use in the application
|
||||||
export type Event = InferSelectModel<typeof events>;
|
export type Event = InferSelectModel<typeof events>;
|
||||||
export type NewEvent = InferInsertModel<typeof events>;
|
export type NewEvent = InferInsertModel<typeof events>;
|
||||||
export type Rsvp = InferSelectModel<typeof rsvps>;
|
export type Rsvp = InferSelectModel<typeof rsvps>;
|
||||||
export type NewRsvp = InferInsertModel<typeof rsvps>;
|
export type NewRsvp = InferInsertModel<typeof rsvps>;
|
||||||
|
export type InviteToken = InferSelectModel<typeof inviteTokens>;
|
||||||
|
export type NewInviteToken = InferInsertModel<typeof inviteTokens>;
|
||||||
|
|
||||||
// --- Additional utility types
|
// --- Additional utility types
|
||||||
export type EventWithRsvps = Event & {
|
export type EventWithRsvps = Event & {
|
||||||
rsvps: Rsvp[];
|
rsvps: Rsvp[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type EventWithInviteTokens = Event & {
|
||||||
|
inviteTokens: InviteToken[];
|
||||||
|
};
|
||||||
|
|
||||||
export type CreateEventData = Omit<NewEvent, 'id' | 'createdAt' | 'updatedAt'>;
|
export type CreateEventData = Omit<NewEvent, 'id' | 'createdAt' | 'updatedAt'>;
|
||||||
export type CreateRsvpData = Omit<NewRsvp, 'id' | 'createdAt'>;
|
export type CreateRsvpData = Omit<NewRsvp, 'id' | 'createdAt'>;
|
||||||
|
export type CreateInviteTokenData = Omit<NewInviteToken, 'id' | 'createdAt'>;
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import type { Event } from './types';
|
import type { Event } from './types';
|
||||||
|
|
||||||
export const formatDate = (dateString: string): string => {
|
export const formatDate = (dateString: string): string => {
|
||||||
const date = new Date(dateString);
|
// Parse the date string as local date to avoid timezone issues
|
||||||
const year = date.getFullYear();
|
// Split the date string and create a Date object in local timezone
|
||||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
const [year, month, day] = dateString.split('-').map(Number);
|
||||||
const day = String(date.getDate()).padStart(2, '0');
|
const date = new Date(year, month - 1, day); // month is 0-indexed in Date constructor
|
||||||
return `${year}/${month}/${day}`;
|
const formattedYear = date.getFullYear();
|
||||||
|
const formattedMonth = String(date.getMonth() + 1).padStart(2, '0');
|
||||||
|
const formattedDay = String(date.getDate()).padStart(2, '0');
|
||||||
|
return `${formattedYear}/${formattedMonth}/${formattedDay}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const formatTime = (timeString: string): string => {
|
export const formatTime = (timeString: string): string => {
|
||||||
@@ -17,7 +20,10 @@ export const formatTime = (timeString: string): string => {
|
|||||||
export const isEventInTimeRange = (event: Event, timeFilter: string): boolean => {
|
export const isEventInTimeRange = (event: Event, timeFilter: string): boolean => {
|
||||||
if (timeFilter === 'any') return true;
|
if (timeFilter === 'any') return true;
|
||||||
|
|
||||||
const eventDate = new Date(`${event.date}T${event.time}`);
|
// Parse date and time as local timezone to avoid timezone issues
|
||||||
|
const [year, month, day] = event.date.split('-').map(Number);
|
||||||
|
const [hours, minutes, seconds] = event.time.split(':').map(Number);
|
||||||
|
const eventDate = new Date(year, month - 1, day, hours, minutes, seconds || 0);
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
|
||||||
// Handle temporal status filters
|
// Handle temporal status filters
|
||||||
|
|||||||
265
src/lib/i18n/it.json
Normal file
265
src/lib/i18n/it.json
Normal file
@@ -0,0 +1,265 @@
|
|||||||
|
{
|
||||||
|
"common": {
|
||||||
|
"required": "*",
|
||||||
|
"cancel": "Annulla",
|
||||||
|
"create": "Crea",
|
||||||
|
"edit": "Modifica",
|
||||||
|
"delete": "Elimina",
|
||||||
|
"view": "Visualizza",
|
||||||
|
"home": "Home",
|
||||||
|
"loading": "Caricamento...",
|
||||||
|
"error": "Errore",
|
||||||
|
"success": "Successo",
|
||||||
|
"name": "Nome",
|
||||||
|
"date": "Data",
|
||||||
|
"time": "Ora",
|
||||||
|
"location": "Luogo",
|
||||||
|
"locationType": "Tipo di Luogo",
|
||||||
|
"locationNone": "Nessuno",
|
||||||
|
"locationText": "Testo",
|
||||||
|
"locationMaps": "Google Maps",
|
||||||
|
"locationNoneDescription": "Nessun luogo specificato",
|
||||||
|
"locationTextDescription": "Inserisci il luogo come testo semplice.",
|
||||||
|
"locationMapsDescription": "Inserisci il link di Google Maps.",
|
||||||
|
"googleMapsUrl": "URL di Google Maps",
|
||||||
|
"googleMapsUrlPlaceholder": "https://maps.google.com/...",
|
||||||
|
"type": "Tipo",
|
||||||
|
"visibility": "Visibilità",
|
||||||
|
"public": "Pubblico",
|
||||||
|
"private": "Privato",
|
||||||
|
"limited": "Limitato",
|
||||||
|
"unlimited": "Illimitato",
|
||||||
|
"capacity": "Capacità",
|
||||||
|
"attendees": "Partecipanti",
|
||||||
|
"attendeeLimit": "Limite di Partecipanti",
|
||||||
|
"enterLimit": "Inserisci il limite",
|
||||||
|
"enterEventName": "Inserisci il nome dell'evento",
|
||||||
|
"enterLocation": "Inserisci il luogo",
|
||||||
|
"enterYourName": "Inserisci il tuo nome",
|
||||||
|
"enterNumberOfGuests": "Inserisci il numero di ospiti",
|
||||||
|
"yourName": "Il tuo nome",
|
||||||
|
"numberOfGuests": "Numero di Ospiti",
|
||||||
|
"addGuests": "Aggiungi ospiti",
|
||||||
|
"joinEvent": "Partecipa all'Evento",
|
||||||
|
"addToCalendar": "Aggiungi al Calendario",
|
||||||
|
"close": "Chiudi",
|
||||||
|
"closeModal": "Chiudi finestra",
|
||||||
|
"removeRSVP": "Rimuovi RSVP",
|
||||||
|
"updating": "Aggiornamento...",
|
||||||
|
"creating": "Creazione...",
|
||||||
|
"adding": "Aggiunta...",
|
||||||
|
"updateEvent": "Aggiorna Evento",
|
||||||
|
"createEvent": "Crea Evento",
|
||||||
|
"createNewEvent": "Crea Nuovo Evento",
|
||||||
|
"createYourFirstEvent": "Crea il Tuo Primo Evento",
|
||||||
|
"editEvent": "Modifica Evento",
|
||||||
|
"deleteEvent": "Elimina Evento",
|
||||||
|
"myEvents": "I Miei Eventi",
|
||||||
|
"discover": "Scopri",
|
||||||
|
"noEventsYet": "Ancora Nessun Evento",
|
||||||
|
"noPublicEventsYet": "Ancora Nessun Evento Pubblico",
|
||||||
|
"noAttendeesYet": "Ancora nessun partecipante",
|
||||||
|
"beFirstToJoin": "Sii il primo a partecipare!",
|
||||||
|
"eventNotFound": "Evento Non Trovato",
|
||||||
|
"eventIsFull": "L'Evento è Pieno!",
|
||||||
|
"maximumCapacityReached": "Raggiunta la capacità massima",
|
||||||
|
"rsvpAddedSuccessfully": "RSVP aggiunto con successo!",
|
||||||
|
"removedRsvpSuccessfully": "RSVP rimosso con successo.",
|
||||||
|
"anUnexpectedErrorOccurred": "Si è verificato un errore inaspettato.",
|
||||||
|
"somethingWentWrong": "Qualcosa è andato storto. Riprova.",
|
||||||
|
"failedToAddRsvp": "Impossibile aggiungere RSVP",
|
||||||
|
"failedToRemoveRsvp": "Impossibile rimuovere RSVP",
|
||||||
|
"failedToDeleteEvent": "Impossibile eliminare l'evento",
|
||||||
|
"youMayNotHavePermission": "Potresti non avere il permesso di eliminare questo evento.",
|
||||||
|
"anErrorOccurredWhileDeleting": "Si è verificato un errore durante l'eliminazione dell'evento:",
|
||||||
|
"databaseUnreachable": "Database non raggiungibile.",
|
||||||
|
"eventIdNotFound": "EventId non trovato",
|
||||||
|
"eventNotExists": "Evento non trovato",
|
||||||
|
"failedToLoadEvent": "Impossibile caricare l'evento",
|
||||||
|
"nameAndUserIdRequired": "Nome e ID utente sono obbligatori",
|
||||||
|
"eventCapacityExceeded": "Capacità dell'evento superata. Stai cercando di aggiungere {guests} partecipanti (te compreso/a), ma rimangono solo {remaining} posti.",
|
||||||
|
"nameAlreadyExists": "Il nome esiste già per questo evento",
|
||||||
|
"missingOrEmptyFields": "Campi mancanti o vuoti: {fields}",
|
||||||
|
"dateCannotBeInPast": "La data non può essere nel passato.",
|
||||||
|
"limitMustBeAtLeast2": "Il limite deve essere almeno 2 per eventi limitati.",
|
||||||
|
"unauthorized": "Non autorizzato",
|
||||||
|
"youCanOnlyEditYourOwnEvents": "Puoi modificare solo i tuoi eventi",
|
||||||
|
"youDoNotHavePermissionToDelete": "Non hai il permesso di eliminare questo evento",
|
||||||
|
"eventIdAndUserIdRequired": "ID evento e ID utente sono obbligatori",
|
||||||
|
"guestsWillBeAddedAs": "Gli ospiti verranno aggiunti come \"Ospite #1 di {name}\", \"Ospite #2 di {name}\", ecc.",
|
||||||
|
"yourNamePlaceholder": "Il tuo nome",
|
||||||
|
"atTime": "alle"
|
||||||
|
},
|
||||||
|
"navigation": {
|
||||||
|
"home": "Home",
|
||||||
|
"discover": "Scopri",
|
||||||
|
"create": "Crea",
|
||||||
|
"myEvents": "I Miei Eventi"
|
||||||
|
},
|
||||||
|
"home": {
|
||||||
|
"title": "Cactoide - Il sito per gli RSVP",
|
||||||
|
"description": "Crea e gestisci gli RSVP degli eventi. Nessuna registrazione richiesta, condivisione immediata.",
|
||||||
|
"mainTitle": "Cactoide(ea)",
|
||||||
|
"subtitle": "La Piattaforma Definitiva per gli RSVP",
|
||||||
|
"tagline": "Crea, condividi e gestisci eventi senza intoppi.",
|
||||||
|
"whyCactoideTitle": "Perché Cactoide(ae)? 🌵",
|
||||||
|
"whyCactoideDescription": "Come il cactus, i grandi eventi fioriscono in ogni condizione se gestiti con cura. Cactoide(ae) ti aiuta a semplificare gli RSVP, coordinare in modo semplice e mantenere ogni dettaglio efficiente: così i tuoi incontri sono resilienti, vivaci e indimenticabili.",
|
||||||
|
"createEventNow": "Crea Evento Ora",
|
||||||
|
"discoverPublicEventsTitle": "Scopri Eventi Pubblici",
|
||||||
|
"discoverPublicEventsDescription": "Guarda cosa stanno pianificando gli altri e lasciati ispirare",
|
||||||
|
"browseAllPublicEvents": "Sfoglia Tutti gli Eventi Pubblici",
|
||||||
|
"whyCactoideFeatureTitle": "Perché Cactoide?",
|
||||||
|
"instantEventCreationTitle": "Creazione Istantanea di Eventi",
|
||||||
|
"instantEventCreationDescription": "Crea eventi in pochi secondi con il nostro modulo semplificato. Nessun account, nessuna attesa, solo pura efficienza.",
|
||||||
|
"oneClickSharingTitle": "Condivisione con un Clic",
|
||||||
|
"oneClickSharingDescription": "Ogni evento ottiene un URL unico e memorabile. Condividi istantaneamente tramite qualsiasi piattaforma o app di messaggistica.",
|
||||||
|
"allInOneClarityTitle": "Chiarezza Tutto-in-Uno",
|
||||||
|
"allInOneClarityDescription": "Niente più scorrimento infinito tra chat e reazioni. Visualizza la disponibilità e le risposte di tutti in un unico posto.",
|
||||||
|
"noHassleNoSignUpsTitle": "Nessun Problema, Nessuna Registrazione",
|
||||||
|
"noHassleNoSignUpsDescription": "Salta le registrazioni e i moduli infiniti. A differenza di altre piattaforme di eventi, crei e condividi istantaneamente: nessun account, nessuna barriera.",
|
||||||
|
"smartLimitsTitle": "Limiti Intelligenti",
|
||||||
|
"smartLimitsDescription": "Scegli tra RSVP illimitati o imposta una capacità limitata. Perfetto per eventi di qualsiasi dimensione.",
|
||||||
|
"effortlessSimplicityTitle": "Semplicità Senza Sforzo",
|
||||||
|
"effortlessSimplicityDescription": "Progettato per essere immediatamente chiaro e facile. Nessuna curva di apprendimento: apri, crea e vai.",
|
||||||
|
"howItWorksTitle": "Come Funziona",
|
||||||
|
"step1Title": "Crea Evento",
|
||||||
|
"step1Description": "Compila un semplice modulo con i dettagli dell'evento. Scegli tra capacità limitata o illimitata.",
|
||||||
|
"step2Title": "Ottieni URL Unico",
|
||||||
|
"step2Description": "Ricevi un URL casuale e memorabile per il tuo evento. Perfetto per la condivisione ovunque.",
|
||||||
|
"step3Title": "Raccogli gli RSVP",
|
||||||
|
"step3Description": "Le persone visitano il tuo link e partecipano solo con il loro nome. Nessun account necessario.",
|
||||||
|
"ctaTitle": "Pronto a Creare il Tuo Primo Evento?",
|
||||||
|
"ctaDescription": "Unisciti a migliaia di organizzatori di eventi che si fidano di Cactoide",
|
||||||
|
"ctaButton": "Crea"
|
||||||
|
},
|
||||||
|
"create": {
|
||||||
|
"title": "Crea Evento - Cactoide",
|
||||||
|
"formTitle": "Crea Nuovo Evento",
|
||||||
|
"eventNameLabel": "Nome",
|
||||||
|
"eventNamePlaceholder": "Inserisci il nome dell'evento",
|
||||||
|
"dateLabel": "Data",
|
||||||
|
"timeLabel": "Ora",
|
||||||
|
"locationLabel": "Luogo",
|
||||||
|
"locationPlaceholder": "Inserisci il luogo",
|
||||||
|
"locationTypeLabel": "Tipo di Luogo",
|
||||||
|
"locationNoneOption": "Nessuno",
|
||||||
|
"locationTextOption": "Testo Semplice",
|
||||||
|
"locationMapsOption": "Google Maps",
|
||||||
|
"locationNoneDescription": "Nessun luogo specificato.",
|
||||||
|
"locationTextDescription": "Inserisci il luogo come testo semplice.",
|
||||||
|
"locationMapsDescription": "Inserisci il link di Google Maps.",
|
||||||
|
"googleMapsUrlLabel": "URL di Google Maps",
|
||||||
|
"googleMapsUrlPlaceholder": "https://maps.google.com/...",
|
||||||
|
"typeLabel": "Tipo",
|
||||||
|
"unlimitedOption": "Illimitato",
|
||||||
|
"limitedOption": "Limitato",
|
||||||
|
"attendeeLimitLabel": "Limite di Partecipanti",
|
||||||
|
"attendeeLimitPlaceholder": "Inserisci il limite",
|
||||||
|
"visibilityLabel": "Visibilità",
|
||||||
|
"publicOption": "🌍 Pubblico",
|
||||||
|
"privateOption": "🔒 Privato",
|
||||||
|
"publicDescription": "Gli eventi pubblici sono visibili a tutti e possono essere scoperti da altri.",
|
||||||
|
"privateDescription": "Gli eventi privati sono visibili solo a te e alle persone con cui condividi il link.",
|
||||||
|
"creatingEvent": "Creazione Evento...",
|
||||||
|
"createEventButton": "Crea Evento"
|
||||||
|
},
|
||||||
|
"event": {
|
||||||
|
"title": "{eventName} - Cactoide",
|
||||||
|
"eventTitle": "Evento - Cactoide",
|
||||||
|
"editTitle": "Modifica Evento - {eventName} - Cactoide",
|
||||||
|
"myEventsTitle": "I Miei Eventi - Cactoide",
|
||||||
|
"eventNotFoundTitle": "Evento Non Trovato",
|
||||||
|
"eventNotFoundDescription": "L'evento che stai cercando non esiste o è stato rimosso.",
|
||||||
|
"joinThisEvent": "Partecipa a Questo Evento",
|
||||||
|
"eventIsFull": "L'Evento è Pieno!",
|
||||||
|
"maximumCapacityReached": "Raggiunta la capacità massima",
|
||||||
|
"yourNameLabel": "Il tuo nome",
|
||||||
|
"yourNamePlaceholder": "Inserisci il tuo nome",
|
||||||
|
"addGuestsLabel": "Aggiungi ospiti",
|
||||||
|
"numberOfGuestsLabel": "Numero di Ospiti",
|
||||||
|
"numberOfGuestsPlaceholder": "Inserisci il numero di ospiti",
|
||||||
|
"guestsWillBeAddedAs": "Gli ospiti verranno aggiunti come \"Ospite #1 di {name}\", \"Ospite #2 di {name}\", ecc.",
|
||||||
|
"joinEventButton": "Partecipa all'Evento",
|
||||||
|
"joinEventWithGuests": "Partecipa all'Evento + {count} Ospite{plural}",
|
||||||
|
"adding": "Aggiunta...",
|
||||||
|
"attendeesTitle": "Partecipanti",
|
||||||
|
"noAttendeesYet": "Ancora nessun partecipante",
|
||||||
|
"beFirstToJoin": "Sii il primo a partecipare!",
|
||||||
|
"copyLinkButton": "Copia Link",
|
||||||
|
"copyInviteLinkButton": "Copia Link Invito",
|
||||||
|
"addToCalendarButton": "Aggiungi al Calendario",
|
||||||
|
"eventLinkCopied": "Link dell'evento copiato negli appunti!",
|
||||||
|
"inviteLinkCopied": "Link invito copiato negli appunti!",
|
||||||
|
"rsvpAddedSuccessfully": "RSVP aggiunto con successo!",
|
||||||
|
"removedRsvpSuccessfully": "RSVP rimosso con successo.",
|
||||||
|
"failedToAddRsvp": "Impossibile aggiungere RSVP",
|
||||||
|
"failedToRemoveRsvp": "Impossibile rimuovere RSVP",
|
||||||
|
"editEventTitle": "Modifica Evento",
|
||||||
|
"editEventDescription": "Aggiorna i dettagli del tuo evento",
|
||||||
|
"updatingEvent": "Aggiornamento...",
|
||||||
|
"updateEventButton": "Aggiorna Evento",
|
||||||
|
"myEventsDescription": "Gestisci i tuoi eventi creati",
|
||||||
|
"noEventsYetTitle": "Ancora Nessun Evento",
|
||||||
|
"noEventsYetDescription": "Non hai ancora creato nessun evento. Inizia creando il tuo primo evento!",
|
||||||
|
"createYourFirstEventButton": "Crea il Tuo Primo Evento",
|
||||||
|
"deleteEventTitle": "Elimina Evento",
|
||||||
|
"deleteEventDescription": "Sei sicuro di voler eliminare \"{eventName}\"? Questa azione non può essere annullata e rimuoverà tutti gli RSVP.",
|
||||||
|
"deleteButton": "Elimina",
|
||||||
|
"viewEventAriaLabel": "Visualizza evento",
|
||||||
|
"editEventAriaLabel": "Modifica evento",
|
||||||
|
"deleteEventAriaLabel": "Elimina evento",
|
||||||
|
"removeRsvpAriaLabel": "Rimuovi RSVP",
|
||||||
|
"inviteLinkExpiresAt": "Questo link scade quando l'evento inizia: {time}"
|
||||||
|
},
|
||||||
|
"discover": {
|
||||||
|
"title": "Scopri Eventi - Cactoide",
|
||||||
|
"noPublicEventsTitle": "Ancora Nessun Evento Pubblico",
|
||||||
|
"noPublicEventsDescription": "Al momento non ci sono eventi pubblici disponibili. Sii il primo a crearne uno!",
|
||||||
|
"createButton": "Crea",
|
||||||
|
"publicEventsTitle": "Eventi Pubblici ({count})",
|
||||||
|
"publicEventsDescription": "Scopri eventi creati dalla comunità",
|
||||||
|
"searchPlaceholder": "Cerca eventi per nome, luogo...",
|
||||||
|
"searchInputAriaLabel": "Input di ricerca",
|
||||||
|
"toggleFiltersAriaLabel": "Attiva/Disattiva filtri",
|
||||||
|
"typeFilterLabel": "Tipo:",
|
||||||
|
"typeFilterAll": "Tutti",
|
||||||
|
"typeFilterLimited": "Limitati",
|
||||||
|
"typeFilterUnlimited": "Illimitati",
|
||||||
|
"statusFilterLabel": "Stato:",
|
||||||
|
"statusFilterAll": "Tutti gli eventi",
|
||||||
|
"statusFilterUpcoming": "Eventi imminenti",
|
||||||
|
"statusFilterPast": "Eventi passati",
|
||||||
|
"timeFilterLabel": "Orario:",
|
||||||
|
"timeFilterAny": "Qualsiasi orario",
|
||||||
|
"timeFilterNextWeek": "Prossima settimana",
|
||||||
|
"timeFilterNextMonth": "Prossimo mese",
|
||||||
|
"sortOrderLabel": "Ordina:",
|
||||||
|
"sortOrderEarliest": "Prima i più vicini",
|
||||||
|
"sortOrderLatest": "Prima i più recenti",
|
||||||
|
"viewButton": "Visualizza",
|
||||||
|
"noEventsFoundTitle": "Nessun evento trovato",
|
||||||
|
"noEventsFoundDescription": "Prova a modificare i termini di ricerca o sfoglia tutti gli eventi"
|
||||||
|
},
|
||||||
|
"calendar": {
|
||||||
|
"addToCalendarTitle": "Aggiungi al Calendario",
|
||||||
|
"googleCalendarTitle": "Google Calendar",
|
||||||
|
"googleCalendarDescription": "Aggiungi a Google Calendar",
|
||||||
|
"microsoftOutlookTitle": "Microsoft Outlook",
|
||||||
|
"microsoftOutlookDescription": "Aggiungi a Outlook Calendar",
|
||||||
|
"downloadICalTitle": "Scarica File iCal",
|
||||||
|
"downloadICalDescription": "Scarica file .ics per qualsiasi app di calendario"
|
||||||
|
},
|
||||||
|
"errors": {
|
||||||
|
"title": "Errore - Cactoide",
|
||||||
|
"errorTitle": "Errore",
|
||||||
|
"anUnexpectedErrorOccurred": "Si è verificato un errore inaspettato.",
|
||||||
|
"homeButton": "Home"
|
||||||
|
},
|
||||||
|
"layout": {
|
||||||
|
"defaultTitle": "Cactoide -",
|
||||||
|
"defaultDescription": "Crea e gestisci gli RSVP degli eventi",
|
||||||
|
"userIdCookieText": "Il tuo UserID memorizzato come cookie:",
|
||||||
|
"firstTimeVisiting": "Prima visita. Generazione di un nuovo UserID...",
|
||||||
|
"copyright": "© 2025 Cactoide"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,10 +14,21 @@
|
|||||||
"date": "Date",
|
"date": "Date",
|
||||||
"time": "Time",
|
"time": "Time",
|
||||||
"location": "Location",
|
"location": "Location",
|
||||||
|
"locationType": "Location Type",
|
||||||
|
"locationNone": "None",
|
||||||
|
"locationText": "Text",
|
||||||
|
"locationMaps": "Google Maps",
|
||||||
|
"locationNoneDescription": "No location specified",
|
||||||
|
"locationTextDescription": "Enter location as plain text.",
|
||||||
|
"locationMapsDescription": "Enter Google Maps link.",
|
||||||
|
"googleMapsUrl": "Google Maps URL",
|
||||||
|
"googleMapsUrlPlaceholder": "https://maps.google.com/...",
|
||||||
"type": "Type",
|
"type": "Type",
|
||||||
"visibility": "Visibility",
|
"visibility": "Visibility",
|
||||||
"public": "Public",
|
"public": "Public",
|
||||||
"private": "Private",
|
"private": "Private",
|
||||||
|
"inviteOnly": "Invite Only",
|
||||||
|
"invite-only": "Invite Only",
|
||||||
"limited": "Limited",
|
"limited": "Limited",
|
||||||
"unlimited": "Unlimited",
|
"unlimited": "Unlimited",
|
||||||
"capacity": "Capacity",
|
"capacity": "Capacity",
|
||||||
@@ -32,7 +43,6 @@
|
|||||||
"numberOfGuests": "Number of Guests",
|
"numberOfGuests": "Number of Guests",
|
||||||
"addGuests": "Add guest users",
|
"addGuests": "Add guest users",
|
||||||
"joinEvent": "Join Event",
|
"joinEvent": "Join Event",
|
||||||
"copyLink": "Copy Link",
|
|
||||||
"addToCalendar": "Add to Calendar",
|
"addToCalendar": "Add to Calendar",
|
||||||
"close": "Close",
|
"close": "Close",
|
||||||
"closeModal": "Close modal",
|
"closeModal": "Close modal",
|
||||||
@@ -55,9 +65,11 @@
|
|||||||
"eventNotFound": "Event Not Found",
|
"eventNotFound": "Event Not Found",
|
||||||
"eventIsFull": "Event is Full!",
|
"eventIsFull": "Event is Full!",
|
||||||
"maximumCapacityReached": "Maximum capacity reached",
|
"maximumCapacityReached": "Maximum capacity reached",
|
||||||
"eventLinkCopied": "Event link copied to clipboard!",
|
|
||||||
"rsvpAddedSuccessfully": "RSVP added successfully!",
|
"rsvpAddedSuccessfully": "RSVP added successfully!",
|
||||||
"removedRsvpSuccessfully": "Removed RSVP successfully.",
|
"removedRsvpSuccessfully": "Removed RSVP successfully.",
|
||||||
|
"inviteRequiredToDetails": "This event requires an invite link to see the details.",
|
||||||
|
"invalidInviteToken": "Invalid invite token",
|
||||||
|
"inviteTokenExpired": "Invite token has expired",
|
||||||
"anUnexpectedErrorOccurred": "An unexpected error occurred.",
|
"anUnexpectedErrorOccurred": "An unexpected error occurred.",
|
||||||
"somethingWentWrong": "Something went wrong. Please try again.",
|
"somethingWentWrong": "Something went wrong. Please try again.",
|
||||||
"failedToAddRsvp": "Failed to add RSVP",
|
"failedToAddRsvp": "Failed to add RSVP",
|
||||||
@@ -134,6 +146,15 @@
|
|||||||
"timeLabel": "Time",
|
"timeLabel": "Time",
|
||||||
"locationLabel": "Location",
|
"locationLabel": "Location",
|
||||||
"locationPlaceholder": "Enter location",
|
"locationPlaceholder": "Enter location",
|
||||||
|
"locationTypeLabel": "Location Type",
|
||||||
|
"locationNoneOption": "None",
|
||||||
|
"locationTextOption": "Plain Text",
|
||||||
|
"locationMapsOption": "Google Maps",
|
||||||
|
"locationNoneDescription": "No location specified.",
|
||||||
|
"locationTextDescription": "Enter location as plain text.",
|
||||||
|
"locationMapsDescription": "Enter Google Maps link.",
|
||||||
|
"googleMapsUrlLabel": "Google Maps URL",
|
||||||
|
"googleMapsUrlPlaceholder": "https://maps.google.com/...",
|
||||||
"typeLabel": "Type",
|
"typeLabel": "Type",
|
||||||
"unlimitedOption": "Unlimited",
|
"unlimitedOption": "Unlimited",
|
||||||
"limitedOption": "Limited",
|
"limitedOption": "Limited",
|
||||||
@@ -142,8 +163,10 @@
|
|||||||
"visibilityLabel": "Visibility",
|
"visibilityLabel": "Visibility",
|
||||||
"publicOption": "🌍 Public",
|
"publicOption": "🌍 Public",
|
||||||
"privateOption": "🔒 Private",
|
"privateOption": "🔒 Private",
|
||||||
"publicDescription": "Public events are visible to everyone and can be discovered by others",
|
"inviteOnlyOption": "🚧 Invite Only",
|
||||||
"privateDescription": "Private events are only visible to you and people you share the link with",
|
"publicDescription": "Public events are visible to everyone and can be discovered by others.",
|
||||||
|
"privateDescription": "Private events are only visible to you and people you share the link with.",
|
||||||
|
"inviteOnlyDescription": "Event is public but requires a special invite link to attend.",
|
||||||
"creatingEvent": "Creating Event...",
|
"creatingEvent": "Creating Event...",
|
||||||
"createEventButton": "Create Event"
|
"createEventButton": "Create Event"
|
||||||
},
|
},
|
||||||
@@ -170,9 +193,14 @@
|
|||||||
"noAttendeesYet": "No attendees yet",
|
"noAttendeesYet": "No attendees yet",
|
||||||
"beFirstToJoin": "Be the first to join!",
|
"beFirstToJoin": "Be the first to join!",
|
||||||
"copyLinkButton": "Copy Link",
|
"copyLinkButton": "Copy Link",
|
||||||
|
"copyInviteLinkButton": "Copy Invite Link",
|
||||||
|
"inviteOnlyBadge": "Invite Only",
|
||||||
|
"inviteOnlyBannerTitle": "Invite Only Event",
|
||||||
|
"inviteOnlyBannerSubtitle": "You're viewing this event through a special invite link",
|
||||||
"addToCalendarButton": "Add to Calendar",
|
"addToCalendarButton": "Add to Calendar",
|
||||||
"eventLinkCopied": "Event link copied to clipboard!",
|
"eventLinkCopied": "Event link copied to clipboard.",
|
||||||
"rsvpAddedSuccessfully": "RSVP added successfully!",
|
"inviteLinkCopied": "Invite link copied to clipboard.",
|
||||||
|
"rsvpAddedSuccessfully": "RSVP added successfully.",
|
||||||
"removedRsvpSuccessfully": "Removed RSVP successfully.",
|
"removedRsvpSuccessfully": "Removed RSVP successfully.",
|
||||||
"failedToAddRsvp": "Failed to add RSVP",
|
"failedToAddRsvp": "Failed to add RSVP",
|
||||||
"failedToRemoveRsvp": "Failed to remove RSVP",
|
"failedToRemoveRsvp": "Failed to remove RSVP",
|
||||||
@@ -190,7 +218,8 @@
|
|||||||
"viewEventAriaLabel": "View event",
|
"viewEventAriaLabel": "View event",
|
||||||
"editEventAriaLabel": "Edit event",
|
"editEventAriaLabel": "Edit event",
|
||||||
"deleteEventAriaLabel": "Delete event",
|
"deleteEventAriaLabel": "Delete event",
|
||||||
"removeRsvpAriaLabel": "Remove RSVP"
|
"removeRsvpAriaLabel": "Remove RSVP",
|
||||||
|
"inviteLinkExpiresAt": "This link expires when the event starts: {time}"
|
||||||
},
|
},
|
||||||
"discover": {
|
"discover": {
|
||||||
"title": "Discover Events - Cactoide",
|
"title": "Discover Events - Cactoide",
|
||||||
@@ -239,7 +268,7 @@
|
|||||||
"layout": {
|
"layout": {
|
||||||
"defaultTitle": "Cactoide -",
|
"defaultTitle": "Cactoide -",
|
||||||
"defaultDescription": "Create and manage event RSVPs",
|
"defaultDescription": "Create and manage event RSVPs",
|
||||||
"userIdCookieText": "Your UserID storated as a cookie:",
|
"userIdCookieText": "Your UserID stored as a cookie:",
|
||||||
"firstTimeVisiting": "First time visiting. Generating new UserID...",
|
"firstTimeVisiting": "First time visiting. Generating new UserID...",
|
||||||
"copyright": "© 2025 Cactoide"
|
"copyright": "© 2025 Cactoide"
|
||||||
}
|
}
|
||||||
|
|||||||
33
src/lib/inviteTokenHelpers.ts
Normal file
33
src/lib/inviteTokenHelpers.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { randomBytes } from 'crypto';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates a secure random token for invite links
|
||||||
|
* @param length - Length of the token (default: 32)
|
||||||
|
* @returns A random hex string
|
||||||
|
*/
|
||||||
|
export function generateInviteToken(length: number = 32): string {
|
||||||
|
return randomBytes(length / 2).toString('hex');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the expiration time for an invite token
|
||||||
|
* The token expires when the event starts
|
||||||
|
* @param eventDate - The event date in YYYY-MM-DD format
|
||||||
|
* @param eventTime - The event time in HH:MM:SS format
|
||||||
|
* @returns ISO string of the expiration time
|
||||||
|
*/
|
||||||
|
export function calculateTokenExpiration(eventDate: string, eventTime: string): string {
|
||||||
|
const eventDateTime = new Date(`${eventDate}T${eventTime}`);
|
||||||
|
return eventDateTime.toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if an invite token is still valid
|
||||||
|
* @param expiresAt - The expiration time as ISO string
|
||||||
|
* @returns true if token is still valid, false otherwise
|
||||||
|
*/
|
||||||
|
export function isTokenValid(expiresAt: string): boolean {
|
||||||
|
const now = new Date();
|
||||||
|
const expiration = new Date(expiresAt);
|
||||||
|
return now < expiration;
|
||||||
|
}
|
||||||
22
src/lib/logger.ts
Normal file
22
src/lib/logger.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import pino from 'pino';
|
||||||
|
import { LOG_PRETTY, LOG_LEVEL } from '$env/static/private';
|
||||||
|
|
||||||
|
const USE_PRETTY_LOGS = LOG_PRETTY === 'true';
|
||||||
|
|
||||||
|
const transport = USE_PRETTY_LOGS
|
||||||
|
? {
|
||||||
|
target: 'pino-pretty',
|
||||||
|
options: {
|
||||||
|
colorize: true,
|
||||||
|
translateTime: 'SYS:standard',
|
||||||
|
ignore: 'pid,hostname'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
export const logger = pino({
|
||||||
|
level: LOG_LEVEL,
|
||||||
|
transport
|
||||||
|
});
|
||||||
|
|
||||||
|
export type Logger = typeof logger;
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
export type EventType = 'limited' | 'unlimited';
|
export type EventType = 'limited' | 'unlimited';
|
||||||
export type EventVisibility = 'public' | 'private';
|
export type EventVisibility = 'public' | 'private' | 'invite-only';
|
||||||
export type ActionType = 'add' | 'remove';
|
export type ActionType = 'add' | 'remove';
|
||||||
|
export type LocationType = 'none' | 'text' | 'maps';
|
||||||
|
|
||||||
export interface Event {
|
export interface Event {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -8,6 +9,8 @@ export interface Event {
|
|||||||
date: string;
|
date: string;
|
||||||
time: string;
|
time: string;
|
||||||
location: string;
|
location: string;
|
||||||
|
location_type: LocationType;
|
||||||
|
location_url?: string;
|
||||||
type: EventType;
|
type: EventType;
|
||||||
attendee_limit?: number;
|
attendee_limit?: number;
|
||||||
visibility: EventVisibility;
|
visibility: EventVisibility;
|
||||||
@@ -29,6 +32,8 @@ export interface CreateEventData {
|
|||||||
date: string;
|
date: string;
|
||||||
time: string;
|
time: string;
|
||||||
location: string;
|
location: string;
|
||||||
|
location_type: LocationType;
|
||||||
|
location_url?: string;
|
||||||
type: EventType;
|
type: EventType;
|
||||||
attendee_limit?: number;
|
attendee_limit?: number;
|
||||||
visibility: EventVisibility;
|
visibility: EventVisibility;
|
||||||
@@ -40,6 +45,8 @@ export interface DatabaseEvent {
|
|||||||
date: string;
|
date: string;
|
||||||
time: string;
|
time: string;
|
||||||
location: string;
|
location: string;
|
||||||
|
location_type: LocationType;
|
||||||
|
location_url?: string;
|
||||||
type: EventType;
|
type: EventType;
|
||||||
attendee_limit?: number;
|
attendee_limit?: number;
|
||||||
visibility: EventVisibility;
|
visibility: EventVisibility;
|
||||||
@@ -55,3 +62,11 @@ export interface DatabaseRSVP {
|
|||||||
user_id: string;
|
user_id: string;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface InviteToken {
|
||||||
|
id: string;
|
||||||
|
event_id: string;
|
||||||
|
token: string;
|
||||||
|
expires_at: string;
|
||||||
|
created_at: string;
|
||||||
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<!-- Error Content -->
|
<!-- Error Content -->
|
||||||
<div class="container mx-auto flex-1 px-4 py-8">
|
<div class="container mx-auto flex-1 px-4 py-8">
|
||||||
<div class="mx-auto max-w-md text-center">
|
<div class="mx-auto max-w-md text-center">
|
||||||
<div class="rounded-sm border border-red-500/30 bg-red-900/20 p-8">
|
<div class="rounded-sm border border-red-500/30 bg-red-900 p-8">
|
||||||
<div class="mb-4 text-6xl text-red-400">🚨</div>
|
<div class="mb-4 text-6xl text-red-400">🚨</div>
|
||||||
<h2 class="mb-4 text-2xl font-bold text-red-400">{t('errors.errorTitle')}</h2>
|
<h2 class="mb-4 text-2xl font-bold text-red-400">{t('errors.errorTitle')}</h2>
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,5 @@
|
|||||||
import { generateUserId } from '$lib/generateUserId.js';
|
|
||||||
|
|
||||||
export function load({ cookies }) {
|
export function load({ cookies }) {
|
||||||
const cactoideUserId = cookies.get('cactoideUserId');
|
const cactoideUserId = cookies.get('cactoideUserId');
|
||||||
const userId = generateUserId();
|
|
||||||
|
|
||||||
const DAYS = 400; // practical upper bound in many browsers for cookies
|
|
||||||
const MAX_AGE = 60 * 60 * 24 * DAYS;
|
|
||||||
const PATH = '/';
|
|
||||||
|
|
||||||
if (!cactoideUserId) {
|
|
||||||
console.debug(`There is no cactoideUserId cookie, generating new one...`);
|
|
||||||
cookies.set('cactoideUserId', userId, { path: PATH, maxAge: MAX_AGE });
|
|
||||||
} else {
|
|
||||||
console.debug(`cactoideUserId: ${cactoideUserId}`);
|
|
||||||
console.debug(`cactoideUserId cookie found, using existing one...`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cactoideUserId
|
cactoideUserId
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import Navbar from '$lib/components/Navbar.svelte';
|
import Navbar from '$lib/components/Navbar.svelte';
|
||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
|
|
||||||
let { data } = $props();
|
let { data, children } = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<main class="relative z-10">
|
<main class="relative z-10">
|
||||||
<slot />
|
{@render children?.()}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- Footer -->
|
<!-- Footer -->
|
||||||
|
|||||||
11
src/routes/+page.server.ts
Normal file
11
src/routes/+page.server.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { redirect } from '@sveltejs/kit';
|
||||||
|
import type { PageServerLoad } from './$types';
|
||||||
|
import { PUBLIC_LANDING_INFO } from '$env/static/public';
|
||||||
|
|
||||||
|
export const load: PageServerLoad = async () => {
|
||||||
|
if (PUBLIC_LANDING_INFO === 'false') {
|
||||||
|
throw redirect(302, '/discover');
|
||||||
|
}
|
||||||
|
|
||||||
|
return {};
|
||||||
|
};
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<h2 class="mt-6 pt-8 text-xl md:text-2xl">
|
<h2 class="mt-6 pt-8 text-xl md:text-2xl">
|
||||||
{t('home.whyCactoideTitle')}<span class="text-violet-400"
|
{t('home.whyCactoideTitle')}<span class="text-violet-400"
|
||||||
><a href="https://en.wikipedia.org/wiki/Cactoideae" target="_blank">*</a></span
|
><a href="https://en.wikipedia.org/wiki/Cactoideae" target="_blank">*</a></span
|
||||||
>?🌵
|
>
|
||||||
</h2>
|
</h2>
|
||||||
<p class="mt-4 text-lg md:text-xl">
|
<p class="mt-4 text-lg md:text-xl">
|
||||||
{t('home.whyCactoideDescription')}
|
{t('home.whyCactoideDescription')}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
import { database } from '$lib/database/db';
|
import { database } from '$lib/database/db';
|
||||||
import { events } from '$lib/database/schema';
|
import { events, inviteTokens } from '$lib/database/schema';
|
||||||
import { fail, redirect } from '@sveltejs/kit';
|
import { fail, redirect } from '@sveltejs/kit';
|
||||||
import type { Actions } from './$types';
|
import type { Actions } from './$types';
|
||||||
|
import { generateInviteToken, calculateTokenExpiration } from '$lib/inviteTokenHelpers.js';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
// Generate a random URL-friendly ID
|
// Generate a random URL-friendly ID
|
||||||
function generateEventId(): string {
|
function generateEventId(): string {
|
||||||
@@ -21,9 +23,11 @@ export const actions: Actions = {
|
|||||||
const date = formData.get('date') as string;
|
const date = formData.get('date') as string;
|
||||||
const time = formData.get('time') as string;
|
const time = formData.get('time') as string;
|
||||||
const location = formData.get('location') as string;
|
const location = formData.get('location') as string;
|
||||||
|
const locationType = formData.get('location_type') as 'none' | 'text' | 'maps';
|
||||||
|
const locationUrl = formData.get('location_url') as string;
|
||||||
const type = formData.get('type') as 'limited' | 'unlimited';
|
const type = formData.get('type') as 'limited' | 'unlimited';
|
||||||
const attendeeLimit = formData.get('attendee_limit') as string;
|
const attendeeLimit = formData.get('attendee_limit') as string;
|
||||||
const visibility = formData.get('visibility') as 'public' | 'private';
|
const visibility = formData.get('visibility') as 'public' | 'private' | 'invite-only';
|
||||||
const userId = cookies.get('cactoideUserId');
|
const userId = cookies.get('cactoideUserId');
|
||||||
|
|
||||||
// Validation
|
// Validation
|
||||||
@@ -32,7 +36,9 @@ export const actions: Actions = {
|
|||||||
if (!name?.trim()) missingFields.push('name');
|
if (!name?.trim()) missingFields.push('name');
|
||||||
if (!date) missingFields.push('date');
|
if (!date) missingFields.push('date');
|
||||||
if (!time) missingFields.push('time');
|
if (!time) missingFields.push('time');
|
||||||
if (!location?.trim()) missingFields.push('location');
|
if (!locationType) missingFields.push('location_type');
|
||||||
|
if (locationType === 'text' && !location?.trim()) missingFields.push('location');
|
||||||
|
if (locationType === 'maps' && !locationUrl?.trim()) missingFields.push('location_url');
|
||||||
if (!userId) missingFields.push('userId');
|
if (!userId) missingFields.push('userId');
|
||||||
|
|
||||||
if (missingFields.length > 0) {
|
if (missingFields.length > 0) {
|
||||||
@@ -43,6 +49,8 @@ export const actions: Actions = {
|
|||||||
date,
|
date,
|
||||||
time,
|
time,
|
||||||
location,
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
type,
|
type,
|
||||||
attendee_limit: attendeeLimit,
|
attendee_limit: attendeeLimit,
|
||||||
visibility
|
visibility
|
||||||
@@ -50,22 +58,49 @@ export const actions: Actions = {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new Date(date) < new Date()) {
|
// Check if date is in the past using local timezone
|
||||||
|
const [year, month, day] = date.split('-').map(Number);
|
||||||
|
const eventDate = new Date(year, month - 1, day);
|
||||||
|
const today = new Date();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
if (eventDate < today) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
error: 'Date cannot be in the past.',
|
error: 'Date cannot be in the past.',
|
||||||
values: { name, date, time, location, type, attendee_limit: attendeeLimit, visibility }
|
values: {
|
||||||
|
name,
|
||||||
|
date,
|
||||||
|
time,
|
||||||
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
|
type,
|
||||||
|
attendee_limit: attendeeLimit,
|
||||||
|
visibility
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 'limited' && (!attendeeLimit || parseInt(attendeeLimit) < 2)) {
|
if (type === 'limited' && (!attendeeLimit || parseInt(attendeeLimit) < 2)) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
error: 'Limit must be at least 2 for limited events.',
|
error: 'Limit must be at least 2 for limited events.',
|
||||||
values: { name, date, time, location, type, attendee_limit: attendeeLimit, visibility }
|
values: {
|
||||||
|
name,
|
||||||
|
date,
|
||||||
|
time,
|
||||||
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
|
type,
|
||||||
|
attendee_limit: attendeeLimit,
|
||||||
|
visibility
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const eventId = generateEventId();
|
const eventId = generateEventId();
|
||||||
|
|
||||||
|
// Create the event
|
||||||
await database
|
await database
|
||||||
.insert(events)
|
.insert(events)
|
||||||
.values({
|
.values({
|
||||||
@@ -73,17 +108,37 @@ export const actions: Actions = {
|
|||||||
name: name.trim(),
|
name: name.trim(),
|
||||||
date: date,
|
date: date,
|
||||||
time: time,
|
time: time,
|
||||||
location: location.trim(),
|
location: location?.trim() || '',
|
||||||
|
locationType: locationType,
|
||||||
|
locationUrl: locationType === 'maps' ? locationUrl?.trim() : null,
|
||||||
type: type,
|
type: type,
|
||||||
attendeeLimit: type === 'limited' ? parseInt(attendeeLimit) : null,
|
attendeeLimit: type === 'limited' ? parseInt(attendeeLimit) : null,
|
||||||
visibility: visibility,
|
visibility: visibility,
|
||||||
userId: userId
|
userId: userId!
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error('Unexpected error', error);
|
logger.error({ error, eventId, userId }, 'Unexpected error creating event');
|
||||||
throw error;
|
throw error;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Generate invite token for invite-only events
|
||||||
|
if (visibility === 'invite-only') {
|
||||||
|
const token = generateInviteToken();
|
||||||
|
const expiresAt = calculateTokenExpiration(date, time);
|
||||||
|
|
||||||
|
await database
|
||||||
|
.insert(inviteTokens)
|
||||||
|
.values({
|
||||||
|
eventId: eventId,
|
||||||
|
token: token,
|
||||||
|
expiresAt: new Date(expiresAt)
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error('Error creating invite token', error);
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
throw redirect(303, `/event/${eventId}`);
|
throw redirect(303, `/event/${eventId}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { CreateEventData, EventType } from '$lib/types';
|
import type { CreateEventData, EventType, LocationType } from '$lib/types';
|
||||||
import { enhance } from '$app/forms';
|
import { enhance } from '$app/forms';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
@@ -11,9 +11,11 @@
|
|||||||
date: '',
|
date: '',
|
||||||
time: '',
|
time: '',
|
||||||
location: '',
|
location: '',
|
||||||
|
location_type: 'none',
|
||||||
|
location_url: '',
|
||||||
type: 'unlimited',
|
type: 'unlimited',
|
||||||
attendee_limit: undefined,
|
attendee_limit: undefined,
|
||||||
visibility: 'public'
|
visibility: 'public' as 'public' | 'private' | 'invite-only'
|
||||||
};
|
};
|
||||||
|
|
||||||
let errors: Record<string, string> = {};
|
let errors: Record<string, string> = {};
|
||||||
@@ -46,6 +48,19 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleLocationTypeChange = (locationType: LocationType) => {
|
||||||
|
eventData.location_type = locationType;
|
||||||
|
if (locationType === 'none') {
|
||||||
|
eventData.location = '';
|
||||||
|
eventData.location_url = '';
|
||||||
|
} else if (locationType === 'text') {
|
||||||
|
eventData.location_url = '';
|
||||||
|
eventData.location = '';
|
||||||
|
} else {
|
||||||
|
eventData.location = 'Google Maps';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleCancel = () => {
|
const handleCancel = () => {
|
||||||
goto(`/discover`);
|
goto(`/discover`);
|
||||||
};
|
};
|
||||||
@@ -58,7 +73,7 @@
|
|||||||
<div class="flex min-h-screen flex-col">
|
<div class="flex min-h-screen flex-col">
|
||||||
<!-- Main Content -->
|
<!-- Main Content -->
|
||||||
<div class="container mx-auto flex-1 px-4 py-8">
|
<div class="container mx-auto flex-1 px-4 py-8">
|
||||||
<div class="mx-auto max-w-md">
|
<div class="mx-auto max-w-2xl">
|
||||||
<!-- Event Creation Form -->
|
<!-- Event Creation Form -->
|
||||||
<div class="rounded-sm border p-8">
|
<div class="rounded-sm border p-8">
|
||||||
<h2 class="mb-8 text-center text-3xl font-bold text-violet-400">{t('create.formTitle')}</h2>
|
<h2 class="mb-8 text-center text-3xl font-bold text-violet-400">{t('create.formTitle')}</h2>
|
||||||
@@ -83,6 +98,7 @@
|
|||||||
<input type="hidden" name="userId" value={currentUserId} />
|
<input type="hidden" name="userId" value={currentUserId} />
|
||||||
<input type="hidden" name="type" value={eventData.type} />
|
<input type="hidden" name="type" value={eventData.type} />
|
||||||
<input type="hidden" name="visibility" value={eventData.visibility} />
|
<input type="hidden" name="visibility" value={eventData.visibility} />
|
||||||
|
<input type="hidden" name="location_type" value={eventData.location_type} />
|
||||||
|
|
||||||
{#if errors.server}
|
{#if errors.server}
|
||||||
<div class="mb-6 rounded-sm border border-red-200 bg-red-50 p-4 text-red-700">
|
<div class="mb-6 rounded-sm border border-red-200 bg-red-50 p-4 text-red-700">
|
||||||
@@ -148,54 +164,126 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Location -->
|
<!-- Location Type -->
|
||||||
<div>
|
<div>
|
||||||
<label for="location" class="text-dark-800 mb-3 block text-sm font-semibold">
|
<fieldset>
|
||||||
{t('create.locationLabel')} <span class="text-red-400">{t('common.required')}</span>
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
</label>
|
{t('create.locationTypeLabel')}
|
||||||
<input
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
id="location"
|
</legend>
|
||||||
name="location"
|
<div class="grid grid-cols-3 gap-3">
|
||||||
type="text"
|
<button
|
||||||
bind:value={eventData.location}
|
type="button"
|
||||||
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
placeholder={t('create.locationPlaceholder')}
|
'none'
|
||||||
maxlength="200"
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
required
|
: 'border-dark-300 text-dark-700'}"
|
||||||
/>
|
on:click={() => handleLocationTypeChange('none')}
|
||||||
{#if errors.location}
|
>
|
||||||
<p class="mt-2 text-sm font-medium text-red-600">{errors.location}</p>
|
{t('create.locationNoneOption')}
|
||||||
{/if}
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
|
'text'
|
||||||
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700'}"
|
||||||
|
on:click={() => handleLocationTypeChange('text')}
|
||||||
|
>
|
||||||
|
{t('create.locationTextOption')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
|
'maps'
|
||||||
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
|
on:click={() => handleLocationTypeChange('maps')}
|
||||||
|
>
|
||||||
|
{t('create.locationMapsOption')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="mt-2 text-xs text-slate-400 italic">
|
||||||
|
{eventData.location_type === 'none'
|
||||||
|
? t('create.locationNoneDescription')
|
||||||
|
: eventData.location_type === 'text'
|
||||||
|
? t('create.locationTextDescription')
|
||||||
|
: t('create.locationMapsDescription')}
|
||||||
|
</p>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Location Input (only show when not 'none') -->
|
||||||
|
{#if eventData.location_type !== 'none'}
|
||||||
|
<div>
|
||||||
|
<label for="location" class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
|
{eventData.location_type === 'text'
|
||||||
|
? t('create.locationLabel')
|
||||||
|
: t('create.googleMapsUrlLabel')}
|
||||||
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
|
</label>
|
||||||
|
{#if eventData.location_type === 'text'}
|
||||||
|
<input
|
||||||
|
id="location"
|
||||||
|
name="location"
|
||||||
|
type="text"
|
||||||
|
bind:value={eventData.location}
|
||||||
|
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
||||||
|
placeholder={t('create.locationPlaceholder')}
|
||||||
|
maxlength="200"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
{:else}
|
||||||
|
<input
|
||||||
|
id="location_url"
|
||||||
|
name="location_url"
|
||||||
|
type="url"
|
||||||
|
bind:value={eventData.location_url}
|
||||||
|
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
||||||
|
placeholder={t('create.googleMapsUrlPlaceholder')}
|
||||||
|
maxlength="500"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
{#if errors.location}
|
||||||
|
<p class="mt-2 text-sm font-medium text-red-600">{errors.location}</p>
|
||||||
|
{/if}
|
||||||
|
{#if errors.location_url}
|
||||||
|
<p class="mt-2 text-sm font-medium text-red-600">{errors.location_url}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Event Type -->
|
<!-- Event Type -->
|
||||||
<div>
|
<div>
|
||||||
<label class="text-dark-800 mb-3 block text-sm font-semibold">
|
<fieldset>
|
||||||
{t('create.typeLabel')}
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
<span class="text-red-400">{t('common.required')}</span></label
|
{t('create.typeLabel')}
|
||||||
>
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
<div class="grid grid-cols-2 gap-3">
|
</legend>
|
||||||
<button
|
<div class="grid grid-cols-2 gap-3">
|
||||||
type="button"
|
<button
|
||||||
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.type ===
|
type="button"
|
||||||
'unlimited'
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.type ===
|
||||||
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
'unlimited'
|
||||||
: 'border-dark-300 text-dark-700'}"
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
on:click={() => handleTypeChange('unlimited')}
|
: 'border-dark-300 text-dark-700'}"
|
||||||
>
|
on:click={() => handleTypeChange('unlimited')}
|
||||||
{t('create.unlimitedOption')}
|
>
|
||||||
</button>
|
{t('create.unlimitedOption')}
|
||||||
<button
|
</button>
|
||||||
type="button"
|
<button
|
||||||
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.type ===
|
type="button"
|
||||||
'limited'
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.type ===
|
||||||
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
'limited'
|
||||||
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
on:click={() => handleTypeChange('limited')}
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
>
|
on:click={() => handleTypeChange('limited')}
|
||||||
{t('create.limitedOption')}
|
>
|
||||||
</button>
|
{t('create.limitedOption')}
|
||||||
</div>
|
</button>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Limit (only for limited events) -->
|
<!-- Limit (only for limited events) -->
|
||||||
@@ -203,7 +291,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<label for="limit" class="text-dark-800 mb-3 block text-sm font-semibold">
|
<label for="limit" class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
{t('create.attendeeLimitLabel')}
|
{t('create.attendeeLimitLabel')}
|
||||||
{t('common.required')}
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="attendee_limit"
|
id="attendee_limit"
|
||||||
@@ -224,37 +312,51 @@
|
|||||||
|
|
||||||
<!-- Event Visibility -->
|
<!-- Event Visibility -->
|
||||||
<div>
|
<div>
|
||||||
<label class="text-dark-800 mb-3 block text-sm font-semibold">
|
<fieldset>
|
||||||
{t('create.visibilityLabel')}
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
<span class="text-red-400">{t('common.required')}</span></label
|
{t('create.visibilityLabel')}
|
||||||
>
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
<div class="grid grid-cols-2 gap-3">
|
</legend>
|
||||||
<button
|
<div class="grid grid-cols-3 gap-3">
|
||||||
type="button"
|
<button
|
||||||
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
type="button"
|
||||||
'public'
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
||||||
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
'public'
|
||||||
: 'border-dark-300 text-dark-700'}"
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
on:click={() => (eventData.visibility = 'public')}
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
>
|
on:click={() => (eventData.visibility = 'public')}
|
||||||
{t('create.publicOption')}
|
>
|
||||||
</button>
|
{t('create.publicOption')}
|
||||||
<button
|
</button>
|
||||||
type="button"
|
<button
|
||||||
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
type="button"
|
||||||
'private'
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
||||||
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
'private'
|
||||||
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
on:click={() => (eventData.visibility = 'private')}
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
>
|
on:click={() => (eventData.visibility = 'private')}
|
||||||
{t('create.privateOption')}
|
>
|
||||||
</button>
|
{t('create.privateOption')}
|
||||||
</div>
|
</button>
|
||||||
<p class="mt-2 text-xs text-slate-400">
|
<button
|
||||||
{eventData.visibility === 'public'
|
type="button"
|
||||||
? t('create.publicDescription')
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
||||||
: t('create.privateDescription')}
|
'invite-only'
|
||||||
</p>
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
|
on:click={() => (eventData.visibility = 'invite-only')}
|
||||||
|
>
|
||||||
|
{t('create.inviteOnlyOption')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="mt-2 text-xs text-slate-400 italic">
|
||||||
|
{eventData.visibility === 'public'
|
||||||
|
? t('create.publicDescription')
|
||||||
|
: eventData.visibility === 'private'
|
||||||
|
? t('create.privateDescription')
|
||||||
|
: 'Event is public but requires a special invite link to attend'}
|
||||||
|
</p>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex space-x-3">
|
<div class="flex space-x-3">
|
||||||
@@ -269,7 +371,7 @@
|
|||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
class="hover:bg-violet-400/70'l rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
class="hover:bg-violet-400/70'l flex-2 rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
||||||
>
|
>
|
||||||
{#if isSubmitting}
|
{#if isSubmitting}
|
||||||
<div class="flex items-center justify-center">
|
<div class="flex items-center justify-center">
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
import { database } from '$lib/database/db';
|
import { database } from '$lib/database/db';
|
||||||
import { eq, desc } from 'drizzle-orm';
|
import { desc, inArray } from 'drizzle-orm';
|
||||||
import type { PageServerLoad } from './$types';
|
import type { PageServerLoad } from './$types';
|
||||||
import { events } from '$lib/database/schema';
|
import { events } from '$lib/database/schema';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
export const load: PageServerLoad = async () => {
|
export const load: PageServerLoad = async () => {
|
||||||
try {
|
try {
|
||||||
// Fetch all public events ordered by creation date (newest first)
|
// Fetch all non-private events (public and invite-only) ordered by creation date (newest first)
|
||||||
const publicEvents = await database
|
const publicEvents = await database
|
||||||
.select()
|
.select()
|
||||||
.from(events)
|
.from(events)
|
||||||
.where(eq(events.visibility, 'public'))
|
.where(inArray(events.visibility, ['public', 'invite-only']))
|
||||||
.orderBy(desc(events.createdAt));
|
.orderBy(desc(events.createdAt));
|
||||||
|
|
||||||
// Transform the database events to match the expected Event interface
|
// Transform the database events to match the expected Event interface
|
||||||
@@ -19,6 +20,8 @@ export const load: PageServerLoad = async () => {
|
|||||||
date: event.date, // Already in 'YYYY-MM-DD' format
|
date: event.date, // Already in 'YYYY-MM-DD' format
|
||||||
time: event.time, // Already in 'HH:MM:SS' format
|
time: event.time, // Already in 'HH:MM:SS' format
|
||||||
location: event.location,
|
location: event.location,
|
||||||
|
location_type: event.locationType,
|
||||||
|
location_url: event.locationUrl,
|
||||||
type: event.type,
|
type: event.type,
|
||||||
attendee_limit: event.attendeeLimit, // Note: schema uses camelCase
|
attendee_limit: event.attendeeLimit, // Note: schema uses camelCase
|
||||||
visibility: event.visibility,
|
visibility: event.visibility,
|
||||||
@@ -31,7 +34,7 @@ export const load: PageServerLoad = async () => {
|
|||||||
events: transformedEvents
|
events: transformedEvents
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading public events:', error);
|
logger.error({ error }, 'Error loading public events');
|
||||||
|
|
||||||
// Return empty array on error to prevent page crash
|
// Return empty array on error to prevent page crash
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { Event, EventType } from '$lib/types';
|
import type { Event, EventType } from '$lib/types';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import type { PageData } from '../$types';
|
|
||||||
import { formatTime, formatDate, isEventInTimeRange } from '$lib/dateHelpers';
|
import { formatTime, formatDate, isEventInTimeRange } from '$lib/dateHelpers';
|
||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
import Fuse from 'fuse.js';
|
import Fuse from 'fuse.js';
|
||||||
|
|
||||||
|
type DiscoverPageData = {
|
||||||
|
events: Event[];
|
||||||
|
};
|
||||||
|
|
||||||
let publicEvents: Event[] = [];
|
let publicEvents: Event[] = [];
|
||||||
let error = '';
|
let error = '';
|
||||||
let searchQuery = '';
|
let searchQuery = '';
|
||||||
@@ -16,7 +19,7 @@
|
|||||||
let showFilters = false;
|
let showFilters = false;
|
||||||
let fuse: Fuse<Event>;
|
let fuse: Fuse<Event>;
|
||||||
|
|
||||||
export let data: PageData;
|
export let data: DiscoverPageData;
|
||||||
// Use the server-side data
|
// Use the server-side data
|
||||||
$: publicEvents = data?.events || [];
|
$: publicEvents = data?.events || [];
|
||||||
|
|
||||||
@@ -67,8 +70,15 @@
|
|||||||
|
|
||||||
// Sort events by date and time
|
// Sort events by date and time
|
||||||
events = events.sort((a, b) => {
|
events = events.sort((a, b) => {
|
||||||
const dateA = new Date(`${a.date}T${a.time}`);
|
// Parse dates as local timezone to avoid timezone issues
|
||||||
const dateB = new Date(`${b.date}T${b.time}`);
|
const parseEventDateTime = (event: Event) => {
|
||||||
|
const [year, month, day] = event.date.split('-').map(Number);
|
||||||
|
const [hours, minutes, seconds] = event.time.split(':').map(Number);
|
||||||
|
return new Date(year, month - 1, day, hours, minutes, seconds || 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
const dateA = parseEventDateTime(a);
|
||||||
|
const dateB = parseEventDateTime(b);
|
||||||
|
|
||||||
if (selectedSortOrder === 'asc') {
|
if (selectedSortOrder === 'asc') {
|
||||||
return dateA.getTime() - dateB.getTime();
|
return dateA.getTime() - dateB.getTime();
|
||||||
@@ -289,7 +299,20 @@
|
|||||||
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
<span>{event.location}</span>
|
{#if event.location_type === 'none'}
|
||||||
|
<span>N/A</span>
|
||||||
|
{:else if event.location_type === 'maps' && event.location_url}
|
||||||
|
<a
|
||||||
|
href={event.location_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="text-slate-500 transition-colors duration-200 hover:text-slate-300"
|
||||||
|
>
|
||||||
|
{t('create.locationMapsOption')}
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<span>{event.location}</span>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2">
|
||||||
<span
|
<span
|
||||||
@@ -301,6 +324,16 @@
|
|||||||
{event.type === 'limited' ? t('common.limited') : t('common.unlimited')}
|
{event.type === 'limited' ? t('common.limited') : t('common.unlimited')}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex items-center space-x-2">
|
||||||
|
<span
|
||||||
|
class="rounded-sm border px-2 py-1 text-xs font-medium {event.visibility ===
|
||||||
|
'public'
|
||||||
|
? 'border-teal-500 text-teal-500'
|
||||||
|
: 'border-amber-600 text-amber-600'}"
|
||||||
|
>
|
||||||
|
{event.visibility === 'public' ? t('common.public') : t('common.inviteOnly')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { events } from '$lib/database/schema';
|
|||||||
import { fail } from '@sveltejs/kit';
|
import { fail } from '@sveltejs/kit';
|
||||||
import { eq, desc } from 'drizzle-orm';
|
import { eq, desc } from 'drizzle-orm';
|
||||||
import type { Actions } from './$types';
|
import type { Actions } from './$types';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
export const load = async ({ cookies }) => {
|
export const load = async ({ cookies }) => {
|
||||||
const userId = cookies.get('cactoideUserId');
|
const userId = cookies.get('cactoideUserId');
|
||||||
@@ -24,6 +25,8 @@ export const load = async ({ cookies }) => {
|
|||||||
date: event.date,
|
date: event.date,
|
||||||
time: event.time,
|
time: event.time,
|
||||||
location: event.location,
|
location: event.location,
|
||||||
|
location_type: event.locationType,
|
||||||
|
location_url: event.locationUrl,
|
||||||
type: event.type,
|
type: event.type,
|
||||||
attendee_limit: event.attendeeLimit,
|
attendee_limit: event.attendeeLimit,
|
||||||
visibility: event.visibility,
|
visibility: event.visibility,
|
||||||
@@ -34,7 +37,7 @@ export const load = async ({ cookies }) => {
|
|||||||
|
|
||||||
return { events: transformedEvents };
|
return { events: transformedEvents };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading user events:', error);
|
logger.error({ error, userId }, 'Error loading user events');
|
||||||
return { events: [] };
|
return { events: [] };
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -66,7 +69,7 @@ export const actions: Actions = {
|
|||||||
|
|
||||||
return { success: true };
|
return { success: true };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error deleting event:', error);
|
logger.error({ error, eventId, userId }, 'Error deleting event');
|
||||||
return fail(500, { error: 'Failed to delete event' });
|
return fail(500, { error: 'Failed to delete event' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,7 +126,20 @@
|
|||||||
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
<span>{event.location}</span>
|
{#if event.location_type === 'none'}
|
||||||
|
<span>N/A</span>
|
||||||
|
{:else if event.location_type === 'maps' && event.location_url}
|
||||||
|
<a
|
||||||
|
href={event.location_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="text-slate-500 transition-colors duration-200 hover:text-slate-300"
|
||||||
|
>
|
||||||
|
Google Maps
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<span>{event.location}</span>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2">
|
||||||
<span
|
<span
|
||||||
@@ -143,7 +156,8 @@
|
|||||||
? 'border-green-300 text-green-400'
|
? 'border-green-300 text-green-400'
|
||||||
: 'border-orange-300 text-orange-400'}"
|
: 'border-orange-300 text-orange-400'}"
|
||||||
>
|
>
|
||||||
{event.visibility === 'public' ? t('common.public') : t('common.private')}
|
<!-- TODO(polaroi8d): replace with something better solution; message.json using this, beacuse of common.invite-only works here -->
|
||||||
|
{t(`common.${event.visibility}`)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center space-x-2"></div>
|
<div class="flex items-center space-x-2"></div>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { events, rsvps } from '$lib/database/schema';
|
|||||||
import { eq, asc } from 'drizzle-orm';
|
import { eq, asc } from 'drizzle-orm';
|
||||||
import { error, fail } from '@sveltejs/kit';
|
import { error, fail } from '@sveltejs/kit';
|
||||||
import type { PageServerLoad, Actions } from './$types';
|
import type { PageServerLoad, Actions } from './$types';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
export const load: PageServerLoad = async ({ params, cookies }) => {
|
export const load: PageServerLoad = async ({ params, cookies }) => {
|
||||||
const eventId = params.id;
|
const eventId = params.id;
|
||||||
@@ -25,6 +26,16 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
|
|||||||
const event = eventData[0];
|
const event = eventData[0];
|
||||||
const eventRsvps = rsvpData;
|
const eventRsvps = rsvpData;
|
||||||
|
|
||||||
|
// Check if this is an invite-only event
|
||||||
|
if (event.visibility === 'invite-only') {
|
||||||
|
// For invite-only events, check if user is the event creator
|
||||||
|
const userId = cookies.get('cactoideUserId');
|
||||||
|
if (event.userId !== userId) {
|
||||||
|
// User is not the creator, redirect to a message about needing invite
|
||||||
|
throw error(403, 'This event requires an invite link to view');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Transform the data to match the expected interface
|
// Transform the data to match the expected interface
|
||||||
const transformedEvent = {
|
const transformedEvent = {
|
||||||
id: event.id,
|
id: event.id,
|
||||||
@@ -32,6 +43,8 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
|
|||||||
date: event.date,
|
date: event.date,
|
||||||
time: event.time,
|
time: event.time,
|
||||||
location: event.location,
|
location: event.location,
|
||||||
|
location_type: event.locationType,
|
||||||
|
location_url: event.locationUrl,
|
||||||
type: event.type,
|
type: event.type,
|
||||||
attendee_limit: event.attendeeLimit,
|
attendee_limit: event.attendeeLimit,
|
||||||
visibility: event.visibility,
|
visibility: event.visibility,
|
||||||
@@ -58,7 +71,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof Response) throw err; // This is the 404 error
|
if (err instanceof Response) throw err; // This is the 404 error
|
||||||
|
|
||||||
console.error('Error loading event:', err);
|
logger.error({ error: err, eventId }, 'Error loading event');
|
||||||
throw error(500, 'Failed to load event');
|
throw error(500, 'Failed to load event');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -83,6 +96,11 @@ export const actions: Actions = {
|
|||||||
return fail(404, { error: 'Event not found' });
|
return fail(404, { error: 'Event not found' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if this is an invite-only event
|
||||||
|
if (eventData.visibility === 'invite-only') {
|
||||||
|
return fail(403, { error: 'This event requires an invite link to RSVP' });
|
||||||
|
}
|
||||||
|
|
||||||
// Get current RSVPs
|
// Get current RSVPs
|
||||||
const currentRSVPs = await database.select().from(rsvps).where(eq(rsvps.eventId, eventId));
|
const currentRSVPs = await database.select().from(rsvps).where(eq(rsvps.eventId, eventId));
|
||||||
|
|
||||||
@@ -128,7 +146,7 @@ export const actions: Actions = {
|
|||||||
|
|
||||||
return { success: true, type: 'add' };
|
return { success: true, type: 'add' };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error adding RSVP:', err);
|
logger.error({ error: err, eventId, userId, name }, 'Error adding RSVP');
|
||||||
return fail(500, { error: 'Failed to add RSVP' });
|
return fail(500, { error: 'Failed to add RSVP' });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -146,7 +164,7 @@ export const actions: Actions = {
|
|||||||
await database.delete(rsvps).where(eq(rsvps.id, rsvpId));
|
await database.delete(rsvps).where(eq(rsvps.id, rsvpId));
|
||||||
return { success: true, type: 'remove' };
|
return { success: true, type: 'remove' };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error removing RSVP:', err);
|
logger.error({ error: err, rsvpId }, 'Error removing RSVP');
|
||||||
return fail(500, { error: 'Failed to remove RSVP' });
|
return fail(500, { error: 'Failed to remove RSVP' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/stores';
|
import { page } from '$app/stores';
|
||||||
|
import { browser } from '$app/environment';
|
||||||
import type { Event, RSVP } from '$lib/types';
|
import type { Event, RSVP } from '$lib/types';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { enhance } from '$app/forms';
|
import { enhance } from '$app/forms';
|
||||||
@@ -9,32 +10,37 @@
|
|||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
|
|
||||||
export let data: { event: Event; rsvps: RSVP[]; userId: string };
|
export let data: { event: Event; rsvps: RSVP[]; userId: string };
|
||||||
export let form;
|
type FormDataLocal = { success?: boolean; error?: string; type?: 'add' | 'remove' | 'copy' };
|
||||||
|
export let form: FormDataLocal | undefined;
|
||||||
|
|
||||||
let event: Event;
|
let event: Event;
|
||||||
let rsvps: RSVP[] = [];
|
let rsvps: RSVP[] = [];
|
||||||
let newAttendeeName = '';
|
let newAttendeeName = '';
|
||||||
let isAddingRSVP = false;
|
let isAddingRSVP = false;
|
||||||
let error = '';
|
let error = '';
|
||||||
let success = '';
|
let success = ''; // TODO: change to boolean and refactor with 482-506
|
||||||
let addGuests = false;
|
let addGuests = false;
|
||||||
let numberOfGuests = 1;
|
let numberOfGuests = 1;
|
||||||
let showCalendarModal = false;
|
let showCalendarModal = false;
|
||||||
let calendarEvent: CalendarEvent;
|
let calendarEvent: CalendarEvent;
|
||||||
|
let toastType: 'add' | 'remove' | 'copy' | null = null;
|
||||||
|
let typeToShow: 'add' | 'remove' | 'copy' | undefined;
|
||||||
|
let successHideTimer: number | null = null;
|
||||||
|
|
||||||
// Use server-side data
|
// Use server-side data
|
||||||
$: event = data.event;
|
$: event = data.event;
|
||||||
$: rsvps = data.rsvps;
|
$: rsvps = data.rsvps;
|
||||||
$: currentUserId = data.userId;
|
$: currentUserId = data.userId;
|
||||||
|
$: isEventCreator = event.user_id === currentUserId;
|
||||||
|
|
||||||
// Create calendar event object when event data changes
|
// Create calendar event object when event data changes
|
||||||
$: if (event) {
|
$: if (event && browser) {
|
||||||
calendarEvent = {
|
calendarEvent = {
|
||||||
name: event.name,
|
name: event.name,
|
||||||
date: event.date,
|
date: event.date,
|
||||||
time: event.time,
|
time: event.time,
|
||||||
location: event.location,
|
location: event.location,
|
||||||
url: `${window.location.origin}/event/${eventId}`
|
url: `${$page.url.origin}/event/${eventId}`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,30 +50,56 @@
|
|||||||
success = '';
|
success = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle form success from server
|
const handleFormSuccess = () => {
|
||||||
$: if (form?.success) {
|
if (form?.type === 'add') {
|
||||||
success = 'RSVP added successfully!';
|
success = 'RSVP added successfully!';
|
||||||
|
} else {
|
||||||
|
success = 'RSVP removed successfully.';
|
||||||
|
}
|
||||||
|
|
||||||
error = '';
|
error = '';
|
||||||
newAttendeeName = '';
|
newAttendeeName = '';
|
||||||
addGuests = false;
|
addGuests = false;
|
||||||
numberOfGuests = 1;
|
numberOfGuests = 1;
|
||||||
}
|
|
||||||
|
toastType = form?.type || 'add';
|
||||||
|
|
||||||
|
if (browser) {
|
||||||
|
if (successHideTimer) clearTimeout(successHideTimer);
|
||||||
|
successHideTimer = window.setTimeout(() => {
|
||||||
|
success = '';
|
||||||
|
toastType = null;
|
||||||
|
}, 3000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle form success from server
|
||||||
|
$: if (form?.success) handleFormSuccess();
|
||||||
|
|
||||||
|
// Derive toast type from local or server form
|
||||||
|
$: typeToShow = toastType ?? form?.type;
|
||||||
|
|
||||||
const eventId = $page.params.id || '';
|
const eventId = $page.params.id || '';
|
||||||
|
|
||||||
const copyEventLink = () => {
|
const copyEventLink = () => {
|
||||||
const url = `${window.location.origin}/event/${eventId}`;
|
if (browser && isEventCreator) {
|
||||||
navigator.clipboard.writeText(url).then(() => {
|
const url = `${$page.url.origin}/event/${eventId}`;
|
||||||
success = 'Event link copied to clipboard!';
|
navigator.clipboard.writeText(url).then(() => {
|
||||||
setTimeout(() => {
|
toastType = 'copy';
|
||||||
success = '';
|
success = t('event.eventLinkCopied');
|
||||||
}, 3000);
|
|
||||||
});
|
setTimeout(() => {
|
||||||
|
success = '';
|
||||||
|
toastType = null;
|
||||||
|
}, 3000);
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const clearMessages = () => {
|
const clearMessages = () => {
|
||||||
error = '';
|
error = '';
|
||||||
success = '';
|
success = '';
|
||||||
|
toastType = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Calendar modal functions
|
// Calendar modal functions
|
||||||
@@ -103,7 +135,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if event}
|
{:else if event}
|
||||||
<div class="mx-auto max-w-md space-y-6">
|
<div class="mx-auto max-w-2xl space-y-6">
|
||||||
<!-- Event Details Card -->
|
<!-- Event Details Card -->
|
||||||
|
|
||||||
<div class="rounded-sm border p-6 shadow-2xl">
|
<div class="rounded-sm border p-6 shadow-2xl">
|
||||||
@@ -133,7 +165,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Location -->
|
<!-- Location (only show when not 'none') -->
|
||||||
<div class="flex items-center space-x-3 text-violet-400">
|
<div class="flex items-center space-x-3 text-violet-400">
|
||||||
<div class="flex h-8 w-8 items-center justify-center rounded-sm">
|
<div class="flex h-8 w-8 items-center justify-center rounded-sm">
|
||||||
<svg class=" h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class=" h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
@@ -152,7 +184,20 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p class="font-semibold text-white">{event.location}</p>
|
{#if event.location_type === 'none'}
|
||||||
|
<p class="font-semibold text-white">N/A</p>
|
||||||
|
{:else if event.location_type === 'maps' && event.location_url}
|
||||||
|
<a
|
||||||
|
href={event.location_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="font-semibold text-white transition-colors duration-200 hover:text-violet-300"
|
||||||
|
>
|
||||||
|
{t('create.locationMapsOption')}
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<p class="font-semibold text-white">{event.location}</p>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -192,7 +237,13 @@
|
|||||||
<div class=" rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
<div class=" rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
||||||
<h3 class=" mb-4 text-xl font-bold">{t('event.joinThisEvent')}</h3>
|
<h3 class=" mb-4 text-xl font-bold">{t('event.joinThisEvent')}</h3>
|
||||||
|
|
||||||
{#if event.type === 'limited' && event.attendee_limit && rsvps.length >= event.attendee_limit}
|
{#if event.visibility === 'invite-only'}
|
||||||
|
<div class="py-6 text-center">
|
||||||
|
<div class="mb-3 text-4xl">🎫</div>
|
||||||
|
<p class="font-semibold text-amber-400">{t('event.inviteOnlyBannerTitle')}</p>
|
||||||
|
<p class="mt-1 text-sm text-amber-300">{t('common.inviteRequiredToDetails')}</p>
|
||||||
|
</div>
|
||||||
|
{:else if event.type === 'limited' && event.attendee_limit && rsvps.length >= event.attendee_limit}
|
||||||
<div class="py-6 text-center">
|
<div class="py-6 text-center">
|
||||||
<div class="mb-3 text-4xl text-red-400">🚫</div>
|
<div class="mb-3 text-4xl text-red-400">🚫</div>
|
||||||
<p class="font-semibold text-red-400">{t('event.eventIsFull')}</p>
|
<p class="font-semibold text-red-400">{t('event.eventIsFull')}</p>
|
||||||
@@ -300,101 +351,113 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Attendees List -->
|
<!-- Attendees List -->
|
||||||
<div class="rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
{#if event.visibility !== 'invite-only'}
|
||||||
<div class="mb-4 flex items-center justify-between">
|
<div class="rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
||||||
<h3 class=" text-xl font-bold">{t('event.attendeesTitle')}</h3>
|
<div class="mb-4 flex items-center justify-between">
|
||||||
<span class="text-2xl font-bold">{rsvps.length}</span>
|
<h3 class=" text-xl font-bold">{t('event.attendeesTitle')}</h3>
|
||||||
</div>
|
<span class="text-2xl font-bold">{rsvps.length}</span>
|
||||||
|
|
||||||
{#if rsvps.length === 0}
|
|
||||||
<div class="text-dark-400 py-8 text-center">
|
|
||||||
<p>{t('event.noAttendeesYet')}</p>
|
|
||||||
<p class="mt-1 text-sm">{t('event.beFirstToJoin')}</p>
|
|
||||||
</div>
|
</div>
|
||||||
{:else}
|
|
||||||
<div class="space-y-3">
|
{#if rsvps.length === 0}
|
||||||
{#each rsvps as attendee, i (i)}
|
<div class="text-dark-400 py-8 text-center">
|
||||||
<div
|
<p>{t('event.noAttendeesYet')}</p>
|
||||||
class="flex items-center justify-between rounded-sm border border-white/20 p-3"
|
<p class="mt-1 text-sm">{t('event.beFirstToJoin')}</p>
|
||||||
>
|
</div>
|
||||||
<div class="flex items-center space-x-3">
|
{:else}
|
||||||
<div
|
<div class="space-y-3">
|
||||||
class="flex h-8 w-8 items-center justify-center rounded-full text-sm font-bold {attendee.name.includes(
|
{#each rsvps as attendee, i (i)}
|
||||||
"'s Guest"
|
<div
|
||||||
)
|
class="flex items-center justify-between rounded-sm border border-white/20 p-3"
|
||||||
? 'text-white-400 bg-violet-500/40'
|
>
|
||||||
: 'bg-violet-500/20 text-violet-400'}"
|
<div class="flex items-center space-x-3">
|
||||||
>
|
<div
|
||||||
{attendee.name.charAt(0).toUpperCase()}
|
class="flex h-8 w-8 items-center justify-center rounded-full text-sm font-bold {attendee.name.includes(
|
||||||
</div>
|
"'s Guest"
|
||||||
<div>
|
)
|
||||||
<p
|
? 'text-white-400 bg-violet-500/40'
|
||||||
class="font-medium text-white {attendee.name.includes("'s Guest")
|
: 'bg-violet-500/20 text-violet-400'}"
|
||||||
? 'text-amber-300'
|
|
||||||
: ''}"
|
|
||||||
>
|
>
|
||||||
{attendee.name}
|
{attendee.name.charAt(0).toUpperCase()}
|
||||||
</p>
|
</div>
|
||||||
<p class="text-xs text-violet-400">
|
<div>
|
||||||
{(() => {
|
<p
|
||||||
const date = new Date(attendee.created_at);
|
class="font-medium text-white {attendee.name.includes("'s Guest")
|
||||||
const year = date.getFullYear();
|
? 'text-amber-300'
|
||||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
: ''}"
|
||||||
const day = String(date.getDate()).padStart(2, '0');
|
>
|
||||||
const hours = String(date.getHours()).padStart(2, '0');
|
{attendee.name}
|
||||||
const minutes = String(date.getMinutes()).padStart(2, '0');
|
</p>
|
||||||
return `${year}/${month}/${day} ${hours}:${minutes}`;
|
<p class="text-xs text-violet-400">
|
||||||
})()}
|
{(() => {
|
||||||
</p>
|
const date = new Date(attendee.created_at);
|
||||||
|
const year = date.getFullYear();
|
||||||
|
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||||
|
const day = String(date.getDate()).padStart(2, '0');
|
||||||
|
const hours = String(date.getHours()).padStart(2, '0');
|
||||||
|
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||||
|
return `${year}/${month}/${day} ${hours}:${minutes}`;
|
||||||
|
})()}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{#if attendee.user_id === currentUserId}
|
||||||
|
<form
|
||||||
|
method="POST"
|
||||||
|
action="?/removeRSVP"
|
||||||
|
use:enhance={() => {
|
||||||
|
clearMessages();
|
||||||
|
return async ({ result, update }) => {
|
||||||
|
if (result.type === 'failure') {
|
||||||
|
error = String(result.data?.error || 'Failed to remove RSVP');
|
||||||
|
}
|
||||||
|
update();
|
||||||
|
};
|
||||||
|
}}
|
||||||
|
style="display: inline;"
|
||||||
|
>
|
||||||
|
<input type="hidden" name="rsvpId" value={attendee.id} />
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="text-dark-400 p-1 transition-colors duration-200 hover:text-red-400"
|
||||||
|
aria-label={t('event.removeRsvpAriaLabel')}
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="h-4 w-4"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
{/each}
|
||||||
{#if attendee.user_id === currentUserId}
|
</div>
|
||||||
<form
|
{/if}
|
||||||
method="POST"
|
</div>
|
||||||
action="?/removeRSVP"
|
{/if}
|
||||||
use:enhance={() => {
|
|
||||||
clearMessages();
|
|
||||||
return async ({ result, update }) => {
|
|
||||||
if (result.type === 'failure') {
|
|
||||||
error = String(result.data?.error || 'Failed to remove RSVP');
|
|
||||||
}
|
|
||||||
update();
|
|
||||||
};
|
|
||||||
}}
|
|
||||||
style="display: inline;"
|
|
||||||
>
|
|
||||||
<input type="hidden" name="rsvpId" value={attendee.id} />
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
class="text-dark-400 p-1 transition-colors duration-200 hover:text-red-400"
|
|
||||||
aria-label={t('event.removeRsvpAriaLabel')}
|
|
||||||
>
|
|
||||||
<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
stroke-width="2"
|
|
||||||
d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Action Buttons -->
|
<!-- Action Buttons -->
|
||||||
<div class="max-w-2xl space-y-3">
|
<div class="max-w-2xl space-y-3">
|
||||||
<button
|
{#if event.visibility !== 'invite-only'}
|
||||||
on:click={copyEventLink}
|
<button
|
||||||
class="hover:bg-violet-400/70' w-full rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
on:click={copyEventLink}
|
||||||
>
|
disabled={!isEventCreator}
|
||||||
{t('event.copyLinkButton')}
|
class="w-full rounded-sm border-2 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105 {isEventCreator
|
||||||
</button>
|
? 'border-violet-500 bg-violet-400/20 hover:bg-violet-400/70'
|
||||||
|
: 'cursor-not-allowed border-gray-500 bg-gray-600/20 hover:bg-gray-600/30'}"
|
||||||
|
>
|
||||||
|
{t('event.copyLinkButton')}
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
<button
|
<button
|
||||||
on:click={openCalendarModal}
|
on:click={openCalendarModal}
|
||||||
class="hover:bg-violet-400/70' w-full rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
class="hover:bg-violet-400/70' w-full rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
||||||
@@ -408,36 +471,44 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Calendar Modal -->
|
<!-- Calendar Modal -->
|
||||||
{#if calendarEvent}
|
{#if calendarEvent && browser}
|
||||||
<CalendarModal
|
<CalendarModal
|
||||||
bind:isOpen={showCalendarModal}
|
bind:isOpen={showCalendarModal}
|
||||||
event={calendarEvent}
|
event={calendarEvent}
|
||||||
{eventId}
|
{eventId}
|
||||||
baseUrl={window.location.origin}
|
baseUrl={$page.url.origin}
|
||||||
on:close={closeCalendarModal}
|
on:close={closeCalendarModal}
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- Success/Error Messages -->
|
<!-- Success/Error Messages -->
|
||||||
{#if success}
|
{#if success}
|
||||||
{#if form?.type === 'add'}
|
{#if typeToShow === 'add'}
|
||||||
<div
|
<div
|
||||||
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-green-500/30 bg-green-900/20 p-4 text-green-400"
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-green-500/30 bg-green-900 p-4 text-green-400"
|
||||||
>
|
>
|
||||||
{success}
|
{success}
|
||||||
</div>
|
</div>
|
||||||
{:else if form?.type === 'remove'}
|
{:else if typeToShow === 'remove'}
|
||||||
<div
|
<div
|
||||||
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-yellow-500/30 bg-yellow-900/20 p-4 text-yellow-400"
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-yellow-500/30 bg-yellow-900 p-4 text-yellow-400"
|
||||||
>
|
>
|
||||||
{t('event.removedRsvpSuccessfully')}
|
{t('event.removedRsvpSuccessfully')}
|
||||||
</div>
|
</div>
|
||||||
|
{:else if typeToShow === 'copy'}
|
||||||
|
<div
|
||||||
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-yellow-500/30 bg-yellow-900 p-4 text-yellow-400"
|
||||||
|
>
|
||||||
|
{t('event.eventLinkCopied')}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<!-- fallback -->
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if error}
|
{#if error}
|
||||||
<div
|
<div
|
||||||
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-red-500/30 bg-red-900/20 p-4 text-red-400"
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-red-500/30 bg-red-900 p-4 text-red-400"
|
||||||
>
|
>
|
||||||
{error}
|
{error}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { database } from '$lib/database/db';
|
import { database } from '$lib/database/db';
|
||||||
import { events } from '$lib/database/schema';
|
import { events, inviteTokens } from '$lib/database/schema';
|
||||||
import { eq, and } from 'drizzle-orm';
|
import { eq, and } from 'drizzle-orm';
|
||||||
import { fail, redirect } from '@sveltejs/kit';
|
import { fail, redirect } from '@sveltejs/kit';
|
||||||
import type { Actions, PageServerLoad } from './$types';
|
import type { Actions, PageServerLoad } from './$types';
|
||||||
|
import { logger } from '$lib/logger';
|
||||||
|
|
||||||
export const load: PageServerLoad = async ({ params, cookies }) => {
|
export const load: PageServerLoad = async ({ params, cookies }) => {
|
||||||
const eventId = params.id;
|
const eventId = params.id;
|
||||||
@@ -23,8 +24,30 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
|
|||||||
throw redirect(303, '/event');
|
throw redirect(303, '/event');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fetch invite token if this is an invite-only event
|
||||||
|
let inviteToken = null;
|
||||||
|
if (event[0].visibility === 'invite-only') {
|
||||||
|
const tokenData = await database
|
||||||
|
.select()
|
||||||
|
.from(inviteTokens)
|
||||||
|
.where(eq(inviteTokens.eventId, eventId))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (tokenData.length > 0) {
|
||||||
|
inviteToken = {
|
||||||
|
id: tokenData[0].id,
|
||||||
|
event_id: tokenData[0].eventId,
|
||||||
|
token: tokenData[0].token,
|
||||||
|
expires_at: tokenData[0].expiresAt.toISOString(),
|
||||||
|
created_at: tokenData[0].createdAt?.toISOString() || new Date().toISOString()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
event: event[0]
|
event: event[0],
|
||||||
|
inviteToken,
|
||||||
|
userId
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -53,6 +76,8 @@ export const actions: Actions = {
|
|||||||
const date = formData.get('date') as string;
|
const date = formData.get('date') as string;
|
||||||
const time = formData.get('time') as string;
|
const time = formData.get('time') as string;
|
||||||
const location = formData.get('location') as string;
|
const location = formData.get('location') as string;
|
||||||
|
const locationType = formData.get('locationType') as string;
|
||||||
|
const locationUrl = formData.get('location_url') as string;
|
||||||
const type = formData.get('type') as 'limited' | 'unlimited';
|
const type = formData.get('type') as 'limited' | 'unlimited';
|
||||||
const attendeeLimit = formData.get('attendee_limit') as string;
|
const attendeeLimit = formData.get('attendee_limit') as string;
|
||||||
const visibility = formData.get('visibility') as 'public' | 'private';
|
const visibility = formData.get('visibility') as 'public' | 'private';
|
||||||
@@ -63,7 +88,9 @@ export const actions: Actions = {
|
|||||||
if (!name?.trim()) missingFields.push('name');
|
if (!name?.trim()) missingFields.push('name');
|
||||||
if (!date) missingFields.push('date');
|
if (!date) missingFields.push('date');
|
||||||
if (!time) missingFields.push('time');
|
if (!time) missingFields.push('time');
|
||||||
if (!location?.trim()) missingFields.push('location');
|
if (!locationType) missingFields.push('location_type');
|
||||||
|
if (locationType === 'text' && !location?.trim()) missingFields.push('location');
|
||||||
|
if (locationType === 'maps' && !locationUrl?.trim()) missingFields.push('location_url');
|
||||||
|
|
||||||
if (missingFields.length > 0) {
|
if (missingFields.length > 0) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
@@ -73,6 +100,8 @@ export const actions: Actions = {
|
|||||||
date,
|
date,
|
||||||
time,
|
time,
|
||||||
location,
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
type,
|
type,
|
||||||
attendee_limit: attendeeLimit,
|
attendee_limit: attendeeLimit,
|
||||||
visibility
|
visibility
|
||||||
@@ -80,25 +109,45 @@ export const actions: Actions = {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if date is in the past (but allow editing past events for corrections)
|
// Check if date is in the past using local timezone
|
||||||
const eventDate = new Date(date);
|
const [year, month, day] = date.split('-').map(Number);
|
||||||
|
const eventDate = new Date(year, month - 1, day);
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
if (eventDate < today) {
|
if (eventDate < today) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
error: 'Date cannot be in the past.',
|
error: 'Date cannot be in the past.',
|
||||||
values: { name, date, time, location, type, attendee_limit: attendeeLimit, visibility }
|
values: {
|
||||||
|
name,
|
||||||
|
date,
|
||||||
|
time,
|
||||||
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
|
type,
|
||||||
|
attendee_limit: attendeeLimit,
|
||||||
|
visibility
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 'limited' && (!attendeeLimit || parseInt(attendeeLimit) < 2)) {
|
if (type === 'limited' && (!attendeeLimit || parseInt(attendeeLimit) < 2)) {
|
||||||
return fail(400, {
|
return fail(400, {
|
||||||
error: 'Limit must be at least 2 for limited events.',
|
error: 'Limit must be at least 2 for limited events.',
|
||||||
values: { name, date, time, location, type, attendee_limit: attendeeLimit, visibility }
|
values: {
|
||||||
|
name,
|
||||||
|
date,
|
||||||
|
time,
|
||||||
|
location,
|
||||||
|
location_type: locationType,
|
||||||
|
location_url: locationUrl,
|
||||||
|
type,
|
||||||
|
attendee_limit: attendeeLimit,
|
||||||
|
visibility
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the event
|
// Update the event
|
||||||
await database
|
await database
|
||||||
.update(events)
|
.update(events)
|
||||||
@@ -106,7 +155,9 @@ export const actions: Actions = {
|
|||||||
name: name.trim(),
|
name: name.trim(),
|
||||||
date: date,
|
date: date,
|
||||||
time: time,
|
time: time,
|
||||||
location: location.trim(),
|
location: location?.trim() || '',
|
||||||
|
locationType: locationType as 'none' | 'text' | 'maps',
|
||||||
|
locationUrl: locationType === 'maps' ? locationUrl?.trim() : null,
|
||||||
type: type,
|
type: type,
|
||||||
attendeeLimit: type === 'limited' ? parseInt(attendeeLimit) : null,
|
attendeeLimit: type === 'limited' ? parseInt(attendeeLimit) : null,
|
||||||
visibility: visibility,
|
visibility: visibility,
|
||||||
@@ -114,7 +165,7 @@ export const actions: Actions = {
|
|||||||
})
|
})
|
||||||
.where(and(eq(events.id, eventId), eq(events.userId, userId)))
|
.where(and(eq(events.id, eventId), eq(events.userId, userId)))
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error('Unexpected error updating event', error);
|
logger.error({ error, eventId, userId }, 'Unexpected error updating event');
|
||||||
throw error;
|
throw error;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { EventType } from '$lib/types';
|
import type { CreateEventData, EventType, LocationType } from '$lib/types';
|
||||||
import { enhance } from '$app/forms';
|
import { enhance } from '$app/forms';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { t } from '$lib/i18n/i18n.js';
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
@@ -7,18 +7,24 @@
|
|||||||
export let data;
|
export let data;
|
||||||
export let form;
|
export let form;
|
||||||
|
|
||||||
let eventData = {
|
let eventData: CreateEventData = {
|
||||||
name: data.event.name,
|
name: data.event.name,
|
||||||
date: data.event.date,
|
date: data.event.date,
|
||||||
time: data.event.time,
|
time: data.event.time,
|
||||||
location: data.event.location,
|
location: data.event.location,
|
||||||
|
location_type: data.event.locationType || 'none',
|
||||||
|
location_url: data.event.locationUrl || '',
|
||||||
type: data.event.type,
|
type: data.event.type,
|
||||||
attendee_limit: data.event.attendeeLimit,
|
attendee_limit: data.event.attendeeLimit || undefined,
|
||||||
visibility: data.event.visibility
|
visibility: data.event.visibility
|
||||||
};
|
};
|
||||||
|
|
||||||
let errors: Record<string, string> = {};
|
let errors: Record<string, string> = {};
|
||||||
let isSubmitting = false;
|
let isSubmitting = false;
|
||||||
|
let inviteToken = data.inviteToken;
|
||||||
|
|
||||||
|
let showInviteLinkToast = false;
|
||||||
|
let toastHideTimer: number | null = null;
|
||||||
|
|
||||||
// Get today's date in YYYY-MM-DD format for min attribute
|
// Get today's date in YYYY-MM-DD format for min attribute
|
||||||
const today = new Date().toISOString().split('T')[0];
|
const today = new Date().toISOString().split('T')[0];
|
||||||
@@ -38,20 +44,51 @@
|
|||||||
attendee_limit: (values as any).attendee_limit
|
attendee_limit: (values as any).attendee_limit
|
||||||
? // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
? // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
parseInt(String((values as any).attendee_limit))
|
parseInt(String((values as any).attendee_limit))
|
||||||
: null
|
: undefined
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleTypeChange = (type: EventType) => {
|
const handleTypeChange = (type: EventType) => {
|
||||||
eventData.type = type;
|
eventData.type = type;
|
||||||
if (type === 'unlimited') {
|
if (type === 'unlimited') {
|
||||||
eventData.attendee_limit = null;
|
eventData.attendee_limit = undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLocationTypeChange = (locationType: LocationType) => {
|
||||||
|
eventData.location_type = locationType;
|
||||||
|
if (locationType === 'none') {
|
||||||
|
eventData.location = '';
|
||||||
|
eventData.location_url = '';
|
||||||
|
} else if (locationType === 'text') {
|
||||||
|
eventData.location_url = '';
|
||||||
|
eventData.location = '';
|
||||||
|
} else {
|
||||||
|
eventData.location = 'Google Maps';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleCancel = () => {
|
const handleCancel = () => {
|
||||||
goto(`/event/${data.event.id}`);
|
goto(`/event/${data.event.id}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const copyInviteLink = async () => {
|
||||||
|
if (inviteToken) {
|
||||||
|
const inviteUrl = `${window.location.origin}/event/${data.event.id}/invite/${inviteToken.token}`;
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(inviteUrl);
|
||||||
|
showInviteLinkToast = true;
|
||||||
|
|
||||||
|
// Auto-hide toast after 3 seconds
|
||||||
|
if (toastHideTimer) clearTimeout(toastHideTimer);
|
||||||
|
toastHideTimer = window.setTimeout(() => {
|
||||||
|
showInviteLinkToast = false;
|
||||||
|
}, 3000);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to copy invite link:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
@@ -61,7 +98,7 @@
|
|||||||
<div class="flex min-h-screen flex-col">
|
<div class="flex min-h-screen flex-col">
|
||||||
<!-- Main Content -->
|
<!-- Main Content -->
|
||||||
<div class="container mx-auto flex-1 px-4 py-8">
|
<div class="container mx-auto flex-1 px-4 py-8">
|
||||||
<div class="mx-auto max-w-md">
|
<div class="mx-auto max-w-2xl">
|
||||||
<!-- Event Edit Form -->
|
<!-- Event Edit Form -->
|
||||||
<div class="rounded-sm border p-8">
|
<div class="rounded-sm border p-8">
|
||||||
<div class="mb-8 text-center">
|
<div class="mb-8 text-center">
|
||||||
@@ -86,9 +123,6 @@
|
|||||||
}}
|
}}
|
||||||
class="space-y-6"
|
class="space-y-6"
|
||||||
>
|
>
|
||||||
<input type="hidden" name="type" value={eventData.type} />
|
|
||||||
<input type="hidden" name="visibility" value={eventData.visibility} />
|
|
||||||
|
|
||||||
{#if errors.server}
|
{#if errors.server}
|
||||||
<div class="mb-6 rounded-sm border border-red-200 bg-red-50 p-4 text-red-700">
|
<div class="mb-6 rounded-sm border border-red-200 bg-red-50 p-4 text-red-700">
|
||||||
{errors.server}
|
{errors.server}
|
||||||
@@ -153,28 +187,104 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Location -->
|
<!-- Location Type -->
|
||||||
<div>
|
<div>
|
||||||
<label for="location" class="text-dark-800 mb-3 block text-sm font-semibold">
|
<!-- Hidden input to submit locationType value -->
|
||||||
{t('common.location')} <span class="text-red-400">{t('common.required')}</span>
|
<input type="hidden" name="locationType" bind:value={eventData.location_type} />
|
||||||
</label>
|
|
||||||
<input
|
<fieldset>
|
||||||
id="location"
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
name="location"
|
{t('create.locationTypeLabel')}
|
||||||
type="text"
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
bind:value={eventData.location}
|
</legend>
|
||||||
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
<div class="grid grid-cols-3 gap-3">
|
||||||
placeholder={t('common.enterLocation')}
|
<button
|
||||||
maxlength="200"
|
type="button"
|
||||||
required
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
/>
|
'none'
|
||||||
{#if errors.location}
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
<p class="mt-2 text-sm font-medium text-red-600">{errors.location}</p>
|
: 'border-dark-300 text-dark-700'}"
|
||||||
{/if}
|
on:click={() => handleLocationTypeChange('none')}
|
||||||
|
>
|
||||||
|
{t('create.locationNoneOption')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
|
'text'
|
||||||
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700'}"
|
||||||
|
on:click={() => handleLocationTypeChange('text')}
|
||||||
|
>
|
||||||
|
{t('create.locationTextOption')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.location_type ===
|
||||||
|
'maps'
|
||||||
|
? ' border-violet-500 bg-violet-400/20 font-semibold hover:bg-violet-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
|
on:click={() => handleLocationTypeChange('maps')}
|
||||||
|
>
|
||||||
|
{t('create.locationMapsOption')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="mt-2 text-xs text-slate-400">
|
||||||
|
{eventData.location_type === 'none'
|
||||||
|
? t('create.locationNoneDescription')
|
||||||
|
: eventData.location_type === 'text'
|
||||||
|
? t('create.locationTextDescription')
|
||||||
|
: t('create.locationMapsDescription')}
|
||||||
|
</p>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Location Input (only show when not 'none') -->
|
||||||
|
{#if eventData.location_type !== 'none'}
|
||||||
|
<div>
|
||||||
|
<label for="location" class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
|
{eventData.location_type === 'text'
|
||||||
|
? t('create.locationLabel')
|
||||||
|
: t('create.googleMapsUrlLabel')}
|
||||||
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
|
</label>
|
||||||
|
{#if eventData.location_type === 'text'}
|
||||||
|
<input
|
||||||
|
id="location"
|
||||||
|
name="location"
|
||||||
|
type="text"
|
||||||
|
bind:value={eventData.location}
|
||||||
|
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
||||||
|
placeholder={t('create.locationPlaceholder')}
|
||||||
|
maxlength="200"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
{:else}
|
||||||
|
<input
|
||||||
|
id="location_url"
|
||||||
|
name="location_url"
|
||||||
|
type="url"
|
||||||
|
bind:value={eventData.location_url}
|
||||||
|
class="border-dark-300 placeholder-dark-500 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm transition-all"
|
||||||
|
placeholder={t('create.googleMapsUrlPlaceholder')}
|
||||||
|
maxlength="500"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
{#if errors.location}
|
||||||
|
<p class="mt-2 text-sm font-medium text-red-600">{errors.location}</p>
|
||||||
|
{/if}
|
||||||
|
{#if errors.location_url}
|
||||||
|
<p class="mt-2 text-sm font-medium text-red-600">{errors.location_url}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Event Type -->
|
<!-- Event Type -->
|
||||||
<div>
|
<div>
|
||||||
|
<!-- Hidden input to submit type value -->
|
||||||
|
<input type="hidden" name="type" bind:value={eventData.type} />
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
{t('common.type')} <span class="text-red-400">{t('common.required')}</span>
|
{t('common.type')} <span class="text-red-400">{t('common.required')}</span>
|
||||||
@@ -229,11 +339,14 @@
|
|||||||
|
|
||||||
<!-- Event Visibility -->
|
<!-- Event Visibility -->
|
||||||
<div>
|
<div>
|
||||||
|
<!-- Hidden input to submit visibility value -->
|
||||||
|
<input type="hidden" name="visibility" bind:value={eventData.visibility} />
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
<legend class="text-dark-800 mb-3 block text-sm font-semibold">
|
||||||
{t('common.visibility')} <span class="text-red-400">{t('common.required')}</span>
|
{t('common.visibility')} <span class="text-red-400">{t('common.required')}</span>
|
||||||
</legend>
|
</legend>
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-3 gap-3">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
||||||
@@ -254,15 +367,59 @@
|
|||||||
>
|
>
|
||||||
{t('create.privateOption')}
|
{t('create.privateOption')}
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded-sm border-2 px-4 py-3 font-medium transition-all duration-200 {eventData.visibility ===
|
||||||
|
'invite-only'
|
||||||
|
? ' border-amber-500 bg-amber-400/20 font-semibold hover:bg-amber-400/70'
|
||||||
|
: 'border-dark-300 text-dark-700 bg-gray-600/20 hover:bg-gray-600/70'}"
|
||||||
|
on:click={() => (eventData.visibility = 'invite-only')}
|
||||||
|
>
|
||||||
|
{t('create.inviteOnlyOption')}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<p class="mt-2 text-xs text-slate-400">
|
<p class="mt-2 text-xs text-slate-400">
|
||||||
{eventData.visibility === 'public'
|
{eventData.visibility === 'public'
|
||||||
? t('create.publicDescription')
|
? t('create.publicDescription')
|
||||||
: t('create.privateDescription')}
|
: eventData.visibility === 'private'
|
||||||
|
? t('create.privateDescription')
|
||||||
|
: t('create.inviteOnlyDescription')}
|
||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Invite Link Section (only for invite-only events and event creator) -->
|
||||||
|
{#if eventData.visibility === 'invite-only' && inviteToken && data.event.userId === data.userId}
|
||||||
|
<div class="rounded-sm border border-amber-500/30 bg-amber-900/20 p-4">
|
||||||
|
<div class="mb-3 flex items-center justify-between">
|
||||||
|
<h3 class="text-lg font-semibold text-amber-400">Invite Link</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-3">
|
||||||
|
<div class="flex items-center space-x-2">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={`${window.location.origin}/event/${data.event.id}/invite/${inviteToken.token}`}
|
||||||
|
readonly
|
||||||
|
class="flex-1 rounded-sm border border-amber-300 bg-amber-50 px-3 py-2 text-sm text-amber-900"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
on:click={copyInviteLink}
|
||||||
|
class="rounded-sm border border-amber-300 bg-amber-200 px-3 py-2 text-sm font-medium text-amber-900 hover:bg-amber-300"
|
||||||
|
>
|
||||||
|
{t('event.copyInviteLinkButton')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-amber-300">
|
||||||
|
{t('event.inviteLinkExpiresAt', {
|
||||||
|
time: new Date(inviteToken.expires_at).toLocaleString()
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Action Buttons -->
|
<!-- Action Buttons -->
|
||||||
<div class="flex space-x-3">
|
<div class="flex space-x-3">
|
||||||
<button
|
<button
|
||||||
@@ -292,3 +449,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Invite Link Toast -->
|
||||||
|
{#if showInviteLinkToast}
|
||||||
|
<div
|
||||||
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-yellow-500/30 bg-yellow-900 p-4 text-yellow-400"
|
||||||
|
>
|
||||||
|
{t('event.inviteLinkCopied')}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|||||||
223
src/routes/event/[id]/invite/[token]/+page.server.ts
Normal file
223
src/routes/event/[id]/invite/[token]/+page.server.ts
Normal file
@@ -0,0 +1,223 @@
|
|||||||
|
import { database } from '$lib/database/db';
|
||||||
|
import { events, rsvps, inviteTokens } from '$lib/database/schema';
|
||||||
|
import { eq, and, asc } from 'drizzle-orm';
|
||||||
|
import { error, fail } from '@sveltejs/kit';
|
||||||
|
import type { PageServerLoad, Actions } from './$types';
|
||||||
|
import { isTokenValid } from '$lib/inviteTokenHelpers.js';
|
||||||
|
|
||||||
|
export const load: PageServerLoad = async ({ params, cookies }) => {
|
||||||
|
const eventId = params.id;
|
||||||
|
const token = params.token;
|
||||||
|
|
||||||
|
if (!eventId || !token) {
|
||||||
|
throw error(404, 'Event or token not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Fetch event, RSVPs, and invite token in parallel
|
||||||
|
const [eventData, rsvpData, tokenData] = await Promise.all([
|
||||||
|
database.select().from(events).where(eq(events.id, eventId)).limit(1),
|
||||||
|
database.select().from(rsvps).where(eq(rsvps.eventId, eventId)).orderBy(asc(rsvps.createdAt)),
|
||||||
|
database
|
||||||
|
.select()
|
||||||
|
.from(inviteTokens)
|
||||||
|
.where(and(eq(inviteTokens.eventId, eventId), eq(inviteTokens.token, token)))
|
||||||
|
.limit(1)
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!eventData[0]) {
|
||||||
|
throw error(404, 'Event not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!tokenData[0]) {
|
||||||
|
throw error(404, 'Invalid invite token');
|
||||||
|
}
|
||||||
|
|
||||||
|
const event = eventData[0];
|
||||||
|
const eventRsvps = rsvpData;
|
||||||
|
const inviteToken = tokenData[0];
|
||||||
|
|
||||||
|
// Check if token is still valid
|
||||||
|
if (!isTokenValid(inviteToken.expiresAt.toISOString())) {
|
||||||
|
throw error(410, 'Invite token has expired');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if event is invite-only
|
||||||
|
if (event.visibility !== 'invite-only') {
|
||||||
|
throw error(403, 'This event does not require an invite');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transform the data to match the expected interface
|
||||||
|
const transformedEvent = {
|
||||||
|
id: event.id,
|
||||||
|
name: event.name,
|
||||||
|
date: event.date,
|
||||||
|
time: event.time,
|
||||||
|
location: event.location,
|
||||||
|
location_type: event.locationType,
|
||||||
|
location_url: event.locationUrl,
|
||||||
|
type: event.type,
|
||||||
|
attendee_limit: event.attendeeLimit,
|
||||||
|
visibility: event.visibility,
|
||||||
|
user_id: event.userId,
|
||||||
|
created_at: event.createdAt?.toISOString() || new Date().toISOString(),
|
||||||
|
updated_at: event.updatedAt?.toISOString() || new Date().toISOString()
|
||||||
|
};
|
||||||
|
|
||||||
|
const transformedRsvps = eventRsvps.map((rsvp) => ({
|
||||||
|
id: rsvp.id,
|
||||||
|
event_id: rsvp.eventId,
|
||||||
|
name: rsvp.name,
|
||||||
|
user_id: rsvp.userId,
|
||||||
|
created_at: rsvp.createdAt?.toISOString() || new Date().toISOString()
|
||||||
|
}));
|
||||||
|
|
||||||
|
const userId = cookies.get('cactoideUserId');
|
||||||
|
|
||||||
|
return {
|
||||||
|
event: transformedEvent,
|
||||||
|
rsvps: transformedRsvps,
|
||||||
|
userId: userId,
|
||||||
|
inviteToken: {
|
||||||
|
id: inviteToken.id,
|
||||||
|
event_id: inviteToken.eventId,
|
||||||
|
token: inviteToken.token,
|
||||||
|
expires_at: inviteToken.expiresAt.toISOString(),
|
||||||
|
created_at: inviteToken.createdAt?.toISOString() || new Date().toISOString()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof Response) throw err; // This is the 404/410/403 error
|
||||||
|
|
||||||
|
console.error('Error loading invite-only event:', err);
|
||||||
|
throw error(500, 'Failed to load event');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const actions: Actions = {
|
||||||
|
addRSVP: async ({ request, params, cookies }) => {
|
||||||
|
const eventId = params.id;
|
||||||
|
const token = params.token;
|
||||||
|
const formData = await request.formData();
|
||||||
|
|
||||||
|
const name = formData.get('newAttendeeName') as string;
|
||||||
|
const numberOfGuests = parseInt(formData.get('numberOfGuests') as string) || 0;
|
||||||
|
const userId = cookies.get('cactoideUserId');
|
||||||
|
|
||||||
|
if (!name?.trim() || !userId) {
|
||||||
|
return fail(400, { error: 'Name and user ID are required' });
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Verify the invite token is still valid
|
||||||
|
const [tokenData] = await database
|
||||||
|
.select()
|
||||||
|
.from(inviteTokens)
|
||||||
|
.where(and(eq(inviteTokens.eventId, eventId), eq(inviteTokens.token, token)))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (!tokenData || !isTokenValid(tokenData.expiresAt.toISOString())) {
|
||||||
|
return fail(403, { error: 'Invalid or expired invite token' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if event exists and get its details
|
||||||
|
const [eventData] = await database.select().from(events).where(eq(events.id, eventId));
|
||||||
|
if (!eventData) {
|
||||||
|
return fail(404, { error: 'Event not found' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get current RSVPs
|
||||||
|
const currentRSVPs = await database.select().from(rsvps).where(eq(rsvps.eventId, eventId));
|
||||||
|
|
||||||
|
// Calculate total attendees (including guests)
|
||||||
|
const totalAttendees = currentRSVPs.length + numberOfGuests;
|
||||||
|
|
||||||
|
// Check if event is full (for limited type events)
|
||||||
|
if (eventData.type === 'limited' && eventData.attendeeLimit) {
|
||||||
|
if (totalAttendees > eventData.attendeeLimit) {
|
||||||
|
return fail(400, {
|
||||||
|
error: `Event capacity exceeded. You're trying to add ${numberOfGuests + 1} attendees (including yourself), but only ${eventData.attendeeLimit - currentRSVPs.length} spots remain.`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if name is already in the list
|
||||||
|
if (currentRSVPs.some((rsvp) => rsvp.name.toLowerCase() === name.toLowerCase())) {
|
||||||
|
return fail(400, { error: 'Name already exists for this event' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare RSVPs to insert
|
||||||
|
const rsvpsToInsert = [
|
||||||
|
{
|
||||||
|
eventId: eventId,
|
||||||
|
name: name.trim(),
|
||||||
|
userId: userId,
|
||||||
|
createdAt: new Date()
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
// Add guest entries
|
||||||
|
for (let i = 1; i <= numberOfGuests; i++) {
|
||||||
|
rsvpsToInsert.push({
|
||||||
|
eventId: eventId,
|
||||||
|
name: `${name.trim()}'s Guest #${i}`,
|
||||||
|
userId: userId,
|
||||||
|
createdAt: new Date()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert all RSVPs
|
||||||
|
await database.insert(rsvps).values(rsvpsToInsert);
|
||||||
|
|
||||||
|
return { success: true, type: 'add' };
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error adding RSVP:', err);
|
||||||
|
return fail(500, { error: 'Failed to add RSVP' });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
removeRSVP: async ({ request, params, cookies }) => {
|
||||||
|
const eventId = params.id;
|
||||||
|
const token = params.token;
|
||||||
|
const formData = await request.formData();
|
||||||
|
|
||||||
|
const rsvpId = formData.get('rsvpId') as string;
|
||||||
|
const userId = cookies.get('cactoideUserId');
|
||||||
|
|
||||||
|
if (!rsvpId || !userId) {
|
||||||
|
return fail(400, { error: 'RSVP ID and user ID are required' });
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Verify the invite token is still valid
|
||||||
|
const [tokenData] = await database
|
||||||
|
.select()
|
||||||
|
.from(inviteTokens)
|
||||||
|
.where(and(eq(inviteTokens.eventId, eventId), eq(inviteTokens.token, token)))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (!tokenData || !isTokenValid(tokenData.expiresAt.toISOString())) {
|
||||||
|
return fail(403, { error: 'Invalid or expired invite token' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if RSVP exists and belongs to the user
|
||||||
|
const [rsvpData] = await database
|
||||||
|
.select()
|
||||||
|
.from(rsvps)
|
||||||
|
.where(and(eq(rsvps.id, rsvpId), eq(rsvps.eventId, eventId), eq(rsvps.userId, userId)))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (!rsvpData) {
|
||||||
|
return fail(404, { error: 'RSVP not found or you do not have permission to remove it' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete the RSVP
|
||||||
|
await database.delete(rsvps).where(eq(rsvps.id, rsvpId));
|
||||||
|
|
||||||
|
return { success: true, type: 'remove' };
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error removing RSVP:', err);
|
||||||
|
return fail(500, { error: 'Failed to remove RSVP' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
472
src/routes/event/[id]/invite/[token]/+page.svelte
Normal file
472
src/routes/event/[id]/invite/[token]/+page.svelte
Normal file
@@ -0,0 +1,472 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/stores';
|
||||||
|
import { browser } from '$app/environment';
|
||||||
|
import type { Event, RSVP, InviteToken } from '$lib/types';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { enhance } from '$app/forms';
|
||||||
|
import { formatTime, formatDate } from '$lib/dateHelpers.js';
|
||||||
|
import CalendarModal from '$lib/components/CalendarModal.svelte';
|
||||||
|
import type { CalendarEvent } from '$lib/calendarHelpers.js';
|
||||||
|
import { t } from '$lib/i18n/i18n.js';
|
||||||
|
|
||||||
|
export let data: { event: Event; rsvps: RSVP[]; userId: string; inviteToken: InviteToken };
|
||||||
|
export let form;
|
||||||
|
|
||||||
|
let event: Event;
|
||||||
|
let rsvps: RSVP[] = [];
|
||||||
|
let newAttendeeName = '';
|
||||||
|
let isAddingRSVP = false;
|
||||||
|
let error = '';
|
||||||
|
let success = '';
|
||||||
|
let addGuests = false;
|
||||||
|
let numberOfGuests = 1;
|
||||||
|
let showCalendarModal = false;
|
||||||
|
let calendarEvent: CalendarEvent;
|
||||||
|
|
||||||
|
// Use server-side data
|
||||||
|
$: event = data.event;
|
||||||
|
$: rsvps = data.rsvps;
|
||||||
|
$: currentUserId = data.userId;
|
||||||
|
$: isEventCreator = event.user_id === currentUserId;
|
||||||
|
|
||||||
|
// Create calendar event object when event data changes
|
||||||
|
$: if (event && browser) {
|
||||||
|
calendarEvent = {
|
||||||
|
name: event.name,
|
||||||
|
date: event.date,
|
||||||
|
time: event.time,
|
||||||
|
location: event.location,
|
||||||
|
url: `${$page.url.origin}/event/${eventId}/invite/${token}`
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle form errors from server
|
||||||
|
$: if (form?.error) {
|
||||||
|
error = String(form.error);
|
||||||
|
success = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle form success from server
|
||||||
|
$: if (form?.success) {
|
||||||
|
success = 'RSVP added successfully!';
|
||||||
|
error = '';
|
||||||
|
newAttendeeName = '';
|
||||||
|
addGuests = false;
|
||||||
|
numberOfGuests = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const eventId = $page.params.id || '';
|
||||||
|
const token = $page.params.token || '';
|
||||||
|
|
||||||
|
const copyInviteLink = () => {
|
||||||
|
if (browser && isEventCreator) {
|
||||||
|
const url = `${$page.url.origin}/event/${eventId}/invite/${token}`;
|
||||||
|
navigator.clipboard.writeText(url).then(() => {
|
||||||
|
success = 'Invite link copied to clipboard!';
|
||||||
|
setTimeout(() => {
|
||||||
|
success = '';
|
||||||
|
}, 3000);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const clearMessages = () => {
|
||||||
|
error = '';
|
||||||
|
success = '';
|
||||||
|
};
|
||||||
|
|
||||||
|
// Calendar modal functions
|
||||||
|
const openCalendarModal = () => {
|
||||||
|
showCalendarModal = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeCalendarModal = () => {
|
||||||
|
showCalendarModal = false;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svelte:head>
|
||||||
|
<title>{event?.name || t('event.eventTitle')} - Invite Only</title>
|
||||||
|
</svelte:head>
|
||||||
|
|
||||||
|
<div class="flex min-h-screen flex-col">
|
||||||
|
<!-- Main Content -->
|
||||||
|
<div class="container mx-auto flex-1 px-4 py-6">
|
||||||
|
{#if error && !event}
|
||||||
|
<!-- Error State -->
|
||||||
|
<div class="mx-auto max-w-md text-center">
|
||||||
|
<div class="rounded-sm border border-red-500/30 bg-red-900/20 p-8">
|
||||||
|
<div class="mb-4 text-6xl text-red-400">⚠️</div>
|
||||||
|
<h2 class="mb-4 text-2xl font-bold text-red-400">{t('event.eventNotFoundTitle')}</h2>
|
||||||
|
<p class="my-8">{t('event.eventNotFoundDescription')}</p>
|
||||||
|
<button
|
||||||
|
on:click={() => goto('/create')}
|
||||||
|
class="border-white-500 bg-white-400/20 mt-2 rounded-sm border px-6 py-3 font-semibold text-white duration-400 hover:scale-110 hover:bg-white/10"
|
||||||
|
>
|
||||||
|
{t('common.createNewEvent')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if event}
|
||||||
|
<div class="mx-auto max-w-2xl space-y-6">
|
||||||
|
<!-- Invite Only Banner -->
|
||||||
|
<div class="rounded-sm border border-amber-500/30 bg-amber-900/20 p-4">
|
||||||
|
<div class="flex items-center space-x-3">
|
||||||
|
<div class="text-2xl">🎫</div>
|
||||||
|
<div>
|
||||||
|
<h3 class="font-semibold text-amber-400">{t('event.inviteOnlyBannerTitle')}</h3>
|
||||||
|
<p class="text-sm text-amber-300">{t('event.inviteOnlyBannerSubtitle')}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Event Details Card -->
|
||||||
|
<div class="rounded-sm border p-6 shadow-2xl">
|
||||||
|
<h2 class=" mb-4 text-center text-2xl font-bold">
|
||||||
|
{event.name}
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<div class="space-y-4">
|
||||||
|
<!-- Date & Time -->
|
||||||
|
<div class="flex items-center space-x-3 text-violet-400">
|
||||||
|
<div class="flex h-8 w-8 items-center justify-center rounded-sm">
|
||||||
|
<svg class=" h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="font-semibold text-white">
|
||||||
|
{formatDate(event.date)}
|
||||||
|
<span class="font-medium text-violet-400">-</span>
|
||||||
|
{formatTime(event.time)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Location (only show when not 'none') -->
|
||||||
|
<div class="flex items-center space-x-3 text-violet-400">
|
||||||
|
<div class="flex h-8 w-8 items-center justify-center rounded-sm">
|
||||||
|
<svg class=" h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"
|
||||||
|
></path>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{#if event.location_type === 'none'}
|
||||||
|
<p class="font-semibold text-white">N/A</p>
|
||||||
|
{:else if event.location_type === 'maps' && event.location_url}
|
||||||
|
<a
|
||||||
|
href={event.location_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="font-semibold text-white transition-colors duration-200 hover:text-violet-300"
|
||||||
|
>
|
||||||
|
{t('create.locationMapsOption')}
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<p class="font-semibold text-white">{event.location}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Event Type, Visibility & Capacity -->
|
||||||
|
<div class="flex items-center justify-between rounded-sm p-3">
|
||||||
|
<div class="flex items-center space-x-2">
|
||||||
|
<span
|
||||||
|
class="rounded-sm border px-2 py-1 text-xs font-medium {event.type === 'limited'
|
||||||
|
? 'border-amber-600 text-amber-600'
|
||||||
|
: 'border-teal-500 text-teal-500'}"
|
||||||
|
>
|
||||||
|
{event.type === 'limited' ? t('common.limited') : t('common.unlimited')}
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
class="rounded-sm border border-amber-300 px-2 py-1 text-xs font-medium text-amber-400"
|
||||||
|
>
|
||||||
|
{t('event.inviteOnlyBadge')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if event.type === 'limited' && event.attendee_limit}
|
||||||
|
<div class="text-right">
|
||||||
|
<p class="text-sm">{t('common.capacity')}</p>
|
||||||
|
<p class=" text-lg font-bold">
|
||||||
|
{rsvps.length}/{event.attendee_limit}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- RSVP Form -->
|
||||||
|
<div class=" rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
||||||
|
<h3 class=" mb-4 text-xl font-bold">{t('event.joinThisEvent')}</h3>
|
||||||
|
|
||||||
|
{#if event.type === 'limited' && event.attendee_limit && rsvps.length >= event.attendee_limit}
|
||||||
|
<div class="py-6 text-center">
|
||||||
|
<div class="mb-3 text-4xl text-red-400">🚫</div>
|
||||||
|
<p class="font-semibold text-red-400">{t('event.eventIsFull')}</p>
|
||||||
|
<p class="mt-1 text-sm">{t('event.maximumCapacityReached')}</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<form
|
||||||
|
method="POST"
|
||||||
|
action="?/addRSVP"
|
||||||
|
use:enhance={() => {
|
||||||
|
isAddingRSVP = true;
|
||||||
|
clearMessages();
|
||||||
|
return async ({ result, update }) => {
|
||||||
|
isAddingRSVP = false;
|
||||||
|
if (result.type === 'failure') {
|
||||||
|
error = String(result.data?.error || 'Failed to add RSVP');
|
||||||
|
}
|
||||||
|
update();
|
||||||
|
};
|
||||||
|
}}
|
||||||
|
class="space-y-4"
|
||||||
|
>
|
||||||
|
<input type="hidden" name="userId" value={currentUserId} />
|
||||||
|
<div>
|
||||||
|
<label for="attendeeName" class=" mb-2 block text-sm font-semibold">
|
||||||
|
{t('event.yourNameLabel')}
|
||||||
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="attendeeName"
|
||||||
|
name="newAttendeeName"
|
||||||
|
type="text"
|
||||||
|
bind:value={newAttendeeName}
|
||||||
|
class="border-dark-300 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm"
|
||||||
|
placeholder={t('event.yourNamePlaceholder')}
|
||||||
|
maxlength="50"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Add Guests Toggle -->
|
||||||
|
<div class="flex items-center space-x-3">
|
||||||
|
<input
|
||||||
|
id="addGuests"
|
||||||
|
type="checkbox"
|
||||||
|
bind:checked={addGuests}
|
||||||
|
class="h-4 w-4 rounded border-gray-300 text-violet-600 focus:ring-violet-500"
|
||||||
|
/>
|
||||||
|
<label for="addGuests" class="text-sm font-medium text-white">
|
||||||
|
{t('event.addGuestsLabel')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Number of Guests Input -->
|
||||||
|
{#if addGuests}
|
||||||
|
<div>
|
||||||
|
<label for="numberOfGuests" class="mb-2 block text-sm font-semibold">
|
||||||
|
{t('event.numberOfGuestsLabel')}
|
||||||
|
<span class="text-red-400">{t('common.required')}</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="numberOfGuests"
|
||||||
|
name="numberOfGuests"
|
||||||
|
type="number"
|
||||||
|
bind:value={numberOfGuests}
|
||||||
|
min="1"
|
||||||
|
max="10"
|
||||||
|
class="border-dark-300 w-full rounded-sm border-2 px-4 py-3 text-slate-900 shadow-sm"
|
||||||
|
placeholder={t('event.numberOfGuestsPlaceholder')}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<p class="mt-1 text-xs text-slate-400">
|
||||||
|
{t('event.guestsWillBeAddedAs', {
|
||||||
|
name: newAttendeeName || t('common.yourNamePlaceholder')
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={isAddingRSVP ||
|
||||||
|
!newAttendeeName.trim() ||
|
||||||
|
(addGuests && numberOfGuests < 1)}
|
||||||
|
class=" hover:bg-violet-400/70' w-full rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
||||||
|
>
|
||||||
|
{#if isAddingRSVP}
|
||||||
|
<div class="flex items-center justify-center">
|
||||||
|
<div
|
||||||
|
class="mr-2 h-5 w-5 animate-spin rounded-full border-b-2 border-white"
|
||||||
|
></div>
|
||||||
|
{t('event.adding')}
|
||||||
|
</div>
|
||||||
|
{:else if addGuests && numberOfGuests > 0}
|
||||||
|
{t('event.joinEventWithGuests', {
|
||||||
|
count: numberOfGuests,
|
||||||
|
plural: numberOfGuests > 1 ? 's' : ''
|
||||||
|
})}
|
||||||
|
{:else}
|
||||||
|
{t('event.joinEventButton')}
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Attendees List -->
|
||||||
|
<div class="rounded-sm border p-6 shadow-2xl backdrop-blur-sm">
|
||||||
|
<div class="mb-4 flex items-center justify-between">
|
||||||
|
<h3 class=" text-xl font-bold">{t('event.attendeesTitle')}</h3>
|
||||||
|
<span class="text-2xl font-bold">{rsvps.length}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if rsvps.length === 0}
|
||||||
|
<div class="text-dark-400 py-8 text-center">
|
||||||
|
<p>{t('event.noAttendeesYet')}</p>
|
||||||
|
<p class="mt-1 text-sm">{t('event.beFirstToJoin')}</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-3">
|
||||||
|
{#each rsvps as attendee, i (i)}
|
||||||
|
<div
|
||||||
|
class="flex items-center justify-between rounded-sm border border-white/20 p-3"
|
||||||
|
>
|
||||||
|
<div class="flex items-center space-x-3">
|
||||||
|
<div
|
||||||
|
class="flex h-8 w-8 items-center justify-center rounded-full text-sm font-bold {attendee.name.includes(
|
||||||
|
"'s Guest"
|
||||||
|
)
|
||||||
|
? 'text-white-400 bg-violet-500/40'
|
||||||
|
: 'bg-violet-500/20 text-violet-400'}"
|
||||||
|
>
|
||||||
|
{attendee.name.charAt(0).toUpperCase()}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p
|
||||||
|
class="font-medium text-white {attendee.name.includes("'s Guest")
|
||||||
|
? 'text-amber-300'
|
||||||
|
: ''}"
|
||||||
|
>
|
||||||
|
{attendee.name}
|
||||||
|
</p>
|
||||||
|
<p class="text-xs text-violet-400">
|
||||||
|
{(() => {
|
||||||
|
const date = new Date(attendee.created_at);
|
||||||
|
const year = date.getFullYear();
|
||||||
|
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||||
|
const day = String(date.getDate()).padStart(2, '0');
|
||||||
|
const hours = String(date.getHours()).padStart(2, '0');
|
||||||
|
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||||
|
return `${year}/${month}/${day} ${hours}:${minutes}`;
|
||||||
|
})()}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if attendee.user_id === currentUserId}
|
||||||
|
<form
|
||||||
|
method="POST"
|
||||||
|
action="?/removeRSVP"
|
||||||
|
use:enhance={() => {
|
||||||
|
clearMessages();
|
||||||
|
return async ({ result, update }) => {
|
||||||
|
if (result.type === 'failure') {
|
||||||
|
error = String(result.data?.error || 'Failed to remove RSVP');
|
||||||
|
}
|
||||||
|
update();
|
||||||
|
};
|
||||||
|
}}
|
||||||
|
style="display: inline;"
|
||||||
|
>
|
||||||
|
<input type="hidden" name="rsvpId" value={attendee.id} />
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="text-dark-400 p-1 transition-colors duration-200 hover:text-red-400"
|
||||||
|
aria-label={t('event.removeRsvpAriaLabel')}
|
||||||
|
>
|
||||||
|
<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Action Buttons -->
|
||||||
|
<div class="max-w-2xl space-y-3">
|
||||||
|
<button
|
||||||
|
on:click={copyInviteLink}
|
||||||
|
disabled={!isEventCreator}
|
||||||
|
class="w-full rounded-sm border-2 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105 {isEventCreator
|
||||||
|
? 'border-violet-500 bg-violet-400/20 hover:bg-violet-400/70'
|
||||||
|
: 'cursor-not-allowed border-gray-500 bg-gray-600/20 hover:bg-gray-600/30'}"
|
||||||
|
>
|
||||||
|
{t('event.copyInviteLinkButton')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
on:click={openCalendarModal}
|
||||||
|
class="hover:bg-violet-400/70' w-full rounded-sm border-2 border-violet-500 bg-violet-400/20 px-4 py-3 py-4 font-bold font-medium font-semibold text-white shadow-lg transition-all duration-200 hover:scale-105"
|
||||||
|
>
|
||||||
|
{t('event.addToCalendarButton')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Calendar Modal -->
|
||||||
|
{#if calendarEvent && browser}
|
||||||
|
<CalendarModal
|
||||||
|
bind:isOpen={showCalendarModal}
|
||||||
|
event={calendarEvent}
|
||||||
|
{eventId}
|
||||||
|
baseUrl={$page.url.origin}
|
||||||
|
on:close={closeCalendarModal}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<!-- Success/Error Messages -->
|
||||||
|
{#if success}
|
||||||
|
{#if form?.type === 'add'}
|
||||||
|
<div
|
||||||
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-green-500 bg-green-900 p-4 text-green-400"
|
||||||
|
>
|
||||||
|
{success}
|
||||||
|
</div>
|
||||||
|
{:else if form?.type === 'remove'}
|
||||||
|
<div
|
||||||
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-yellow-500 bg-yellow-900 p-4 text-yellow-400"
|
||||||
|
>
|
||||||
|
{t('event.removedRsvpSuccessfully')}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if error}
|
||||||
|
<div
|
||||||
|
class="fixed right-4 bottom-4 z-40 w-128 rounded-sm border border-red-500 bg-red-900 p-4 text-red-400"
|
||||||
|
>
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"moduleResolution": "bundler"
|
"moduleResolution": "bundler",
|
||||||
|
"types": ["node"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user