Index: kupi-mk/backend/routes/users.js =================================================================== --- kupi-mk/backend/routes/users.js (revision c3904bd1b397a993305af9f3a3d2338d73d7288f) +++ kupi-mk/backend/routes/users.js (revision bfc4bbc3a64bdafba2745cc5cc1af602bae674ec) @@ -48,3 +48,64 @@ }); +// Update user profile +router.put('/profile', auth, async (req, res) => { + try { + const userId = req.user.userId; + const { username, first_name, last_name, phone, address } = req.body; + + // Check if username is already taken by another user + if (username) { + const existingUser = await pool.query( + 'SELECT id FROM users WHERE username = $1 AND id != $2', + [username, userId] + ); + + if (existingUser.rows.length > 0) { + return res.status(400).json({ message: 'Username is already taken' }); + } + } + + const updatedUser = await pool.query(` + UPDATE users + SET username = $1, first_name = $2, last_name = $3, phone = $4, address = $5, updated_at = NOW() + WHERE id = $6 + RETURNING id, username, email, first_name, last_name, phone, address, is_seller, created_at + `, [username, first_name, last_name, phone, address, userId]); + + if (updatedUser.rows.length === 0) { + return res.status(404).json({ message: 'User not found' }); + } + + res.json(updatedUser.rows[0]); + + } catch (err) { + console.error(err); + res.status(500).json({ message: 'Server error' }); + } +}); + +// Update user to become seller +router.patch('/become-seller', auth, async (req, res) => { + try { + const userId = req.user.userId; + + const updatedUser = await pool.query(` + UPDATE users + SET is_seller = true, updated_at = NOW() + WHERE id = $1 + RETURNING id, username, email, first_name, last_name, phone, address, is_seller, created_at + `, [userId]); + + if (updatedUser.rows.length === 0) { + return res.status(404).json({ message: 'User not found' }); + } + + res.json(updatedUser.rows[0]); + + } catch (err) { + console.error(err); + res.status(500).json({ message: 'Server error' }); + } +}); + module.exports = router; Index: kupi-mk/frontend/src/pages/Home.js =================================================================== --- kupi-mk/frontend/src/pages/Home.js (revision c3904bd1b397a993305af9f3a3d2338d73d7288f) +++ kupi-mk/frontend/src/pages/Home.js (revision bfc4bbc3a64bdafba2745cc5cc1af602bae674ec) @@ -1,8 +1,12 @@ import React, { useState, useEffect } from 'react'; +import { useNavigate } from 'react-router-dom'; import { useProducts } from '../context/ProductContext'; +import { useAuth } from '../context/AuthContext'; import ProductCard from '../components/ProductCard'; const Home = () => { + const navigate = useNavigate(); const { products, loading, fetchProducts, categories, fetchCategories } = useProducts(); + const { user, isAuthenticated } = useAuth(); const [selectedCategory, setSelectedCategory] = useState(''); const [searchTerm, setSearchTerm] = useState(''); @@ -27,4 +31,12 @@ if (searchTerm) filters.search = searchTerm; fetchProducts(filters); + }; + + const handleBecomeSeller = () => { + if (isAuthenticated()) { + navigate('/profile'); + } else { + navigate('/login'); + } }; @@ -108,6 +120,7 @@ {selectedCategory ? 'Филтрирани производи' : 'Најнови производи'} + {/* prikazuva broj na proizvodi */} - {products.length} производи // prikazuva broj na proizvodi + {products.length} производи @@ -144,16 +157,21 @@ - {/* Call to Action */} -
-

- Продавате производи? -

-

- Придружете се на нашата платформа и достигнете до илјадници потенцијални купувачи -

