Compare commits

...
6 Commits
11 changed files with 363 additions and 8 deletions
+3 -2
View File
@@ -20,14 +20,15 @@ func GetTopItems(c *gin.Context) {
results := []TopItem{}
err := database.DB.Table("order_items").
Select("items.name, SUM(order_items.price * order_items.quantity) AS revenue, order_items.price, SUM(order_items.quantity) as sale_quantity, items.unit").
Select("items.name, SUM(order_items.price * order_items.quantity) AS revenue, AVG(order_items.price) as price, SUM(order_items.quantity) as sale_quantity, items.unit").
Joins("JOIN items ON items.id = order_items.item_id").
Group("items.name, order_items.price, items.unit").
Group("items.name, items.unit").
Order("revenue DESC").
Limit(5).
Scan(&results).Error
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
c.JSON(http.StatusOK, results)
+64
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"net/http"
"path/filepath"
"time"
"github.com/disintegration/imaging"
"github.com/gin-gonic/gin"
@@ -169,3 +170,66 @@ func UploadItemAvatar(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"avatar_url": item.AvatarURL})
}
func GetAdminOrder(c *gin.Context) {
orderID := c.Param("id")
type OrderItemDetail struct {
ItemID uint `json:"item_id"`
Name string `json:"name"`
Quantity float64 `json:"quantity"`
Price float64 `json:"price"`
Unit string `json:"unit"`
}
type OrderHeader struct {
OrderID uint `json:"order_id"`
Address string `json:"address"`
Status string `json:"status"`
CreatedAt time.Time `json:"created_at"`
}
type OrderDetail struct {
OrderHeader
Items []OrderItemDetail `json:"items"`
Total float64 `json:"total"`
}
var header OrderHeader
err := database.DB.Table("orders").
Select("orders.id as order_id, orders.status, orders.created_at").
Where("orders.id = ?", orderID).
Scan(&header).Error
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if header.OrderID == 0 {
c.JSON(http.StatusNotFound, gin.H{"error": "заказ не найден"})
return
}
var items []OrderItemDetail
err = database.DB.Table("order_items").
Select("order_items.item_id, items.name, order_items.quantity, order_items.price, items.unit").
Joins("JOIN items ON items.id = order_items.item_id").
Where("order_items.order_id = ?", orderID).
Scan(&items).Error
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
order := OrderDetail{
OrderHeader: header,
Items: items,
}
for _, it := range items {
order.Total += it.Price * it.Quantity
}
c.JSON(http.StatusOK, order)
}
+1
View File
@@ -66,6 +66,7 @@ func main() {
admin.POST("/register", handlers.RegisterAdmin)
admin.GET("/orders", handlers.GetAllOrders)
admin.PATCH("/orders/:id", handlers.UpdateOrderStatus)
admin.GET("/orders/:id", handlers.GetAdminOrder)
admin.GET("/items/top", handlers.GetTopItems)
admin.PATCH("/items/:id/avatar", handlers.UploadItemAvatar)
admin.POST("/stock/in", handlers.StockIn)
+9
View File
@@ -10,6 +10,7 @@ import Cart from "./pages/Cart";
import Profile from "./pages/Profile";
import ItemPage from "./pages/ItemPage";
import AdminPage from "./pages/AdminPage";
import AdminOrderDetail from "./pages/AdminOrderPage";
const PrivateRoute = ({ children }) => {
const token = localStorage.getItem("token");
@@ -62,6 +63,14 @@ export default function App() {
</AdminRoute>
}
/>
<Route
path="/admin/orders/:id"
element={
<AdminRoute>
<AdminOrderDetail />
</AdminRoute>
}
/>
<Route path="items/:id" element={<ItemPage />} />
<Route path="*" element={<NotFoundPage />} />
</Routes>
+1
View File
@@ -71,3 +71,4 @@ export const stockOut = (data) =>
export const getStockMovements = () =>
axios.get(`${API_URL}/admin/stock/movements`);
export const getTopItems = () => axios.get(`${API_URL}/admin/items/top`);
export const getAdminOrder = (id) => axios.get(`${API_URL}/admin/orders/${id}`);
+7 -3
View File
@@ -1,9 +1,10 @@
import { useState, useEffect } from "react";
import { getAllOrders, updateOrderStatus } from "../api/index";
import { useNavigate, useParams } from "react-router-dom";
const STATUSES = [
{ value: "new", label: "Новый" },
{ value: "packed", label: "Собран" },
{ value: "packed", label: "Собран" },
{ value: "delivered", label: "Доставлен" },
{ value: "cancel", label: "Отменён" },
];
@@ -34,6 +35,8 @@ export default function AdminOrders() {
}
};
const navigate = useNavigate();
if (loading) return <p className="text-white/60">Загрузка...</p>;
return (
@@ -44,7 +47,8 @@ export default function AdminOrders() {
orders.map((order) => (
<div
key={order.id}
className="bg-white/5 rounded-lg p-4 border border-white/10"
className="bg-white/5 rounded-lg p-4 border border-white/10 hover:bg-white/10"
onClick={() => navigate(`/admin/orders/${order.id}`)}
>
{/* шапка: номер + селект статуса */}
<div className="flex justify-between items-center mb-3">
@@ -69,7 +73,7 @@ export default function AdminOrders() {
<img
src={`/static/items/${oi.item?.avatar_url}`}
alt=""
className="w-20 h-20 object-cover rounded shrink-0"
className="w-20 h-20 md:w-40 md:h-40 object-cover rounded shrink-0"
/>
<span className="grow">{oi.item?.name}</span>
<span className="whitespace-nowrap">
+28
View File
@@ -2,6 +2,15 @@ import { useNavigate } from "react-router-dom";
import BurgerClose from "./BurgerClose";
export default function BurgerMenu({ isOpen, onClose }) {
const raw = localStorage.getItem("user");
let user = null;
try {
user = raw ? JSON.parse(raw) : null;
} catch {
user = null;
}
const isAdmin = user?.role == "Админ";
const navigate = useNavigate();
return (
<div
@@ -55,6 +64,25 @@ export default function BurgerMenu({ isOpen, onClose }) {
>
контакты
</button>
{isAdmin && (
<>
<svg
width="4"
height="4"
viewBox="0 0 4 4"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="2" cy="2" r="2" fill="white" />
</svg>
<button
className="hover:text-gold duration-200 transition uppercase"
onClick={() => navigate("/admin")}
>
админ
</button>
</>
)}
</div>
</div>
</div>
+28
View File
@@ -3,6 +3,15 @@ import siteLogo from "../assets/Исходники/logo.png";
export default function FooterDesktop() {
const navigate = useNavigate();
const raw = localStorage.getItem("user");
let user = null;
try {
user = raw ? JSON.parse(raw) : null;
} catch {
user = null;
}
const isAdmin = user?.role == "Админ";
return (
<footer className="bg-light-blue w-full h-27.5 px-16 flex items-center justify-between ">
@@ -51,6 +60,25 @@ export default function FooterDesktop() {
>
контакты
</button>
{isAdmin && (
<>
<svg
width="4"
height="4"
viewBox="0 0 4 4"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="2" cy="2" r="2" fill="white" />
</svg>
<button
className="hover:text-gold duration-200 transition uppercase"
onClick={() => navigate("/admin")}
>
админ
</button>
</>
)}
</div>
<div className="flex items-center">
+30
View File
@@ -4,6 +4,16 @@ import siteLogo from "../assets/Исходники/logo.png";
export default function HeaderDesktop() {
const navigate = useNavigate();
const raw = localStorage.getItem("user");
let user = null;
try {
user = raw ? JSON.parse(raw) : null;
} catch {
user = null;
}
const isAdmin = user?.role == "Админ";
const handleProfileClick = () => {
const token = localStorage.getItem("token");
if (token) {
@@ -60,6 +70,26 @@ export default function HeaderDesktop() {
>
контакты
</button>
{isAdmin && (
<>
<svg
width="4"
height="4"
viewBox="0 0 4 4"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="2" cy="2" r="2" fill="white" />
</svg>
<button
className="hover:text-gold duration-200 transition uppercase"
onClick={() => navigate("/admin")}
>
админ
</button>
</>
)}
</div>
<div className="flex items-center">
+189
View File
@@ -0,0 +1,189 @@
import { useState, useEffect } from "react";
import { getAdminOrder } from "../api";
import { useParams, useNavigate } from "react-router-dom";
// Статусы заказа — ПОДСТАВЬ свои, если в БД они другие
const STATUSES = [
{ value: "new", label: "Новый" },
{ value: "prepared", label: "Собран" },
{ value: "shipped", label: "Отправлен" },
{ value: "delivered", label: "Доставлен" },
{ value: "canceled", label: "Отменён" },
];
export default function AdminOrderDetail({ orderId }) {
const [order, setOrder] = useState(null);
const [status, setStatus] = useState("");
const [items, setItems] = useState([]); // редактируемая копия позиций
const [loading, setLoading] = useState(false);
const [saving, setSaving] = useState(false);
const [error, setError] = useState("");
const { id } = useParams();
const navigate = useNavigate();
// Загружаем заказ при монтировании / смене orderId
useEffect(() => {
setError("");
setLoading(true);
getAdminOrder(id)
.then((res) => {
setOrder(res.data);
setStatus(res.data.status);
setItems((res.data.items ?? []).map((it) => ({ ...it })));
})
.catch((err) => {
setError(err.response?.data?.error ?? "Не удалось загрузить заказ");
})
.finally(() => { });
}, [orderId]);
function handleQuantityChange(itemId, value) {
setItems((prev) =>
prev.map((it) =>
it.item_id === itemId
? { ...it, quantity: value === "" ? "" : parseFloat(value) }
: it,
),
);
}
// Пересчёт итога на лету
const total = items.reduce((sum, it) => {
const q = typeof it.quantity === "number" ? it.quantity : 0;
return sum + it.price * q;
}, 0);
if (!loading) {
return <div className="p-6 text-slate-300">Загрузка заказа</div>;
}
if (!order) {
return (
<div className="p-6">
<p className="text-red-400">{error || "Заказ не найден"}</p>
<button
onClick={() => navigate("/admin")}
className="mt-4 text-slate-300 hover:text-white"
>
Назад к заказам
</button>
</div>
);
}
const created = order.created_at
? new Date(order.created_at).toLocaleString("ru-RU")
: "";
return (
<div className="max-w-2xl mx-auto p-4 sm:p-6">
{/* Шапка */}
<div className="flex items-center justify-between mb-6">
<button
onClick={() => navigate("/admin")}
className="text-slate-400 hover:text-white transition-colors"
>
Заказы
</button>
<h1 className="text-lg font-semibold text-white">
Заказ #{order.order_id}
</h1>
</div>
{error && (
<div className="mb-4 rounded-lg bg-red-500/10 border border-red-500/30 px-4 py-2 text-red-400 text-sm">
{error}
</div>
)}
{/* Мета заказа */}
<div className="rounded-xl bg-slate-800 p-4 mb-4 space-y-3">
{order.address && (
<div className="flex justify-between text-sm">
<span className="text-slate-400">Адрес</span>
<span className="text-slate-200">{order.address}</span>
</div>
)}
{created && (
<div className="flex justify-between text-sm">
<span className="text-slate-400">Создан</span>
<span className="text-slate-200">{created}</span>
</div>
)}
{/* Редактируемый статус */}
<div className="flex items-center justify-between">
<span className="text-slate-400 text-sm">Статус</span>
<select
value={status}
onChange={(e) => setStatus(e.target.value)}
className="bg-slate-700 text-white rounded-lg px-3 py-1.5 text-sm outline-none focus:ring-2 focus:ring-sky-500"
>
{STATUSES.map((s) => (
<option
key={s.value}
value={s.value}
className="bg-slate-800 text-white"
>
{s.label}
</option>
))}
</select>
</div>
</div>
{/* Позиции с редактируемым весом */}
<div className="rounded-xl bg-slate-800 divide-y divide-slate-700 mb-4">
{items.map((it) => (
<div key={it.item_id} className="flex items-center gap-3 p-4">
<div className="grow min-w-0">
<p className="text-white truncate">{it.name}</p>
<p className="text-slate-400 text-sm">
{it.price} / {it.unit}
</p>
</div>
<div className="shrink-0 flex items-center gap-2">
<input
type="number"
step="0.001"
min="0"
value={it.quantity}
onChange={(e) =>
handleQuantityChange(it.item_id, e.target.value)
}
className="w-20 bg-slate-700 text-white rounded-lg px-2 py-1.5 text-right outline-none focus:ring-2 focus:ring-sky-500"
/>
<span className="text-slate-400 text-sm w-8">{it.unit}</span>
</div>
<div className="shrink-0 w-24 text-right text-slate-200">
{(
it.price * (typeof it.quantity === "number" ? it.quantity : 0)
).toFixed(2)}{" "}
</div>
</div>
))}
</div>
{/* Итог */}
<div className="flex justify-between items-center px-4 mb-6">
<span className="text-slate-400">Итого</span>
<span className="text-xl font-semibold text-white">
{total.toFixed(2)}
</span>
</div>
{/* Сохранить */}
<button
disabled={saving}
className="w-full bg-sky-600 hover:bg-sky-500 disabled:opacity-50 text-white rounded-xl py-3 font-medium transition-colors"
>
{saving ? "Сохранение…" : "Сохранить изменения"}
</button>
</div>
);
}
+3 -3
View File
@@ -25,14 +25,14 @@ export default function AdminPage() {
</h1>
{/* Вкладки */}
<div className="flex gap-2 mb-8 border-b border-white/10">
<div className="flex overflow-x-auto whitespace-nowrap gap-2 mb-8 border-b border-white/10">
{tabs.map((t) => (
<button
key={t.key}
onClick={() => setTab(t.key)}
className={`px-4 py-2 text-sm uppercase transition-colors ${tab === t.key
? "text-white border-b-2 border-gold"
: "text-white/50 hover:text-white/80"
? "text-white border-b-2 border-gold"
: "text-white/50 hover:text-white/80"
}`}
>
{t.label}