diff --git a/jambotron-ui/src/app/components/breadcrumb/breadcrumb.component.ts b/jambotron-ui/src/app/components/breadcrumb/breadcrumb.component.ts index d824924..d119640 100644 --- a/jambotron-ui/src/app/components/breadcrumb/breadcrumb.component.ts +++ b/jambotron-ui/src/app/components/breadcrumb/breadcrumb.component.ts @@ -62,7 +62,7 @@ export class BreadcrumbComponent { this.navigationList = breadcrumbList;//breadcrumbList.slice(breadcrumbList.length - 1, breadcrumbList.length); const title = breadcrumbList[breadcrumbList.length - 1]?.title || 'Welcome'; - this.titleService.setTitle(title + ' | Mantis Angular Admin Template'); + this.titleService.setTitle(title ); } }); } diff --git a/jambotron-ui/src/app/layouts/admin-layout/nav-bar/nav-right/nav-right.component.html b/jambotron-ui/src/app/layouts/admin-layout/nav-bar/nav-right/nav-right.component.html index 97bcd93..5d6e4a5 100644 --- a/jambotron-ui/src/app/layouts/admin-layout/nav-bar/nav-right/nav-right.component.html +++ b/jambotron-ui/src/app/layouts/admin-layout/nav-bar/nav-right/nav-right.component.html @@ -104,7 +104,7 @@
JWT User
UI/UX Designer - + -
-
-
-
- user -
-
Mantis Pro
- Checkout pro features -
-
- - Pro - -
-
-
-
-
diff --git a/jambotron-ui/src/app/main-module/main.component/main.component.html b/jambotron-ui/src/app/main-module/main.component/main.component.html index 82e7c14..e38d048 100644 --- a/jambotron-ui/src/app/main-module/main.component/main.component.html +++ b/jambotron-ui/src/app/main-module/main.component/main.component.html @@ -39,7 +39,7 @@ } @if (isLoggedIn) { @@ -48,7 +48,8 @@ {{ username }} diff --git a/jambotron-ui/src/app/main-module/main.component/main.component.scss b/jambotron-ui/src/app/main-module/main.component/main.component.scss index 713ba97..91d9aa8 100644 --- a/jambotron-ui/src/app/main-module/main.component/main.component.scss +++ b/jambotron-ui/src/app/main-module/main.component/main.component.scss @@ -13,3 +13,8 @@ mat-toolbar{ left: 0; 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); +} + diff --git a/jambotron-ui/src/app/main-module/main.component/main.component.ts b/jambotron-ui/src/app/main-module/main.component/main.component.ts index 5df47b4..8274fe7 100644 --- a/jambotron-ui/src/app/main-module/main.component/main.component.ts +++ b/jambotron-ui/src/app/main-module/main.component/main.component.ts @@ -7,13 +7,21 @@ import {BreadcrumbComponent} from '../../components/breadcrumb/breadcrumb.compon import {NavBarComponent} from '../../layouts/admin-layout/nav-bar/nav-bar.component'; import {MatToolbar} from '@angular/material/toolbar'; 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 {Subscription} from 'rxjs'; import {TokenStorageService} from '../../services/token-storage.service'; import {AuthService} from '../../services/auth.service'; import {EventBusService} from '../../_shared/event-bus.service'; 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({ selector: 'app-main.component', @@ -51,9 +59,32 @@ export class MainComponent implements OnInit{ private storageService: TokenStorageService = inject(TokenStorageService); private authService: AuthService = inject(AuthService); private eventBusService: EventBusService = inject(EventBusService); + private iconService = inject(IconService); + + 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() { this.router.navigate(['main/home']); diff --git a/src/main/java/com/jambotronGroup/jambotron/system/SystemServiceImpl.java b/src/main/java/com/jambotronGroup/jambotron/system/SystemServiceImpl.java index 6eb88b1..d7cfe68 100644 --- a/src/main/java/com/jambotronGroup/jambotron/system/SystemServiceImpl.java +++ b/src/main/java/com/jambotronGroup/jambotron/system/SystemServiceImpl.java @@ -1,6 +1,7 @@ package com.jambotronGroup.jambotron.system; import com.jambotronGroup.jambotron.JambotronApplication; +import com.jambotronGroup.jambotron.controllers.SystemController; import com.jambotronGroup.jambotron.model.Bean; import com.jambotronGroup.jambotron.model.NameValueItem; 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.context.ApplicationContext; import org.springframework.core.env.Environment; +import org.springframework.data.web.config.SpringDataWebSettings; import org.springframework.stereotype.Service; import java.util.*; @@ -27,9 +29,11 @@ public class SystemServiceImpl implements SystemService { @Autowired DataSourceProperties _dataSourceProperties; + private static final Logger logger = LoggerFactory.getLogger(SystemServiceImpl.class); + public List getDataSourceProperties(){ List returnValue = new ArrayList(); diff --git a/src/main/resources/db/migration/V6__fix_tutorial_id.sql b/src/main/resources/db/migration/V6__fix_tutorial_id.sql new file mode 100644 index 0000000..108fee1 --- /dev/null +++ b/src/main/resources/db/migration/V6__fix_tutorial_id.sql @@ -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 ); \ No newline at end of file