Index: pom.xml =================================================================== --- pom.xml (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ pom.xml (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -6,6 +6,6 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0 - + 3.2.5 + com.zinemasterapp @@ -60,4 +60,13 @@ spring-boot-starter-security + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-starter-actuator + + Index: src/main/java/com/zinemasterapp/zinemasterapp/controller/AuthController.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/controller/AuthController.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/controller/AuthController.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -3,6 +3,9 @@ import com.zinemasterapp.zinemasterapp.dto.LoginRequest; +import com.zinemasterapp.zinemasterapp.model.PasswordResetToken; import com.zinemasterapp.zinemasterapp.model.User; +import com.zinemasterapp.zinemasterapp.repository.TokenRepository; import com.zinemasterapp.zinemasterapp.repository.UserRepository; +import com.zinemasterapp.zinemasterapp.service.EmailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -13,4 +16,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; +import org.springframework.security.core.token.TokenService; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,4 +24,8 @@ import javax.naming.AuthenticationException; +import java.time.LocalDateTime; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; @RestController//deka e REST API kontroler, vrakja JSON @@ -24,25 +33,17 @@ public class AuthController { -// @Autowired -// private AuthenticationManager authenticationManager;//avtomatski Springboot pravi AuthenticationManager -// -// @PostMapping("/login")//na /api/auth/login primame POST metoda -// public ResponseEntity login(@RequestBody LoginRequest request) {//ResponseEntity ni dozvoluva da kontrolirame HTTP status, response body -// try { -// Authentication authentication = authenticationManager.authenticate( -// new UsernamePasswordAuthenticationToken(request.getUsername(), request.getPassword()) -// ); -// return ResponseEntity.ok("Login successful!"); -// }catch (BadCredentialsException e){ -// return ResponseEntity.status(401).body("Invalid username or password"); -// }catch (DisabledException e){ -// return ResponseEntity.status(403).body("User is inactive"); -// } -// -// } private final UserRepository userRepository;//isto e kako @Autowired ama povekje imam so konstructor koristeno + private final TokenRepository tokenRepository; - public AuthController(UserRepository userRepository) { + @Autowired + private EmailService emailService;//service za isprakjanje emails + @Autowired + private PasswordEncoder passwordEncoder;//za enkodiranje na pass + + + + public AuthController(UserRepository userRepository, TokenRepository tokenRepository) { this.userRepository = userRepository; + this.tokenRepository = tokenRepository; } @@ -61,10 +62,55 @@ } - // za demo - if ("test123".equals(request.getPassword())) { - return ResponseEntity.ok(user);//ova se stava vo localStorage, ova e JSON + + if (passwordEncoder.matches(request.getPassword(), user.getPassword())) {//dali e ist so od baza pass + return ResponseEntity.ok(user); } else { - return ResponseEntity.status(401).body("Invalid password");//ova e String + return ResponseEntity.status(401).body("Invalid password"); } } + + @PostMapping("/request-password-reset") + public ResponseEntity requestReset(@RequestBody Map body) { + String username = body.get("username"); + Optional userOpt = userRepository.findByUsername(username);//dali postoi vo baza + if (userOpt.isPresent()) { + String token = UUID.randomUUID().toString();//namerno e bez seckanje na UUID za da e pobezbedno + PasswordResetToken prt = new PasswordResetToken();//kreirame token + prt.setToken(token);//tokenot + prt.setUser(userOpt.get());//korisnikot + prt.setExpiresAt(LocalDateTime.now().plusMinutes(15)); + tokenRepository.save(prt); + String email = userOpt.get().getEmail(); + + String resetLink = "http://localhost:8082/reset-password?token=" + token; + emailService.sendResetLink(email, resetLink);//prakja email + + return ResponseEntity.ok("Линкот е успешно пратен."); + } + return ResponseEntity.ok("That username is not found."); + + } + + + @PostMapping("/reset-password") + public ResponseEntity resetPassword(@RequestBody Map body) { + String token = body.get("token"); + String newPassword = body.get("newPassword"); + + PasswordResetToken prt = tokenRepository.findByToken(token) + .orElseThrow(() -> new RuntimeException("Invalid token"));//dali go imame vo baza tokenot -> linija 79/82 + if (prt.getExpiresAt().isBefore(LocalDateTime.now())) {//dali pominalo 15min + return ResponseEntity.status(HttpStatus.GONE).body("Token expired"); + } + + User user = prt.getUser(); + user.setPassword(passwordEncoder.encode(newPassword)); + userRepository.save(user); + tokenRepository.delete(prt);//da ne se koristi pak tokenot + + return ResponseEntity.ok("Password has been reset."); + } + + + } Index: src/main/java/com/zinemasterapp/zinemasterapp/controller/CategoryController.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/controller/CategoryController.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/controller/CategoryController.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -10,8 +10,5 @@ import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.UUID; +import java.util.*; @RestController @@ -65,7 +62,13 @@ for (Product p : products) { if (deleteProducts) { - p.setAccessable(false); + Set productCategories = p.getCategories(); + if (productCategories.size() == 1 && productCategories.iterator().next().getId().equals(id)) { + p.setAccessable(false); + }else { + + productCategories.removeIf(cat -> cat.getId().equals(id)); + } } else { - // p.setCategoryId(null);//dali ova ke pravi problem? + p.getCategories().removeIf(cat -> cat.getId().equals(id)); } } Index: src/main/java/com/zinemasterapp/zinemasterapp/controller/ProductController.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/controller/ProductController.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/controller/ProductController.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -5,6 +5,10 @@ import com.zinemasterapp.zinemasterapp.model.Category; import com.zinemasterapp.zinemasterapp.model.Product; +import com.zinemasterapp.zinemasterapp.model.ProductRequest; +import com.zinemasterapp.zinemasterapp.model.ProductRequestItem; import com.zinemasterapp.zinemasterapp.repository.CategoryRepository; import com.zinemasterapp.zinemasterapp.repository.ProductRepository; +import com.zinemasterapp.zinemasterapp.repository.ProductRequestItemRepository; +import com.zinemasterapp.zinemasterapp.repository.ProductRequestRepository; import org.springframework.data.domain.Sort; import org.springframework.http.ResponseEntity; @@ -15,5 +19,8 @@ import java.nio.file.Path; import java.nio.file.Paths; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.stream.Collectors; @RestController @@ -24,8 +31,12 @@ private final ProductRepository productRepository; private final CategoryRepository categoryRepository; + private final ProductRequestItemRepository productRequestItemRepository; + private final ProductRequestRepository productRequestRepository; - public ProductController(ProductRepository productRepository, CategoryRepository categoryRepository) { + public ProductController(ProductRepository productRepository, CategoryRepository categoryRepository, ProductRequestItemRepository productRequestItemRepository, ProductRequestRepository productRequestRepository) { this.productRepository = productRepository; this.categoryRepository = categoryRepository; + this.productRequestItemRepository = productRequestItemRepository; + this.productRequestRepository = productRequestRepository; } @@ -113,4 +124,36 @@ } + @GetMapping("/{id}/reservations-by-month") + public Map getReservationsByMonth(@PathVariable String id) { + List items = productRequestItemRepository.findByProductId(id);//site naracki so toj proizvod + + Map reservationsPerMonth = new TreeMap<>();//prazna mapa + + for (ProductRequestItem item : items) {//za baranje od baranjata + ProductRequest request = item.getRequest(); + if (request != null && request.getRequestDate() != null) {//dali postoi narackata? + LocalDate date = request.getRequestDate(); + String month = date.getMonth().toString() + " " + date.getYear(); + reservationsPerMonth.put(month, reservationsPerMonth.getOrDefault(month, 0) + item.getQuantityRequested()); + } + } + + return reservationsPerMonth;//JULY 2025: 22 + //AUGUST 2025: 23 + + } + + @GetMapping("/{id}") + public ResponseEntity getProductById(@PathVariable String id) { + Optional product = productRepository.findById(id); + return product.map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + + + + + Index: src/main/java/com/zinemasterapp/zinemasterapp/controller/UserController.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/controller/UserController.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/controller/UserController.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -103,4 +103,22 @@ } + @PutMapping("/{id}") + public ResponseEntity updateUser(@PathVariable String id, @RequestBody User updatedUser) { + Optional optUser = userRepository.findById(id); + if (optUser.isEmpty()) return ResponseEntity.notFound().build(); + + User user = optUser.get(); + user.setName(updatedUser.getName()); + user.setSurname(updatedUser.getSurname()); + user.setStartDate(updatedUser.getStartDate()); + user.setUserType(updatedUser.getUserType()); + user.setEmail(updatedUser.getEmail()); + user.setAddress(updatedUser.getAddress());//sve setirame + + userRepository.save(user); + return ResponseEntity.ok().build(); + } + + Index: src/main/java/com/zinemasterapp/zinemasterapp/model/PasswordResetToken.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/model/PasswordResetToken.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ src/main/java/com/zinemasterapp/zinemasterapp/model/PasswordResetToken.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,42 @@ +package com.zinemasterapp.zinemasterapp.model; + +import jakarta.persistence.*; + +import java.time.LocalDateTime; + +@Entity +@Table(name = "password_reset_token") +public class PasswordResetToken { + @Id + private String token; + + @OneToOne + @JoinColumn(name = "user_id") + private User user; + + private LocalDateTime expiresAt; + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public LocalDateTime getExpiresAt() { + return expiresAt; + } + + public void setExpiresAt(LocalDateTime expiresAt) { + this.expiresAt = expiresAt; + } +} Index: src/main/java/com/zinemasterapp/zinemasterapp/model/User.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/model/User.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/model/User.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -36,4 +36,15 @@ @Column(name = "profile_pic") private String profilePic; + + @Column(nullable = false, unique = true) + private String email; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } public String getProfilePic() { Index: src/main/java/com/zinemasterapp/zinemasterapp/repository/ProductRequestItemRepository.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/repository/ProductRequestItemRepository.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/repository/ProductRequestItemRepository.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -9,3 +9,4 @@ public interface ProductRequestItemRepository extends JpaRepository { List findByRequestId(String requestId); + List findByProductId(String productId); } Index: src/main/java/com/zinemasterapp/zinemasterapp/repository/TokenRepository.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/repository/TokenRepository.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ src/main/java/com/zinemasterapp/zinemasterapp/repository/TokenRepository.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,10 @@ +package com.zinemasterapp.zinemasterapp.repository; + +import com.zinemasterapp.zinemasterapp.model.PasswordResetToken; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface TokenRepository extends JpaRepository { + Optional findByToken(String token); +} Index: src/main/java/com/zinemasterapp/zinemasterapp/security/CustomUserAccess.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/security/CustomUserAccess.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/security/CustomUserAccess.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -35,3 +35,2 @@ } } -//moze i bez ova? Index: src/main/java/com/zinemasterapp/zinemasterapp/security/SecurityConfig.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/security/SecurityConfig.java (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/java/com/zinemasterapp/zinemasterapp/security/SecurityConfig.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -39,6 +39,8 @@ .requestMatchers(HttpMethod.POST, "/api/users").permitAll() .requestMatchers(HttpMethod.PUT, "/api/users/**").permitAll() + .requestMatchers(HttpMethod.POST, "/api/auth/").permitAll() .requestMatchers(HttpMethod.GET, "/api/requests/**").permitAll() .requestMatchers(HttpMethod.GET, "/api/users/**").permitAll() + .requestMatchers(HttpMethod.GET, "/api/products/*/reservations-by-month").permitAll() .requestMatchers(HttpMethod.POST, "/api/products").permitAll() .requestMatchers(HttpMethod.PUT, "/api/products/**").permitAll() Index: src/main/java/com/zinemasterapp/zinemasterapp/service/EmailService.java =================================================================== --- src/main/java/com/zinemasterapp/zinemasterapp/service/EmailService.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ src/main/java/com/zinemasterapp/zinemasterapp/service/EmailService.java (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,20 @@ +package com.zinemasterapp.zinemasterapp.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; + +@Service +public class EmailService { + @Autowired + private JavaMailSender mailSender; + + public void sendResetLink(String to, String link) { + SimpleMailMessage message = new SimpleMailMessage(); + message.setTo(to); + message.setSubject("Промена на Лозинка"); + message.setText("Кликнете тука за да ја промените лозинката: " + link);//body na mailot + mailSender.send(message); + } +} Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ src/main/resources/application.properties (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -16,4 +16,13 @@ spring.web.resources.static-locations=classpath:/static/,file:src/main/resources/static/uploads/ +spring.mail.host=smtp.gmail.com +spring.mail.port=587 +spring.mail.username=${MAIL_USERNAME} +spring.mail.password=${MAIL_PASSWORD} +spring.mail.properties.mail.smtp.auth=true +spring.mail.properties.mail.smtp.starttls.enable=true + + + Index: zinemaster-frontend/src/components/AllRequests.vue =================================================================== --- zinemaster-frontend/src/components/AllRequests.vue (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ zinemaster-frontend/src/components/AllRequests.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -11,4 +11,7 @@ Profile + + Управувај со корисници + @@ -65,5 +68,5 @@
-
+
✔️ ⏳ @@ -74,5 +77,5 @@

Корисник: {{ req.username }}

Датум: {{ req.requestDate }}

-

Статус: {{ req.status }}

+

Статус: {{ statusToMacedonian(req.status) }}

{{req.status === 'approved' ? 'Одобрена од: ' : 'Одбиена од: ' }} {{ req.processedBy }} @@ -82,5 +85,5 @@ class="btn btn-sm mt-2 text-dark" :class="buttonClass(req.status)" - @click="toggleDetails(req.id)" v-if="req.status != 'unavailable'"> + @click="toggleDetails(req.id)" > {{ expandedRequests.includes(req.id) ? 'Скриј производи' : 'Покажи производи' }} @@ -208,5 +211,5 @@ const result = await Swal.fire({ title: 'Потврда на статус', - text: `Дали сте сигурни дека сакате да ја означите нарачката како '${newStatus}'?`, + text: `Дали сте сигурни дека сакате да ја означите нарачката како '${statusToMacedonian(newStatus)}'?`, icon: 'question', showCancelButton: true, @@ -231,5 +234,5 @@ icon: 'success', title: 'Успешно', - text: `Нарачката е означена како '${newStatus}'` + text: `Нарачката е означена како '${statusToMacedonian(newStatus)}'` }); } else { @@ -265,4 +268,13 @@ }); +const statusToMacedonian = (status) => { + switch (status) { + case 'approved': return 'Одобрено'; + case 'pending': return 'Во тек'; + case 'rejected': return 'Одбиено'; + default: return status; + } +}; + Index: zinemaster-frontend/src/components/ForgotPassword.vue =================================================================== --- zinemaster-frontend/src/components/ForgotPassword.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ zinemaster-frontend/src/components/ForgotPassword.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,46 @@ + + + Index: zinemaster-frontend/src/components/LoginPage.vue =================================================================== --- zinemaster-frontend/src/components/LoginPage.vue (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ zinemaster-frontend/src/components/LoginPage.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -6,33 +6,32 @@

- +
+ type="text" + v-model="username" + class="form-control" + id="username" placeholder="Type your username" required />
- +
+ :type="showPassword ? 'text' : 'password'" + v-model="password" + class="form-control" + id="password" placeholder="Type your password" required /> + + + +
- Forgot password? + Заборавена Лозинка? +
@@ -43,5 +42,5 @@
- +
@@ -57,4 +56,6 @@ const error = ref('');//reactive promenlivi - real time change const router = useRouter(); +const showPassword = ref(false); + const login = async () => {//ova e demek pomoderno,ama i so method block da koristis isto ke e Index: zinemaster-frontend/src/components/MainPage.vue =================================================================== --- zinemaster-frontend/src/components/MainPage.vue (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ zinemaster-frontend/src/components/MainPage.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -43,5 +43,5 @@
- + -
-
- -
-
- -
-
- +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
- -
+ + + + + +
+
Уреди корисник
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ + @@ -67,5 +112,4 @@ Почетен датум - Тип на корисник @@ -78,5 +122,5 @@ {{ u.name }} {{ u.surname }} {{ u.startDate }} - {{ u.userType }} + {{ typeWorkerToMacedonian(u.userType) }}
@@ -85,7 +129,7 @@
+ + @@ -123,4 +173,13 @@ const sortOrder = ref('asc'); +const typeWorkerToMacedonian = (type) =>{ + switch (type) { + case 'Worker': return 'Работник'; + case 'ProductAdministrator': return 'Администратор на продукти'; + case 'UserAdministrator': return 'Администратор на корисници'; + default: return type; + } +} + onMounted(async () => { const stored = localStorage.getItem('user'); @@ -139,5 +198,5 @@ users.value = data.map(u => ({ ...u, - newRole: u.userType + newRole: u.userType //na site properties plus dodavame nov propertie za newRole })); loading.value = false; @@ -151,5 +210,5 @@ const result = await Swal.fire({ title: 'Промена на улога', - text: `Дали сте сигурни дека сакате да ја промените улогата на ${user.username} во ${user.newRole}?`, + text: `Дали сте сигурни дека сакате да ја промените улогата на ${user.username} во ${typeWorkerToMacedonian(user.newRole)}?`, icon: 'warning', showCancelButton: true, @@ -191,5 +250,9 @@ if (res.ok) { - alert(`Пристапот е ${newAccess === 1 ? 'одобрен' : 'одземен'}.`); + Swal.fire({ + icon: 'success', + title: 'Успешна промена', + text: `Пристапот е ${newAccess === 1 ? 'одобрен' : 'одземен'}.` + }); await fetchUsers(); } else { @@ -206,9 +269,13 @@ try { const res = await fetch('http://localhost:8081/api/users'); - if (!res.ok) throw new Error("Неуспешно превземање на корисници"); + if (!res.ok)Swal.fire({ + icon: 'error', + title: 'Грешка', + text: 'Грешка при вчитување на корисниците.' + }); users.value = await res.json(); } catch (err) { - console.error("Грешка при превземање на корисници:", err); + console.error(err); } }; @@ -228,7 +295,8 @@ name: '', surname: '', - startDate: '', + startDate: new Date().toISOString().split('T')[0],//denesen datum e default userType: 'Worker', - address: '' + address: '', + email: '' }); @@ -243,5 +311,5 @@ } - const password = 'test123'; + const password = 'test123';//default @@ -256,5 +324,6 @@ password, access: 1, - address: newUser.value.address + address: newUser.value.address, + email: newUser.value.email }) }); @@ -281,4 +350,59 @@ router.push('/login'); }; +const resetForm = () => { + newUser.value = { + name: '', + surname: '', + startDate: new Date().toISOString().split('T')[0], + userType: 'Worker', + address: '', + email: '' + }; +}; + +const toggleAddUserForm = () => { + showAddUserForm.value = !showAddUserForm.value; + if (!showAddUserForm.value) { + resetForm(); + } +}; + +const editUserForm = ref(false); +const editUser = ref({}); + +const startEdit = (user) => { + editUser.value = { ...user }; // copy od podatocite + editUserForm.value = true; +}; + +const cancelEdit = () => { + editUserForm.value = false; + editUser.value = {}; +}; + +const updateUser = async () => { + const res = await fetch(`http://localhost:8081/api/users/${editUser.value.id}`, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(editUser.value) + }); + + if (res.ok) { + await Swal.fire({ + icon: 'success', + title: 'Успешно!', + text: 'Корисникот е ажуриран.' + }); + editUserForm.value = false; + await fetchUsers(); + } else { + Swal.fire({ + icon: 'error', + title: 'Грешка!', + text: 'Не може да се ажурира корисникот.' + }); + } +}; + @@ -331,3 +455,9 @@ } +input[type="checkbox"]:disabled + .slider { + background-color: #ccc; + cursor: not-allowed; + opacity: 0.6; +} + Index: zinemaster-frontend/src/components/ProductDetails.vue =================================================================== --- zinemaster-frontend/src/components/ProductDetails.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ zinemaster-frontend/src/components/ProductDetails.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,76 @@ + + + Index: zinemaster-frontend/src/components/ProfilePage.vue =================================================================== --- zinemaster-frontend/src/components/ProfilePage.vue (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ zinemaster-frontend/src/components/ProfilePage.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -8,4 +8,7 @@ Сите нарачки + + Управувај со корисници + @@ -26,9 +29,9 @@

{{ user.name }} {{ user.surname }}

-

@{{ user.username }}

+

{{ user.username }}

  • Адреса: {{ user.address }}
    • -
  • Тип: {{ user.userType }}
    • +
  • Тип: {{ typeWorkerToMacedonian(user.userType) }}
  • Старт: {{ user.startDate }}
  • Статус: @@ -96,5 +99,5 @@
    Нарачка {{ req.id }}

    Датум: {{ req.requestDate }}

    -

    Статус: {{ req.status }}

    +

    Статус: {{ statusToMacedonian(req.status) }}

    {{req.status === 'approved' ? 'Одобрена од: ' : 'Одбиена од: ' }} {{getUsernameById(req.processedBy)}} @@ -148,4 +151,23 @@ const allUsers = ref([]); + +const statusToMacedonian = (status) => { + switch (status) { + case 'approved': return 'Одобрено'; + case 'pending': return 'Во тек'; + case 'rejected': return 'Одбиено'; + default: return status; + } +}; + +const typeWorkerToMacedonian = (type) =>{ + switch (type) { + case 'Worker': return 'Работник'; + case 'ProductAdministrator': return 'Администратор на продукти'; + case 'UserAdministrator': return 'Администратор на корисници'; + default: return type; + } +} + onMounted(async () => { const stored = localStorage.getItem('user'); @@ -232,9 +254,9 @@ const handleFileChange = async (event) => { - const file = event.target.files[0]; + const file = event.target.files[0];//od if (!file) return; - const reader = new FileReader(); - reader.onload = async (e) => { + const reader = new FileReader();//sluzi za citanje na fileovi od klientot + reader.onload = async (e) => {//ova e 2 const newUrl = e.target.result; userProfileImage.value = newUrl; @@ -250,5 +272,5 @@ if (res.ok) { - user.value.profilePic = newUrl; + user.value.profilePic = newUrl;//azurira localStorage.setItem("user", JSON.stringify(user.value)); await Swal.fire({ @@ -266,5 +288,5 @@ }; - reader.readAsDataURL(file); + reader.readAsDataURL(file); //ova e 1 }; Index: zinemaster-frontend/src/components/ResetPassword.vue =================================================================== --- zinemaster-frontend/src/components/ResetPassword.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) +++ zinemaster-frontend/src/components/ResetPassword.vue (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -0,0 +1,63 @@ + + + Index: zinemaster-frontend/src/router/index.js =================================================================== --- zinemaster-frontend/src/router/index.js (revision 99adf50bc33c245de97c9ab3d513a66edfbbc65c) +++ zinemaster-frontend/src/router/index.js (revision 37cf0705121314723a82b25f95929c9e78ebd5f5) @@ -1,9 +1,11 @@ import { createRouter, createWebHistory } from 'vue-router'; -import Login from '../components/LoginPage.vue'; +import Login from '../components/LoginPage.vue'; import Main from '../components/MainPage.vue'; -import Requests from '../components/AllRequests.vue'; +import Requests from '../components/AllRequests.vue'; import Profile from '../components/ProfilePage.vue'; import ManageUsers from '@/components/ManageUsers.vue'; - +import ForgotPassword from '@/components/ForgotPassword.vue'; +import ResetPassword from '@/components/ResetPassword.vue'; +import ProductDetails from '@/components/ProductDetails.vue'; const routes = [ @@ -13,5 +15,9 @@ { path: '/requests', component: Requests }, { path: '/profile', component: Profile }, - { path: '/manage-users', component: ManageUsers} + { path: '/manage-users', component: ManageUsers}, + { path: '/forgot-password', component: ForgotPassword}, + { path: '/reset-password', component: ResetPassword}, + { path: '/products/:id', component: ProductDetails, props: true } + ]; @@ -23,3 +29,2 @@ export default router; -