From e6fc9a0bbaf5700321dfe30dd1fe67edc245f0bd Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Sat, 21 Jun 2025 19:09:08 +0530 Subject: [PATCH] site --- .../Controller/PhotoSearchController.java | 4 +- .../realnet/OpenAi/Services/HtmlBuilder5.java | 44 +++++++++++++++---- .../OpenAi/Services/UnsplashService.java | 5 ++- .../Controllers/Design_lbraryController.java | 13 ++++++ .../dlf/Services/Design_lbraryService.java | 28 +++++++++--- .../session/controller/SessionController.java | 11 +++-- .../users/service1/AppUserServiceImpl.java | 3 ++ .../Controllers/SiteBuilderController.java | 12 +---- 8 files changed, 89 insertions(+), 31 deletions(-) diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Controller/PhotoSearchController.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Controller/PhotoSearchController.java index 90a33db..1db102e 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Controller/PhotoSearchController.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Controller/PhotoSearchController.java @@ -18,7 +18,7 @@ public class PhotoSearchController { private UnsplashService unsplashService; @GetMapping("/search") - public List searchPhotos(@RequestParam String keyword) { - return unsplashService.getImageUrls(keyword); + public List searchPhotos(@RequestParam String keyword, @RequestParam Integer pageNumber) { + return unsplashService.getImageUrls(keyword, pageNumber); } } diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/HtmlBuilder5.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/HtmlBuilder5.java index f64733a..38e3521 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/HtmlBuilder5.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/HtmlBuilder5.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; @@ -122,13 +121,42 @@ public class HtmlBuilder5 { // Handle children Object children = node.get("children"); +// if (children instanceof List) { +// for (Object child : (List) children) { +// if (child instanceof Map) { +// html.append(buildHtml((Map) child, jsonInput)); +// } +// } +// } + if (children instanceof List) { for (Object child : (List) children) { if (child instanceof Map) { - html.append(buildHtml((Map) child, jsonInput)); + Map childMap = (Map) child; + + // 🟨 Special case: Dropdown
  • handling + if ("li".equals(tag) && "dropdown".equals(node.get("type"))) { + html.append(buildHtml(childMap, jsonInput)); + + // Look for nested
      dropdown menu inside children + for (Object dropdownChild : (List) children) { + if (dropdownChild instanceof Map) { + Map dropdownChildMap = (Map) dropdownChild; + Object dropdownUl = dropdownChildMap.get("ul"); + if (dropdownUl instanceof Map) { + html.append(buildHtml((Map) dropdownUl, jsonInput)); + } + } + } + break; // dropdown handled, exit + } else { + html.append(buildHtml(childMap, jsonInput)); + } } } - } else if (children instanceof Map) { + } + + else if (children instanceof Map) { html.append(buildHtml((Map) children, jsonInput)); } @@ -175,11 +203,11 @@ public class HtmlBuilder5 { return "🔗"; if (label.contains("youtube")) return "▶️"; - if (label.contains("fas fa-cube")) - return "📦"; - - if (label.contains("cube")) + if (label.contains("fas fa-cube") || label.contains("cube")) return "📦"; + // ✅ New: Dropdown / Chevron icon + if (label.contains("dropdown") || label.contains("chevron-down") || label.contains("fas fa-chevron-down")) + return "🔽"; // downward arrow return ""; } @@ -248,7 +276,7 @@ public class HtmlBuilder5 { String query = keywords.trim().replace(" ", ","); // 1. Get list of image URLs from Unsplash - List imageUrls = unsplashService.getImageUrls(keywords); + List imageUrls = unsplashService.getImageUrls(keywords, 10); // 2. Prepare prompt for Gemini StringBuilder promptBuilder = new StringBuilder(); diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/UnsplashService.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/UnsplashService.java index 1d49816..754b054 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/UnsplashService.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/OpenAi/Services/UnsplashService.java @@ -19,10 +19,10 @@ public class UnsplashService { @Value("${unsplash.access.key}") private String accessKey; - public List getImageUrls(String keyword) { + public List getImageUrls(String keyword, int i) { RestTemplate restTemplate = new RestTemplate(); String uri = UriComponentsBuilder.fromHttpUrl(apiUrl).queryParam("query", keyword) - .queryParam("client_id", accessKey).queryParam("per_page", 10).toUriString(); + .queryParam("client_id", accessKey).queryParam("per_page", i).toUriString(); UnsplashPhotoResponse response = restTemplate.getForObject(uri, UnsplashPhotoResponse.class); @@ -37,4 +37,5 @@ public class UnsplashService { return imageUrls; } + } diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Controllers/Design_lbraryController.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Controllers/Design_lbraryController.java index 7fa186f..f5b9235 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Controllers/Design_lbraryController.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Controllers/Design_lbraryController.java @@ -168,4 +168,17 @@ public class Design_lbraryController { return new ResponseEntity<>(flf_line, HttpStatus.OK); } +// get flf by tag + @GetMapping("/Design_lbrary/tag") + public ResponseEntity getFlfByRandom(@RequestParam String operationType, @RequestParam String fieldType) { + Design_lbrary flf_line = designLibraryService.getflflinerandom(operationType, fieldType); + + if (flf_line == null) { + + return new ResponseEntity<>("not found", HttpStatus.EXPECTATION_FAILED); + } + + return new ResponseEntity(flf_line, HttpStatus.OK); + } + } \ No newline at end of file diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Services/Design_lbraryService.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Services/Design_lbraryService.java index 7f9d243..77ed1e1 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Services/Design_lbraryService.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/dlf/Services/Design_lbraryService.java @@ -134,13 +134,31 @@ public class Design_lbraryService { if (flf == null || flf.isEmpty()) { - flf = designLibraryRepository.searchByTag(true, operationType.toLowerCase().trim(), - fieldType.toLowerCase().trim()); +// flf = designLibraryRepository.searchByTag(true, operationType.toLowerCase().trim(), +// fieldType.toLowerCase().trim()); +// +// if (flf == null || flf.isEmpty()) { +// return null; // ya throw new RuntimeException("No data found"); +// +// } + return null; // ya throw new RuntimeException("No data found"); - if (flf == null || flf.isEmpty()) { - return null; // ya throw new RuntimeException("No data found"); + } + + // Random index pick + int randomIndex = ThreadLocalRandom.current().nextInt(flf.size()); + return flf.get(randomIndex); + } + +// get flf by tag + public Design_lbrary getflfByTag(String operationType, String fieldType) { + + List flf = designLibraryRepository.searchByTag(true, operationType.toLowerCase().trim(), + fieldType.toLowerCase().trim()); + + if (flf == null || flf.isEmpty()) { + return null; // ya throw new RuntimeException("No data found"); - } } // Random index pick diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/session/controller/SessionController.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/session/controller/SessionController.java index f8af297..33f4ea5 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/session/controller/SessionController.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/session/controller/SessionController.java @@ -343,15 +343,18 @@ public class SessionController { @PostMapping("/user/send_email") public ResponseEntity userviaadmin(HttpServletRequest request, @RequestBody Registration reg) { String email = reg.getEmail(); - AppUser appUser = new AppUser(); +// AppUser appUser = new AppUser(); AppUser user = userService.findUserByEmail(email); if (user != null && user.isIsComplete()) { return ResponseEntity.badRequest().body(new MessageResponse(email + " already exist")); } else { - if (user != null && !user.isIsComplete()) { - appUser = user; - } +// if (user != null && !user.isIsComplete()) { +// appUser = user; +// } + + AppUser appUser = (user != null && !user.isIsComplete()) ? user : new AppUser(); + // Random random = new Random(); SecureRandom random = new SecureRandom(); diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/users/service1/AppUserServiceImpl.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/users/service1/AppUserServiceImpl.java index b09149c..28d5441 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/users/service1/AppUserServiceImpl.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/users/service1/AppUserServiceImpl.java @@ -617,6 +617,9 @@ public class AppUserServiceImpl implements UserDetailsService, AppUserService { user.setRandom_no(token); user.setUsername(email); user.setEmail(email); + if (user.getCreatedate() == null) { + user.setCreatedate(LocalDateTime.now()); + } appUserRepository.save(user); diff --git a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/vpspack/Controllers/SiteBuilderController.java b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/vpspack/Controllers/SiteBuilderController.java index 70136fe..14c6581 100644 --- a/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/vpspack/Controllers/SiteBuilderController.java +++ b/visaproject-back-b/authsec_springboot/backend/src/main/java/com/realnet/vpspack/Controllers/SiteBuilderController.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.IOException; import java.util.List; +import org.apache.commons.io.FileUtils; +import org.eclipse.jgit.api.Git; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; @@ -23,18 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.realnet.Heplers.FileHelper; -import com.realnet.OpenAi.Services.SureopsService; import com.realnet.fnd.response.EntityResponse; import com.realnet.vpspack.Entity.SiteBuilder; import com.realnet.vpspack.Entity.SiteBuilderDto; import com.realnet.vpspack.Services.SiteBuilderService; -import org.eclipse.jgit.api.Git; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.apache.commons.io.FileUtils; - -import java.io.File; @RequestMapping(value = "/SiteTree") @CrossOrigin("*") @@ -50,8 +44,6 @@ public class SiteBuilderController { @Autowired private FileHelper fileHelper; - @Autowired - private SureopsService sureopsService; @PostMapping("/SiteTree") public SiteBuilder Savedata(@RequestBody SiteBuilder data) {