Refactor breadcrumb title setting and update icons in navigation components
This commit is contained in:
@@ -62,7 +62,7 @@ export class BreadcrumbComponent {
|
|||||||
|
|
||||||
this.navigationList = breadcrumbList;//breadcrumbList.slice(breadcrumbList.length - 1, breadcrumbList.length);
|
this.navigationList = breadcrumbList;//breadcrumbList.slice(breadcrumbList.length - 1, breadcrumbList.length);
|
||||||
const title = breadcrumbList[breadcrumbList.length - 1]?.title || 'Welcome';
|
const title = breadcrumbList[breadcrumbList.length - 1]?.title || 'Welcome';
|
||||||
this.titleService.setTitle(title + ' | Mantis Angular Admin Template');
|
this.titleService.setTitle(title );
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -104,7 +104,7 @@
|
|||||||
<h6 class="mb-0">JWT User</h6>
|
<h6 class="mb-0">JWT User</h6>
|
||||||
<span>UI/UX Designer</span>
|
<span>UI/UX Designer</span>
|
||||||
</div>
|
</div>
|
||||||
<a href="javascript:" class="bg-transparent"><i class="d-flex f-20" antIcon theme="outline" type="logout"></i></a>
|
<a href="javascript:" class="bg-transparent"><i class="d-flex f-20" antIcon theme="outline" type="login"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ul ngbNav #nav="ngbNav" class="nav drp-tabs nav-fill nav-tabs">
|
<ul ngbNav #nav="ngbNav" class="nav drp-tabs nav-fill nav-tabs">
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
<li data-username="mantis dashboard" class="nav-item coded-hasmenu" [routerLinkActive]="['active']">
|
<li data-username="dashboard" class="nav-item coded-hasmenu" [routerLinkActive]="['active']">
|
||||||
<a [routerLinkActive]="['active']" (click)="navCollapse($event)">
|
<a [routerLinkActive]="['active']" (click)="navCollapse($event)">
|
||||||
@if (item.icon) {
|
@if (item.icon) {
|
||||||
<span class="coded-micon">
|
<span class="coded-micon">
|
||||||
|
|||||||
-22
@@ -8,27 +8,5 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
<div class="m-4 mb-0">
|
|
||||||
<div class="card nav-card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="d-flex flex-column align-items-center">
|
|
||||||
<img src="assets/images/avatar-group.png" alt="user" class="img-fluid" />
|
|
||||||
<div class="m-t-20 text-center">
|
|
||||||
<h5 class="mb-0">Mantis Pro</h5>
|
|
||||||
<span class="text-muted">Checkout pro features</span>
|
|
||||||
</div>
|
|
||||||
<div class="m-t-20 text-center">
|
|
||||||
<a
|
|
||||||
href="https://codedthemes.com/item/mantis-angular-admin-template/?utm_source=free_demo&utm_medium=codedthemes&utm_campaign=button_download_premium"
|
|
||||||
target="_blank"
|
|
||||||
class="btn btn-primary text-white"
|
|
||||||
>
|
|
||||||
Pro
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</ng-scrollbar>
|
</ng-scrollbar>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
<button mat-raised-button (click)="openDialog('100ms', '5ms')" >
|
<button mat-raised-button (click)="openDialog('100ms', '5ms')" >
|
||||||
<!-- <i antIcon type="bell" theme="outline"></i>-->
|
<!-- <i antIcon type="bell" theme="outline"></i>-->
|
||||||
<!-- <mat-icon>login</mat-icon>-->
|
<!-- <mat-icon>login</mat-icon>-->
|
||||||
Login
|
<i class="d- f-20" antIcon theme="outline" type="login">Login</i>
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
@if (isLoggedIn) {
|
@if (isLoggedIn) {
|
||||||
@@ -48,7 +48,8 @@
|
|||||||
{{ username }}
|
{{ username }}
|
||||||
</button>
|
</button>
|
||||||
<button mat-raised-button (click)="logout()">
|
<button mat-raised-button (click)="logout()">
|
||||||
<mat-icon>logout</mat-icon>
|
|
||||||
|
<i class="d-flex f-20" antIcon theme="outline" type="logout"></i>
|
||||||
Logout
|
Logout
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
|||||||
@@ -13,3 +13,8 @@ mat-toolbar{
|
|||||||
left: 0;
|
left: 0;
|
||||||
z-index: 1000; // Ensure toolbar stays above other content
|
z-index: 1000; // Ensure toolbar stays above other content
|
||||||
}
|
}
|
||||||
|
.mat-mdc-raised-button:not(:disabled){
|
||||||
|
color: rgba(24, 255, 255, 0.96);
|
||||||
|
background-color: rgba(24,255,255,0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,13 +7,21 @@ import {BreadcrumbComponent} from '../../components/breadcrumb/breadcrumb.compon
|
|||||||
import {NavBarComponent} from '../../layouts/admin-layout/nav-bar/nav-bar.component';
|
import {NavBarComponent} from '../../layouts/admin-layout/nav-bar/nav-bar.component';
|
||||||
import {MatToolbar} from '@angular/material/toolbar';
|
import {MatToolbar} from '@angular/material/toolbar';
|
||||||
import {MatButton} from '@angular/material/button';
|
import {MatButton} from '@angular/material/button';
|
||||||
import {IconDirective} from '@ant-design/icons-angular';
|
import {IconDirective, IconService} from '@ant-design/icons-angular';
|
||||||
import {MatDialog} from '@angular/material/dialog';
|
import {MatDialog} from '@angular/material/dialog';
|
||||||
import {Subscription} from 'rxjs';
|
import {Subscription} from 'rxjs';
|
||||||
import {TokenStorageService} from '../../services/token-storage.service';
|
import {TokenStorageService} from '../../services/token-storage.service';
|
||||||
import {AuthService} from '../../services/auth.service';
|
import {AuthService} from '../../services/auth.service';
|
||||||
import {EventBusService} from '../../_shared/event-bus.service';
|
import {EventBusService} from '../../_shared/event-bus.service';
|
||||||
import {DialogComponent} from '../../components/dialog/dialog.component';
|
import {DialogComponent} from '../../components/dialog/dialog.component';
|
||||||
|
import {
|
||||||
|
ArrowRightOutline, BellOutline,
|
||||||
|
CheckCircleOutline, CommentOutline, EditOutline,
|
||||||
|
GiftOutline, GithubOutline, LockOutline, LogoutOutline,
|
||||||
|
MessageOutline,
|
||||||
|
PhoneOutline, ProfileOutline, QuestionCircleOutline,
|
||||||
|
SettingOutline, UnorderedListOutline, UserOutline, WalletOutline
|
||||||
|
} from '@ant-design/icons-angular/icons';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-main.component',
|
selector: 'app-main.component',
|
||||||
@@ -51,9 +59,32 @@ export class MainComponent implements OnInit{
|
|||||||
private storageService: TokenStorageService = inject(TokenStorageService);
|
private storageService: TokenStorageService = inject(TokenStorageService);
|
||||||
private authService: AuthService = inject(AuthService);
|
private authService: AuthService = inject(AuthService);
|
||||||
private eventBusService: EventBusService = inject(EventBusService);
|
private eventBusService: EventBusService = inject(EventBusService);
|
||||||
|
private iconService = inject(IconService);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
constructor(private router: Router) {
|
constructor(private router: Router) {
|
||||||
|
this.iconService.addIcon(
|
||||||
|
...[
|
||||||
|
CheckCircleOutline,
|
||||||
|
GiftOutline,
|
||||||
|
MessageOutline,
|
||||||
|
SettingOutline,
|
||||||
|
PhoneOutline,
|
||||||
|
LogoutOutline,
|
||||||
|
UserOutline,
|
||||||
|
EditOutline,
|
||||||
|
ProfileOutline,
|
||||||
|
QuestionCircleOutline,
|
||||||
|
LockOutline,
|
||||||
|
CommentOutline,
|
||||||
|
UnorderedListOutline,
|
||||||
|
ArrowRightOutline,
|
||||||
|
BellOutline,
|
||||||
|
GithubOutline,
|
||||||
|
WalletOutline
|
||||||
|
]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
goToHome() {
|
goToHome() {
|
||||||
this.router.navigate(['main/home']);
|
this.router.navigate(['main/home']);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.jambotronGroup.jambotron.system;
|
package com.jambotronGroup.jambotron.system;
|
||||||
|
|
||||||
import com.jambotronGroup.jambotron.JambotronApplication;
|
import com.jambotronGroup.jambotron.JambotronApplication;
|
||||||
|
import com.jambotronGroup.jambotron.controllers.SystemController;
|
||||||
import com.jambotronGroup.jambotron.model.Bean;
|
import com.jambotronGroup.jambotron.model.Bean;
|
||||||
import com.jambotronGroup.jambotron.model.NameValueItem;
|
import com.jambotronGroup.jambotron.model.NameValueItem;
|
||||||
import com.jambotronGroup.jambotron.utils.EntityLoggingConsumer;
|
import com.jambotronGroup.jambotron.utils.EntityLoggingConsumer;
|
||||||
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
|
import org.springframework.data.web.config.SpringDataWebSettings;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -27,9 +29,11 @@ public class SystemServiceImpl implements SystemService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
DataSourceProperties _dataSourceProperties;
|
DataSourceProperties _dataSourceProperties;
|
||||||
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(SystemServiceImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(SystemServiceImpl.class);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public List<NameValueItem> getDataSourceProperties(){
|
public List<NameValueItem> getDataSourceProperties(){
|
||||||
List<NameValueItem> returnValue = new ArrayList<NameValueItem>();
|
List<NameValueItem> returnValue = new ArrayList<NameValueItem>();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- Column: public.tutorials.
|
||||||
|
|
||||||
|
ALTER TABLE IF EXISTS public.tutorials DROP COLUMN IF EXISTS id;
|
||||||
|
|
||||||
|
ALTER TABLE IF EXISTS public.tutorials
|
||||||
|
ADD COLUMN id bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 );
|
||||||
Reference in New Issue
Block a user