admin/cmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

latestt changes

Browse Source
This commit is contained in:
govardhan
2025-08-19 14:03:53 +05:30
parent 911933074b
commit cfe68a276f
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
View File

@ -7,7 +7,9 @@ import org.mapstruct.Mapping;
import java.time.LocalDateTime; 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 { public interface UserMapper {
@Mapping(target = "isNotLocked", source = "notLocked") @Mapping(target = "isNotLocked", source = "notLocked")

12
support-portal-backend/src/main/resources/application.yml
View File

@ -24,13 +24,13 @@ spring:
enable: false enable: false
datasource: datasource:
# url: jdbc:mysql://mysql:3306/demo # 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 # url: jdbc:mysql://${MYSQL_HOST:db}:8098/demo
# username: youruser username: youruser
# password: youruserpassword password: youruserpassword
url: ${SPRING_DATASOURCE_URL} # url: ${SPRING_DATASOURCE_URL}
username: ${SPRING_DATASOURCE_USERNAME} # username: ${SPRING_DATASOURCE_USERNAME}
password: ${SPRING_DATASOURCE_PASSWORD} # password: ${SPRING_DATASOURCE_PASSWORD}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jpa: jpa:
hibernate: hibernate:

18
support-portal-frontend/src/app/component/user/user.component.ts
View File

@ -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 {BehaviorSubject} from "rxjs";
import {User} from "../../model/user"; import {User} from "../../model/user";
import {UserService} from "../../service/user.service"; 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 { AuthenticationService } from 'src/app/service/authentication.service';
; ;
import {Router} from "@angular/router"; import {Router} from "@angular/router";
import {FileUploadStatus} from "../../model/file-upload.status"; import {FileUploadStatus} from "../../model/file-upload.status";
import {Role} from "../../enum/role.enum"; 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 { public get isAdmin(): boolean {
return this.loggedInUser.role === Role.ADMIN || this.loggedInUser.role === Role.SUPER_ADMIN; return this.loggedInUser.role === Role.ADMIN || this.loggedInUser.role === Role.SUPER_ADMIN;
} }

3
support-portal-frontend/src/index.html
View File

@ -8,6 +8,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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" /> <link href="https://fonts.googleapis.com/css2?family=Mulish:wght@400;500;700;800&display=swap" rel="stylesheet" />
<!-- add this line --> <!-- add this line -->