Skip to content

Commit 1b0b5b1

Browse files
zahmozahmo
authored
Merge pull request #4 from zahmo/upgrade-ang16-frameworks-refactor
Upgrade ang16 release
2 parents 861fada + e7a570f commit 1b0b5b1

File tree

118 files changed

+23956
-18429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+23956
-18429
lines changed

‎CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,11 @@ The scope should be the name of the npm package affected (as perceived by the pe
129129
The following is the list of supported scopes:
130130

131131
* **zajsf/core**
132+
* **zajsf/cssfw**
132133
* **zajsf/bs3**
133134
* **zajsf/bs4**
135+
* **zajsf/bs5**
136+
* **zajsf/daisyui**
134137
* **zajsf/material**
135138
* **locales**
136139
* **demo**

‎README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,31 @@ for example
545545
currently the following built-in themes are available(per framework):
546546
* Bootstrap 3:"bootstrap3_default"
547547
* Bootstrap 4:"bootstrap4_default"
548+
* Bootstrap 5:"bootstrap5_default" | "light" | "dark"
549+
* Material design:"material_default" | "indigo-pink" | "purple-green" | "deeppurple-amber" | "pink-bluegrey"
550+
* DaisyUi: "daisyui_default" | "light" | "dark" | "cupcake" | "cmyk" | "pastel" |"daisyui_leaf"
551+
552+
Framework Values | Theme values
553+
------------------|--------------------
554+
"bootstrap-3" | "bootstrap3_default"
555+
"bootstrap-4" | "bootstrap4_default"
556+
"bootstrap-5" | "bootstrap5_default"
557+
| "light"
558+
| "dark"
559+
"material-design" | "material_default"
560+
| "indigo-pink"
561+
| "purple-green"
562+
| "deeppurple-amber"
563+
| "pink-bluegrey"
564+
"daisyui" | "daisyui_default"
565+
| "light"
566+
| "dark"
567+
| "cupcake"
568+
| "cmyk"
569+
| "pastel"
570+
| "daisyui-leaf"
571+
572+
=======
548573
* Bootstrap 3:"bootstrap5_default" | "light" | "dark"
549574
* Material design:"material_default" | "indigo-pink" | "purple-green" | "deeppurple-amber" | "pink-bluegrey"
550575
* DaisyUi: "daisyui_default" | "light" | "dark" | "cupcake" | "cmyk" | "pastel" |"daisyui_leaf"

‎angular.json

Lines changed: 99 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,107 @@
220220
}
221221
}
222222
}
223+
},
224+
"@zajsf/daisyui": {
225+
"projectType": "library",
226+
"root": "projects/zajsf-daisyui",
227+
"sourceRoot": "projects/zajsf-daisyui/src",
228+
"prefix": "lib",
229+
"architect": {
230+
"build": {
231+
"builder": "@angular-devkit/build-angular:ng-packagr",
232+
"options": {
233+
"project": "projects/zajsf-daisyui/ng-package.json"
234+
},
235+
"configurations": {
236+
"production": {
237+
"tsConfig": "projects/zajsf-daisyui/tsconfig.lib.prod.json"
238+
},
239+
"development": {
240+
"tsConfig": "projects/zajsf-daisyui/tsconfig.lib.json"
241+
}
242+
},
243+
"defaultConfiguration": "production"
244+
},
245+
"test": {
246+
"builder": "@angular-devkit/build-angular:karma",
247+
"options": {
248+
"tsConfig": "projects/zajsf-daisyui/tsconfig.spec.json",
249+
"polyfills": [
250+
"zone.js",
251+
"zone.js/testing"
252+
]
253+
}
254+
}
255+
}
256+
},
257+
"@zajsf/cssframework": {
258+
"projectType": "library",
259+
"root": "projects/zajsf-cssframework",
260+
"sourceRoot": "projects/zajsf-cssframework/src",
261+
"prefix": "lib",
262+
"architect": {
263+
"build": {
264+
"builder": "@angular-devkit/build-angular:ng-packagr",
265+
"options": {
266+
"project": "projects/zajsf-cssframework/ng-package.json"
267+
},
268+
"configurations": {
269+
"production": {
270+
"tsConfig": "projects/zajsf-cssframework/tsconfig.lib.prod.json"
271+
},
272+
"development": {
273+
"tsConfig": "projects/zajsf-cssframework/tsconfig.lib.json"
274+
}
275+
},
276+
"defaultConfiguration": "production"
277+
},
278+
"test": {
279+
"builder": "@angular-devkit/build-angular:karma",
280+
"options": {
281+
"tsConfig": "projects/zajsf-cssframework/tsconfig.spec.json",
282+
"polyfills": [
283+
"zone.js",
284+
"zone.js/testing"
285+
]
286+
}
287+
}
288+
}
289+
},
290+
"@zajsf/bootstrap5": {
291+
"projectType": "library",
292+
"root": "projects/zajsf-bootstrap5",
293+
"sourceRoot": "projects/zajsf-bootstrap5/src",
294+
"prefix": "lib",
295+
"architect": {
296+
"build": {
297+
"builder": "@angular-devkit/build-angular:ng-packagr",
298+
"options": {
299+
"project": "projects/zajsf-bootstrap5/ng-package.json"
300+
},
301+
"configurations": {
302+
"production": {
303+
"tsConfig": "projects/zajsf-bootstrap5/tsconfig.lib.prod.json"
304+
},
305+
"development": {
306+
"tsConfig": "projects/zajsf-bootstrap5/tsconfig.lib.json"
307+
}
308+
},
309+
"defaultConfiguration": "production"
310+
},
311+
"test": {
312+
"builder": "@angular-devkit/build-angular:karma",
313+
"options": {
314+
"tsConfig": "projects/zajsf-bootstrap5/tsconfig.spec.json",
315+
"polyfills": [
316+
"zone.js",
317+
"zone.js/testing"
318+
]
319+
}
320+
}
321+
}
223322
}
224323
},
225-
"defaultProject": "demo",
226324
"schematics": {
227325
"@schematics/angular:component": {
228326
"style": "scss"

‎cp.cmd

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
copy /Y "%1" "%2"
1+
@ECHO OFF
2+
set src=%1
3+
set trg=%2
4+
set src=%src:/=\%
5+
set trg=%trg:/=\%
6+
@ECHO ON
7+
copy /Y "%src%" "%trg%"
8+
9+

0 commit comments

Comments
 (0)