THE LAST ONE BEFORE THE RELEASE
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { CartItems } from "@/components/cart-items"
|
||||
import { CartSummary } from "@/components/cart-summary"
|
||||
import { CheckoutForm } from "@/components/checkout-form"
|
||||
|
||||
export default function CartPage() {
|
||||
return (
|
||||
@@ -9,8 +9,8 @@ export default function CartPage() {
|
||||
<div className="flex-1">
|
||||
<CartItems />
|
||||
</div>
|
||||
<div className="w-full md:w-80">
|
||||
<CartSummary />
|
||||
<div className="w-full md:w-96">
|
||||
<CheckoutForm />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
13
frontend/style/app/checkout/page.tsx
Normal file
13
frontend/style/app/checkout/page.tsx
Normal file
@@ -0,0 +1,13 @@
|
||||
export default function CheckoutPage() {
|
||||
return (
|
||||
<div className="container mx-auto px-4 py-8">
|
||||
<h1 className="text-2xl font-bold mb-6">Оформление заказа</h1>
|
||||
<div className="max-w-2xl mx-auto">
|
||||
{/* Checkout form goes here */}
|
||||
<p>Форма оформления заказа</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ export default function LoginPage() {
|
||||
e.preventDefault()
|
||||
// In a real application, you would validate credentials here
|
||||
login()
|
||||
router.push("/cart")
|
||||
router.push("/")
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -26,13 +26,7 @@ export default function LoginPage() {
|
||||
<form onSubmit={handleSubmit} className="space-y-4 max-w-md mx-auto">
|
||||
<div>
|
||||
<Label htmlFor="email">Email</Label>
|
||||
<Input
|
||||
type="email"
|
||||
id="email"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<Input type="email" id="email" value={email} onChange={(e) => setEmail(e.target.value)} required />
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="password">Пароль</Label>
|
||||
@@ -44,7 +38,9 @@ export default function LoginPage() {
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<Button type="submit" className="w-full">Войти</Button>
|
||||
<Button type="submit" className="w-full">
|
||||
Войти
|
||||
</Button>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -1,32 +1,36 @@
|
||||
import { notFound } from 'next/navigation'
|
||||
import { notFound } from "next/navigation"
|
||||
import { ProductDetail } from "@/components/product-detail"
|
||||
import { SAMPLE_PRODUCTS } from "@/lib/sample-products"
|
||||
import { draftMode } from 'next/headers'
|
||||
import { cookies } from "next/headers"
|
||||
|
||||
async function getProduct(id: string, isDraft: boolean) {
|
||||
// In a real application, you would fetch the product from an API or database
|
||||
// For this example, we'll use the SAMPLE_PRODUCTS
|
||||
const product = SAMPLE_PRODUCTS.find(p => p.id === parseInt(id))
|
||||
const product = SAMPLE_PRODUCTS.find((p) => p.id === Number.parseInt(id))
|
||||
|
||||
if (!product) {
|
||||
return null
|
||||
}
|
||||
|
||||
if (isDraft) {
|
||||
// Simulate draft data
|
||||
return {
|
||||
...product,
|
||||
title: `[Draft] ${product.title}`,
|
||||
price: product.price * 0.9, // 10% discount in draft mode
|
||||
price: product.price * 0.9,
|
||||
}
|
||||
}
|
||||
|
||||
return product
|
||||
}
|
||||
|
||||
export default async function ProductPage({ params }: { params: { id: string } }) {
|
||||
const draftModeData = draftMode()
|
||||
const isDraftMode = draftModeData ? draftModeData.isEnabled : false
|
||||
interface ProductPageProps {
|
||||
params: { id: string }
|
||||
}
|
||||
|
||||
export default async function ProductPage({ params }: ProductPageProps) {
|
||||
// Get cookies first
|
||||
const cookieStore = await cookies()
|
||||
const isDraftMode = cookieStore.get("__prerender_bypass")?.value === process.env.PRERENDER_BYPASS_TOKEN
|
||||
|
||||
// Then get product
|
||||
const product = await getProduct(params.id, isDraftMode)
|
||||
|
||||
if (!product) {
|
||||
@@ -36,14 +40,7 @@ export default async function ProductPage({ params }: { params: { id: string } }
|
||||
return (
|
||||
<div className="container mx-auto px-4 py-8">
|
||||
<ProductDetail product={product} />
|
||||
{isDraftMode && (
|
||||
<div className="fixed bottom-0 left-0 w-full bg-yellow-400 text-black p-2 text-center">
|
||||
Preview Mode Enabled - {' '}
|
||||
<a className="underline" href={`/api/disable-preview?id=${params.id}`}>
|
||||
Exit Preview Mode
|
||||
</a>
|
||||
</div>
|
||||
)}
|
||||
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,11 +1,157 @@
|
||||
import { UserProfile } from "@/components/user-profile"
|
||||
"use client"
|
||||
|
||||
import { useState } from "react"
|
||||
import { useRouter } from "next/navigation"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import { Label } from "@/components/ui/label"
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
|
||||
import { useAuth } from "@/contexts/auth-context"
|
||||
|
||||
export default function AccountPage() {
|
||||
const [loginEmail, setLoginEmail] = useState("")
|
||||
const [loginPassword, setLoginPassword] = useState("")
|
||||
const [registerEmail, setRegisterEmail] = useState("")
|
||||
const [registerPassword, setRegisterPassword] = useState("")
|
||||
const [registerConfirmPassword, setRegisterConfirmPassword] = useState("")
|
||||
const [message, setMessage] = useState("")
|
||||
const { isLoggedIn, login, logout } = useAuth()
|
||||
const router = useRouter()
|
||||
|
||||
const handleLogin = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
try {
|
||||
const response = await fetch("http://localhost:8080/api/login", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({ email: loginEmail, password: loginPassword }),
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
if (response.ok) {
|
||||
login() // Обновляем контекст аутентификации
|
||||
setMessage(data.message)
|
||||
router.push("/") // Перенаправляем на основную страницу
|
||||
} else {
|
||||
setMessage(data.message || "Ошибка при входе")
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Ошибка сети:", error);
|
||||
setMessage("Ошибка сети")
|
||||
}
|
||||
}
|
||||
|
||||
const handleRegister = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
if (registerPassword !== registerConfirmPassword) {
|
||||
setMessage("Пароли не совпадают")
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const response = await fetch("http://localhost:8080/api/register", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({ email: registerEmail, password: registerPassword }),
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
if (response.ok) {
|
||||
login() // Обновляем контекст аутентификации после регистрации
|
||||
setMessage(data.message)
|
||||
router.push("/") // Перенаправляем на основную страницу
|
||||
} else {
|
||||
setMessage(data.message || "Ошибка при регистрации")
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Ошибка сети:", error);
|
||||
setMessage("Ошибка сети")
|
||||
}
|
||||
}
|
||||
|
||||
if (isLoggedIn) {
|
||||
return (
|
||||
<div className="container mx-auto px-4 py-8">
|
||||
<h1 className="text-2xl font-bold mb-6">Личный кабинет</h1>
|
||||
<p className="mb-4">Вы вошли в систему.</p>
|
||||
<Button onClick={logout}>Выйти</Button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default function ProfilePage() {
|
||||
return (
|
||||
<div className="container mx-auto px-4 py-8">
|
||||
<h1 className="text-2xl font-bold mb-6">Личный кабинет</h1>
|
||||
<UserProfile />
|
||||
{message && <p className="text-red-500 mb-4">{message}</p>}
|
||||
<Tabs defaultValue="login" className="max-w-md mx-auto">
|
||||
<TabsList className="grid w-full grid-cols-2">
|
||||
<TabsTrigger value="login">Вход</TabsTrigger>
|
||||
<TabsTrigger value="register">Регистрация</TabsTrigger>
|
||||
</TabsList>
|
||||
<TabsContent value="login">
|
||||
<form onSubmit={handleLogin} className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="login-email">Email</Label>
|
||||
<Input
|
||||
id="login-email"
|
||||
type="email"
|
||||
value={loginEmail}
|
||||
onChange={(e) => setLoginEmail(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="login-password">Пароль</Label>
|
||||
<Input
|
||||
id="login-password"
|
||||
type="password"
|
||||
value={loginPassword}
|
||||
onChange={(e) => setLoginPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<Button type="submit" className="w-full">Войти</Button>
|
||||
</form>
|
||||
</TabsContent>
|
||||
<TabsContent value="register">
|
||||
<form onSubmit={handleRegister} className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="register-email">Email</Label>
|
||||
<Input
|
||||
id="register-email"
|
||||
type="email"
|
||||
value={registerEmail}
|
||||
onChange={(e) => setRegisterEmail(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="register-password">Пароль</Label>
|
||||
<Input
|
||||
id="register-password"
|
||||
type="password"
|
||||
value={registerPassword}
|
||||
onChange={(e) => setRegisterPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="register-confirm-password">Подтвердите пароль</Label>
|
||||
<Input
|
||||
id="register-confirm-password"
|
||||
type="password"
|
||||
value={registerConfirmPassword}
|
||||
onChange={(e) => setRegisterConfirmPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<Button type="submit" className="w-full">Зарегистрироваться</Button>
|
||||
</form>
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
160
frontend/style/app/profile/register.go
Normal file
160
frontend/style/app/profile/register.go
Normal file
@@ -0,0 +1,160 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"github.com/gorilla/handlers"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
ID int `json:"id"`
|
||||
Email string `json:"email"`
|
||||
Password string `json:"password"`
|
||||
}
|
||||
|
||||
var db *sql.DB
|
||||
|
||||
func initDB() {
|
||||
var err error
|
||||
dbFile := "users.db"
|
||||
db, err = sql.Open("sqlite3", dbFile)
|
||||
if err != nil {
|
||||
log.Fatal("Ошибка подключения к базе данных:", err)
|
||||
}
|
||||
|
||||
createTableQuery := `
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
password TEXT NOT NULL
|
||||
);`
|
||||
_, err = db.Exec(createTableQuery)
|
||||
if err != nil {
|
||||
log.Fatal("Ошибка при создании таблицы:", err)
|
||||
}
|
||||
fmt.Println("База данных готова к работе.")
|
||||
}
|
||||
|
||||
func registerHandler(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("Received request with method: %s", r.Method)
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "Метод не поддерживается", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var user User
|
||||
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
|
||||
http.Error(w, "Ошибка обработки JSON", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if user.Email == "" || user.Password == "" {
|
||||
http.Error(w, "Email и пароль обязательны", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
insertQuery := `INSERT INTO users (email, password) VALUES (?, ?)`
|
||||
_, err := db.Exec(insertQuery, user.Email, user.Password)
|
||||
if err != nil {
|
||||
http.Error(w, "Ошибка записи в базу данных", http.StatusInternalServerError)
|
||||
fmt.Println("Ошибка:", err)
|
||||
return
|
||||
}
|
||||
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
json.NewEncoder(w).Encode(map[string]string{"message": "Пользователь успешно зарегистрирован", "email": user.Email})
|
||||
}
|
||||
|
||||
func loginHandler(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("Received request with method: %s", r.Method)
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "Метод не поддерживается", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var user User
|
||||
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
|
||||
http.Error(w, "Ошибка обработки JSON", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if user.Email == "" || user.Password == "" {
|
||||
http.Error(w, "Email и пароль обязательны", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
query := `SELECT id, email, password FROM users WHERE email = ? AND password = ?`
|
||||
var dbUser User
|
||||
err := db.QueryRow(query, user.Email, user.Password).Scan(&dbUser.ID, &dbUser.Email, &dbUser.Password)
|
||||
if err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
http.Error(w, "Неверные учетные данные", http.StatusUnauthorized)
|
||||
} else {
|
||||
http.Error(w, "Ошибка при проверке учетных данных", http.StatusInternalServerError)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]string{"message": "Вход успешен", "email": dbUser.Email})
|
||||
}
|
||||
|
||||
func getUsersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("Received request with method: %s", r.Method)
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "Метод не поддерживается", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
rows, err := db.Query(`SELECT id, email, password FROM users`)
|
||||
if err != nil {
|
||||
http.Error(w, "Ошибка чтения из базы данных", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var users []User
|
||||
for rows.Next() {
|
||||
var user User
|
||||
if err := rows.Scan(&user.ID, &user.Email, &user.Password); err != nil {
|
||||
http.Error(w, "Ошибка обработки данных", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
users = append(users, user)
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(users)
|
||||
}
|
||||
|
||||
func main() {
|
||||
initDB()
|
||||
defer db.Close()
|
||||
|
||||
// Setup CORS
|
||||
cors := handlers.CORS(
|
||||
handlers.AllowedOrigins([]string{"*"}),
|
||||
handlers.AllowedMethods([]string{"GET", "POST"}),
|
||||
handlers.AllowedHeaders([]string{"Content-Type"}),
|
||||
)
|
||||
|
||||
// Register handlers
|
||||
http.HandleFunc("/api/register", registerHandler)
|
||||
http.HandleFunc("/api/login", loginHandler)
|
||||
http.HandleFunc("/api/users", getUsersHandler)
|
||||
|
||||
// Start server with CORS middleware
|
||||
port := os.Getenv("PORT")
|
||||
if port == "" {
|
||||
port = "8080"
|
||||
}
|
||||
|
||||
fmt.Println("Go-сервер запущен на порту", port)
|
||||
log.Fatal(http.ListenAndServe(":"+port, cors(http.DefaultServeMux)))
|
||||
}
|
||||
BIN
frontend/style/app/profile/users.db
Normal file
BIN
frontend/style/app/profile/users.db
Normal file
Binary file not shown.
Reference in New Issue
Block a user