Skip to content

build(deps): drop Angular Material + Bootstrap, enable Preflight (migration complete) #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gkbishnoi07 merged 8 commits into from
Jul 9, 2026
Merged

build(deps): drop Angular Material + Bootstrap, enable Preflight (migration complete) #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
611babc
build(deps): drop Angular Material + Bootstrap; enable Tailwind Prefl…
gkbishnoi07 Jul 6, 2026
81f66b7
fix(ui): import NgFor in main-store indent worklist; drop unused NgClass
gkbishnoi07 Jul 6, 2026
c665dcf
refactor(ui): remove the global footer (parity with MMU-UI)
gkbishnoi07 Jul 6, 2026
ab488d8
fix(ui): register provideZard() and use the colored Swasthya logo in …
gkbishnoi07 Jul 6, 2026
556ca02
feat(ui): match the service-selection tile to MMU-UI (primary tile + …
gkbishnoi07 Jul 6, 2026
6d812ec
fix(ui): service tile keeps the store icon on the primary tile
gkbishnoi07 Jul 6, 2026
8c183dd
fix(ui): service tile shows only a large store icon
gkbishnoi07 Jul 6, 2026
5a81611
fix(ui): bump Common-UI - shadcn-faithful form colors + table headers
gkbishnoi07 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common-UI
Open in desktop
Submodule Common-UI updated 3 files
+1 −1 v2/ui/form/form.component.ts
+3 −3 v2/ui/form/form.variants.ts
+2 −2 v2/ui/table/table.variants.ts
12 changes: 3 additions & 9 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@
}
],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
"src/tailwind.css",
"src/css/custom.css",
"src/css/layout.css",
"src/styles.css",
"src/bootstrap.layer.css"
"src/styles.css"
],
"scripts": [
"node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
]
"scripts": []
},
"configurations": {
"production": {
Expand Down Expand Up @@ -145,12 +141,10 @@
"src/assets"
],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
"src/tailwind.css",
"src/css/custom.css",
"src/css/layout.css",
"src/styles.css",
"src/bootstrap.layer.css"
"src/styles.css"
],
"scripts": []
}
Expand Down
49 changes: 0 additions & 49 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"@angular/compiler": "^20.3.25",
"@angular/core": "^20.3.25",
"@angular/forms": "^20.3.25",
"@angular/material": "^20.2.14",
"@angular/platform-browser": "^20.3.25",
"@angular/platform-browser-dynamic": "^20.3.25",
"@angular/router": "^20.3.25",
Expand All @@ -40,7 +39,6 @@
"@types/file-saver": "^2.0.7",
"angular": "^1.6.10",
"angular-moment": "^1.3.0",
"bootstrap": "^5.3.2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"crypto-js": "^4.2.0",
Expand Down
37 changes: 0 additions & 37 deletions src/app/app-modules/core/components/app-footer/app-footer.component.html
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/app/app-modules/core/components/app-footer/app-footer.component.spec.ts
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions src/app/app-modules/core/components/app-footer/app-footer.component.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/app-modules/core/components/app-header/app-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[class.border-b]="!showRoles"
>
<a class="inline-flex items-center" aria-label="Piramal Swasthya">
<img class="h-8 w-auto" src="assets/images/logo.png" alt="Logo" />
<img class="h-8 w-auto" src="assets/images/Swasthya.png" alt="Logo" />
</a>

