Skip to content

Commit

Permalink
Merge branch 'release/v1.0.9' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@steve-lebleu
steve-lebleu committed Apr 18, 2021
2 parents 7e09d96 + 5cd8d80 commit bb38b4d
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 26 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [v1.0.8](https://github.com/konfer-be/cliam/compare/v1.0.7...v1.0.8)
## [v1.0.9](https://github.com/konfer-be/cliam/compare/v1.0.8...v1.0.9)

### Commits

- Fix default colors [`44f5ce3`](https://github.com/konfer-be/cliam/commit/44f5ce397aa8f8909cdefbebd45eb7cd2539da5c)

## [v1.0.8](https://github.com/konfer-be/cliam/compare/v1.0.7...v1.0.8) - 2021-04-18

### Commits

- Update changelog [`a6d6bca`](https://github.com/konfer-be/cliam/commit/a6d6bca13dcb3b7e0fee6c68e00ba30933d8d445)

## [v1.0.7](https://github.com/konfer-be/cliam/compare/v1.0.6...v1.0.7) - 2021-04-16

Expand Down
28 changes: 16 additions & 12 deletions lib/services/compiler.service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const container_service_1 = require("./../services/container.service");
*/
class Compiler {
constructor() {
/**
* @description
*/
this.THEME = container_service_1.Container.configuration.consumer?.theme;
/**
* @description
*/
Expand Down Expand Up @@ -60,18 +64,18 @@ class Compiler {
* @description
*/
this.COLORS = [
{ key: '111111', value: container_service_1.Container.configuration.consumer?.theme?.primaryColor },
{ key: '222222', value: container_service_1.Container.configuration.consumer?.theme?.secondaryColor },
{ key: '333333', value: container_service_1.Container.configuration.consumer?.theme?.tertiaryColor },
{ key: '444444', value: container_service_1.Container.configuration.consumer?.theme?.quaternaryColor },
{ key: 'fffff1', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.primaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff2', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.secondaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff3', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.tertiaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff4', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.quaternaryColor}`).lighten(0.50).hex().substring(1) },
{ key: '000001', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.primaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000002', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.secondaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000003', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.tertiaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000004', value: Color(`#${container_service_1.Container.configuration.consumer?.theme?.quaternaryColor}`).darken(0.50).hex().substring(1) }
{ key: '111111', value: this.THEME?.primaryColor || null },
{ key: '222222', value: this.THEME?.secondaryColor || null },
{ key: '333333', value: this.THEME?.tertiaryColor || null },
{ key: '444444', value: this.THEME?.quaternaryColor || null },
{ key: 'fffff1', value: this.THEME?.primaryColor ? Color(`#${this.THEME.primaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff2', value: this.THEME?.secondaryColor ? Color(`#${this.THEME.secondaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff3', value: this.THEME?.tertiaryColor ? Color(`#${this.THEME.tertiaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff4', value: this.THEME?.quaternaryColor ? Color(`#${this.THEME.quaternaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: '000001', value: this.THEME?.primaryColor ? Color(`#${this.THEME.primaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000002', value: this.THEME?.secondaryColor ? Color(`#${this.THEME.secondaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000003', value: this.THEME?.tertiaryColor ? Color(`#${this.THEME.tertiaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000004', value: this.THEME?.quaternaryColor ? Color(`#${this.THEME.quaternaryColor}`).darken(0.50).hex().substring(1) : null }
];
Hbs.handlebars.registerHelper('year', () => {
return new Date().getFullYear();
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cliam",
"version": "1.0.8",
"version": "1.0.9",
"engines": {
"node": ">=14.16"
},
Expand Down
29 changes: 17 additions & 12 deletions src/services/compiler.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ class Compiler {
*/
private static instance: Compiler = null;

/**
* @description
*/
private readonly THEME = Container.configuration.consumer?.theme;

/**
* @description
*/
Expand Down Expand Up @@ -71,18 +76,18 @@ class Compiler {
* @description
*/
private readonly COLORS: Array<{key: string, value: string}> = [
{ key: '111111', value: Container.configuration.consumer?.theme?.primaryColor },
{ key: '222222', value: Container.configuration.consumer?.theme?.secondaryColor },
{ key: '333333', value: Container.configuration.consumer?.theme?.tertiaryColor },
{ key: '444444', value: Container.configuration.consumer?.theme?.quaternaryColor },
{ key: 'fffff1', value: Color(`#${Container.configuration.consumer?.theme?.primaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff2', value: Color(`#${Container.configuration.consumer?.theme?.secondaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff3', value: Color(`#${Container.configuration.consumer?.theme?.tertiaryColor}`).lighten(0.50).hex().substring(1) },
{ key: 'fffff4', value: Color(`#${Container.configuration.consumer?.theme?.quaternaryColor}`).lighten(0.50).hex().substring(1) },
{ key: '000001', value: Color(`#${Container.configuration.consumer?.theme?.primaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000002', value: Color(`#${Container.configuration.consumer?.theme?.secondaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000003', value: Color(`#${Container.configuration.consumer?.theme?.tertiaryColor}`).darken(0.50).hex().substring(1) },
{ key: '000004', value: Color(`#${Container.configuration.consumer?.theme?.quaternaryColor}`).darken(0.50).hex().substring(1) }
{ key: '111111', value: this.THEME?.primaryColor || null },
{ key: '222222', value: this.THEME?.secondaryColor || null },
{ key: '333333', value: this.THEME?.tertiaryColor || null },
{ key: '444444', value: this.THEME?.quaternaryColor || null },
{ key: 'fffff1', value: this.THEME?.primaryColor ? Color(`#${this.THEME.primaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff2', value: this.THEME?.secondaryColor ? Color(`#${this.THEME.secondaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff3', value: this.THEME?.tertiaryColor ? Color(`#${this.THEME.tertiaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: 'fffff4', value: this.THEME?.quaternaryColor ? Color(`#${this.THEME.quaternaryColor}`).lighten(0.50).hex().substring(1) : null },
{ key: '000001', value: this.THEME?.primaryColor ? Color(`#${this.THEME.primaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000002', value: this.THEME?.secondaryColor ? Color(`#${this.THEME.secondaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000003', value: this.THEME?.tertiaryColor ? Color(`#${this.THEME.tertiaryColor}`).darken(0.50).hex().substring(1) : null },
{ key: '000004', value: this.THEME?.quaternaryColor ? Color(`#${this.THEME.quaternaryColor}`).darken(0.50).hex().substring(1) : null }
];

constructor() {
Expand Down

0 comments on commit bb38b4d

Please sign in to comment.