Новые изменения в проекте
This commit is contained in:
Web-serfer
parent
ecb720f751
commit
ddc0a26635
13 changed files with 950 additions and 48 deletions
22
backend/pb_migrations/1776691961_updated_reviews.js
Normal file
22
backend/pb_migrations/1776691961_updated_reviews.js
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"listRule": "status = \"published\" ",
|
||||||
|
"viewRule": "status = \"published\" "
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"listRule": "",
|
||||||
|
"viewRule": ""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
20
backend/pb_migrations/1776691976_updated_reviews.js
Normal file
20
backend/pb_migrations/1776691976_updated_reviews.js
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"createRule": "@request.auth.id != \"\""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"createRule": ""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
20
backend/pb_migrations/1776691990_updated_reviews.js
Normal file
20
backend/pb_migrations/1776691990_updated_reviews.js
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"updateRule": "user = @request.auth.id || @request.auth.id = \"admin_id\""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"updateRule": ""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
20
backend/pb_migrations/1776692012_updated_reviews.js
Normal file
20
backend/pb_migrations/1776692012_updated_reviews.js
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"deleteRule": "user = @request.auth.id || @request.auth.id = \"admin_id\" "
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_4163081445")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"deleteRule": null
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
57
backend/pb_migrations/1776696068_created_review_votes.js
Normal file
57
backend/pb_migrations/1776696068_created_review_votes.js
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = new Collection({
|
||||||
|
"createRule": null,
|
||||||
|
"deleteRule": null,
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"autogeneratePattern": "[a-z0-9]{15}",
|
||||||
|
"hidden": false,
|
||||||
|
"id": "text3208210256",
|
||||||
|
"max": 15,
|
||||||
|
"min": 15,
|
||||||
|
"name": "id",
|
||||||
|
"pattern": "^[a-z0-9]+$",
|
||||||
|
"presentable": false,
|
||||||
|
"primaryKey": true,
|
||||||
|
"required": true,
|
||||||
|
"system": true,
|
||||||
|
"type": "text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"hidden": false,
|
||||||
|
"id": "autodate2990389176",
|
||||||
|
"name": "created",
|
||||||
|
"onCreate": true,
|
||||||
|
"onUpdate": false,
|
||||||
|
"presentable": false,
|
||||||
|
"system": false,
|
||||||
|
"type": "autodate"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"hidden": false,
|
||||||
|
"id": "autodate3332085495",
|
||||||
|
"name": "updated",
|
||||||
|
"onCreate": true,
|
||||||
|
"onUpdate": true,
|
||||||
|
"presentable": false,
|
||||||
|
"system": false,
|
||||||
|
"type": "autodate"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"id": "pbc_362615506",
|
||||||
|
"indexes": [],
|
||||||
|
"listRule": null,
|
||||||
|
"name": "review_votes",
|
||||||
|
"system": false,
|
||||||
|
"type": "base",
|
||||||
|
"updateRule": null,
|
||||||
|
"viewRule": null
|
||||||
|
});
|
||||||
|
|
||||||
|
return app.save(collection);
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_362615506");
|
||||||
|
|
||||||
|
return app.delete(collection);
|
||||||
|
})
|
||||||
65
backend/pb_migrations/1776696147_updated_review_votes.js
Normal file
65
backend/pb_migrations/1776696147_updated_review_votes.js
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_362615506")
|
||||||
|
|
||||||
|
// add field
|
||||||
|
collection.fields.addAt(1, new Field({
|
||||||
|
"cascadeDelete": false,
|
||||||
|
"collectionId": "pbc_4163081445",
|
||||||
|
"hidden": false,
|
||||||
|
"id": "relation2034467270",
|
||||||
|
"maxSelect": 1,
|
||||||
|
"minSelect": 0,
|
||||||
|
"name": "review",
|
||||||
|
"presentable": false,
|
||||||
|
"required": false,
|
||||||
|
"system": false,
|
||||||
|
"type": "relation"
|
||||||
|
}))
|
||||||
|
|
||||||
|
// add field
|
||||||
|
collection.fields.addAt(2, new Field({
|
||||||
|
"cascadeDelete": false,
|
||||||
|
"collectionId": "_pb_users_auth_",
|
||||||
|
"hidden": false,
|
||||||
|
"id": "relation2375276105",
|
||||||
|
"maxSelect": 1,
|
||||||
|
"minSelect": 0,
|
||||||
|
"name": "user",
|
||||||
|
"presentable": false,
|
||||||
|
"required": false,
|
||||||
|
"system": false,
|
||||||
|
"type": "relation"
|
||||||
|
}))
|
||||||
|
|
||||||
|
// add field
|
||||||
|
collection.fields.addAt(3, new Field({
|
||||||
|
"hidden": false,
|
||||||
|
"id": "select1002219032",
|
||||||
|
"maxSelect": 1,
|
||||||
|
"name": "vote_type",
|
||||||
|
"presentable": false,
|
||||||
|
"required": false,
|
||||||
|
"system": false,
|
||||||
|
"type": "select",
|
||||||
|
"values": [
|
||||||
|
"likes",
|
||||||
|
"dislikes"
|
||||||
|
]
|
||||||
|
}))
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_362615506")
|
||||||
|
|
||||||
|
// remove field
|
||||||
|
collection.fields.removeById("relation2034467270")
|
||||||
|
|
||||||
|
// remove field
|
||||||
|
collection.fields.removeById("relation2375276105")
|
||||||
|
|
||||||
|
// remove field
|
||||||
|
collection.fields.removeById("select1002219032")
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
28
backend/pb_migrations/1776696207_updated_review_votes.js
Normal file
28
backend/pb_migrations/1776696207_updated_review_votes.js
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
/// <reference path="../pb_data/types.d.ts" />
|
||||||
|
migrate((app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_362615506")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"createRule": "@request.auth.id != \"\"",
|
||||||
|
"deleteRule": "user = @request.auth.id",
|
||||||
|
"listRule": "@request.auth.id != \"\"",
|
||||||
|
"updateRule": "user = @request.auth.id",
|
||||||
|
"viewRule": "@request.auth.id != \"\""
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
}, (app) => {
|
||||||
|
const collection = app.findCollectionByNameOrId("pbc_362615506")
|
||||||
|
|
||||||
|
// update collection data
|
||||||
|
unmarshal({
|
||||||
|
"createRule": null,
|
||||||
|
"deleteRule": null,
|
||||||
|
"listRule": null,
|
||||||
|
"updateRule": null,
|
||||||
|
"viewRule": null
|
||||||
|
}, collection)
|
||||||
|
|
||||||
|
return app.save(collection)
|
||||||
|
})
|
||||||
BIN
frontend/public/images/sc_pocketbase.jpg
Normal file
BIN
frontend/public/images/sc_pocketbase.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.9 MiB |
|
|
@ -1,6 +1,4 @@
|
||||||
---
|
---
|
||||||
import RatingStars from './RatingStars.astro';
|
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
name: string;
|
name: string;
|
||||||
profession: string;
|
profession: string;
|
||||||
|
|
@ -10,7 +8,7 @@ export interface Props {
|
||||||
color: string;
|
color: string;
|
||||||
date: string;
|
date: string;
|
||||||
votesCount?: number;
|
votesCount?: number;
|
||||||
isHelpful?: boolean;
|
reviewId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
|
@ -22,7 +20,7 @@ const {
|
||||||
color,
|
color,
|
||||||
date,
|
date,
|
||||||
votesCount = 0,
|
votesCount = 0,
|
||||||
isHelpful = false
|
reviewId = ''
|
||||||
} = Astro.props;
|
} = Astro.props;
|
||||||
|
|
||||||
// Форматируем дату
|
// Форматируем дату
|
||||||
|
|
@ -53,7 +51,18 @@ const formatDate = (dateStr: string) => {
|
||||||
|
|
||||||
<!-- Рейтинг отзыва -->
|
<!-- Рейтинг отзыва -->
|
||||||
<div class="review-rating">
|
<div class="review-rating">
|
||||||
<RatingStars rating={rating} size="md" />
|
<div class="rating-stars-display">
|
||||||
|
{[1, 2, 3, 4, 5].map((star) => (
|
||||||
|
<svg
|
||||||
|
class={`star ${star <= rating ? 'filled' : ''}`}
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill={star <= rating ? 'currentColor' : 'none'}
|
||||||
|
stroke="currentColor"
|
||||||
|
>
|
||||||
|
<path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z" />
|
||||||
|
</svg>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Текст отзыва -->
|
<!-- Текст отзыва -->
|
||||||
|
|
@ -62,26 +71,41 @@ const formatDate = (dateStr: string) => {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Блок голосования -->
|
<!-- Блок голосования -->
|
||||||
<div class="voting-section">
|
<div class="voting-section" data-review-id={reviewId}>
|
||||||
<p class="voting-question">Полезен ли этот отзыв?</p>
|
<p class="voting-question">Полезен ли этот отзыв?</p>
|
||||||
<div class="voting-stars">
|
<div class="voting-buttons">
|
||||||
<RatingStars rating={0} size="lg" interactive />
|
<button
|
||||||
|
type="button"
|
||||||
|
class="vote-btn vote-btn-up"
|
||||||
|
data-vote="like"
|
||||||
|
aria-label="Полезно"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="reaction-icon">
|
||||||
|
<path d="M7 10v12"></path>
|
||||||
|
<path d="M15 5.88 14 10h5.83a2 2 0 0 1 1.92 2.56l-2.33 8A2 2 0 0 1 17.5 22H4a2 2 0 0 1-2-2v-8a2 2 0 0 1 2-2h2.76a2 2 0 0 0 1.79-1.11L12 2a3.13 3.13 0 0 1 3 3.88Z"></path>
|
||||||
|
</svg>
|
||||||
|
<span class="vote-label">Да</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="vote-btn vote-btn-down"
|
||||||
|
data-vote="dislike"
|
||||||
|
aria-label="Бесполезно"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="reaction-icon">
|
||||||
|
<path d="M17 14V2"></path>
|
||||||
|
<path d="M9 18.12 10 14H4.17a2 2 0 0 1-1.92-2.56l2.33-8A2 2 0 0 1 6.5 2H20a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2h-2.76a2 2 0 0 0-1.79 1.11L12 22a3.13 3.13 0 0 1-3-3.88Z"></path>
|
||||||
|
</svg>
|
||||||
|
<span class="vote-label">Нет</span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="voting-stats">
|
<div class="voting-stats">
|
||||||
<span class="votes-count">
|
<span class="votes-count">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 20 20" fill="currentColor">
|
<svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 20 20" fill="currentColor">
|
||||||
<path d="M2 10.5a1.5 1.5 0 113 0v6a1.5 1.5 0 01-3 0v-6zM6 10.333v5.43a2 2 0 001.106 1.79l.05.025A4 4 0 008.943 18h5.416a2 2 0 001.962-1.608l1.2-6A2 2 0 0015.56 8H12V4a2 2 0 00-2-2 1 1 0 00-1 1v.667a4 4 0 01-.8 2.4L6.8 7.933a4 4 0 00-.8 2.4z" />
|
<path d="M2 10.5a1.5 1.5 0 113 0v6a1.5 1.5 0 01-3 0v-6zM6 10.333v5.43a2 2 0 001.106 1.79l.05.025A4 4 0 008.943 18h5.416a2 2 0 001.962-1.608l1.2-6A2 2 0 0015.56 8H12V4a2 2 0 00-2-2 1 1 0 00-1 1v.667a4 4 0 01-.8 2.4L6.8 7.933a4 4 0 00-.8 2.4z" />
|
||||||
</svg>
|
</svg>
|
||||||
{votesCount}
|
<span class="votes-number">{votesCount}</span>
|
||||||
</span>
|
</span>
|
||||||
{isHelpful && (
|
|
||||||
<span class="helpful-badge">
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 20 20" fill="currentColor">
|
|
||||||
<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
|
|
||||||
</svg>
|
|
||||||
Полезно
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
|
|
@ -160,6 +184,21 @@ const formatDate = (dateStr: string) => {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.rating-stars-display {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.125rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rating-stars-display .star {
|
||||||
|
width: 1.25rem;
|
||||||
|
height: 1.25rem;
|
||||||
|
color: #d1d5db;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rating-stars-display .star.filled {
|
||||||
|
color: #fbbf24;
|
||||||
|
}
|
||||||
|
|
||||||
.review-text {
|
.review-text {
|
||||||
color: #334155;
|
color: #334155;
|
||||||
line-height: 1.7;
|
line-height: 1.7;
|
||||||
|
|
@ -186,6 +225,83 @@ const formatDate = (dateStr: string) => {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.voting-auth-note {
|
||||||
|
color: #dc2626 !important;
|
||||||
|
font-size: 0.7rem !important;
|
||||||
|
font-style: italic;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voting-buttons {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.75rem;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.375rem;
|
||||||
|
padding: 0.5rem 0.875rem;
|
||||||
|
border: 2px solid #e2e8f0;
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
background: #ffffff;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #64748b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn svg {
|
||||||
|
width: 1.25rem;
|
||||||
|
height: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reaction-icon {
|
||||||
|
width: 1.25rem;
|
||||||
|
height: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn-up:hover,
|
||||||
|
.vote-btn-up.active {
|
||||||
|
border-color: #22c55e;
|
||||||
|
color: #22c55e;
|
||||||
|
background: rgba(34, 197, 94, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn-down:hover,
|
||||||
|
.vote-btn-down.active {
|
||||||
|
border-color: #ef4444;
|
||||||
|
color: #ef4444;
|
||||||
|
background: rgba(239, 68, 68, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-label {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.voting-buttons {
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn {
|
||||||
|
width: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-label {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.voting-stars {
|
.voting-stars {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -195,6 +311,7 @@ const formatDate = (dateStr: string) => {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
|
margin-top: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.votes-count {
|
.votes-count {
|
||||||
|
|
@ -211,6 +328,36 @@ const formatDate = (dateStr: string) => {
|
||||||
height: 1.125rem;
|
height: 1.125rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.auth-prompt {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 1rem;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
background: #1e293b;
|
||||||
|
color: #fff;
|
||||||
|
padding: 1rem 1.5rem;
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
||||||
|
z-index: 1000;
|
||||||
|
animation: fadeInUp 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-prompt a {
|
||||||
|
color: #d4af37;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeInUp {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateX(-50%) translateY(1rem);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateX(-50%) translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.helpful-badge {
|
.helpful-badge {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -248,6 +395,22 @@ const formatDate = (dateStr: string) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.voting-buttons {
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-btn {
|
||||||
|
width: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vote-label {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
.review-card {
|
.review-card {
|
||||||
padding: 1.5rem;
|
padding: 1.5rem;
|
||||||
|
|
@ -279,3 +442,124 @@ const formatDate = (dateStr: string) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function showAuthPrompt(section: Element) {
|
||||||
|
const votingSection = section as HTMLElement;
|
||||||
|
let authNote = votingSection.querySelector('.voting-auth-note');
|
||||||
|
if (!authNote) {
|
||||||
|
authNote = document.createElement('p');
|
||||||
|
authNote.className = 'voting-auth-note';
|
||||||
|
authNote.style.cssText = 'color: #dc2626 !important; font-size: 0.7rem !important; font-style: italic; margin: 0;';
|
||||||
|
authNote.innerHTML = 'Чтобы голосовать, <a href="/auth/sign-in">войдите</a> или <a href="/auth/sign-up">зарегистрируйтесь</a>';
|
||||||
|
votingSection.insertBefore(authNote, votingSection.querySelector('.voting-buttons'));
|
||||||
|
setTimeout(() => authNote?.remove(), 3000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
const votingSections = document.querySelectorAll('.voting-section');
|
||||||
|
|
||||||
|
votingSections.forEach(section => {
|
||||||
|
const reviewId = section.getAttribute('data-review-id');
|
||||||
|
const buttons = section.querySelectorAll('.vote-btn');
|
||||||
|
|
||||||
|
buttons.forEach(btn => {
|
||||||
|
btn.addEventListener('click', async () => {
|
||||||
|
const voteType = btn.getAttribute('data-vote');
|
||||||
|
|
||||||
|
if (!reviewId) {
|
||||||
|
showAuthPrompt(section);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
buttons.forEach(b => (b as HTMLButtonElement).disabled = true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch('/api/reviews/vote', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'include',
|
||||||
|
body: JSON.stringify({ review_id: reviewId, vote_type: voteType })
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status === 401) {
|
||||||
|
showAuthPrompt(section);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
buttons.forEach(b => b.classList.remove('active'));
|
||||||
|
btn.classList.add('active');
|
||||||
|
|
||||||
|
const votesNumber = section.querySelector('.votes-number');
|
||||||
|
if (votesNumber && typeof data.likes === 'number') {
|
||||||
|
votesNumber.textContent = data.likes.toString();
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('[ReviewCard] Vote failed:', err);
|
||||||
|
} finally {
|
||||||
|
buttons.forEach(b => (b as HTMLButtonElement).disabled = false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
document.addEventListener('astro:page-load', () => {
|
||||||
|
const votingSections = document.querySelectorAll('.voting-section');
|
||||||
|
|
||||||
|
votingSections.forEach(section => {
|
||||||
|
const buttons = section.querySelectorAll('.vote-btn');
|
||||||
|
|
||||||
|
buttons.forEach(btn => {
|
||||||
|
btn.addEventListener('click', async () => {
|
||||||
|
const voteType = btn.getAttribute('data-vote');
|
||||||
|
const reviewId = section.getAttribute('data-review-id');
|
||||||
|
|
||||||
|
if (!reviewId) {
|
||||||
|
showAuthPrompt(section);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
buttons.forEach(b => (b as HTMLButtonElement).disabled = true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch('/api/reviews/vote', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'include',
|
||||||
|
body: JSON.stringify({ review_id: reviewId, vote_type: voteType })
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status === 401) {
|
||||||
|
showAuthPrompt(section);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
buttons.forEach(b => b.classList.remove('active'));
|
||||||
|
btn.classList.add('active');
|
||||||
|
|
||||||
|
const votesNumber = section.querySelector('.votes-number');
|
||||||
|
if (votesNumber && typeof data.likes === 'number') {
|
||||||
|
votesNumber.textContent = data.likes.toString();
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('[ReviewCard] Vote failed:', err);
|
||||||
|
} finally {
|
||||||
|
buttons.forEach(b => (b as HTMLButtonElement).disabled = false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
|
||||||
146
frontend/src/components/reviews/ReviewsList.astro
Normal file
146
frontend/src/components/reviews/ReviewsList.astro
Normal file
|
|
@ -0,0 +1,146 @@
|
||||||
|
---
|
||||||
|
import ReviewCard from './ReviewCard.astro';
|
||||||
|
import VotingSummary from './VotingSummary.astro';
|
||||||
|
|
||||||
|
interface ReviewRecord {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
surname?: string;
|
||||||
|
profession?: string;
|
||||||
|
text: string;
|
||||||
|
rating: number;
|
||||||
|
status: string;
|
||||||
|
votesCount: number;
|
||||||
|
created: string;
|
||||||
|
expand?: {
|
||||||
|
user?: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
firstName?: string;
|
||||||
|
email: string;
|
||||||
|
avatar?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const POCKETBASE_URL = import.meta.env.POCKETBASE_URL || 'http://127.0.0.1:8090';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
status?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { status = 'published' } = Astro.props;
|
||||||
|
|
||||||
|
// Загрузка данных с сервера
|
||||||
|
let reviews: ReviewRecord[] = [];
|
||||||
|
let error: string | null = null;
|
||||||
|
let averageRating = 0;
|
||||||
|
let totalVotes = 0;
|
||||||
|
let totalReviews = 0;
|
||||||
|
let ratingDistribution: Record<number, number> = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 };
|
||||||
|
|
||||||
|
try {
|
||||||
|
const filter = `status = "${status}"`;
|
||||||
|
const expand = 'user';
|
||||||
|
const sort = '-created';
|
||||||
|
|
||||||
|
const response = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/reviews/records?expand=${expand}&filter=${encodeURIComponent(filter)}&sort=${sort}`
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
reviews = data.items || [];
|
||||||
|
|
||||||
|
// Расчёт статистики
|
||||||
|
totalReviews = reviews.length;
|
||||||
|
totalVotes = reviews.reduce((sum, r) => sum + (r.votesCount || 0), 0);
|
||||||
|
const totalRating = reviews.reduce((sum, r) => sum + r.rating, 0);
|
||||||
|
averageRating = totalReviews > 0 ? parseFloat((totalRating / totalReviews).toFixed(1)) : 0;
|
||||||
|
|
||||||
|
ratingDistribution = reviews.reduce((acc, r) => {
|
||||||
|
acc[r.rating] = (acc[r.rating] || 0) + 1;
|
||||||
|
return acc;
|
||||||
|
}, {} as Record<number, number>);
|
||||||
|
} else {
|
||||||
|
error = 'Не удалось загрузить отзывы';
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[ReviewsList] Error:', e);
|
||||||
|
error = 'Ошибка загрузки отзывов';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Цвета для аватарок
|
||||||
|
const colors = [
|
||||||
|
'bg-blue-100 text-blue-600', 'bg-teal-100 text-teal-600', 'bg-orange-100 text-orange-600',
|
||||||
|
'bg-pink-100 text-pink-600', 'bg-purple-100 text-purple-600', 'bg-indigo-100 text-indigo-600',
|
||||||
|
'bg-green-100 text-green-600', 'bg-yellow-100 text-yellow-600', 'bg-red-100 text-red-600'
|
||||||
|
];
|
||||||
|
|
||||||
|
const getAvatarInfo = (name: string) => {
|
||||||
|
const initial = name.charAt(0).toUpperCase();
|
||||||
|
const color = colors[initial.charCodeAt(0) % colors.length];
|
||||||
|
return { initial, color };
|
||||||
|
};
|
||||||
|
---
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<div class="text-center py-12 text-red-500">
|
||||||
|
<p>{error}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!error && (
|
||||||
|
<>
|
||||||
|
{reviews.length > 0 && (
|
||||||
|
<VotingSummary
|
||||||
|
averageRating={averageRating}
|
||||||
|
totalVotes={totalVotes}
|
||||||
|
totalReviews={totalReviews}
|
||||||
|
ratingDistribution={ratingDistribution}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div class="reviews-grid">
|
||||||
|
{reviews.length > 0 ? (
|
||||||
|
reviews.map((review) => {
|
||||||
|
const avatarInfo = getAvatarInfo(review.name);
|
||||||
|
const fullName = `${review.name} ${review.surname || ''}`.trim();
|
||||||
|
return (
|
||||||
|
<ReviewCard
|
||||||
|
name={fullName}
|
||||||
|
profession={review.profession || 'Клиент'}
|
||||||
|
text={review.text}
|
||||||
|
rating={review.rating}
|
||||||
|
initial={avatarInfo.initial}
|
||||||
|
color={avatarInfo.color}
|
||||||
|
date={review.created}
|
||||||
|
votesCount={review.votesCount || 0}
|
||||||
|
reviewId={review.id}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
<div class="text-center py-12 text-gray-500" style="grid-column: 1 / -1;">
|
||||||
|
<p>Пока нет отзывов. Будьте первым!</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.reviews-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
|
||||||
|
gap: 2rem;
|
||||||
|
margin: 3rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.reviews-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
gap: 1.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -16,8 +16,8 @@ const { averageRating, totalVotes, totalReviews, ratingDistribution } = Astro.pr
|
||||||
|
|
||||||
// Расчёт процентов для каждого рейтинга
|
// Расчёт процентов для каждого рейтинга
|
||||||
const getPercentage = (count: number) => {
|
const getPercentage = (count: number) => {
|
||||||
if (totalVotes === 0) return 0;
|
if (totalReviews === 0) return 0;
|
||||||
return Math.round((count / totalVotes) * 100);
|
return Math.round((count / totalReviews) * 100);
|
||||||
};
|
};
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
@ -45,7 +45,7 @@ const getPercentage = (count: number) => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="total-votes-text">
|
<p class="total-votes-text">
|
||||||
На основе <strong>{totalVotes}</strong> голосов
|
На основе <strong>{totalReviews}</strong> отзывов
|
||||||
</p>
|
</p>
|
||||||
<p class="total-reviews-text">
|
<p class="total-reviews-text">
|
||||||
<strong>{totalReviews}</strong> отзывов оставлено
|
<strong>{totalReviews}</strong> отзывов оставлено
|
||||||
|
|
@ -54,18 +54,21 @@ const getPercentage = (count: number) => {
|
||||||
|
|
||||||
<!-- Правая колонка - Распределение оценок -->
|
<!-- Правая колонка - Распределение оценок -->
|
||||||
<div class="distribution">
|
<div class="distribution">
|
||||||
{[5, 4, 3, 2, 1].map((rating) => (
|
{[5, 4, 3, 2, 1].map((rating) => {
|
||||||
|
const count = ratingDistribution[rating as keyof typeof ratingDistribution] || 0;
|
||||||
|
return (
|
||||||
<div class="distribution-row">
|
<div class="distribution-row">
|
||||||
<span class="rating-label">{rating} ★</span>
|
<span class="rating-label">{rating} ★</span>
|
||||||
<div class="progress-bar">
|
<div class="progress-bar">
|
||||||
<div
|
<div
|
||||||
class="progress-fill"
|
class="progress-fill"
|
||||||
style={`width: ${getPercentage(ratingDistribution[rating as keyof typeof ratingDistribution])}%`}
|
style={`width: ${getPercentage(count)}%`}
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
<span class="rating-count">{ratingDistribution[rating as keyof typeof ratingDistribution]}</span>
|
<span class="rating-count">{count}</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
252
frontend/src/pages/api/reviews/vote.ts
Normal file
252
frontend/src/pages/api/reviews/vote.ts
Normal file
|
|
@ -0,0 +1,252 @@
|
||||||
|
import type { APIRoute } from 'astro';
|
||||||
|
|
||||||
|
const POCKETBASE_URL = import.meta.env.POCKETBASE_URL || 'http://127.0.0.1:8090';
|
||||||
|
|
||||||
|
const POCKETBASE_ID_REGEX = /^[a-z0-9]{15}$/;
|
||||||
|
|
||||||
|
export const POST: APIRoute = async ({ request, cookies }) => {
|
||||||
|
try {
|
||||||
|
const token = cookies.get('pb_auth')?.value;
|
||||||
|
|
||||||
|
if (!token) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Требуется авторизация' }),
|
||||||
|
{ status: 401, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const authResponse = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/users/auth-refresh`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${token}`,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!authResponse.ok) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Недействительная сессия' }),
|
||||||
|
{ status: 401, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const authData = await authResponse.json();
|
||||||
|
const userId = authData.record?.id;
|
||||||
|
|
||||||
|
if (!userId || !POCKETBASE_ID_REGEX.test(userId)) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Ошибка идентификации пользователя' }),
|
||||||
|
{ status: 500, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = await request.json();
|
||||||
|
const { review_id, vote_type } = body;
|
||||||
|
|
||||||
|
if (!review_id || !POCKETBASE_ID_REGEX.test(review_id)) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Некорректный review_id' }),
|
||||||
|
{ status: 400, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vote_type || !['like', 'dislike'].includes(vote_type)) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Некорректный vote_type' }),
|
||||||
|
{ status: 400, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingVoteRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/review_votes/records?` +
|
||||||
|
new URLSearchParams({
|
||||||
|
filter: `review="${review_id}" && user="${userId}"`,
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
headers: { 'Authorization': `Bearer ${token}` },
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
let method = 'POST';
|
||||||
|
let url = `${POCKETBASE_URL}/api/collections/review_votes/records`;
|
||||||
|
let voteId = null;
|
||||||
|
let userVote: 'like' | 'dislike' | null = null;
|
||||||
|
|
||||||
|
if (existingVoteRes.ok) {
|
||||||
|
const existingData = await existingVoteRes.json();
|
||||||
|
if (existingData.items?.length > 0) {
|
||||||
|
const existing = existingData.items[0];
|
||||||
|
voteId = existing.id;
|
||||||
|
|
||||||
|
if (existing.vote_type === vote_type) {
|
||||||
|
method = 'DELETE';
|
||||||
|
url = `${POCKETBASE_URL}/api/collections/review_votes/records/${voteId}`;
|
||||||
|
} else {
|
||||||
|
method = 'PATCH';
|
||||||
|
url = `${POCKETBASE_URL}/api/collections/review_votes/records/${voteId}`;
|
||||||
|
userVote = vote_type;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const voteBody = method === 'POST'
|
||||||
|
? JSON.stringify({ review: review_id, user: userId, vote_type })
|
||||||
|
: method === 'PATCH'
|
||||||
|
? JSON.stringify({ vote_type })
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const voteRes = await fetch(url, {
|
||||||
|
method,
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${token}`,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: voteBody,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!voteRes.ok && method !== 'DELETE') {
|
||||||
|
const errorText = await voteRes.text();
|
||||||
|
console.error('[ReviewVote API] Failed to save vote:', errorText);
|
||||||
|
throw new Error('Failed to save vote');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (method === 'POST') userVote = vote_type;
|
||||||
|
if (method === 'DELETE') userVote = null;
|
||||||
|
|
||||||
|
const likesRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/review_votes/records?` +
|
||||||
|
new URLSearchParams({
|
||||||
|
filter: `review="${review_id}"`,
|
||||||
|
fields: 'vote_type',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
let likes = 0;
|
||||||
|
let dislikes = 0;
|
||||||
|
|
||||||
|
if (likesRes.ok) {
|
||||||
|
const votesData = await likesRes.json();
|
||||||
|
likes = votesData.items.filter((v: any) => v.vote_type === 'like').length;
|
||||||
|
dislikes = votesData.items.filter((v: any) => v.vote_type === 'dislike').length;
|
||||||
|
}
|
||||||
|
|
||||||
|
await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/reviews/records/${review_id}`,
|
||||||
|
{
|
||||||
|
method: 'PATCH',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${token}`,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ votesCount: likes }),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ likes, dislikes, userVote }),
|
||||||
|
{ status: 200, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[ReviewVote API] Error:', error);
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Внутренняя ошибка сервера' }),
|
||||||
|
{ status: 500, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const GET: APIRoute = async ({ url, cookies }) => {
|
||||||
|
try {
|
||||||
|
const reviewId = url.searchParams.get('review_id');
|
||||||
|
const token = cookies.get('pb_auth')?.value;
|
||||||
|
|
||||||
|
if (!reviewId || !POCKETBASE_ID_REGEX.test(reviewId)) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Некорректный review_id' }),
|
||||||
|
{ status: 400, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const reviewRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/reviews/records/${reviewId}`
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!reviewRes.ok) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Отзыв не найден' }),
|
||||||
|
{ status: 404, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const votesRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/review_votes/records?` +
|
||||||
|
new URLSearchParams({
|
||||||
|
filter: `review="${reviewId}"`,
|
||||||
|
fields: 'vote_type',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
let likes = 0;
|
||||||
|
let dislikes = 0;
|
||||||
|
|
||||||
|
if (votesRes.ok) {
|
||||||
|
const votesData = await votesRes.json();
|
||||||
|
likes = votesData.items.filter((v: any) => v.vote_type === 'like').length;
|
||||||
|
dislikes = votesData.items.filter((v: any) => v.vote_type === 'dislike').length;
|
||||||
|
}
|
||||||
|
|
||||||
|
let userVote: 'like' | 'dislike' | null = null;
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
try {
|
||||||
|
const authRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/users/auth-refresh`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Authorization': `Bearer ${token}` },
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (authRes.ok) {
|
||||||
|
const authData = await authRes.json();
|
||||||
|
const userId = authData.record?.id;
|
||||||
|
|
||||||
|
if (userId && POCKETBASE_ID_REGEX.test(userId)) {
|
||||||
|
const userVoteRes = await fetch(
|
||||||
|
`${POCKETBASE_URL}/api/collections/review_votes/records?` +
|
||||||
|
new URLSearchParams({
|
||||||
|
filter: `review="${reviewId}" && user="${userId}"`,
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
headers: { 'Authorization': `Bearer ${token}` },
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (userVoteRes.ok) {
|
||||||
|
const userVoteData = await userVoteRes.json();
|
||||||
|
if (userVoteData.items?.length > 0) {
|
||||||
|
userVote = userVoteData.items[0].vote_type;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[ReviewVote API] Error fetching user vote:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ likes, dislikes, userVote }),
|
||||||
|
{ status: 200, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[ReviewVote API GET] Error:', error);
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Внутренняя ошибка сервера' }),
|
||||||
|
{ status: 500, headers: { 'Content-Type': 'application/json' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -2,21 +2,8 @@
|
||||||
import Layout from '@layouts/Layout.astro';
|
import Layout from '@layouts/Layout.astro';
|
||||||
import { SITE_URL } from '@constants';
|
import { SITE_URL } from '@constants';
|
||||||
import PageHero from '@components/base/PageHero.astro';
|
import PageHero from '@components/base/PageHero.astro';
|
||||||
import Pagination from '@components/base/Pagination.astro';
|
|
||||||
import ReviewCard from '@components/reviews/ReviewCard.astro';
|
|
||||||
import ReviewFormContainer from '@components/reviews/ReviewFormContainer.tsx';
|
import ReviewFormContainer from '@components/reviews/ReviewFormContainer.tsx';
|
||||||
import ReviewsList from '@components/reviews/ReviewsList.tsx';
|
import ReviewsList from '@components/reviews/ReviewsList.astro';
|
||||||
import VotingSummary from '@components/reviews/VotingSummary.astro';
|
|
||||||
import AuthLockBlock from '@components/base/AuthLockBlock.astro';
|
|
||||||
import { reviewsData, votingSummary } from '@data/reviewsData';
|
|
||||||
|
|
||||||
const REVIEWS_PER_PAGE = 6;
|
|
||||||
const currentPage = 1;
|
|
||||||
const totalPages = Math.ceil(reviewsData.length / REVIEWS_PER_PAGE);
|
|
||||||
|
|
||||||
const startIndex = 0;
|
|
||||||
const endIndex = REVIEWS_PER_PAGE;
|
|
||||||
const paginatedReviews = reviewsData.slice(startIndex, endIndex);
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout
|
<Layout
|
||||||
|
|
@ -48,7 +35,7 @@ const paginatedReviews = reviewsData.slice(startIndex, endIndex);
|
||||||
<div class="site-container">
|
<div class="site-container">
|
||||||
|
|
||||||
<!-- Блок статистики голосования -->
|
<!-- Блок статистики голосования -->
|
||||||
<ReviewsList client:load />
|
<ReviewsList />
|
||||||
|
|
||||||
<!-- Форма для отзыва -->
|
<!-- Форма для отзыва -->
|
||||||
<section class="review-form-section">
|
<section class="review-form-section">
|
||||||
|
|
@ -208,11 +195,9 @@ const paginatedReviews = reviewsData.slice(startIndex, endIndex);
|
||||||
|
|
||||||
// Запуск
|
// Запуск
|
||||||
setupAnimations();
|
setupAnimations();
|
||||||
setupReviewForm();
|
|
||||||
|
|
||||||
// Для поддержки View Transitions в Astro
|
// Для поддержки View Transitions в Astro
|
||||||
document.addEventListener('astro:after-swap', () => {
|
document.addEventListener('astro:after-swap', () => {
|
||||||
setupAnimations();
|
setupAnimations();
|
||||||
setupReviewForm();
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue