diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 90ae32d..d5eef9f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,12 +1,9 @@ import { Component } from '@angular/core'; import { RouterOutlet } from '@angular/router'; -import { UserComponent } from './shared/components/user/user.component'; -import { EditUserDetailsComponent } from './shared/components/header/edit-user/edit-user-details/edit-user-details.component'; -import { ToggleBooleanService } from './service/toggle-boolean.service'; @Component({ selector: 'app-root', standalone: true, - imports: [RouterOutlet, UserComponent, EditUserDetailsComponent], + imports: [RouterOutlet], templateUrl: './app.component.html', styleUrl: './app.component.scss', }) diff --git a/src/app/components/main-login/login/login.component.html b/src/app/components/main-login/login/login.component.html index 4476587..5b542fc 100644 --- a/src/app/components/main-login/login/login.component.html +++ b/src/app/components/main-login/login/login.component.html @@ -1,4 +1,4 @@ -
+
@@ -32,7 +32,7 @@ class="inputField" #passwordField="ngModel" minlength="6" - maxlength="16" + maxlength="16" [(ngModel)]="this.loginService.password" name="password" [type]="loginService.passwordFieldType" @@ -45,7 +45,12 @@ cols="30" rows="10" /> - Toggle visibility + Toggle visibility @if (!passwordField.valid && passwordField.touched) {

