Skip to content

Commit 1ed1c33

Browse files
committed
refactor: TT-332 changes in sidebar and dark mode components
1 parent 18997af commit 1ed1c33

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

src/app/modules/shared/components/dark-mode/dark-mode.component.spec.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { CookieService } from 'ngx-cookie-service';
3-
import { FeatureToggle } from 'src/environments/enum';
4-
52
import { DarkModeComponent } from './dark-mode.component';
63

74
describe('DarkModeComponent', () => {
85
let component: DarkModeComponent;
96
let fixture: ComponentFixture<DarkModeComponent>;
10-
let cookieService: CookieService;
117

128
beforeEach(async () => {
139
await TestBed.configureTestingModule({
@@ -17,7 +13,6 @@ describe('DarkModeComponent', () => {
1713

1814
beforeEach(() => {
1915
fixture = TestBed.createComponent(DarkModeComponent);
20-
cookieService = TestBed.inject(CookieService);
2116
component = fixture.componentInstance;
2217
fixture.detectChanges();
2318
});

src/app/modules/shared/components/dark-mode/dark-mode.component.ts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class DarkModeComponent implements OnInit, AfterViewInit {
3131

3232
ngAfterViewInit(): void {
3333
if (this.isFeatureToggleDarkModeActive) {
34-
this.switchThemeToggleStyles(this.theme);
34+
this.switchThemeToggleStyles();
3535
}
3636
}
3737

@@ -70,20 +70,17 @@ export class DarkModeComponent implements OnInit, AfterViewInit {
7070
changeToDarkOrLightTheme(): void {
7171
this.theme = this.setTheme();
7272
this.setLocalStorageTheme(this.theme);
73-
this.switchThemeToggleStyles(this.theme);
73+
this.switchThemeToggleStyles();
7474
this.addOrRemoveDarkMode();
7575
}
7676

77-
switchThemeToggleStyles(theme: string): void {
78-
switch (theme) {
79-
case 'dark':
80-
this.themeToggle.nativeElement.classList.remove('bg-warningTW', '-translate-x-1');
81-
this.themeToggle.nativeElement.classList.add('bg-grayTW-lighter', 'translate-x-1/2');
82-
break;
83-
case 'light':
84-
this.themeToggle.nativeElement.classList.remove('bg-grayTW-lighter', 'translate-x-1/2');
85-
this.themeToggle.nativeElement.classList.add('bg-warningTW', '-translate-x-1');
86-
break;
77+
switchThemeToggleStyles(): void {
78+
if (this.isDarkTheme()) {
79+
this.themeToggle.nativeElement.classList.remove('bg-warningTW', '-translate-x-1');
80+
this.themeToggle.nativeElement.classList.add('bg-grayTW-lighter', 'translate-x-1/2');
81+
} else {
82+
this.themeToggle.nativeElement.classList.remove('bg-grayTW-lighter', 'translate-x-1/2');
83+
this.themeToggle.nativeElement.classList.add('bg-warningTW', '-translate-x-1');
8784
}
8885
}
8986
}

src/app/modules/shared/components/sidebar/sidebar.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333
</div>
3434
</nav>
3535
<div class="container-fluid px-0 full-height">
36-
<div class="content_app mx-10 my-10 rounded-md bg-whiteTW dark:bg-grayTW-dark">
36+
<div class="content_app h-100">
37+
<div class="m-1 p-5 rounded-md bg-whiteTW dark:bg-grayTW-dark">
3738
<router-outlet></router-outlet>
3839
</div>
39-
</div>
40+
</div>
41+
</div>
4042
</div>
4143
</div>

0 commit comments

Comments
 (0)