<div class="flex flex-wrap items-center justify-end gap-2">
Expand Down
7 changes: 3 additions & 4 deletions src/app/app-modules/core/components/batch-adjustment/batch-adjustment.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import { Observable } from 'rxjs';
import { SetLanguageComponent } from '../set-language.component';
import { LanguageService } from '../../services/language.service';
import { Z_MODAL_DATA, ZardDialogRef } from 'Common-UI/v2/ui/dialog';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { TableDataSource } from 'src/app/app-modules/core/utils/table-data-source';
import { FormsModule } from '@angular/forms';
import { StringValidatorDirective } from '../../directives/stringValidator.directive';
import { NgIf, NgFor, DatePipe } from '@angular/common';
Expand Down Expand Up @@ -69,8 +68,8 @@ export class BatchAdjustmentComponent implements OnInit, DoCheck {
selectedBatchList: any = [];
languageComponent!: SetLanguageComponent;
currentLanguageSet: any;
dataSource = new MatTableDataSource<any>();
@ViewChild(MatPaginator) paginator: MatPaginator | null = null;
dataSource = new TableDataSource<any>();
paginator: unknown = null;
data: any;

constructor(
Expand Down
7 changes: 3 additions & 4 deletions src/app/app-modules/core/components/batch-search/batch-search.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import { Observable } from 'rxjs';
import { SetLanguageComponent } from '../set-language.component';
import { LanguageService } from '../../services/language.service';
import { Z_MODAL_DATA, ZardDialogRef } from 'Common-UI/v2/ui/dialog';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { TableDataSource } from 'src/app/app-modules/core/utils/table-data-source';
import { FormsModule } from '@angular/forms';
import { StringValidatorDirective } from '../../directives/stringValidator.directive';
import { NgIf, NgFor, DatePipe } from '@angular/common';
Expand Down Expand Up @@ -69,8 +68,8 @@ export class BatchSearchComponent implements OnInit, DoCheck {
languageComponent!: SetLanguageComponent;
currentLanguageSet: any;
noRecordsFlag = false;
dataSource = new MatTableDataSource<any>();
@ViewChild(MatPaginator) paginator: MatPaginator | null = null;
dataSource = new TableDataSource<any>();
paginator: unknown = null;

constructor(
@Inject(Z_MODAL_DATA) public input: any,
Expand Down
4 changes: 2 additions & 2 deletions src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { Router, ActivatedRoute } from '@angular/router';
import { BeneficiaryDetailsService } from '../../services/beneficiary-details.service';
import { LanguageService } from '../../services/language.service';
import { SetLanguageComponent } from '../set-language.component';
import { MatTableDataSource } from '@angular/material/table';
import { TableDataSource } from 'src/app/app-modules/core/utils/table-data-source';
import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service';
import { NgIf, DatePipe } from '@angular/common';

Expand All @@ -41,7 +41,7 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy {
currentLanguageSet: any;
languageComponent!: SetLanguageComponent;
healthIDValue!: string;
dataList = new MatTableDataSource<any>();
dataList = new TableDataSource<any>();

constructor(
private router: Router,
Expand Down
7 changes: 3 additions & 4 deletions src/app/app-modules/core/components/indent-item-list/indent-item-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import { BatchSearchService } from '../../services/batch-search.service';
import { SetLanguageComponent } from '../set-language.component';
import { LanguageService } from '../../services/language.service';
import { Z_MODAL_DATA, ZardDialogRef } from 'Common-UI/v2/ui/dialog';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { TableDataSource } from 'src/app/app-modules/core/utils/table-data-source';
import { FormsModule } from '@angular/forms';
import { StringValidatorDirective } from '../../directives/stringValidator.directive';
import { NgIf, NgFor } from '@angular/common';
Expand Down Expand Up @@ -64,8 +63,8 @@ export class IndentItemListComponent implements OnInit, DoCheck {
searchTerms!: string;
items!: Observable<any>;
selectedItemList: any = [];
dataSource = new MatTableDataSource<any>();
@ViewChild(MatPaginator) paginator: MatPaginator | null = null;
dataSource = new TableDataSource<any>();
paginator: unknown = null;
languageComponent!: SetLanguageComponent;
currentLanguageSet: any;
noRecordsFlag = false;
Expand Down
7 changes: 3 additions & 4 deletions src/app/app-modules/core/components/item-dispense/item-dispense.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import { Observable } from 'rxjs';
import { SetLanguageComponent } from '../set-language.component';
import { LanguageService } from '../../services/language.service';
import { Z_MODAL_DATA, ZardDialogRef } from 'Common-UI/v2/ui/dialog';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { TableDataSource } from 'src/app/app-modules/core/utils/table-data-source';
import { FormsModule } from '@angular/forms';
import { StringValidatorDirective } from '../../directives/stringValidator.directive';
import { NgIf, NgFor } from '@angular/common';
Expand Down Expand Up @@ -66,9 +65,9 @@ export class ItemDispenseComponent implements OnInit, DoCheck {

languageComponent!: SetLanguageComponent;
currentLanguageSet: any;
dataSource = new MatTableDataSource<any>();
dataSource = new TableDataSource<any>();
noRecordsFlag = false;
@ViewChild(MatPaginator) paginator: MatPaginator | null = null;
paginator: unknown = null;

constructor(
@Inject(Z_MODAL_DATA) public input: any,
Expand Down
Loading
Loading