Merge pull request #285 from design4pro/develop

rafalwolak · web-flow · commit 2fe7d9079a2e · 2022-11-25T09:03:28.000+01:00
fix(ng-styled): lint errors fix
diff --git a/apps/ng-styled-webpage/src/app/app-shell/app-shell.component.ts b/apps/ng-styled-webpage/src/app/app-shell/app-shell.component.ts
@@ -1,12 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'ng-styled-app-shell',
   templateUrl: './app-shell.component.html',
   styleUrls: ['./app-shell.component.css'],
 })
-export class AppShellComponent implements OnInit {
-  constructor() {}
-
-  ngOnInit(): void {}
-}
+export class AppShellComponent {}
diff --git a/apps/ng-styled-webpage/src/app/app.component.spec.ts b/apps/ng-styled-webpage/src/app/app.component.spec.ts
@@ -1,10 +1,12 @@
 import { TestBed } from '@angular/core/testing';
+import { RouterModule } from '@angular/router';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [AppComponent],
+      imports: [RouterModule],
     }).compileComponents();
   });
 
diff --git a/apps/ng-styled-webpage/src/app/app.module.ts b/apps/ng-styled-webpage/src/app/app.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import {
   createTheme,
-  StyledModule,
   Options,
+  StyledModule,
   Theme,
 } from '@design4pro/ng-styled';
 import { create, Jss } from 'jss';
diff --git a/apps/ng-styled-webpage/src/app/layout/layout-footer/layout-footer.component.html b/apps/ng-styled-webpage/src/app/layout/layout-footer/layout-footer.component.html
@@ -1 +1 @@
-<p>layout-footer works!</p>
+<p>©{{ year }} DESIGN4PRO</p>
diff --git a/apps/ng-styled-webpage/src/app/layout/layout-footer/layout-footer.component.ts b/apps/ng-styled-webpage/src/app/layout/layout-footer/layout-footer.component.ts
@@ -5,4 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
   templateUrl: './layout-footer.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class LayoutFooterComponent {}
+export class LayoutFooterComponent {
+  year = new Date().getFullYear();
+}
diff --git a/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.html b/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.html
@@ -4,4 +4,4 @@
   width="48"
   alt="Angular Logo"
 />
-<h1 [ngClass]="classes.h1">Angular JSS <span>by DESIGN4PRO</span></h1>
+<h1 [ngClass]="classes?.h1">Angular JSS <span>by DESIGN4PRO</span></h1>
diff --git a/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.spec.ts b/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.spec.ts
@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { LayoutHeaderComponent } from './layout-header.component';
 
 describe('LayoutHeaderComponent', () => {
diff --git a/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.ts b/apps/ng-styled-webpage/src/app/layout/layout-header/layout-header.component.ts
@@ -9,10 +9,10 @@ import { COMPONENT_STYLES } from './layout-header.component.styles';
 })
 @Styled(({ css }) => css(COMPONENT_STYLES))
 export class LayoutHeaderComponent {
-  classes: any;
+  classes: { host: string; h1: string } | undefined;
 
   @HostBinding('class')
   get className() {
-    return this.classes.host;
+    return this.classes?.host;
   }
 }
diff --git a/apps/ng-styled-webpage/src/app/layout/layout.component.spec.ts b/apps/ng-styled-webpage/src/app/layout/layout.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { AppModule } from '../app.module';
 import { LayoutComponent } from './layout.component';
 
 describe('LayoutComponent', () => {
@@ -8,7 +8,7 @@ describe('LayoutComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [LayoutComponent],
+      imports: [AppModule],
     }).compileComponents();
   });
 
diff --git a/apps/ng-styled-webpage/src/app/layout/layout.component.ts b/apps/ng-styled-webpage/src/app/layout/layout.component.ts
@@ -9,10 +9,10 @@ import { COMPONENT_STYLES } from './layout.component.styles';
 })
 @Styled(({ css }) => css(COMPONENT_STYLES))
 export class LayoutComponent {
-  classes: any;
+  classes: { host: string } | undefined;
 
   @HostBinding('class')
   get className() {
-    return this.classes.host;
+    return this.classes?.host;
   }
 }
diff --git a/apps/ng-styled-webpage/src/app/page/home/home.component.spec.ts b/apps/ng-styled-webpage/src/app/page/home/home.component.spec.ts
@@ -1,14 +1,14 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { HomeComponent } from './home.component';
+import { HomeModule } from './home.module';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
   let fixture: ComponentFixture<HomeComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [HomeComponent],
