diff --git a/.postcssrc.json b/.postcssrc.json new file mode 100644 index 0000000..e092dc7 --- /dev/null +++ b/.postcssrc.json @@ -0,0 +1,5 @@ +{ + "plugins": { + "@tailwindcss/postcss": {} + } +} diff --git a/Common-UI b/Common-UI index 71a2236..306f09b 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 71a223686e9f4bae4e425be286d362a23998cb2a +Subproject commit 306f09bc3f3ecc387a1dc19ecb43f6d8ab17f63f diff --git a/angular.json b/angular.json index 2fb7383..0973b3a 100644 --- a/angular.json +++ b/angular.json @@ -31,14 +31,16 @@ ], "styles": [ "@angular/material/prebuilt-themes/indigo-pink.css", + "src/tailwind.css", + "src/css/custom.css", + "src/css/layout.css", "src/styles.css", - "node_modules/bootstrap/dist/css/bootstrap.min.css" + "src/bootstrap.layer.css" ], "scripts": [ "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" ] }, - "configurations": { "production": { "budgets": [ @@ -98,7 +100,7 @@ } ] }, - "test":{ + "test": { "fileReplacements": [ { "replace": "src/environments/environment.ts", @@ -120,7 +122,7 @@ } }, "defaultConfiguration": "development", - "options":{ + "options": { "port": 4201 } }, @@ -144,7 +146,11 @@ ], "styles": [ "@angular/material/prebuilt-themes/indigo-pink.css", - "src/styles.css" + "src/tailwind.css", + "src/css/custom.css", + "src/css/layout.css", + "src/styles.css", + "src/bootstrap.layer.css" ], "scripts": [] } diff --git a/package-lock.json b/package-lock.json index a023248..a049932 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,11 +20,15 @@ "@angular/platform-browser": "^20.3.25", "@angular/platform-browser-dynamic": "^20.3.25", "@angular/router": "^20.3.25", + "@ng-icons/core": "^32.5.0", + "@ng-icons/lucide": "^32.5.0", "@types/events": "^3.0.3", "@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", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -32,6 +36,8 @@ "ng-cryptostore": "^16.0.0", "ngx-cookie-service": "^20.1.1", "rxjs": "~7.8.0", + "tailwind-merge": "^3.6.0", + "tailwindcss-animate": "^1.0.7", "tslib": "^2.3.0", "zone.js": "~0.15.1" }, @@ -44,6 +50,7 @@ "@angular/compiler-cli": "^20.3.25", "@commitlint/cli": "^19.8.0", "@commitlint/config-conventional": "^19.8.0", + "@tailwindcss/postcss": "^4.3.2", "@types/crypto-js": "^4.2.1", "@types/jasmine": "~4.3.0", "@types/node": "^22.14.0", @@ -63,6 +70,7 @@ "lint-staged": "^15.2.2", "prettier": "^3.2.5", "prettier-eslint": "^16.3.0", + "tailwindcss": "^4.3.2", "typescript": "~5.8.3" } }, @@ -275,6 +283,19 @@ "node": ">= 14.0.0" } }, + "node_modules/@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -5691,9 +5712,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { @@ -6687,6 +6708,29 @@ "node": ">= 10" } }, + "node_modules/@ng-icons/core": { + "version": "32.5.0", + "resolved": "https://registry.npmjs.org/@ng-icons/core/-/core-32.5.0.tgz", + "integrity": "sha512-6zAXQ5vryaclOWEVzprFJjJAW6NSOl0eBm+I6BwmcMk+vR+1vHU82DNpNTbUE9Wn4CGXEP1yd+S+pTKIaRTXjg==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=20.0.0", + "@angular/core": ">=20.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, + "node_modules/@ng-icons/lucide": { + "version": "32.5.0", + "resolved": "https://registry.npmjs.org/@ng-icons/lucide/-/lucide-32.5.0.tgz", + "integrity": "sha512-oLIkz2tB4ZnO3JoLQ8pS15AaR7kxBpF81s/e3mGALqNXSu2U2u0TgiP88CF/4DQ14ONFD7S/gT4Ej4gIESvbeQ==", + "license": "ISC", + "dependencies": { + "tslib": "^2.3.0" + } + }, "node_modules/@ngtools/webpack": { "version": "20.3.31", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-20.3.31.tgz", @@ -8111,6 +8155,301 @@ "devOptional": true, "license": "MIT" }, + "node_modules/@tailwindcss/node": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.3.2.tgz", + "integrity": "sha512-yWP/sqEcBLaD8JuA6zNwxoYKr75qxTioYwlRwekj5Jr/I5GXnoJfjetH/psLUIv74cYTH2lBUEzBkinthoYcBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/remapping": "^2.3.5", + "enhanced-resolve": "5.21.6", + "jiti": "^2.7.0", + "lightningcss": "1.32.0", + "magic-string": "^0.30.21", + "source-map-js": "^1.2.1", + "tailwindcss": "4.3.2" + } + }, + "node_modules/@tailwindcss/node/node_modules/enhanced-resolve": { + "version": "5.21.6", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz", + "integrity": "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.3.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@tailwindcss/node/node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/@tailwindcss/oxide": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.3.2.tgz", + "integrity": "sha512-z8ZgnzX8gdNoWLBLqBPoh/sjnxkwvf9ZuWjnO0l0yIzbLa5/9S+eC5QxGZKRobVHIC3/1BoMWjHblqWjcgFgag==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20" + }, + "optionalDependencies": { + "@tailwindcss/oxide-android-arm64": "4.3.2", + "@tailwindcss/oxide-darwin-arm64": "4.3.2", + "@tailwindcss/oxide-darwin-x64": "4.3.2", + "@tailwindcss/oxide-freebsd-x64": "4.3.2", + "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.2", + "@tailwindcss/oxide-linux-arm64-gnu": "4.3.2", + "@tailwindcss/oxide-linux-arm64-musl": "4.3.2", + "@tailwindcss/oxide-linux-x64-gnu": "4.3.2", + "@tailwindcss/oxide-linux-x64-musl": "4.3.2", + "@tailwindcss/oxide-wasm32-wasi": "4.3.2", + "@tailwindcss/oxide-win32-arm64-msvc": "4.3.2", + "@tailwindcss/oxide-win32-x64-msvc": "4.3.2" + } + }, + "node_modules/@tailwindcss/oxide-android-arm64": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.3.2.tgz", + "integrity": "sha512-WHxqIuHpvZ5VtdX6GTl1Ik/Vp2YuN42Et+0CdeaVd/frQ9jAvGmvR8vLT+jk3e8/Q3x8kECB9+R17pgpp2BulA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-darwin-arm64": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.3.2.tgz", + "integrity": "sha512-GZypeUY/IDJW3877KeM+O67vbXr3MBnbtEL4aYhNErv/JWZhye2vGSWWG9tB6iiqR2MqRNkY8IOUy4NdSZV26w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-darwin-x64": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.3.2.tgz", + "integrity": "sha512-UIIzmefR6KO1sDU7MzRqAxC8iBpft/VhkGjTjnhoS6k7Z3rQ9wEgA1ODSiyH/tcSYssulNm4Ci3hOeK1jH7ccQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-freebsd-x64": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.3.2.tgz", + "integrity": "sha512-GN+uAmcI6DNspnCDwtOAZrTz6oukJnp337qZvxqCGLd3BHBzJpO0ZbTLRvJNdztOeAmTzewewGIMPb0tk2R4WA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.3.2.tgz", + "integrity": "sha512-4ABn7qSbdHRwTiDiuWNegCyb5+2FJ4vKIKc3DmKrvAFw7MU1Lm11dIkTPwUaFdTzc7IsOpDbqBrlh0x6y36U/w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.3.2.tgz", + "integrity": "sha512-wDgEIGwoM8w8pufh9LVt1PahDgNdKXrLC2qfAnV3vAmococ9RWbxeAw4pxPttd/TsJfwjyLf90Dg1y9y8I6Emw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-musl": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.3.2.tgz", + "integrity": "sha512-J5Nuk0uZQIiMTJj3LEx4sAA9tMFUoXQZFv1J6An+QGYe53HKRJuFDi0rpq/tuouCZeAbOBY3kQ6g8qeD4TUjtA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-gnu": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.3.2.tgz", + "integrity": "sha512-kqCZpSKOBEJO4mz7OqWoofBZeXTAwaVGPj0ErAj7CojmhKpWVWVOnrt9dE8odoIraZq4oj3ausM37kXi+Tow8w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-musl": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.3.2.tgz", + "integrity": "sha512-cixpqbh2toJDmkuCRI68nXA8ZxNmdK9Y+9v5h3MC3ZQKy/0BO8AWzlkWyRM7JAFSGBlfig4YVTPsK6MVgqz1uw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.3.2.tgz", + "integrity": "sha512-4ec2Z/LOmRsAgU23CS4xeJfcJlmRg94A/XrbGRCF1gyU/zdDfRLYDVsS+ynSZCmGNxQ1jQriQOKMQeQxBA3Isw==", + "bundleDependencies": [ + "@napi-rs/wasm-runtime", + "@emnapi/core", + "@emnapi/runtime", + "@tybys/wasm-util", + "@emnapi/wasi-threads", + "tslib" + ], + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.11.1", + "@emnapi/runtime": "^1.11.1", + "@emnapi/wasi-threads": "^1.2.2", + "@napi-rs/wasm-runtime": "^1.1.4", + "@tybys/wasm-util": "^0.10.2", + "tslib": "^2.8.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.2.tgz", + "integrity": "sha512-Zyr/M0+XcYZu3bZrUytc7TXvrk0ftWfl8gN2MwekNDzhqhKRUucMPSeOzM0o0wH5AWOU49BsKRrfKxI2atCPMQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/oxide-win32-x64-msvc": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.3.2.tgz", + "integrity": "sha512-QI9BO7KlNZsp2GuO0jwAAj5jCDABOKXRkCk2XuKTSaNEFSdfzqswYVTtCHBNKHLsqyjFyFkqlDiwkNbTYSssMQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 20" + } + }, + "node_modules/@tailwindcss/postcss": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.3.2.tgz", + "integrity": "sha512-rjVWYCa7Ngbi5AarT6k8TkxUG3Wl1QKzHdIZVsjZSzf36Jmo2IKZt/NHRAwly8oDkbBOH0YTu+CHuf9jPxMc+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@alloc/quick-lru": "^5.2.0", + "@tailwindcss/node": "4.3.2", + "@tailwindcss/oxide": "4.3.2", + "postcss": "^8.5.15", + "tailwindcss": "4.3.2" + } + }, "node_modules/@tufjs/canonical-json": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", @@ -9922,6 +10261,18 @@ "node": ">=6.0" } }, + "node_modules/class-variance-authority": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz", + "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==", + "license": "Apache-2.0", + "dependencies": { + "clsx": "^2.1.1" + }, + "funding": { + "url": "https://polar.sh/cva" + } + }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -10071,6 +10422,15 @@ "node": ">=0.10.0" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -10924,8 +11284,8 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "devOptional": true, "license": "Apache-2.0", - "optional": true, "engines": { "node": ">=8" } @@ -13842,9 +14202,9 @@ } }, "node_modules/jiti": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", - "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.7.0.tgz", + "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==", "devOptional": true, "license": "MIT", "bin": { @@ -14354,6 +14714,267 @@ "immediate": "~3.0.5" } }, + "node_modules/lightningcss": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", + "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "devOptional": true, + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-android-arm64": "1.32.0", + "lightningcss-darwin-arm64": "1.32.0", + "lightningcss-darwin-x64": "1.32.0", + "lightningcss-freebsd-x64": "1.32.0", + "lightningcss-linux-arm-gnueabihf": "1.32.0", + "lightningcss-linux-arm64-gnu": "1.32.0", + "lightningcss-linux-arm64-musl": "1.32.0", + "lightningcss-linux-x64-gnu": "1.32.0", + "lightningcss-linux-x64-musl": "1.32.0", + "lightningcss-win32-arm64-msvc": "1.32.0", + "lightningcss-win32-x64-msvc": "1.32.0" + } + }, + "node_modules/lightningcss-android-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", + "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", + "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", + "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", + "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", + "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", + "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", + "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", + "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", + "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", + "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", + "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/lilconfig": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", @@ -18590,6 +19211,31 @@ "url": "https://opencollective.com/synckit" } }, + "node_modules/tailwind-merge": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz", + "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, + "node_modules/tailwindcss": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.2.tgz", + "integrity": "sha512-WtctNNSH8A9jlMIqxzuYumOHU5uGZyRv0Q5svQl+oEPy5w84YpBxdb7MdqyiSPQge5jTJ6zFQLq0PFygdccSBA==", + "license": "MIT" + }, + "node_modules/tailwindcss-animate": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz", + "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==", + "license": "MIT", + "peerDependencies": { + "tailwindcss": ">=3.0.0 || insiders" + } + }, "node_modules/tapable": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", diff --git a/package.json b/package.json index 84fca8f..ae0e174 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,15 @@ "@angular/platform-browser": "^20.3.25", "@angular/platform-browser-dynamic": "^20.3.25", "@angular/router": "^20.3.25", + "@ng-icons/core": "^32.5.0", + "@ng-icons/lucide": "^32.5.0", "@types/events": "^3.0.3", "@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", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -46,6 +50,8 @@ "ng-cryptostore": "^16.0.0", "ngx-cookie-service": "^20.1.1", "rxjs": "~7.8.0", + "tailwind-merge": "^3.6.0", + "tailwindcss-animate": "^1.0.7", "tslib": "^2.3.0", "zone.js": "~0.15.1" }, @@ -58,6 +64,7 @@ "@angular/compiler-cli": "^20.3.25", "@commitlint/cli": "^19.8.0", "@commitlint/config-conventional": "^19.8.0", + "@tailwindcss/postcss": "^4.3.2", "@types/crypto-js": "^4.2.1", "@types/jasmine": "~4.3.0", "@types/node": "^22.14.0", @@ -77,6 +84,7 @@ "lint-staged": "^15.2.2", "prettier": "^3.2.5", "prettier-eslint": "^16.3.0", + "tailwindcss": "^4.3.2", "typescript": "~5.8.3" }, "config": { diff --git a/src/app/app-modules/core/components/app-header/app-header.component.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts index 3f3ba85..55e9159 100644 --- a/src/app/app-modules/core/components/app-header/app-header.component.ts +++ b/src/app/app-modules/core/components/app-header/app-header.component.ts @@ -25,7 +25,7 @@ import { AuthService } from '../../services/auth.service'; import { ConfirmationService } from '../../services/confirmation.service'; import { LanguageService } from '../../services/language.service'; import { MatDialog } from '@angular/material/dialog'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { environment } from 'src/environments/environment'; import { CookieService } from 'ngx-cookie-service'; import { ShowCommitAndVersionDetailsComponent } from '../show-commit-and-version-details/show-commit-and-version-details.component'; diff --git a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.ts b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.ts index 9ea8062..0997b88 100644 --- a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.ts +++ b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.ts @@ -26,7 +26,7 @@ import { BeneficiaryDetailsService } from '../../services/beneficiary-details.se import { LanguageService } from '../../services/language.service'; import { SetLanguageComponent } from '../set-language.component'; import { MatTableDataSource } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { NgIf, DatePipe } from '@angular/common'; @Component({ diff --git a/src/app/app-modules/core/components/search/search.component.ts b/src/app/app-modules/core/components/search/search.component.ts index 3f4edd2..c58120a 100644 --- a/src/app/app-modules/core/components/search/search.component.ts +++ b/src/app/app-modules/core/components/search/search.component.ts @@ -47,7 +47,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatIconButton, MatButton } from '@angular/material/button'; import { MatTooltip } from '@angular/material/tooltip'; import { MatIcon } from '@angular/material/icon'; diff --git a/src/app/app-modules/core/services/auth-guard.service.ts b/src/app/app-modules/core/services/auth-guard.service.ts index 8635dd5..ca68696 100644 --- a/src/app/app-modules/core/services/auth-guard.service.ts +++ b/src/app/app-modules/core/services/auth-guard.service.ts @@ -23,7 +23,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router, ActivatedRoute } from '@angular/router'; import { SetLanguageComponent } from '../components/set-language.component'; import { LanguageService } from './language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable() export class AuthGuard implements CanActivate { diff --git a/src/app/app-modules/core/services/batch-search.service.ts b/src/app/app-modules/core/services/batch-search.service.ts index e214aed..981f0db 100644 --- a/src/app/app-modules/core/services/batch-search.service.ts +++ b/src/app/app-modules/core/services/batch-search.service.ts @@ -22,7 +22,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable() export class BatchSearchService { diff --git a/src/app/app-modules/core/services/beneficiary-details.service.ts b/src/app/app-modules/core/services/beneficiary-details.service.ts index 4fcf833..11a0eee 100644 --- a/src/app/app-modules/core/services/beneficiary-details.service.ts +++ b/src/app/app-modules/core/services/beneficiary-details.service.ts @@ -23,7 +23,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { environment } from 'src/environments/environment'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable() export class BeneficiaryDetailsService { diff --git a/src/app/app-modules/core/services/http-interceptor.service.ts b/src/app/app-modules/core/services/http-interceptor.service.ts index 73a6f41..85d8593 100644 --- a/src/app/app-modules/core/services/http-interceptor.service.ts +++ b/src/app/app-modules/core/services/http-interceptor.service.ts @@ -36,7 +36,7 @@ import { throwError } from 'rxjs/internal/observable/throwError'; import { SpinnerService } from './spinner.service'; import { ConfirmationService } from './confirmation.service'; import { environment } from 'src/environments/environment'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/app-modules/core/services/item-search.service.ts b/src/app/app-modules/core/services/item-search.service.ts index ab8a4ee..b7acc0a 100644 --- a/src/app/app-modules/core/services/item-search.service.ts +++ b/src/app/app-modules/core/services/item-search.service.ts @@ -21,7 +21,7 @@ */ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { environment } from 'src/environments/environment'; @Injectable() export class ItemSearchService { diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/indent-order-worklist.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/indent-order-worklist.component.ts index 73a3bd3..4d96896 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/indent-order-worklist.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/indent-order-worklist.component.ts @@ -23,7 +23,7 @@ import { Component, OnInit } from '@angular/core'; import { Router, RouterOutlet } from '@angular/router'; import { ConfirmationService } from 'src/app/app-modules/core/services'; import { InventoryService } from '../../shared/service/inventory.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Component({ selector: 'app-indent-order-worklist', templateUrl: './indent-order-worklist.component.html', diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts index 3fc21a9..41e3e29 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts @@ -44,7 +44,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton } from '@angular/material/button'; import { MatTooltip } from '@angular/material/tooltip'; import { MatIcon } from '@angular/material/icon'; diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/system-indent-dispense/system-indent-dispense.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/system-indent-dispense/system-indent-dispense.component.ts index 46cfaee..f8174bb 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/system-indent-dispense/system-indent-dispense.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/system-indent-dispense/system-indent-dispense.component.ts @@ -30,7 +30,7 @@ import { ShowIndentBatchDetailsComponent } from './show-indent-batch-details/sho import { Router, ActivatedRoute } from '@angular/router'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { NgIf, NgFor, DatePipe } from '@angular/common'; import { MatTable, diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/main-store-indent-order-worklist.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/main-store-indent-order-worklist.component.ts index f1499bc..2b75b50 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/main-store-indent-order-worklist.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/main-store-indent-order-worklist.component.ts @@ -42,7 +42,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { NgIf, DatePipe } from '@angular/common'; import { MatButton } from '@angular/material/button'; import { MatCard, MatCardContent } from '@angular/material/card'; diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts index a35f73e..1b546cb 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts @@ -51,7 +51,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { Subscription } from 'rxjs'; import { MatFormField, diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts index 75e5ab0..38687e0 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts +++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts @@ -42,7 +42,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton } from '@angular/material/button'; import { MatCard, MatCardContent } from '@angular/material/card'; import { MatIcon } from '@angular/material/icon'; diff --git a/src/app/app-modules/inventory/medicine-dispense/manual-medicine-dispense/manual-medicine-dispense.component.ts b/src/app/app-modules/inventory/medicine-dispense/manual-medicine-dispense/manual-medicine-dispense.component.ts index 69f07fa..03c96fe 100644 --- a/src/app/app-modules/inventory/medicine-dispense/manual-medicine-dispense/manual-medicine-dispense.component.ts +++ b/src/app/app-modules/inventory/medicine-dispense/manual-medicine-dispense/manual-medicine-dispense.component.ts @@ -59,7 +59,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts index 0568997..fafe1b0 100644 --- a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts +++ b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts @@ -32,7 +32,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone import { LanguageService } from '../../core/services/language.service'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { SearchComponent } from '../../core/components/search/search.component'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton } from '@angular/material/button'; import { RouterLink } from '@angular/router'; import { MatCard } from '@angular/material/card'; diff --git a/src/app/app-modules/inventory/medicine-dispense/system-medicine-dispense/show-batch-item/show-batch-item.component.ts b/src/app/app-modules/inventory/medicine-dispense/system-medicine-dispense/show-batch-item/show-batch-item.component.ts index 8ecc716..42aa7d4 100644 --- a/src/app/app-modules/inventory/medicine-dispense/system-medicine-dispense/show-batch-item/show-batch-item.component.ts +++ b/src/app/app-modules/inventory/medicine-dispense/system-medicine-dispense/show-batch-item/show-batch-item.component.ts @@ -42,7 +42,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatIconButton, MatButton } from '@angular/material/button'; import { MatIcon } from '@angular/material/icon'; import { CdkScrollable } from '@angular/cdk/scrolling'; diff --git a/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense-details/view-medicine-dispense-details.component.ts b/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense-details/view-medicine-dispense-details.component.ts index 01fa472..5ac1889 100644 --- a/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense-details/view-medicine-dispense-details.component.ts +++ b/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense-details/view-medicine-dispense-details.component.ts @@ -49,7 +49,7 @@ import { import * as moment from 'moment'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatIcon } from '@angular/material/icon'; import { MatTooltip } from '@angular/material/tooltip'; import { MatFormField, MatSuffix } from '@angular/material/form-field'; diff --git a/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense.component.ts b/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense.component.ts index c098d9a..a2a840e 100644 --- a/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense.component.ts +++ b/src/app/app-modules/inventory/medicine-dispense/view-medicine-dispense/view-medicine-dispense.component.ts @@ -42,7 +42,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/patient-return/item-batch-details-for-patient-return/item-batch-details-for-patient-return.component.ts b/src/app/app-modules/inventory/patient-return/item-batch-details-for-patient-return/item-batch-details-for-patient-return.component.ts index e1bf5dc..7e4fe85 100644 --- a/src/app/app-modules/inventory/patient-return/item-batch-details-for-patient-return/item-batch-details-for-patient-return.component.ts +++ b/src/app/app-modules/inventory/patient-return/item-batch-details-for-patient-return/item-batch-details-for-patient-return.component.ts @@ -59,7 +59,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel } from '@angular/material/form-field'; import { MatSelect, MatOption } from '@angular/material/select'; import { NgFor, NgIf } from '@angular/common'; diff --git a/src/app/app-modules/inventory/patient-return/patient-return-previous-record/patient-return-previous-record.component.ts b/src/app/app-modules/inventory/patient-return/patient-return-previous-record/patient-return-previous-record.component.ts index 551b060..b159525 100644 --- a/src/app/app-modules/inventory/patient-return/patient-return-previous-record/patient-return-previous-record.component.ts +++ b/src/app/app-modules/inventory/patient-return/patient-return-previous-record/patient-return-previous-record.component.ts @@ -40,7 +40,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/patient-return/patient-return.component.ts b/src/app/app-modules/inventory/patient-return/patient-return.component.ts index 1be42f8..72c408d 100644 --- a/src/app/app-modules/inventory/patient-return/patient-return.component.ts +++ b/src/app/app-modules/inventory/patient-return/patient-return.component.ts @@ -32,7 +32,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { LanguageService } from '../../core/services/language.service'; import { BenificiaryDetailsComponent } from './benificiary-details/benificiary-details.component'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton } from '@angular/material/button'; import { RouterLink } from '@angular/router'; import { NgIf } from '@angular/common'; diff --git a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts index e02aa4b..914dea8 100644 --- a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts +++ b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts @@ -54,7 +54,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton, MatMiniFabButton } from '@angular/material/button'; import { RouterLink } from '@angular/router'; import { diff --git a/src/app/app-modules/inventory/physical-stock-entry/view-physical-stock/view-physical-stock.component.ts b/src/app/app-modules/inventory/physical-stock-entry/view-physical-stock/view-physical-stock.component.ts index c972446..70a395a 100644 --- a/src/app/app-modules/inventory/physical-stock-entry/view-physical-stock/view-physical-stock.component.ts +++ b/src/app/app-modules/inventory/physical-stock-entry/view-physical-stock/view-physical-stock.component.ts @@ -43,7 +43,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts index 8f1983d..529990b 100644 --- a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts +++ b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts index 6fb2d23..91504dc 100644 --- a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts +++ b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts index e4fb282..ecaa4b7 100644 --- a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts +++ b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts index 4d87672..935063b 100644 --- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts +++ b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts @@ -36,7 +36,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts index 056eb0b..eb5f317 100644 --- a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts +++ b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel } from '@angular/material/form-field'; import { MatSelect, MatOption } from '@angular/material/select'; import { NgFor } from '@angular/common'; diff --git a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts index a78b8ff..7f6fa17 100644 --- a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts +++ b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts index 7187f73..e817923 100644 --- a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts +++ b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts @@ -34,7 +34,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel } from '@angular/material/form-field'; import { MatSelect, MatOption } from '@angular/material/select'; import { NgFor } from '@angular/common'; diff --git a/src/app/app-modules/inventory/shared/service/inventory.service.ts b/src/app/app-modules/inventory/shared/service/inventory.service.ts index 57f60a5..a7a761d 100644 --- a/src/app/app-modules/inventory/shared/service/inventory.service.ts +++ b/src/app/app-modules/inventory/shared/service/inventory.service.ts @@ -24,7 +24,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { Observable, Subject, throwError } from 'rxjs'; import { environment } from 'src/environments/environment'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable() export class InventoryService { diff --git a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts index ee756a6..9457884 100644 --- a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts +++ b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts @@ -48,7 +48,7 @@ import { MatRow, } from '@angular/material/table'; import { Subscription } from 'rxjs'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton, MatMiniFabButton } from '@angular/material/button'; import { MatFormField, diff --git a/src/app/app-modules/inventory/store-self-consumption/view-store-self-consumption/view-store-self-consumption.component.ts b/src/app/app-modules/inventory/store-self-consumption/view-store-self-consumption/view-store-self-consumption.component.ts index 3405b1c..03e15f7 100644 --- a/src/app/app-modules/inventory/store-self-consumption/view-store-self-consumption/view-store-self-consumption.component.ts +++ b/src/app/app-modules/inventory/store-self-consumption/view-store-self-consumption/view-store-self-consumption.component.ts @@ -43,7 +43,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts index d8b0599..3d64a04 100644 --- a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts +++ b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts @@ -49,7 +49,7 @@ import { MatRow, } from '@angular/material/table'; import { Subscription } from 'rxjs'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton, MatMiniFabButton } from '@angular/material/button'; import { MatFormField, diff --git a/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment-draft/view-store-stock-adjustment-draft.component.ts b/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment-draft/view-store-stock-adjustment-draft.component.ts index afedf1e..5922a60 100644 --- a/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment-draft/view-store-stock-adjustment-draft.component.ts +++ b/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment-draft/view-store-stock-adjustment-draft.component.ts @@ -43,7 +43,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment/view-store-stock-adjustment.component.ts b/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment/view-store-stock-adjustment.component.ts index d6d3ec4..a0390aa 100644 --- a/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment/view-store-stock-adjustment.component.ts +++ b/src/app/app-modules/inventory/store-stock-adjustment/view-store-stock-adjustment/view-store-stock-adjustment.component.ts @@ -43,7 +43,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts index b677d1d..ff6807e 100644 --- a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts +++ b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts @@ -37,7 +37,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone import { LanguageService } from '../../core/services/language.service'; import * as moment from 'moment'; import { MatTableDataSource } from '@angular/material/table'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatButton, MatMiniFabButton } from '@angular/material/button'; import { MatFormField, diff --git a/src/app/app-modules/inventory/store-stock-transfer/view-store-stock-transfer/view-store-stock-transfer.component.ts b/src/app/app-modules/inventory/store-stock-transfer/view-store-stock-transfer/view-store-stock-transfer.component.ts index 84a6df4..fb41828 100644 --- a/src/app/app-modules/inventory/store-stock-transfer/view-store-stock-transfer/view-store-stock-transfer.component.ts +++ b/src/app/app-modules/inventory/store-stock-transfer/view-store-stock-transfer/view-store-stock-transfer.component.ts @@ -43,7 +43,7 @@ import { MatRow, } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatFormField, MatLabel, diff --git a/src/app/app-modules/rx/rx-dashboard/rx-dashboard.component.ts b/src/app/app-modules/rx/rx-dashboard/rx-dashboard.component.ts index 52be160..0585f7f 100644 --- a/src/app/app-modules/rx/rx-dashboard/rx-dashboard.component.ts +++ b/src/app/app-modules/rx/rx-dashboard/rx-dashboard.component.ts @@ -26,7 +26,7 @@ import { PrescribedDrugService } from './../shared/service/prescribed-drug.servi import { ConfirmationService } from '../../core/services/confirmation.service'; import { LanguageService } from '../../core/services/language.service'; import { SetLanguageComponent } from '../../core/components/set-language.component'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AppHeaderComponent } from '../../core/components/app-header/app-header.component'; import { MatSidenavContainer, MatSidenav } from '@angular/material/sidenav'; import { BeneficiaryDetailsComponent } from '../../core/components/beneficiary-details/beneficiary-details.component'; diff --git a/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.ts b/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.ts index 286de7f..3c177f2 100644 --- a/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.ts +++ b/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.ts @@ -40,7 +40,7 @@ import { PrescribedDrugService } from './../shared/service/prescribed-drug.servi import { ConfirmationService } from './../../core/services/confirmation.service'; import { LanguageService } from '../../core/services/language.service'; import { SetLanguageComponent } from '../../core/components/set-language.component'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatTableDataSource, MatTable, diff --git a/src/app/app-modules/rx/shared/service/prescribed-drug.service.ts b/src/app/app-modules/rx/shared/service/prescribed-drug.service.ts index 57756ae..2079cb3 100644 --- a/src/app/app-modules/rx/shared/service/prescribed-drug.service.ts +++ b/src/app/app-modules/rx/shared/service/prescribed-drug.service.ts @@ -22,7 +22,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; @Injectable() export class PrescribedDrugService { diff --git a/src/app/custom-route-reuse-strategy.ts b/src/app/custom-route-reuse-strategy.ts index 2dd6287..40b79b0 100644 --- a/src/app/custom-route-reuse-strategy.ts +++ b/src/app/custom-route-reuse-strategy.ts @@ -25,7 +25,7 @@ import { ActivatedRouteSnapshot, DetachedRouteHandle, } from '@angular/router'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; export class CustomRouteReuseStrategy implements RouteReuseStrategy { handlers: { [key: string]: DetachedRouteHandle } = {}; diff --git a/src/app/facility-selection/facility-selection.component.ts b/src/app/facility-selection/facility-selection.component.ts index 5c67084..f733d2b 100644 --- a/src/app/facility-selection/facility-selection.component.ts +++ b/src/app/facility-selection/facility-selection.component.ts @@ -27,7 +27,7 @@ import { FaciltyService } from './facilty.service'; import { ConfirmationService } from '../app-modules/core/services'; import { SetLanguageComponent } from '../app-modules/core/components/set-language.component'; import { LanguageService } from '../app-modules/core/services/language.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AppHeaderComponent } from '../app-modules/core/components/app-header/app-header.component'; import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card'; import { MatRadioGroup, MatRadioButton } from '@angular/material/radio'; diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index c20ca5c..40b9b9e 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -24,7 +24,7 @@ import { Router, RouterLink } from '@angular/router'; import * as CryptoJS from 'crypto-js'; import { ConfirmationService } from '../app-modules/core/services/confirmation.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AuthenticationService } from './authentication.service'; import { environment } from 'src/environments/environment'; import { CaptchaComponent } from '../app-modules/core/components/captcha/captcha.component'; diff --git a/src/app/redir-in/redir-in.component.ts b/src/app/redir-in/redir-in.component.ts index 8cc7047..e1dc5a5 100644 --- a/src/app/redir-in/redir-in.component.ts +++ b/src/app/redir-in/redir-in.component.ts @@ -32,7 +32,7 @@ import { SpinnerService } from '../app-modules/core/services/spinner.service'; import { AuthenticationService } from '../login/authentication.service'; import { CookieService } from 'ngx-cookie-service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; @Component({ selector: 'app-redir-in', diff --git a/src/app/reset-password/reset-password.component.ts b/src/app/reset-password/reset-password.component.ts index cb0253c..25941b7 100644 --- a/src/app/reset-password/reset-password.component.ts +++ b/src/app/reset-password/reset-password.component.ts @@ -24,7 +24,7 @@ import { Router, RouterLink } from '@angular/router'; import { AuthenticationService } from '../login/authentication.service'; import { ConfirmationService } from '../app-modules/core/services/confirmation.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AppHeaderComponent } from '../app-modules/core/components/app-header/app-header.component'; import { MatGridList } from '@angular/material/grid-list'; import { MatCard, MatCardTitle, MatCardContent } from '@angular/material/card'; diff --git a/src/app/set-password/set-password.component.ts b/src/app/set-password/set-password.component.ts index bc2d874..269f00d 100644 --- a/src/app/set-password/set-password.component.ts +++ b/src/app/set-password/set-password.component.ts @@ -25,7 +25,7 @@ import { Router } from '@angular/router'; import { AuthenticationService } from '../login/authentication.service'; import { ConfirmationService } from '../app-modules/core/services/confirmation.service'; import * as CryptoJS from 'crypto-js'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AppHeaderComponent } from '../app-modules/core/components/app-header/app-header.component'; import { MatGridList, MatGridTile } from '@angular/material/grid-list'; import { MatCard, MatCardTitle, MatCardContent } from '@angular/material/card'; diff --git a/src/app/set-security-questions/set-security-questions.component.ts b/src/app/set-security-questions/set-security-questions.component.ts index 19b8d24..2cd3391 100644 --- a/src/app/set-security-questions/set-security-questions.component.ts +++ b/src/app/set-security-questions/set-security-questions.component.ts @@ -26,7 +26,7 @@ import { AuthenticationService } from '../login/authentication.service'; import { ConfirmationService } from '../app-modules/core/services/confirmation.service'; import * as CryptoJS from 'crypto-js'; import { AuthService } from '../app-modules/core/services/auth.service'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { MatCard, MatCardTitle, MatCardContent } from '@angular/material/card'; import { NgIf, NgFor } from '@angular/common'; import { FormsModule } from '@angular/forms'; diff --git a/src/bootstrap.layer.css b/src/bootstrap.layer.css new file mode 100644 index 0000000..84f003c --- /dev/null +++ b/src/bootstrap.layer.css @@ -0,0 +1,6 @@ +/* Loads Bootstrap into the `bootstrap` cascade layer (declared lowest-priority + in src/tailwind.css). Because layer order beats specificity, Tailwind + utilities now override Bootstrap's global element rules on migrated screens, + while un-migrated Bootstrap screens keep working (nothing competes there). + Removed from angular.json's raw styles list so it is no longer unlayered. */ +@import '../node_modules/bootstrap/dist/css/bootstrap.min.css' layer(bootstrap); diff --git a/src/index.html b/src/index.html index 9f21e22..7a94e77 100644 --- a/src/index.html +++ b/src/index.html @@ -18,8 +18,6 @@ - - diff --git a/src/service/service.component.ts b/src/service/service.component.ts index c7b1d6e..c1d4097 100644 --- a/src/service/service.component.ts +++ b/src/service/service.component.ts @@ -21,7 +21,7 @@ */ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { SessionStorageService } from 'Common-UI/v2/registrar/services/session-storage.service'; import { AppHeaderComponent } from '../app/app-modules/core/components/app-header/app-header.component'; import { NgFor } from '@angular/common'; import { MatTooltip } from '@angular/material/tooltip'; diff --git a/src/styles.css b/src/styles.css index e5db96c..40927f6 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,8 +1,5 @@ /* You can add global styles to this file, and also import other style files */ -@import "~bootstrap/dist/css/bootstrap.css"; -@import "css/custom.css"; -@import "css/layout.css"; /* Lato Font - Local */ @font-face { @@ -455,3 +452,16 @@ h5 { .mat_green:disabled { background-color: #8e8e8e !important; } + +/* ===== ZardUI coexistence resets (remove once Material is dropped and Tailwind + Preflight is enabled) ===== */ +/* Angular Material's prebuilt theme ships an unlayered `button { border-radius: 0 }` + and Preflight is off, so bare buttons (incl. the z-select trigger) render square + with the native gray background. These unlayered attribute selectors outrank the + bare element rule and restore the theme radius for all Zard controls. */ +[z-button], +z-select [role='combobox'] { + -webkit-appearance: none; + appearance: none; + border-radius: var(--radius); +} diff --git a/src/tailwind.css b/src/tailwind.css new file mode 100644 index 0000000..3b1e49c --- /dev/null +++ b/src/tailwind.css @@ -0,0 +1,128 @@ +/* ===== AMRIT Tailwind v4 + ZardUI theme (coexistence mode) ===== + Loaded as its own entry in angular.json so it doesn't pull existing app CSS + (custom.css/layout.css) through Tailwind's @import bundler. + Preflight (Tailwind's global reset) is intentionally NOT imported and there is + no global `*` base reset, so existing Bootstrap/Material screens render + unchanged. Tailwind utilities live in @layer utilities (lower priority than the + unlayered app CSS), so they only affect new ZardUI markup. AMRIT blue + white + tokens drive ZardUI components from Common-UI/v2/ui. */ + +/* Bootstrap is wrapped in the lowest cascade layer (see src/bootstrap.layer.css) + so Tailwind utilities win over Bootstrap's global element rules — letting us + style migrated screens with utility classes instead of component CSS. + Un-migrated screens are unaffected (no Tailwind utilities compete there). */ +@layer bootstrap, theme, components, utilities; +@import 'tailwindcss/theme.css' layer(theme); +@import 'tailwindcss/utilities.css' layer(utilities); +@plugin 'tailwindcss-animate'; +@source '../Common-UI/v2/ui'; + +@custom-variant dark (&:is(.dark *)); + +:root { + --radius: 0.625rem; + + --background: #ffffff; + --foreground: #212529; + --card: #ffffff; + --card-foreground: #212529; + --popover: #ffffff; + --popover-foreground: #212529; + + --primary: #0277bd; /* AMRIT brand blue */ + --primary-foreground: #ffffff; + + --secondary: #f8f9fa; + --secondary-foreground: #212529; + --muted: #f8f9fa; + --muted-foreground: #6c757d; + --accent: #f0f5f5; + --accent-foreground: #212529; + + --destructive: #dc3545; + --destructive-foreground: #ffffff; + + --border: #dee2e6; + --input: #dee2e6; + --ring: #0277bd; + + --success: #198754; + --success-foreground: #ffffff; + --warning: #ffc107; + --warning-foreground: #212529; + --info: #0dcaf0; + --info-foreground: #212529; + + --chart-1: #0277bd; + --chart-2: #198754; + --chart-3: #0dcaf0; + --chart-4: #ffc107; + --chart-5: #dc3545; +} + +.dark { + --background: #1a1d20; + --foreground: #f8f9fa; + --card: #212529; + --card-foreground: #f8f9fa; + --popover: #212529; + --popover-foreground: #f8f9fa; + --primary: #4fc3f7; + --primary-foreground: #102027; + --secondary: #2b3035; + --secondary-foreground: #f8f9fa; + --muted: #2b3035; + --muted-foreground: #adb5bd; + --accent: #2b3035; + --accent-foreground: #f8f9fa; + --destructive: #e4606d; + --destructive-foreground: #ffffff; + --border: rgba(255, 255, 255, 0.12); + --input: rgba(255, 255, 255, 0.15); + --ring: #4fc3f7; + --success: #2fb380; + --warning: #ffca2c; + --info: #3dd5f3; + --chart-1: #4fc3f7; + --chart-2: #2fb380; + --chart-3: #3dd5f3; + --chart-4: #ffca2c; + --chart-5: #e4606d; +} + +@theme inline { + --color-background: var(--background); + --color-foreground: var(--foreground); + --color-card: var(--card); + --color-card-foreground: var(--card-foreground); + --color-popover: var(--popover); + --color-popover-foreground: var(--popover-foreground); + --color-primary: var(--primary); + --color-primary-foreground: var(--primary-foreground); + --color-secondary: var(--secondary); + --color-secondary-foreground: var(--secondary-foreground); + --color-muted: var(--muted); + --color-muted-foreground: var(--muted-foreground); + --color-accent: var(--accent); + --color-accent-foreground: var(--accent-foreground); + --color-destructive: var(--destructive); + --color-destructive-foreground: var(--destructive-foreground); + --color-border: var(--border); + --color-input: var(--input); + --color-ring: var(--ring); + --color-success: var(--success); + --color-success-foreground: var(--success-foreground); + --color-warning: var(--warning); + --color-warning-foreground: var(--warning-foreground); + --color-info: var(--info); + --color-info-foreground: var(--info-foreground); + --color-chart-1: var(--chart-1); + --color-chart-2: var(--chart-2); + --color-chart-3: var(--chart-3); + --color-chart-4: var(--chart-4); + --color-chart-5: var(--chart-5); + --radius-sm: calc(var(--radius) - 4px); + --radius-md: calc(var(--radius) - 2px); + --radius-lg: var(--radius); + --radius-xl: calc(var(--radius) + 4px); +}