latestt changes

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")

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:

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;
   }

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 -->