{{ "login.errorText2" | translate }}

} @if (loginService.errorMessage) { @@ -99,4 +104,4 @@
-
+ diff --git a/src/app/components/main-login/login/login.component.scss b/src/app/components/main-login/login/login.component.scss index ed43036..dc78665 100644 --- a/src/app/components/main-login/login/login.component.scss +++ b/src/app/components/main-login/login/login.component.scss @@ -3,8 +3,8 @@ overflow-x: hidden; overflow-y: hidden; } -.loginSektion { - @include SektionBody; +section { + @include SectionBody; } .loginContainer { @include Card; diff --git a/src/app/components/main-login/password-forget/password-forget.component.html b/src/app/components/main-login/password-forget/password-forget.component.html index 7015664..7cf2d32 100644 --- a/src/app/components/main-login/password-forget/password-forget.component.html +++ b/src/app/components/main-login/password-forget/password-forget.component.html @@ -1,4 +1,4 @@ -
+
@@ -11,10 +11,10 @@ >
- {{ 'passwordForget.header' | translate }} + {{ "passwordForget.header" | translate }}
- {{ 'passwordForget.infoText' | translate }} + {{ "passwordForget.infoText" | translate }}
@if (!emailField.valid && emailField.touched) { -

{{ 'login.errorText' | translate }}

+

{{ "login.errorText" | translate }}

}
- - {{ 'passwordForget.infoTextBottom' | translate }} + {{ "passwordForget.infoTextBottom" | translate }}
@@ -58,4 +56,4 @@ - + diff --git a/src/app/components/main-login/password-forget/password-forget.component.scss b/src/app/components/main-login/password-forget/password-forget.component.scss index 8a6dec6..1cd54cf 100644 --- a/src/app/components/main-login/password-forget/password-forget.component.scss +++ b/src/app/components/main-login/password-forget/password-forget.component.scss @@ -1,7 +1,7 @@ @import "../../../shared/components/login/mixins/mixin.scss"; -.passwordSektion { - @include SektionBody; +section { + @include SectionBody; } .passwordContainer { diff --git a/src/app/components/main-login/password-reset/password-reset.component.html b/src/app/components/main-login/password-reset/password-reset.component.html index 238e083..5b39ee8 100644 --- a/src/app/components/main-login/password-reset/password-reset.component.html +++ b/src/app/components/main-login/password-reset/password-reset.component.html @@ -1,4 +1,4 @@ -
+
@@ -11,7 +11,7 @@ >
- {{ 'passwordReset.header' | translate }} + {{ "passwordReset.header" | translate }}
@if (!passwordField.valid && passwordField.touched) {

- {{ 'passwordReset.errorText' | translate }} + {{ "passwordReset.errorText" | translate }}

}
@@ -66,7 +66,7 @@ class="error" *ngIf="passwordRepeatField.touched && !passwordsMatch()" > - {{ 'passwordReset.errorText2' | translate }} + {{ "passwordReset.errorText2" | translate }}

@@ -74,10 +74,10 @@ [ngClass]="{ aktivButton: contactForm.valid && passwordsMatch() }" [disabled]="!contactForm.valid || !passwordsMatch()" > - {{ 'passwordReset.Btn' | translate }} + {{ "passwordReset.Btn" | translate }}
- + diff --git a/src/app/components/main-login/password-reset/password-reset.component.scss b/src/app/components/main-login/password-reset/password-reset.component.scss index d3d3657..30c316a 100644 --- a/src/app/components/main-login/password-reset/password-reset.component.scss +++ b/src/app/components/main-login/password-reset/password-reset.component.scss @@ -1,6 +1,6 @@ @import "../../../shared/components/login/mixins/mixin.scss"; -.passwordSektion { - @include SektionBody; +section { + @include SectionBody; } .passwordContainer { max-width: 606px; diff --git a/src/app/components/sidebar/searchbar/searchbar.component.html b/src/app/components/sidebar/searchbar/searchbar.component.html deleted file mode 100644 index c2d538f..0000000 --- a/src/app/components/sidebar/searchbar/searchbar.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
- - -
- @if (inputValue) { -
- } -
diff --git a/src/app/components/sidebar/searchbar/searchbar.component.scss b/src/app/components/sidebar/searchbar/searchbar.component.scss deleted file mode 100644 index 1b10a30..0000000 --- a/src/app/components/sidebar/searchbar/searchbar.component.scss +++ /dev/null @@ -1,54 +0,0 @@ -@import "./../../../../styles.scss"; - -section{ - position: relative; - @include displayFlex(); - .whiteBox{ - z-index: 1; - position: absolute; - top: -16px; - left: 322px; - @include displayFlex(); - width: auto; - height: 56px; - background-color: #fff; - padding: 2px 8px 2px; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 34px; - border-top-left-radius: 0; - box-shadow: rgb(111 139 169) 0px 20px 30px -10px; - input{ - width: 30vw; - height: 46px; - border-radius: 26px; - padding-right: 40px; - padding-left: 8px; - margin-right: 2px; - font-size: larger; - border: 1px solid #888dec; - font-family: "Nunito", sans-serif; - outline: none; - &:hover{ - border: 1px solid #5f66e7; - } - } - img{ - margin-left: -36px; - padding-right: 4px; - cursor: pointer; - } - } -} - -.suggestions{ - width: 200px; - height: 300px; - background-color: coral; - position: absolute; - top: 46px; - left: 360px; - border-bottom-left-radius: 25px; - border-bottom-right-radius: 25px; - z-index: 1; - box-shadow: rgb(111 139 169) 0px 20px 30px -10px; -} \ No newline at end of file diff --git a/src/app/components/sidebar/searchbar/searchbar.component.spec.ts b/src/app/components/sidebar/searchbar/searchbar.component.spec.ts deleted file mode 100644 index 5031dad..0000000 --- a/src/app/components/sidebar/searchbar/searchbar.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SearchbarComponent } from './searchbar.component'; - -describe('SearchbarComponent', () => { - let component: SearchbarComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [SearchbarComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SearchbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/sidebar/searchbar/searchbar.component.ts b/src/app/components/sidebar/searchbar/searchbar.component.ts deleted file mode 100644 index fff28e9..0000000 --- a/src/app/components/sidebar/searchbar/searchbar.component.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { Component } from '@angular/core'; -import { ToggleBooleanService } from '../../../service/toggle-boolean.service'; -import { FormsModule } from '@angular/forms'; - -@Component({ - selector: 'app-searchbar', - standalone: true, - imports: [CommonModule, FormsModule], - templateUrl: './searchbar.component.html', - styleUrl: './searchbar.component.scss', -}) -export class SearchbarComponent { - inputValue: string = ''; - - constructor(private toggleBoolean: ToggleBooleanService) {} - - - /** - * Closes the search window. - * @param event The event object. - */ - closeSearchWindow(event: Event) { - this.toggleBoolean.openSearchWindow = false; - event.stopPropagation(); - this.inputValue = ''; - } - - /** - * Opens the search bar. - * @param event The event object. - */ - openSearchbar(event: Event){ - this.toggleBoolean.openSearchWindow = true; - event.stopPropagation(); - } - -} diff --git a/src/app/components/sidebar/show-all-users/show-all-users.component.spec.ts b/src/app/components/sidebar/show-all-users/show-all-users.component.spec.ts index 441ed21..cc51c8d 100644 --- a/src/app/components/sidebar/show-all-users/show-all-users.component.spec.ts +++ b/src/app/components/sidebar/show-all-users/show-all-users.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { ShowAllUsersComponent } from './show-all-users.component'; describe('ShowAllUsersComponent', () => { @@ -8,10 +7,9 @@ describe('ShowAllUsersComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ShowAllUsersComponent] - }) - .compileComponents(); - + imports: [ShowAllUsersComponent], + }).compileComponents(); + fixture = TestBed.createComponent(ShowAllUsersComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/src/app/components/sidebar/sidebar-channels/add-new-channel/add-new-channel.component.html b/src/app/components/sidebar/sidebar-channels/add-new-channel/add-new-channel.component.html index 2b39068..e25162e 100644 --- a/src/app/components/sidebar/sidebar-channels/add-new-channel/add-new-channel.component.html +++ b/src/app/components/sidebar/sidebar-channels/add-new-channel/add-new-channel.component.html @@ -10,8 +10,8 @@
@if (!showNextWindow) {
-
-

{{ 'add-new-channel.header' | translate }}

+
+

{{ "add-new-channel.header" | translate }}

- {{ 'add-new-channel.info' | translate }} + {{ "add-new-channel.info" | translate }}
-

{{ 'add-new-channel.header2' | translate }}

+

{{ "add-new-channel.header2" | translate }}

  - {{ 'add-new-channel.required' | translate }} + {{ "add-new-channel.required" | translate }} @if (chechIfChannelExist(channelName)) { -

{{ 'add-new-channel.warning' | translate }}

+

{{ "add-new-channel.warning" | translate }}

} - +
-

{{ 'add-new-channel.description' | translate }}

+

{{ "add-new-channel.description" | translate }}

  - {{ 'add-new-channel.optional' | translate }} + {{ "add-new-channel.optional" | translate }}