diff --git a/src/app/@shell/ui/header/header.component.spec.ts b/src/app/@shell/ui/header/header.component.spec.ts
index e2c49984c..45a514627 100644
--- a/src/app/@shell/ui/header/header.component.spec.ts
+++ b/src/app/@shell/ui/header/header.component.spec.ts
@@ -8,9 +8,10 @@ describe('HeaderComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [HeaderComponent],
- imports: [RouterTestingModule],
- }).compileComponents();
+ declarations: [HeaderComponent],
+ imports: [RouterTestingModule],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
});
beforeEach(() => {
diff --git a/src/app/@shell/ui/header/header.component.ts b/src/app/@shell/ui/header/header.component.ts
index b543c9fe6..5758c4cad 100644
--- a/src/app/@shell/ui/header/header.component.ts
+++ b/src/app/@shell/ui/header/header.component.ts
@@ -6,7 +6,7 @@ import { AuthService } from '@pages/auth/services/auth.service';
@Component({
selector: 'app-header',
templateUrl: './header.component.html',
- styleUrls: ['./header.component.scss'],
+ styleUrls: ['./header.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class HeaderComponent {
diff --git a/src/app/@shell/ui/layout/layout.component.scss b/src/app/@shell/ui/layout/layout.component.css
similarity index 100%
rename from src/app/@shell/ui/layout/layout.component.scss
rename to src/app/@shell/ui/layout/layout.component.css
diff --git a/src/app/@shell/ui/layout/layout.component.spec.ts b/src/app/@shell/ui/layout/layout.component.spec.ts
index 1b62115de..9e64d0b24 100644
--- a/src/app/@shell/ui/layout/layout.component.spec.ts
+++ b/src/app/@shell/ui/layout/layout.component.spec.ts
@@ -10,9 +10,10 @@ describe('LayoutComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [LayoutComponent],
- imports: [RouterTestingModule, HeaderModule, FooterModule],
- }).compileComponents();
+ declarations: [LayoutComponent],
+ imports: [RouterTestingModule, HeaderModule, FooterModule],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
});
beforeEach(() => {
diff --git a/src/app/@shell/ui/layout/layout.component.ts b/src/app/@shell/ui/layout/layout.component.ts
index e660334b6..8bdbbcb65 100644
--- a/src/app/@shell/ui/layout/layout.component.ts
+++ b/src/app/@shell/ui/layout/layout.component.ts
@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
@Component({
selector: 'app-layout',
templateUrl: './layout.component.html',
- styleUrls: ['./layout.component.scss'],
+ styleUrls: ['./layout.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class LayoutComponent {}
diff --git a/src/app/@shell/ui/not-found/not-found.page.scss b/src/app/@shell/ui/not-found/not-found.page.css
similarity index 100%
rename from src/app/@shell/ui/not-found/not-found.page.scss
rename to src/app/@shell/ui/not-found/not-found.page.css
diff --git a/src/app/@shell/ui/not-found/not-found.page.html b/src/app/@shell/ui/not-found/not-found.page.html
index fedc9dac3..f157542ea 100644
--- a/src/app/@shell/ui/not-found/not-found.page.html
+++ b/src/app/@shell/ui/not-found/not-found.page.html
@@ -1,9 +1,9 @@
-
+
diff --git a/src/app/@shell/ui/not-found/not-found.page.spec.ts b/src/app/@shell/ui/not-found/not-found.page.spec.ts
index ca8238a1d..ae7619038 100644
--- a/src/app/@shell/ui/not-found/not-found.page.spec.ts
+++ b/src/app/@shell/ui/not-found/not-found.page.spec.ts
@@ -8,9 +8,10 @@ describe('NotFoundPage', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [NotFoundPage],
- imports: [RouterTestingModule],
- }).compileComponents();
+ declarations: [NotFoundPage],
+ imports: [RouterTestingModule],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
});
beforeEach(() => {
diff --git a/src/app/@shell/ui/not-found/not-found.page.ts b/src/app/@shell/ui/not-found/not-found.page.ts
index 85a2e5d03..a0ec08ebf 100644
--- a/src/app/@shell/ui/not-found/not-found.page.ts
+++ b/src/app/@shell/ui/not-found/not-found.page.ts
@@ -3,7 +3,7 @@ import { ROUTER_UTILS } from '@core/utils/router.utils';
@Component({
templateUrl: './not-found.page.html',
- styleUrls: ['./not-found.page.scss'],
+ styleUrls: ['./not-found.page.css'],
})
export class NotFoundPage {
path = ROUTER_UTILS.config.base;
diff --git a/src/app/@shell/ft/web-shell.module.ts b/src/app/@shell/web-shell.module.ts
similarity index 87%
rename from src/app/@shell/ft/web-shell.module.ts
rename to src/app/@shell/web-shell.module.ts
index ffa75440f..e48bb84f7 100644
--- a/src/app/@shell/ft/web-shell.module.ts
+++ b/src/app/@shell/web-shell.module.ts
@@ -4,10 +4,10 @@ import { RouterModule, Routes } from '@angular/router';
import { AuthGuard, NoAuthGuard } from '@core/guards';
import { ROUTER_UTILS } from '@core/utils/router.utils';
import { NotFoundModule } from '@shell/ui/not-found/not-found.module';
-import { FooterModule } from '../ui/footer/footer.module';
-import { HeaderModule } from '../ui/header/header.module';
-import { LayoutModule } from '../ui/layout/layout.module';
-import { NotFoundPage } from '../ui/not-found/not-found.page';
+import { FooterModule } from './ui/footer/footer.module';
+import { HeaderModule } from './ui/header/header.module';
+import { LayoutModule } from './ui/layout/layout.module';
+import { NotFoundPage } from './ui/not-found/not-found.page';
const APP_ROUTES: Routes = [
{
diff --git a/src/app/app.component.scss b/src/app/app.component.css
similarity index 100%
rename from src/app/app.component.scss
rename to src/app/app.component.css
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index cf496f6f6..25d2b352b 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,7 +1,7 @@
import { APP_BASE_HREF } from '@angular/common';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
-import { WebShellModule } from '@shell/ft/web-shell.module';
+import { WebShellModule } from '@shell/web-shell.module';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
@@ -11,6 +11,7 @@ describe('AppComponent', () => {
imports: [RouterTestingModule, WebShellModule],
declarations: [AppComponent],
providers: [{ provide: APP_BASE_HREF, useValue: '/' }],
+ teardown: { destroyAfterEach: false },
}).compileComponents();
}),
);
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b3ed9fad0..1f0b6398b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.scss'],
+ styleUrls: ['./app.component.css'],
})
export class AppComponent implements OnInit {
isLoggedIn$!: Observable
;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d8ecd3a18..04fde43a5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
-import { WebShellModule } from '@shell/ft/web-shell.module';
+import { WebShellModule } from '@shell/web-shell.module';
import { CoreModule } from './@core/core.module';
import { AppComponent } from './app.component';
diff --git a/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.scss b/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.css
similarity index 100%
rename from src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.scss
rename to src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.css
diff --git a/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.spec.ts b/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.spec.ts
index eaefaf562..40f74536b 100644
--- a/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.spec.ts
+++ b/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.spec.ts
@@ -9,8 +9,9 @@ describe('ForgotPasswordEmailSentPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [ForgotPasswordEmailSentPage],
- }).compileComponents();
+ declarations: [ForgotPasswordEmailSentPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.ts b/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.ts
index 563d556ab..c1cd742a1 100644
--- a/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.ts
+++ b/src/app/pages/auth/pages/forgot-password-email-sent/forgot-password-email-sent.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './forgot-password-email-sent.page.html',
- styleUrls: ['./forgot-password-email-sent.page.scss'],
+ styleUrls: ['./forgot-password-email-sent.page.css'],
})
export class ForgotPasswordEmailSentPage {}
diff --git a/src/app/pages/auth/pages/forgot-password/forgot-password.page.scss b/src/app/pages/auth/pages/forgot-password/forgot-password.page.css
similarity index 100%
rename from src/app/pages/auth/pages/forgot-password/forgot-password.page.scss
rename to src/app/pages/auth/pages/forgot-password/forgot-password.page.css
diff --git a/src/app/pages/auth/pages/forgot-password/forgot-password.page.spec.ts b/src/app/pages/auth/pages/forgot-password/forgot-password.page.spec.ts
index eebc001d7..93285bf3e 100644
--- a/src/app/pages/auth/pages/forgot-password/forgot-password.page.spec.ts
+++ b/src/app/pages/auth/pages/forgot-password/forgot-password.page.spec.ts
@@ -9,8 +9,9 @@ describe('ForgotPasswordPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [ForgotPasswordPage],
- }).compileComponents();
+ declarations: [ForgotPasswordPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/forgot-password/forgot-password.page.ts b/src/app/pages/auth/pages/forgot-password/forgot-password.page.ts
index 4590531c4..27d943e89 100644
--- a/src/app/pages/auth/pages/forgot-password/forgot-password.page.ts
+++ b/src/app/pages/auth/pages/forgot-password/forgot-password.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './forgot-password.page.html',
- styleUrls: ['./forgot-password.page.scss'],
+ styleUrls: ['./forgot-password.page.css'],
})
export class ForgotPasswordPage {}
diff --git a/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.scss b/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.css
similarity index 100%
rename from src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.scss
rename to src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.css
diff --git a/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.spec.ts b/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.spec.ts
index a2d11a678..3a230ca0b 100644
--- a/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.spec.ts
+++ b/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.spec.ts
@@ -9,8 +9,9 @@ describe('PasswordResetFailedPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [PasswordResetFailedPage],
- }).compileComponents();
+ declarations: [PasswordResetFailedPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.ts b/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.ts
index cdd6fe56d..bcc162f39 100644
--- a/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.ts
+++ b/src/app/pages/auth/pages/password-reset-failed/password-reset-failed.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './password-reset-failed.page.html',
- styleUrls: ['./password-reset-failed.page.scss'],
+ styleUrls: ['./password-reset-failed.page.css'],
})
export class PasswordResetFailedPage {}
diff --git a/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.scss b/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.css
similarity index 100%
rename from src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.scss
rename to src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.css
diff --git a/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.spec.ts b/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.spec.ts
index 2b8554f5c..933985145 100644
--- a/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.spec.ts
+++ b/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.spec.ts
@@ -9,8 +9,9 @@ describe('PasswordResetSucceededPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [PasswordResetSucceededPage],
- }).compileComponents();
+ declarations: [PasswordResetSucceededPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.ts b/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.ts
index ed6c3a99d..e701dfc3b 100644
--- a/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.ts
+++ b/src/app/pages/auth/pages/password-reset-succeeded/password-reset-succeeded.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './password-reset-succeeded.page.html',
- styleUrls: ['./password-reset-succeeded.page.scss'],
+ styleUrls: ['./password-reset-succeeded.page.css'],
})
export class PasswordResetSucceededPage {}
diff --git a/src/app/pages/auth/pages/password-reset/password-reset.page.scss b/src/app/pages/auth/pages/password-reset/password-reset.page.css
similarity index 100%
rename from src/app/pages/auth/pages/password-reset/password-reset.page.scss
rename to src/app/pages/auth/pages/password-reset/password-reset.page.css
diff --git a/src/app/pages/auth/pages/password-reset/password-reset.page.spec.ts b/src/app/pages/auth/pages/password-reset/password-reset.page.spec.ts
index 0e18e0193..124ce979d 100644
--- a/src/app/pages/auth/pages/password-reset/password-reset.page.spec.ts
+++ b/src/app/pages/auth/pages/password-reset/password-reset.page.spec.ts
@@ -9,8 +9,9 @@ describe('PasswordResetPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [PasswordResetPage],
- }).compileComponents();
+ declarations: [PasswordResetPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/password-reset/password-reset.page.ts b/src/app/pages/auth/pages/password-reset/password-reset.page.ts
index 23be0cbf6..b63505512 100644
--- a/src/app/pages/auth/pages/password-reset/password-reset.page.ts
+++ b/src/app/pages/auth/pages/password-reset/password-reset.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './password-reset.page.html',
- styleUrls: ['./password-reset.page.scss'],
+ styleUrls: ['./password-reset.page.css'],
})
export class PasswordResetPage {}
diff --git a/src/app/pages/auth/pages/sign-in/sign-in.page.scss b/src/app/pages/auth/pages/sign-in/sign-in.page.css
similarity index 100%
rename from src/app/pages/auth/pages/sign-in/sign-in.page.scss
rename to src/app/pages/auth/pages/sign-in/sign-in.page.css
diff --git a/src/app/pages/auth/pages/sign-in/sign-in.page.spec.ts b/src/app/pages/auth/pages/sign-in/sign-in.page.spec.ts
index a64399286..214dcc8f0 100644
--- a/src/app/pages/auth/pages/sign-in/sign-in.page.spec.ts
+++ b/src/app/pages/auth/pages/sign-in/sign-in.page.spec.ts
@@ -8,9 +8,10 @@ describe('SignInPage', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [SignInPage],
- imports: [RouterTestingModule],
- }).compileComponents();
+ declarations: [SignInPage],
+ imports: [RouterTestingModule],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
});
beforeEach(() => {
diff --git a/src/app/pages/auth/pages/sign-in/sign-in.page.ts b/src/app/pages/auth/pages/sign-in/sign-in.page.ts
index 0535218c3..3d6427936 100644
--- a/src/app/pages/auth/pages/sign-in/sign-in.page.ts
+++ b/src/app/pages/auth/pages/sign-in/sign-in.page.ts
@@ -5,7 +5,7 @@ import { AuthService } from '../../services/auth.service';
@Component({
templateUrl: './sign-in.page.html',
- styleUrls: ['./sign-in.page.scss'],
+ styleUrls: ['./sign-in.page.css'],
})
export class SignInPage {
returnUrl: string;
diff --git a/src/app/pages/auth/pages/sign-up/sign-up.page.scss b/src/app/pages/auth/pages/sign-up/sign-up.page.css
similarity index 100%
rename from src/app/pages/auth/pages/sign-up/sign-up.page.scss
rename to src/app/pages/auth/pages/sign-up/sign-up.page.css
diff --git a/src/app/pages/auth/pages/sign-up/sign-up.page.spec.ts b/src/app/pages/auth/pages/sign-up/sign-up.page.spec.ts
index 1d062eecd..a3f8eeca8 100644
--- a/src/app/pages/auth/pages/sign-up/sign-up.page.spec.ts
+++ b/src/app/pages/auth/pages/sign-up/sign-up.page.spec.ts
@@ -9,8 +9,9 @@ describe('SignUpPage', () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [SignUpPage],
- }).compileComponents();
+ declarations: [SignUpPage],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
}),
);
diff --git a/src/app/pages/auth/pages/sign-up/sign-up.page.ts b/src/app/pages/auth/pages/sign-up/sign-up.page.ts
index 4d7d81079..d881cbe2a 100644
--- a/src/app/pages/auth/pages/sign-up/sign-up.page.ts
+++ b/src/app/pages/auth/pages/sign-up/sign-up.page.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
@Component({
templateUrl: './sign-up.page.html',
- styleUrls: ['./sign-up.page.scss'],
+ styleUrls: ['./sign-up.page.css'],
})
export class SignUpPage {}
diff --git a/src/app/pages/auth/services/auth.service.spec.ts b/src/app/pages/auth/services/auth.service.spec.ts
index f1251cacf..9798036fd 100644
--- a/src/app/pages/auth/services/auth.service.spec.ts
+++ b/src/app/pages/auth/services/auth.service.spec.ts
@@ -6,7 +6,7 @@ describe('AuthService', () => {
let service: AuthService;
beforeEach(() => {
- TestBed.configureTestingModule({});
+ TestBed.configureTestingModule({ teardown: { destroyAfterEach: false } });
service = TestBed.inject(AuthService);
});
diff --git a/src/app/pages/dashboard/dashboard.page.scss b/src/app/pages/dashboard/dashboard.page.css
similarity index 100%
rename from src/app/pages/dashboard/dashboard.page.scss
rename to src/app/pages/dashboard/dashboard.page.css
diff --git a/src/app/pages/dashboard/dashboard.page.html b/src/app/pages/dashboard/dashboard.page.html
index f2ae98ef5..2e3a00ac2 100644
--- a/src/app/pages/dashboard/dashboard.page.html
+++ b/src/app/pages/dashboard/dashboard.page.html
@@ -8,10 +8,5 @@
dashboard works!
๐๐๐
-
- Back to home
-
+ Back to home
diff --git a/src/app/pages/dashboard/dashboard.page.spec.ts b/src/app/pages/dashboard/dashboard.page.spec.ts
index 08458b6f7..80cfe408f 100644
--- a/src/app/pages/dashboard/dashboard.page.spec.ts
+++ b/src/app/pages/dashboard/dashboard.page.spec.ts
@@ -8,9 +8,10 @@ describe('DashboardPage', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [DashboardPage],
- imports: [RouterTestingModule],
- }).compileComponents();
+ declarations: [DashboardPage],
+ imports: [RouterTestingModule],
+ teardown: { destroyAfterEach: false }
+}).compileComponents();
});
beforeEach(() => {
diff --git a/src/app/pages/dashboard/dashboard.page.ts b/src/app/pages/dashboard/dashboard.page.ts
index 014d7b825..521210509 100644
--- a/src/app/pages/dashboard/dashboard.page.ts
+++ b/src/app/pages/dashboard/dashboard.page.ts
@@ -3,7 +3,7 @@ import { ROUTER_UTILS } from '@core/utils/router.utils';
@Component({
templateUrl: './dashboard.page.html',
- styleUrls: ['./dashboard.page.scss'],
+ styleUrls: ['./dashboard.page.css'],
})
export class DashboardPage {
path = ROUTER_UTILS.config.base;
diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.css
similarity index 100%
rename from src/app/pages/home/home.page.scss
rename to src/app/pages/home/home.page.css
diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html
index 574a6d8de..d55a9bc64 100644
--- a/src/app/pages/home/home.page.html
+++ b/src/app/pages/home/home.page.html
@@ -1,31 +1,27 @@