Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d65d5975c | ||
|
|
b8779e5a35 | ||
|
|
000ebd388a | ||
|
|
3374eb1ec0 | ||
|
|
d7b82c0ec9 | ||
|
|
3718882f5b | ||
|
|
cb2355adcd | ||
|
|
c6e602d354 | ||
|
|
42002f8e6f | ||
|
|
7378d37b36 |
No files matched your search
@@ -8,6 +8,34 @@ News site in Macedonia with sarcastic tone. Minimalistic design using TanStack s
|
|||||||
- **Backend**: NestJS + TypeORM + SQLite
|
- **Backend**: NestJS + TypeORM + SQLite
|
||||||
- **CMS**: Strapi (in /cms)
|
- **CMS**: Strapi (in /cms)
|
||||||
|
|
||||||
|
## Root-Level Commands
|
||||||
|
```bash
|
||||||
|
# Docker development
|
||||||
|
npm run docker:up # Start all services
|
||||||
|
npm run docker:down # Stop all services
|
||||||
|
npm run docker:build # Rebuild containers
|
||||||
|
npm run docker:logs # View logs
|
||||||
|
npm run dev:docker # Start docker dev (alias)
|
||||||
|
|
||||||
|
# Local development
|
||||||
|
npm run dev:local # Start backend & frontend locally
|
||||||
|
npm run dev:backend:local # Backend only (local env)
|
||||||
|
npm run dev:frontend:local # Frontend only (local env)
|
||||||
|
|
||||||
|
# Code quality
|
||||||
|
npm run lint # Lint both projects
|
||||||
|
npm run lint:fix # Auto-fix lint issues
|
||||||
|
npm run type-check # Type check both projects
|
||||||
|
|
||||||
|
# Database operations
|
||||||
|
npm run db:backup # Backup database
|
||||||
|
npm run db:restore # Restore database
|
||||||
|
npm run db:reset # Reset database
|
||||||
|
|
||||||
|
# Environment
|
||||||
|
npm run reset:env # Reset to docker environment
|
||||||
|
```
|
||||||
|
|
||||||
## Build Commands
|
## Build Commands
|
||||||
|
|
||||||
### Backend (NestJS)
|
### Backend (NestJS)
|
||||||
@@ -15,16 +43,21 @@ News site in Macedonia with sarcastic tone. Minimalistic design using TanStack s
|
|||||||
cd backend
|
cd backend
|
||||||
npm install
|
npm install
|
||||||
npm run start:dev # Watch mode
|
npm run start:dev # Watch mode
|
||||||
|
npm run start:debug # Debug mode
|
||||||
npm run build
|
npm run build
|
||||||
npm run start:prod
|
npm run start:prod
|
||||||
npm run lint # Lint
|
npm run lint # Lint
|
||||||
npm run lint:fix # Auto-fix
|
npm run lint:fix # Auto-fix
|
||||||
npm run type-check # TypeScript check
|
npm run type-check # TypeScript check
|
||||||
npm test # All tests
|
npm test # All tests
|
||||||
|
npm test:watch # Watch mode tests
|
||||||
|
npm test:cov # Coverage
|
||||||
|
npm test:e2e # E2E tests
|
||||||
npm test app.service.spec.ts # Single file
|
npm test app.service.spec.ts # Single file
|
||||||
npm test -t "should" # By test name
|
npm test -t "should return" # By test name pattern
|
||||||
npm run test:cov # Coverage
|
npm run format # Format with Prettier
|
||||||
npm run test:e2e # E2E tests
|
npm run dev:local # Local env with .env.local
|
||||||
|
npm run dev:docker # Docker env with .env.docker
|
||||||
```
|
```
|
||||||
|
|
||||||
### Frontend (TanStack)
|
### Frontend (TanStack)
|
||||||
@@ -34,13 +67,16 @@ npm install
|
|||||||
npm run dev # Vite dev server
|
npm run dev # Vite dev server
|
||||||
npm run build
|
npm run build
|
||||||
npm run preview
|
npm run preview
|
||||||
npm run lint
|
npm run lint # Lint
|
||||||
npm run lint:fix
|
npm run lint:fix # Auto-fix
|
||||||
npm run type-check
|
npm run type-check # TypeScript check
|
||||||
npm test # All tests
|
npm test # All tests (Vitest)
|
||||||
|
npm test:ui # Vitest UI
|
||||||
|
npm test:coverage # Test coverage
|
||||||
npm test Header.test.tsx # Single file
|
npm test Header.test.tsx # Single file
|
||||||
npm test -t "renders" # By name
|
npm test -t "renders" # By test name pattern
|
||||||
npm run test:ui # Vitest UI
|
npm run dev:local # Local env with .env.local
|
||||||
|
npm run dev:docker # Docker env with .env.docker
|
||||||
```
|
```
|
||||||
|
|
||||||
## Code Style
|
## Code Style
|
||||||
@@ -51,6 +87,8 @@ npm run test:ui # Vitest UI
|
|||||||
- Explicit return types for public methods
|
- Explicit return types for public methods
|
||||||
- Prefer interfaces over types for objects
|
- Prefer interfaces over types for objects
|
||||||
- Use `readonly` for immutable properties
|
- Use `readonly` for immutable properties
|
||||||
|
- Backend: `noImplicitAny: true`, `strictNullChecks: true`
|
||||||
|
- Frontend: Path alias `@/*` maps to `./src/*`
|
||||||
|
|
||||||
### Naming Conventions
|
### Naming Conventions
|
||||||
- **Files**: kebab-case (`user-profile.ts`, `auth.service.ts`)
|
- **Files**: kebab-case (`user-profile.ts`, `auth.service.ts`)
|
||||||
@@ -62,6 +100,20 @@ npm run test:ui # Vitest UI
|
|||||||
|
|
||||||
### Import Order
|
### Import Order
|
||||||
- External libraries first, then internal modules, then relative imports
|
- External libraries first, then internal modules, then relative imports
|
||||||
|
- Group imports with blank lines between groups
|
||||||
|
- Example:
|
||||||
|
```typescript
|
||||||
|
// External
|
||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
|
||||||
|
// Internal modules
|
||||||
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
|
||||||
|
// Relative imports
|
||||||
|
import { UserService } from './user.service';
|
||||||
|
import { UserController } from './user.controller';
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
### File Structure
|
### File Structure
|
||||||
@@ -104,12 +156,16 @@ frontend/src/
|
|||||||
```
|
```
|
||||||
|
|
||||||
### Testing
|
### Testing
|
||||||
|
- **Backend**: Jest with ts-jest transformer
|
||||||
|
- **Frontend**: Vitest with React Testing Library patterns
|
||||||
- Unit tests for services/hooks (AAA pattern: Arrange-Act-Assert)
|
- Unit tests for services/hooks (AAA pattern: Arrange-Act-Assert)
|
||||||
- Integration tests for API endpoints
|
- Integration tests for API endpoints
|
||||||
- E2E tests for critical user flows
|
- E2E tests for critical user flows
|
||||||
- Descriptive test names that explain what is tested
|
- Descriptive test names that explain what is tested (e.g., `should return user data when valid ID provided`)
|
||||||
- Mock external dependencies (use Jest for backend, Vitest for frontend)
|
- Mock external dependencies (use Jest for backend, Vitest for frontend)
|
||||||
- Run `npm test` for all tests or target specific files/names
|
- Run `npm test` for all tests or target specific files/names
|
||||||
|
- Test files: `*.spec.ts` (backend), `*.test.tsx` (frontend)
|
||||||
|
- Coverage reports: `npm test:cov` (backend), `npm test:coverage` (frontend)
|
||||||
|
|
||||||
### Git Workflow
|
### Git Workflow
|
||||||
- Conventional commits: `feat:`, `fix:`, `refactor:`, `test:`, `docs:`, `chore:`
|
- Conventional commits: `feat:`, `fix:`, `refactor:`, `test:`, `docs:`, `chore:`
|
||||||
@@ -147,5 +203,16 @@ frontend/src/
|
|||||||
- Example backend env: `DATABASE_PATH=./data.db`
|
- Example backend env: `DATABASE_PATH=./data.db`
|
||||||
- Store sensitive config in `.env` files
|
- Store sensitive config in `.env` files
|
||||||
- Use `DATABASE_PATH` for SQLite location
|
- Use `DATABASE_PATH` for SQLite location
|
||||||
|
- Use `@nestjs/config` for backend environment management
|
||||||
|
- Frontend env vars must be prefixed with `VITE_`
|
||||||
|
|
||||||
|
## Agent-Specific Instructions
|
||||||
|
- **ALWAYS** run `npm run lint` and `npm run type-check` after making changes
|
||||||
|
- **NEVER** commit changes without explicit user request
|
||||||
|
- **ALWAYS** follow existing code patterns and conventions
|
||||||
|
- **PREFER** editing existing files over creating new ones
|
||||||
|
- **VERIFY** tests pass before considering work complete
|
||||||
|
- **USE** the root-level commands for common operations
|
||||||
|
- **CHECK** both backend and frontend when making API changes
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
# Quick Strapi Webhook Setup
|
||||||
|
|
||||||
|
## TL;DR - Quick Configuration
|
||||||
|
|
||||||
|
1. **Access Strapi Admin**: `http://localhost:1337/admin`
|
||||||
|
2. **Go to Settings → Webhooks**
|
||||||
|
3. **Add New Webhook**:
|
||||||
|
- **Name**: `Backend Sync`
|
||||||
|
- **URL**: `http://localhost:3000/api/v1/webhooks/strapi`
|
||||||
|
- **Events**: Select all for "Article" and "Live Blog" content types
|
||||||
|
4. **Save and Test**
|
||||||
|
|
||||||
|
## Already Configured (What We Fixed)
|
||||||
|
|
||||||
|
✅ **Backend webhook endpoints** are now public (no auth required)
|
||||||
|
✅ **Tested webhooks** manually - they work
|
||||||
|
✅ **Articles sync** from Strapi to backend
|
||||||
|
✅ **Frontend TypeScript errors** fixed
|
||||||
|
✅ **Authentication system** working
|
||||||
|
|
||||||
|
## Manual Test Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Test webhook manually
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{
|
||||||
|
"event": "entry.publish",
|
||||||
|
"model": "article",
|
||||||
|
"entry": {"documentId": "r07qatlpgvx82d7337n3nz1l"}
|
||||||
|
}'
|
||||||
|
|
||||||
|
# Check synced articles
|
||||||
|
curl http://localhost:3000/api/v1/articles?status=published
|
||||||
|
|
||||||
|
# Run comprehensive test
|
||||||
|
./scripts/test-webhooks.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Current Status
|
||||||
|
|
||||||
|
- **Strapi Articles**: 2
|
||||||
|
- **Backend Articles**: 2 (synced)
|
||||||
|
- **Webhook Status**: Ready for configuration
|
||||||
|
- **Frontend**: Access at `http://localhost:5173/articles`
|
||||||
|
|
||||||
|
## Immediate Action Required
|
||||||
|
|
||||||
|
1. **Configure webhooks in Strapi admin** (see detailed guide in `STRAPI_WEBHOOKS_SETUP.md`)
|
||||||
|
2. **Test by publishing an article** in Strapi
|
||||||
|
3. **Verify automatic sync** works
|
||||||
|
|
||||||
|
## If Webhooks Don't Work
|
||||||
|
|
||||||
|
Use manual sync as fallback:
|
||||||
|
```bash
|
||||||
|
# Get auth token first
|
||||||
|
TOKEN=$(curl -s -X POST http://localhost:3000/api/v1/auth/login \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"username":"testuser","password":"Test123!"}' | jq -r '.access_token')
|
||||||
|
|
||||||
|
# Sync all articles
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi/sync/all \
|
||||||
|
-H "Authorization: Bearer $TOKEN"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
- Visit `http://localhost:5173/articles` to see synced articles
|
||||||
|
- Check backend logs: `docker logs placebo-backend-dev --tail 20`
|
||||||
|
- Monitor sync status with test script: `./scripts/test-webhooks.sh`
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
# Strapi Webhooks Configuration Guide
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
This guide explains how to configure Strapi webhooks for automatic synchronization with the backend API. When articles or live blogs are published/updated/deleted in Strapi, webhooks will automatically trigger synchronization with the backend.
|
||||||
|
|
||||||
|
## Webhook Endpoints
|
||||||
|
|
||||||
|
The backend provides three webhook endpoints:
|
||||||
|
|
||||||
|
1. **Article-specific webhook**: `POST /api/v1/webhooks/strapi/article`
|
||||||
|
2. **Live Blog-specific webhook**: `POST /api/v1/webhooks/strapi/live-blog`
|
||||||
|
3. **Generic webhook**: `POST /api/v1/webhooks/strapi` (handles both)
|
||||||
|
|
||||||
|
All endpoints accept the following JSON format:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"event": "entry.publish", // or "entry.update", "entry.delete", "entry.unpublish"
|
||||||
|
"model": "article", // or "live-blog"
|
||||||
|
"entry": {
|
||||||
|
"documentId": "unique-strapi-id"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Configuration Steps
|
||||||
|
|
||||||
|
### Step 1: Access Strapi Admin Panel
|
||||||
|
1. Open your browser and go to: `http://localhost:1337/admin`
|
||||||
|
2. Log in with your admin credentials
|
||||||
|
|
||||||
|
### Step 2: Configure Webhooks
|
||||||
|
1. In the left sidebar, click on **Settings** (gear icon)
|
||||||
|
2. Click on **Webhooks** under the "GLOBAL SETTINGS" section
|
||||||
|
3. Click the **"Add new webhook"** button
|
||||||
|
|
||||||
|
### Step 3: Configure Article Webhook
|
||||||
|
**Basic Settings:**
|
||||||
|
- **Name**: `Backend Article Sync`
|
||||||
|
- **URL**: `http://localhost:3000/api/v1/webhooks/strapi/article`
|
||||||
|
- For Docker internal communication: `http://backend:3000/api/v1/webhooks/strapi/article`
|
||||||
|
- **Headers**: Add if needed (usually not required)
|
||||||
|
|
||||||
|
**Trigger Events:**
|
||||||
|
Select the following events for the "Article" content type:
|
||||||
|
- [x] **Create entry** (`entry.create`)
|
||||||
|
- [x] **Update entry** (`entry.update`)
|
||||||
|
- [x] **Delete entry** (`entry.delete`)
|
||||||
|
- [x] **Publish entry** (`entry.publish`)
|
||||||
|
- [x] **Unpublish entry** (`entry.unpublish`)
|
||||||
|
|
||||||
|
**Save the webhook.**
|
||||||
|
|
||||||
|
### Step 4: Configure Live Blog Webhook (Optional)
|
||||||
|
Repeat Step 3 for live blogs:
|
||||||
|
- **Name**: `Backend Live Blog Sync`
|
||||||
|
- **URL**: `http://localhost:3000/api/v1/webhooks/strapi/live-blog`
|
||||||
|
- Select events for the "Live Blog" content type
|
||||||
|
|
||||||
|
### Alternative: Single Generic Webhook
|
||||||
|
You can use a single webhook for all content types:
|
||||||
|
- **Name**: `Backend Generic Sync`
|
||||||
|
- **URL**: `http://localhost:3000/api/v1/webhooks/strapi`
|
||||||
|
- Select events for ALL relevant content types (Article, Live Blog)
|
||||||
|
|
||||||
|
## Testing Webhooks
|
||||||
|
|
||||||
|
### Manual Test
|
||||||
|
You can manually trigger a webhook to test the configuration:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Test article webhook
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi/article \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{
|
||||||
|
"event": "entry.publish",
|
||||||
|
"model": "article",
|
||||||
|
"entry": {
|
||||||
|
"documentId": "your-article-id"
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
|
||||||
|
# Test generic webhook
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{
|
||||||
|
"event": "entry.publish",
|
||||||
|
"model": "article",
|
||||||
|
"entry": {
|
||||||
|
"documentId": "your-article-id"
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Test from Strapi
|
||||||
|
1. In Strapi admin, edit any article
|
||||||
|
2. Click "Save" or "Publish"
|
||||||
|
3. Check backend logs for webhook receipt:
|
||||||
|
```bash
|
||||||
|
docker logs placebo-backend-dev --tail 20 | grep -i "webhook\|strapi"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Manual Sync (Fallback)
|
||||||
|
If webhooks fail or for initial sync, use manual sync endpoints:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Get authentication token first
|
||||||
|
curl -X POST http://localhost:3000/api/v1/auth/login \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"username":"your-username","password":"your-password"}'
|
||||||
|
|
||||||
|
# Sync all articles (requires auth)
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi/sync/all \
|
||||||
|
-H "Authorization: Bearer YOUR_TOKEN_HERE"
|
||||||
|
|
||||||
|
# Sync all live blogs
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi/sync/live-blogs \
|
||||||
|
-H "Authorization: Bearer YOUR_TOKEN_HERE"
|
||||||
|
|
||||||
|
# Sync everything
|
||||||
|
curl -X POST http://localhost:3000/api/v1/webhooks/strapi/sync/everything \
|
||||||
|
-H "Authorization: Bearer YOUR_TOKEN_HERE"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Common Issues
|
||||||
|
|
||||||
|
1. **Webhook not received by backend**
|
||||||
|
- Check backend logs: `docker logs placebo-backend-dev --tail 50`
|
||||||
|
- Verify CORS is configured (should allow `http://localhost:1337`)
|
||||||
|
- Test webhook manually with curl
|
||||||
|
|
||||||
|
2. **401 Unauthorized error**
|
||||||
|
- Webhook endpoints are now public (no auth required)
|
||||||
|
- If getting 401, check that `@Public()` decorator is on webhook methods
|
||||||
|
|
||||||
|
3. **Webhook received but sync fails**
|
||||||
|
- Check Strapi API token in backend `.env.docker`
|
||||||
|
- Verify Strapi is accessible from backend container
|
||||||
|
- Check backend logs for specific error messages
|
||||||
|
|
||||||
|
4. **Article not appearing in frontend**
|
||||||
|
- Verify article is synced to backend: `curl http://localhost:3000/api/v1/articles`
|
||||||
|
- Check frontend browser console for errors
|
||||||
|
- Hard refresh frontend (Ctrl+F5)
|
||||||
|
|
||||||
|
### Log Monitoring
|
||||||
|
```bash
|
||||||
|
# Monitor backend logs for webhooks
|
||||||
|
docker logs -f placebo-backend-dev | grep -i "webhook\|strapi"
|
||||||
|
|
||||||
|
# Monitor Strapi logs
|
||||||
|
docker logs -f placebo-cms-dev
|
||||||
|
|
||||||
|
# Check if articles are in backend
|
||||||
|
curl -s "http://localhost:3000/api/v1/articles?status=published" | jq '.total'
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Network Considerations
|
||||||
|
|
||||||
|
### Internal Docker Communication
|
||||||
|
- Within Docker network: Use `http://backend:3000` and `http://cms:1337`
|
||||||
|
- From host machine: Use `http://localhost:3000` and `http://localhost:1337`
|
||||||
|
|
||||||
|
### Webhook URL Examples
|
||||||
|
- **From Strapi container to Backend**: `http://backend:3000/api/v1/webhooks/strapi`
|
||||||
|
- **From Host to Backend**: `http://localhost:3000/api/v1/webhooks/strapi`
|
||||||
|
- **External/Production**: Use your domain: `https://api.yourdomain.com/api/v1/webhooks/strapi`
|
||||||
|
|
||||||
|
## Security Considerations
|
||||||
|
|
||||||
|
1. **Webhook endpoints are public** - ensure your backend is not exposed to the public internet in production
|
||||||
|
2. **Consider adding webhook signature verification** for production
|
||||||
|
3. **Use HTTPS in production** for all webhook calls
|
||||||
|
4. **Monitor webhook logs** for suspicious activity
|
||||||
|
|
||||||
|
## Verification Checklist
|
||||||
|
|
||||||
|
- [ ] Webhooks configured in Strapi admin
|
||||||
|
- [ ] Test webhook manually works
|
||||||
|
- [ ] Article publish in Strapi triggers sync
|
||||||
|
- [ ] Synced articles appear in backend API
|
||||||
|
- [ ] Frontend displays synced articles
|
||||||
|
- [ ] All event types tested (publish, update, delete)
|
||||||
|
|
||||||
|
## Support
|
||||||
|
If issues persist:
|
||||||
|
1. Check all service logs
|
||||||
|
2. Verify network connectivity between containers
|
||||||
|
3. Test each component independently
|
||||||
|
4. Review error messages in logs
|
||||||
@@ -4,6 +4,9 @@ FROM node:20-alpine
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Install build dependencies for native modules
|
||||||
|
RUN apk add --no-cache python3 make g++
|
||||||
|
|
||||||
# Install dependencies with better error handling
|
# Install dependencies with better error handling
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
COPY package-lock.json* ./
|
COPY package-lock.json* ./
|
||||||
|
|||||||
Generated
+638
-342
File diff suppressed because it is too large.
Load diff
+11
-1
@@ -22,7 +22,8 @@
|
|||||||
"test:e2e": "jest --config ./test/jest-e2e.json",
|
"test:e2e": "jest --config ./test/jest-e2e.json",
|
||||||
"dev:docker": "nest start --watch",
|
"dev:docker": "nest start --watch",
|
||||||
"dev:local": "cp -f .env.local .env && nest start --watch",
|
"dev:local": "cp -f .env.local .env && nest start --watch",
|
||||||
"dev:reset-env": "cp -f .env.docker .env"
|
"dev:reset-env": "cp -f .env.docker .env",
|
||||||
|
"seed:admin": "ts-node scripts/seed-admin.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/axios": "^4.0.1",
|
"@nestjs/axios": "^4.0.1",
|
||||||
@@ -30,10 +31,19 @@
|
|||||||
"@nestjs/config": "^4.0.2",
|
"@nestjs/config": "^4.0.2",
|
||||||
"@nestjs/core": "^11.0.1",
|
"@nestjs/core": "^11.0.1",
|
||||||
"@nestjs/event-emitter": "^3.0.1",
|
"@nestjs/event-emitter": "^3.0.1",
|
||||||
|
"@nestjs/jwt": "^11.0.2",
|
||||||
|
"@nestjs/passport": "^11.0.5",
|
||||||
"@nestjs/platform-express": "^11.0.1",
|
"@nestjs/platform-express": "^11.0.1",
|
||||||
"@nestjs/typeorm": "^11.0.0",
|
"@nestjs/typeorm": "^11.0.0",
|
||||||
|
"@types/bcrypt": "^6.0.0",
|
||||||
|
"@types/passport-jwt": "^4.0.1",
|
||||||
|
"@types/passport-local": "^1.0.38",
|
||||||
|
"bcrypt": "^6.0.0",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"class-validator": "^0.14.3",
|
"class-validator": "^0.14.3",
|
||||||
|
"passport": "^0.7.0",
|
||||||
|
"passport-jwt": "^4.0.1",
|
||||||
|
"passport-local": "^1.0.0",
|
||||||
"pg": "^8.18.0",
|
"pg": "^8.18.0",
|
||||||
"reflect-metadata": "^0.2.2",
|
"reflect-metadata": "^0.2.2",
|
||||||
"rxjs": "^7.8.1",
|
"rxjs": "^7.8.1",
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
const { exec } = require('child_process');
|
||||||
|
const { promisify } = require('util');
|
||||||
|
const execAsync = promisify(exec);
|
||||||
|
|
||||||
|
async function resetDatabase() {
|
||||||
|
console.log('Resetting database...');
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Drop and recreate the database
|
||||||
|
const { stdout, stderr } = await execAsync(`
|
||||||
|
PGPASSWORD=placebo_password psql -h localhost -U placebo_user -d postgres -c "DROP DATABASE IF EXISTS placebo_backend_db;"
|
||||||
|
PGPASSWORD=placebo_password psql -h localhost -U placebo_user -d postgres -c "CREATE DATABASE placebo_backend_db;"
|
||||||
|
`);
|
||||||
|
|
||||||
|
if (stderr && !stderr.includes('warning')) {
|
||||||
|
console.error('Error:', stderr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Database reset successfully!');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to reset database:', error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resetDatabase();
|
||||||
Executable
+12
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "Resetting PostgreSQL database..."
|
||||||
|
|
||||||
|
# Connect to PostgreSQL and reset the database (without -t for TTY)
|
||||||
|
docker exec -i placebo-postgres-dev psql -U placebo_user -d postgres <<EOF
|
||||||
|
DROP DATABASE IF EXISTS placebo_backend_db;
|
||||||
|
CREATE DATABASE placebo_backend_db;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "Database reset complete!"
|
||||||
|
echo "The new schema will be created when the backend starts with DATABASE_SYNCHRONIZE=true"
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { NestFactory } from '@nestjs/core';
|
||||||
|
import { AppModule } from '../src/app.module';
|
||||||
|
import { UserService } from '../src/modules/users/user.service';
|
||||||
|
import { UserRole } from '../src/modules/entities';
|
||||||
|
|
||||||
|
async function bootstrap() {
|
||||||
|
const app = await NestFactory.createApplicationContext(AppModule);
|
||||||
|
const userService = app.get(UserService);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Check if admin user already exists
|
||||||
|
const existingAdmin = await userService.findByUsername('admin');
|
||||||
|
if (existingAdmin) {
|
||||||
|
console.log('Admin user already exists');
|
||||||
|
await app.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create admin user
|
||||||
|
const adminUser = await userService.create({
|
||||||
|
username: 'admin',
|
||||||
|
email: 'admin@placebo.mk',
|
||||||
|
password: 'admin123', // Change this in production!
|
||||||
|
role: UserRole.ADMIN,
|
||||||
|
isActive: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('Admin user created successfully:');
|
||||||
|
console.log(`Username: ${adminUser.username}`);
|
||||||
|
console.log(`Email: ${adminUser.email}`);
|
||||||
|
console.log(`Role: ${adminUser.role}`);
|
||||||
|
console.log('\n⚠️ IMPORTANT: Change the default password immediately!');
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error creating admin user:', error);
|
||||||
|
} finally {
|
||||||
|
await app.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bootstrap();
|
||||||
@@ -6,13 +6,21 @@ import { AppService } from './app.service';
|
|||||||
import { ArticlesModule } from './modules/articles.module';
|
import { ArticlesModule } from './modules/articles.module';
|
||||||
import { StrapiModule } from './modules/strapi.module';
|
import { StrapiModule } from './modules/strapi.module';
|
||||||
import { LiveBlogModule } from './modules/live-blog.module';
|
import { LiveBlogModule } from './modules/live-blog.module';
|
||||||
|
import { UserModule } from './modules/users/user.module';
|
||||||
|
import { AuthModule } from './modules/auth/auth.module';
|
||||||
|
import { CommentModule } from './modules/comment/comment.module';
|
||||||
|
import { AnalyticsModule } from './modules/analytics/analytics.module';
|
||||||
import {
|
import {
|
||||||
Article,
|
Article,
|
||||||
Author,
|
Author,
|
||||||
Category,
|
Category,
|
||||||
LiveBlog,
|
LiveBlog,
|
||||||
LiveBlogUpdate,
|
LiveBlogUpdate,
|
||||||
|
User,
|
||||||
|
Comment,
|
||||||
|
Reaction,
|
||||||
} from './modules/entities';
|
} from './modules/entities';
|
||||||
|
import { ShareEvent } from './modules/analytics/analytics.entity';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -26,13 +34,27 @@ import {
|
|||||||
username: process.env.DATABASE_USERNAME || 'placebo_user',
|
username: process.env.DATABASE_USERNAME || 'placebo_user',
|
||||||
password: process.env.DATABASE_PASSWORD || 'placebo_password',
|
password: process.env.DATABASE_PASSWORD || 'placebo_password',
|
||||||
database: process.env.DATABASE_NAME || 'placebo_backend_db',
|
database: process.env.DATABASE_NAME || 'placebo_backend_db',
|
||||||
entities: [Article, Author, Category, LiveBlog, LiveBlogUpdate],
|
entities: [
|
||||||
synchronize: process.env.NODE_ENV !== 'production',
|
Article,
|
||||||
logging: process.env.NODE_ENV === 'development',
|
Author,
|
||||||
|
Category,
|
||||||
|
LiveBlog,
|
||||||
|
LiveBlogUpdate,
|
||||||
|
User,
|
||||||
|
Comment,
|
||||||
|
Reaction,
|
||||||
|
ShareEvent,
|
||||||
|
],
|
||||||
|
synchronize: process.env.DATABASE_SYNCHRONIZE === 'true',
|
||||||
|
logging: process.env.DATABASE_LOGGING === 'true',
|
||||||
}),
|
}),
|
||||||
ArticlesModule,
|
ArticlesModule,
|
||||||
StrapiModule,
|
StrapiModule,
|
||||||
LiveBlogModule,
|
LiveBlogModule,
|
||||||
|
UserModule,
|
||||||
|
AuthModule,
|
||||||
|
CommentModule,
|
||||||
|
AnalyticsModule,
|
||||||
],
|
],
|
||||||
controllers: [AppController],
|
controllers: [AppController],
|
||||||
providers: [AppService],
|
providers: [AppService],
|
||||||
|
|||||||
+16
-1
@@ -1,5 +1,7 @@
|
|||||||
import { NestFactory } from '@nestjs/core';
|
import { NestFactory, Reflector } from '@nestjs/core';
|
||||||
|
import { ValidationPipe } from '@nestjs/common';
|
||||||
import { AppModule } from './app.module';
|
import { AppModule } from './app.module';
|
||||||
|
import { JwtAuthPublicGuard } from './modules/auth/jwt-auth-public.guard';
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = await NestFactory.create(AppModule);
|
const app = await NestFactory.create(AppModule);
|
||||||
@@ -16,6 +18,19 @@ async function bootstrap() {
|
|||||||
|
|
||||||
app.setGlobalPrefix('api/v1');
|
app.setGlobalPrefix('api/v1');
|
||||||
|
|
||||||
|
// Apply global validation pipe
|
||||||
|
app.useGlobalPipes(
|
||||||
|
new ValidationPipe({
|
||||||
|
whitelist: true,
|
||||||
|
transform: true,
|
||||||
|
forbidNonWhitelisted: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Apply global authentication guard
|
||||||
|
const reflector = app.get(Reflector);
|
||||||
|
app.useGlobalGuards(new JwtAuthPublicGuard(reflector));
|
||||||
|
|
||||||
const port = process.env.PORT ?? 3000;
|
const port = process.env.PORT ?? 3000;
|
||||||
const host = '0.0.0.0'; // Bind to all interfaces for Docker
|
const host = '0.0.0.0'; // Bind to all interfaces for Docker
|
||||||
await app.listen(port, host);
|
await app.listen(port, host);
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Post,
|
||||||
|
Body,
|
||||||
|
Get,
|
||||||
|
Query,
|
||||||
|
UsePipes,
|
||||||
|
ValidationPipe,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { AnalyticsService } from './analytics.service';
|
||||||
|
import {
|
||||||
|
TrackShareDto,
|
||||||
|
GetShareStatsDto,
|
||||||
|
ShareStatsResponse,
|
||||||
|
} from './analytics.dto';
|
||||||
|
import { Public } from '../auth/public.decorator';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { RolesGuard } from '../auth/roles.guard';
|
||||||
|
import { Roles } from '../auth/roles.decorator';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
@Controller('analytics')
|
||||||
|
export class AnalyticsController {
|
||||||
|
constructor(private readonly analyticsService: AnalyticsService) {}
|
||||||
|
|
||||||
|
@Public()
|
||||||
|
@Post('share')
|
||||||
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
@UsePipes(new ValidationPipe({ transform: true }))
|
||||||
|
async trackShare(@Body() trackShareDto: TrackShareDto) {
|
||||||
|
return await this.analyticsService.trackShare(trackShareDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
@Get('shares')
|
||||||
|
@UsePipes(new ValidationPipe({ transform: true }))
|
||||||
|
async getShareStats(
|
||||||
|
@Query() getShareStatsDto: GetShareStatsDto,
|
||||||
|
): Promise<ShareStatsResponse[]> {
|
||||||
|
return await this.analyticsService.getShareStats(getShareStatsDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
@Get('shares/top')
|
||||||
|
async getTopSharedArticles(@Query('limit') limit: string) {
|
||||||
|
const limitNum = limit ? parseInt(limit) : 10;
|
||||||
|
return await this.analyticsService.getTopSharedArticles(limitNum);
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
@Get('shares/trends')
|
||||||
|
async getShareTrends(
|
||||||
|
@Query('startDate') startDate: string,
|
||||||
|
@Query('endDate') endDate: string,
|
||||||
|
@Query('interval') interval: 'day' | 'week' | 'month',
|
||||||
|
) {
|
||||||
|
return await this.analyticsService.getShareTrends(
|
||||||
|
new Date(startDate),
|
||||||
|
new Date(endDate),
|
||||||
|
interval || 'day',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
@Get('shares/total')
|
||||||
|
async getTotalShareStats() {
|
||||||
|
return await this.analyticsService.getTotalShareStats();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
|
||||||
|
import type { SharePlatform } from './analytics.entity';
|
||||||
|
|
||||||
|
export class TrackShareDto {
|
||||||
|
@IsUUID()
|
||||||
|
articleId: string;
|
||||||
|
|
||||||
|
@IsEnum(['facebook', 'twitter', 'whatsapp', 'telegram', 'link'])
|
||||||
|
platform: SharePlatform;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
userAgent?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ipAddress?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class GetShareStatsDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
articleId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
startDate?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
endDate?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ShareStatsResponse {
|
||||||
|
articleId: string;
|
||||||
|
articleTitle: string;
|
||||||
|
facebookShares: number;
|
||||||
|
twitterShares: number;
|
||||||
|
whatsappShares: number;
|
||||||
|
telegramShares: number;
|
||||||
|
linkShares: number;
|
||||||
|
totalShares: number;
|
||||||
|
views: number;
|
||||||
|
shareRate: number;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
import {
|
||||||
|
Entity,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
ManyToOne,
|
||||||
|
JoinColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { Article } from '../entities';
|
||||||
|
|
||||||
|
export type SharePlatform =
|
||||||
|
| 'facebook'
|
||||||
|
| 'twitter'
|
||||||
|
| 'whatsapp'
|
||||||
|
| 'telegram'
|
||||||
|
| 'link';
|
||||||
|
|
||||||
|
@Entity('share_events')
|
||||||
|
export class ShareEvent {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column()
|
||||||
|
articleId: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text' })
|
||||||
|
platform: SharePlatform;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
userId: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
userAgent: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
ipAddress: string;
|
||||||
|
|
||||||
|
@CreateDateColumn()
|
||||||
|
createdAt: Date;
|
||||||
|
|
||||||
|
@ManyToOne(() => Article, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'articleId' })
|
||||||
|
article: Article;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ShareStats {
|
||||||
|
articleId: string;
|
||||||
|
articleTitle: string;
|
||||||
|
facebookShares: number;
|
||||||
|
twitterShares: number;
|
||||||
|
whatsappShares: number;
|
||||||
|
telegramShares: number;
|
||||||
|
linkShares: number;
|
||||||
|
totalShares: number;
|
||||||
|
views: number;
|
||||||
|
shareRate: number;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { AnalyticsController } from './analytics.controller';
|
||||||
|
import { AnalyticsService } from './analytics.service';
|
||||||
|
import { ShareEvent } from './analytics.entity';
|
||||||
|
import { Article } from '../entities';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([ShareEvent, Article])],
|
||||||
|
controllers: [AnalyticsController],
|
||||||
|
providers: [AnalyticsService],
|
||||||
|
exports: [AnalyticsService],
|
||||||
|
})
|
||||||
|
export class AnalyticsModule {}
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { ShareEvent, SharePlatform } from './analytics.entity';
|
||||||
|
import { Article } from '../entities';
|
||||||
|
import {
|
||||||
|
TrackShareDto,
|
||||||
|
GetShareStatsDto,
|
||||||
|
ShareStatsResponse,
|
||||||
|
} from './analytics.dto';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AnalyticsService {
|
||||||
|
private readonly logger = new Logger(AnalyticsService.name);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(ShareEvent)
|
||||||
|
private readonly shareEventRepository: Repository<ShareEvent>,
|
||||||
|
@InjectRepository(Article)
|
||||||
|
private readonly articleRepository: Repository<Article>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async trackShare(trackShareDto: TrackShareDto): Promise<ShareEvent> {
|
||||||
|
const shareEvent = this.shareEventRepository.create(trackShareDto);
|
||||||
|
|
||||||
|
// Also update the article's share counters
|
||||||
|
await this.incrementArticleShareCounter(
|
||||||
|
trackShareDto.articleId,
|
||||||
|
trackShareDto.platform,
|
||||||
|
);
|
||||||
|
|
||||||
|
return await this.shareEventRepository.save(shareEvent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async incrementArticleShareCounter(
|
||||||
|
articleId: string,
|
||||||
|
platform: SharePlatform,
|
||||||
|
): Promise<void> {
|
||||||
|
const updateField = this.getShareCounterField(platform);
|
||||||
|
if (!updateField) return;
|
||||||
|
|
||||||
|
await this.articleRepository
|
||||||
|
.createQueryBuilder()
|
||||||
|
.update(Article)
|
||||||
|
.set({ [updateField]: () => `${updateField} + 1` })
|
||||||
|
.where('id = :id', { id: articleId })
|
||||||
|
.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
private getShareCounterField(platform: SharePlatform): string | null {
|
||||||
|
switch (platform) {
|
||||||
|
case 'facebook':
|
||||||
|
return 'facebookShares';
|
||||||
|
case 'twitter':
|
||||||
|
return 'twitterShares';
|
||||||
|
case 'whatsapp':
|
||||||
|
return 'whatsappShares';
|
||||||
|
case 'telegram':
|
||||||
|
return 'telegramShares';
|
||||||
|
default:
|
||||||
|
return null; // 'link' shares don't increment counters
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getShareStats(
|
||||||
|
getShareStatsDto: GetShareStatsDto,
|
||||||
|
): Promise<ShareStatsResponse[]> {
|
||||||
|
const query = this.articleRepository
|
||||||
|
.createQueryBuilder('article')
|
||||||
|
.select([
|
||||||
|
'article.id as "articleId"',
|
||||||
|
'article.title as "articleTitle"',
|
||||||
|
'article.facebookShares as "facebookShares"',
|
||||||
|
'article.twitterShares as "twitterShares"',
|
||||||
|
'article.whatsappShares as "whatsappShares"',
|
||||||
|
'article.telegramShares as "telegramShares"',
|
||||||
|
'article.views as "views"',
|
||||||
|
'article.createdAt as "createdAt"',
|
||||||
|
'article.updatedAt as "updatedAt"',
|
||||||
|
])
|
||||||
|
.addSelect(
|
||||||
|
`(article.facebookShares + article.twitterShares + article.whatsappShares + article.telegramShares) as "totalShares"`,
|
||||||
|
)
|
||||||
|
.addSelect(
|
||||||
|
`CASE
|
||||||
|
WHEN article.views > 0
|
||||||
|
THEN ROUND(
|
||||||
|
(article.facebookShares + article.twitterShares + article.whatsappShares + article.telegramShares)::decimal / article.views * 100,
|
||||||
|
2
|
||||||
|
)
|
||||||
|
ELSE 0
|
||||||
|
END as "shareRate"`,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (getShareStatsDto.articleId) {
|
||||||
|
query.where('article.id = :articleId', {
|
||||||
|
articleId: getShareStatsDto.articleId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getShareStatsDto.startDate) {
|
||||||
|
query.andWhere('article.createdAt >= :startDate', {
|
||||||
|
startDate: getShareStatsDto.startDate,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getShareStatsDto.endDate) {
|
||||||
|
query.andWhere('article.createdAt <= :endDate', {
|
||||||
|
endDate: getShareStatsDto.endDate,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
query.orderBy('"totalShares"', 'DESC');
|
||||||
|
|
||||||
|
const rawResults = await query.getRawMany<{
|
||||||
|
articleId: string;
|
||||||
|
articleTitle: string;
|
||||||
|
facebookShares: string;
|
||||||
|
twitterShares: string;
|
||||||
|
whatsappShares: string;
|
||||||
|
telegramShares: string;
|
||||||
|
views: string;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
totalShares: string;
|
||||||
|
shareRate: string;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
// Get link shares from share_events table
|
||||||
|
const results: ShareStatsResponse[] = [];
|
||||||
|
for (const rawResult of rawResults) {
|
||||||
|
const linkShares = await this.shareEventRepository.count({
|
||||||
|
where: {
|
||||||
|
articleId: rawResult.articleId,
|
||||||
|
platform: 'link',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const facebookShares = parseInt(rawResult.facebookShares) || 0;
|
||||||
|
const twitterShares = parseInt(rawResult.twitterShares) || 0;
|
||||||
|
const whatsappShares = parseInt(rawResult.whatsappShares) || 0;
|
||||||
|
const telegramShares = parseInt(rawResult.telegramShares) || 0;
|
||||||
|
const views = parseInt(rawResult.views) || 0;
|
||||||
|
const baseTotalShares =
|
||||||
|
facebookShares + twitterShares + whatsappShares + telegramShares;
|
||||||
|
const totalShares = baseTotalShares + linkShares;
|
||||||
|
const shareRate =
|
||||||
|
views > 0 ? parseFloat(((totalShares / views) * 100).toFixed(2)) : 0;
|
||||||
|
|
||||||
|
results.push({
|
||||||
|
articleId: rawResult.articleId,
|
||||||
|
articleTitle: rawResult.articleTitle,
|
||||||
|
facebookShares,
|
||||||
|
twitterShares,
|
||||||
|
whatsappShares,
|
||||||
|
telegramShares,
|
||||||
|
linkShares,
|
||||||
|
totalShares,
|
||||||
|
views,
|
||||||
|
shareRate,
|
||||||
|
createdAt: new Date(rawResult.createdAt),
|
||||||
|
updatedAt: new Date(rawResult.updatedAt),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getTopSharedArticles(
|
||||||
|
limit: number = 10,
|
||||||
|
): Promise<ShareStatsResponse[]> {
|
||||||
|
const stats = await this.getShareStats({});
|
||||||
|
return stats.slice(0, limit);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getShareTrends(
|
||||||
|
startDate: Date,
|
||||||
|
endDate: Date,
|
||||||
|
interval: 'day' | 'week' | 'month' = 'day',
|
||||||
|
): Promise<
|
||||||
|
Array<{ period: string; platform: SharePlatform; count: number }>
|
||||||
|
> {
|
||||||
|
const dateFormat =
|
||||||
|
interval === 'day'
|
||||||
|
? 'YYYY-MM-DD'
|
||||||
|
: interval === 'week'
|
||||||
|
? 'YYYY-WW'
|
||||||
|
: 'YYYY-MM';
|
||||||
|
|
||||||
|
const query = this.shareEventRepository
|
||||||
|
.createQueryBuilder('share_event')
|
||||||
|
.select([
|
||||||
|
`TO_CHAR(share_event.createdAt, '${dateFormat}') as period`,
|
||||||
|
'share_event.platform as platform',
|
||||||
|
'COUNT(*) as count',
|
||||||
|
])
|
||||||
|
.where('share_event.createdAt >= :startDate', { startDate })
|
||||||
|
.andWhere('share_event.createdAt <= :endDate', { endDate })
|
||||||
|
.groupBy('period, platform')
|
||||||
|
.orderBy('period', 'ASC');
|
||||||
|
|
||||||
|
const rawResults = await query.getRawMany<{
|
||||||
|
period: string;
|
||||||
|
platform: string;
|
||||||
|
count: string;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
// Convert platform strings to SharePlatform type
|
||||||
|
return rawResults.map((result) => ({
|
||||||
|
period: result.period,
|
||||||
|
platform: result.platform as SharePlatform,
|
||||||
|
count: parseInt(result.count) || 0,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
async getTotalShareStats(): Promise<{
|
||||||
|
totalShares: number;
|
||||||
|
facebookShares: number;
|
||||||
|
twitterShares: number;
|
||||||
|
whatsappShares: number;
|
||||||
|
telegramShares: number;
|
||||||
|
linkShares: number;
|
||||||
|
}> {
|
||||||
|
interface ArticleStatsRaw {
|
||||||
|
facebookShares: string;
|
||||||
|
twitterShares: string;
|
||||||
|
whatsappShares: string;
|
||||||
|
telegramShares: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const articleStats = (await this.articleRepository
|
||||||
|
.createQueryBuilder('article')
|
||||||
|
.select([
|
||||||
|
'SUM(article.facebookShares) as facebookShares',
|
||||||
|
'SUM(article.twitterShares) as twitterShares',
|
||||||
|
'SUM(article.whatsappShares) as whatsappShares',
|
||||||
|
'SUM(article.telegramShares) as telegramShares',
|
||||||
|
])
|
||||||
|
.getRawOne()) as ArticleStatsRaw;
|
||||||
|
|
||||||
|
const linkShares = await this.shareEventRepository.count({
|
||||||
|
where: { platform: 'link' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const facebookShares = parseInt(articleStats?.facebookShares || '0') || 0;
|
||||||
|
const twitterShares = parseInt(articleStats?.twitterShares || '0') || 0;
|
||||||
|
const whatsappShares = parseInt(articleStats?.whatsappShares || '0') || 0;
|
||||||
|
const telegramShares = parseInt(articleStats?.telegramShares || '0') || 0;
|
||||||
|
|
||||||
|
const totalShares =
|
||||||
|
facebookShares +
|
||||||
|
twitterShares +
|
||||||
|
whatsappShares +
|
||||||
|
telegramShares +
|
||||||
|
linkShares;
|
||||||
|
|
||||||
|
return {
|
||||||
|
totalShares,
|
||||||
|
facebookShares,
|
||||||
|
twitterShares,
|
||||||
|
whatsappShares,
|
||||||
|
telegramShares,
|
||||||
|
linkShares,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
Body,
|
Body,
|
||||||
Param,
|
Param,
|
||||||
Query,
|
Query,
|
||||||
ValidationPipe,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ArticlesService } from './articles.service';
|
import { ArticlesService } from './articles.service';
|
||||||
import {
|
import {
|
||||||
@@ -16,57 +16,67 @@ import {
|
|||||||
UpdateArticleDto,
|
UpdateArticleDto,
|
||||||
FindArticlesDto,
|
FindArticlesDto,
|
||||||
} from './articles.dto';
|
} from './articles.dto';
|
||||||
import { ArticleStatus } from './entities';
|
|
||||||
|
import { JwtAuthGuard } from './auth/jwt-auth.guard';
|
||||||
|
import { RolesGuard } from './auth/roles.guard';
|
||||||
|
import { Roles } from './auth/roles.decorator';
|
||||||
|
import { Public } from './auth/public.decorator';
|
||||||
|
import { UserRole } from './entities';
|
||||||
|
|
||||||
@Controller('articles')
|
@Controller('articles')
|
||||||
export class ArticlesController {
|
export class ArticlesController {
|
||||||
constructor(private readonly articlesService: ArticlesService) {}
|
constructor(private readonly articlesService: ArticlesService) {}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
create(@Body(new ValidationPipe({ transform: true })) dto: CreateArticleDto) {
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
|
create(@Body() dto: CreateArticleDto) {
|
||||||
return this.articlesService.create(dto);
|
return this.articlesService.create(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
findAll(
|
@Public()
|
||||||
@Query(new ValidationPipe({ transform: true })) dto: FindArticlesDto,
|
findAll(@Query() dto: FindArticlesDto) {
|
||||||
) {
|
|
||||||
return this.articlesService.findAll(dto);
|
return this.articlesService.findAll(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
|
@Public()
|
||||||
findOne(@Param('id') id: string) {
|
findOne(@Param('id') id: string) {
|
||||||
return this.articlesService.findOne(id);
|
return this.articlesService.findOne(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('slug/:slug')
|
@Get('slug/:slug')
|
||||||
|
@Public()
|
||||||
findBySlug(@Param('slug') slug: string) {
|
findBySlug(@Param('slug') slug: string) {
|
||||||
return this.articlesService.findBySlug(slug);
|
return this.articlesService.findBySlug(slug);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put(':id')
|
@Put(':id')
|
||||||
update(
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
@Param('id') id: string,
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
@Body(new ValidationPipe({ transform: true })) dto: UpdateArticleDto,
|
update(@Param('id') id: string, @Body() dto: UpdateArticleDto) {
|
||||||
) {
|
|
||||||
return this.articlesService.update(id, dto);
|
return this.articlesService.update(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(':id')
|
@Delete(':id')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
remove(@Param('id') id: string) {
|
remove(@Param('id') id: string) {
|
||||||
return this.articlesService.remove(id);
|
return this.articlesService.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/archive')
|
@Patch(':id/archive')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
archive(@Param('id') id: string) {
|
archive(@Param('id') id: string) {
|
||||||
return this.articlesService.archive(id);
|
return this.articlesService.archive(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/publish')
|
@Patch(':id/publish')
|
||||||
publish(
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
@Param('id') id: string,
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
@Query('status') status?: ArticleStatus,
|
publish(@Param('id') id: string) {
|
||||||
) {
|
return this.articlesService.publish(id);
|
||||||
return this.articlesService.publish(id, status || ArticleStatus.PUBLISHED);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,6 +75,30 @@ export class CreateArticleDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
videoCaption?: string;
|
videoCaption?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogTitle?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogDescription?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterTitle?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterDescription?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterImage?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateArticleDto {
|
export class UpdateArticleDto {
|
||||||
@@ -138,6 +162,30 @@ export class UpdateArticleDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
videoCaption?: string;
|
videoCaption?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogTitle?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogDescription?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
ogImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterTitle?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterDescription?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
twitterImage?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FindArticlesDto {
|
export class FindArticlesDto {
|
||||||
|
|||||||
@@ -0,0 +1,356 @@
|
|||||||
|
import {
|
||||||
|
IsString,
|
||||||
|
IsOptional,
|
||||||
|
IsEnum,
|
||||||
|
IsArray,
|
||||||
|
IsUUID,
|
||||||
|
IsNumber,
|
||||||
|
IsBoolean,
|
||||||
|
IsDate,
|
||||||
|
} from 'class-validator';
|
||||||
|
import {
|
||||||
|
ArticleStatus,
|
||||||
|
LiveBlogStatus,
|
||||||
|
ImagePosition,
|
||||||
|
ImageSize,
|
||||||
|
VideoPosition,
|
||||||
|
} from './entities';
|
||||||
|
|
||||||
|
export class CreateArticleDto {
|
||||||
|
@IsString()
|
||||||
|
title: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
content: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
excerpt?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
slug?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
featuredImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@IsString({ each: true })
|
||||||
|
tags?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ArticleStatus)
|
||||||
|
status?: ArticleStatus;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
categoryId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImagePosition)
|
||||||
|
imagePosition?: ImagePosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImageSize)
|
||||||
|
imageSize?: ImageSize;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoUrl?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(VideoPosition)
|
||||||
|
videoPosition?: VideoPosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoCaption?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UpdateArticleDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
title?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
content?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
excerpt?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
slug?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
featuredImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@IsString({ each: true })
|
||||||
|
tags?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ArticleStatus)
|
||||||
|
status?: ArticleStatus;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
categoryId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImagePosition)
|
||||||
|
imagePosition?: ImagePosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImageSize)
|
||||||
|
imageSize?: ImageSize;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoUrl?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(VideoPosition)
|
||||||
|
videoPosition?: VideoPosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoCaption?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class FindArticlesDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
category?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
author?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
tag?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
status?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
search?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsNumber()
|
||||||
|
page?: number;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
limit?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CreateLiveBlogDto {
|
||||||
|
@IsString()
|
||||||
|
title: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
slug: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
description?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(LiveBlogStatus)
|
||||||
|
status?: LiveBlogStatus;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isPinned?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
categoryId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
featuredImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImagePosition)
|
||||||
|
imagePosition?: ImagePosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImageSize)
|
||||||
|
imageSize?: ImageSize;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoUrl?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(VideoPosition)
|
||||||
|
videoPosition?: VideoPosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoCaption?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UpdateLiveBlogDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
title?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
slug?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
description?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(LiveBlogStatus)
|
||||||
|
status?: LiveBlogStatus;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isPinned?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
categoryId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
featuredImage?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImagePosition)
|
||||||
|
imagePosition?: ImagePosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(ImageSize)
|
||||||
|
imageSize?: ImageSize;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoUrl?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(VideoPosition)
|
||||||
|
videoPosition?: VideoPosition;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
videoCaption?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CreateLiveBlogUpdateDto {
|
||||||
|
@IsString()
|
||||||
|
content: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isPinned?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsDate()
|
||||||
|
scheduledAt?: Date;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UpdateLiveBlogUpdateDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
content?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isPinned?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
authorId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsDate()
|
||||||
|
scheduledAt?: Date;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
strapiId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class FindLiveBlogsDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
category?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
author?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
status?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isPinned?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
search?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsNumber()
|
||||||
|
page?: number;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
limit?: number;
|
||||||
|
}
|
||||||
@@ -1,11 +1,15 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module, forwardRef } from '@nestjs/common';
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { ArticlesService } from './articles.service';
|
import { ArticlesService } from './articles.service';
|
||||||
import { ArticlesController } from './articles.controller';
|
import { ArticlesController } from './articles.controller';
|
||||||
import { Article, Author, Category } from './entities';
|
import { Article, Author, Category } from './entities';
|
||||||
|
import { StrapiModule } from './strapi.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [TypeOrmModule.forFeature([Article, Author, Category])],
|
imports: [
|
||||||
|
TypeOrmModule.forFeature([Article, Author, Category]),
|
||||||
|
forwardRef(() => StrapiModule),
|
||||||
|
],
|
||||||
controllers: [ArticlesController],
|
controllers: [ArticlesController],
|
||||||
providers: [ArticlesService],
|
providers: [ArticlesService],
|
||||||
exports: [ArticlesService],
|
exports: [ArticlesService],
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
import { Injectable, NotFoundException, Logger } from '@nestjs/common';
|
import {
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
Logger,
|
||||||
|
Inject,
|
||||||
|
forwardRef,
|
||||||
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { Repository } from 'typeorm';
|
import { Repository } from 'typeorm';
|
||||||
import { Article, ArticleStatus } from './entities';
|
import { Article, ArticleStatus } from './entities';
|
||||||
|
import { StrapiService } from './strapi.service';
|
||||||
import {
|
import {
|
||||||
CreateArticleDto,
|
CreateArticleDto,
|
||||||
UpdateArticleDto,
|
UpdateArticleDto,
|
||||||
@@ -15,6 +22,8 @@ export class ArticlesService {
|
|||||||
constructor(
|
constructor(
|
||||||
@InjectRepository(Article)
|
@InjectRepository(Article)
|
||||||
private readonly articleRepository: Repository<Article>,
|
private readonly articleRepository: Repository<Article>,
|
||||||
|
@Inject(forwardRef(() => StrapiService))
|
||||||
|
private readonly strapiService: StrapiService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(dto: CreateArticleDto): Promise<Article> {
|
async create(dto: CreateArticleDto): Promise<Article> {
|
||||||
@@ -102,44 +111,173 @@ export class ArticlesService {
|
|||||||
|
|
||||||
async update(id: string, dto: UpdateArticleDto): Promise<Article> {
|
async update(id: string, dto: UpdateArticleDto): Promise<Article> {
|
||||||
const article = await this.findOne(id);
|
const article = await this.findOne(id);
|
||||||
|
const oldStatus = article.status;
|
||||||
Object.assign(article, dto);
|
Object.assign(article, dto);
|
||||||
return await this.articleRepository.save(article);
|
const savedArticle = await this.articleRepository.save(article);
|
||||||
|
|
||||||
|
// Update Strapi if status changed and article has strapiId
|
||||||
|
if (
|
||||||
|
dto.status !== undefined &&
|
||||||
|
dto.status !== oldStatus &&
|
||||||
|
article.strapiId
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateArticleStatusInStrapi(
|
||||||
|
article.strapiId,
|
||||||
|
dto.status,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for article ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return savedArticle;
|
||||||
}
|
}
|
||||||
|
|
||||||
async remove(id: string): Promise<void> {
|
async remove(id: string): Promise<void> {
|
||||||
const article = await this.findOne(id);
|
const article = await this.findOne(id);
|
||||||
|
|
||||||
|
// Delete from Strapi if article has strapiId
|
||||||
|
if (article.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.deleteArticleFromStrapi(article.strapiId);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - we still want to delete from backend
|
||||||
|
this.logger.error(`Failed to delete article ${id} from Strapi:`, error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await this.articleRepository.remove(article);
|
await this.articleRepository.remove(article);
|
||||||
}
|
}
|
||||||
|
|
||||||
async archive(id: string): Promise<Article> {
|
async archive(id: string): Promise<Article> {
|
||||||
const article = await this.findOne(id);
|
const article = await this.findOne(id);
|
||||||
article.status = ArticleStatus.ARCHIVED;
|
article.status = ArticleStatus.ARCHIVED;
|
||||||
return await this.articleRepository.save(article);
|
const savedArticle = await this.articleRepository.save(article);
|
||||||
|
|
||||||
|
// Update Strapi if article has strapiId
|
||||||
|
if (article.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateArticleStatusInStrapi(
|
||||||
|
article.strapiId,
|
||||||
|
ArticleStatus.ARCHIVED,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for article ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async publish(id: string, status: ArticleStatus = ArticleStatus.PUBLISHED): Promise<Article> {
|
return savedArticle;
|
||||||
|
}
|
||||||
|
|
||||||
|
async publish(
|
||||||
|
id: string,
|
||||||
|
status: ArticleStatus = ArticleStatus.PUBLISHED,
|
||||||
|
): Promise<Article> {
|
||||||
const article = await this.findOne(id);
|
const article = await this.findOne(id);
|
||||||
article.status = status;
|
article.status = status;
|
||||||
return await this.articleRepository.save(article);
|
const savedArticle = await this.articleRepository.save(article);
|
||||||
|
|
||||||
|
// Update Strapi if article has strapiId
|
||||||
|
if (article.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateArticleStatusInStrapi(
|
||||||
|
article.strapiId,
|
||||||
|
status,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for article ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return savedArticle;
|
||||||
}
|
}
|
||||||
|
|
||||||
async syncFromStrapi(
|
async syncFromStrapi(
|
||||||
strapiId: string,
|
strapiId: string,
|
||||||
data: Partial<CreateArticleDto>,
|
data: Partial<CreateArticleDto>,
|
||||||
): Promise<Article> {
|
): Promise<Article> {
|
||||||
let article = await this.articleRepository.findOne({ where: { strapiId } });
|
// Use upsert to handle race conditions and ensure uniqueness
|
||||||
|
try {
|
||||||
|
// First try to find existing article by strapiId
|
||||||
|
const article = await this.articleRepository.findOne({
|
||||||
|
where: { strapiId },
|
||||||
|
});
|
||||||
|
|
||||||
if (!article) {
|
if (article) {
|
||||||
article = this.articleRepository.create({
|
// Update existing article
|
||||||
|
const currentStatus = article.status;
|
||||||
|
Object.assign(article, data);
|
||||||
|
|
||||||
|
// Preserve archived status if article is already archived in our system
|
||||||
|
// unless Strapi explicitly sends a different status
|
||||||
|
if (
|
||||||
|
currentStatus === ArticleStatus.ARCHIVED &&
|
||||||
|
data.status !== ArticleStatus.ARCHIVED
|
||||||
|
) {
|
||||||
|
article.status = ArticleStatus.ARCHIVED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await this.articleRepository.save(article);
|
||||||
|
} else {
|
||||||
|
// Create new article
|
||||||
|
const newArticle = this.articleRepository.create({
|
||||||
strapiId,
|
strapiId,
|
||||||
...data,
|
...data,
|
||||||
status: data.status || ArticleStatus.DRAFT,
|
status: data.status || ArticleStatus.DRAFT,
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
Object.assign(article, data);
|
return await this.articleRepository.save(newArticle);
|
||||||
|
}
|
||||||
|
} catch (error: unknown) {
|
||||||
|
// If we get a unique constraint violation, try to find and update again
|
||||||
|
// This handles race conditions where two syncs happen simultaneously
|
||||||
|
const dbError = error as { code?: string; constraint?: string };
|
||||||
|
if (
|
||||||
|
dbError.code === '23505' &&
|
||||||
|
dbError.constraint?.includes('strapiId')
|
||||||
|
) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Race condition detected for strapiId ${strapiId}, retrying...`,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Wait a bit and retry
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||||
|
|
||||||
|
const existingArticle = await this.articleRepository.findOne({
|
||||||
|
where: { strapiId },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (existingArticle) {
|
||||||
|
const currentStatus = existingArticle.status;
|
||||||
|
Object.assign(existingArticle, data);
|
||||||
|
|
||||||
|
if (
|
||||||
|
currentStatus === ArticleStatus.ARCHIVED &&
|
||||||
|
data.status !== ArticleStatus.ARCHIVED
|
||||||
|
) {
|
||||||
|
existingArticle.status = ArticleStatus.ARCHIVED;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await this.articleRepository.save(article);
|
return await this.articleRepository.save(existingArticle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-throw other errors
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeByStrapiId(strapiId: string): Promise<void> {
|
async removeByStrapiId(strapiId: string): Promise<void> {
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Post,
|
||||||
|
Body,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { LoginUserDto, CreateUserDto } from '../users/user.dto';
|
||||||
|
import { LocalAuthGuard } from './local-auth.guard';
|
||||||
|
import { Public } from './public.decorator';
|
||||||
|
|
||||||
|
@Controller('auth')
|
||||||
|
export class AuthController {
|
||||||
|
constructor(private readonly authService: AuthService) {}
|
||||||
|
|
||||||
|
@Public()
|
||||||
|
@UseGuards(LocalAuthGuard)
|
||||||
|
@Post('login')
|
||||||
|
@HttpCode(HttpStatus.OK)
|
||||||
|
async login(@Body() loginUserDto: LoginUserDto) {
|
||||||
|
return this.authService.login(loginUserDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Public()
|
||||||
|
@Post('register')
|
||||||
|
async register(@Body() createUserDto: CreateUserDto) {
|
||||||
|
return this.authService.register(createUserDto);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { PassportModule } from '@nestjs/passport';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { UserModule } from '../users/user.module';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { AuthController } from './auth.controller';
|
||||||
|
import { JwtStrategy } from './jwt.strategy';
|
||||||
|
import { LocalStrategy } from './local.strategy';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
UserModule,
|
||||||
|
PassportModule,
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (configService: ConfigService) => {
|
||||||
|
const expiration = configService.get<string>('JWT_EXPIRATION') || '7d';
|
||||||
|
return {
|
||||||
|
secret:
|
||||||
|
configService.get<string>('JWT_SECRET') || 'default-secret-key',
|
||||||
|
signOptions: {
|
||||||
|
expiresIn: expiration ? parseInt(expiration) : 3600, // Convert to number
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
controllers: [AuthController],
|
||||||
|
providers: [AuthService, LocalStrategy, JwtStrategy],
|
||||||
|
exports: [AuthService, JwtModule],
|
||||||
|
})
|
||||||
|
export class AuthModule {}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { JwtService } from '@nestjs/jwt';
|
||||||
|
import { UserService } from '../users/user.service';
|
||||||
|
import { CreateUserDto, LoginUserDto } from '../users/user.dto';
|
||||||
|
import { AuthResponse, JwtPayload } from './types';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuthService {
|
||||||
|
constructor(
|
||||||
|
private userService: UserService,
|
||||||
|
private jwtService: JwtService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async validateUser(
|
||||||
|
username: string,
|
||||||
|
password: string,
|
||||||
|
): Promise<{
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: string;
|
||||||
|
} | null> {
|
||||||
|
return this.userService.validateUser(username, password);
|
||||||
|
}
|
||||||
|
|
||||||
|
async login(loginUserDto: LoginUserDto): Promise<AuthResponse> {
|
||||||
|
const user = await this.validateUser(
|
||||||
|
loginUserDto.username,
|
||||||
|
loginUserDto.password,
|
||||||
|
);
|
||||||
|
if (!user) {
|
||||||
|
throw new Error('Invalid credentials');
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload: JwtPayload = {
|
||||||
|
sub: user.id,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
role: user.role as UserRole,
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
access_token: this.jwtService.sign(payload),
|
||||||
|
user: {
|
||||||
|
id: user.id,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
role: user.role as UserRole,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async register(createUserDto: CreateUserDto): Promise<AuthResponse> {
|
||||||
|
// Default new users to USER role
|
||||||
|
const userDto = {
|
||||||
|
...createUserDto,
|
||||||
|
role: UserRole.USER,
|
||||||
|
};
|
||||||
|
|
||||||
|
const user = await this.userService.create(userDto);
|
||||||
|
|
||||||
|
const payload: JwtPayload = {
|
||||||
|
sub: user.id,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
role: user.role,
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
access_token: this.jwtService.sign(payload),
|
||||||
|
user: {
|
||||||
|
id: user.id,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
role: user.role,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { Injectable, ExecutionContext } from '@nestjs/common';
|
||||||
|
import { Reflector } from '@nestjs/core';
|
||||||
|
import { AuthGuard } from '@nestjs/passport';
|
||||||
|
import { IS_PUBLIC_KEY } from './public.decorator';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class JwtAuthPublicGuard extends AuthGuard('jwt') {
|
||||||
|
constructor(private reflector: Reflector) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
canActivate(context: ExecutionContext) {
|
||||||
|
const isPublic = this.reflector.getAllAndOverride<boolean>(IS_PUBLIC_KEY, [
|
||||||
|
context.getHandler(),
|
||||||
|
context.getClass(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (isPublic) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.canActivate(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import { Injectable, ExecutionContext } from '@nestjs/common';
|
||||||
|
import { AuthGuard } from '@nestjs/passport';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class JwtAuthGuard extends AuthGuard('jwt') {
|
||||||
|
canActivate(context: ExecutionContext) {
|
||||||
|
return super.canActivate(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { PassportStrategy } from '@nestjs/passport';
|
||||||
|
import { ExtractJwt, Strategy } from 'passport-jwt';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtPayload } from './types';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||||
|
constructor(private configService: ConfigService) {
|
||||||
|
super({
|
||||||
|
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
||||||
|
ignoreExpiration: false,
|
||||||
|
secretOrKey:
|
||||||
|
configService.get<string>('JWT_SECRET') || 'default-secret-key',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async validate(payload: JwtPayload) {
|
||||||
|
await Promise.resolve(); // Add await to satisfy eslint rule
|
||||||
|
return {
|
||||||
|
id: payload.sub,
|
||||||
|
username: payload.username,
|
||||||
|
email: payload.email,
|
||||||
|
role: payload.role,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { AuthGuard } from '@nestjs/passport';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class LocalAuthGuard extends AuthGuard('local') {}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
||||||
|
import { PassportStrategy } from '@nestjs/passport';
|
||||||
|
import { Strategy } from 'passport-local';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class LocalStrategy extends PassportStrategy(Strategy) {
|
||||||
|
constructor(private authService: AuthService) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
async validate(
|
||||||
|
username: string,
|
||||||
|
password: string,
|
||||||
|
): Promise<{ id: string; username: string; email: string; role: string }> {
|
||||||
|
const user = await this.authService.validateUser(username, password);
|
||||||
|
if (!user) {
|
||||||
|
throw new UnauthorizedException('Invalid credentials');
|
||||||
|
}
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import { SetMetadata } from '@nestjs/common';
|
||||||
|
|
||||||
|
export const IS_PUBLIC_KEY = 'isPublic';
|
||||||
|
export const Public = () => SetMetadata(IS_PUBLIC_KEY, true);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import { SetMetadata } from '@nestjs/common';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
export const Roles = (...roles: UserRole[]) => SetMetadata('roles', roles);
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
|
||||||
|
import { Reflector } from '@nestjs/core';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class RolesGuard implements CanActivate {
|
||||||
|
constructor(private reflector: Reflector) {}
|
||||||
|
|
||||||
|
canActivate(context: ExecutionContext): boolean {
|
||||||
|
const requiredRoles = this.reflector.getAllAndOverride<UserRole[]>(
|
||||||
|
'roles',
|
||||||
|
[context.getHandler(), context.getClass()],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!requiredRoles) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
||||||
|
const user = request.user as
|
||||||
|
| { id: string; username: string; email: string; role: UserRole }
|
||||||
|
| undefined;
|
||||||
|
if (!user) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return requiredRoles.includes(user.role);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
export interface JwtPayload {
|
||||||
|
sub: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: UserRole;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RequestWithUser extends Request {
|
||||||
|
user: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: UserRole;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuthResponse {
|
||||||
|
access_token: string;
|
||||||
|
user: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: UserRole;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Post,
|
||||||
|
Put,
|
||||||
|
Delete,
|
||||||
|
Patch,
|
||||||
|
Body,
|
||||||
|
Param,
|
||||||
|
Query,
|
||||||
|
UseGuards,
|
||||||
|
Request,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { CommentService } from './comment.service';
|
||||||
|
import {
|
||||||
|
CreateCommentDto,
|
||||||
|
UpdateCommentDto,
|
||||||
|
CommentResponseDto,
|
||||||
|
FindCommentsDto,
|
||||||
|
CreateReactionDto,
|
||||||
|
} from './comment.dto';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { RolesGuard } from '../auth/roles.guard';
|
||||||
|
import { Roles } from '../auth/roles.decorator';
|
||||||
|
import { Public } from '../auth/public.decorator';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
import type { RequestWithUser } from '../auth/types';
|
||||||
|
|
||||||
|
@Controller('comments')
|
||||||
|
export class CommentController {
|
||||||
|
constructor(private readonly commentService: CommentService) {}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
async create(
|
||||||
|
@Body() createCommentDto: CreateCommentDto,
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
): Promise<CommentResponseDto> {
|
||||||
|
return this.commentService.create(createCommentDto, req.user.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Public()
|
||||||
|
async findAll(
|
||||||
|
@Query() findCommentsDto: FindCommentsDto,
|
||||||
|
): Promise<CommentResponseDto[]> {
|
||||||
|
return this.commentService.findAll(findCommentsDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get(':id')
|
||||||
|
@Public()
|
||||||
|
async findOne(@Param('id') id: string): Promise<CommentResponseDto> {
|
||||||
|
return this.commentService.findOne(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put(':id')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
async update(
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() updateCommentDto: UpdateCommentDto,
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
): Promise<CommentResponseDto> {
|
||||||
|
return this.commentService.update(
|
||||||
|
id,
|
||||||
|
updateCommentDto,
|
||||||
|
req.user.id,
|
||||||
|
req.user.role,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
async remove(
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
): Promise<void> {
|
||||||
|
return this.commentService.remove(id, req.user.id, req.user.role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('reactions')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
async addReaction(
|
||||||
|
@Body() createReactionDto: CreateReactionDto,
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
): Promise<void> {
|
||||||
|
return this.commentService.addReaction(createReactionDto, req.user.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('reactions/user')
|
||||||
|
@Public()
|
||||||
|
async getUserReaction(
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
@Query('articleId') articleId?: string,
|
||||||
|
@Query('liveBlogId') liveBlogId?: string,
|
||||||
|
@Query('commentId') commentId?: string,
|
||||||
|
): Promise<{ type: string | null }> {
|
||||||
|
// If user is not authenticated, return null
|
||||||
|
if (!req.user?.id) {
|
||||||
|
return { type: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const reaction = await this.commentService.getUserReaction(
|
||||||
|
req.user.id,
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
commentId,
|
||||||
|
);
|
||||||
|
return { type: reaction };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('reactions/counts')
|
||||||
|
@Public()
|
||||||
|
async getReactionCounts(
|
||||||
|
@Query('articleId') articleId?: string,
|
||||||
|
@Query('liveBlogId') liveBlogId?: string,
|
||||||
|
@Query('commentId') commentId?: string,
|
||||||
|
): Promise<{ likes: number; dislikes: number }> {
|
||||||
|
return this.commentService.getReactionCounts(
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
commentId,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Admin endpoints
|
||||||
|
@Patch(':id/hide')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async hideComment(@Param('id') id: string): Promise<CommentResponseDto> {
|
||||||
|
return this.commentService.update(
|
||||||
|
id,
|
||||||
|
{ isVisible: false },
|
||||||
|
'admin',
|
||||||
|
'admin',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id/show')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async showComment(@Param('id') id: string): Promise<CommentResponseDto> {
|
||||||
|
return this.commentService.update(
|
||||||
|
id,
|
||||||
|
{ isVisible: true },
|
||||||
|
'admin',
|
||||||
|
'admin',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,149 @@
|
|||||||
|
import {
|
||||||
|
IsString,
|
||||||
|
IsOptional,
|
||||||
|
IsUUID,
|
||||||
|
IsBoolean,
|
||||||
|
IsInt,
|
||||||
|
Min,
|
||||||
|
Max,
|
||||||
|
MaxLength,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { Type } from 'class-transformer';
|
||||||
|
|
||||||
|
interface CommentEntity {
|
||||||
|
id: string;
|
||||||
|
content: string;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
parentId?: string;
|
||||||
|
userId: string;
|
||||||
|
likeCount: number;
|
||||||
|
dislikeCount: number;
|
||||||
|
isVisible: boolean;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
|
user?: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
};
|
||||||
|
replies?: CommentEntity[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CreateCommentDto {
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(5000)
|
||||||
|
content: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
articleId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
liveBlogId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
parentId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UpdateCommentDto {
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(5000)
|
||||||
|
@IsOptional()
|
||||||
|
content?: string;
|
||||||
|
|
||||||
|
@IsBoolean()
|
||||||
|
@IsOptional()
|
||||||
|
isVisible?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CommentResponseDto {
|
||||||
|
id: string;
|
||||||
|
content: string;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
parentId?: string;
|
||||||
|
userId: string;
|
||||||
|
likeCount: number;
|
||||||
|
dislikeCount: number;
|
||||||
|
isVisible: boolean;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
|
user: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
};
|
||||||
|
replies?: CommentResponseDto[];
|
||||||
|
|
||||||
|
constructor(comment: CommentEntity) {
|
||||||
|
this.id = comment.id;
|
||||||
|
this.content = comment.content;
|
||||||
|
this.articleId = comment.articleId;
|
||||||
|
this.liveBlogId = comment.liveBlogId;
|
||||||
|
this.parentId = comment.parentId;
|
||||||
|
this.userId = comment.userId;
|
||||||
|
this.likeCount = comment.likeCount;
|
||||||
|
this.dislikeCount = comment.dislikeCount;
|
||||||
|
this.isVisible = comment.isVisible;
|
||||||
|
this.createdAt = comment.createdAt;
|
||||||
|
this.updatedAt = comment.updatedAt;
|
||||||
|
|
||||||
|
if (comment.user) {
|
||||||
|
this.user = {
|
||||||
|
id: comment.user.id,
|
||||||
|
username: comment.user.username,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (comment.replies) {
|
||||||
|
this.replies = comment.replies.map(
|
||||||
|
(reply) => new CommentResponseDto(reply),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class FindCommentsDto {
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
articleId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
liveBlogId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
parentId?: string;
|
||||||
|
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@IsOptional()
|
||||||
|
@Type(() => Number)
|
||||||
|
page?: number = 1;
|
||||||
|
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@Max(100)
|
||||||
|
@IsOptional()
|
||||||
|
@Type(() => Number)
|
||||||
|
limit?: number = 20;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CreateReactionDto {
|
||||||
|
@IsString()
|
||||||
|
type: 'like' | 'dislike';
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
articleId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
liveBlogId?: string;
|
||||||
|
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
commentId?: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { Comment, Reaction } from '../entities';
|
||||||
|
import { CommentService } from './comment.service';
|
||||||
|
import { CommentController } from './comment.controller';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([Comment, Reaction])],
|
||||||
|
controllers: [CommentController],
|
||||||
|
providers: [CommentService],
|
||||||
|
exports: [CommentService],
|
||||||
|
})
|
||||||
|
export class CommentModule {}
|
||||||
@@ -0,0 +1,298 @@
|
|||||||
|
import {
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
BadRequestException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { Comment, Reaction, ReactionType } from '../entities';
|
||||||
|
import {
|
||||||
|
CreateCommentDto,
|
||||||
|
UpdateCommentDto,
|
||||||
|
CommentResponseDto,
|
||||||
|
FindCommentsDto,
|
||||||
|
CreateReactionDto,
|
||||||
|
} from './comment.dto';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CommentService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(Comment)
|
||||||
|
private commentRepository: Repository<Comment>,
|
||||||
|
@InjectRepository(Reaction)
|
||||||
|
private reactionRepository: Repository<Reaction>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(
|
||||||
|
createCommentDto: CreateCommentDto,
|
||||||
|
userId: string,
|
||||||
|
): Promise<CommentResponseDto> {
|
||||||
|
// Validate that comment is attached to either article or live blog
|
||||||
|
if (!createCommentDto.articleId && !createCommentDto.liveBlogId) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'Comment must be attached to either an article or live blog',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If parentId is provided, verify it exists
|
||||||
|
if (createCommentDto.parentId) {
|
||||||
|
const parent = await this.commentRepository.findOne({
|
||||||
|
where: { id: createCommentDto.parentId },
|
||||||
|
});
|
||||||
|
if (!parent) {
|
||||||
|
throw new NotFoundException('Parent comment not found');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const comment = this.commentRepository.create({
|
||||||
|
...createCommentDto,
|
||||||
|
userId,
|
||||||
|
});
|
||||||
|
|
||||||
|
const savedComment = await this.commentRepository.save(comment);
|
||||||
|
return this.findOne(savedComment.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAll(
|
||||||
|
findCommentsDto: FindCommentsDto,
|
||||||
|
): Promise<CommentResponseDto[]> {
|
||||||
|
const {
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
parentId,
|
||||||
|
page = 1,
|
||||||
|
limit = 20,
|
||||||
|
} = findCommentsDto;
|
||||||
|
const skip = (page - 1) * limit;
|
||||||
|
|
||||||
|
const query = this.commentRepository
|
||||||
|
.createQueryBuilder('comment')
|
||||||
|
.leftJoinAndSelect('comment.user', 'user')
|
||||||
|
.leftJoinAndSelect('comment.replies', 'replies')
|
||||||
|
.leftJoinAndSelect('replies.user', 'replyUser')
|
||||||
|
.where('comment.isVisible = :isVisible', { isVisible: true });
|
||||||
|
|
||||||
|
if (articleId) {
|
||||||
|
query.andWhere('comment.articleId = :articleId', { articleId });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (liveBlogId) {
|
||||||
|
query.andWhere('comment.liveBlogId = :liveBlogId', { liveBlogId });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parentId) {
|
||||||
|
query.andWhere('comment.parentId = :parentId', { parentId });
|
||||||
|
} else {
|
||||||
|
query.andWhere('comment.parentId IS NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
query.orderBy('comment.createdAt', 'DESC').skip(skip).take(limit);
|
||||||
|
|
||||||
|
const comments = await query.getMany();
|
||||||
|
return comments.map((comment) => new CommentResponseDto(comment));
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOne(id: string): Promise<CommentResponseDto> {
|
||||||
|
const comment = await this.commentRepository
|
||||||
|
.createQueryBuilder('comment')
|
||||||
|
.leftJoinAndSelect('comment.user', 'user')
|
||||||
|
.leftJoinAndSelect('comment.replies', 'replies')
|
||||||
|
.leftJoinAndSelect('replies.user', 'replyUser')
|
||||||
|
.where('comment.id = :id', { id })
|
||||||
|
.andWhere('comment.isVisible = :isVisible', { isVisible: true })
|
||||||
|
.getOne();
|
||||||
|
|
||||||
|
if (!comment) {
|
||||||
|
throw new NotFoundException('Comment not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
return new CommentResponseDto(comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(
|
||||||
|
id: string,
|
||||||
|
updateCommentDto: UpdateCommentDto,
|
||||||
|
userId: string,
|
||||||
|
userRole: string,
|
||||||
|
): Promise<CommentResponseDto> {
|
||||||
|
const comment = await this.commentRepository.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['user'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!comment) {
|
||||||
|
throw new NotFoundException('Comment not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only allow comment owner or admin to update
|
||||||
|
if (comment.userId !== userId && userRole !== 'admin') {
|
||||||
|
throw new BadRequestException('You can only update your own comments');
|
||||||
|
}
|
||||||
|
|
||||||
|
Object.assign(comment, updateCommentDto);
|
||||||
|
const updatedComment = await this.commentRepository.save(comment);
|
||||||
|
return this.findOne(updatedComment.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
async remove(id: string, userId: string, userRole: string): Promise<void> {
|
||||||
|
const comment = await this.commentRepository.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['user'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!comment) {
|
||||||
|
throw new NotFoundException('Comment not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only allow comment owner or admin to delete
|
||||||
|
if (comment.userId !== userId && userRole !== 'admin') {
|
||||||
|
throw new BadRequestException('You can only delete your own comments');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.commentRepository.remove(comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
async addReaction(
|
||||||
|
createReactionDto: CreateReactionDto,
|
||||||
|
userId: string,
|
||||||
|
): Promise<void> {
|
||||||
|
// Validate that reaction is attached to either article, live blog, or comment
|
||||||
|
const { articleId, liveBlogId, commentId, type } = createReactionDto;
|
||||||
|
|
||||||
|
if (!articleId && !liveBlogId && !commentId) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'Reaction must be attached to an article, live blog, or comment',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if user already reacted to this item
|
||||||
|
const whereClause: {
|
||||||
|
userId: string;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
commentId?: string;
|
||||||
|
} = { userId };
|
||||||
|
if (articleId) whereClause.articleId = articleId;
|
||||||
|
if (liveBlogId) whereClause.liveBlogId = liveBlogId;
|
||||||
|
if (commentId) whereClause.commentId = commentId;
|
||||||
|
|
||||||
|
const existingReaction = await this.reactionRepository.findOne({
|
||||||
|
where: whereClause,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (existingReaction) {
|
||||||
|
// If same reaction type, remove it (toggle)
|
||||||
|
if (existingReaction.type === (type as ReactionType)) {
|
||||||
|
await this.reactionRepository.remove(existingReaction);
|
||||||
|
|
||||||
|
// Update comment counts if reacting to comment
|
||||||
|
if (commentId) {
|
||||||
|
await this.updateCommentReactionCount(commentId, type, -1);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
// Change reaction type
|
||||||
|
existingReaction.type = type as ReactionType;
|
||||||
|
await this.reactionRepository.save(existingReaction);
|
||||||
|
|
||||||
|
// Update comment counts if reacting to comment
|
||||||
|
if (commentId) {
|
||||||
|
// Decrement old reaction count
|
||||||
|
await this.updateCommentReactionCount(
|
||||||
|
commentId,
|
||||||
|
existingReaction.type === ReactionType.LIKE
|
||||||
|
? ReactionType.DISLIKE
|
||||||
|
: ReactionType.LIKE,
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
// Increment new reaction count
|
||||||
|
await this.updateCommentReactionCount(commentId, type, 1);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new reaction
|
||||||
|
const reaction = this.reactionRepository.create({
|
||||||
|
...createReactionDto,
|
||||||
|
userId,
|
||||||
|
type: type as ReactionType,
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.reactionRepository.save(reaction);
|
||||||
|
|
||||||
|
// Update comment counts if reacting to comment
|
||||||
|
if (commentId) {
|
||||||
|
await this.updateCommentReactionCount(commentId, type, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async updateCommentReactionCount(
|
||||||
|
commentId: string,
|
||||||
|
type: 'like' | 'dislike',
|
||||||
|
change: number,
|
||||||
|
): Promise<void> {
|
||||||
|
const comment = await this.commentRepository.findOne({
|
||||||
|
where: { id: commentId },
|
||||||
|
});
|
||||||
|
if (!comment) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === 'like') {
|
||||||
|
comment.likeCount = Math.max(0, comment.likeCount + change);
|
||||||
|
} else {
|
||||||
|
comment.dislikeCount = Math.max(0, comment.dislikeCount + change);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.commentRepository.save(comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserReaction(
|
||||||
|
userId: string,
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string,
|
||||||
|
): Promise<ReactionType | null> {
|
||||||
|
const whereClause: {
|
||||||
|
userId: string;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
commentId?: string;
|
||||||
|
} = { userId };
|
||||||
|
if (articleId) whereClause.articleId = articleId;
|
||||||
|
if (liveBlogId) whereClause.liveBlogId = liveBlogId;
|
||||||
|
if (commentId) whereClause.commentId = commentId;
|
||||||
|
|
||||||
|
const reaction = await this.reactionRepository.findOne({
|
||||||
|
where: whereClause,
|
||||||
|
});
|
||||||
|
|
||||||
|
return reaction ? reaction.type : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getReactionCounts(
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string,
|
||||||
|
): Promise<{ likes: number; dislikes: number }> {
|
||||||
|
const query = this.reactionRepository.createQueryBuilder('reaction');
|
||||||
|
|
||||||
|
if (articleId) {
|
||||||
|
query.where('reaction.articleId = :articleId', { articleId });
|
||||||
|
} else if (liveBlogId) {
|
||||||
|
query.where('reaction.liveBlogId = :liveBlogId', { liveBlogId });
|
||||||
|
} else if (commentId) {
|
||||||
|
query.where('reaction.commentId = :commentId', { commentId });
|
||||||
|
} else {
|
||||||
|
return { likes: 0, dislikes: 0 };
|
||||||
|
}
|
||||||
|
|
||||||
|
const reactions = await query.getMany();
|
||||||
|
|
||||||
|
return {
|
||||||
|
likes: reactions.filter((r) => r.type === ReactionType.LIKE).length,
|
||||||
|
dislikes: reactions.filter((r) => r.type === ReactionType.DISLIKE).length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -56,6 +56,17 @@ export enum VideoPosition {
|
|||||||
NONE = 'none',
|
NONE = 'none',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum UserRole {
|
||||||
|
ADMIN = 'admin',
|
||||||
|
CONTRIBUTOR = 'contributor',
|
||||||
|
USER = 'user',
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum ReactionType {
|
||||||
|
LIKE = 'like',
|
||||||
|
DISLIKE = 'dislike',
|
||||||
|
}
|
||||||
|
|
||||||
@Entity('authors')
|
@Entity('authors')
|
||||||
export class Author {
|
export class Author {
|
||||||
@PrimaryGeneratedColumn('uuid')
|
@PrimaryGeneratedColumn('uuid')
|
||||||
@@ -114,6 +125,36 @@ export class Category {
|
|||||||
parent: Category;
|
parent: Category;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Entity('users')
|
||||||
|
export class User {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ unique: true })
|
||||||
|
email: string;
|
||||||
|
|
||||||
|
@Column({ unique: true })
|
||||||
|
username: string;
|
||||||
|
|
||||||
|
@Column()
|
||||||
|
passwordHash: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'text',
|
||||||
|
default: 'user',
|
||||||
|
})
|
||||||
|
role: UserRole;
|
||||||
|
|
||||||
|
@Column({ default: true })
|
||||||
|
isActive: boolean;
|
||||||
|
|
||||||
|
@CreateDateColumn()
|
||||||
|
createdAt: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn()
|
||||||
|
updatedAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
@Entity('articles')
|
@Entity('articles')
|
||||||
export class Article {
|
export class Article {
|
||||||
@PrimaryGeneratedColumn('uuid')
|
@PrimaryGeneratedColumn('uuid')
|
||||||
@@ -174,7 +215,7 @@ export class Article {
|
|||||||
@Column({ default: 0 })
|
@Column({ default: 0 })
|
||||||
views: number;
|
views: number;
|
||||||
|
|
||||||
@Column({ nullable: true })
|
@Column({ nullable: true, unique: true })
|
||||||
strapiId: string;
|
strapiId: string;
|
||||||
|
|
||||||
@Column({ nullable: true })
|
@Column({ nullable: true })
|
||||||
@@ -183,6 +224,36 @@ export class Article {
|
|||||||
@Column({ nullable: true })
|
@Column({ nullable: true })
|
||||||
categoryId: string;
|
categoryId: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
ogTitle: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
ogDescription: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
ogImage: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
twitterTitle: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
twitterDescription: string;
|
||||||
|
|
||||||
|
@Column({ type: 'text', nullable: true })
|
||||||
|
twitterImage: string;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
facebookShares: number;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
twitterShares: number;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
whatsappShares: number;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
telegramShares: number;
|
||||||
|
|
||||||
@CreateDateColumn()
|
@CreateDateColumn()
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
|
|
||||||
@@ -196,6 +267,12 @@ export class Article {
|
|||||||
@ManyToOne(() => Category, { onDelete: 'SET NULL' })
|
@ManyToOne(() => Category, { onDelete: 'SET NULL' })
|
||||||
@JoinColumn({ name: 'categoryId' })
|
@JoinColumn({ name: 'categoryId' })
|
||||||
category: Category;
|
category: Category;
|
||||||
|
|
||||||
|
@OneToMany(() => Comment, (comment) => comment.article)
|
||||||
|
comments: Comment[];
|
||||||
|
|
||||||
|
@OneToMany(() => Reaction, (reaction) => reaction.article)
|
||||||
|
reactions: Reaction[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Entity('live_blogs')
|
@Entity('live_blogs')
|
||||||
@@ -221,7 +298,7 @@ export class LiveBlog {
|
|||||||
@Column({ default: false })
|
@Column({ default: false })
|
||||||
isPinned: boolean;
|
isPinned: boolean;
|
||||||
|
|
||||||
@Column({ nullable: true })
|
@Column({ nullable: true, unique: true })
|
||||||
strapiId: string;
|
strapiId: string;
|
||||||
|
|
||||||
@Column({ nullable: true })
|
@Column({ nullable: true })
|
||||||
@@ -278,6 +355,12 @@ export class LiveBlog {
|
|||||||
cascade: true,
|
cascade: true,
|
||||||
})
|
})
|
||||||
updates: LiveBlogUpdate[];
|
updates: LiveBlogUpdate[];
|
||||||
|
|
||||||
|
@OneToMany(() => Comment, (comment) => comment.liveBlog)
|
||||||
|
comments: Comment[];
|
||||||
|
|
||||||
|
@OneToMany(() => Reaction, (reaction) => reaction.liveBlog)
|
||||||
|
reactions: Reaction[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Entity('live_blog_updates')
|
@Entity('live_blog_updates')
|
||||||
@@ -314,3 +397,100 @@ export class LiveBlogUpdate {
|
|||||||
@JoinColumn({ name: 'liveBlogId' })
|
@JoinColumn({ name: 'liveBlogId' })
|
||||||
liveBlog: LiveBlog;
|
liveBlog: LiveBlog;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Entity('comments')
|
||||||
|
export class Comment {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column('text')
|
||||||
|
content: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
articleId: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
liveBlogId: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
parentId: string;
|
||||||
|
|
||||||
|
@Column()
|
||||||
|
userId: string;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
likeCount: number;
|
||||||
|
|
||||||
|
@Column({ default: 0 })
|
||||||
|
dislikeCount: number;
|
||||||
|
|
||||||
|
@Column({ default: true })
|
||||||
|
isVisible: boolean;
|
||||||
|
|
||||||
|
@CreateDateColumn()
|
||||||
|
createdAt: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn()
|
||||||
|
updatedAt: Date;
|
||||||
|
|
||||||
|
@ManyToOne(() => Article, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'articleId' })
|
||||||
|
article: Article;
|
||||||
|
|
||||||
|
@ManyToOne(() => LiveBlog, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'liveBlogId' })
|
||||||
|
liveBlog: LiveBlog;
|
||||||
|
|
||||||
|
@ManyToOne(() => Comment, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'parentId' })
|
||||||
|
parent: Comment;
|
||||||
|
|
||||||
|
@ManyToOne(() => User, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'userId' })
|
||||||
|
user: User;
|
||||||
|
|
||||||
|
@OneToMany(() => Comment, (comment) => comment.parent)
|
||||||
|
replies: Comment[];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('reactions')
|
||||||
|
export class Reaction {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'text',
|
||||||
|
})
|
||||||
|
type: ReactionType;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
articleId: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
liveBlogId: string;
|
||||||
|
|
||||||
|
@Column({ nullable: true })
|
||||||
|
commentId: string;
|
||||||
|
|
||||||
|
@Column()
|
||||||
|
userId: string;
|
||||||
|
|
||||||
|
@CreateDateColumn()
|
||||||
|
createdAt: Date;
|
||||||
|
|
||||||
|
@ManyToOne(() => Article, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'articleId' })
|
||||||
|
article: Article;
|
||||||
|
|
||||||
|
@ManyToOne(() => LiveBlog, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'liveBlogId' })
|
||||||
|
liveBlog: LiveBlog;
|
||||||
|
|
||||||
|
@ManyToOne(() => Comment, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'commentId' })
|
||||||
|
comment: Comment;
|
||||||
|
|
||||||
|
@ManyToOne(() => User, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'userId' })
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
@@ -8,10 +8,10 @@ import {
|
|||||||
Body,
|
Body,
|
||||||
Param,
|
Param,
|
||||||
Query,
|
Query,
|
||||||
ValidationPipe,
|
|
||||||
Res,
|
Res,
|
||||||
Logger,
|
Logger,
|
||||||
Headers,
|
Headers,
|
||||||
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import type { Response as ExpressResponse } from 'express';
|
import type { Response as ExpressResponse } from 'express';
|
||||||
import { LiveBlogService } from './live-blog.service';
|
import { LiveBlogService } from './live-blog.service';
|
||||||
@@ -22,7 +22,11 @@ import {
|
|||||||
CreateLiveBlogUpdateDto,
|
CreateLiveBlogUpdateDto,
|
||||||
UpdateLiveBlogUpdateDto,
|
UpdateLiveBlogUpdateDto,
|
||||||
} from './articles.dto';
|
} from './articles.dto';
|
||||||
import { LiveBlogStatus } from './entities';
|
import { LiveBlogStatus, UserRole } from './entities';
|
||||||
|
import { JwtAuthGuard } from './auth/jwt-auth.guard';
|
||||||
|
import { RolesGuard } from './auth/roles.guard';
|
||||||
|
import { Roles } from './auth/roles.decorator';
|
||||||
|
import { Public } from './auth/public.decorator';
|
||||||
|
|
||||||
@Controller('live-blogs')
|
@Controller('live-blogs')
|
||||||
export class LiveBlogController {
|
export class LiveBlogController {
|
||||||
@@ -32,68 +36,76 @@ export class LiveBlogController {
|
|||||||
|
|
||||||
// Live Blog CRUD operations
|
// Live Blog CRUD operations
|
||||||
@Get('featured')
|
@Get('featured')
|
||||||
|
@Public()
|
||||||
getFeatured() {
|
getFeatured() {
|
||||||
this.logger.log('GET /featured called');
|
this.logger.log('GET /featured called');
|
||||||
return this.liveBlogService.findPinned();
|
return this.liveBlogService.findPinned();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('active')
|
@Get('active')
|
||||||
|
@Public()
|
||||||
getActive() {
|
getActive() {
|
||||||
return this.liveBlogService.findActive();
|
return this.liveBlogService.findActive();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('recent')
|
@Get('recent')
|
||||||
|
@Public()
|
||||||
getRecent() {
|
getRecent() {
|
||||||
return this.liveBlogService.getLiveBlogsWithRecentUpdates();
|
return this.liveBlogService.getLiveBlogsWithRecentUpdates();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
create(
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
@Body(new ValidationPipe({ transform: true })) dto: CreateLiveBlogDto,
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
) {
|
create(@Body() dto: CreateLiveBlogDto) {
|
||||||
return this.liveBlogService.create(dto);
|
return this.liveBlogService.create(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
findAll(
|
@Public()
|
||||||
@Query(new ValidationPipe({ transform: true })) dto: FindLiveBlogsDto,
|
findAll(@Query() dto: FindLiveBlogsDto) {
|
||||||
) {
|
|
||||||
return this.liveBlogService.findAll(dto);
|
return this.liveBlogService.findAll(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
|
@Public()
|
||||||
findOne(@Param('id') id: string) {
|
findOne(@Param('id') id: string) {
|
||||||
return this.liveBlogService.findOne(id);
|
return this.liveBlogService.findOne(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('slug/:slug')
|
@Get('slug/:slug')
|
||||||
|
@Public()
|
||||||
findBySlug(@Param('slug') slug: string) {
|
findBySlug(@Param('slug') slug: string) {
|
||||||
return this.liveBlogService.findBySlug(slug);
|
return this.liveBlogService.findBySlug(slug);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put(':id')
|
@Put(':id')
|
||||||
update(
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
@Param('id') id: string,
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
@Body(new ValidationPipe({ transform: true })) dto: UpdateLiveBlogDto,
|
update(@Param('id') id: string, @Body() dto: UpdateLiveBlogDto) {
|
||||||
) {
|
|
||||||
return this.liveBlogService.update(id, dto);
|
return this.liveBlogService.update(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(':id')
|
@Delete(':id')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
remove(@Param('id') id: string) {
|
remove(@Param('id') id: string) {
|
||||||
return this.liveBlogService.remove(id);
|
return this.liveBlogService.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Live Blog Updates CRUD operations
|
// Live Blog Updates CRUD operations
|
||||||
@Post(':id/updates')
|
@Post(':id/updates')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
createUpdate(
|
createUpdate(
|
||||||
@Param('id') liveBlogId: string,
|
@Param('id') liveBlogId: string,
|
||||||
@Body(new ValidationPipe({ transform: true })) dto: CreateLiveBlogUpdateDto,
|
@Body() dto: CreateLiveBlogUpdateDto,
|
||||||
) {
|
) {
|
||||||
return this.liveBlogService.createUpdate(dto, liveBlogId);
|
return this.liveBlogService.createUpdate(dto, liveBlogId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get(':id/updates')
|
@Get(':id/updates')
|
||||||
|
@Public()
|
||||||
findUpdates(
|
findUpdates(
|
||||||
@Param('id') liveBlogId: string,
|
@Param('id') liveBlogId: string,
|
||||||
@Query('page') page = 1,
|
@Query('page') page = 1,
|
||||||
@@ -107,15 +119,19 @@ export class LiveBlogController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Put(':id/updates/:updateId')
|
@Put(':id/updates/:updateId')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
updateUpdate(
|
updateUpdate(
|
||||||
@Param('id') liveBlogId: string,
|
@Param('id') liveBlogId: string,
|
||||||
@Param('updateId') updateId: string,
|
@Param('updateId') updateId: string,
|
||||||
@Body(new ValidationPipe({ transform: true })) dto: UpdateLiveBlogUpdateDto,
|
@Body() dto: UpdateLiveBlogUpdateDto,
|
||||||
) {
|
) {
|
||||||
return this.liveBlogService.updateUpdate(liveBlogId, updateId, dto);
|
return this.liveBlogService.updateUpdate(liveBlogId, updateId, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(':id/updates/:updateId')
|
@Delete(':id/updates/:updateId')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
removeUpdate(
|
removeUpdate(
|
||||||
@Param('id') liveBlogId: string,
|
@Param('id') liveBlogId: string,
|
||||||
@Param('updateId') updateId: string,
|
@Param('updateId') updateId: string,
|
||||||
@@ -124,20 +140,22 @@ export class LiveBlogController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/archive')
|
@Patch(':id/archive')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
archive(@Param('id') id: string) {
|
archive(@Param('id') id: string) {
|
||||||
return this.liveBlogService.archive(id);
|
return this.liveBlogService.archive(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/publish')
|
@Patch(':id/publish')
|
||||||
publish(
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
@Param('id') id: string,
|
@Roles(UserRole.ADMIN, UserRole.CONTRIBUTOR)
|
||||||
@Query('status') status?: LiveBlogStatus,
|
publish(@Param('id') id: string, @Query('status') status?: LiveBlogStatus) {
|
||||||
) {
|
|
||||||
return this.liveBlogService.publish(id, status || LiveBlogStatus.DRAFT);
|
return this.liveBlogService.publish(id, status || LiveBlogStatus.DRAFT);
|
||||||
}
|
}
|
||||||
|
|
||||||
// SSE endpoint for real-time updates
|
// SSE endpoint for real-time updates
|
||||||
@Get(':id/stream')
|
@Get(':id/stream')
|
||||||
|
@Public()
|
||||||
stream(
|
stream(
|
||||||
@Param('id') liveBlogId: string,
|
@Param('id') liveBlogId: string,
|
||||||
@Res() response: ExpressResponse,
|
@Res() response: ExpressResponse,
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module, forwardRef } from '@nestjs/common';
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { EventEmitterModule } from '@nestjs/event-emitter';
|
import { EventEmitterModule } from '@nestjs/event-emitter';
|
||||||
import { LiveBlogService } from './live-blog.service';
|
import { LiveBlogService } from './live-blog.service';
|
||||||
import { LiveBlogController } from './live-blog.controller';
|
import { LiveBlogController } from './live-blog.controller';
|
||||||
import { LiveBlog, LiveBlogUpdate, Author, Category } from './entities';
|
import { LiveBlog, LiveBlogUpdate, Author, Category } from './entities';
|
||||||
|
import { StrapiModule } from './strapi.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([LiveBlog, LiveBlogUpdate, Author, Category]),
|
TypeOrmModule.forFeature([LiveBlog, LiveBlogUpdate, Author, Category]),
|
||||||
EventEmitterModule.forRoot(),
|
EventEmitterModule.forRoot(),
|
||||||
|
forwardRef(() => StrapiModule),
|
||||||
],
|
],
|
||||||
controllers: [LiveBlogController],
|
controllers: [LiveBlogController],
|
||||||
providers: [LiveBlogService],
|
providers: [LiveBlogService],
|
||||||
|
|||||||
@@ -3,12 +3,15 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
Logger,
|
Logger,
|
||||||
OnModuleInit,
|
OnModuleInit,
|
||||||
|
Inject,
|
||||||
|
forwardRef,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { Repository, In } from 'typeorm';
|
import { Repository, In } from 'typeorm';
|
||||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||||
import { Response } from 'express';
|
import { Response } from 'express';
|
||||||
import { LiveBlog, LiveBlogUpdate, LiveBlogStatus } from './entities';
|
import { LiveBlog, LiveBlogUpdate, LiveBlogStatus } from './entities';
|
||||||
|
import { StrapiService } from './strapi.service';
|
||||||
import {
|
import {
|
||||||
CreateLiveBlogDto,
|
CreateLiveBlogDto,
|
||||||
UpdateLiveBlogDto,
|
UpdateLiveBlogDto,
|
||||||
@@ -50,6 +53,8 @@ export class LiveBlogService implements OnModuleInit {
|
|||||||
@InjectRepository(LiveBlogUpdate)
|
@InjectRepository(LiveBlogUpdate)
|
||||||
private readonly liveBlogUpdateRepository: Repository<LiveBlogUpdate>,
|
private readonly liveBlogUpdateRepository: Repository<LiveBlogUpdate>,
|
||||||
private readonly eventEmitter: EventEmitter2,
|
private readonly eventEmitter: EventEmitter2,
|
||||||
|
@Inject(forwardRef(() => StrapiService))
|
||||||
|
private readonly strapiService: StrapiService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
onModuleInit() {
|
onModuleInit() {
|
||||||
@@ -248,6 +253,22 @@ export class LiveBlogService implements OnModuleInit {
|
|||||||
blogId: id,
|
blogId: id,
|
||||||
status: dto.status,
|
status: dto.status,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Update Strapi if live blog has strapiId
|
||||||
|
if (liveBlog.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateLiveBlogStatusInStrapi(
|
||||||
|
liveBlog.strapiId,
|
||||||
|
dto.status,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for live blog ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return updatedBlog;
|
return updatedBlog;
|
||||||
@@ -255,19 +276,72 @@ export class LiveBlogService implements OnModuleInit {
|
|||||||
|
|
||||||
async remove(id: string): Promise<void> {
|
async remove(id: string): Promise<void> {
|
||||||
const liveBlog = await this.findOne(id);
|
const liveBlog = await this.findOne(id);
|
||||||
|
|
||||||
|
// Delete from Strapi if live blog has strapiId
|
||||||
|
if (liveBlog.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.deleteLiveBlogFromStrapi(liveBlog.strapiId);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - we still want to delete from backend
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to delete live blog ${id} from Strapi:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await this.liveBlogRepository.remove(liveBlog);
|
await this.liveBlogRepository.remove(liveBlog);
|
||||||
}
|
}
|
||||||
|
|
||||||
async archive(id: string): Promise<LiveBlog> {
|
async archive(id: string): Promise<LiveBlog> {
|
||||||
const liveBlog = await this.findOne(id);
|
const liveBlog = await this.findOne(id);
|
||||||
liveBlog.status = LiveBlogStatus.ARCHIVED;
|
liveBlog.status = LiveBlogStatus.ARCHIVED;
|
||||||
return await this.liveBlogRepository.save(liveBlog);
|
const savedLiveBlog = await this.liveBlogRepository.save(liveBlog);
|
||||||
|
|
||||||
|
// Update Strapi if live blog has strapiId
|
||||||
|
if (liveBlog.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateLiveBlogStatusInStrapi(
|
||||||
|
liveBlog.strapiId,
|
||||||
|
LiveBlogStatus.ARCHIVED,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for live blog ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async publish(id: string, status: LiveBlogStatus = LiveBlogStatus.DRAFT): Promise<LiveBlog> {
|
return savedLiveBlog;
|
||||||
|
}
|
||||||
|
|
||||||
|
async publish(
|
||||||
|
id: string,
|
||||||
|
status: LiveBlogStatus = LiveBlogStatus.DRAFT,
|
||||||
|
): Promise<LiveBlog> {
|
||||||
const liveBlog = await this.findOne(id);
|
const liveBlog = await this.findOne(id);
|
||||||
liveBlog.status = status;
|
liveBlog.status = status;
|
||||||
return await this.liveBlogRepository.save(liveBlog);
|
const savedLiveBlog = await this.liveBlogRepository.save(liveBlog);
|
||||||
|
|
||||||
|
// Update Strapi if live blog has strapiId
|
||||||
|
if (liveBlog.strapiId) {
|
||||||
|
try {
|
||||||
|
await this.strapiService.updateLiveBlogStatusInStrapi(
|
||||||
|
liveBlog.strapiId,
|
||||||
|
status,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Log error but don't fail - backend status is updated
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update Strapi status for live blog ${id}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return savedLiveBlog;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Live Blog Update CRUD operations
|
// Live Blog Update CRUD operations
|
||||||
@@ -433,21 +507,75 @@ export class LiveBlogService implements OnModuleInit {
|
|||||||
strapiId: string,
|
strapiId: string,
|
||||||
data: Partial<CreateLiveBlogDto>,
|
data: Partial<CreateLiveBlogDto>,
|
||||||
): Promise<LiveBlog> {
|
): Promise<LiveBlog> {
|
||||||
let liveBlog = await this.liveBlogRepository.findOne({
|
// Use upsert to handle race conditions and ensure uniqueness
|
||||||
|
try {
|
||||||
|
// First try to find existing live blog by strapiId
|
||||||
|
const liveBlog = await this.liveBlogRepository.findOne({
|
||||||
where: { strapiId },
|
where: { strapiId },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!liveBlog) {
|
if (liveBlog) {
|
||||||
liveBlog = this.liveBlogRepository.create({
|
// Update existing live blog
|
||||||
|
const currentStatus = liveBlog.status;
|
||||||
|
Object.assign(liveBlog, data);
|
||||||
|
|
||||||
|
// Preserve archived status if live blog is already archived in our system
|
||||||
|
// unless Strapi explicitly sends a different status
|
||||||
|
if (
|
||||||
|
currentStatus === LiveBlogStatus.ARCHIVED &&
|
||||||
|
data.status !== LiveBlogStatus.ARCHIVED
|
||||||
|
) {
|
||||||
|
liveBlog.status = LiveBlogStatus.ARCHIVED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await this.liveBlogRepository.save(liveBlog);
|
||||||
|
} else {
|
||||||
|
// Create new live blog
|
||||||
|
const newLiveBlog = this.liveBlogRepository.create({
|
||||||
strapiId,
|
strapiId,
|
||||||
...data,
|
...data,
|
||||||
status: data.status || LiveBlogStatus.DRAFT,
|
status: data.status || LiveBlogStatus.DRAFT,
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
Object.assign(liveBlog, data);
|
return await this.liveBlogRepository.save(newLiveBlog);
|
||||||
|
}
|
||||||
|
} catch (error: unknown) {
|
||||||
|
// If we get a unique constraint violation, try to find and update again
|
||||||
|
// This handles race conditions where two syncs happen simultaneously
|
||||||
|
const dbError = error as { code?: string; constraint?: string };
|
||||||
|
if (
|
||||||
|
dbError.code === '23505' &&
|
||||||
|
dbError.constraint?.includes('strapiId')
|
||||||
|
) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Race condition detected for strapiId ${strapiId}, retrying...`,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Wait a bit and retry
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||||
|
|
||||||
|
const existingLiveBlog = await this.liveBlogRepository.findOne({
|
||||||
|
where: { strapiId },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (existingLiveBlog) {
|
||||||
|
const currentStatus = existingLiveBlog.status;
|
||||||
|
Object.assign(existingLiveBlog, data);
|
||||||
|
|
||||||
|
if (
|
||||||
|
currentStatus === LiveBlogStatus.ARCHIVED &&
|
||||||
|
data.status !== LiveBlogStatus.ARCHIVED
|
||||||
|
) {
|
||||||
|
existingLiveBlog.status = LiveBlogStatus.ARCHIVED;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await this.liveBlogRepository.save(liveBlog);
|
return await this.liveBlogRepository.save(existingLiveBlog);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-throw other errors
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeByStrapiId(strapiId: string): Promise<void> {
|
async removeByStrapiId(strapiId: string): Promise<void> {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { Controller, Post, Body, Logger } from '@nestjs/common';
|
import { Controller, Post, Body, Logger } from '@nestjs/common';
|
||||||
import { StrapiService } from './strapi.service';
|
import { StrapiService } from './strapi.service';
|
||||||
|
import { Public } from './auth/public.decorator';
|
||||||
|
|
||||||
interface WebhookBody {
|
interface WebhookBody {
|
||||||
event:
|
event:
|
||||||
@@ -21,6 +22,7 @@ export class StrapiController {
|
|||||||
constructor(private readonly strapiService: StrapiService) {}
|
constructor(private readonly strapiService: StrapiService) {}
|
||||||
|
|
||||||
@Post('article')
|
@Post('article')
|
||||||
|
@Public()
|
||||||
async handleArticleWebhook(@Body() body: WebhookBody) {
|
async handleArticleWebhook(@Body() body: WebhookBody) {
|
||||||
this.logger.log(`Received article webhook: ${JSON.stringify(body)}`);
|
this.logger.log(`Received article webhook: ${JSON.stringify(body)}`);
|
||||||
const { event, model, entry } = body;
|
const { event, model, entry } = body;
|
||||||
@@ -38,6 +40,7 @@ export class StrapiController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post('live-blog')
|
@Post('live-blog')
|
||||||
|
@Public()
|
||||||
async handleLiveBlogWebhook(@Body() body: WebhookBody) {
|
async handleLiveBlogWebhook(@Body() body: WebhookBody) {
|
||||||
this.logger.log(`Received live-blog webhook: ${JSON.stringify(body)}`);
|
this.logger.log(`Received live-blog webhook: ${JSON.stringify(body)}`);
|
||||||
const { event, model, entry } = body;
|
const { event, model, entry } = body;
|
||||||
@@ -55,6 +58,7 @@ export class StrapiController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
|
@Public()
|
||||||
async handleGenericWebhook(@Body() body: unknown) {
|
async handleGenericWebhook(@Body() body: unknown) {
|
||||||
this.logger.log(`Received generic webhook: ${JSON.stringify(body)}`);
|
this.logger.log(`Received generic webhook: ${JSON.stringify(body)}`);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module, forwardRef } from '@nestjs/common';
|
||||||
import { HttpModule } from '@nestjs/axios';
|
import { HttpModule } from '@nestjs/axios';
|
||||||
import { StrapiService } from './strapi.service';
|
import { StrapiService } from './strapi.service';
|
||||||
import { StrapiController } from './strapi.controller';
|
import { StrapiController } from './strapi.controller';
|
||||||
@@ -6,7 +6,11 @@ import { ArticlesModule } from './articles.module';
|
|||||||
import { LiveBlogModule } from './live-blog.module';
|
import { LiveBlogModule } from './live-blog.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [HttpModule, ArticlesModule, LiveBlogModule],
|
imports: [
|
||||||
|
HttpModule,
|
||||||
|
forwardRef(() => ArticlesModule),
|
||||||
|
forwardRef(() => LiveBlogModule),
|
||||||
|
],
|
||||||
controllers: [StrapiController],
|
controllers: [StrapiController],
|
||||||
providers: [StrapiService],
|
providers: [StrapiService],
|
||||||
exports: [StrapiService],
|
exports: [StrapiService],
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable, Logger, Inject, forwardRef } from '@nestjs/common';
|
||||||
import { ConfigService } from '@nestjs/config';
|
import { ConfigService } from '@nestjs/config';
|
||||||
import { HttpService } from '@nestjs/axios';
|
import { HttpService } from '@nestjs/axios';
|
||||||
import { lastValueFrom } from 'rxjs';
|
import { lastValueFrom } from 'rxjs';
|
||||||
@@ -13,6 +13,21 @@ import {
|
|||||||
VideoPosition,
|
VideoPosition,
|
||||||
} from './entities';
|
} from './entities';
|
||||||
|
|
||||||
|
interface StrapiImage {
|
||||||
|
url: string;
|
||||||
|
alternativeText?: string;
|
||||||
|
caption?: string;
|
||||||
|
width?: number;
|
||||||
|
height?: number;
|
||||||
|
formats?: Record<string, StrapiImageFormat>;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface StrapiImageFormat {
|
||||||
|
url: string;
|
||||||
|
width: number;
|
||||||
|
height: number;
|
||||||
|
}
|
||||||
|
|
||||||
interface StrapiArticle {
|
interface StrapiArticle {
|
||||||
id: number;
|
id: number;
|
||||||
documentId: string;
|
documentId: string;
|
||||||
@@ -23,8 +38,8 @@ interface StrapiArticle {
|
|||||||
publishedAt: string | null;
|
publishedAt: string | null;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
img?: any;
|
img?: StrapiImage;
|
||||||
media?: any[];
|
media?: StrapiImage[];
|
||||||
imagePosition?: string;
|
imagePosition?: string;
|
||||||
imageSize?: string;
|
imageSize?: string;
|
||||||
videoUrl?: string;
|
videoUrl?: string;
|
||||||
@@ -42,8 +57,8 @@ interface StrapiLiveBlog {
|
|||||||
publishedAt: string | null;
|
publishedAt: string | null;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
img?: any;
|
img?: StrapiImage;
|
||||||
media?: any[];
|
media?: StrapiImage[];
|
||||||
imagePosition?: string;
|
imagePosition?: string;
|
||||||
imageSize?: string;
|
imageSize?: string;
|
||||||
videoUrl?: string;
|
videoUrl?: string;
|
||||||
@@ -72,7 +87,9 @@ export class StrapiService {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly configService: ConfigService,
|
private readonly configService: ConfigService,
|
||||||
private readonly httpService: HttpService,
|
private readonly httpService: HttpService,
|
||||||
|
@Inject(forwardRef(() => ArticlesService))
|
||||||
private readonly articlesService: ArticlesService,
|
private readonly articlesService: ArticlesService,
|
||||||
|
@Inject(forwardRef(() => LiveBlogService))
|
||||||
private readonly liveBlogService: LiveBlogService,
|
private readonly liveBlogService: LiveBlogService,
|
||||||
) {
|
) {
|
||||||
this.strapiUrl =
|
this.strapiUrl =
|
||||||
@@ -262,9 +279,10 @@ export class StrapiService {
|
|||||||
this.logger.log(
|
this.logger.log(
|
||||||
`Successfully synced article: ${strapiArticle.title} with status: ${status}`,
|
`Successfully synced article: ${strapiArticle.title} with status: ${status}`,
|
||||||
);
|
);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
// If we get a 404 and it's an unpublish event, we can still mark it as draft
|
// If we get a 404 and it's an unpublish event, we can still mark it as draft
|
||||||
if (event === 'entry.unpublish' && error.response?.status === 404) {
|
const axiosError = error as { response?: { status: number } };
|
||||||
|
if (event === 'entry.unpublish' && axiosError.response?.status === 404) {
|
||||||
this.logger.log(
|
this.logger.log(
|
||||||
`Article ${strapiId} not found in Strapi, marking as draft based on unpublish event`,
|
`Article ${strapiId} not found in Strapi, marking as draft based on unpublish event`,
|
||||||
);
|
);
|
||||||
@@ -403,9 +421,10 @@ export class StrapiService {
|
|||||||
this.logger.log(
|
this.logger.log(
|
||||||
`Successfully synced live blog: ${strapiLiveBlog.title} with status: ${status}`,
|
`Successfully synced live blog: ${strapiLiveBlog.title} with status: ${status}`,
|
||||||
);
|
);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
// If we get a 404 and it's an unpublish event, we can still mark it as draft
|
// If we get a 404 and it's an unpublish event, we can still mark it as draft
|
||||||
if (event === 'entry.unpublish' && error.response?.status === 404) {
|
const axiosError = error as { response?: { status: number } };
|
||||||
|
if (event === 'entry.unpublish' && axiosError.response?.status === 404) {
|
||||||
this.logger.log(
|
this.logger.log(
|
||||||
`Live blog ${strapiId} not found in Strapi, marking as draft based on unpublish event`,
|
`Live blog ${strapiId} not found in Strapi, marking as draft based on unpublish event`,
|
||||||
);
|
);
|
||||||
@@ -489,4 +508,162 @@ export class StrapiService {
|
|||||||
this.logger.warn(`Unknown model type in webhook: ${data.model}`);
|
this.logger.warn(`Unknown model type in webhook: ${data.model}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateArticleStatusInStrapi(
|
||||||
|
strapiId: string,
|
||||||
|
status: ArticleStatus,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.logger.log(
|
||||||
|
`Updating article ${strapiId} status in Strapi to: ${status}`,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Map our status to Strapi status
|
||||||
|
let strapiStatus: string;
|
||||||
|
switch (status) {
|
||||||
|
case ArticleStatus.DRAFT:
|
||||||
|
strapiStatus = 'draft';
|
||||||
|
break;
|
||||||
|
case ArticleStatus.PUBLISHED:
|
||||||
|
strapiStatus = 'published';
|
||||||
|
break;
|
||||||
|
case ArticleStatus.ARCHIVED:
|
||||||
|
strapiStatus = 'archived';
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
strapiStatus = 'draft';
|
||||||
|
}
|
||||||
|
|
||||||
|
// For archived status, we need to unpublish first if it's published
|
||||||
|
if (status === ArticleStatus.ARCHIVED) {
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.patch(
|
||||||
|
`${this.strapiUrl}/api/articles/${strapiId}/unpublish`,
|
||||||
|
{},
|
||||||
|
{ headers: this.getHeaders() },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the status
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.patch(
|
||||||
|
`${this.strapiUrl}/api/articles/${strapiId}`,
|
||||||
|
{ data: { status: strapiStatus } },
|
||||||
|
{ headers: this.getHeaders() },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.log(
|
||||||
|
`Successfully updated article ${strapiId} status in Strapi to: ${status}`,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update article ${strapiId} status in Strapi:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateLiveBlogStatusInStrapi(
|
||||||
|
strapiId: string,
|
||||||
|
status: LiveBlogStatus,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.logger.log(
|
||||||
|
`Updating live blog ${strapiId} status in Strapi to: ${status}`,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Map our status to Strapi status
|
||||||
|
let strapiStatus: string;
|
||||||
|
switch (status) {
|
||||||
|
case LiveBlogStatus.DRAFT:
|
||||||
|
strapiStatus = 'draft';
|
||||||
|
break;
|
||||||
|
case LiveBlogStatus.LIVE:
|
||||||
|
strapiStatus = 'live';
|
||||||
|
break;
|
||||||
|
case LiveBlogStatus.ENDED:
|
||||||
|
strapiStatus = 'ended';
|
||||||
|
break;
|
||||||
|
case LiveBlogStatus.ARCHIVED:
|
||||||
|
strapiStatus = 'archived';
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
strapiStatus = 'draft';
|
||||||
|
}
|
||||||
|
|
||||||
|
// For archived status, we need to unpublish first if it's published
|
||||||
|
if (status === LiveBlogStatus.ARCHIVED) {
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.patch(
|
||||||
|
`${this.strapiUrl}/api/live-blogs/${strapiId}/unpublish`,
|
||||||
|
{},
|
||||||
|
{ headers: this.getHeaders() },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the status
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.patch(
|
||||||
|
`${this.strapiUrl}/api/live-blogs/${strapiId}`,
|
||||||
|
{ data: { status: strapiStatus } },
|
||||||
|
{ headers: this.getHeaders() },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.log(
|
||||||
|
`Successfully updated live blog ${strapiId} status in Strapi to: ${status}`,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to update live blog ${strapiId} status in Strapi:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteArticleFromStrapi(strapiId: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.logger.log(`Deleting article ${strapiId} from Strapi`);
|
||||||
|
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.delete(`${this.strapiUrl}/api/articles/${strapiId}`, {
|
||||||
|
headers: this.getHeaders(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.log(`Successfully deleted article ${strapiId} from Strapi`);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to delete article ${strapiId} from Strapi:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteLiveBlogFromStrapi(strapiId: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.logger.log(`Deleting live blog ${strapiId} from Strapi`);
|
||||||
|
|
||||||
|
await lastValueFrom(
|
||||||
|
this.httpService.delete(
|
||||||
|
`${this.strapiUrl}/api/live-blogs/${strapiId}`,
|
||||||
|
{ headers: this.getHeaders() },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.log(`Successfully deleted live blog ${strapiId} from Strapi`);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
`Failed to delete live blog ${strapiId} from Strapi:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Post,
|
||||||
|
Body,
|
||||||
|
Patch,
|
||||||
|
Param,
|
||||||
|
Delete,
|
||||||
|
UseGuards,
|
||||||
|
Request,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { UserService } from './user.service';
|
||||||
|
import {
|
||||||
|
CreateUserDto,
|
||||||
|
UpdateUserDto,
|
||||||
|
UserResponseDto,
|
||||||
|
ChangePasswordDto,
|
||||||
|
} from './user.dto';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { RolesGuard } from '../auth/roles.guard';
|
||||||
|
import { Roles } from '../auth/roles.decorator';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
import type { RequestWithUser } from '../auth/types';
|
||||||
|
|
||||||
|
@Controller('users')
|
||||||
|
export class UserController {
|
||||||
|
constructor(private readonly userService: UserService) {}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async create(@Body() createUserDto: CreateUserDto): Promise<UserResponseDto> {
|
||||||
|
return this.userService.create(createUserDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async findAll(): Promise<UserResponseDto[]> {
|
||||||
|
return this.userService.findAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('profile')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
async getProfile(@Request() req: RequestWithUser): Promise<UserResponseDto> {
|
||||||
|
return this.userService.findOne(req.user.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get(':id')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async findOne(@Param('id') id: string): Promise<UserResponseDto> {
|
||||||
|
return this.userService.findOne(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async update(
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() updateUserDto: UpdateUserDto,
|
||||||
|
): Promise<UserResponseDto> {
|
||||||
|
return this.userService.update(id, updateUserDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
async remove(@Param('id') id: string): Promise<void> {
|
||||||
|
return this.userService.remove(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post(':id/change-password')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
async changePassword(
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() changePasswordDto: ChangePasswordDto,
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
|
): Promise<void> {
|
||||||
|
// Users can only change their own password, unless they're admin
|
||||||
|
if (req.user.role !== UserRole.ADMIN && req.user.id !== id) {
|
||||||
|
throw new Error('You can only change your own password');
|
||||||
|
}
|
||||||
|
return this.userService.changePassword(id, changePasswordDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id/deactivate')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async deactivate(@Param('id') id: string): Promise<UserResponseDto> {
|
||||||
|
return this.userService.update(id, { isActive: false });
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id/activate')
|
||||||
|
@UseGuards(JwtAuthGuard, RolesGuard)
|
||||||
|
@Roles(UserRole.ADMIN)
|
||||||
|
async activate(@Param('id') id: string): Promise<UserResponseDto> {
|
||||||
|
return this.userService.update(id, { isActive: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
import {
|
||||||
|
IsEmail,
|
||||||
|
IsString,
|
||||||
|
IsEnum,
|
||||||
|
IsBoolean,
|
||||||
|
IsOptional,
|
||||||
|
MinLength,
|
||||||
|
MaxLength,
|
||||||
|
Matches,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { UserRole } from '../entities';
|
||||||
|
|
||||||
|
interface UserEntity {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
username: string;
|
||||||
|
role: UserRole;
|
||||||
|
isActive: boolean;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CreateUserDto {
|
||||||
|
@IsEmail()
|
||||||
|
email: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(3)
|
||||||
|
@MaxLength(30)
|
||||||
|
@Matches(/^[a-zA-Z0-9_]+$/, {
|
||||||
|
message: 'Username can only contain letters, numbers, and underscores',
|
||||||
|
})
|
||||||
|
username: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(6)
|
||||||
|
password: string;
|
||||||
|
|
||||||
|
@IsEnum(UserRole)
|
||||||
|
@IsOptional()
|
||||||
|
role?: UserRole = UserRole.USER;
|
||||||
|
|
||||||
|
@IsBoolean()
|
||||||
|
@IsOptional()
|
||||||
|
isActive?: boolean = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UpdateUserDto {
|
||||||
|
@IsEmail()
|
||||||
|
@IsOptional()
|
||||||
|
email?: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(3)
|
||||||
|
@MaxLength(30)
|
||||||
|
@Matches(/^[a-zA-Z0-9_]+$/, {
|
||||||
|
message: 'Username can only contain letters, numbers, and underscores',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
username?: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(6)
|
||||||
|
@IsOptional()
|
||||||
|
password?: string;
|
||||||
|
|
||||||
|
@IsEnum(UserRole)
|
||||||
|
@IsOptional()
|
||||||
|
role?: UserRole;
|
||||||
|
|
||||||
|
@IsBoolean()
|
||||||
|
@IsOptional()
|
||||||
|
isActive?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class LoginUserDto {
|
||||||
|
@IsString()
|
||||||
|
username: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UserResponseDto {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
username: string;
|
||||||
|
role: UserRole;
|
||||||
|
isActive: boolean;
|
||||||
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
|
|
||||||
|
constructor(user: UserEntity) {
|
||||||
|
this.id = user.id;
|
||||||
|
this.email = user.email;
|
||||||
|
this.username = user.username;
|
||||||
|
this.role = user.role;
|
||||||
|
this.isActive = user.isActive;
|
||||||
|
this.createdAt = user.createdAt;
|
||||||
|
this.updatedAt = user.updatedAt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ChangePasswordDto {
|
||||||
|
@IsString()
|
||||||
|
currentPassword: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(6)
|
||||||
|
newPassword: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { User } from '../entities';
|
||||||
|
import { UserService } from './user.service';
|
||||||
|
import { UserController } from './user.controller';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([User])],
|
||||||
|
controllers: [UserController],
|
||||||
|
providers: [UserService],
|
||||||
|
exports: [UserService],
|
||||||
|
})
|
||||||
|
export class UserModule {}
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
import {
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
ConflictException,
|
||||||
|
BadRequestException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import * as bcrypt from 'bcrypt';
|
||||||
|
import { User, UserRole } from '../entities';
|
||||||
|
import {
|
||||||
|
CreateUserDto,
|
||||||
|
UpdateUserDto,
|
||||||
|
UserResponseDto,
|
||||||
|
ChangePasswordDto,
|
||||||
|
} from './user.dto';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class UserService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(User)
|
||||||
|
private userRepository: Repository<User>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(createUserDto: CreateUserDto): Promise<UserResponseDto> {
|
||||||
|
// Check if email already exists
|
||||||
|
const existingEmail = await this.userRepository.findOne({
|
||||||
|
where: { email: createUserDto.email },
|
||||||
|
});
|
||||||
|
if (existingEmail) {
|
||||||
|
throw new ConflictException('Email already exists');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if username already exists
|
||||||
|
const existingUsername = await this.userRepository.findOne({
|
||||||
|
where: { username: createUserDto.username },
|
||||||
|
});
|
||||||
|
if (existingUsername) {
|
||||||
|
throw new ConflictException('Username already exists');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hash password
|
||||||
|
const saltRounds = 10;
|
||||||
|
const passwordHash = await bcrypt.hash(createUserDto.password, saltRounds);
|
||||||
|
|
||||||
|
// Create user
|
||||||
|
const user = this.userRepository.create({
|
||||||
|
...createUserDto,
|
||||||
|
passwordHash,
|
||||||
|
});
|
||||||
|
|
||||||
|
const savedUser = await this.userRepository.save(user);
|
||||||
|
return new UserResponseDto(savedUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAll(): Promise<UserResponseDto[]> {
|
||||||
|
const users = await this.userRepository.find({
|
||||||
|
order: { createdAt: 'DESC' },
|
||||||
|
});
|
||||||
|
return users.map((user) => new UserResponseDto(user));
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOne(id: string): Promise<UserResponseDto> {
|
||||||
|
const user = await this.userRepository.findOne({ where: { id } });
|
||||||
|
if (!user) {
|
||||||
|
throw new NotFoundException('User not found');
|
||||||
|
}
|
||||||
|
return new UserResponseDto(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByUsername(username: string): Promise<User | null> {
|
||||||
|
return this.userRepository.findOne({ where: { username } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByEmail(email: string): Promise<User | null> {
|
||||||
|
return this.userRepository.findOne({ where: { email } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(
|
||||||
|
id: string,
|
||||||
|
updateUserDto: UpdateUserDto,
|
||||||
|
): Promise<UserResponseDto> {
|
||||||
|
const user = await this.userRepository.findOne({ where: { id } });
|
||||||
|
if (!user) {
|
||||||
|
throw new NotFoundException('User not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if email is being changed and if it already exists
|
||||||
|
if (updateUserDto.email && updateUserDto.email !== user.email) {
|
||||||
|
const existingEmail = await this.userRepository.findOne({
|
||||||
|
where: { email: updateUserDto.email },
|
||||||
|
});
|
||||||
|
if (existingEmail) {
|
||||||
|
throw new ConflictException('Email already exists');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if username is being changed and if it already exists
|
||||||
|
if (updateUserDto.username && updateUserDto.username !== user.username) {
|
||||||
|
const existingUsername = await this.userRepository.findOne({
|
||||||
|
where: { username: updateUserDto.username },
|
||||||
|
});
|
||||||
|
if (existingUsername) {
|
||||||
|
throw new ConflictException('Username already exists');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hash new password if provided
|
||||||
|
if (updateUserDto.password) {
|
||||||
|
const saltRounds = 10;
|
||||||
|
updateUserDto.password = await bcrypt.hash(
|
||||||
|
updateUserDto.password,
|
||||||
|
saltRounds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update user
|
||||||
|
Object.assign(user, updateUserDto);
|
||||||
|
if (updateUserDto.password) {
|
||||||
|
user.passwordHash = updateUserDto.password;
|
||||||
|
delete updateUserDto.password;
|
||||||
|
}
|
||||||
|
|
||||||
|
const updatedUser = await this.userRepository.save(user);
|
||||||
|
return new UserResponseDto(updatedUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
async remove(id: string): Promise<void> {
|
||||||
|
const user = await this.userRepository.findOne({ where: { id } });
|
||||||
|
if (!user) {
|
||||||
|
throw new NotFoundException('User not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prevent deleting the last admin
|
||||||
|
if (user.role === UserRole.ADMIN) {
|
||||||
|
const adminCount = await this.userRepository.count({
|
||||||
|
where: { role: UserRole.ADMIN },
|
||||||
|
});
|
||||||
|
if (adminCount <= 1) {
|
||||||
|
throw new BadRequestException('Cannot delete the last admin user');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.userRepository.remove(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async changePassword(
|
||||||
|
id: string,
|
||||||
|
changePasswordDto: ChangePasswordDto,
|
||||||
|
): Promise<void> {
|
||||||
|
const user = await this.userRepository.findOne({ where: { id } });
|
||||||
|
if (!user) {
|
||||||
|
throw new NotFoundException('User not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify current password
|
||||||
|
const isPasswordValid = await bcrypt.compare(
|
||||||
|
changePasswordDto.currentPassword,
|
||||||
|
user.passwordHash,
|
||||||
|
);
|
||||||
|
if (!isPasswordValid) {
|
||||||
|
throw new BadRequestException('Current password is incorrect');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hash new password
|
||||||
|
const saltRounds = 10;
|
||||||
|
user.passwordHash = await bcrypt.hash(
|
||||||
|
changePasswordDto.newPassword,
|
||||||
|
saltRounds,
|
||||||
|
);
|
||||||
|
|
||||||
|
await this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async validateUser(username: string, password: string): Promise<User | null> {
|
||||||
|
const user = await this.userRepository.findOne({
|
||||||
|
where: { username, isActive: true },
|
||||||
|
});
|
||||||
|
if (!user) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const isPasswordValid = await bcrypt.compare(password, user.passwordHash);
|
||||||
|
if (!isPasswordValid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
|
async createAdminIfNotExists(): Promise<void> {
|
||||||
|
const adminExists = await this.userRepository.findOne({
|
||||||
|
where: { role: UserRole.ADMIN },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!adminExists) {
|
||||||
|
const saltRounds = 10;
|
||||||
|
const passwordHash = await bcrypt.hash('admin123', saltRounds);
|
||||||
|
|
||||||
|
const adminUser = this.userRepository.create({
|
||||||
|
email: 'admin@placebo.mk',
|
||||||
|
username: 'admin',
|
||||||
|
passwordHash,
|
||||||
|
role: UserRole.ADMIN,
|
||||||
|
isActive: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.userRepository.save(adminUser);
|
||||||
|
console.log('Default admin user created: admin / admin123');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,9 +24,9 @@ services:
|
|||||||
dockerfile: Dockerfile.dev
|
dockerfile: Dockerfile.dev
|
||||||
container_name: placebo-backend-dev
|
container_name: placebo-backend-dev
|
||||||
env_file:
|
env_file:
|
||||||
- ./backend/.env # Use the .env file for configuration
|
- ./backend/.env.docker # Use the .env.docker file for Docker configuration
|
||||||
environment:
|
environment:
|
||||||
# Only override if needed, most config is in .env file
|
# Only override if needed, most config is in .env.docker file
|
||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
@@ -36,7 +36,7 @@ services:
|
|||||||
- ./backend/src:/app/src
|
- ./backend/src:/app/src
|
||||||
- ./backend/package.json:/app/package.json
|
- ./backend/package.json:/app/package.json
|
||||||
- ./backend/package-lock.json:/app/package-lock.json
|
- ./backend/package-lock.json:/app/package-lock.json
|
||||||
- ./backend/.env:/app/.env # Mount .env file into container
|
- ./backend/.env.docker:/app/.env # Mount .env.docker file as .env in container
|
||||||
command: npm run dev:docker
|
command: npm run dev:docker
|
||||||
networks:
|
networks:
|
||||||
- placebo-network-dev
|
- placebo-network-dev
|
||||||
|
|||||||
+3
-5
@@ -6,7 +6,7 @@ services:
|
|||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
container_name: placebo-postgres
|
container_name: placebo-postgres
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: placebo_db
|
POSTGRES_DB: placebo_backend_db
|
||||||
POSTGRES_USER: placebo_user
|
POSTGRES_USER: placebo_user
|
||||||
POSTGRES_PASSWORD: placebo_password
|
POSTGRES_PASSWORD: placebo_password
|
||||||
volumes:
|
volumes:
|
||||||
@@ -15,7 +15,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U placebo_user -d placebo_db"]
|
test: ["CMD-SHELL", "pg_isready -U placebo_user -d placebo_backend_db"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
@@ -35,11 +35,9 @@ services:
|
|||||||
DATABASE_PORT: 5432
|
DATABASE_PORT: 5432
|
||||||
DATABASE_USERNAME: placebo_user
|
DATABASE_USERNAME: placebo_user
|
||||||
DATABASE_PASSWORD: placebo_password
|
DATABASE_PASSWORD: placebo_password
|
||||||
DATABASE_NAME: placebo_db
|
DATABASE_NAME: placebo_backend_db
|
||||||
DATABASE_SYNCHRONIZE: "false"
|
DATABASE_SYNCHRONIZE: "false"
|
||||||
DATABASE_LOGGING: "false"
|
DATABASE_LOGGING: "false"
|
||||||
JWT_SECRET: ${JWT_SECRET:-your-jwt-secret-key-change-in-production}
|
|
||||||
JWT_EXPIRATION: 3600
|
|
||||||
CORS_ORIGIN: http://localhost:5173,http://localhost:3001
|
CORS_ORIGIN: http://localhost:5173,http://localhost:3001
|
||||||
PORT: 3000
|
PORT: 3000
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export function ArticleTicker() {
|
|||||||
{articles.map((article, index) => (
|
{articles.map((article, index) => (
|
||||||
<Link
|
<Link
|
||||||
key={`${article.id}-${index}`}
|
key={`${article.id}-${index}`}
|
||||||
to={`/articles/${article.id}` as any}
|
to={`/articles/${article.id}`}
|
||||||
className="text-sm text-muted-foreground hover:text-foreground hover:underline inline-block px-4"
|
className="text-sm text-muted-foreground hover:text-foreground hover:underline inline-block px-4"
|
||||||
>
|
>
|
||||||
{article.title || 'No title'}
|
{article.title || 'No title'}
|
||||||
@@ -34,7 +34,7 @@ export function ArticleTicker() {
|
|||||||
{articles.map((article, index) => (
|
{articles.map((article, index) => (
|
||||||
<Link
|
<Link
|
||||||
key={`dup-${article.id}-${index}`}
|
key={`dup-${article.id}-${index}`}
|
||||||
to={`/articles/${article.id}` as any}
|
to={`/articles/${article.id}`}
|
||||||
className="text-sm text-muted-foreground hover:text-foreground hover:underline inline-block px-4"
|
className="text-sm text-muted-foreground hover:text-foreground hover:underline inline-block px-4"
|
||||||
>
|
>
|
||||||
{article.title || 'No title'}
|
{article.title || 'No title'}
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
import { Button } from '../ui/button';
|
||||||
|
import { Input } from '../ui/input';
|
||||||
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card';
|
||||||
|
import { Label } from '../ui/label';
|
||||||
|
|
||||||
|
interface LoginFormProps {
|
||||||
|
onSuccess?: () => void;
|
||||||
|
onSwitchToRegister?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function LoginForm({ onSuccess, onSwitchToRegister }: LoginFormProps) {
|
||||||
|
const { login, isLoading } = useAuth();
|
||||||
|
const [username, setUsername] = useState('');
|
||||||
|
const [password, setPassword] = useState('');
|
||||||
|
const [error, setError] = useState('');
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setError('');
|
||||||
|
|
||||||
|
try {
|
||||||
|
await login(username, password);
|
||||||
|
onSuccess?.();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Login failed');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="w-full max-w-md mx-auto">
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle>Login</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
Enter your credentials to access your account
|
||||||
|
</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
|
{error && (
|
||||||
|
<div className="p-3 text-sm bg-destructive/10 text-destructive rounded-md">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="username">Username</Label>
|
||||||
|
<Input
|
||||||
|
id="username"
|
||||||
|
type="text"
|
||||||
|
value={username}
|
||||||
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
|
placeholder="Enter your username"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="password">Password</Label>
|
||||||
|
<Input
|
||||||
|
id="password"
|
||||||
|
type="password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
placeholder="Enter your password"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Button type="submit" className="w-full" disabled={isLoading}>
|
||||||
|
{isLoading ? 'Logging in...' : 'Login'}
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
{onSwitchToRegister && (
|
||||||
|
<div className="text-center text-sm text-muted-foreground">
|
||||||
|
Don't have an account?{' '}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onSwitchToRegister}
|
||||||
|
className="text-primary hover:underline"
|
||||||
|
disabled={isLoading}
|
||||||
|
>
|
||||||
|
Register here
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</form>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Navigate } from '@tanstack/react-router';
|
||||||
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
|
||||||
|
interface ProtectedRouteProps {
|
||||||
|
children: React.ReactNode;
|
||||||
|
requiredRole?: 'admin' | 'contributor' | 'user';
|
||||||
|
redirectTo?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ProtectedRoute({
|
||||||
|
children,
|
||||||
|
requiredRole,
|
||||||
|
redirectTo = '/'
|
||||||
|
}: ProtectedRouteProps) {
|
||||||
|
const { isAuthenticated, user, isLoading } = useAuth();
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center justify-center min-h-screen">
|
||||||
|
<div className="text-center">
|
||||||
|
<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>
|
||||||
|
<p className="mt-4 text-muted-foreground">Loading...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isAuthenticated) {
|
||||||
|
return <Navigate to={redirectTo} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requiredRole && user?.role !== requiredRole) {
|
||||||
|
return <Navigate to="/" />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
import { Button } from '../ui/button';
|
||||||
|
import { Input } from '../ui/input';
|
||||||
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card';
|
||||||
|
import { Label } from '../ui/label';
|
||||||
|
|
||||||
|
interface RegisterFormProps {
|
||||||
|
onSuccess?: () => void;
|
||||||
|
onSwitchToLogin?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RegisterForm({ onSuccess, onSwitchToLogin }: RegisterFormProps) {
|
||||||
|
const { register, isLoading } = useAuth();
|
||||||
|
const [username, setUsername] = useState('');
|
||||||
|
const [email, setEmail] = useState('');
|
||||||
|
const [password, setPassword] = useState('');
|
||||||
|
const [confirmPassword, setConfirmPassword] = useState('');
|
||||||
|
const [error, setError] = useState('');
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setError('');
|
||||||
|
|
||||||
|
if (password !== confirmPassword) {
|
||||||
|
setError('Passwords do not match');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password.length < 6) {
|
||||||
|
setError('Password must be at least 6 characters');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await register(username, email, password);
|
||||||
|
onSuccess?.();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Registration failed');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="w-full max-w-md mx-auto">
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle>Register</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
Create a new account to start commenting and reacting
|
||||||
|
</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
|
{error && (
|
||||||
|
<div className="p-3 text-sm bg-destructive/10 text-destructive rounded-md">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="username">Username</Label>
|
||||||
|
<Input
|
||||||
|
id="username"
|
||||||
|
type="text"
|
||||||
|
value={username}
|
||||||
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
|
placeholder="Choose a username"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="email">Email</Label>
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
type="email"
|
||||||
|
value={email}
|
||||||
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
placeholder="Enter your email"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="password">Password</Label>
|
||||||
|
<Input
|
||||||
|
id="password"
|
||||||
|
type="password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
placeholder="Choose a password (min 6 characters)"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="confirmPassword">Confirm Password</Label>
|
||||||
|
<Input
|
||||||
|
id="confirmPassword"
|
||||||
|
type="password"
|
||||||
|
value={confirmPassword}
|
||||||
|
onChange={(e) => setConfirmPassword(e.target.value)}
|
||||||
|
placeholder="Confirm your password"
|
||||||
|
required
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Button type="submit" className="w-full" disabled={isLoading}>
|
||||||
|
{isLoading ? 'Creating account...' : 'Register'}
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
{onSwitchToLogin && (
|
||||||
|
<div className="text-center text-sm text-muted-foreground">
|
||||||
|
Already have an account?{' '}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onSwitchToLogin}
|
||||||
|
className="text-primary hover:underline"
|
||||||
|
disabled={isLoading}
|
||||||
|
>
|
||||||
|
Login here
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</form>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { useAuth } from '../../../contexts/AuthContext';
|
||||||
|
import { useCreateComment } from '../../../queries/comments';
|
||||||
|
import { Button } from '../../ui/button';
|
||||||
|
import { Textarea } from '../../ui/textarea';
|
||||||
|
import { Card, CardContent } from '../../ui/card';
|
||||||
|
import { format } from 'date-fns';
|
||||||
|
import { mk } from 'date-fns/locale';
|
||||||
|
import type { Comment } from '../../../lib/api';
|
||||||
|
|
||||||
|
interface CommentItemProps {
|
||||||
|
comment: Comment;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
depth?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CommentItem({ comment, articleId, liveBlogId, depth = 0 }: CommentItemProps) {
|
||||||
|
const { isAuthenticated } = useAuth();
|
||||||
|
const [showReplyForm, setShowReplyForm] = useState(false);
|
||||||
|
const [replyContent, setReplyContent] = useState('');
|
||||||
|
const [isSubmittingReply, setIsSubmittingReply] = useState(false);
|
||||||
|
|
||||||
|
const createCommentMutation = useCreateComment();
|
||||||
|
|
||||||
|
const handleSubmitReply = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
if (!replyContent.trim() || !isAuthenticated) return;
|
||||||
|
|
||||||
|
setIsSubmittingReply(true);
|
||||||
|
try {
|
||||||
|
await createCommentMutation.mutateAsync({
|
||||||
|
content: replyContent,
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
parentCommentId: comment.id,
|
||||||
|
});
|
||||||
|
setReplyContent('');
|
||||||
|
setShowReplyForm(false);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to post reply:', error);
|
||||||
|
} finally {
|
||||||
|
setIsSubmittingReply(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Maximum depth to prevent infinite nesting (optional)
|
||||||
|
const maxDepth = 5;
|
||||||
|
const canReply = depth < maxDepth;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={depth > 0 ? 'ml-8 mt-4 border-l-2 border-border pl-4' : ''}>
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="flex items-start justify-between mb-4">
|
||||||
|
<div>
|
||||||
|
<div className="font-medium">
|
||||||
|
{comment.user?.username || 'Анонимен корисник'}
|
||||||
|
</div>
|
||||||
|
<div className="text-sm text-muted-foreground">
|
||||||
|
{format(new Date(comment.createdAt), 'dd MMMM yyyy, HH:mm', { locale: mk })}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{comment.user?.role === 'admin' && (
|
||||||
|
<span className="px-2 py-1 text-xs rounded-full bg-primary/10 text-primary">
|
||||||
|
Администратор
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="whitespace-pre-wrap mb-4">{comment.content}</p>
|
||||||
|
|
||||||
|
{/* Reply button and form */}
|
||||||
|
{isAuthenticated && canReply && (
|
||||||
|
<div className="mt-4">
|
||||||
|
{!showReplyForm ? (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => setShowReplyForm(true)}
|
||||||
|
className="text-sm"
|
||||||
|
>
|
||||||
|
Одговори
|
||||||
|
</Button>
|
||||||
|
) : (
|
||||||
|
<div className="mt-4 p-4 border rounded-lg bg-muted/20">
|
||||||
|
<form onSubmit={handleSubmitReply}>
|
||||||
|
<Textarea
|
||||||
|
placeholder="Вашиот одговор..."
|
||||||
|
value={replyContent}
|
||||||
|
onChange={(e) => setReplyContent(e.target.value)}
|
||||||
|
className="min-h-[80px] mb-3"
|
||||||
|
disabled={isSubmittingReply}
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
<div className="flex justify-end gap-2">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => {
|
||||||
|
setShowReplyForm(false);
|
||||||
|
setReplyContent('');
|
||||||
|
}}
|
||||||
|
disabled={isSubmittingReply}
|
||||||
|
>
|
||||||
|
Откажи
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
size="sm"
|
||||||
|
disabled={!replyContent.trim() || isSubmittingReply}
|
||||||
|
>
|
||||||
|
{isSubmittingReply ? 'Поставување...' : 'Постави одговор'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Reactions (if implemented) */}
|
||||||
|
{comment.reactions && (
|
||||||
|
<div className="flex items-center gap-4 mt-4 pt-4 border-t">
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<span className="text-sm text-muted-foreground">👍 {comment.reactions.likes}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<span className="text-sm text-muted-foreground">👎 {comment.reactions.dislikes}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Render replies recursively */}
|
||||||
|
{comment.replies && comment.replies.length > 0 && (
|
||||||
|
<div className="mt-4">
|
||||||
|
{comment.replies.map((reply) => (
|
||||||
|
<CommentItem
|
||||||
|
key={reply.id}
|
||||||
|
comment={reply}
|
||||||
|
articleId={articleId}
|
||||||
|
liveBlogId={liveBlogId}
|
||||||
|
depth={depth + 1}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { useAuth } from '../../../contexts/AuthContext';
|
||||||
|
import { useComments, useCreateComment } from '../../../queries/comments';
|
||||||
|
import { Button } from '../../ui/button';
|
||||||
|
import { Textarea } from '../../ui/textarea';
|
||||||
|
import { Card, CardContent } from '../../ui/card';
|
||||||
|
import { CommentItem } from './CommentItem';
|
||||||
|
|
||||||
|
interface CommentSectionProps {
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CommentSection({ articleId, liveBlogId }: CommentSectionProps) {
|
||||||
|
const { isAuthenticated } = useAuth();
|
||||||
|
const [newComment, setNewComment] = useState('');
|
||||||
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
|
|
||||||
|
const { data: commentsData, isLoading } = useComments({
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
limit: 50,
|
||||||
|
});
|
||||||
|
|
||||||
|
const createCommentMutation = useCreateComment();
|
||||||
|
|
||||||
|
const comments = commentsData?.data || [];
|
||||||
|
|
||||||
|
const handleSubmitComment = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
if (!newComment.trim() || !isAuthenticated) return;
|
||||||
|
|
||||||
|
setIsSubmitting(true);
|
||||||
|
try {
|
||||||
|
await createCommentMutation.mutateAsync({
|
||||||
|
content: newComment,
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
});
|
||||||
|
setNewComment('');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to post comment:', error);
|
||||||
|
} finally {
|
||||||
|
setIsSubmitting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mt-12 pt-8 border-t">
|
||||||
|
<h2 className="text-2xl font-bold mb-6">Коментари</h2>
|
||||||
|
|
||||||
|
{isAuthenticated ? (
|
||||||
|
<Card className="mb-8">
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<form onSubmit={handleSubmitComment}>
|
||||||
|
<Textarea
|
||||||
|
placeholder="Што мислите за овој напис?"
|
||||||
|
value={newComment}
|
||||||
|
onChange={(e) => setNewComment(e.target.value)}
|
||||||
|
className="min-h-[100px] mb-4"
|
||||||
|
disabled={isSubmitting}
|
||||||
|
/>
|
||||||
|
<div className="flex justify-end">
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
disabled={!newComment.trim() || isSubmitting}
|
||||||
|
>
|
||||||
|
{isSubmitting ? 'Поставување...' : 'Постави коментар'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
) : (
|
||||||
|
<Card className="mb-8">
|
||||||
|
<CardContent className="pt-6 text-center">
|
||||||
|
<p className="text-muted-foreground mb-4">
|
||||||
|
Најавете се за да можете да коментирате
|
||||||
|
</p>
|
||||||
|
<Button asChild>
|
||||||
|
<a href="/auth">Најави се</a>
|
||||||
|
</Button>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="text-center py-8">
|
||||||
|
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto"></div>
|
||||||
|
<p className="mt-2 text-sm text-muted-foreground">Вчитување коментари...</p>
|
||||||
|
</div>
|
||||||
|
) : comments.length === 0 ? (
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6 text-center">
|
||||||
|
<p className="text-muted-foreground">
|
||||||
|
Сè уште нема коментари. Бидете првиот што ќе коментира!
|
||||||
|
</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-6">
|
||||||
|
{comments.map((comment) => (
|
||||||
|
<CommentItem
|
||||||
|
key={comment.id}
|
||||||
|
comment={comment}
|
||||||
|
articleId={articleId}
|
||||||
|
liveBlogId={liveBlogId}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
|
||||||
|
import { useAuth } from '../../../contexts/AuthContext';
|
||||||
|
import { useReactionCounts, useUserReaction, useAddReaction } from '../../../queries/comments';
|
||||||
|
import { Button } from '../../ui/button';
|
||||||
|
import { ThumbsUp, ThumbsDown } from 'lucide-react';
|
||||||
|
|
||||||
|
interface ReactionButtonsProps {
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
commentId?: string;
|
||||||
|
compact?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ReactionButtons({
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
commentId,
|
||||||
|
compact = false
|
||||||
|
}: ReactionButtonsProps) {
|
||||||
|
const { isAuthenticated } = useAuth();
|
||||||
|
|
||||||
|
const { data: counts } = useReactionCounts(articleId, liveBlogId, commentId);
|
||||||
|
const { data: userReaction } = useUserReaction(articleId, liveBlogId, commentId);
|
||||||
|
const addReactionMutation = useAddReaction();
|
||||||
|
|
||||||
|
const userReactionType = userReaction?.type;
|
||||||
|
|
||||||
|
const handleReaction = async (type: 'like' | 'dislike') => {
|
||||||
|
if (!isAuthenticated) {
|
||||||
|
window.location.href = '/auth';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await addReactionMutation.mutateAsync({
|
||||||
|
type,
|
||||||
|
articleId,
|
||||||
|
liveBlogId,
|
||||||
|
commentId,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to add reaction:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const likes = counts?.likes || 0;
|
||||||
|
const dislikes = counts?.dislikes || 0;
|
||||||
|
|
||||||
|
if (compact) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleReaction('like')}
|
||||||
|
className={`h-8 px-2 ${userReactionType === 'like' ? 'text-primary' : ''}`}
|
||||||
|
>
|
||||||
|
<ThumbsUp className="w-4 h-4 mr-1" />
|
||||||
|
{likes > 0 && <span>{likes}</span>}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleReaction('dislike')}
|
||||||
|
className={`h-8 px-2 ${userReactionType === 'dislike' ? 'text-destructive' : ''}`}
|
||||||
|
>
|
||||||
|
<ThumbsDown className="w-4 h-4 mr-1" />
|
||||||
|
{dislikes > 0 && <span>{dislikes}</span>}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-4">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Button
|
||||||
|
variant={userReactionType === 'like' ? 'default' : 'outline'}
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleReaction('like')}
|
||||||
|
className="gap-2"
|
||||||
|
>
|
||||||
|
<ThumbsUp className="w-4 h-4" />
|
||||||
|
<span>Допаѓа ми</span>
|
||||||
|
{likes > 0 && (
|
||||||
|
<span className="ml-1 bg-primary/20 px-2 py-0.5 rounded-full text-xs">
|
||||||
|
{likes}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Button
|
||||||
|
variant={userReactionType === 'dislike' ? 'destructive' : 'outline'}
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleReaction('dislike')}
|
||||||
|
className="gap-2"
|
||||||
|
>
|
||||||
|
<ThumbsDown className="w-4 h-4" />
|
||||||
|
<span>Не ми се допаѓа</span>
|
||||||
|
{dislikes > 0 && (
|
||||||
|
<span className="ml-1 bg-destructive/20 px-2 py-0.5 rounded-full text-xs">
|
||||||
|
{dislikes}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Copy, Check } from 'lucide-react';
|
||||||
|
import { copyToClipboard } from '@/lib/social-utils';
|
||||||
|
|
||||||
|
interface CopyLinkButtonProps {
|
||||||
|
url: string;
|
||||||
|
size?: 'sm' | 'default' | 'lg';
|
||||||
|
variant?: 'default' | 'outline' | 'ghost';
|
||||||
|
className?: string;
|
||||||
|
showLabel?: boolean;
|
||||||
|
onCopy?: (success: boolean) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CopyLinkButton({
|
||||||
|
url,
|
||||||
|
size = 'default',
|
||||||
|
variant = 'outline',
|
||||||
|
className = '',
|
||||||
|
showLabel = false,
|
||||||
|
onCopy,
|
||||||
|
}: CopyLinkButtonProps) {
|
||||||
|
const [isCopied, setIsCopied] = useState(false);
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
const handleCopy = async () => {
|
||||||
|
if (isLoading) return;
|
||||||
|
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
const success = await copyToClipboard(url);
|
||||||
|
setIsCopied(success);
|
||||||
|
|
||||||
|
if (onCopy) {
|
||||||
|
onCopy(success);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset copied state after 2 seconds
|
||||||
|
if (success) {
|
||||||
|
setTimeout(() => setIsCopied(false), 2000);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to copy:', error);
|
||||||
|
if (onCopy) {
|
||||||
|
onCopy(false);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const label = isCopied ? 'Copied!' : 'Copy Link';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant={variant}
|
||||||
|
size={size}
|
||||||
|
onClick={handleCopy}
|
||||||
|
disabled={isLoading}
|
||||||
|
className={`relative ${className}`}
|
||||||
|
aria-label={label}
|
||||||
|
title={label}
|
||||||
|
>
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current" />
|
||||||
|
) : isCopied ? (
|
||||||
|
<Check className="h-4 w-4 text-green-600" />
|
||||||
|
) : (
|
||||||
|
<Copy className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
{showLabel && <span className="ml-2">{label}</span>}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { type SharePlatform, getPlatformLabel } from '@/lib/social-utils';
|
||||||
|
import {
|
||||||
|
Facebook,
|
||||||
|
Twitter,
|
||||||
|
MessageCircle,
|
||||||
|
Send,
|
||||||
|
Mail,
|
||||||
|
Link,
|
||||||
|
Share2
|
||||||
|
} from 'lucide-react';
|
||||||
|
|
||||||
|
interface ShareButtonProps {
|
||||||
|
platform: SharePlatform;
|
||||||
|
onClick: () => void;
|
||||||
|
disabled?: boolean;
|
||||||
|
size?: 'sm' | 'default' | 'lg';
|
||||||
|
variant?: 'default' | 'outline' | 'ghost';
|
||||||
|
className?: string;
|
||||||
|
showLabel?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ShareButton({
|
||||||
|
platform,
|
||||||
|
onClick,
|
||||||
|
disabled = false,
|
||||||
|
size = 'default',
|
||||||
|
variant = 'outline',
|
||||||
|
className = '',
|
||||||
|
showLabel = false,
|
||||||
|
}: ShareButtonProps) {
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
const handleClick = async () => {
|
||||||
|
if (disabled || isLoading) return;
|
||||||
|
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
await onClick();
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const label = getPlatformLabel(platform);
|
||||||
|
|
||||||
|
// Get the appropriate icon component
|
||||||
|
const getIconComponent = () => {
|
||||||
|
switch (platform) {
|
||||||
|
case 'facebook':
|
||||||
|
return Facebook;
|
||||||
|
case 'twitter':
|
||||||
|
return Twitter;
|
||||||
|
case 'whatsapp':
|
||||||
|
return MessageCircle;
|
||||||
|
case 'telegram':
|
||||||
|
return Send;
|
||||||
|
case 'email':
|
||||||
|
return Mail;
|
||||||
|
case 'link':
|
||||||
|
return Link;
|
||||||
|
default:
|
||||||
|
return Share2;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const IconComponent = getIconComponent();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant={variant}
|
||||||
|
size={size}
|
||||||
|
onClick={handleClick}
|
||||||
|
disabled={disabled || isLoading}
|
||||||
|
className={`relative ${className}`}
|
||||||
|
aria-label={label}
|
||||||
|
title={label}
|
||||||
|
>
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current" />
|
||||||
|
) : (
|
||||||
|
<IconComponent className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
{showLabel && <span className="ml-2">{label}</span>}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { ShareButton } from './ShareButton';
|
||||||
|
import { CopyLinkButton } from './CopyLinkButton';
|
||||||
|
import { type SharePlatform, type ShareData, getShareUrl } from '@/lib/social-utils';
|
||||||
|
import { trackShare } from '@/lib/analytics';
|
||||||
|
|
||||||
|
export type SocialShareVariant = 'default' | 'compact' | 'footer' | 'floating';
|
||||||
|
|
||||||
|
interface SocialShareButtonsProps extends ShareData {
|
||||||
|
articleId: string;
|
||||||
|
variant?: SocialShareVariant;
|
||||||
|
className?: string;
|
||||||
|
onShare?: (platform: SharePlatform) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const PLATFORMS: SharePlatform[] = ['facebook', 'twitter', 'whatsapp', 'telegram', 'email', 'link'];
|
||||||
|
|
||||||
|
export function SocialShareButtons({
|
||||||
|
articleId,
|
||||||
|
title,
|
||||||
|
url,
|
||||||
|
excerpt,
|
||||||
|
image,
|
||||||
|
tags,
|
||||||
|
variant = 'default',
|
||||||
|
className = '',
|
||||||
|
onShare,
|
||||||
|
}: SocialShareButtonsProps) {
|
||||||
|
const [isTracking, setIsTracking] = useState(false);
|
||||||
|
const [isExpanded, setIsExpanded] = useState(false);
|
||||||
|
|
||||||
|
const shareData: ShareData = {
|
||||||
|
title,
|
||||||
|
url,
|
||||||
|
excerpt,
|
||||||
|
image,
|
||||||
|
tags,
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleShare = async (platform: SharePlatform) => {
|
||||||
|
try {
|
||||||
|
// Track the share event
|
||||||
|
setIsTracking(true);
|
||||||
|
await trackShare({
|
||||||
|
articleId,
|
||||||
|
platform,
|
||||||
|
userAgent: navigator.userAgent,
|
||||||
|
// Note: We don't send IP address from frontend for privacy reasons
|
||||||
|
// Backend should extract it from the request if needed
|
||||||
|
});
|
||||||
|
|
||||||
|
// Call the onShare callback if provided
|
||||||
|
if (onShare) {
|
||||||
|
onShare(platform);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open share URL in new window for social platforms
|
||||||
|
if (platform !== 'link') {
|
||||||
|
const shareUrl = getShareUrl(platform, shareData);
|
||||||
|
window.open(shareUrl, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to track share:', error);
|
||||||
|
// Still open the share URL even if tracking fails
|
||||||
|
if (platform !== 'link') {
|
||||||
|
const shareUrl = getShareUrl(platform, shareData);
|
||||||
|
window.open(shareUrl, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setIsTracking(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCopyLink = async (success: boolean) => {
|
||||||
|
if (success) {
|
||||||
|
await handleShare('link');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Determine layout based on variant
|
||||||
|
const getLayoutClasses = () => {
|
||||||
|
switch (variant) {
|
||||||
|
case 'compact':
|
||||||
|
return 'flex items-center space-x-1';
|
||||||
|
case 'footer':
|
||||||
|
return 'flex flex-col sm:flex-row items-center justify-center space-y-2 sm:space-y-0 sm:space-x-4';
|
||||||
|
case 'floating':
|
||||||
|
return 'fixed right-4 bottom-4 flex flex-col space-y-2 z-50';
|
||||||
|
default:
|
||||||
|
return 'flex flex-wrap items-center gap-2';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getButtonSize = () => {
|
||||||
|
switch (variant) {
|
||||||
|
case 'compact':
|
||||||
|
return 'sm' as const;
|
||||||
|
case 'footer':
|
||||||
|
return 'default' as const;
|
||||||
|
case 'floating':
|
||||||
|
return 'default' as const;
|
||||||
|
default:
|
||||||
|
return 'default' as const;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getButtonVariant = () => {
|
||||||
|
switch (variant) {
|
||||||
|
case 'compact':
|
||||||
|
return 'ghost' as const;
|
||||||
|
case 'footer':
|
||||||
|
return 'outline' as const;
|
||||||
|
case 'floating':
|
||||||
|
return 'default' as const;
|
||||||
|
default:
|
||||||
|
return 'outline' as const;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const showLabels = variant === 'footer';
|
||||||
|
|
||||||
|
// For compact variant, only show a single share button that expands on hover
|
||||||
|
if (variant === 'compact') {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={`relative ${className}`}
|
||||||
|
onMouseEnter={() => setIsExpanded(true)}
|
||||||
|
onMouseLeave={() => setIsExpanded(false)}
|
||||||
|
>
|
||||||
|
<div className="flex items-center space-x-1">
|
||||||
|
<ShareButton
|
||||||
|
platform="link"
|
||||||
|
onClick={() => handleShare('link')}
|
||||||
|
size={getButtonSize()}
|
||||||
|
variant={getButtonVariant()}
|
||||||
|
disabled={isTracking}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{isExpanded && (
|
||||||
|
<div className="flex items-center space-x-1 animate-in slide-in-from-right-2">
|
||||||
|
{PLATFORMS.filter(p => p !== 'link').map((platform) => (
|
||||||
|
<ShareButton
|
||||||
|
key={platform}
|
||||||
|
platform={platform}
|
||||||
|
onClick={() => handleShare(platform)}
|
||||||
|
size={getButtonSize()}
|
||||||
|
variant={getButtonVariant()}
|
||||||
|
disabled={isTracking}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`${getLayoutClasses()} ${className}`}>
|
||||||
|
{PLATFORMS.map((platform) => {
|
||||||
|
if (platform === 'link') {
|
||||||
|
return (
|
||||||
|
<CopyLinkButton
|
||||||
|
key={platform}
|
||||||
|
url={url}
|
||||||
|
size={getButtonSize()}
|
||||||
|
variant={getButtonVariant()}
|
||||||
|
showLabel={showLabels}
|
||||||
|
onCopy={handleCopyLink}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ShareButton
|
||||||
|
key={platform}
|
||||||
|
platform={platform}
|
||||||
|
onClick={() => handleShare(platform)}
|
||||||
|
size={getButtonSize()}
|
||||||
|
variant={getButtonVariant()}
|
||||||
|
disabled={isTracking}
|
||||||
|
showLabel={showLabels}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
export { SocialShareButtons } from './SocialShareButtons';
|
||||||
|
export { ShareButton } from './ShareButton';
|
||||||
|
export { CopyLinkButton } from './CopyLinkButton';
|
||||||
|
export type { SocialShareVariant } from './SocialShareButtons';
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
|
||||||
|
import { useState } from 'react';
|
||||||
|
import { Link } from '@tanstack/react-router';
|
||||||
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
import { Button } from '../ui/button';
|
||||||
|
import { ThemeToggle } from './ThemeToggle';
|
||||||
|
import { Menu, X } from 'lucide-react';
|
||||||
|
|
||||||
|
export function Header() {
|
||||||
|
const { user, logout, isAuthenticated, hasRole } = useAuth();
|
||||||
|
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
|
||||||
|
|
||||||
|
const toggleMobileMenu = () => {
|
||||||
|
setIsMobileMenuOpen(!isMobileMenuOpen);
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeMobileMenu = () => {
|
||||||
|
setIsMobileMenuOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const navLinks = [
|
||||||
|
{ to: '/', label: 'Home' },
|
||||||
|
{ to: '/articles', label: 'Articles' },
|
||||||
|
{ to: '/live-blogs', label: 'Live' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const adminLinks = [
|
||||||
|
{ to: '/admin', label: 'Admin' },
|
||||||
|
{ to: '/admin/live-blogs/create', label: '+ New Live Blog' },
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<header className="border-b sticky top-0 z-50 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
|
||||||
|
<div className="container mx-auto max-w-6xl px-4 py-4">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h1 className="text-2xl md:text-3xl font-bold">
|
||||||
|
<Link to="/" className="hover:underline">Placebo.mk</Link>
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
{/* Desktop Navigation */}
|
||||||
|
<nav className="hidden md:flex items-center gap-4">
|
||||||
|
{navLinks.map((link) => (
|
||||||
|
<Link
|
||||||
|
key={link.to}
|
||||||
|
to={link.to}
|
||||||
|
className="text-sm font-medium hover:underline transition-colors"
|
||||||
|
>
|
||||||
|
{link.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{isAuthenticated ? (
|
||||||
|
<>
|
||||||
|
{(hasRole('admin') || hasRole('contributor')) && (
|
||||||
|
<>
|
||||||
|
{adminLinks.map((link) => (
|
||||||
|
<Link
|
||||||
|
key={link.to}
|
||||||
|
to={link.to}
|
||||||
|
className="text-sm font-medium hover:underline text-primary transition-colors"
|
||||||
|
>
|
||||||
|
{link.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2 ml-2">
|
||||||
|
<span className="text-sm text-muted-foreground">
|
||||||
|
{user?.username}
|
||||||
|
</span>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={logout}
|
||||||
|
className="text-xs"
|
||||||
|
>
|
||||||
|
Logout
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Link to="/auth" className="text-sm font-medium hover:underline text-primary transition-colors">
|
||||||
|
Login / Register
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<ThemeToggle />
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
{/* Mobile Menu Button */}
|
||||||
|
<div className="flex items-center gap-2 md:hidden">
|
||||||
|
<ThemeToggle />
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={toggleMobileMenu}
|
||||||
|
className="h-9 w-9"
|
||||||
|
aria-label={isMobileMenuOpen ? 'Close menu' : 'Open menu'}
|
||||||
|
>
|
||||||
|
{isMobileMenuOpen ? (
|
||||||
|
<X className="h-5 w-5" />
|
||||||
|
) : (
|
||||||
|
<Menu className="h-5 w-5" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Mobile Navigation */}
|
||||||
|
{isMobileMenuOpen && (
|
||||||
|
<div className="md:hidden mt-4 pb-4 border-t pt-4 animate-in slide-in-from-top-2">
|
||||||
|
<div className="flex flex-col gap-3">
|
||||||
|
{navLinks.map((link) => (
|
||||||
|
<Link
|
||||||
|
key={link.to}
|
||||||
|
to={link.to}
|
||||||
|
className="text-sm font-medium hover:underline py-2 transition-colors"
|
||||||
|
onClick={closeMobileMenu}
|
||||||
|
>
|
||||||
|
{link.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{isAuthenticated ? (
|
||||||
|
<>
|
||||||
|
{(hasRole('admin') || hasRole('contributor')) && (
|
||||||
|
<div className="border-t pt-3 mt-2">
|
||||||
|
<p className="text-xs text-muted-foreground mb-2">Admin</p>
|
||||||
|
{adminLinks.map((link) => (
|
||||||
|
<Link
|
||||||
|
key={link.to}
|
||||||
|
to={link.to}
|
||||||
|
className="text-sm font-medium hover:underline text-primary py-2 block transition-colors"
|
||||||
|
onClick={closeMobileMenu}
|
||||||
|
>
|
||||||
|
{link.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="border-t pt-3 mt-2">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<span className="text-sm text-muted-foreground">
|
||||||
|
Logged in as: {user?.username}
|
||||||
|
</span>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => {
|
||||||
|
logout();
|
||||||
|
closeMobileMenu();
|
||||||
|
}}
|
||||||
|
className="text-xs"
|
||||||
|
>
|
||||||
|
Logout
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Link
|
||||||
|
to="/auth"
|
||||||
|
className="text-sm font-medium hover:underline text-primary py-2 transition-colors"
|
||||||
|
onClick={closeMobileMenu}
|
||||||
|
>
|
||||||
|
Login / Register
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { useState, useEffect } from 'react';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Sun, Moon } from 'lucide-react';
|
||||||
|
import { getInitialTheme, toggleTheme, watchSystemTheme } from '@/lib/theme';
|
||||||
|
|
||||||
|
export function ThemeToggle() {
|
||||||
|
const [theme, setTheme] = useState<'light' | 'dark'>(getInitialTheme);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Watch for system theme changes
|
||||||
|
const cleanup = watchSystemTheme((newTheme) => {
|
||||||
|
setTheme(newTheme);
|
||||||
|
});
|
||||||
|
|
||||||
|
return cleanup;
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleToggle = () => {
|
||||||
|
const newTheme = toggleTheme();
|
||||||
|
setTheme(newTheme);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={handleToggle}
|
||||||
|
className="h-9 w-9"
|
||||||
|
aria-label={`Switch to ${theme === 'light' ? 'dark' : 'light'} mode`}
|
||||||
|
>
|
||||||
|
{theme === 'light' ? (
|
||||||
|
<Moon className="h-4 w-4" />
|
||||||
|
) : (
|
||||||
|
<Sun className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -324,6 +324,11 @@ export function AdminDashboardComponent() {
|
|||||||
</span>
|
</span>
|
||||||
<span>•</span>
|
<span>•</span>
|
||||||
<span>Прегледи: {article.views}</span>
|
<span>Прегледи: {article.views}</span>
|
||||||
|
<span>•</span>
|
||||||
|
<span>
|
||||||
|
Shares: {(article.facebookShares || 0) + (article.twitterShares || 0) +
|
||||||
|
(article.whatsappShares || 0) + (article.telegramShares || 0)}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{article.excerpt && (
|
{article.excerpt && (
|
||||||
<p className="mt-2 text-sm text-muted-foreground line-clamp-2">
|
<p className="mt-2 text-sm text-muted-foreground line-clamp-2">
|
||||||
@@ -416,6 +421,139 @@ export function AdminDashboardComponent() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Social Media Analytics - Only show when not viewing archived items */}
|
||||||
|
{!showArchived && (
|
||||||
|
<div className="mt-8">
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle>Social Media Analytics</CardTitle>
|
||||||
|
<CardDescription>Share statistics for articles</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<div className="space-y-6">
|
||||||
|
{/* Total Shares Summary */}
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-5 gap-4">
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="text-2xl font-bold">
|
||||||
|
{articles.reduce((sum, a) => sum + (a.facebookShares || 0), 0) || 0}
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">Facebook Shares</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="text-2xl font-bold">
|
||||||
|
{articles.reduce((sum, a) => sum + (a.twitterShares || 0), 0) || 0}
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">Twitter Shares</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="text-2xl font-bold">
|
||||||
|
{articles.reduce((sum, a) => sum + (a.whatsappShares || 0), 0) || 0}
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">WhatsApp Shares</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="text-2xl font-bold">
|
||||||
|
{articles.reduce((sum, a) => sum + (a.telegramShares || 0), 0) || 0}
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">Telegram Shares</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
<Card>
|
||||||
|
<CardContent className="pt-6">
|
||||||
|
<div className="text-2xl font-bold">
|
||||||
|
{articles.reduce((sum, a) =>
|
||||||
|
sum + (a.facebookShares || 0) + (a.twitterShares || 0) +
|
||||||
|
(a.whatsappShares || 0) + (a.telegramShares || 0), 0) || 0}
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">Total Shares</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Top Shared Articles */}
|
||||||
|
<div>
|
||||||
|
<h3 className="text-lg font-semibold mb-4">Top Shared Articles</h3>
|
||||||
|
<div className="space-y-3">
|
||||||
|
{articles
|
||||||
|
.filter(a => a.status === 'published')
|
||||||
|
.sort((a, b) => {
|
||||||
|
const aShares = (a.facebookShares || 0) + (a.twitterShares || 0) +
|
||||||
|
(a.whatsappShares || 0) + (a.telegramShares || 0);
|
||||||
|
const bShares = (b.facebookShares || 0) + (b.twitterShares || 0) +
|
||||||
|
(b.whatsappShares || 0) + (b.telegramShares || 0);
|
||||||
|
return bShares - aShares;
|
||||||
|
})
|
||||||
|
.slice(0, 5)
|
||||||
|
.map((article) => {
|
||||||
|
const totalShares = (article.facebookShares || 0) +
|
||||||
|
(article.twitterShares || 0) +
|
||||||
|
(article.whatsappShares || 0) +
|
||||||
|
(article.telegramShares || 0);
|
||||||
|
const shareRate = article.views > 0
|
||||||
|
? ((totalShares / article.views) * 100).toFixed(2)
|
||||||
|
: '0.00';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={article.id}
|
||||||
|
className="p-4 border rounded-lg hover:bg-accent/50 transition-colors"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between">
|
||||||
|
<div className="flex-1">
|
||||||
|
<div className="flex items-center gap-2 mb-1">
|
||||||
|
<Link
|
||||||
|
to="/articles/$id"
|
||||||
|
params={{ id: article.id }}
|
||||||
|
className="font-medium hover:text-primary hover:underline"
|
||||||
|
>
|
||||||
|
{article.title}
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-4 text-sm text-muted-foreground">
|
||||||
|
<span>Views: {article.views}</span>
|
||||||
|
<span>•</span>
|
||||||
|
<span>Shares: {totalShares}</span>
|
||||||
|
<span>•</span>
|
||||||
|
<span>Share Rate: {shareRate}%</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-4 mt-2 text-xs">
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<span className="w-2 h-2 bg-blue-500 rounded-full"></span>
|
||||||
|
Facebook: {article.facebookShares || 0}
|
||||||
|
</span>
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<span className="w-2 h-2 bg-sky-500 rounded-full"></span>
|
||||||
|
Twitter: {article.twitterShares || 0}
|
||||||
|
</span>
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<span className="w-2 h-2 bg-green-500 rounded-full"></span>
|
||||||
|
WhatsApp: {article.whatsappShares || 0}
|
||||||
|
</span>
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<span className="w-2 h-2 bg-cyan-500 rounded-full"></span>
|
||||||
|
Telegram: {article.telegramShares || 0}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Confirmation Dialog */}
|
{/* Confirmation Dialog */}
|
||||||
{showConfirmDialog && itemToDelete && (
|
{showConfirmDialog && itemToDelete && (
|
||||||
<div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
|
<div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ import ReactMarkdown from 'react-markdown'
|
|||||||
import remarkGfm from 'remark-gfm'
|
import remarkGfm from 'remark-gfm'
|
||||||
import { YouTubeEmbed } from '@/components/ui/youtube-embed'
|
import { YouTubeEmbed } from '@/components/ui/youtube-embed'
|
||||||
import { extractYouTubeVideoId, getVideoPositionClasses } from '@/lib/video-utils'
|
import { extractYouTubeVideoId, getVideoPositionClasses } from '@/lib/video-utils'
|
||||||
|
import { CommentSection } from '@/components/features/comments/CommentSection'
|
||||||
|
import { ReactionButtons } from '@/components/features/comments/ReactionButtons'
|
||||||
|
import { SocialShareButtons } from '@/components/features/social-share'
|
||||||
|
|
||||||
export function ArticleDetailComponent({ id }: { id: string }) {
|
export function ArticleDetailComponent({ id }: { id: string }) {
|
||||||
const { data, isLoading, error } = useQuery({
|
const { data, isLoading, error } = useQuery({
|
||||||
@@ -69,6 +72,18 @@ export function ArticleDetailComponent({ id }: { id: string }) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Social Sharing */}
|
||||||
|
<div className="mb-8">
|
||||||
|
<SocialShareButtons
|
||||||
|
articleId={data.id}
|
||||||
|
title={data.title}
|
||||||
|
url={typeof window !== 'undefined' ? window.location.href : ''}
|
||||||
|
excerpt={data.excerpt}
|
||||||
|
image={data.featuredImage}
|
||||||
|
tags={data.tags}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
{data.featuredImage && data.imagePosition !== 'none' && (
|
{data.featuredImage && data.imagePosition !== 'none' && (
|
||||||
<div className={`relative mb-4 ${
|
<div className={`relative mb-4 ${
|
||||||
data.imagePosition === 'top'
|
data.imagePosition === 'top'
|
||||||
@@ -166,6 +181,22 @@ export function ArticleDetailComponent({ id }: { id: string }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Social Sharing Footer */}
|
||||||
|
<div className="mt-8 pt-8 border-t">
|
||||||
|
<div className="flex flex-col items-center">
|
||||||
|
<p className="text-sm text-muted-foreground mb-4">Share this article:</p>
|
||||||
|
<SocialShareButtons
|
||||||
|
articleId={data.id}
|
||||||
|
title={data.title}
|
||||||
|
url={typeof window !== 'undefined' ? window.location.href : ''}
|
||||||
|
excerpt={data.excerpt}
|
||||||
|
image={data.featuredImage}
|
||||||
|
tags={data.tags}
|
||||||
|
variant="footer"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{data.tags && Array.isArray(data.tags) && data.tags.length > 0 && (
|
{data.tags && Array.isArray(data.tags) && data.tags.length > 0 && (
|
||||||
<div className="mt-8 pt-8 border-t">
|
<div className="mt-8 pt-8 border-t">
|
||||||
<h3 className="text-sm font-semibold mb-4 text-muted-foreground">Tags</h3>
|
<h3 className="text-sm font-semibold mb-4 text-muted-foreground">Tags</h3>
|
||||||
@@ -181,6 +212,17 @@ export function ArticleDetailComponent({ id }: { id: string }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Reactions */}
|
||||||
|
<div className="mt-8 pt-8 border-t">
|
||||||
|
<div className="flex items-center justify-between mb-6">
|
||||||
|
<h3 className="text-lg font-semibold">Што мислите за овој напис?</h3>
|
||||||
|
<ReactionButtons articleId={data.id} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Comments */}
|
||||||
|
<CommentSection articleId={data.id} />
|
||||||
</article>
|
</article>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery } from '@tanstack/react-query'
|
||||||
import { Link } from '@tanstack/react-router'
|
import { Link } from '@tanstack/react-router'
|
||||||
import * as api from '@/lib/api'
|
import * as api from '@/lib/api'
|
||||||
|
import { SocialShareButtons } from '@/components/features/social-share'
|
||||||
|
|
||||||
export function ArticlesComponent() {
|
export function ArticlesComponent() {
|
||||||
const { data, isLoading, error } = useQuery({
|
const { data, isLoading, error } = useQuery({
|
||||||
@@ -33,10 +34,13 @@ export function ArticlesComponent() {
|
|||||||
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
|
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
|
||||||
{data?.data.map((article) => (
|
{data?.data.map((article) => (
|
||||||
<Link
|
<div
|
||||||
key={article.id}
|
key={article.id}
|
||||||
to={`/articles/${article.id}` as any}
|
className="p-6 rounded-xl border bg-card hover:shadow-lg transition-shadow"
|
||||||
className="p-6 rounded-xl border bg-card hover:shadow-lg transition-shadow cursor-pointer block"
|
>
|
||||||
|
<Link
|
||||||
|
to={`/articles/${article.id}`}
|
||||||
|
className="block mb-4"
|
||||||
>
|
>
|
||||||
<h2 className="text-xl font-semibold mb-2 line-clamp-2">
|
<h2 className="text-xl font-semibold mb-2 line-clamp-2">
|
||||||
{article.title}
|
{article.title}
|
||||||
@@ -46,7 +50,10 @@ export function ArticlesComponent() {
|
|||||||
{article.excerpt}
|
{article.excerpt}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
</Link>
|
||||||
|
|
||||||
<div className="flex items-center justify-between text-sm text-muted-foreground">
|
<div className="flex items-center justify-between text-sm text-muted-foreground">
|
||||||
|
<div className="flex items-center space-x-4">
|
||||||
<span>
|
<span>
|
||||||
{new Date(article.createdAt).toLocaleDateString('mk-MK', {
|
{new Date(article.createdAt).toLocaleDateString('mk-MK', {
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
@@ -54,9 +61,21 @@ export function ArticlesComponent() {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
|
<span>•</span>
|
||||||
<span>{article.views} views</span>
|
<span>{article.views} views</span>
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
|
||||||
|
<SocialShareButtons
|
||||||
|
articleId={article.id}
|
||||||
|
title={article.title}
|
||||||
|
url={`${window.location.origin}/articles/${article.id}`}
|
||||||
|
excerpt={article.excerpt}
|
||||||
|
image={article.featuredImage}
|
||||||
|
tags={article.tags}
|
||||||
|
variant="compact"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { LoginForm } from '../auth/LoginForm';
|
||||||
|
import { RegisterForm } from '../auth/RegisterForm';
|
||||||
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
import { Navigate } from '@tanstack/react-router';
|
||||||
|
|
||||||
|
export function AuthPage() {
|
||||||
|
const { isAuthenticated } = useAuth();
|
||||||
|
const [isLogin, setIsLogin] = useState(true);
|
||||||
|
|
||||||
|
if (isAuthenticated) {
|
||||||
|
return <Navigate to="/" />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-background p-4">
|
||||||
|
<div className="w-full max-w-lg">
|
||||||
|
<div className="text-center mb-8">
|
||||||
|
<h1 className="text-3xl font-bold mb-2">
|
||||||
|
Welcome to <span className="text-primary">Placebo.mk</span>
|
||||||
|
</h1>
|
||||||
|
<p className="text-muted-foreground">
|
||||||
|
{isLogin
|
||||||
|
? 'Login to comment, react, and access admin features'
|
||||||
|
: 'Join our community of sarcastic news enthusiasts'}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{isLogin ? (
|
||||||
|
<LoginForm
|
||||||
|
onSuccess={() => window.location.href = '/'}
|
||||||
|
onSwitchToRegister={() => setIsLogin(false)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<RegisterForm
|
||||||
|
onSuccess={() => window.location.href = '/'}
|
||||||
|
onSwitchToLogin={() => setIsLogin(true)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="mt-8 text-center text-sm text-muted-foreground">
|
||||||
|
<p>
|
||||||
|
By {isLogin ? 'logging in' : 'registering'}, you agree to our{' '}
|
||||||
|
<a href="#" className="text-primary hover:underline">Terms of Service</a>{' '}
|
||||||
|
and{' '}
|
||||||
|
<a href="#" className="text-primary hover:underline">Privacy Policy</a>.
|
||||||
|
</p>
|
||||||
|
<p className="mt-2">
|
||||||
|
Need help?{' '}
|
||||||
|
<a href="mailto:support@placebo.mk" className="text-primary hover:underline">
|
||||||
|
Contact support
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -38,7 +38,7 @@ export function LiveBlogsComponent() {
|
|||||||
{data?.data.map((liveBlog) => (
|
{data?.data.map((liveBlog) => (
|
||||||
<Link
|
<Link
|
||||||
key={liveBlog.id}
|
key={liveBlog.id}
|
||||||
to={`/live-blogs/${liveBlog.slug}` as any}
|
to={`/live-blogs/${liveBlog.slug}`}
|
||||||
className="p-6 rounded-xl border bg-card hover:shadow-lg transition-shadow cursor-pointer block"
|
className="p-6 rounded-xl border bg-card hover:shadow-lg transition-shadow cursor-pointer block"
|
||||||
>
|
>
|
||||||
<div className="flex items-start justify-between mb-4">
|
<div className="flex items-start justify-between mb-4">
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/* eslint-disable react-refresh/only-export-components */
|
||||||
|
import { Article } from '@/lib/api';
|
||||||
|
|
||||||
|
interface SocialMetaTagsProps {
|
||||||
|
article: Article;
|
||||||
|
url?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SocialMetaTags({ article, url }: SocialMetaTagsProps) {
|
||||||
|
// This component doesn't render anything directly
|
||||||
|
// It's used to generate meta tags for TanStack Router's head API
|
||||||
|
// Mark props as used to avoid ESLint warnings
|
||||||
|
void article;
|
||||||
|
void url;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getSocialMetaTags(article: Article, url?: string) {
|
||||||
|
// Use article's social metadata if available, otherwise generate from article data
|
||||||
|
const ogTitle = article.ogTitle || article.title;
|
||||||
|
const ogDescription = article.ogDescription || article.excerpt || 'Latest news from Placebo.mk';
|
||||||
|
const ogImage = article.ogImage || article.featuredImage || '/placeholder-image.jpg';
|
||||||
|
const twitterTitle = article.twitterTitle || article.title;
|
||||||
|
const twitterDescription = article.twitterDescription || article.excerpt || 'Latest news from Placebo.mk';
|
||||||
|
const twitterImage = article.twitterImage || article.featuredImage || '/placeholder-image.jpg';
|
||||||
|
|
||||||
|
// Use provided URL or construct from article ID
|
||||||
|
const articleUrl = url || `${typeof window !== 'undefined' ? window.location.origin : ''}/articles/${article.id}`;
|
||||||
|
|
||||||
|
const metaTags = [
|
||||||
|
// Basic SEO
|
||||||
|
{ title: `${article.title} - Placebo.mk` },
|
||||||
|
{ name: 'description', content: ogDescription },
|
||||||
|
|
||||||
|
// Open Graph tags
|
||||||
|
{ property: 'og:title', content: ogTitle },
|
||||||
|
{ property: 'og:description', content: ogDescription },
|
||||||
|
{ property: 'og:image', content: ogImage },
|
||||||
|
{ property: 'og:url', content: articleUrl },
|
||||||
|
{ property: 'og:type', content: 'article' },
|
||||||
|
{ property: 'og:locale', content: 'mk_MK' },
|
||||||
|
|
||||||
|
// Twitter Card tags
|
||||||
|
{ name: 'twitter:card', content: 'summary_large_image' },
|
||||||
|
{ name: 'twitter:title', content: twitterTitle },
|
||||||
|
{ name: 'twitter:description', content: twitterDescription },
|
||||||
|
{ name: 'twitter:image', content: twitterImage },
|
||||||
|
|
||||||
|
// Article-specific tags
|
||||||
|
{ property: 'article:published_time', content: article.createdAt },
|
||||||
|
{ property: 'article:modified_time', content: article.updatedAt },
|
||||||
|
];
|
||||||
|
|
||||||
|
// Add author if available
|
||||||
|
if (article.author?.name) {
|
||||||
|
metaTags.push({ property: 'article:author', content: article.author.name });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add tags if available
|
||||||
|
if (article.tags && article.tags.length > 0) {
|
||||||
|
article.tags.forEach(tag => {
|
||||||
|
metaTags.push({ property: 'article:tag', content: tag });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
meta: metaTags,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
/* eslint-disable react-refresh/only-export-components */
|
||||||
|
import { createContext, useContext, useState, useEffect } from 'react';
|
||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import * as api from '../lib/api';
|
||||||
|
import type { User } from '@/types';
|
||||||
|
|
||||||
|
interface AuthContextType {
|
||||||
|
user: User | null;
|
||||||
|
token: string | null;
|
||||||
|
isLoading: boolean;
|
||||||
|
login: (username: string, password: string) => Promise<void>;
|
||||||
|
register: (username: string, email: string, password: string) => Promise<void>;
|
||||||
|
logout: () => void;
|
||||||
|
isAuthenticated: boolean;
|
||||||
|
hasRole: (role: string) => boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||||
|
|
||||||
|
interface AuthProviderProps {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AuthProvider({ children }: AuthProviderProps) {
|
||||||
|
const [user, setUser] = useState<User | null>(null);
|
||||||
|
const [token, setToken] = useState<string | null>(null);
|
||||||
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const initializeAuth = () => {
|
||||||
|
const storedToken = localStorage.getItem('token');
|
||||||
|
const storedUser = localStorage.getItem('user');
|
||||||
|
|
||||||
|
if (storedToken && storedUser) {
|
||||||
|
try {
|
||||||
|
setToken(storedToken);
|
||||||
|
setUser(JSON.parse(storedUser));
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to parse stored user:', error);
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('user');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsLoading(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
initializeAuth();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const login = async (username: string, password: string) => {
|
||||||
|
setIsLoading(true);
|
||||||
|
const response = await api.login({ username, password });
|
||||||
|
localStorage.setItem('token', response.access_token);
|
||||||
|
localStorage.setItem('user', JSON.stringify(response.user));
|
||||||
|
setToken(response.access_token);
|
||||||
|
setUser(response.user);
|
||||||
|
setIsLoading(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const register = async (username: string, email: string, password: string) => {
|
||||||
|
setIsLoading(true);
|
||||||
|
const response = await api.register({ username, email, password });
|
||||||
|
localStorage.setItem('token', response.access_token);
|
||||||
|
localStorage.setItem('user', JSON.stringify(response.user));
|
||||||
|
setToken(response.access_token);
|
||||||
|
setUser(response.user);
|
||||||
|
setIsLoading(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const logout = () => {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('user');
|
||||||
|
setToken(null);
|
||||||
|
setUser(null);
|
||||||
|
api.logout();
|
||||||
|
};
|
||||||
|
|
||||||
|
const isAuthenticated = !!user && !!token;
|
||||||
|
|
||||||
|
const hasRole = (role: string) => {
|
||||||
|
if (!user) return false;
|
||||||
|
return user.role === role;
|
||||||
|
};
|
||||||
|
|
||||||
|
const value = {
|
||||||
|
user,
|
||||||
|
token,
|
||||||
|
isLoading,
|
||||||
|
login,
|
||||||
|
register,
|
||||||
|
logout,
|
||||||
|
isAuthenticated,
|
||||||
|
hasRole,
|
||||||
|
};
|
||||||
|
|
||||||
|
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useAuth() {
|
||||||
|
const context = useContext(AuthContext);
|
||||||
|
if (context === undefined) {
|
||||||
|
throw new Error('useAuth must be used within an AuthProvider');
|
||||||
|
}
|
||||||
|
return context;
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useRef, useState, useMemo } from 'react';
|
||||||
|
|
||||||
export interface LiveBlogStreamEvent {
|
export interface LiveBlogStreamEvent {
|
||||||
type: 'connected' | 'update' | 'status-change' | 'pin-update' | 'error';
|
type: 'connected' | 'update' | 'status-change' | 'pin-update' | 'error';
|
||||||
@@ -16,13 +16,13 @@ export function useLiveBlogStream(
|
|||||||
liveBlogId: string,
|
liveBlogId: string,
|
||||||
options: LiveBlogStreamOptions = {}
|
options: LiveBlogStreamOptions = {}
|
||||||
) {
|
) {
|
||||||
const defaultOptions: LiveBlogStreamOptions = {
|
const defaultOptions = useMemo((): LiveBlogStreamOptions => ({
|
||||||
autoReconnect: true,
|
autoReconnect: true,
|
||||||
reconnectInterval: 3000,
|
reconnectInterval: 3000,
|
||||||
maxReconnectAttempts: 10,
|
maxReconnectAttempts: 10,
|
||||||
};
|
}), []);
|
||||||
|
|
||||||
const mergedOptions = { ...defaultOptions, ...options };
|
const mergedOptions = useMemo(() => ({ ...defaultOptions, ...options }), [options, defaultOptions]);
|
||||||
const [isConnected, setIsConnected] = useState(false);
|
const [isConnected, setIsConnected] = useState(false);
|
||||||
const [lastEvent, setLastEvent] = useState<LiveBlogStreamEvent | null>(null);
|
const [lastEvent, setLastEvent] = useState<LiveBlogStreamEvent | null>(null);
|
||||||
const [connectionError, setConnectionError] = useState<string | null>(null);
|
const [connectionError, setConnectionError] = useState<string | null>(null);
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import { useState, useCallback } from 'react';
|
||||||
|
import { type SharePlatform, type ShareData, getShareUrl, copyToClipboard } from '@/lib/social-utils';
|
||||||
|
import { trackShare } from '@/lib/analytics';
|
||||||
|
|
||||||
|
interface UseSocialShareOptions {
|
||||||
|
onSuccess?: (platform: SharePlatform) => void;
|
||||||
|
onError?: (platform: SharePlatform, error: Error) => void;
|
||||||
|
onCopySuccess?: () => void;
|
||||||
|
onCopyError?: (error: Error) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface UseSocialShareReturn {
|
||||||
|
isSharing: boolean;
|
||||||
|
isCopying: boolean;
|
||||||
|
lastSharedPlatform: SharePlatform | null;
|
||||||
|
share: (platform: SharePlatform, data: ShareData & { articleId: string }) => Promise<void>;
|
||||||
|
copyLink: (url: string) => Promise<boolean>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useSocialShare(options: UseSocialShareOptions = {}): UseSocialShareReturn {
|
||||||
|
const [isSharing, setIsSharing] = useState(false);
|
||||||
|
const [isCopying, setIsCopying] = useState(false);
|
||||||
|
const [lastSharedPlatform, setLastSharedPlatform] = useState<SharePlatform | null>(null);
|
||||||
|
|
||||||
|
const share = useCallback(async (
|
||||||
|
platform: SharePlatform,
|
||||||
|
data: ShareData & { articleId: string }
|
||||||
|
) => {
|
||||||
|
setIsSharing(true);
|
||||||
|
setLastSharedPlatform(platform);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Track the share event
|
||||||
|
await trackShare({
|
||||||
|
articleId: data.articleId,
|
||||||
|
platform,
|
||||||
|
userAgent: navigator.userAgent,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Call success callback
|
||||||
|
if (options.onSuccess) {
|
||||||
|
options.onSuccess(platform);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open share URL for social platforms (not for 'link')
|
||||||
|
if (platform !== 'link') {
|
||||||
|
const shareUrl = getShareUrl(platform, data);
|
||||||
|
window.open(shareUrl, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to share on ${platform}:`, error);
|
||||||
|
|
||||||
|
// Call error callback
|
||||||
|
if (options.onError) {
|
||||||
|
options.onError(platform, error as Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Still open the share URL even if tracking fails (for social platforms)
|
||||||
|
if (platform !== 'link') {
|
||||||
|
const shareUrl = getShareUrl(platform, data);
|
||||||
|
window.open(shareUrl, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setIsSharing(false);
|
||||||
|
}
|
||||||
|
}, [options]);
|
||||||
|
|
||||||
|
const copyLink = useCallback(async (url: string): Promise<boolean> => {
|
||||||
|
setIsCopying(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const success = await copyToClipboard(url);
|
||||||
|
|
||||||
|
if (success && options.onCopySuccess) {
|
||||||
|
options.onCopySuccess();
|
||||||
|
} else if (!success && options.onCopyError) {
|
||||||
|
options.onCopyError(new Error('Failed to copy to clipboard'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return success;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to copy link:', error);
|
||||||
|
|
||||||
|
if (options.onCopyError) {
|
||||||
|
options.onCopyError(error as Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
setIsCopying(false);
|
||||||
|
}
|
||||||
|
}, [options]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isSharing,
|
||||||
|
isCopying,
|
||||||
|
lastSharedPlatform,
|
||||||
|
share,
|
||||||
|
copyLink,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import { type SharePlatform } from './social-utils';
|
||||||
|
|
||||||
|
const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:3000';
|
||||||
|
|
||||||
|
export interface TrackShareParams {
|
||||||
|
articleId: string;
|
||||||
|
platform: SharePlatform;
|
||||||
|
userAgent?: string;
|
||||||
|
ipAddress?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const trackShare = async (params: TrackShareParams): Promise<boolean> => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/v1/analytics/share`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(params),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
console.warn('Failed to track share event:', response.statusText);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error tracking share event:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getShareStats = async (articleId?: string) => {
|
||||||
|
try {
|
||||||
|
const url = articleId
|
||||||
|
? `${API_BASE_URL}/api/v1/analytics/shares?articleId=${articleId}`
|
||||||
|
: `${API_BASE_URL}/api/v1/analytics/shares`;
|
||||||
|
|
||||||
|
const response = await fetch(url, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
credentials: 'include', // Include cookies for admin auth
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch share stats: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error fetching share stats:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getTopSharedArticles = async (limit: number = 10) => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/v1/analytics/shares/top?limit=${limit}`, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
credentials: 'include',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch top shared articles: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error fetching top shared articles:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getTotalShareStats = async () => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/v1/analytics/shares/total`, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
credentials: 'include',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch total share stats: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error fetching total share stats:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
+343
-41
@@ -4,6 +4,42 @@ const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:3000/api/
|
|||||||
console.log('API_BASE_URL:', API_BASE_URL);
|
console.log('API_BASE_URL:', API_BASE_URL);
|
||||||
console.log('VITE_API_URL env:', import.meta.env.VITE_API_URL);
|
console.log('VITE_API_URL env:', import.meta.env.VITE_API_URL);
|
||||||
|
|
||||||
|
// Helper function to get auth headers
|
||||||
|
function getAuthHeaders(): HeadersInit {
|
||||||
|
const token = localStorage.getItem('token');
|
||||||
|
const headers: HeadersInit = {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
};
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
headers['Authorization'] = `Bearer ${token}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return headers;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enhanced fetch wrapper
|
||||||
|
async function authFetch(url: string, options: RequestInit = {}): Promise<Response> {
|
||||||
|
const headers = getAuthHeaders();
|
||||||
|
|
||||||
|
const response = await fetch(url, {
|
||||||
|
...options,
|
||||||
|
headers: {
|
||||||
|
...headers,
|
||||||
|
...options.headers,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Handle 401 unauthorized
|
||||||
|
if (response.status === 401) {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('user');
|
||||||
|
window.location.href = '/auth';
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
export interface Article {
|
export interface Article {
|
||||||
id: string;
|
id: string;
|
||||||
title: string;
|
title: string;
|
||||||
@@ -110,7 +146,7 @@ export async function fetchArticles(params: FindArticlesParams = {}): Promise<Ar
|
|||||||
const url = `${API_BASE_URL}/articles?${searchParams}`;
|
const url = `${API_BASE_URL}/articles?${searchParams}`;
|
||||||
console.log('Fetching from:', url);
|
console.log('Fetching from:', url);
|
||||||
|
|
||||||
const response = await fetch(url);
|
const response = await authFetch(url);
|
||||||
console.log('Response status:', response.status, 'ok:', response.ok);
|
console.log('Response status:', response.status, 'ok:', response.ok);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -123,7 +159,7 @@ export async function fetchArticles(params: FindArticlesParams = {}): Promise<Ar
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchArticleBySlug(slug: string): Promise<Article> {
|
export async function fetchArticleBySlug(slug: string): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/slug/${slug}`);
|
const response = await authFetch(`${API_BASE_URL}/articles/slug/${slug}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch article');
|
throw new Error('Failed to fetch article');
|
||||||
}
|
}
|
||||||
@@ -131,7 +167,7 @@ export async function fetchArticleBySlug(slug: string): Promise<Article> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchArticleById(id: string): Promise<Article> {
|
export async function fetchArticleById(id: string): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/${id}`);
|
const response = await authFetch(`${API_BASE_URL}/articles/${id}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch article');
|
throw new Error('Failed to fetch article');
|
||||||
}
|
}
|
||||||
@@ -139,11 +175,8 @@ export async function fetchArticleById(id: string): Promise<Article> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function createArticle(dto: CreateArticleDto): Promise<Article> {
|
export async function createArticle(dto: CreateArticleDto): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles`, {
|
const response = await authFetch(`${API_BASE_URL}/articles`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -153,11 +186,8 @@ export async function createArticle(dto: CreateArticleDto): Promise<Article> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function updateArticle(id: string, dto: UpdateArticleDto): Promise<Article> {
|
export async function updateArticle(id: string, dto: UpdateArticleDto): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/${id}`, {
|
const response = await authFetch(`${API_BASE_URL}/articles/${id}`, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -167,7 +197,7 @@ export async function updateArticle(id: string, dto: UpdateArticleDto): Promise<
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteArticle(id: string): Promise<void> {
|
export async function deleteArticle(id: string): Promise<void> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/${id}`, {
|
const response = await authFetch(`${API_BASE_URL}/articles/${id}`, {
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -176,7 +206,7 @@ export async function deleteArticle(id: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function archiveArticle(id: string): Promise<Article> {
|
export async function archiveArticle(id: string): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/${id}/archive`, {
|
const response = await authFetch(`${API_BASE_URL}/articles/${id}/archive`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -186,7 +216,7 @@ export async function archiveArticle(id: string): Promise<Article> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function publishArticle(id: string, status: 'draft' | 'published' = 'published'): Promise<Article> {
|
export async function publishArticle(id: string, status: 'draft' | 'published' = 'published'): Promise<Article> {
|
||||||
const response = await fetch(`${API_BASE_URL}/articles/${id}/publish?status=${status}`, {
|
const response = await authFetch(`${API_BASE_URL}/articles/${id}/publish?status=${status}`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -323,7 +353,7 @@ export async function fetchLiveBlogs(params: FindLiveBlogsParams = {}): Promise<
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs?${searchParams}`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs?${searchParams}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch live blogs');
|
throw new Error('Failed to fetch live blogs');
|
||||||
}
|
}
|
||||||
@@ -331,7 +361,7 @@ export async function fetchLiveBlogs(params: FindLiveBlogsParams = {}): Promise<
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchLiveBlogBySlug(slug: string): Promise<LiveBlog> {
|
export async function fetchLiveBlogBySlug(slug: string): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/slug/${slug}`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/slug/${slug}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch live blog');
|
throw new Error('Failed to fetch live blog');
|
||||||
}
|
}
|
||||||
@@ -339,7 +369,7 @@ export async function fetchLiveBlogBySlug(slug: string): Promise<LiveBlog> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchLiveBlogById(id: string): Promise<LiveBlog> {
|
export async function fetchLiveBlogById(id: string): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${id}`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${id}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch live blog');
|
throw new Error('Failed to fetch live blog');
|
||||||
}
|
}
|
||||||
@@ -351,7 +381,7 @@ export async function fetchLiveBlogUpdates(
|
|||||||
page = 1,
|
page = 1,
|
||||||
limit = 50
|
limit = 50
|
||||||
): Promise<LiveBlogUpdatesResponse> {
|
): Promise<LiveBlogUpdatesResponse> {
|
||||||
const response = await fetch(
|
const response = await authFetch(
|
||||||
`${API_BASE_URL}/live-blogs/${liveBlogId}/updates?page=${page}&limit=${limit}`
|
`${API_BASE_URL}/live-blogs/${liveBlogId}/updates?page=${page}&limit=${limit}`
|
||||||
);
|
);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -361,7 +391,7 @@ export async function fetchLiveBlogUpdates(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchRecentLiveBlogs(): Promise<LiveBlog[]> {
|
export async function fetchRecentLiveBlogs(): Promise<LiveBlog[]> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/recent`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/recent`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch recent live blogs');
|
throw new Error('Failed to fetch recent live blogs');
|
||||||
}
|
}
|
||||||
@@ -369,7 +399,7 @@ export async function fetchRecentLiveBlogs(): Promise<LiveBlog[]> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchPinnedLiveBlogs(): Promise<LiveBlog[]> {
|
export async function fetchPinnedLiveBlogs(): Promise<LiveBlog[]> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/featured`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/featured`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch pinned live blogs');
|
throw new Error('Failed to fetch pinned live blogs');
|
||||||
}
|
}
|
||||||
@@ -377,7 +407,7 @@ export async function fetchPinnedLiveBlogs(): Promise<LiveBlog[]> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchActiveLiveBlogs(): Promise<LiveBlog[]> {
|
export async function fetchActiveLiveBlogs(): Promise<LiveBlog[]> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/active`);
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/active`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch active live blogs');
|
throw new Error('Failed to fetch active live blogs');
|
||||||
}
|
}
|
||||||
@@ -389,11 +419,8 @@ export async function createLiveBlogUpdate(
|
|||||||
liveBlogId: string,
|
liveBlogId: string,
|
||||||
dto: CreateLiveBlogUpdateDto
|
dto: CreateLiveBlogUpdateDto
|
||||||
): Promise<LiveBlogUpdate> {
|
): Promise<LiveBlogUpdate> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -407,11 +434,8 @@ export async function updateLiveBlogUpdate(
|
|||||||
updateId: string,
|
updateId: string,
|
||||||
dto: UpdateLiveBlogUpdateDto
|
dto: UpdateLiveBlogUpdateDto
|
||||||
): Promise<LiveBlogUpdate> {
|
): Promise<LiveBlogUpdate> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates/${updateId}`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates/${updateId}`, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -421,7 +445,7 @@ export async function updateLiveBlogUpdate(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteLiveBlogUpdate(liveBlogId: string, updateId: string): Promise<void> {
|
export async function deleteLiveBlogUpdate(liveBlogId: string, updateId: string): Promise<void> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates/${updateId}`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${liveBlogId}/updates/${updateId}`, {
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -430,11 +454,8 @@ export async function deleteLiveBlogUpdate(liveBlogId: string, updateId: string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function createLiveBlog(dto: CreateLiveBlogDto): Promise<LiveBlog> {
|
export async function createLiveBlog(dto: CreateLiveBlogDto): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -444,11 +465,8 @@ export async function createLiveBlog(dto: CreateLiveBlogDto): Promise<LiveBlog>
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function updateLiveBlog(id: string, dto: UpdateLiveBlogDto): Promise<LiveBlog> {
|
export async function updateLiveBlog(id: string, dto: UpdateLiveBlogDto): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${id}`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${id}`, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(dto),
|
body: JSON.stringify(dto),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -458,7 +476,7 @@ export async function updateLiveBlog(id: string, dto: UpdateLiveBlogDto): Promis
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteLiveBlog(id: string): Promise<void> {
|
export async function deleteLiveBlog(id: string): Promise<void> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${id}`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${id}`, {
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -467,7 +485,7 @@ export async function deleteLiveBlog(id: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function archiveLiveBlog(id: string): Promise<LiveBlog> {
|
export async function archiveLiveBlog(id: string): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${id}/archive`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${id}/archive`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -477,7 +495,7 @@ export async function archiveLiveBlog(id: string): Promise<LiveBlog> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function publishLiveBlog(id: string, status: 'draft' | 'live' | 'ended' = 'draft'): Promise<LiveBlog> {
|
export async function publishLiveBlog(id: string, status: 'draft' | 'live' | 'ended' = 'draft'): Promise<LiveBlog> {
|
||||||
const response = await fetch(`${API_BASE_URL}/live-blogs/${id}/publish?status=${status}`, {
|
const response = await authFetch(`${API_BASE_URL}/live-blogs/${id}/publish?status=${status}`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -485,3 +503,287 @@ export async function publishLiveBlog(id: string, status: 'draft' | 'live' | 'en
|
|||||||
}
|
}
|
||||||
return response.json();
|
return response.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Auth Types
|
||||||
|
import type { User, LoginDto, RegisterDto, AuthResponse } from '@/types';
|
||||||
|
|
||||||
|
// Auth API Functions
|
||||||
|
export async function login(dto: LoginDto): Promise<AuthResponse> {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/auth/login`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(dto),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const error = await response.json();
|
||||||
|
throw new Error(error.message || 'Login failed');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function register(dto: RegisterDto): Promise<AuthResponse> {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/auth/register`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(dto),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const error = await response.json();
|
||||||
|
throw new Error(error.message || 'Registration failed');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getProfile(): Promise<User> {
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/users/profile`, {
|
||||||
|
method: 'GET',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to fetch profile');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function logout(): Promise<void> {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('user');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Comment Types
|
||||||
|
export interface Comment {
|
||||||
|
id: string;
|
||||||
|
content: string;
|
||||||
|
articleId: string | null;
|
||||||
|
liveBlogId: string | null;
|
||||||
|
parentCommentId: string | null;
|
||||||
|
userId: string;
|
||||||
|
isVisible: boolean;
|
||||||
|
user?: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: string;
|
||||||
|
};
|
||||||
|
reactions?: {
|
||||||
|
likes: number;
|
||||||
|
dislikes: number;
|
||||||
|
};
|
||||||
|
replies?: Comment[];
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CreateCommentDto {
|
||||||
|
content: string;
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
parentCommentId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdateCommentDto {
|
||||||
|
content?: string;
|
||||||
|
isVisible?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FindCommentsParams {
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
parentCommentId?: string;
|
||||||
|
page?: number;
|
||||||
|
limit?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CommentsResponse {
|
||||||
|
data: Comment[];
|
||||||
|
total: number;
|
||||||
|
page?: number;
|
||||||
|
limit?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ReactionCounts {
|
||||||
|
likes: number;
|
||||||
|
dislikes: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CreateReactionDto {
|
||||||
|
type: 'like' | 'dislike';
|
||||||
|
articleId?: string;
|
||||||
|
liveBlogId?: string;
|
||||||
|
commentId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Comment API Functions
|
||||||
|
// Interface for backend comment response
|
||||||
|
interface BackendComment {
|
||||||
|
id: string;
|
||||||
|
content: string;
|
||||||
|
articleId: string | null;
|
||||||
|
liveBlogId: string | null;
|
||||||
|
parentId: string | null;
|
||||||
|
userId: string;
|
||||||
|
likeCount: number;
|
||||||
|
dislikeCount: number;
|
||||||
|
isVisible: boolean;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
user?: {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
};
|
||||||
|
replies?: BackendComment[];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Recursive function to map comment and its replies
|
||||||
|
function mapBackendComment(comment: BackendComment): Comment {
|
||||||
|
const mappedComment: Comment = {
|
||||||
|
...comment,
|
||||||
|
parentCommentId: comment.parentId,
|
||||||
|
// Ensure reactions object exists
|
||||||
|
reactions: {
|
||||||
|
likes: comment.likeCount || 0,
|
||||||
|
dislikes: comment.dislikeCount || 0,
|
||||||
|
},
|
||||||
|
// Recursively map replies if they exist
|
||||||
|
replies: comment.replies?.map(mapBackendComment) || [],
|
||||||
|
};
|
||||||
|
return mappedComment;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchComments(params: FindCommentsParams = {}): Promise<CommentsResponse> {
|
||||||
|
const searchParams = new URLSearchParams();
|
||||||
|
|
||||||
|
// Map parentCommentId to parentId for backend compatibility
|
||||||
|
const backendParams = { ...params };
|
||||||
|
if (backendParams.parentCommentId) {
|
||||||
|
backendParams.parentId = backendParams.parentCommentId;
|
||||||
|
delete backendParams.parentCommentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
Object.entries(backendParams).forEach(([key, value]) => {
|
||||||
|
if (value !== undefined && value !== null) {
|
||||||
|
if (typeof value === 'number') {
|
||||||
|
searchParams.append(key, value.toString());
|
||||||
|
} else {
|
||||||
|
searchParams.append(key, String(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/comments?${searchParams}`);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to fetch comments');
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
const mappedData = (data as BackendComment[]).map(mapBackendComment);
|
||||||
|
|
||||||
|
return {
|
||||||
|
data: mappedData,
|
||||||
|
total: mappedData.length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createComment(dto: CreateCommentDto): Promise<Comment> {
|
||||||
|
// Map parentCommentId to parentId for backend compatibility
|
||||||
|
const backendDto = {
|
||||||
|
content: dto.content,
|
||||||
|
articleId: dto.articleId,
|
||||||
|
liveBlogId: dto.liveBlogId,
|
||||||
|
parentId: dto.parentCommentId,
|
||||||
|
};
|
||||||
|
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/comments`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(backendDto),
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to create comment');
|
||||||
|
}
|
||||||
|
|
||||||
|
const comment = await response.json() as BackendComment;
|
||||||
|
|
||||||
|
// Map backend response to frontend interface
|
||||||
|
return mapBackendComment(comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function updateComment(id: string, dto: UpdateCommentDto): Promise<Comment> {
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/comments/${id}`, {
|
||||||
|
method: 'PUT',
|
||||||
|
body: JSON.stringify(dto),
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to update comment');
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteComment(id: string): Promise<void> {
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/comments/${id}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to delete comment');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addReaction(dto: CreateReactionDto): Promise<void> {
|
||||||
|
const response = await authFetch(`${API_BASE_URL}/comments/reactions`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(dto),
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to add reaction');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getReactionCounts(
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string
|
||||||
|
): Promise<ReactionCounts> {
|
||||||
|
const searchParams = new URLSearchParams();
|
||||||
|
|
||||||
|
if (articleId) searchParams.append('articleId', articleId);
|
||||||
|
if (liveBlogId) searchParams.append('liveBlogId', liveBlogId);
|
||||||
|
if (commentId) searchParams.append('commentId', commentId);
|
||||||
|
|
||||||
|
const url = `${API_BASE_URL}/comments/reactions/counts${searchParams.toString() ? `?${searchParams}` : ''}`;
|
||||||
|
const response = await authFetch(url);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to fetch reaction counts');
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUserReaction(
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string
|
||||||
|
): Promise<{ type: string | null }> {
|
||||||
|
const searchParams = new URLSearchParams();
|
||||||
|
|
||||||
|
if (articleId) searchParams.append('articleId', articleId);
|
||||||
|
if (liveBlogId) searchParams.append('liveBlogId', liveBlogId);
|
||||||
|
if (commentId) searchParams.append('commentId', commentId);
|
||||||
|
|
||||||
|
const url = `${API_BASE_URL}/comments/reactions/user${searchParams.toString() ? `?${searchParams}` : ''}`;
|
||||||
|
const response = await authFetch(url);
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
return { type: null };
|
||||||
|
}
|
||||||
|
throw new Error('Failed to fetch user reaction');
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
export type SharePlatform = 'facebook' | 'twitter' | 'whatsapp' | 'telegram' | 'email' | 'link';
|
||||||
|
|
||||||
|
export interface ShareData {
|
||||||
|
title: string;
|
||||||
|
url: string;
|
||||||
|
excerpt?: string;
|
||||||
|
image?: string;
|
||||||
|
tags?: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getShareUrl = (
|
||||||
|
platform: Exclude<SharePlatform, 'link'>,
|
||||||
|
data: ShareData
|
||||||
|
): string => {
|
||||||
|
const { title, url, excerpt } = data;
|
||||||
|
const encodedUrl = encodeURIComponent(url);
|
||||||
|
const encodedTitle = encodeURIComponent(title);
|
||||||
|
const encodedText = encodeURIComponent(excerpt ? `${title} - ${excerpt}` : title);
|
||||||
|
|
||||||
|
switch (platform) {
|
||||||
|
case 'facebook':
|
||||||
|
return `https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}`;
|
||||||
|
case 'twitter':
|
||||||
|
return `https://twitter.com/intent/tweet?url=${encodedUrl}&text=${encodedTitle}`;
|
||||||
|
case 'whatsapp':
|
||||||
|
return `https://wa.me/?text=${encodedText}%20${encodedUrl}`;
|
||||||
|
case 'telegram':
|
||||||
|
return `https://t.me/share/url?url=${encodedUrl}&text=${encodedTitle}`;
|
||||||
|
case 'email':
|
||||||
|
return `mailto:?subject=${encodedTitle}&body=${encodedUrl}`;
|
||||||
|
default:
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const copyToClipboard = async (text: string): Promise<boolean> => {
|
||||||
|
try {
|
||||||
|
if (navigator.clipboard && window.isSecureContext) {
|
||||||
|
await navigator.clipboard.writeText(text);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// Fallback for older browsers
|
||||||
|
const textArea = document.createElement('textarea');
|
||||||
|
textArea.value = text;
|
||||||
|
textArea.style.position = 'fixed';
|
||||||
|
textArea.style.left = '-999999px';
|
||||||
|
textArea.style.top = '-999999px';
|
||||||
|
document.body.appendChild(textArea);
|
||||||
|
textArea.focus();
|
||||||
|
textArea.select();
|
||||||
|
const success = document.execCommand('copy');
|
||||||
|
document.body.removeChild(textArea);
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to copy to clipboard:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPlatformIcon = (platform: SharePlatform): string => {
|
||||||
|
switch (platform) {
|
||||||
|
case 'facebook':
|
||||||
|
return 'Facebook';
|
||||||
|
case 'twitter':
|
||||||
|
return 'Twitter';
|
||||||
|
case 'whatsapp':
|
||||||
|
return 'MessageCircle';
|
||||||
|
case 'telegram':
|
||||||
|
return 'Send';
|
||||||
|
case 'email':
|
||||||
|
return 'Mail';
|
||||||
|
case 'link':
|
||||||
|
return 'Link';
|
||||||
|
default:
|
||||||
|
return 'Share2';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPlatformLabel = (platform: SharePlatform): string => {
|
||||||
|
switch (platform) {
|
||||||
|
case 'facebook':
|
||||||
|
return 'Facebook';
|
||||||
|
case 'twitter':
|
||||||
|
return 'Twitter';
|
||||||
|
case 'whatsapp':
|
||||||
|
return 'WhatsApp';
|
||||||
|
case 'telegram':
|
||||||
|
return 'Telegram';
|
||||||
|
case 'email':
|
||||||
|
return 'Email';
|
||||||
|
case 'link':
|
||||||
|
return 'Copy Link';
|
||||||
|
default:
|
||||||
|
return 'Share';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const generateSocialMetaTags = (data: ShareData & { articleId: string }) => {
|
||||||
|
const { title, excerpt, image, url } = data;
|
||||||
|
|
||||||
|
// Default values if not provided
|
||||||
|
const ogTitle = title || 'Placebo.mk - Sarcastic News from Macedonia';
|
||||||
|
const ogDescription = excerpt || 'Latest news and articles from Macedonia with a sarcastic twist';
|
||||||
|
const ogImage = image || '/placeholder-image.jpg';
|
||||||
|
const ogUrl = url || (typeof window !== 'undefined' ? window.location.href : '');
|
||||||
|
|
||||||
|
return {
|
||||||
|
ogTitle,
|
||||||
|
ogDescription,
|
||||||
|
ogImage,
|
||||||
|
ogUrl,
|
||||||
|
ogType: 'article' as const,
|
||||||
|
twitterCard: 'summary_large_image' as const,
|
||||||
|
twitterTitle: ogTitle,
|
||||||
|
twitterDescription: ogDescription,
|
||||||
|
twitterImage: ogImage,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const truncateForTwitter = (text: string, maxLength: number = 280): string => {
|
||||||
|
if (text.length <= maxLength) return text;
|
||||||
|
return text.substring(0, maxLength - 3) + '...';
|
||||||
|
};
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
/**
|
||||||
|
* Theme utilities for dark/light mode
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type Theme = 'light' | 'dark';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current theme from localStorage or system preference
|
||||||
|
*/
|
||||||
|
export function getInitialTheme(): Theme {
|
||||||
|
// Check localStorage first
|
||||||
|
const savedTheme = localStorage.getItem('theme') as Theme;
|
||||||
|
if (savedTheme) {
|
||||||
|
return savedTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check system preference
|
||||||
|
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||||
|
return 'dark';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default to light
|
||||||
|
return 'light';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply theme to document
|
||||||
|
*/
|
||||||
|
export function applyTheme(theme: Theme): void {
|
||||||
|
const root = document.documentElement;
|
||||||
|
|
||||||
|
if (theme === 'dark') {
|
||||||
|
root.classList.add('dark');
|
||||||
|
} else {
|
||||||
|
root.classList.remove('dark');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save to localStorage
|
||||||
|
localStorage.setItem('theme', theme);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize theme on page load
|
||||||
|
*/
|
||||||
|
export function initializeTheme(): void {
|
||||||
|
const theme = getInitialTheme();
|
||||||
|
applyTheme(theme);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle between light and dark themes
|
||||||
|
*/
|
||||||
|
export function toggleTheme(): Theme {
|
||||||
|
const currentTheme = getInitialTheme();
|
||||||
|
const newTheme = currentTheme === 'light' ? 'dark' : 'light';
|
||||||
|
applyTheme(newTheme);
|
||||||
|
return newTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Listen for system theme changes
|
||||||
|
*/
|
||||||
|
export function watchSystemTheme(callback: (theme: Theme) => void): () => void {
|
||||||
|
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
|
||||||
|
|
||||||
|
const handleChange = (e: MediaQueryListEvent) => {
|
||||||
|
// Only update if user hasn't set a preference in localStorage
|
||||||
|
if (!localStorage.getItem('theme')) {
|
||||||
|
const theme = e.matches ? 'dark' : 'light';
|
||||||
|
callback(theme);
|
||||||
|
applyTheme(theme);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
mediaQuery.addEventListener('change', handleChange);
|
||||||
|
|
||||||
|
// Return cleanup function
|
||||||
|
return () => mediaQuery.removeEventListener('change', handleChange);
|
||||||
|
}
|
||||||
@@ -3,13 +3,20 @@ import ReactDOM from 'react-dom/client'
|
|||||||
import { RouterProvider } from '@tanstack/react-router'
|
import { RouterProvider } from '@tanstack/react-router'
|
||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
import { router } from './routes'
|
import { router } from './routes'
|
||||||
|
import { AuthProvider } from './contexts/AuthContext'
|
||||||
|
import { initializeTheme } from './lib/theme'
|
||||||
|
|
||||||
|
// Initialize theme before rendering
|
||||||
|
initializeTheme();
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
|
<AuthProvider>
|
||||||
<RouterProvider router={router} />
|
<RouterProvider router={router} />
|
||||||
|
</AuthProvider>
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
</StrictMode>,
|
</StrictMode>,
|
||||||
)
|
)
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
||||||
|
import * as api from '../lib/api';
|
||||||
|
|
||||||
|
export function useLogin() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ username, password }: { username: string; password: string }) =>
|
||||||
|
api.login({ username, password }),
|
||||||
|
onSuccess: (data) => {
|
||||||
|
queryClient.setQueryData(['auth', 'user'], data.user);
|
||||||
|
queryClient.setQueryData(['auth', 'token'], data.access_token);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useRegister() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ username, email, password }: { username: string; email: string; password: string }) =>
|
||||||
|
api.register({ username, email, password }),
|
||||||
|
onSuccess: (data) => {
|
||||||
|
queryClient.setQueryData(['auth', 'user'], data.user);
|
||||||
|
queryClient.setQueryData(['auth', 'token'], data.access_token);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProfile() {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['auth', 'user'],
|
||||||
|
queryFn: api.getProfile,
|
||||||
|
enabled: false, // We'll manually trigger this when needed
|
||||||
|
retry: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useLogout() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: api.logout,
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.removeQueries({ queryKey: ['auth'] });
|
||||||
|
queryClient.clear();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
||||||
|
import * as api from '../lib/api';
|
||||||
|
|
||||||
|
export function useComments(params: api.FindCommentsParams = {}) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['comments', params],
|
||||||
|
queryFn: () => api.fetchComments(params),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useCreateComment() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: api.createComment,
|
||||||
|
onSuccess: (_data, variables) => {
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['comments', { articleId: variables.articleId }]
|
||||||
|
});
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['comments', { liveBlogId: variables.liveBlogId }]
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useUpdateComment() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ id, dto }: { id: string; dto: api.UpdateCommentDto }) =>
|
||||||
|
api.updateComment(id, dto),
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['comments'] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useDeleteComment() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: api.deleteComment,
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['comments'] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useReactionCounts(
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string
|
||||||
|
) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['reactions', 'counts', { articleId, liveBlogId, commentId }],
|
||||||
|
queryFn: () => api.getReactionCounts(articleId, liveBlogId, commentId),
|
||||||
|
enabled: !!articleId || !!liveBlogId || !!commentId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useUserReaction(
|
||||||
|
articleId?: string,
|
||||||
|
liveBlogId?: string,
|
||||||
|
commentId?: string
|
||||||
|
) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['reactions', 'user', { articleId, liveBlogId, commentId }],
|
||||||
|
queryFn: () => api.getUserReaction(articleId, liveBlogId, commentId),
|
||||||
|
enabled: !!articleId || !!liveBlogId || !!commentId,
|
||||||
|
retry: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useAddReaction() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: api.addReaction,
|
||||||
|
onSuccess: (_, variables) => {
|
||||||
|
// Invalidate both counts and user reaction queries
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['reactions', 'counts', {
|
||||||
|
articleId: variables.articleId,
|
||||||
|
liveBlogId: variables.liveBlogId,
|
||||||
|
commentId: variables.commentId
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['reactions', 'user', {
|
||||||
|
articleId: variables.articleId,
|
||||||
|
liveBlogId: variables.liveBlogId,
|
||||||
|
commentId: variables.commentId
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
+95
-27
@@ -7,8 +7,11 @@ import { LiveBlogDetailComponent } from './components/routes/LiveBlogDetailCompo
|
|||||||
import { LiveBlogAdminComponent } from './components/routes/LiveBlogAdminComponent'
|
import { LiveBlogAdminComponent } from './components/routes/LiveBlogAdminComponent'
|
||||||
import { CreateLiveBlogComponent } from './components/routes/CreateLiveBlogComponent'
|
import { CreateLiveBlogComponent } from './components/routes/CreateLiveBlogComponent'
|
||||||
import { AdminDashboardComponent } from './components/routes/AdminDashboardComponent'
|
import { AdminDashboardComponent } from './components/routes/AdminDashboardComponent'
|
||||||
|
import { AuthPage } from './components/routes/AuthPage'
|
||||||
import { LiveBlogTicker } from './components/features/live-blog/LiveBlogTicker'
|
import { LiveBlogTicker } from './components/features/live-blog/LiveBlogTicker'
|
||||||
import { PinnedLiveBlogSidebar } from './components/features/live-blog/PinnedLiveBlogSidebar'
|
import { PinnedLiveBlogSidebar } from './components/features/live-blog/PinnedLiveBlogSidebar'
|
||||||
|
import { ProtectedRoute } from './components/auth/ProtectedRoute'
|
||||||
|
import { Header } from './components/layout/Header'
|
||||||
import './styles.css'
|
import './styles.css'
|
||||||
|
|
||||||
const rootRoute = createRootRoute({
|
const rootRoute = createRootRoute({
|
||||||
@@ -22,30 +25,7 @@ const rootRoute = createRootRoute({
|
|||||||
}),
|
}),
|
||||||
component: () => (
|
component: () => (
|
||||||
<div className="min-h-screen bg-background text-foreground flex flex-col">
|
<div className="min-h-screen bg-background text-foreground flex flex-col">
|
||||||
<header className="border-b">
|
<Header />
|
||||||
<div className="container mx-auto max-w-6xl px-4 py-4">
|
|
||||||
<h1 className="text-3xl font-bold">
|
|
||||||
<Link to="/" className="hover:underline">Placebo.mk</Link>
|
|
||||||
</h1>
|
|
||||||
<nav className="flex gap-4">
|
|
||||||
<Link to="/" className="text-sm font-medium hover:underline">
|
|
||||||
Home
|
|
||||||
</Link>
|
|
||||||
<Link to="/articles" className="text-sm font-medium hover:underline">
|
|
||||||
Articles
|
|
||||||
</Link>
|
|
||||||
<Link to="/live-blogs" className="text-sm font-medium hover:underline">
|
|
||||||
Live
|
|
||||||
</Link>
|
|
||||||
<Link to="/admin" className="text-sm font-medium hover:underline text-primary">
|
|
||||||
Admin
|
|
||||||
</Link>
|
|
||||||
<Link to="/admin/live-blogs/create" className="text-sm font-medium hover:underline text-primary">
|
|
||||||
+ New Live Blog
|
|
||||||
</Link>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<main className="flex-1 container mx-auto max-w-6xl px-4 py-8">
|
<main className="flex-1 container mx-auto max-w-6xl px-4 py-8">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
@@ -219,6 +199,75 @@ const articleDetailRoute = createRoute({
|
|||||||
const { id } = articleDetailRoute.useParams()
|
const { id } = articleDetailRoute.useParams()
|
||||||
return <ArticleDetailComponent id={id} />
|
return <ArticleDetailComponent id={id} />
|
||||||
},
|
},
|
||||||
|
loader: async ({ params }) => {
|
||||||
|
// Fetch article data for meta tags
|
||||||
|
const response = await fetch(`${import.meta.env.VITE_API_URL || 'http://localhost:3000'}/api/v1/articles/${params.id}`)
|
||||||
|
if (!response.ok) {
|
||||||
|
return { article: null }
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
return { article: data.data }
|
||||||
|
},
|
||||||
|
head: ({ loaderData }) => {
|
||||||
|
const article = loaderData?.article
|
||||||
|
|
||||||
|
if (!article) {
|
||||||
|
return {
|
||||||
|
meta: [
|
||||||
|
{ title: 'Article Not Found - Placebo.mk' },
|
||||||
|
{ name: 'description', content: 'Article not found' },
|
||||||
|
],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use article's social metadata if available, otherwise generate from article data
|
||||||
|
const ogTitle = article.ogTitle || article.title
|
||||||
|
const ogDescription = article.ogDescription || article.excerpt || 'Latest news from Placebo.mk'
|
||||||
|
const ogImage = article.ogImage || article.featuredImage || '/placeholder-image.jpg'
|
||||||
|
const twitterTitle = article.twitterTitle || article.title
|
||||||
|
const twitterDescription = article.twitterDescription || article.excerpt || 'Latest news from Placebo.mk'
|
||||||
|
const twitterImage = article.twitterImage || article.featuredImage || '/placeholder-image.jpg'
|
||||||
|
|
||||||
|
const metaTags = [
|
||||||
|
// Basic SEO
|
||||||
|
{ title: `${article.title} - Placebo.mk` },
|
||||||
|
{ name: 'description', content: ogDescription },
|
||||||
|
|
||||||
|
// Open Graph tags
|
||||||
|
{ property: 'og:title', content: ogTitle },
|
||||||
|
{ property: 'og:description', content: ogDescription },
|
||||||
|
{ property: 'og:image', content: ogImage },
|
||||||
|
{ property: 'og:url', content: typeof window !== 'undefined' ? window.location.href : '' },
|
||||||
|
{ property: 'og:type', content: 'article' },
|
||||||
|
{ property: 'og:locale', content: 'mk_MK' },
|
||||||
|
|
||||||
|
// Twitter Card tags
|
||||||
|
{ name: 'twitter:card', content: 'summary_large_image' },
|
||||||
|
{ name: 'twitter:title', content: twitterTitle },
|
||||||
|
{ name: 'twitter:description', content: twitterDescription },
|
||||||
|
{ name: 'twitter:image', content: twitterImage },
|
||||||
|
|
||||||
|
// Article-specific tags
|
||||||
|
{ property: 'article:published_time', content: article.createdAt },
|
||||||
|
{ property: 'article:modified_time', content: article.updatedAt },
|
||||||
|
]
|
||||||
|
|
||||||
|
// Add author if available
|
||||||
|
if (article.author?.name) {
|
||||||
|
metaTags.push({ property: 'article:author', content: article.author.name })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add tags if available
|
||||||
|
if (article.tags && article.tags.length > 0) {
|
||||||
|
article.tags.forEach(tag => {
|
||||||
|
metaTags.push({ property: 'article:tag', content: tag })
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
meta: metaTags,
|
||||||
|
}
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const liveBlogsRoute = createRoute({
|
const liveBlogsRoute = createRoute({
|
||||||
@@ -236,25 +285,43 @@ const liveBlogDetailRoute = createRoute({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const authRoute = createRoute({
|
||||||
|
getParentRoute: () => rootRoute,
|
||||||
|
path: '/auth',
|
||||||
|
component: AuthPage,
|
||||||
|
})
|
||||||
|
|
||||||
const liveBlogAdminRoute = createRoute({
|
const liveBlogAdminRoute = createRoute({
|
||||||
getParentRoute: () => rootRoute,
|
getParentRoute: () => rootRoute,
|
||||||
path: '/admin/live-blogs/$slug',
|
path: '/admin/live-blogs/$slug',
|
||||||
component: () => {
|
component: () => {
|
||||||
const { slug } = liveBlogAdminRoute.useParams()
|
const { slug } = liveBlogAdminRoute.useParams()
|
||||||
return <LiveBlogAdminComponent slug={slug} />
|
return (
|
||||||
|
<ProtectedRoute requiredRole="admin">
|
||||||
|
<LiveBlogAdminComponent slug={slug} />
|
||||||
|
</ProtectedRoute>
|
||||||
|
)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const createLiveBlogRoute = createRoute({
|
const createLiveBlogRoute = createRoute({
|
||||||
getParentRoute: () => rootRoute,
|
getParentRoute: () => rootRoute,
|
||||||
path: '/admin/live-blogs/create',
|
path: '/admin/live-blogs/create',
|
||||||
component: CreateLiveBlogComponent,
|
component: () => (
|
||||||
|
<ProtectedRoute requiredRole="admin">
|
||||||
|
<CreateLiveBlogComponent />
|
||||||
|
</ProtectedRoute>
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
const adminDashboardRoute = createRoute({
|
const adminDashboardRoute = createRoute({
|
||||||
getParentRoute: () => rootRoute,
|
getParentRoute: () => rootRoute,
|
||||||
path: '/admin',
|
path: '/admin',
|
||||||
component: AdminDashboardComponent,
|
component: () => (
|
||||||
|
<ProtectedRoute requiredRole="admin">
|
||||||
|
<AdminDashboardComponent />
|
||||||
|
</ProtectedRoute>
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
const routeTree = rootRoute.addChildren([
|
const routeTree = rootRoute.addChildren([
|
||||||
@@ -263,6 +330,7 @@ const routeTree = rootRoute.addChildren([
|
|||||||
articleDetailRoute,
|
articleDetailRoute,
|
||||||
liveBlogsRoute,
|
liveBlogsRoute,
|
||||||
liveBlogDetailRoute,
|
liveBlogDetailRoute,
|
||||||
|
authRoute,
|
||||||
liveBlogAdminRoute,
|
liveBlogAdminRoute,
|
||||||
createLiveBlogRoute,
|
createLiveBlogRoute,
|
||||||
adminDashboardRoute,
|
adminDashboardRoute,
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
export type UserRole = 'admin' | 'contributor' | 'user';
|
||||||
|
|
||||||
|
export interface User {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
role: UserRole;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LoginDto {
|
||||||
|
username: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RegisterDto {
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuthResponse {
|
||||||
|
access_token: string;
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiError {
|
||||||
|
message: string;
|
||||||
|
statusCode: number;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export type { User, UserRole, LoginDto, RegisterDto, AuthResponse, ApiError } from './auth';
|
||||||
@@ -13,6 +13,12 @@ export default defineConfig({
|
|||||||
alias: {
|
alias: {
|
||||||
'@': path.resolve(__dirname, './src'),
|
'@': path.resolve(__dirname, './src'),
|
||||||
},
|
},
|
||||||
|
// For npm workspaces - look for dependencies in parent node_modules
|
||||||
|
preserveSymlinks: true,
|
||||||
|
},
|
||||||
|
// For npm workspaces - optimize dependencies from root
|
||||||
|
optimizeDeps: {
|
||||||
|
include: ['react', 'react-dom', 'react-markdown'],
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
host: true, // Listen on all addresses
|
host: true, // Listen on all addresses
|
||||||
|
|||||||
Generated
+658
-499
File diff suppressed because it is too large.
Load diff
Executable
+113
@@ -0,0 +1,113 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Test script for Strapi webhooks
|
||||||
|
# Usage: ./test-webhooks.sh [article-id]
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
echo -e "${YELLOW}=== Strapi Webhook Test Script ===${NC}\n"
|
||||||
|
|
||||||
|
# Default article ID (first article from Strapi)
|
||||||
|
DEFAULT_ARTICLE_ID="r07qatlpgvx82d7337n3nz1l"
|
||||||
|
ARTICLE_ID=${1:-$DEFAULT_ARTICLE_ID}
|
||||||
|
|
||||||
|
echo "Testing with article ID: $ARTICLE_ID"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Test 1: Check backend is running
|
||||||
|
echo -e "${YELLOW}1. Testing backend connectivity...${NC}"
|
||||||
|
if curl -s -f "http://localhost:3000/api/v1/articles" > /dev/null; then
|
||||||
|
echo -e "${GREEN}✓ Backend is running${NC}"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Backend is not accessible${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test 2: Check Strapi is running
|
||||||
|
echo -e "${YELLOW}2. Testing Strapi connectivity...${NC}"
|
||||||
|
if curl -s -f "http://localhost:1337/_health" > /dev/null 2>&1 || curl -s -f "http://localhost:1337/admin" > /dev/null; then
|
||||||
|
echo -e "${GREEN}✓ Strapi is running${NC}"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Strapi is not accessible${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test 3: Send test webhook
|
||||||
|
echo -e "${YELLOW}3. Sending test webhook...${NC}"
|
||||||
|
WEBHOOK_RESPONSE=$(curl -s -w "%{http_code}" -X POST "http://localhost:3000/api/v1/webhooks/strapi/article" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{
|
||||||
|
\"event\": \"entry.publish\",
|
||||||
|
\"model\": \"article\",
|
||||||
|
\"entry\": {
|
||||||
|
\"documentId\": \"$ARTICLE_ID\"
|
||||||
|
}
|
||||||
|
}")
|
||||||
|
|
||||||
|
# Extract status code and body
|
||||||
|
HTTP_STATUS=${WEBHOOK_RESPONSE: -3}
|
||||||
|
RESPONSE_BODY=${WEBHOOK_RESPONSE%???}
|
||||||
|
|
||||||
|
if [[ "$HTTP_STATUS" =~ ^2[0-9][0-9]$ ]]; then
|
||||||
|
echo -e "${GREEN}✓ Webhook sent successfully (HTTP $HTTP_STATUS)${NC}"
|
||||||
|
echo "Response: $RESPONSE_BODY"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Webhook failed (HTTP $HTTP_STATUS)${NC}"
|
||||||
|
echo "Response: $RESPONSE_BODY"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test 4: Check if article is in backend
|
||||||
|
echo -e "${YELLOW}4. Verifying article in backend...${NC}"
|
||||||
|
sleep 2 # Give backend time to process
|
||||||
|
|
||||||
|
ARTICLE_COUNT=$(curl -s "http://localhost:3000/api/v1/articles?status=published" | jq '.total // 0')
|
||||||
|
|
||||||
|
if [ "$ARTICLE_COUNT" -gt 0 ]; then
|
||||||
|
echo -e "${GREEN}✓ Backend has $ARTICLE_COUNT published article(s)${NC}"
|
||||||
|
|
||||||
|
# List articles
|
||||||
|
echo -e "\n${YELLOW}Articles in backend:${NC}"
|
||||||
|
curl -s "http://localhost:3000/api/v1/articles?status=published" | jq -r '.data[] | "• \(.title) (ID: \(.id))"'
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ No articles found in backend${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test 5: Check Strapi articles
|
||||||
|
echo -e "\n${YELLOW}5. Checking Strapi articles...${NC}"
|
||||||
|
STRAPI_TOKEN="578d628f62df967ff95f95bedb205b5d10bbf792340519c8c467d6473208e16b3918151a97b49fa2285a53df0ec8e340a9ca555b01a654bd22152847840e6a368ee626a6f1338ce2f23790c171013b263ec80fbaf116e2b459d3663b234d08855fd0eb631991ed15bb94f7dbb0b80f190352965c72c7fd327c73629ceff38fbb"
|
||||||
|
STRAPI_ARTICLES=$(curl -s -H "Authorization: Bearer $STRAPI_TOKEN" "http://localhost:1337/api/articles")
|
||||||
|
|
||||||
|
STRAPI_COUNT=$(echo "$STRAPI_ARTICLES" | jq '.data | length // 0')
|
||||||
|
|
||||||
|
if [ "$STRAPI_COUNT" -gt 0 ]; then
|
||||||
|
echo -e "${GREEN}✓ Strapi has $STRAPI_COUNT article(s)${NC}"
|
||||||
|
|
||||||
|
echo -e "\n${YELLOW}Articles in Strapi:${NC}"
|
||||||
|
echo "$STRAPI_ARTICLES" | jq -r '.data[] | "• \(.title) (Strapi ID: \(.documentId))"'
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ No articles found in Strapi${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "\n${YELLOW}=== Summary ===${NC}"
|
||||||
|
echo "Backend articles: $ARTICLE_COUNT"
|
||||||
|
echo "Strapi articles: $STRAPI_COUNT"
|
||||||
|
|
||||||
|
if [ "$ARTICLE_COUNT" -eq "$STRAPI_COUNT" ]; then
|
||||||
|
echo -e "${GREEN}✓ Sync appears to be working correctly!${NC}"
|
||||||
|
else
|
||||||
|
echo -e "${YELLOW}⚠ Article counts don't match. Manual sync may be needed.${NC}"
|
||||||
|
echo "Run: curl -X POST http://localhost:3000/api/v1/webhooks/strapi/sync/all -H \"Authorization: Bearer YOUR_TOKEN\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "\n${YELLOW}Next steps:${NC}"
|
||||||
|
echo "1. Configure webhooks in Strapi admin: http://localhost:1337/admin"
|
||||||
|
echo "2. Test by publishing an article in Strapi"
|
||||||
|
echo "3. Check backend logs: docker logs placebo-backend-dev --tail 20"
|
||||||
|
echo "4. Visit frontend: http://localhost:5173/articles"
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Test Article API</title>
|
||||||
|
<script>
|
||||||
|
async function testAPI() {
|
||||||
|
try {
|
||||||
|
const response = await fetch('http://localhost:3000/api/v1/articles?status=published');
|
||||||
|
const data = await response.json();
|
||||||
|
document.getElementById('result').innerHTML = `
|
||||||
|
<h2>API Test Result</h2>
|
||||||
|
<p>Status: ${response.status}</p>
|
||||||
|
<p>Articles found: ${data.total}</p>
|
||||||
|
<pre>${JSON.stringify(data.data[0], null, 2)}</pre>
|
||||||
|
`;
|
||||||
|
} catch (error) {
|
||||||
|
document.getElementById('result').innerHTML = `
|
||||||
|
<h2>Error</h2>
|
||||||
|
<p>${error.message}</p>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.onload = testAPI;
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Testing Article API</h1>
|
||||||
|
<div id="result">Loading...</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,10 +1,4 @@
|
|||||||
1. role based auth [admin, contributor, user]
|
|
||||||
2. [ ] video
|
|
||||||
3. social media integration [telegram, whatsup, facebook, viber]
|
3. social media integration [telegram, whatsup, facebook, viber]
|
||||||
4. share with functionality
|
4. share with functionality
|
||||||
|
5. admin dashboard enhancement
|
||||||
|
|
||||||
lets implement a role based auth
|
|
||||||
admin can create, edit and delete articles and liveblogs
|
|
||||||
admin can create contributors
|
|
||||||
contributors can create, edit and delete articles and liveblogs
|
|
||||||
user can react(like, dislike) to articles and write comments
|
|
||||||
Reference in new issue
Block a user