- -
+ {/* Call to Action - Only show for non-sellers */} + {(!isAuthenticated() || !user?.is_seller) && ( +
+

+ Продавате производи? +

+

+ Придружете се на нашата платформа и достигнете до илјадници потенцијални купувачи +

+ +
+ )} ); Index: kupi-mk/frontend/src/pages/ProductDetail.js =================================================================== --- kupi-mk/frontend/src/pages/ProductDetail.js (revision c3904bd1b397a993305af9f3a3d2338d73d7288f) +++ kupi-mk/frontend/src/pages/ProductDetail.js (revision bfc4bbc3a64bdafba2745cc5cc1af602bae674ec) @@ -42,4 +42,27 @@ setTimeout(() => setShowShareMessage(false), 3000); }); + }; + + const handleEmailContact = () => { + if (product.email) { + const subject = `Интерес за: ${product.title}`; + const body = `Здраво ${product.first_name},\n\nЗаинтересиран/а сум за вашиот производ "${product.title}".\n\nЛинк на производот: ${window.location.href}\n\nВи благодарам!\n`; + const mailtoLink = `mailto:${product.email}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`; + window.location.href = mailtoLink; + } else { + alert('Email адресата на продавачот не е достапна'); + } + }; + + const handleWhatsAppContact = () => { + if (product.phone) { + // Remove any non-digit characters from phone number + const cleanPhone = product.phone.replace(/\D/g, ''); + const message = `Здраво! Заинтересиран/а сум за вашиот производ "${product.title}". Линк: ${window.location.href}`; + const whatsappUrl = `https://wa.me/${cleanPhone}?text=${encodeURIComponent(message)}`; + window.open(whatsappUrl, '_blank'); + } else { + alert('Телефонскиот број на продавачот не е достапен'); + } }; @@ -350,10 +373,16 @@ {/* Contact Buttons */}
- - Index: kupi-mk/frontend/src/pages/Profile.js =================================================================== --- kupi-mk/frontend/src/pages/Profile.js (revision c3904bd1b397a993305af9f3a3d2338d73d7288f) +++ kupi-mk/frontend/src/pages/Profile.js (revision bfc4bbc3a64bdafba2745cc5cc1af602bae674ec) @@ -5,8 +5,17 @@ const Profile = () => { - const { user } = useAuth(); + const { user, setUser } = useAuth(); const navigate = useNavigate(); const [userProducts, setUserProducts] = useState([]); const [loading, setLoading] = useState(true); + const [isEditModalOpen, setIsEditModalOpen] = useState(false); + const [editForm, setEditForm] = useState({ + username: '', + first_name: '', + last_name: '', + phone: '', + address: '' + }); + const [isUpdating, setIsUpdating] = useState(false); const fetchUserProducts = async () => { @@ -69,4 +78,49 @@ }; + const handleEditProfile = () => { + setEditForm({ + username: user?.username || '', + first_name: user?.first_name || '', + last_name: user?.last_name || '', + phone: user?.phone || '', + address: user?.address || '' + }); + setIsEditModalOpen(true); + }; + + const handleUpdateProfile = async (e) => { + e.preventDefault(); + setIsUpdating(true); + + try { + const response = await api.put('/users/profile', editForm); + setUser(response.data); + setIsEditModalOpen(false); + alert('Профилот е успешно ажуриран!'); + } catch (error) { + console.error('Error updating profile:', error); + if (error.response?.data?.message === 'Username is already taken') { + alert('Корисничкото име е веќе зафатено. Обидете се со друго.'); + } else { + alert('Грешка при ажурирање на профилот'); + } + } finally { + setIsUpdating(false); + } + }; + + const handleBecomeSeller = async () => { + if (window.confirm('Дали сакате да станете продавач? Ова ќе ви овозможи да објавувате производи.')) { + try { + const response = await api.patch('/users/become-seller'); + setUser(response.data); + alert('Успешно станавте продавач!'); + } catch (error) { + console.error('Error becoming seller:', error); + alert('Грешка при станување продавач'); + } + } + }; + useEffect(() => { fetchUserProducts(); @@ -104,7 +158,21 @@
- +
+ + + {!user?.is_seller && ( + + )} +
@@ -242,4 +310,99 @@ )} + + {/* Edit Profile Modal */} + {isEditModalOpen && ( +
+
+

Уреди профил

+ +
+
+ + setEditForm({ ...editForm, username: e.target.value })} + className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent" + required + placeholder="korisnicko_ime" + /> +
+ +
+ + setEditForm({ ...editForm, first_name: e.target.value })} + className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent" + required + /> +
+ +
+ + setEditForm({ ...editForm, last_name: e.target.value })} + className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent" + required + /> +
+ +
+ + setEditForm({ ...editForm, phone: e.target.value })} + className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent" + placeholder="070 123 456" + /> +
+ +
+ + setEditForm({ ...editForm, address: e.target.value })} + className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent" + placeholder="Град, улица..." + /> +
+ +
+ + +
+
+
+
+ )} );