+      imports: [HomeModule],
     }).compileComponents();
   });
 
diff --git a/apps/ng-styled-webpage/src/app/page/home/home.component.ts b/apps/ng-styled-webpage/src/app/page/home/home.component.ts
@@ -33,7 +33,7 @@ import { Styled, StyledProp } from '@design4pro/ng-styled';
 })
 export class HomeComponent {
   title = 'Angular JSS';
-  classes: any;
+  classes: { root: string; title: string; hint: string } | undefined;
 
   code = `
     import { ChangeDetectionStrategy, Component } from '@angular/core';
diff --git a/apps/ng-styled-webpage/src/app/shared/code/code.component.spec.ts b/apps/ng-styled-webpage/src/app/shared/code/code.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { SharedModule } from '../shared.module';
 import { CodeComponent } from './code.component';
 
 describe('CodeComponent', () => {
@@ -9,6 +9,7 @@ describe('CodeComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [CodeComponent],
+      imports: [SharedModule],
     }).compileComponents();
   });
 
diff --git a/apps/ng-styled-webpage/src/app/shared/code/code.component.ts b/apps/ng-styled-webpage/src/app/shared/code/code.component.ts
@@ -16,7 +16,7 @@ import { GITHUB_STYLES } from './code.component.styles';
   );
 })
 export class CodeComponent {
-  classes: any;
+  classes: { root: string } | undefined;
 
   @Input()
   code = '';
diff --git a/libs/ng-styled/src/lib/styled.module.ts b/libs/ng-styled/src/lib/styled.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
+import { JssStore } from './jss/context';
 import {
   StyledOptions,
   styledOptionsFactory,
@@ -8,8 +9,7 @@ import {
   STYLED_OPTIONS_INJECTOR,
   STYLED_THEME_INJECTOR,
 } from './styled.options';
-import { StyledService, styledFactory } from './styled.service';
-import { JssStore } from './jss/context';
+import { styledFactory, StyledService } from './styled.service';
 import defaultTheme from './theme/default-theme';
 import { ThemeStore } from './theme/theme-context';
 
diff --git a/libs/ng-styled/src/lib/styled.service.ts b/libs/ng-styled/src/lib/styled.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import { createGenerateId, SheetsRegistry } from 'jss';
-import { StyledOptions, StyledTheme } from './styled.options';
 import { JssContext, JssStore } from './jss/context';
 import { manageSheet } from './jss/managers';
 import { JssManagers, StaticStyles } from './jss/types';
 import getSheetIndex from './jss/utils/get-sheet-index';
 import { createStyleSheet } from './jss/utils/sheets';
+import { StyledOptions, StyledTheme } from './styled.options';
 import normalize from './styles/normalize';
 import { ThemeContext, ThemeStore } from './theme/theme-context';
 import shallowEqualObjects from './utils/shallow-equal-objects';
diff --git a/libs/ng-styled/src/lib/theme/theme-context.ts b/libs/ng-styled/src/lib/theme/theme-context.ts
@@ -1,15 +1,16 @@
 import { Injectable } from '@angular/core';
 import { Store } from '../utils/store';
+import defaultTheme from './default-theme';
 import { Theme } from './types';
 
-export class ThemeContext implements Partial<Theme> {}
+export type ThemeContext = Partial<Theme>;
 
 @Injectable()
 export class ThemeStore extends Store<ThemeContext> {
   private static instance: ThemeStore;
 
   constructor() {
-    super(new ThemeContext());
+    super(defaultTheme);
   }
 
   static getInstance(): ThemeStore {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<p>layout-footer works!</p>`
	`1`	`+<p>©{{ year }} DESIGN4PRO</p>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { ComponentFixture, TestBed } from '@angular/core/testing';`
`2`		`-`
`3`	`2`	`import { LayoutHeaderComponent } from './layout-header.component';`
`4`	`3`
`5`	`4`	`describe('LayoutHeaderComponent', () => {`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ import { COMPONENT_STYLES } from './layout-header.component.styles';`
`9`	`9`	`})`
`10`	`10`	`@Styled(({ css }) => css(COMPONENT_STYLES))`
`11`	`11`	`export class LayoutHeaderComponent {`
`12`		`- classes: any;`
	`12`	`+ classes: { host: string; h1: string } \| undefined;`
`13`	`13`
`14`	`14`	`@HostBinding('class')`
`15`	`15`	`get className() {`
`16`		`- return this.classes.host;`
	`16`	`+ return this.classes?.host;`
`17`	`17`	`}`
`18`	`18`	`}`