diff --git a/src/app/components/sidebar/show-all-users/show-all-users.component.html b/src/app/components/sidebar/show-all-users/show-all-users.component.html index d760183..8fa05da 100644 --- a/src/app/components/sidebar/show-all-users/show-all-users.component.html +++ b/src/app/components/sidebar/show-all-users/show-all-users.component.html @@ -17,7 +17,7 @@ class="user" (click)="checkRoute([user]); closeSecondaryChatAndSidebar()" > -
+
  {{ "add-new-channel.required" | translate }} - @if (chechIfChannelExist(channelName)) { + @if (checkIfChannelExist(channelName)) {

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

} @@ -118,18 +118,18 @@
@for(user of getSearchedUser; track user){
-
+
@for (channel of getChannels(); track channel) { diff --git a/src/app/components/sidebar/sidebar-channels/sidebar-channels.component.scss b/src/app/components/sidebar/sidebar-channels/sidebar-channels.component.scss index 0adbe9f..9fb77a9 100644 --- a/src/app/components/sidebar/sidebar-channels/sidebar-channels.component.scss +++ b/src/app/components/sidebar/sidebar-channels/sidebar-channels.component.scss @@ -128,7 +128,7 @@ section { } } -.showAllChanneld { +.showAllChannels { animation-name: slideIn; overflow: auto; transition: max-height 0.3s ease-in-out; @@ -162,7 +162,7 @@ section { } @media screen and (max-width: $RESPONSIVE_THRESHOLD_MOBILE380px) { - .showAllChanneld { + .showAllChannels { max-height: 16vh; } } diff --git a/src/app/service/login.service.ts b/src/app/service/login.service.ts index 02d4a35..4170e9d 100644 --- a/src/app/service/login.service.ts +++ b/src/app/service/login.service.ts @@ -255,7 +255,7 @@ export class loginService { * Retrieves the completion status of the introduction class. * @returns {boolean} True if the introduction is complete, false otherwise. */ - getFinalclass(): boolean { + getFinalClass(): boolean { return this.introCompleteStatus; } @@ -326,7 +326,7 @@ export class loginService { this.getUserIdInLocalStorage(this.currentUser); } - // -------------------- UserAddFunktions -------------------------------> + // -------------------- UserAddFunctions -------------------------------> /** * Updates the online status of the user in Firestore. diff --git a/src/app/service/user.service.ts b/src/app/service/user.service.ts index 9bf3627..f4654cf 100644 --- a/src/app/service/user.service.ts +++ b/src/app/service/user.service.ts @@ -74,7 +74,7 @@ export class UserService implements OnDestroy { * Get current user's data. * @returns Array containing current user's data. */ - getCurentUsers() { + getCurrentUsers() { const filteredUser = this.getUsers().filter( (user) => user.id == this.getCurrentUserId() ); diff --git a/src/app/shared/components/header/edit-user/edit-user-details/edit-user-details.component.html b/src/app/shared/components/header/edit-user/edit-user-details/edit-user-details.component.html index faa49ba..275a75d 100644 --- a/src/app/shared/components/header/edit-user/edit-user-details/edit-user-details.component.html +++ b/src/app/shared/components/header/edit-user/edit-user-details/edit-user-details.component.html @@ -1,5 +1,5 @@
-@for(i of userService.getCurentUsers(); track i){ +@for(i of userService.getCurrentUsers(); track i){
(); @Output() saveUserData = new EventEmitter(); @ViewChild('inputName') inputName!: ElementRef; @@ -98,22 +98,15 @@ export class EditUserDetailsComponent { /**Separate the first ans lastname. */ splitNameValue() { - const fullname: string[] = this.changedName.split(' '); - const newFirstName: string = fullname[0]; - let newLastName: string = fullname[1]; - if (fullname[2]) { - newLastName += ' ' + fullname[2]; + const fullName: string[] = this.changedName.split(' '); + const newFirstName: string = fullName[0]; + let newLastName: string = fullName[1]; + if (fullName[2]) { + newLastName += ' ' + fullName[2]; } return [newFirstName, newLastName]; } - /** Get the email value. */ - chechEmailValue() { - if (this.changedEmail == '') { - this.changedEmail = this.userService.emailValue; - } - } - /** * Checks if the user name is valid. * @param nameValue The value of the user's name. @@ -122,15 +115,15 @@ export class EditUserDetailsComponent { if (nameValue.trim() === '') { this.nameValueBoolean = false; } else { - const channelNameLenght = nameValue.length; - if (channelNameLenght >= 3) { + const channelNameLength = nameValue.length; + if (channelNameLength >= 3) { this.nameValueBoolean = true; this.changedName = nameValue; } else { this.nameValueBoolean = false; } } - this.chackSaveBtnName(); + this.checkSaveBtnName(); } /** @@ -155,7 +148,7 @@ export class EditUserDetailsComponent { /** * Checks if the save button is valid. */ - chackSaveBtnName() { + checkSaveBtnName() { if (this.nameValueBoolean) { this.channelService.saveEditBtnIsValid = true; } else { diff --git a/src/app/shared/components/header/edit-user/edit-user.component.html b/src/app/shared/components/header/edit-user/edit-user.component.html index 5aeda43..cacd724 100644 --- a/src/app/shared/components/header/edit-user/edit-user.component.html +++ b/src/app/shared/components/header/edit-user/edit-user.component.html @@ -1,5 +1,5 @@
-@for(i of userService.getCurentUsers(); track i){ +@for(i of userService.getCurrentUsers(); track i){

Profil

diff --git a/src/app/shared/components/header/edit-user/edit-user.component.ts b/src/app/shared/components/header/edit-user/edit-user.component.ts index ce202bc..6c014a6 100644 --- a/src/app/shared/components/header/edit-user/edit-user.component.ts +++ b/src/app/shared/components/header/edit-user/edit-user.component.ts @@ -18,12 +18,12 @@ import { SmallBtnComponent } from '../../small-btn/small-btn.component'; styleUrl: './edit-user.component.scss', }) export class EditUserComponent { - @Input() showCurrentProfile!: boolean; + @Input() showCurrentProfile: boolean = false; @Output() testValueChange = new EventEmitter(); - isOnline = true; - openProfil = false; - openEditUserValue = false; + isOnline: boolean = true; + openProfil: boolean = false; + openEditUserValue: boolean = false; constructor(public userService: UserService) {} diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index 163f0aa..7452ecb 100644 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -18,7 +18,7 @@ }
- @for(i of userService.getCurentUsers(); track i){ + @for(i of userService.getCurrentUsers(); track i){

{{ i.firstName }} {{ i.lastName }}

diff --git a/src/app/shared/components/header/header.component.scss b/src/app/shared/components/header/header.component.scss index bdef968..848543a 100644 --- a/src/app/shared/components/header/header.component.scss +++ b/src/app/shared/components/header/header.component.scss @@ -35,7 +35,7 @@ header { .leftSide { @include displayFlex($j: start, $g: 20px); - width: 20vw; + width: 30vw; .homeIcon { width: 242px; height: 70px; @@ -48,7 +48,7 @@ header { } .rightSide { - width: 20vw; + width: 30vw; @include displayFlex($j: end, $g: 20px); p { font-size: 28px; diff --git a/src/app/shared/components/header/search-bar/search-bar.component.html b/src/app/shared/components/header/search-bar/search-bar.component.html index 3c3834c..f0496c8 100644 --- a/src/app/shared/components/header/search-bar/search-bar.component.html +++ b/src/app/shared/components/header/search-bar/search-bar.component.html @@ -66,7 +66,7 @@
@for (chat of filteredChats; track chat) {
-

[ {{ getChannel(chat.channelId) }} ]

+

[ {{ getChannel(chat.channelId) }} ]

DABubble
diff --git a/src/app/shared/components/login/start-header/start-header.component.scss b/src/app/shared/components/login/start-header/start-header.component.scss index ec7b690..4ff42cd 100644 --- a/src/app/shared/components/login/start-header/start-header.component.scss +++ b/src/app/shared/components/login/start-header/start-header.component.scss @@ -112,12 +112,12 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - animation: animationToEndPosiotion 0.5s ease-in forwards 1s; + animation: animationToEndPosition 0.5s ease-in forwards 1s; background-size: contain; z-index: 999; } -.imgEndPosiotion { +.imgEndPosition { animation: imgSize 0.5s ease-in forwards 1s; } @@ -136,7 +136,7 @@ } } -@keyframes animationToEndPosiotion { +@keyframes animationToEndPosition { 0% { top: 50%; left: 50%; @@ -237,10 +237,10 @@ } .logoEndPosition { animation: none; - animation: animationToEndPosiotionMobile 0.5s ease-in forwards 1s; + animation: animationToEndPositionMobile 0.5s ease-in forwards 1s; } - @keyframes animationToEndPosiotionMobile { + @keyframes animationToEndPositionMobile { 0% { top: 50%; left: 50%; @@ -276,7 +276,7 @@ } } - .imgEndPosiotion { + .imgEndPosition { animation: none; animation: imgSizeMobile 0.5s ease-in forwards 1s; } diff --git a/src/app/shared/components/login/start-header/start-header.component.ts b/src/app/shared/components/login/start-header/start-header.component.ts index eaa21c7..f8bdc6c 100644 --- a/src/app/shared/components/login/start-header/start-header.component.ts +++ b/src/app/shared/components/login/start-header/start-header.component.ts @@ -23,11 +23,12 @@ import { SharedService } from '../../../../service/shared.service'; export class StartHeaderComponent { @Input() introCompleteStatus: boolean = false; @Input() display: string = ''; + animationStart: boolean = false; animationLogo: boolean = false; d_none: boolean = false; animationBackground: boolean = false; - animationToEndPosiotion: boolean = false; + animationToEndPosition: boolean = false; animationsBlock: boolean = false; viewWidth: number = 0; @@ -60,7 +61,7 @@ export class StartHeaderComponent { setTimeout(() => { this.animationBackground = true; }, 1000); - this.animationToEndPosiotion = true; + this.animationToEndPosition = true; this.loginService.setAnimationState(true); setTimeout(() => { this.d_none = true;