From cfe68a276f77133c1a50ccdc86a6445a5c3c2ea8 Mon Sep 17 00:00:00 2001
From: govardhan <govardhan@gmail.com>
Date: Tue, 19 Aug 2025 14:03:53 +0530
Subject: [PATCH] latestt changes

---
 .DS_Store                                     | Bin 6148 -> 8196 bytes
 .../backend/mapper/UserMapper.java            |   4 +++-
 .../src/main/resources/application.yml        |  12 ++++++------
 .../src/app/component/user/user.component.ts  |  18 +++++++++++++++++-
 support-portal-frontend/src/index.html        |   3 +++
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index fd23fe36b13635d2932dbe2029aa4552099fcaa6..ca52a6edadf3a284af03ceb0c9fcfc342a263954 100644
GIT binary patch
literal 8196
zcmeHMPiqrF6o1o3v!PUSs5Ty|3*xPR5~-9TVvOm*gA|)$54FT>ciS%A?1XI697<t9
zMbHo6#Y1o6$x}hRt0zG`_yH>TB|PYxKW%0clXiO$vGZW&H<@|w?R&qSo!Qv{04X%>
z96$yD3@i-OLs<Pm*f=X)G9Y^{AriC)Z#`F9rPW%OrtZ)TXa+O`ngPv#X5e380QYPr
zMvr}8jOto5pcy!o46yaV#KJHyF%-y`4y^bQ05O5xT(F&H4MbC7UScQ^M^K0`MHHq)
z9x;e8$9_}l<t2s!g*gy;_#pDiM4nIxzdHIixjK-%KwWDFGy~lXu(NvtCSe_1XsG9R
z^5(}yb*xH@Ma!cW_8Cu~U0r&-`0;jh-0nMG+h~6qAYZd+3Q4@~76h;g6l`$RtK-Tt
z*R7$(us{FgWud@h=<rje?MQlSsqx6Q>KsNvF`7+qpbir}t}4{9F97GRM^|P3Y>8pH
zPyXV9Er7nZ(aeUQAEmG6`RT*d``sCyXWwh6Ss&LX%0Zsxk%9%7!|aN14{;KzV0UEx
z7PZvOhmoBIRIs?nSQ%RZ;|qTW(Y%>^=%cM>ee?6{6<gfhz838}eLRb3#yp}67;O{p
zGP}=pjC$g*RRIrwS(uTS6MiQbWDGs1T*UGfVP`mb8GXgFSNYnzpP{$J6B*M-o57R%
zh;TZx%SatPg3~o*nu3pPJ6LzjF!BODsI12HX0?Kvd{W<8HO~zi+3YtmFqk-VHfbb{
zA!DVqL0hFprO^xumHIOKwMeOF9keUf1J`Ml(<67N->A60Q|AV*?V!rTCD*rUt3aE+
z9dO%{7%);ss+`VjZ(qyKj+@t~cgD@_-1JOt+?<`s?d+tC^H-*BER;9Bs!!PpfI{TU
z3_cZ6VGP8~TAfX!d*Ob359)lH|Nd$@6!R%&9O^oBaxdzf8vFT$u@f_nty10hsK1Vu
z2P`u$TG|W@ie`qL|8ckN_5HtXpj(;&&A@-h07(=}#R8_)YoTOkZ4=8QEKHbQD3F_A
v#Z*{7KaL|F{$Yr1Q;y{&h5~T}<*$DT(EC4oTW4>!9dBWJ|K}6(lvKX~cg7k&

delta 152
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5sJ6q~50D9Q$s2aBaL6fx*BBs1hQ<Zet{
z&dkU*IY3ZhvWcMlWN9Iz$&tdkldXj1C$AUL-#kIYg>mx}F=fVy1uGV_b8rYU0}TNJ
i0d64S3Nn0S;&<lB{4$;(s~DId)`DEZusNP*4l@7?ryDN-

diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
index 9e4dfce..4e7369a 100644
--- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
+++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
@@ -7,7 +7,9 @@ import org.mapstruct.Mapping;
 
 import java.time.LocalDateTime;
 
-@Mapper(componentModel = "spring",imports = {LocalDateTime.class})
+
+@Mapper(componentModel = "spring")  // This is crucial for Spring integration
+// @Mapper(componentModel = "spring",imports = {LocalDateTime.class})
 public interface UserMapper {
 
     @Mapping(target = "isNotLocked", source = "notLocked")
diff --git a/support-portal-backend/src/main/resources/application.yml b/support-portal-backend/src/main/resources/application.yml
index 8cc9ad5..10363c8 100644
--- a/support-portal-backend/src/main/resources/application.yml
+++ b/support-portal-backend/src/main/resources/application.yml
@@ -24,13 +24,13 @@ spring:
             enable: false
   datasource:
     # url: jdbc:mysql://mysql:3306/demo
-    # url: jdbc:mysql://210.18.189.94:8098/demo
+    url: jdbc:mysql://210.18.189.94:8098/demo
     # url: jdbc:mysql://${MYSQL_HOST:db}:8098/demo
-    # username: youruser
-    # password: youruserpassword
-    url: ${SPRING_DATASOURCE_URL}
-    username: ${SPRING_DATASOURCE_USERNAME}
-    password: ${SPRING_DATASOURCE_PASSWORD}
+    username: youruser
+    password: youruserpassword
+    # url: ${SPRING_DATASOURCE_URL}
+    # username: ${SPRING_DATASOURCE_USERNAME}
+    # password: ${SPRING_DATASOURCE_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
diff --git a/support-portal-frontend/src/app/component/user/user.component.ts b/support-portal-frontend/src/app/component/user/user.component.ts
index 6f8585c..e8c61d1 100644
--- a/support-portal-frontend/src/app/component/user/user.component.ts
+++ b/support-portal-frontend/src/app/component/user/user.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {BehaviorSubject} from "rxjs";
 import {User} from "../../model/user";
 import {UserService} from "../../service/user.service";
@@ -10,6 +10,8 @@ import {CustomHttpResponse} from "../../dto/custom-http-response";
 import { AuthenticationService } from 'src/app/service/authentication.service';
 ;
 
+
+
 import {Router} from "@angular/router";
 import {FileUploadStatus} from "../../model/file-upload.status";
 import {Role} from "../../enum/role.enum";
@@ -290,6 +292,20 @@ export class UserComponent implements OnInit, OnDestroy {
     }
   }
 
+
+
+  @ViewChild('addUserModal') addUserModal!: ElementRef;
+  
+  openAddUserModal() {
+    console.log("clicked")
+    if (this.addUserModal) {
+
+      // const modalInstance = new Modal(this.addUserModal.nativeElement);
+      // modalInstance.show();
+    }
+  }
+
+
   public get isAdmin(): boolean {
     return this.loggedInUser.role === Role.ADMIN || this.loggedInUser.role === Role.SUPER_ADMIN;
   }
diff --git a/support-portal-frontend/src/index.html b/support-portal-frontend/src/index.html
index 82bb219..8acac9d 100644
--- a/support-portal-frontend/src/index.html
+++ b/support-portal-frontend/src/index.html
@@ -8,6 +8,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
+
+
     <link href="https://fonts.googleapis.com/css2?family=Mulish:wght@400;500;700;800&display=swap" rel="stylesheet" />
 
     <!-- add this line -->