diff --git a/package-lock.json b/package-lock.json index bb152e8..f46ed69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,6 +65,7 @@ "ngx-echarts": "^15.0.1", "ngx-google-places-autocomplete": "^2.0.5", "ngx-image-cropper": "^6.3.2", + "ngx-mask": "^14.2.4", "ngx-masonry": "^14.0.1", "ngx-perfect-scrollbar": "^10.1.1", "ngx-quill": "^20.0.1", @@ -14433,6 +14434,19 @@ "@angular/core": ">=13.0.0" } }, + "node_modules/ngx-mask": { + "version": "14.2.4", + "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-14.2.4.tgz", + "integrity": "sha512-158nAe2tyiZa2T8COoI6SvJCQHqpJ4+JW0amGcvVEYUBF6FIoYK66BlnOJURAOy5qry0d0N45w7J/LGsCBgZcg==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=10.0.0", + "@angular/core": ">=10.0.0", + "@angular/forms": ">=10.0.0" + } + }, "node_modules/ngx-masonry": { "version": "14.0.1", "resolved": "https://registry.npmjs.org/ngx-masonry/-/ngx-masonry-14.0.1.tgz", @@ -30171,6 +30185,14 @@ "tslib": "^2.3.0" } }, + "ngx-mask": { + "version": "14.2.4", + "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-14.2.4.tgz", + "integrity": "sha512-158nAe2tyiZa2T8COoI6SvJCQHqpJ4+JW0amGcvVEYUBF6FIoYK66BlnOJURAOy5qry0d0N45w7J/LGsCBgZcg==", + "requires": { + "tslib": "^2.3.0" + } + }, "ngx-masonry": { "version": "14.0.1", "resolved": "https://registry.npmjs.org/ngx-masonry/-/ngx-masonry-14.0.1.tgz", diff --git a/package.json b/package.json index 92315b0..79ac79a 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "ngx-echarts": "^15.0.1", "ngx-google-places-autocomplete": "^2.0.5", "ngx-image-cropper": "^6.3.2", + "ngx-mask": "^14.2.4", "ngx-masonry": "^14.0.1", "ngx-perfect-scrollbar": "^10.1.1", "ngx-quill": "^20.0.1", diff --git a/src/app/_layout/footer/footer.component.html b/src/app/_layout/footer/footer.component.html index f3e7c3e..0898b63 100644 --- a/src/app/_layout/footer/footer.component.html +++ b/src/app/_layout/footer/footer.component.html @@ -13,7 +13,7 @@ href="https://allbestsistem.com/" target="_blank" style="background-color: #000000 !important;" - >Smart Building Management Systems (V@2024-06-13.01) + >Smart Building Management Systems (V@2024-06-14.01)

diff --git a/src/app/_layout/header/vertical/vertical.component.html b/src/app/_layout/header/vertical/vertical.component.html index b22479b..54e3f99 100644 --- a/src/app/_layout/header/vertical/vertical.component.html +++ b/src/app/_layout/header/vertical/vertical.component.html @@ -28,11 +28,11 @@ class="navbar-brand" routerLink="/dashboard/sales" > - + src="../../../../assets/images/logo/smart2.png" + />

@@ -106,7 +106,11 @@ ngbDropdown *ngIf="notification === 'on'" > - + + @@ -336,16 +340,16 @@ class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownProfileMenu" > - Edit Profile - My Inbox - Task - Chats diff --git a/src/app/_layout/settings/theme-settings.config.ts b/src/app/_layout/settings/theme-settings.config.ts index 03c010c..7ecf3f5 100644 --- a/src/app/_layout/settings/theme-settings.config.ts +++ b/src/app/_layout/settings/theme-settings.config.ts @@ -29,5 +29,5 @@ export const ThemeSettingsConfig = { // value:'http://evolvision.com/wp-content/uploads/2018/01/envelope4-green.png' }, }, - defaultTitleSuffix: 'Modern Admin - Angular 11+ Bootstrap 5 Admin Dashboard Template' + defaultTitleSuffix: '' }; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 5f87147..89a6831 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -74,7 +74,8 @@ export class AppComponent implements OnInit { } } if (this.title && this.router.url !== '/') { - this.titleService.setTitle(this.title + ' - ' + this._themeSettingsConfig.defaultTitleSuffix); + this.titleService.setTitle(this.title); + // this.titleService.setTitle(this.title + ' - ' + this._themeSettingsConfig.defaultTitleSuffix); } else { if ((this.router.url === '/' || this.router.url === '/login' || this.router.url === '/register') && !localStorage.getItem('remember')) { diff --git a/src/app/content/full-pages/others/maintenance/maintenance.component.html b/src/app/content/full-pages/others/maintenance/maintenance.component.html index ef5c73b..eccd845 100644 --- a/src/app/content/full-pages/others/maintenance/maintenance.component.html +++ b/src/app/content/full-pages/others/maintenance/maintenance.component.html @@ -14,7 +14,7 @@
- logo
diff --git a/src/app/content/full-pages/others/search-page/search-page.component.html b/src/app/content/full-pages/others/search-page/search-page.component.html index 755b959..d8d7881 100644 --- a/src/app/content/full-pages/others/search-page/search-page.component.html +++ b/src/app/content/full-pages/others/search-page/search-page.component.html @@ -7,7 +7,7 @@
Modern Search + src="../../../../../assets/images/logo/smart.png" alt="Modern Search">
diff --git a/src/app/content/hemat-app/coming-soon/coming-soon.component.html b/src/app/content/hemat-app/coming-soon/coming-soon.component.html index 6e2b71f..fc54b59 100644 --- a/src/app/content/hemat-app/coming-soon/coming-soon.component.html +++ b/src/app/content/hemat-app/coming-soon/coming-soon.component.html @@ -7,7 +7,7 @@
logo
- -
- Kwh + +
+ Kwh +
-
- +
+ +
+ IDR +
+
@@ -299,14 +328,16 @@ > - {{ rowIndex + 1 }} +

+ {{ rowIndex + 1 }} +

| (() => Partial) = null; @NgModule({ @@ -40,6 +41,7 @@ import { ModalAddActualComponent } from './modal-add-actual/modal-add-actual.com NgChartsModule, ChartistModule, MatchHeightModule, + NgxMaskModule.forRoot(), BlockUIModule.forRoot({ template: BlockTemplateComponent }), diff --git a/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html b/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html index d941700..54a5ba5 100644 --- a/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html +++ b/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html @@ -1,7 +1,7 @@